-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Restore state before the CRAN release
- Loading branch information
Showing
1,412 changed files
with
99,167 additions
and
53,396 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| Package: duckdb | ||
| Title: DBI Package for the DuckDB Database Management System | ||
| Version: 1.1.3-2 | ||
| Version: 1.1.3.9039 | ||
| Authors@R: c( | ||
| person("Hannes", "Mühleisen", , "[email protected]", role = "aut", | ||
| comment = c(ORCID = "0000-0001-8552-0029")), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| From 1e6fb864921a6314b5d4a946bbd406ed72de0e30 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Kirill=20M=C3=BCller?= <[email protected]> | ||
| Date: Fri, 20 Dec 2024 19:59:12 +0100 | ||
| Subject: [PATCH] Remove stderr for zstd | ||
|
|
||
| --- | ||
| src/duckdb/third_party/zstd/dict/cover.cpp | 3 +-- | ||
| src/duckdb/third_party/zstd/dict/fastcover.cpp | 3 +-- | ||
| src/duckdb/third_party/zstd/dict/zdict.cpp | 3 ++- | ||
| 3 files changed, 4 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/src/duckdb/third_party/zstd/dict/cover.cpp b/src/duckdb/third_party/zstd/dict/cover.cpp | ||
| index 935c96609..4a80eb1c5 100644 | ||
| --- a/src/duckdb/third_party/zstd/dict/cover.cpp | ||
| +++ b/src/duckdb/third_party/zstd/dict/cover.cpp | ||
| @@ -58,10 +58,9 @@ | ||
| static int g_displayLevel = 0; | ||
| #endif | ||
| #undef DISPLAY | ||
| +// CRAN does not allow stderr references | ||
| #define DISPLAY(...) \ | ||
| { \ | ||
| - fprintf(stderr, __VA_ARGS__); \ | ||
| - fflush(stderr); \ | ||
| } | ||
| #undef LOCALDISPLAYLEVEL | ||
| #define LOCALDISPLAYLEVEL(displayLevel, l, ...) \ | ||
| diff --git a/src/duckdb/third_party/zstd/dict/fastcover.cpp b/src/duckdb/third_party/zstd/dict/fastcover.cpp | ||
| index b3d103125..af4556676 100644 | ||
| --- a/src/duckdb/third_party/zstd/dict/fastcover.cpp | ||
| +++ b/src/duckdb/third_party/zstd/dict/fastcover.cpp | ||
| @@ -55,10 +55,9 @@ namespace duckdb_zstd { | ||
| static int g_displayLevel = 0; | ||
| #endif | ||
| #undef DISPLAY | ||
| +// CRAN does not allow stderr references | ||
| #define DISPLAY(...) \ | ||
| { \ | ||
| - fprintf(stderr, __VA_ARGS__); \ | ||
| - fflush(stderr); \ | ||
| } | ||
| #undef LOCALDISPLAYLEVEL | ||
| #define LOCALDISPLAYLEVEL(displayLevel, l, ...) \ | ||
| diff --git a/src/duckdb/third_party/zstd/dict/zdict.cpp b/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| index 7381e505d..069691d19 100644 | ||
| --- a/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| +++ b/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| @@ -75,7 +75,8 @@ static const U32 g_selectivity_default = 9; | ||
| * Console display | ||
| ***************************************/ | ||
| #undef DISPLAY | ||
| -#define DISPLAY(...) do { fprintf(stderr, __VA_ARGS__); fflush( stderr ); } while (0) | ||
| +// CRAN does not allow stderr references | ||
| +#define DISPLAY(...) do { } while (0) | ||
| #undef DISPLAYLEVEL | ||
| #define DISPLAYLEVEL(l, ...) do { if (notificationLevel>=l) { DISPLAY(__VA_ARGS__); } } while (0) /* 0 : no display; 1: errors; 2: default; 3: details; 4: debug */ | ||
|
|
||
| -- | ||
| 2.43.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| From a8efb1ccf35192701564878566a22bc7f014c9c7 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Kirill=20M=C3=BCller?= <[email protected]> | ||
| Date: Fri, 20 Dec 2024 20:00:18 +0100 | ||
| Subject: [PATCH] Avoid pragma for zstd | ||
|
|
||
| --- | ||
| src/duckdb/third_party/zstd/dict/divsufsort.cpp | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/duckdb/third_party/zstd/dict/divsufsort.cpp b/src/duckdb/third_party/zstd/dict/divsufsort.cpp | ||
| index b40901734..d0d00f8ca 100644 | ||
| --- a/src/duckdb/third_party/zstd/dict/divsufsort.cpp | ||
| +++ b/src/duckdb/third_party/zstd/dict/divsufsort.cpp | ||
| @@ -26,7 +26,7 @@ | ||
|
|
||
| /*- Compiler specifics -*/ | ||
| #ifdef __clang__ | ||
| -#pragma clang diagnostic ignored "-Wshorten-64-to-32" | ||
| +// CRAN does not allow pragmas | ||
| #endif | ||
|
|
||
| #if defined(_MSC_VER) | ||
| -- | ||
| 2.43.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From 4b2b14d6197ba4dbb9de0afeb974e92f42aa561f Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Kirill=20M=C3=BCller?= <[email protected]> | ||
| Date: Fri, 20 Dec 2024 20:40:37 +0100 | ||
| Subject: [PATCH] Remove stderr for zstd | ||
|
|
||
| --- | ||
| src/duckdb/third_party/zstd/dict/zdict.cpp | 8 +------- | ||
| 1 file changed, 1 insertion(+), 7 deletions(-) | ||
|
|
||
| diff --git a/src/duckdb/third_party/zstd/dict/zdict.cpp b/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| index 069691d19..8529e9442 100644 | ||
| --- a/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| +++ b/src/duckdb/third_party/zstd/dict/zdict.cpp | ||
| @@ -479,15 +479,9 @@ static size_t ZDICT_trainBuffer_legacy(dictItem* dictList, U32 dictListSize, | ||
| clock_t const refreshRate = CLOCKS_PER_SEC * 3 / 10; | ||
|
|
||
| # undef DISPLAYUPDATE | ||
| +// CRAN does not allow stderr references | ||
| # define DISPLAYUPDATE(l, ...) \ | ||
| do { \ | ||
| - if (notificationLevel>=l) { \ | ||
| - if (ZDICT_clockSpan(displayClock) > refreshRate) { \ | ||
| - displayClock = clock(); \ | ||
| - DISPLAY(__VA_ARGS__); \ | ||
| - } \ | ||
| - if (notificationLevel>=4) fflush(stderr); \ | ||
| - } \ | ||
| } while (0) | ||
|
|
||
| /* init */ | ||
| -- | ||
| 2.43.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ore_functions/aggregate/algebraic/avg.cpp → ...ore_functions/aggregate/algebraic/avg.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...re_functions/aggregate/algebraic/corr.cpp → ...re_functions/aggregate/algebraic/corr.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...e_functions/aggregate/algebraic/covar.cpp → ...e_functions/aggregate/algebraic/covar.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
..._functions/aggregate/algebraic/stddev.cpp → ..._functions/aggregate/algebraic/stddev.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...s/aggregate/distributive/approx_count.cpp → ...s/aggregate/distributive/approx_count.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.