duckdb 0.8.1 → 0.8.2-dev11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/binding.gyp +3 -3
- package/package.json +1 -1
- package/src/duckdb/extension/icu/{icu-extension.cpp → icu_extension.cpp} +24 -27
- package/src/duckdb/extension/icu/include/{icu-extension.hpp → icu_extension.hpp} +2 -2
- package/src/duckdb/extension/json/include/{json-extension.hpp → json_extension.hpp} +2 -2
- package/src/duckdb/extension/json/{json-extension.cpp → json_extension.cpp} +4 -4
- package/src/duckdb/extension/parquet/{parquet-extension.cpp → parquet_extension.cpp} +1 -2
- package/src/duckdb/src/common/allocator.cpp +2 -2
- package/src/duckdb/src/function/table/version/pragma_version.cpp +2 -2
- package/src/duckdb/src/main/extension/extension_helper.cpp +24 -24
- /package/src/duckdb/extension/parquet/include/{parquet-extension.hpp → parquet_extension.hpp} +0 -0
package/binding.gyp
CHANGED
@@ -200,7 +200,7 @@
|
|
200
200
|
"src/duckdb/third_party/mbedtls/library/sha256.cpp",
|
201
201
|
"src/duckdb/third_party/mbedtls/library/sha512.cpp",
|
202
202
|
"src/duckdb/third_party/mbedtls/mbedtls_wrapper.cpp",
|
203
|
-
"src/duckdb/extension/parquet/
|
203
|
+
"src/duckdb/extension/parquet/parquet_extension.cpp",
|
204
204
|
"src/duckdb/extension/parquet/column_writer.cpp",
|
205
205
|
"src/duckdb/extension/parquet/parquet_reader.cpp",
|
206
206
|
"src/duckdb/extension/parquet/parquet_timestamp.cpp",
|
@@ -237,13 +237,13 @@
|
|
237
237
|
"src/duckdb/third_party/zstd/compress/zstd_lazy.cpp",
|
238
238
|
"src/duckdb/third_party/zstd/compress/zstd_ldm.cpp",
|
239
239
|
"src/duckdb/third_party/zstd/compress/zstd_opt.cpp",
|
240
|
+
"src/duckdb/extension/icu/./icu_extension.cpp",
|
240
241
|
"src/duckdb/extension/icu/./icu-list-range.cpp",
|
241
242
|
"src/duckdb/extension/icu/./icu-datefunc.cpp",
|
242
243
|
"src/duckdb/extension/icu/./icu-datepart.cpp",
|
243
244
|
"src/duckdb/extension/icu/./icu-datetrunc.cpp",
|
244
245
|
"src/duckdb/extension/icu/./icu-table-range.cpp",
|
245
246
|
"src/duckdb/extension/icu/./icu-dateadd.cpp",
|
246
|
-
"src/duckdb/extension/icu/./icu-extension.cpp",
|
247
247
|
"src/duckdb/extension/icu/./icu-strptime.cpp",
|
248
248
|
"src/duckdb/extension/icu/./icu-datesub.cpp",
|
249
249
|
"src/duckdb/extension/icu/./icu-makedate.cpp",
|
@@ -253,7 +253,7 @@
|
|
253
253
|
"src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp",
|
254
254
|
"src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp",
|
255
255
|
"src/duckdb/extension/json/buffered_json_reader.cpp",
|
256
|
-
"src/duckdb/extension/json/
|
256
|
+
"src/duckdb/extension/json/json_extension.cpp",
|
257
257
|
"src/duckdb/extension/json/json_common.cpp",
|
258
258
|
"src/duckdb/extension/json/json_functions.cpp",
|
259
259
|
"src/duckdb/extension/json/json_scan.cpp",
|
package/package.json
CHANGED
@@ -1,37 +1,34 @@
|
|
1
1
|
#define DUCKDB_EXTENSION_MAIN
|
2
2
|
|
3
|
-
#include "
|
4
|
-
#include "
|
5
|
-
#include "
|
6
|
-
#include "
|
7
|
-
#include "
|
8
|
-
#include "
|
9
|
-
|
10
|
-
#include "
|
3
|
+
#include "duckdb/catalog/catalog.hpp"
|
4
|
+
#include "duckdb/common/string_util.hpp"
|
5
|
+
#include "duckdb/common/vector_operations/unary_executor.hpp"
|
6
|
+
#include "duckdb/execution/expression_executor.hpp"
|
7
|
+
#include "duckdb/function/scalar_function.hpp"
|
8
|
+
#include "duckdb/main/config.hpp"
|
9
|
+
#include "duckdb/main/connection.hpp"
|
10
|
+
#include "duckdb/main/database.hpp"
|
11
|
+
#include "duckdb/parser/parsed_data/create_collation_info.hpp"
|
12
|
+
#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
|
13
|
+
#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
|
14
|
+
#include "duckdb/planner/expression/bound_function_expression.hpp"
|
11
15
|
#include "include/icu-dateadd.hpp"
|
12
16
|
#include "include/icu-datepart.hpp"
|
13
17
|
#include "include/icu-datesub.hpp"
|
14
18
|
#include "include/icu-datetrunc.hpp"
|
15
|
-
#include "include/icu-makedate.hpp"
|
16
19
|
#include "include/icu-list-range.hpp"
|
17
|
-
#include "include/icu-
|
20
|
+
#include "include/icu-makedate.hpp"
|
18
21
|
#include "include/icu-strptime.hpp"
|
22
|
+
#include "include/icu-table-range.hpp"
|
19
23
|
#include "include/icu-timebucket.hpp"
|
20
24
|
#include "include/icu-timezone.hpp"
|
21
|
-
|
22
|
-
#include "
|
23
|
-
#include "
|
24
|
-
#include "
|
25
|
-
|
26
|
-
#include "
|
27
|
-
#include "
|
28
|
-
#include "duckdb/function/scalar_function.hpp"
|
29
|
-
#include "duckdb/common/vector_operations/unary_executor.hpp"
|
30
|
-
#include "duckdb/parser/parsed_data/create_collation_info.hpp"
|
31
|
-
#include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
|
32
|
-
#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
|
33
|
-
#include "duckdb/execution/expression_executor.hpp"
|
34
|
-
#include "duckdb/catalog/catalog.hpp"
|
25
|
+
#include "include/icu_extension.hpp"
|
26
|
+
#include "unicode/calendar.h"
|
27
|
+
#include "unicode/coll.h"
|
28
|
+
#include "unicode/sortkey.h"
|
29
|
+
#include "unicode/stringpiece.h"
|
30
|
+
#include "unicode/timezone.h"
|
31
|
+
#include "unicode/ucol.h"
|
35
32
|
|
36
33
|
#include <cassert>
|
37
34
|
|
@@ -225,7 +222,7 @@ static void SetICUCalendar(ClientContext &context, SetScope scope, Value ¶me
|
|
225
222
|
}
|
226
223
|
}
|
227
224
|
|
228
|
-
void
|
225
|
+
void IcuExtension::Load(DuckDB &db) {
|
229
226
|
Connection con(db);
|
230
227
|
con.BeginTransaction();
|
231
228
|
|
@@ -288,7 +285,7 @@ void ICUExtension::Load(DuckDB &db) {
|
|
288
285
|
con.Commit();
|
289
286
|
}
|
290
287
|
|
291
|
-
std::string
|
288
|
+
std::string IcuExtension::Name() {
|
292
289
|
return "icu";
|
293
290
|
}
|
294
291
|
|
@@ -298,7 +295,7 @@ extern "C" {
|
|
298
295
|
|
299
296
|
DUCKDB_EXTENSION_API void icu_init(duckdb::DatabaseInstance &db) { // NOLINT
|
300
297
|
duckdb::DuckDB db_wrapper(db);
|
301
|
-
db_wrapper.LoadExtension<duckdb::
|
298
|
+
db_wrapper.LoadExtension<duckdb::IcuExtension>();
|
302
299
|
}
|
303
300
|
|
304
301
|
DUCKDB_EXTENSION_API const char *icu_version() { // NOLINT
|
@@ -1,7 +1,7 @@
|
|
1
1
|
//===----------------------------------------------------------------------===//
|
2
2
|
// DuckDB
|
3
3
|
//
|
4
|
-
//
|
4
|
+
// icu_extension.hpp
|
5
5
|
//
|
6
6
|
//
|
7
7
|
//===----------------------------------------------------------------------===//
|
@@ -12,7 +12,7 @@
|
|
12
12
|
|
13
13
|
namespace duckdb {
|
14
14
|
|
15
|
-
class
|
15
|
+
class IcuExtension : public Extension {
|
16
16
|
public:
|
17
17
|
void Load(DuckDB &db) override;
|
18
18
|
std::string Name() override;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
//===----------------------------------------------------------------------===//
|
2
2
|
// DuckDB
|
3
3
|
//
|
4
|
-
//
|
4
|
+
// json_extension.hpp
|
5
5
|
//
|
6
6
|
//
|
7
7
|
//===----------------------------------------------------------------------===//
|
@@ -12,7 +12,7 @@
|
|
12
12
|
|
13
13
|
namespace duckdb {
|
14
14
|
|
15
|
-
class
|
15
|
+
class JsonExtension : public Extension {
|
16
16
|
public:
|
17
17
|
void Load(DuckDB &db) override;
|
18
18
|
std::string Name() override;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#define DUCKDB_EXTENSION_MAIN
|
2
|
-
#include "
|
2
|
+
#include "json_extension.hpp"
|
3
3
|
|
4
4
|
#include "duckdb/catalog/catalog_entry/macro_catalog_entry.hpp"
|
5
5
|
#include "duckdb/catalog/default/default_functions.hpp"
|
@@ -23,7 +23,7 @@ static DefaultMacro json_macros[] = {
|
|
23
23
|
{DEFAULT_SCHEMA, "json", {"x", nullptr}, "json_extract(x, '$')"},
|
24
24
|
{nullptr, nullptr, {nullptr}, nullptr}};
|
25
25
|
|
26
|
-
void
|
26
|
+
void JsonExtension::Load(DuckDB &db) {
|
27
27
|
auto &db_instance = *db.instance;
|
28
28
|
// JSON type
|
29
29
|
auto json_type = JSONCommon::JSONType();
|
@@ -64,7 +64,7 @@ void JSONExtension::Load(DuckDB &db) {
|
|
64
64
|
}
|
65
65
|
}
|
66
66
|
|
67
|
-
std::string
|
67
|
+
std::string JsonExtension::Name() {
|
68
68
|
return "json";
|
69
69
|
}
|
70
70
|
|
@@ -74,7 +74,7 @@ extern "C" {
|
|
74
74
|
|
75
75
|
DUCKDB_EXTENSION_API void json_init(duckdb::DatabaseInstance &db) {
|
76
76
|
duckdb::DuckDB db_wrapper(db);
|
77
|
-
db_wrapper.LoadExtension<duckdb::
|
77
|
+
db_wrapper.LoadExtension<duckdb::JsonExtension>();
|
78
78
|
}
|
79
79
|
|
80
80
|
DUCKDB_EXTENSION_API const char *json_version() {
|
@@ -15,7 +15,7 @@
|
|
15
15
|
#endif
|
16
16
|
|
17
17
|
#if defined(BUILD_JEMALLOC_EXTENSION) && !defined(WIN32)
|
18
|
-
#include "
|
18
|
+
#include "jemalloc_extension.hpp"
|
19
19
|
#endif
|
20
20
|
|
21
21
|
namespace duckdb {
|
@@ -91,7 +91,7 @@ PrivateAllocatorData::~PrivateAllocatorData() {
|
|
91
91
|
//===--------------------------------------------------------------------===//
|
92
92
|
#if defined(BUILD_JEMALLOC_EXTENSION) && !defined(WIN32)
|
93
93
|
Allocator::Allocator()
|
94
|
-
: Allocator(
|
94
|
+
: Allocator(JemallocExtension::Allocate, JemallocExtension::Free, JemallocExtension::Reallocate, nullptr) {
|
95
95
|
}
|
96
96
|
#else
|
97
97
|
Allocator::Allocator()
|
@@ -1,8 +1,8 @@
|
|
1
1
|
#ifndef DUCKDB_VERSION
|
2
|
-
#define DUCKDB_VERSION "0.8.
|
2
|
+
#define DUCKDB_VERSION "0.8.2-dev11"
|
3
3
|
#endif
|
4
4
|
#ifndef DUCKDB_SOURCE_ID
|
5
|
-
#define DUCKDB_SOURCE_ID "
|
5
|
+
#define DUCKDB_SOURCE_ID "eefa9c9213"
|
6
6
|
#endif
|
7
7
|
#include "duckdb/function/table/system_functions.hpp"
|
8
8
|
#include "duckdb/main/database.hpp"
|
@@ -8,79 +8,79 @@
|
|
8
8
|
|
9
9
|
#if defined(BUILD_ICU_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
10
10
|
#define ICU_STATICALLY_LOADED true
|
11
|
-
#include "
|
11
|
+
#include "icu_extension.hpp"
|
12
12
|
#else
|
13
13
|
#define ICU_STATICALLY_LOADED false
|
14
14
|
#endif
|
15
15
|
|
16
16
|
#if defined(BUILD_PARQUET_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
17
17
|
#define PARQUET_STATICALLY_LOADED true
|
18
|
-
#include "
|
18
|
+
#include "parquet_extension.hpp"
|
19
19
|
#else
|
20
20
|
#define PARQUET_STATICALLY_LOADED false
|
21
21
|
#endif
|
22
22
|
|
23
23
|
#if defined(BUILD_TPCH_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
24
24
|
#define TPCH_STATICALLY_LOADED true
|
25
|
-
#include "
|
25
|
+
#include "tpch_extension.hpp"
|
26
26
|
#else
|
27
27
|
#define TPCH_STATICALLY_LOADED false
|
28
28
|
#endif
|
29
29
|
|
30
30
|
#if defined(BUILD_TPCDS_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
31
31
|
#define TPCDS_STATICALLY_LOADED true
|
32
|
-
#include "
|
32
|
+
#include "tpcds_extension.hpp"
|
33
33
|
#else
|
34
34
|
#define TPCDS_STATICALLY_LOADED false
|
35
35
|
#endif
|
36
36
|
|
37
37
|
#if defined(BUILD_FTS_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
38
38
|
#define FTS_STATICALLY_LOADED true
|
39
|
-
#include "
|
39
|
+
#include "fts_extension.hpp"
|
40
40
|
#else
|
41
41
|
#define FTS_STATICALLY_LOADED false
|
42
42
|
#endif
|
43
43
|
|
44
44
|
#if defined(BUILD_HTTPFS_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
45
45
|
#define HTTPFS_STATICALLY_LOADED true
|
46
|
-
#include "
|
46
|
+
#include "httpfs_extension.hpp"
|
47
47
|
#else
|
48
48
|
#define HTTPFS_STATICALLY_LOADED false
|
49
49
|
#endif
|
50
50
|
|
51
51
|
#if defined(BUILD_VISUALIZER_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
52
|
-
#include "
|
52
|
+
#include "visualizer_extension.hpp"
|
53
53
|
#endif
|
54
54
|
|
55
55
|
#if defined(BUILD_JSON_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
56
56
|
#define JSON_STATICALLY_LOADED true
|
57
|
-
#include "
|
57
|
+
#include "json_extension.hpp"
|
58
58
|
#else
|
59
59
|
#define JSON_STATICALLY_LOADED false
|
60
60
|
#endif
|
61
61
|
|
62
62
|
#if defined(BUILD_JEMALLOC_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
63
63
|
#define JEMALLOC_STATICALLY_LOADED true
|
64
|
-
#include "
|
64
|
+
#include "jemalloc_extension.hpp"
|
65
65
|
#else
|
66
66
|
#define JEMALLOC_STATICALLY_LOADED false
|
67
67
|
#endif
|
68
68
|
|
69
69
|
#if defined(BUILD_EXCEL_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
70
|
-
#include "
|
70
|
+
#include "excel_extension.hpp"
|
71
71
|
#endif
|
72
72
|
|
73
73
|
#if defined(BUILD_SQLSMITH_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
74
|
-
#include "
|
74
|
+
#include "sqlsmith_extension.hpp"
|
75
75
|
#endif
|
76
76
|
|
77
77
|
#if defined(BUILD_INET_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
78
|
-
#include "
|
78
|
+
#include "inet_extension.hpp"
|
79
79
|
#endif
|
80
80
|
|
81
81
|
#if defined(BUILD_AUTOCOMPLETE_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
82
82
|
#define AUTOCOMPLETE_STATICALLY_LOADED true
|
83
|
-
#include "
|
83
|
+
#include "autocomplete_extension.hpp"
|
84
84
|
#else
|
85
85
|
#define AUTOCOMPLETE_STATICALLY_LOADED false
|
86
86
|
#endif
|
@@ -187,35 +187,35 @@ ExtensionLoadResult ExtensionHelper::LoadExtensionInternal(DuckDB &db, const std
|
|
187
187
|
#endif
|
188
188
|
} else if (extension == "icu") {
|
189
189
|
#if ICU_STATICALLY_LOADED
|
190
|
-
db.LoadExtension<
|
190
|
+
db.LoadExtension<IcuExtension>();
|
191
191
|
#else
|
192
192
|
// icu extension required but not build: skip this test
|
193
193
|
return ExtensionLoadResult::NOT_LOADED;
|
194
194
|
#endif
|
195
195
|
} else if (extension == "tpch") {
|
196
196
|
#if TPCH_STATICALLY_LOADED
|
197
|
-
db.LoadExtension<
|
197
|
+
db.LoadExtension<TpchExtension>();
|
198
198
|
#else
|
199
199
|
// icu extension required but not build: skip this test
|
200
200
|
return ExtensionLoadResult::NOT_LOADED;
|
201
201
|
#endif
|
202
202
|
} else if (extension == "tpcds") {
|
203
203
|
#if TPCDS_STATICALLY_LOADED
|
204
|
-
db.LoadExtension<
|
204
|
+
db.LoadExtension<TpcdsExtension>();
|
205
205
|
#else
|
206
206
|
// icu extension required but not build: skip this test
|
207
207
|
return ExtensionLoadResult::NOT_LOADED;
|
208
208
|
#endif
|
209
209
|
} else if (extension == "fts") {
|
210
210
|
#if FTS_STATICALLY_LOADED
|
211
|
-
db.LoadExtension<
|
211
|
+
db.LoadExtension<FtsExtension>();
|
212
212
|
#else
|
213
213
|
// fts extension required but not build: skip this test
|
214
214
|
return ExtensionLoadResult::NOT_LOADED;
|
215
215
|
#endif
|
216
216
|
} else if (extension == "httpfs") {
|
217
217
|
#if HTTPFS_STATICALLY_LOADED
|
218
|
-
db.LoadExtension<
|
218
|
+
db.LoadExtension<HttpfsExtension>();
|
219
219
|
#else
|
220
220
|
return ExtensionLoadResult::NOT_LOADED;
|
221
221
|
#endif
|
@@ -228,42 +228,42 @@ ExtensionLoadResult ExtensionHelper::LoadExtensionInternal(DuckDB &db, const std
|
|
228
228
|
#endif
|
229
229
|
} else if (extension == "json") {
|
230
230
|
#if JSON_STATICALLY_LOADED
|
231
|
-
db.LoadExtension<
|
231
|
+
db.LoadExtension<JsonExtension>();
|
232
232
|
#else
|
233
233
|
// json extension required but not build: skip this test
|
234
234
|
return ExtensionLoadResult::NOT_LOADED;
|
235
235
|
#endif
|
236
236
|
} else if (extension == "excel") {
|
237
237
|
#if defined(BUILD_EXCEL_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
238
|
-
db.LoadExtension<
|
238
|
+
db.LoadExtension<ExcelExtension>();
|
239
239
|
#else
|
240
240
|
// excel extension required but not build: skip this test
|
241
241
|
return ExtensionLoadResult::NOT_LOADED;
|
242
242
|
#endif
|
243
243
|
} else if (extension == "sqlsmith") {
|
244
244
|
#if defined(BUILD_SQLSMITH_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
245
|
-
db.LoadExtension<
|
245
|
+
db.LoadExtension<SqlsmithExtension>();
|
246
246
|
#else
|
247
247
|
// excel extension required but not build: skip this test
|
248
248
|
return ExtensionLoadResult::NOT_LOADED;
|
249
249
|
#endif
|
250
250
|
} else if (extension == "jemalloc") {
|
251
251
|
#if defined(BUILD_JEMALLOC_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
252
|
-
db.LoadExtension<
|
252
|
+
db.LoadExtension<JemallocExtension>();
|
253
253
|
#else
|
254
254
|
// jemalloc extension required but not build: skip this test
|
255
255
|
return ExtensionLoadResult::NOT_LOADED;
|
256
256
|
#endif
|
257
257
|
} else if (extension == "autocomplete") {
|
258
258
|
#if defined(BUILD_AUTOCOMPLETE_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
259
|
-
db.LoadExtension<
|
259
|
+
db.LoadExtension<AutocompleteExtension>();
|
260
260
|
#else
|
261
261
|
// autocomplete extension required but not build: skip this test
|
262
262
|
return ExtensionLoadResult::NOT_LOADED;
|
263
263
|
#endif
|
264
264
|
} else if (extension == "inet") {
|
265
265
|
#if defined(BUILD_INET_EXTENSION) && !defined(DISABLE_BUILTIN_EXTENSIONS)
|
266
|
-
db.LoadExtension<
|
266
|
+
db.LoadExtension<InetExtension>();
|
267
267
|
#else
|
268
268
|
// inet extension required but not build: skip this test
|
269
269
|
return ExtensionLoadResult::NOT_LOADED;
|
/package/src/duckdb/extension/parquet/include/{parquet-extension.hpp → parquet_extension.hpp}
RENAMED
File without changes
|