duckdb 0.6.2-dev13.0 → 0.6.2-dev23.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/package.json +1 -1
- package/src/duckdb.cpp +4133 -4131
- package/src/duckdb.hpp +118 -118
- package/src/parquet-amalgamation.cpp +37843 -37843
package/src/duckdb.hpp
CHANGED
|
@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
|
11
11
|
#pragma once
|
|
12
12
|
#define DUCKDB_AMALGAMATION 1
|
|
13
13
|
#define DUCKDB_AMALGAMATION_EXTENDED 1
|
|
14
|
-
#define DUCKDB_SOURCE_ID "
|
|
15
|
-
#define DUCKDB_VERSION "v0.6.2-
|
|
14
|
+
#define DUCKDB_SOURCE_ID "6f67ea9ef0"
|
|
15
|
+
#define DUCKDB_VERSION "v0.6.2-dev23"
|
|
16
16
|
//===----------------------------------------------------------------------===//
|
|
17
17
|
// DuckDB
|
|
18
18
|
//
|
|
@@ -9475,10 +9475,118 @@ DUCKDB_API TypeCatalogEntry *Catalog::GetEntry(ClientContext &context, const str
|
|
|
9475
9475
|
|
|
9476
9476
|
} // namespace duckdb
|
|
9477
9477
|
|
|
9478
|
+
|
|
9479
|
+
//===----------------------------------------------------------------------===//
|
|
9480
|
+
// DuckDB
|
|
9481
|
+
//
|
|
9482
|
+
// duckdb/common/enums/logical_operator_type.hpp
|
|
9483
|
+
//
|
|
9484
|
+
//
|
|
9485
|
+
//===----------------------------------------------------------------------===//
|
|
9486
|
+
|
|
9487
|
+
|
|
9488
|
+
|
|
9489
|
+
|
|
9490
|
+
|
|
9491
|
+
namespace duckdb {
|
|
9492
|
+
|
|
9493
|
+
//===--------------------------------------------------------------------===//
|
|
9494
|
+
// Logical Operator Types
|
|
9495
|
+
//===--------------------------------------------------------------------===//
|
|
9496
|
+
enum class LogicalOperatorType : uint8_t {
|
|
9497
|
+
LOGICAL_INVALID = 0,
|
|
9498
|
+
LOGICAL_PROJECTION = 1,
|
|
9499
|
+
LOGICAL_FILTER = 2,
|
|
9500
|
+
LOGICAL_AGGREGATE_AND_GROUP_BY = 3,
|
|
9501
|
+
LOGICAL_WINDOW = 4,
|
|
9502
|
+
LOGICAL_UNNEST = 5,
|
|
9503
|
+
LOGICAL_LIMIT = 6,
|
|
9504
|
+
LOGICAL_ORDER_BY = 7,
|
|
9505
|
+
LOGICAL_TOP_N = 8,
|
|
9506
|
+
LOGICAL_COPY_TO_FILE = 10,
|
|
9507
|
+
LOGICAL_DISTINCT = 11,
|
|
9508
|
+
LOGICAL_SAMPLE = 12,
|
|
9509
|
+
LOGICAL_LIMIT_PERCENT = 13,
|
|
9510
|
+
|
|
9511
|
+
// -----------------------------
|
|
9512
|
+
// Data sources
|
|
9513
|
+
// -----------------------------
|
|
9514
|
+
LOGICAL_GET = 25,
|
|
9515
|
+
LOGICAL_CHUNK_GET = 26,
|
|
9516
|
+
LOGICAL_DELIM_GET = 27,
|
|
9517
|
+
LOGICAL_EXPRESSION_GET = 28,
|
|
9518
|
+
LOGICAL_DUMMY_SCAN = 29,
|
|
9519
|
+
LOGICAL_EMPTY_RESULT = 30,
|
|
9520
|
+
LOGICAL_CTE_REF = 31,
|
|
9521
|
+
// -----------------------------
|
|
9522
|
+
// Joins
|
|
9523
|
+
// -----------------------------
|
|
9524
|
+
LOGICAL_JOIN = 50,
|
|
9525
|
+
LOGICAL_DELIM_JOIN = 51,
|
|
9526
|
+
LOGICAL_COMPARISON_JOIN = 52,
|
|
9527
|
+
LOGICAL_ANY_JOIN = 53,
|
|
9528
|
+
LOGICAL_CROSS_PRODUCT = 54,
|
|
9529
|
+
// -----------------------------
|
|
9530
|
+
// SetOps
|
|
9531
|
+
// -----------------------------
|
|
9532
|
+
LOGICAL_UNION = 75,
|
|
9533
|
+
LOGICAL_EXCEPT = 76,
|
|
9534
|
+
LOGICAL_INTERSECT = 77,
|
|
9535
|
+
LOGICAL_RECURSIVE_CTE = 78,
|
|
9536
|
+
|
|
9537
|
+
// -----------------------------
|
|
9538
|
+
// Updates
|
|
9539
|
+
// -----------------------------
|
|
9540
|
+
LOGICAL_INSERT = 100,
|
|
9541
|
+
LOGICAL_DELETE = 101,
|
|
9542
|
+
LOGICAL_UPDATE = 102,
|
|
9543
|
+
|
|
9544
|
+
// -----------------------------
|
|
9545
|
+
// Schema
|
|
9546
|
+
// -----------------------------
|
|
9547
|
+
LOGICAL_ALTER = 125,
|
|
9548
|
+
LOGICAL_CREATE_TABLE = 126,
|
|
9549
|
+
LOGICAL_CREATE_INDEX = 127,
|
|
9550
|
+
LOGICAL_CREATE_SEQUENCE = 128,
|
|
9551
|
+
LOGICAL_CREATE_VIEW = 129,
|
|
9552
|
+
LOGICAL_CREATE_SCHEMA = 130,
|
|
9553
|
+
LOGICAL_CREATE_MACRO = 131,
|
|
9554
|
+
LOGICAL_DROP = 132,
|
|
9555
|
+
LOGICAL_PRAGMA = 133,
|
|
9556
|
+
LOGICAL_TRANSACTION = 134,
|
|
9557
|
+
LOGICAL_CREATE_TYPE = 135,
|
|
9558
|
+
|
|
9559
|
+
// -----------------------------
|
|
9560
|
+
// Explain
|
|
9561
|
+
// -----------------------------
|
|
9562
|
+
LOGICAL_EXPLAIN = 150,
|
|
9563
|
+
|
|
9564
|
+
// -----------------------------
|
|
9565
|
+
// Show
|
|
9566
|
+
// -----------------------------
|
|
9567
|
+
LOGICAL_SHOW = 160,
|
|
9568
|
+
|
|
9569
|
+
// -----------------------------
|
|
9570
|
+
// Helpers
|
|
9571
|
+
// -----------------------------
|
|
9572
|
+
LOGICAL_PREPARE = 175,
|
|
9573
|
+
LOGICAL_EXECUTE = 176,
|
|
9574
|
+
LOGICAL_EXPORT = 177,
|
|
9575
|
+
LOGICAL_VACUUM = 178,
|
|
9576
|
+
LOGICAL_SET = 179,
|
|
9577
|
+
LOGICAL_LOAD = 180,
|
|
9578
|
+
|
|
9579
|
+
LOGICAL_EXTENSION_OPERATOR = 255
|
|
9580
|
+
};
|
|
9581
|
+
|
|
9582
|
+
DUCKDB_API string LogicalOperatorToString(LogicalOperatorType type);
|
|
9583
|
+
|
|
9584
|
+
} // namespace duckdb
|
|
9585
|
+
|
|
9478
9586
|
//===----------------------------------------------------------------------===//
|
|
9479
9587
|
// DuckDB
|
|
9480
9588
|
//
|
|
9481
|
-
// duckdb/optimizer/estimated_properties.hpp
|
|
9589
|
+
// duckdb/optimizer/join_order/estimated_properties.hpp
|
|
9482
9590
|
//
|
|
9483
9591
|
//
|
|
9484
9592
|
//===----------------------------------------------------------------------===//
|
|
@@ -10779,112 +10887,6 @@ public:
|
|
|
10779
10887
|
|
|
10780
10888
|
|
|
10781
10889
|
|
|
10782
|
-
//===----------------------------------------------------------------------===//
|
|
10783
|
-
// DuckDB
|
|
10784
|
-
//
|
|
10785
|
-
// duckdb/common/enums/logical_operator_type.hpp
|
|
10786
|
-
//
|
|
10787
|
-
//
|
|
10788
|
-
//===----------------------------------------------------------------------===//
|
|
10789
|
-
|
|
10790
|
-
|
|
10791
|
-
|
|
10792
|
-
|
|
10793
|
-
|
|
10794
|
-
namespace duckdb {
|
|
10795
|
-
|
|
10796
|
-
//===--------------------------------------------------------------------===//
|
|
10797
|
-
// Logical Operator Types
|
|
10798
|
-
//===--------------------------------------------------------------------===//
|
|
10799
|
-
enum class LogicalOperatorType : uint8_t {
|
|
10800
|
-
LOGICAL_INVALID = 0,
|
|
10801
|
-
LOGICAL_PROJECTION = 1,
|
|
10802
|
-
LOGICAL_FILTER = 2,
|
|
10803
|
-
LOGICAL_AGGREGATE_AND_GROUP_BY = 3,
|
|
10804
|
-
LOGICAL_WINDOW = 4,
|
|
10805
|
-
LOGICAL_UNNEST = 5,
|
|
10806
|
-
LOGICAL_LIMIT = 6,
|
|
10807
|
-
LOGICAL_ORDER_BY = 7,
|
|
10808
|
-
LOGICAL_TOP_N = 8,
|
|
10809
|
-
LOGICAL_COPY_TO_FILE = 10,
|
|
10810
|
-
LOGICAL_DISTINCT = 11,
|
|
10811
|
-
LOGICAL_SAMPLE = 12,
|
|
10812
|
-
LOGICAL_LIMIT_PERCENT = 13,
|
|
10813
|
-
|
|
10814
|
-
// -----------------------------
|
|
10815
|
-
// Data sources
|
|
10816
|
-
// -----------------------------
|
|
10817
|
-
LOGICAL_GET = 25,
|
|
10818
|
-
LOGICAL_CHUNK_GET = 26,
|
|
10819
|
-
LOGICAL_DELIM_GET = 27,
|
|
10820
|
-
LOGICAL_EXPRESSION_GET = 28,
|
|
10821
|
-
LOGICAL_DUMMY_SCAN = 29,
|
|
10822
|
-
LOGICAL_EMPTY_RESULT = 30,
|
|
10823
|
-
LOGICAL_CTE_REF = 31,
|
|
10824
|
-
// -----------------------------
|
|
10825
|
-
// Joins
|
|
10826
|
-
// -----------------------------
|
|
10827
|
-
LOGICAL_JOIN = 50,
|
|
10828
|
-
LOGICAL_DELIM_JOIN = 51,
|
|
10829
|
-
LOGICAL_COMPARISON_JOIN = 52,
|
|
10830
|
-
LOGICAL_ANY_JOIN = 53,
|
|
10831
|
-
LOGICAL_CROSS_PRODUCT = 54,
|
|
10832
|
-
// -----------------------------
|
|
10833
|
-
// SetOps
|
|
10834
|
-
// -----------------------------
|
|
10835
|
-
LOGICAL_UNION = 75,
|
|
10836
|
-
LOGICAL_EXCEPT = 76,
|
|
10837
|
-
LOGICAL_INTERSECT = 77,
|
|
10838
|
-
LOGICAL_RECURSIVE_CTE = 78,
|
|
10839
|
-
|
|
10840
|
-
// -----------------------------
|
|
10841
|
-
// Updates
|
|
10842
|
-
// -----------------------------
|
|
10843
|
-
LOGICAL_INSERT = 100,
|
|
10844
|
-
LOGICAL_DELETE = 101,
|
|
10845
|
-
LOGICAL_UPDATE = 102,
|
|
10846
|
-
|
|
10847
|
-
// -----------------------------
|
|
10848
|
-
// Schema
|
|
10849
|
-
// -----------------------------
|
|
10850
|
-
LOGICAL_ALTER = 125,
|
|
10851
|
-
LOGICAL_CREATE_TABLE = 126,
|
|
10852
|
-
LOGICAL_CREATE_INDEX = 127,
|
|
10853
|
-
LOGICAL_CREATE_SEQUENCE = 128,
|
|
10854
|
-
LOGICAL_CREATE_VIEW = 129,
|
|
10855
|
-
LOGICAL_CREATE_SCHEMA = 130,
|
|
10856
|
-
LOGICAL_CREATE_MACRO = 131,
|
|
10857
|
-
LOGICAL_DROP = 132,
|
|
10858
|
-
LOGICAL_PRAGMA = 133,
|
|
10859
|
-
LOGICAL_TRANSACTION = 134,
|
|
10860
|
-
LOGICAL_CREATE_TYPE = 135,
|
|
10861
|
-
|
|
10862
|
-
// -----------------------------
|
|
10863
|
-
// Explain
|
|
10864
|
-
// -----------------------------
|
|
10865
|
-
LOGICAL_EXPLAIN = 150,
|
|
10866
|
-
|
|
10867
|
-
// -----------------------------
|
|
10868
|
-
// Show
|
|
10869
|
-
// -----------------------------
|
|
10870
|
-
LOGICAL_SHOW = 160,
|
|
10871
|
-
|
|
10872
|
-
// -----------------------------
|
|
10873
|
-
// Helpers
|
|
10874
|
-
// -----------------------------
|
|
10875
|
-
LOGICAL_PREPARE = 175,
|
|
10876
|
-
LOGICAL_EXECUTE = 176,
|
|
10877
|
-
LOGICAL_EXPORT = 177,
|
|
10878
|
-
LOGICAL_VACUUM = 178,
|
|
10879
|
-
LOGICAL_SET = 179,
|
|
10880
|
-
LOGICAL_LOAD = 180,
|
|
10881
|
-
|
|
10882
|
-
LOGICAL_EXTENSION_OPERATOR = 255
|
|
10883
|
-
};
|
|
10884
|
-
|
|
10885
|
-
DUCKDB_API string LogicalOperatorToString(LogicalOperatorType type);
|
|
10886
|
-
|
|
10887
|
-
} // namespace duckdb
|
|
10888
10890
|
|
|
10889
10891
|
|
|
10890
10892
|
//===----------------------------------------------------------------------===//
|
|
@@ -11241,10 +11243,6 @@ idx_t EstimatedProperties::GetCardinality() const;
|
|
|
11241
11243
|
|
|
11242
11244
|
} // namespace duckdb
|
|
11243
11245
|
|
|
11244
|
-
|
|
11245
|
-
|
|
11246
|
-
|
|
11247
|
-
|
|
11248
11246
|
//===----------------------------------------------------------------------===//
|
|
11249
11247
|
// DuckDB
|
|
11250
11248
|
//
|
|
@@ -11278,8 +11276,10 @@ struct ColumnBinding {
|
|
|
11278
11276
|
|
|
11279
11277
|
|
|
11280
11278
|
|
|
11281
|
-
|
|
11279
|
+
|
|
11280
|
+
|
|
11282
11281
|
#include <algorithm>
|
|
11282
|
+
#include <functional>
|
|
11283
11283
|
|
|
11284
11284
|
namespace duckdb {
|
|
11285
11285
|
|
|
@@ -13417,7 +13417,7 @@ public:
|
|
|
13417
13417
|
//===----------------------------------------------------------------------===//
|
|
13418
13418
|
// DuckDB
|
|
13419
13419
|
//
|
|
13420
|
-
// duckdb/optimizer/join_node.hpp
|
|
13420
|
+
// duckdb/optimizer/join_order/join_node.hpp
|
|
13421
13421
|
//
|
|
13422
13422
|
//
|
|
13423
13423
|
//===----------------------------------------------------------------------===//
|
|
@@ -13426,6 +13426,9 @@ public:
|
|
|
13426
13426
|
|
|
13427
13427
|
|
|
13428
13428
|
|
|
13429
|
+
|
|
13430
|
+
|
|
13431
|
+
|
|
13429
13432
|
//===----------------------------------------------------------------------===//
|
|
13430
13433
|
// DuckDB
|
|
13431
13434
|
//
|
|
@@ -13506,9 +13509,6 @@ private:
|
|
|
13506
13509
|
|
|
13507
13510
|
|
|
13508
13511
|
|
|
13509
|
-
|
|
13510
|
-
|
|
13511
|
-
|
|
13512
13512
|
namespace duckdb {
|
|
13513
13513
|
|
|
13514
13514
|
class JoinOrderOptimizer;
|