duckdb 0.8.2-dev150.0 → 0.8.2-dev1549.0

package/src/duckdb/src/include/duckdb/optimizer/compressed_materialization.hpp

@@ -0,0 +1,132 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/optimizer/compressed_materialization.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/common/unordered_set.hpp"
+#include "duckdb/function/scalar/compressed_materialization_functions.hpp"
+#include "duckdb/planner/column_binding_map.hpp"
+#include "duckdb/storage/statistics/base_statistics.hpp"
+
+namespace duckdb {
+
+class LogicalOperator;
+struct JoinCondition;
+
+struct CMChildInfo {
+public:
+	CMChildInfo(LogicalOperator &op, const column_binding_set_t &referenced_bindings);
+
+public:
+	//! Bindings and types before compressing
+	vector<ColumnBinding> bindings_before;
+	vector<LogicalType> &types;
+	//! Whether the input binding is eligible for compression
+	vector<bool> can_compress;
+
+	//! Bindings after compressing (projection on top)
+	vector<ColumnBinding> bindings_after;
+};
+
+struct CMBindingInfo {
+public:
+	explicit CMBindingInfo(ColumnBinding binding, const LogicalType &type);
+
+public:
+	ColumnBinding binding;
+
+	//! Type before compressing
+	LogicalType type;
+	bool needs_decompression;
+	unique_ptr<BaseStatistics> stats;
+};
+
+struct CompressedMaterializationInfo {
+public:
+	CompressedMaterializationInfo(LogicalOperator &op, vector<idx_t> &&child_idxs,
+	                              const column_binding_set_t &referenced_bindings);
+
+public:
+	//! Mapping from incoming bindings to outgoing bindings
+	column_binding_map_t<CMBindingInfo> binding_map;
+
+	//! Operator child info
+	vector<idx_t> child_idxs;
+	vector<CMChildInfo> child_info;
+};
+
+struct CompressExpression {
+public:
+	CompressExpression(unique_ptr<Expression> expression, unique_ptr<BaseStatistics> stats);
+
+public:
+	unique_ptr<Expression> expression;
+	unique_ptr<BaseStatistics> stats;
+};
+
+typedef column_binding_map_t<unique_ptr<BaseStatistics>> statistics_map_t;
+
+//! The CompressedMaterialization optimizer compressed columns using projections, based on available statistics,
+//! but only if the data enters a materializing operator
+class CompressedMaterialization {
+public:
+	explicit CompressedMaterialization(ClientContext &context, Binder &binder, statistics_map_t &&statistics_map);
+
+	void Compress(unique_ptr<LogicalOperator> &op);
+
+private:
+	//! Depth-first traversal of the plan
+	void CompressInternal(unique_ptr<LogicalOperator> &op);
+
+	//! Compress materializing operators
+	void CompressAggregate(unique_ptr<LogicalOperator> &op);
+	void CompressDistinct(unique_ptr<LogicalOperator> &op);
+	void CompressOrder(unique_ptr<LogicalOperator> &op);
+
+	//! Update statistics after compressing
+	void UpdateAggregateStats(unique_ptr<LogicalOperator> &op);
+	void UpdateOrderStats(unique_ptr<LogicalOperator> &op);
+
+	//! Adds bindings referenced in expression to referenced_bindings
+	static void GetReferencedBindings(const Expression &expression, column_binding_set_t &referenced_bindings);
+	//! Updates CMBindingInfo in the binding_map in info
+	void UpdateBindingInfo(CompressedMaterializationInfo &info, const ColumnBinding &binding, bool needs_decompression);
+
+	//! Create (de)compress projections around the operator
+	void CreateProjections(unique_ptr<LogicalOperator> &op, CompressedMaterializationInfo &info);
+	bool TryCompressChild(CompressedMaterializationInfo &info, const CMChildInfo &child_info,
+	                      vector<unique_ptr<CompressExpression>> &compress_expressions);
+	void CreateCompressProjection(unique_ptr<LogicalOperator> &child_op,
+	                              vector<unique_ptr<CompressExpression>> &&compress_exprs,
+	                              CompressedMaterializationInfo &info, CMChildInfo &child_info);
+	void CreateDecompressProjection(unique_ptr<LogicalOperator> &op, CompressedMaterializationInfo &info);
+
+	//! Create expressions that apply a scalar compression function
+	unique_ptr<CompressExpression> GetCompressExpression(const ColumnBinding &binding, const LogicalType &type,
+	                                                     const bool &can_compress);
+	unique_ptr<CompressExpression> GetCompressExpression(unique_ptr<Expression> input, const BaseStatistics &stats);
+	unique_ptr<CompressExpression> GetIntegralCompress(unique_ptr<Expression> input, const BaseStatistics &stats);
+	unique_ptr<CompressExpression> GetStringCompress(unique_ptr<Expression> input, const BaseStatistics &stats);
+
+	//! Create an expression that applies a scalar decompression function
+	unique_ptr<Expression> GetDecompressExpression(unique_ptr<Expression> input, const LogicalType &result_type,
+	                                               const BaseStatistics &stats);
+	unique_ptr<Expression> GetIntegralDecompress(unique_ptr<Expression> input, const LogicalType &result_type,
+	                                             const BaseStatistics &stats);
+	unique_ptr<Expression> GetStringDecompress(unique_ptr<Expression> input, const BaseStatistics &stats);
+
+private:
+	ClientContext &context;
+	Binder &binder;
+	statistics_map_t statistics_map;
+	unordered_set<idx_t> compression_table_indices;
+	unordered_set<idx_t> decompression_table_indices;
+	optional_ptr<LogicalOperator> root;
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/deliminator.hpp

@@ -8,36 +8,33 @@
 
 #pragma once
 
-#include "duckdb/parser/expression_map.hpp"
-#include "duckdb/planner/column_binding_map.hpp"
-#include "duckdb/planner/logical_operator.hpp"
-#include "duckdb/planner/logical_operator_visitor.hpp"
+#include "duckdb/optimizer/column_binding_replacer.hpp"
 
 namespace duckdb {
 
-class Optimizer;
-class DeliminatorPlanUpdater;
+struct DelimCandidate;
 
 //! The Deliminator optimizer traverses the logical operator tree and removes any redundant DelimGets/DelimJoins
 class Deliminator {
 public:
-	explicit Deliminator(ClientContext &context) : context(context) {
+	Deliminator() {
 	}
 	//! Perform DelimJoin elimination
 	unique_ptr<LogicalOperator> Optimize(unique_ptr<LogicalOperator> op);
 
 private:
-	//! Find Joins with a DelimGet that can be removed
-	void FindCandidates(unique_ptr<LogicalOperator> *op_ptr, vector<unique_ptr<LogicalOperator> *> &candidates);
-	//! Try to remove a Join with a DelimGet, returns true if it was successful
-	bool RemoveCandidate(unique_ptr<LogicalOperator> *plan, unique_ptr<LogicalOperator> *candidate,
-	                     DeliminatorPlanUpdater &updater);
-	//! Try to remove an inequality Join with a DelimGet, returns true if it was successful
-	bool RemoveInequalityCandidate(unique_ptr<LogicalOperator> *plan, unique_ptr<LogicalOperator> *candidate,
-	                               DeliminatorPlanUpdater &updater);
+	//! Finds DelimJoins and their corresponding DelimGets
+	void FindCandidates(unique_ptr<LogicalOperator> &op, vector<DelimCandidate> &candidates);
+	void FindJoinWithDelimGet(unique_ptr<LogicalOperator> &op, DelimCandidate &candidate);
+	//! Remove joins with a DelimGet
+	bool RemoveJoinWithDelimGet(LogicalDelimJoin &delim_join, const idx_t delim_get_count,
+	                            unique_ptr<LogicalOperator> &join, bool &all_equality_conditions);
+	bool RemoveInequalityJoinWithDelimGet(LogicalDelimJoin &delim_join, const idx_t delim_get_count,
+	                                      unique_ptr<LogicalOperator> &join,
+	                                      const vector<ReplacementBinding> &replacement_bindings);
 
 private:
-	ClientContext &context;
+	optional_ptr<LogicalOperator> root;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/filter_pushdown.hpp

@@ -19,8 +19,11 @@ class Optimizer;
 class FilterPushdown {
 public:
 	explicit FilterPushdown(Optimizer &optimizer);
+
 	//! Perform filter pushdown
 	unique_ptr<LogicalOperator> Rewrite(unique_ptr<LogicalOperator> op);
+	//! Return a reference to the client context (from the optimizer)
+	ClientContext &GetContext();
 
 	struct Filter {
 		unordered_set<idx_t> bindings;

package/src/duckdb/src/include/duckdb/optimizer/join_order/cardinality_estimator.hpp

@@ -34,7 +34,7 @@ struct RelationsToTDom {
 	bool has_tdom_hll;
 	vector<FilterInfo *> filters;
 
-	RelationsToTDom(column_binding_set_t column_binding_set)
+	RelationsToTDom(const column_binding_set_t &column_binding_set)
 	    : equivalent_relations(column_binding_set), tdom_hll(0), tdom_no_hll(NumericLimits<idx_t>::Maximum()),
 	      has_tdom_hll(false) {};
 };

package/src/duckdb/src/include/duckdb/optimizer/join_order/estimated_properties.hpp

@@ -27,7 +27,10 @@ public:
 	T GetCardinality() const {
 		throw NotImplementedException("Unsupported type for GetCardinality");
 	}
-	double GetCost() const;
+	template <class T>
+	T GetCost() const {
+		throw NotImplementedException("Unsupported type for GetCost");
+	}
 	void SetCost(double new_cost);
 	void SetCardinality(double cardinality);
 
@@ -45,4 +48,10 @@ double EstimatedProperties::GetCardinality() const;
 template <>
 idx_t EstimatedProperties::GetCardinality() const;
 
+template <>
+double EstimatedProperties::GetCost() const;
+
+template <>
+idx_t EstimatedProperties::GetCost() const;
+
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/join_order/join_order_optimizer.hpp

@@ -90,7 +90,7 @@ private:
 	//! cancelling the dynamic programming step.
 	bool TryEmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
 
-	bool EnumerateCmpRecursive(JoinRelationSet &left, JoinRelationSet &right, unordered_set<idx_t> exclusion_set);
+	bool EnumerateCmpRecursive(JoinRelationSet &left, JoinRelationSet &right, unordered_set<idx_t> &exclusion_set);
 	//! Emit a relation set node
 	bool EmitCSG(JoinRelationSet &node);
 	//! Enumerate the possible connected subgraphs that can be joined together in the join graph

package/src/duckdb/src/include/duckdb/optimizer/join_order/join_relation.hpp

@@ -53,7 +53,7 @@ public:
 	//! Create or get a JoinRelationSet from a single node with the given index
 	JoinRelationSet &GetJoinRelation(idx_t index);
 	//! Create or get a JoinRelationSet from a set of relation bindings
-	JoinRelationSet &GetJoinRelation(unordered_set<idx_t> &bindings);
+	JoinRelationSet &GetJoinRelation(const unordered_set<idx_t> &bindings);
 	//! Create or get a JoinRelationSet from a (sorted, duplicate-free!) list of relations
 	JoinRelationSet &GetJoinRelation(unsafe_unique_array<idx_t> relations, idx_t count);
 	//! Union two sets of relations together and create a new relation set

package/src/duckdb/src/include/duckdb/optimizer/join_order/query_graph.hpp

@@ -75,6 +75,9 @@ private:
 	//! Get the QueryEdge of a specific node
 	QueryEdge &GetQueryEdge(JoinRelationSet &left);
 
+	void EnumerateNeighborsDFS(JoinRelationSet &node, reference<QueryEdge> info, idx_t index,
+	                           const std::function<bool(NeighborInfo &)> &callback);
+
 	QueryEdge root;
 };
 

package/src/duckdb/src/include/duckdb/optimizer/matcher/set_matcher.hpp

@@ -23,6 +23,8 @@ public:
 		UNORDERED,
 		//! Only some entries have to be matched, the order of the matches does not matter
 		SOME,
+		//! Only some entries have to be matched. The order of the matches does matter.
+		SOME_ORDERED,
 		//! Not initialized
 		INVALID
 	};
@@ -79,6 +81,17 @@ public:
 				}
 			}
 			return true;
+		} else if (policy == Policy::SOME_ORDERED) {
+			if (entries.size() < matchers.size()) {
+				return false;
+			}
+			// now provided entries have to match in order
+			for (idx_t i = 0; i < matchers.size(); i++) {
+				if (!matchers[i]->Match(entries[i], bindings)) {
+					return false;
+				}
+			}
+			return true;
 		} else {
 			if (policy == Policy::UNORDERED && matchers.size() != entries.size()) {
 				// unordered policy, count does not match: no match

package/src/duckdb/src/include/duckdb/optimizer/optimizer.hpp

@@ -22,7 +22,10 @@ class Optimizer {
 public:
 	Optimizer(Binder &binder, ClientContext &context);
 
+	//! Optimize a plan by running specialized optimizers
 	unique_ptr<LogicalOperator> Optimize(unique_ptr<LogicalOperator> plan);
+	//! Return a reference to the client context of this optimizer
+	ClientContext &GetContext();
 
 	ClientContext &context;
 	Binder &binder;

package/src/duckdb/src/include/duckdb/optimizer/remove_duplicate_groups.hpp

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/optimizer/remove_duplicate_groups.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/planner/column_binding_map.hpp"
+#include "duckdb/planner/logical_operator_visitor.hpp"
+
+namespace duckdb {
+
+class BoundColumnRefExpression;
+
+//! The RemoveDuplicateGroups optimizer traverses the logical operator tree and removes any duplicate aggregate groups
+//! Duplicate groups may be introduced when joins columns are removed, e.g., by Deliminator or RemoveUnusedColumns
+class RemoveDuplicateGroups : public LogicalOperatorVisitor {
+public:
+	RemoveDuplicateGroups() {
+	}
+
+	void VisitOperator(LogicalOperator &op) override;
+
+private:
+	void VisitAggregate(LogicalAggregate &aggr);
+
+protected:
+	unique_ptr<Expression> VisitReplace(BoundColumnRefExpression &expr, unique_ptr<Expression> *expr_ptr) override;
+
+private:
+	//! The map of column references
+	column_binding_map_t<vector<reference<BoundColumnRefExpression>>> column_references;
+	//! Stored expressions (kept around so we don't have dangling pointers)
+	vector<unique_ptr<Expression>> stored_expressions;
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/statistics_propagator.hpp

@@ -18,6 +18,8 @@
 #include "duckdb/storage/statistics/node_statistics.hpp"
 
 namespace duckdb {
+
+class Optimizer;
 class ClientContext;
 class LogicalOperator;
 class TableFilter;
@@ -25,10 +27,14 @@ struct BoundOrderByNode;
 
 class StatisticsPropagator {
 public:
-	explicit StatisticsPropagator(ClientContext &context);
+	explicit StatisticsPropagator(Optimizer &optimizer);
 
 	unique_ptr<NodeStatistics> PropagateStatistics(unique_ptr<LogicalOperator> &node_ptr);
 
+	column_binding_map_t<unique_ptr<BaseStatistics>> GetStatisticsMap() {
+		return std::move(statistics_map);
+	}
+
 private:
 	//! Propagate statistics through an operator
 	unique_ptr<NodeStatistics> PropagateStatistics(LogicalOperator &node, unique_ptr<LogicalOperator> *node_ptr);
@@ -75,6 +81,9 @@ private:
 	//! Multiply the cardinalities together (i.e. new max cardinality is stats.max * new_stats.max): used for
 	//! joins/cross products
 	void MultiplyCardinalities(unique_ptr<NodeStatistics> &stats, NodeStatistics &new_stats);
+	//! Creates and pushes down a filter based on join statistics
+	void CreateFilterFromJoinStats(unique_ptr<LogicalOperator> &child, unique_ptr<Expression> &expr,
+	                               const BaseStatistics &stats_before, const BaseStatistics &stats_after);
 
 	unique_ptr<BaseStatistics> PropagateExpression(unique_ptr<Expression> &expr);
 	unique_ptr<BaseStatistics> PropagateExpression(Expression &expr, unique_ptr<Expression> *expr_ptr);
@@ -90,14 +99,13 @@ private:
 	unique_ptr<BaseStatistics> PropagateExpression(BoundColumnRefExpression &expr, unique_ptr<Expression> *expr_ptr);
 	unique_ptr<BaseStatistics> PropagateExpression(BoundOperatorExpression &expr, unique_ptr<Expression> *expr_ptr);
 
-	void PropagateAndCompress(unique_ptr<Expression> &expr, unique_ptr<BaseStatistics> &stats);
-
 	void ReplaceWithEmptyResult(unique_ptr<LogicalOperator> &node);
 
 	bool ExpressionIsConstant(Expression &expr, const Value &val);
 	bool ExpressionIsConstantOrNull(Expression &expr, const Value &val);
 
 private:
+	Optimizer &optimizer;
 	ClientContext &context;
 	//! The map of ColumnBinding -> statistics for the various nodes
 	column_binding_map_t<unique_ptr<BaseStatistics>> statistics_map;

package/src/duckdb/src/include/duckdb/optimizer/topn_optimizer.hpp

@@ -18,6 +18,8 @@ class TopN {
 public:
 	//! Optimize ORDER BY + LIMIT to TopN
 	unique_ptr<LogicalOperator> Optimize(unique_ptr<LogicalOperator> op);
+	//! Whether we can perform the optimization on this operator
+	static bool CanOptimize(LogicalOperator &op);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parallel/pipeline.hpp

@@ -30,6 +30,8 @@ public:
 public:
 	//! Duplicate eliminated join scan dependencies
 	reference_map_t<const PhysicalOperator, reference<Pipeline>> delim_join_dependencies;
+	//! Materialized CTE scan dependencies
+	reference_map_t<const PhysicalOperator, reference<Pipeline>> cte_dependencies;
 
 public:
 	void SetPipelineSource(Pipeline &pipeline, PhysicalOperator &op);

package/src/duckdb/src/include/duckdb/parallel/task_scheduler.hpp

@@ -67,6 +67,9 @@ public:
 	//! Send signals to n threads, signalling for them to wake up and attempt to execute a task
 	void Signal(idx_t n);
 
+	//! Set the allocator flush threshold
+	void SetAllocatorFlushTreshold(idx_t threshold);
+
 private:
 	void SetThreadsInternal(int32_t n);
 
@@ -80,6 +83,8 @@ private:
 	vector<unique_ptr<SchedulerThread>> threads;
 	//! Markers used by the various threads, if the markers are set to "false" the thread execution is stopped
 	vector<unique_ptr<atomic<bool>>> markers;
+	//! The threshold after which to flush the allocator after completing a task
+	atomic<idx_t> allocator_flush_threshold;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/common_table_expression_info.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "duckdb/parser/statement/select_statement.hpp"
+#include "duckdb/common/enums/cte_materialize.hpp"
 
 namespace duckdb {
 
@@ -17,6 +18,7 @@ class SelectStatement;
 struct CommonTableExpressionInfo {
 	vector<string> aliases;
 	unique_ptr<SelectStatement> query;
+	CTEMaterialize materialized = CTEMaterialize::CTE_MATERIALIZE_DEFAULT;
 
 	void FormatSerialize(FormatSerializer &serializer) const;
 	static unique_ptr<CommonTableExpressionInfo> FormatDeserialize(FormatDeserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/expression/between_expression.hpp

@@ -43,5 +43,8 @@ public:
 		return "(" + entry.input->ToString() + " BETWEEN " + entry.lower->ToString() + " AND " +
 		       entry.upper->ToString() + ")";
 	}
+
+private:
+	BetweenExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/cast_expression.hpp

@@ -46,5 +46,8 @@ public:
 		return (entry.try_cast ? "TRY_CAST(" : "CAST(") + entry.child->ToString() + " AS " +
 		       entry.cast_type.ToString() + ")";
 	}
+
+private:
+	CastExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/collate_expression.hpp

@@ -36,5 +36,8 @@ public:
 	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
+
+private:
+	CollateExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/columnref_expression.hpp

@@ -50,5 +50,8 @@ public:
 	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
+
+private:
+	ColumnRefExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/comparison_expression.hpp

@@ -42,5 +42,8 @@ public:
 		return StringUtil::Format("(%s %s %s)", entry.left->ToString(), ExpressionTypeToOperator(entry.type),
 		                          entry.right->ToString());
 	}
+
+private:
+	explicit ComparisonExpression(ExpressionType type);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/constant_expression.hpp

@@ -37,6 +37,9 @@ public:
 
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
+
+private:
+	ConstantExpression();
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/default_expression.hpp

@@ -31,5 +31,6 @@ public:
 	void Serialize(FieldWriter &writer) const override;
 	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
 	void FormatSerialize(FormatSerializer &serializer) const override;
+	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/function_expression.hpp

@@ -120,5 +120,8 @@ public:
 
 		return result;
 	}
+
+private:
+	FunctionExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/lambda_expression.hpp

@@ -42,6 +42,9 @@ public:
 	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
+
+private:
+	LambdaExpression();
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/positional_reference_expression.hpp

@@ -35,5 +35,8 @@ public:
 	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
 	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<ParsedExpression> FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer);
+
+private:
+	PositionalReferenceExpression();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/expression/window_expression.hpp

@@ -210,6 +210,9 @@ public:
 
 		return result;
 	}
+
+private:
+	explicit WindowExpression(ExpressionType type);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/query_node/cte_node.hpp

@@ -0,0 +1,54 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/query_node/cte_node.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+
+namespace duckdb {
+
+class CTENode : public QueryNode {
+public:
+	static constexpr const QueryNodeType TYPE = QueryNodeType::CTE_NODE;
+
+public:
+	CTENode() : QueryNode(QueryNodeType::CTE_NODE) {
+	}
+
+	string ctename;
+	//! The query of the CTE
+	unique_ptr<QueryNode> query;
+	//! Child
+	unique_ptr<QueryNode> child;
+	//! Aliases of the CTE node
+	vector<string> aliases;
+
+	const vector<unique_ptr<ParsedExpression>> &GetSelectList() const override {
+		return query->GetSelectList();
+	}
+
+public:
+	//! Convert the query node to a string
+	string ToString() const override;
+
+	bool Equals(const QueryNode *other) const override;
+	//! Create a copy of this SelectNode
+	unique_ptr<QueryNode> Copy() const override;
+
+	//! Serializes a QueryNode to a stand-alone binary blob
+	void Serialize(FieldWriter &writer) const override;
+	//! Deserializes a blob back into a QueryNode
+	static unique_ptr<QueryNode> Deserialize(FieldReader &reader);
+
+	void FormatSerialize(FormatSerializer &serializer) const override;
+	static unique_ptr<QueryNode> FormatDeserialize(FormatDeserializer &source);
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/query_node/list.hpp

@@ -1,3 +1,4 @@
 #include "duckdb/parser/query_node/recursive_cte_node.hpp"
+#include "duckdb/parser/query_node/cte_node.hpp"
 #include "duckdb/parser/query_node/select_node.hpp"
 #include "duckdb/parser/query_node/set_operation_node.hpp"

package/src/duckdb/src/include/duckdb/parser/query_node.hpp

@@ -25,7 +25,8 @@ enum class QueryNodeType : uint8_t {
 	SELECT_NODE = 1,
 	SET_OPERATION_NODE = 2,
 	BOUND_SUBQUERY_NODE = 3,
-	RECURSIVE_CTE_NODE = 4
+	RECURSIVE_CTE_NODE = 4,
+	CTE_NODE = 5
 };
 
 struct CommonTableExpressionInfo;

package/src/duckdb/src/include/duckdb/parser/tableref/emptytableref.hpp

@@ -31,6 +31,7 @@ public:
 	//! Deserializes a blob back into a DummyTableRef
 	static unique_ptr<TableRef> Deserialize(FieldReader &source);
 
+	void FormatSerialize(FormatSerializer &serializer) const override;
 	static unique_ptr<TableRef> FormatDeserialize(FormatDeserializer &source);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref/joinref.hpp

@@ -23,7 +23,7 @@ public:
 	static constexpr const TableReferenceType TYPE = TableReferenceType::JOIN;
 
 public:
-	explicit JoinRef(JoinRefType ref_type)
+	explicit JoinRef(JoinRefType ref_type = JoinRefType::REGULAR)
 	    : TableRef(TableReferenceType::JOIN), type(JoinType::INNER), ref_type(ref_type) {
 	}