duckdb 0.8.1-dev0.0 → 0.8.1-dev125.0

package/src/duckdb/src/optimizer/statistics/operator/propagate_get.cpp

@@ -14,14 +14,14 @@ void StatisticsPropagator::UpdateFilterStatistics(BaseStatistics &input, TableFi
 	// FIXME: update stats...
 	switch (filter.filter_type) {
 	case TableFilterType::CONJUNCTION_AND: {
-		auto &conjunction_and = (ConjunctionAndFilter &)filter;
+		auto &conjunction_and = filter.Cast<ConjunctionAndFilter>();
 		for (auto &child_filter : conjunction_and.child_filters) {
 			UpdateFilterStatistics(input, *child_filter);
 		}
 		break;
 	}
 	case TableFilterType::CONSTANT_COMPARISON: {
-		auto &constant_filter = (ConstantFilter &)filter;
+		auto &constant_filter = filter.Cast<ConstantFilter>();
 		UpdateFilterStatistics(input, constant_filter.comparison_type, constant_filter.constant);
 		break;
 	}

package/src/duckdb/src/parallel/executor.cpp

@@ -562,7 +562,7 @@ bool Executor::HasResultCollector() {
 
 unique_ptr<QueryResult> Executor::GetResult() {
 	D_ASSERT(HasResultCollector());
-	auto &result_collector = (PhysicalResultCollector &)*physical_plan;
+	auto &result_collector = physical_plan->Cast<PhysicalResultCollector>();
 	D_ASSERT(result_collector.sink_state);
 	return result_collector.GetResult(*result_collector.sink_state);
 }

package/src/duckdb/src/parser/base_expression.cpp

@@ -18,11 +18,8 @@ string BaseExpression::GetName() const {
 	return !alias.empty() ? alias : ToString();
 }
 
-bool BaseExpression::Equals(const BaseExpression *other) const {
-	if (!other) {
-		return false;
-	}
-	if (this->expression_class != other->expression_class || this->type != other->type) {
+bool BaseExpression::Equals(const BaseExpression &other) const {
+	if (expression_class != other.expression_class || type != other.type) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/between_expression.cpp

@@ -15,14 +15,14 @@ string BetweenExpression::ToString() const {
 	return ToString<BetweenExpression, ParsedExpression>(*this);
 }
 
-bool BetweenExpression::Equal(const BetweenExpression *a, const BetweenExpression *b) {
-	if (!a->input->Equals(b->input.get())) {
+bool BetweenExpression::Equal(const BetweenExpression &a, const BetweenExpression &b) {
+	if (!a.input->Equals(*b.input)) {
 		return false;
 	}
-	if (!a->lower->Equals(b->lower.get())) {
+	if (!a.lower->Equals(*b.lower)) {
 		return false;
 	}
-	if (!a->upper->Equals(b->upper.get())) {
+	if (!a.upper->Equals(*b.upper)) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/case_expression.cpp

@@ -27,19 +27,19 @@ string CaseExpression::ToString() const {
 	return ToString<CaseExpression, ParsedExpression>(*this);
 }
 
-bool CaseExpression::Equal(const CaseExpression *a, const CaseExpression *b) {
-	if (a->case_checks.size() != b->case_checks.size()) {
+bool CaseExpression::Equal(const CaseExpression &a, const CaseExpression &b) {
+	if (a.case_checks.size() != b.case_checks.size()) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->case_checks.size(); i++) {
-		if (!a->case_checks[i].when_expr->Equals(b->case_checks[i].when_expr.get())) {
+	for (idx_t i = 0; i < a.case_checks.size(); i++) {
+		if (!a.case_checks[i].when_expr->Equals(*b.case_checks[i].when_expr)) {
 			return false;
 		}
-		if (!a->case_checks[i].then_expr->Equals(b->case_checks[i].then_expr.get())) {
+		if (!a.case_checks[i].then_expr->Equals(*b.case_checks[i].then_expr)) {
 			return false;
 		}
 	}
-	if (!a->else_expr->Equals(b->else_expr.get())) {
+	if (!a.else_expr->Equals(*b.else_expr)) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/cast_expression.cpp

@@ -19,14 +19,14 @@ string CastExpression::ToString() const {
 	return ToString<CastExpression, ParsedExpression>(*this);
 }
 
-bool CastExpression::Equal(const CastExpression *a, const CastExpression *b) {
-	if (!a->child->Equals(b->child.get())) {
+bool CastExpression::Equal(const CastExpression &a, const CastExpression &b) {
+	if (!a.child->Equals(*b.child)) {
 		return false;
 	}
-	if (a->cast_type != b->cast_type) {
+	if (a.cast_type != b.cast_type) {
 		return false;
 	}
-	if (a->try_cast != b->try_cast) {
+	if (a.try_cast != b.try_cast) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/collate_expression.cpp

@@ -18,11 +18,11 @@ string CollateExpression::ToString() const {
 	return StringUtil::Format("%s COLLATE %s", child->ToString(), SQLIdentifier(collation));
 }
 
-bool CollateExpression::Equal(const CollateExpression *a, const CollateExpression *b) {
-	if (!a->child->Equals(b->child.get())) {
+bool CollateExpression::Equal(const CollateExpression &a, const CollateExpression &b) {
+	if (!a.child->Equals(*b.child)) {
 		return false;
 	}
-	if (a->collation != b->collation) {
+	if (a.collation != b.collation) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/columnref_expression.cpp

@@ -64,12 +64,12 @@ string ColumnRefExpression::ToString() const {
 	return result;
 }
 
-bool ColumnRefExpression::Equal(const ColumnRefExpression *a, const ColumnRefExpression *b) {
-	if (a->column_names.size() != b->column_names.size()) {
+bool ColumnRefExpression::Equal(const ColumnRefExpression &a, const ColumnRefExpression &b) {
+	if (a.column_names.size() != b.column_names.size()) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->column_names.size(); i++) {
-		if (!StringUtil::CIEquals(a->column_names[i], b->column_names[i])) {
+	for (idx_t i = 0; i < a.column_names.size(); i++) {
+		if (!StringUtil::CIEquals(a.column_names[i], b.column_names[i])) {
 			return false;
 		}
 	}

package/src/duckdb/src/parser/expression/comparison_expression.cpp

@@ -18,11 +18,11 @@ string ComparisonExpression::ToString() const {
 	return ToString<ComparisonExpression, ParsedExpression>(*this);
 }
 
-bool ComparisonExpression::Equal(const ComparisonExpression *a, const ComparisonExpression *b) {
-	if (!a->left->Equals(b->left.get())) {
+bool ComparisonExpression::Equal(const ComparisonExpression &a, const ComparisonExpression &b) {
+	if (!a.left->Equals(*b.left)) {
 		return false;
 	}
-	if (!a->right->Equals(b->right.get())) {
+	if (!a.right->Equals(*b.right)) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/conjunction_expression.cpp

@@ -42,8 +42,8 @@ string ConjunctionExpression::ToString() const {
 	return ToString<ConjunctionExpression, ParsedExpression>(*this);
 }
 
-bool ConjunctionExpression::Equal(const ConjunctionExpression *a, const ConjunctionExpression *b) {
-	return ExpressionUtil::SetEquals(a->children, b->children);
+bool ConjunctionExpression::Equal(const ConjunctionExpression &a, const ConjunctionExpression &b) {
+	return ExpressionUtil::SetEquals(a.children, b.children);
 }
 
 unique_ptr<ParsedExpression> ConjunctionExpression::Copy() const {

package/src/duckdb/src/parser/expression/constant_expression.cpp

@@ -18,8 +18,8 @@ string ConstantExpression::ToString() const {
 	return value.ToSQLString();
 }
 
-bool ConstantExpression::Equal(const ConstantExpression *a, const ConstantExpression *b) {
-	return a->value.type() == b->value.type() && !ValueOperations::DistinctFrom(a->value, b->value);
+bool ConstantExpression::Equal(const ConstantExpression &a, const ConstantExpression &b) {
+	return a.value.type() == b.value.type() && !ValueOperations::DistinctFrom(a.value, b.value);
 }
 
 hash_t ConstantExpression::Hash() const {

package/src/duckdb/src/parser/expression/function_expression.cpp

@@ -37,26 +37,26 @@ string FunctionExpression::ToString() const {
 	                                                      filter.get(), order_bys.get(), export_state, true);
 }
 
-bool FunctionExpression::Equal(const FunctionExpression *a, const FunctionExpression *b) {
-	if (a->catalog != b->catalog || a->schema != b->schema || a->function_name != b->function_name ||
-	    b->distinct != a->distinct) {
+bool FunctionExpression::Equal(const FunctionExpression &a, const FunctionExpression &b) {
+	if (a.catalog != b.catalog || a.schema != b.schema || a.function_name != b.function_name ||
+	    b.distinct != a.distinct) {
 		return false;
 	}
-	if (b->children.size() != a->children.size()) {
+	if (b.children.size() != a.children.size()) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->children.size(); i++) {
-		if (!a->children[i]->Equals(b->children[i].get())) {
+	for (idx_t i = 0; i < a.children.size(); i++) {
+		if (!a.children[i]->Equals(*b.children[i])) {
 			return false;
 		}
 	}
-	if (!BaseExpression::Equals(a->filter.get(), b->filter.get())) {
+	if (!ParsedExpression::Equals(a.filter, b.filter)) {
 		return false;
 	}
-	if (!a->order_bys->Equals(b->order_bys.get())) {
+	if (!OrderModifier::Equals(a.order_bys, b.order_bys)) {
 		return false;
 	}
-	if (a->export_state != b->export_state) {
+	if (a.export_state != b.export_state) {
 		return false;
 	}
 	return true;
@@ -81,11 +81,7 @@ unique_ptr<ParsedExpression> FunctionExpression::Copy() const {
 	if (filter) {
 		filter_copy = filter->Copy();
 	}
-	unique_ptr<OrderModifier> order_copy;
-	if (order_bys) {
-		order_copy.reset(static_cast<OrderModifier *>(order_bys->Copy().release()));
-	}
-
+	auto order_copy = order_bys ? unique_ptr_cast<ResultModifier, OrderModifier>(order_bys->Copy()) : nullptr;
 	auto copy =
 	    make_uniq<FunctionExpression>(catalog, schema, function_name, std::move(copy_children), std::move(filter_copy),
 	                                  std::move(order_copy), distinct, is_operator, export_state);

package/src/duckdb/src/parser/expression/lambda_expression.cpp

@@ -16,8 +16,8 @@ string LambdaExpression::ToString() const {
 	return lhs->ToString() + " -> " + expr->ToString();
 }
 
-bool LambdaExpression::Equal(const LambdaExpression *a, const LambdaExpression *b) {
-	return a->lhs->Equals(b->lhs.get()) && a->expr->Equals(b->expr.get());
+bool LambdaExpression::Equal(const LambdaExpression &a, const LambdaExpression &b) {
+	return a.lhs->Equals(*b.lhs) && a.expr->Equals(*b.expr);
 }
 
 hash_t LambdaExpression::Hash() const {

package/src/duckdb/src/parser/expression/operator_expression.cpp

@@ -27,12 +27,12 @@ string OperatorExpression::ToString() const {
 	return ToString<OperatorExpression, ParsedExpression>(*this);
 }
 
-bool OperatorExpression::Equal(const OperatorExpression *a, const OperatorExpression *b) {
-	if (a->children.size() != b->children.size()) {
+bool OperatorExpression::Equal(const OperatorExpression &a, const OperatorExpression &b) {
+	if (a.children.size() != b.children.size()) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->children.size(); i++) {
-		if (!a->children[i]->Equals(b->children[i].get())) {
+	for (idx_t i = 0; i < a.children.size(); i++) {
+		if (!a.children[i]->Equals(*b.children[i])) {
 			return false;
 		}
 	}

package/src/duckdb/src/parser/expression/parameter_expression.cpp

@@ -25,8 +25,8 @@ unique_ptr<ParsedExpression> ParameterExpression::Copy() const {
 	return std::move(copy);
 }
 
-bool ParameterExpression::Equal(const ParameterExpression *a, const ParameterExpression *b) {
-	return a->parameter_nr == b->parameter_nr;
+bool ParameterExpression::Equal(const ParameterExpression &a, const ParameterExpression &b) {
+	return a.parameter_nr == b.parameter_nr;
 }
 
 hash_t ParameterExpression::Hash() const {

package/src/duckdb/src/parser/expression/positional_reference_expression.cpp

@@ -18,9 +18,9 @@ string PositionalReferenceExpression::ToString() const {
 	return "#" + to_string(index);
 }
 
-bool PositionalReferenceExpression::Equal(const PositionalReferenceExpression *a,
-                                          const PositionalReferenceExpression *b) {
-	return a->index == b->index;
+bool PositionalReferenceExpression::Equal(const PositionalReferenceExpression &a,
+                                          const PositionalReferenceExpression &b) {
+	return a.index == b.index;
 }
 
 unique_ptr<ParsedExpression> PositionalReferenceExpression::Copy() const {

package/src/duckdb/src/parser/expression/star_expression.cpp

@@ -54,26 +54,26 @@ string StarExpression::ToString() const {
 	return result;
 }
 
-bool StarExpression::Equal(const StarExpression *a, const StarExpression *b) {
-	if (a->relation_name != b->relation_name || a->exclude_list != b->exclude_list) {
+bool StarExpression::Equal(const StarExpression &a, const StarExpression &b) {
+	if (a.relation_name != b.relation_name || a.exclude_list != b.exclude_list) {
 		return false;
 	}
-	if (a->columns != b->columns) {
+	if (a.columns != b.columns) {
 		return false;
 	}
-	if (a->replace_list.size() != b->replace_list.size()) {
+	if (a.replace_list.size() != b.replace_list.size()) {
 		return false;
 	}
-	for (auto &entry : a->replace_list) {
-		auto other_entry = b->replace_list.find(entry.first);
-		if (other_entry == b->replace_list.end()) {
+	for (auto &entry : a.replace_list) {
+		auto other_entry = b.replace_list.find(entry.first);
+		if (other_entry == b.replace_list.end()) {
 			return false;
 		}
-		if (!entry.second->Equals(other_entry->second.get())) {
+		if (!entry.second->Equals(*other_entry->second)) {
 			return false;
 		}
 	}
-	if (!BaseExpression::Equals(a->expr.get(), b->expr.get())) {
+	if (!ParsedExpression::Equals(a.expr, b.expr)) {
 		return false;
 	}
 	return true;

package/src/duckdb/src/parser/expression/subquery_expression.cpp

@@ -28,15 +28,15 @@ string SubqueryExpression::ToString() const {
 	}
 }
 
-bool SubqueryExpression::Equal(const SubqueryExpression *a, const SubqueryExpression *b) {
-	if (!a->subquery || !b->subquery) {
+bool SubqueryExpression::Equal(const SubqueryExpression &a, const SubqueryExpression &b) {
+	if (!a.subquery || !b.subquery) {
 		return false;
 	}
-	if (!BaseExpression::Equals(a->child.get(), b->child.get())) {
+	if (!ParsedExpression::Equals(a.child, b.child)) {
 		return false;
 	}
-	return a->comparison_type == b->comparison_type && a->subquery_type == b->subquery_type &&
-	       a->subquery->Equals(b->subquery.get());
+	return a.comparison_type == b.comparison_type && a.subquery_type == b.subquery_type &&
+	       a.subquery->Equals(*b.subquery);
 }
 
 unique_ptr<ParsedExpression> SubqueryExpression::Copy() const {

package/src/duckdb/src/parser/expression/window_expression.cpp

@@ -63,53 +63,42 @@ string WindowExpression::ToString() const {
 	return ToString<WindowExpression, ParsedExpression, OrderByNode>(*this, schema, function_name);
 }
 
-bool WindowExpression::Equal(const WindowExpression *a, const WindowExpression *b) {
+bool WindowExpression::Equal(const WindowExpression &a, const WindowExpression &b) {
 	// check if the child expressions are equivalent
-	if (b->children.size() != a->children.size()) {
+	if (a.ignore_nulls != b.ignore_nulls) {
 		return false;
 	}
-	if (a->ignore_nulls != b->ignore_nulls) {
+	if (!ParsedExpression::ListEquals(a.children, b.children)) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->children.size(); i++) {
-		if (!a->children[i]->Equals(b->children[i].get())) {
-			return false;
-		}
-	}
-	if (a->start != b->start || a->end != b->end) {
+	if (a.start != b.start || a.end != b.end) {
 		return false;
 	}
 	// check if the framing expressions are equivalentbind_
-	if (!BaseExpression::Equals(a->start_expr.get(), b->start_expr.get()) ||
-	    !BaseExpression::Equals(a->end_expr.get(), b->end_expr.get()) ||
-	    !BaseExpression::Equals(a->offset_expr.get(), b->offset_expr.get()) ||
-	    !BaseExpression::Equals(a->default_expr.get(), b->default_expr.get())) {
+	if (!ParsedExpression::Equals(a.start_expr, b.start_expr) || !ParsedExpression::Equals(a.end_expr, b.end_expr) ||
+	    !ParsedExpression::Equals(a.offset_expr, b.offset_expr) ||
+	    !ParsedExpression::Equals(a.default_expr, b.default_expr)) {
 		return false;
 	}
 
 	// check if the partitions are equivalent
-	if (a->partitions.size() != b->partitions.size()) {
+	if (!ParsedExpression::ListEquals(a.partitions, b.partitions)) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->partitions.size(); i++) {
-		if (!a->partitions[i]->Equals(b->partitions[i].get())) {
-			return false;
-		}
-	}
 	// check if the orderings are equivalent
-	if (a->orders.size() != b->orders.size()) {
+	if (a.orders.size() != b.orders.size()) {
 		return false;
 	}
-	for (idx_t i = 0; i < a->orders.size(); i++) {
-		if (a->orders[i].type != b->orders[i].type) {
+	for (idx_t i = 0; i < a.orders.size(); i++) {
+		if (a.orders[i].type != b.orders[i].type) {
 			return false;
 		}
-		if (!a->orders[i].expression->Equals(b->orders[i].expression.get())) {
+		if (!a.orders[i].expression->Equals(*b.orders[i].expression)) {
 			return false;
 		}
 	}
 	// check if the filter clauses are equivalent
-	if (!BaseExpression::Equals(a->filter_expr.get(), b->filter_expr.get())) {
+	if (!ParsedExpression::Equals(a.filter_expr, b.filter_expr)) {
 		return false;
 	}
 

package/src/duckdb/src/parser/parsed_expression.cpp

@@ -7,6 +7,7 @@
 #include "duckdb/parser/parsed_expression_iterator.hpp"
 #include "duckdb/common/serializer/format_serializer.hpp"
 #include "duckdb/common/serializer/format_deserializer.hpp"
+#include "duckdb/parser/expression_util.hpp"
 
 namespace duckdb {
 
@@ -48,46 +49,46 @@ bool ParsedExpression::HasSubquery() const {
 	return has_subquery;
 }
 
-bool ParsedExpression::Equals(const BaseExpression *other) const {
+bool ParsedExpression::Equals(const BaseExpression &other) const {
 	if (!BaseExpression::Equals(other)) {
 		return false;
 	}
 	switch (expression_class) {
 	case ExpressionClass::BETWEEN:
-		return BetweenExpression::Equal((BetweenExpression *)this, (BetweenExpression *)other);
+		return BetweenExpression::Equal(Cast<BetweenExpression>(), other.Cast<BetweenExpression>());
 	case ExpressionClass::CASE:
-		return CaseExpression::Equal((CaseExpression *)this, (CaseExpression *)other);
+		return CaseExpression::Equal(Cast<CaseExpression>(), other.Cast<CaseExpression>());
 	case ExpressionClass::CAST:
-		return CastExpression::Equal((CastExpression *)this, (CastExpression *)other);
+		return CastExpression::Equal(Cast<CastExpression>(), other.Cast<CastExpression>());
 	case ExpressionClass::COLLATE:
-		return CollateExpression::Equal((CollateExpression *)this, (CollateExpression *)other);
+		return CollateExpression::Equal(Cast<CollateExpression>(), other.Cast<CollateExpression>());
 	case ExpressionClass::COLUMN_REF:
-		return ColumnRefExpression::Equal((ColumnRefExpression *)this, (ColumnRefExpression *)other);
+		return ColumnRefExpression::Equal(Cast<ColumnRefExpression>(), other.Cast<ColumnRefExpression>());
 	case ExpressionClass::COMPARISON:
-		return ComparisonExpression::Equal((ComparisonExpression *)this, (ComparisonExpression *)other);
+		return ComparisonExpression::Equal(Cast<ComparisonExpression>(), other.Cast<ComparisonExpression>());
 	case ExpressionClass::CONJUNCTION:
-		return ConjunctionExpression::Equal((ConjunctionExpression *)this, (ConjunctionExpression *)other);
+		return ConjunctionExpression::Equal(Cast<ConjunctionExpression>(), other.Cast<ConjunctionExpression>());
 	case ExpressionClass::CONSTANT:
-		return ConstantExpression::Equal((ConstantExpression *)this, (ConstantExpression *)other);
+		return ConstantExpression::Equal(Cast<ConstantExpression>(), other.Cast<ConstantExpression>());
 	case ExpressionClass::DEFAULT:
 		return true;
 	case ExpressionClass::FUNCTION:
-		return FunctionExpression::Equal((FunctionExpression *)this, (FunctionExpression *)other);
+		return FunctionExpression::Equal(Cast<FunctionExpression>(), other.Cast<FunctionExpression>());
 	case ExpressionClass::LAMBDA:
-		return LambdaExpression::Equal((LambdaExpression *)this, (LambdaExpression *)other);
+		return LambdaExpression::Equal(Cast<LambdaExpression>(), other.Cast<LambdaExpression>());
 	case ExpressionClass::OPERATOR:
-		return OperatorExpression::Equal((OperatorExpression *)this, (OperatorExpression *)other);
+		return OperatorExpression::Equal(Cast<OperatorExpression>(), other.Cast<OperatorExpression>());
 	case ExpressionClass::PARAMETER:
-		return ParameterExpression::Equal((ParameterExpression *)this, (ParameterExpression *)other);
+		return ParameterExpression::Equal(Cast<ParameterExpression>(), other.Cast<ParameterExpression>());
 	case ExpressionClass::POSITIONAL_REFERENCE:
-		return PositionalReferenceExpression::Equal((PositionalReferenceExpression *)this,
-		                                            (PositionalReferenceExpression *)other);
+		return PositionalReferenceExpression::Equal(Cast<PositionalReferenceExpression>(),
+		                                            other.Cast<PositionalReferenceExpression>());
 	case ExpressionClass::STAR:
-		return StarExpression::Equal((StarExpression *)this, (StarExpression *)other);
+		return StarExpression::Equal(Cast<StarExpression>(), other.Cast<StarExpression>());
 	case ExpressionClass::SUBQUERY:
-		return SubqueryExpression::Equal((SubqueryExpression *)this, (SubqueryExpression *)other);
+		return SubqueryExpression::Equal(Cast<SubqueryExpression>(), other.Cast<SubqueryExpression>());
 	case ExpressionClass::WINDOW:
-		return WindowExpression::Equal((WindowExpression *)this, (WindowExpression *)other);
+		return WindowExpression::Equal(Cast<WindowExpression>(), other.Cast<WindowExpression>());
 	default:
 		throw SerializationException("Unsupported type for expression comparison!");
 	}
@@ -246,4 +247,19 @@ unique_ptr<ParsedExpression> ParsedExpression::Deserialize(Deserializer &source)
 	return result;
 }
 
+bool ParsedExpression::Equals(const unique_ptr<ParsedExpression> &left, const unique_ptr<ParsedExpression> &right) {
+	if (left.get() == right.get()) {
+		return true;
+	}
+	if (!left || !right) {
+		return false;
+	}
+	return left->Equals(*right);
+}
+
+bool ParsedExpression::ListEquals(const vector<unique_ptr<ParsedExpression>> &left,
+                                  const vector<unique_ptr<ParsedExpression>> &right) {
+	return ExpressionUtil::ListEquals(left, right);
+}
+
 } // namespace duckdb

package/src/duckdb/src/parser/parsed_expression_iterator.cpp

@@ -158,7 +158,7 @@ void ParsedExpressionIterator::EnumerateQueryNodeModifiers(
 	for (auto &modifier : node.modifiers) {
 		switch (modifier->type) {
 		case ResultModifierType::LIMIT_MODIFIER: {
-			auto &limit_modifier = (LimitModifier &)*modifier;
+			auto &limit_modifier = modifier->Cast<LimitModifier>();
 			if (limit_modifier.limit) {
 				callback(limit_modifier.limit);
 			}
@@ -168,7 +168,7 @@ void ParsedExpressionIterator::EnumerateQueryNodeModifiers(
 		} break;
 
 		case ResultModifierType::LIMIT_PERCENT_MODIFIER: {
-			auto &limit_modifier = (LimitPercentModifier &)*modifier;
+			auto &limit_modifier = modifier->Cast<LimitPercentModifier>();
 			if (limit_modifier.limit) {
 				callback(limit_modifier.limit);
 			}
@@ -178,14 +178,14 @@ void ParsedExpressionIterator::EnumerateQueryNodeModifiers(
 		} break;
 
 		case ResultModifierType::ORDER_MODIFIER: {
-			auto &order_modifier = (OrderModifier &)*modifier;
+			auto &order_modifier = modifier->Cast<OrderModifier>();
 			for (auto &order : order_modifier.orders) {
 				callback(order.expression);
 			}
 		} break;
 
 		case ResultModifierType::DISTINCT_MODIFIER: {
-			auto &distinct_modifier = (DistinctModifier &)*modifier;
+			auto &distinct_modifier = modifier->Cast<DistinctModifier>();
 			for (auto &target : distinct_modifier.distinct_on_targets) {
 				callback(target);
 			}

package/src/duckdb/src/parser/parser.cpp

@@ -51,7 +51,7 @@ static bool StripUnicodeSpaces(const string &query_str, string &new_query) {
 	idx_t pos = 0;
 	unsigned char quote;
 	vector<UnicodeSpace> unicode_spaces;
-	auto query = (unsigned char *)query_str.c_str();
+	auto query = const_uchar_ptr_cast(query_str.c_str());
 	auto qsize = query_str.size();
 
 regular:
@@ -288,7 +288,7 @@ vector<OrderByNode> Parser::ParseOrderList(const string &select_list, ParserOpti
 	    select_node.modifiers.size() != 1) {
 		throw ParserException("Expected a single ORDER clause");
 	}
-	auto &order = (OrderModifier &)*select_node.modifiers[0];
+	auto &order = select_node.modifiers[0]->Cast<OrderModifier>();
 	return std::move(order.orders);
 }
 
@@ -341,7 +341,7 @@ ColumnList Parser::ParseColumnList(const string &column_list, ParserOptions opti
 	if (create.info->type != CatalogType::TABLE_ENTRY) {
 		throw InternalException("Expected a single CREATE TABLE statement");
 	}
-	auto &info = ((CreateTableInfo &)*create.info);
+	auto &info = create.info->Cast<CreateTableInfo>();
 	return std::move(info.columns);
 }
 

package/src/duckdb/src/parser/query_node/select_node.cpp

@@ -19,7 +19,7 @@ string SelectNode::ToString() const {
 	// search for a distinct modifier
 	for (idx_t modifier_idx = 0; modifier_idx < modifiers.size(); modifier_idx++) {
 		if (modifiers[modifier_idx]->type == ResultModifierType::DISTINCT_MODIFIER) {
-			auto &distinct_modifier = (DistinctModifier &)*modifiers[modifier_idx];
+			auto &distinct_modifier = modifiers[modifier_idx]->Cast<DistinctModifier>();
 			result += "DISTINCT ";
 			if (!distinct_modifier.distinct_on_targets.empty()) {
 				result += "ON (";
@@ -120,22 +120,15 @@ bool SelectNode::Equals(const QueryNode *other_p) const {
 		return false;
 	}
 	// FROM
-	if (from_table) {
-		// we have a FROM clause, compare to the other one
-		if (!from_table->Equals(other.from_table.get())) {
-			return false;
-		}
-	} else if (other.from_table) {
-		// we don't have a FROM clause, if the other statement has one they are
-		// not equal
+	if (!TableRef::Equals(from_table, other.from_table)) {
 		return false;
 	}
 	// WHERE
-	if (!BaseExpression::Equals(where_clause.get(), other.where_clause.get())) {
+	if (!ParsedExpression::Equals(where_clause, other.where_clause)) {
 		return false;
 	}
 	// GROUP BY
-	if (!ExpressionUtil::ListEquals(groups.group_expressions, other.groups.group_expressions)) {
+	if (!ParsedExpression::ListEquals(groups.group_expressions, other.groups.group_expressions)) {
 		return false;
 	}
 	if (groups.grouping_sets != other.groups.grouping_sets) {
@@ -145,11 +138,11 @@ bool SelectNode::Equals(const QueryNode *other_p) const {
 		return false;
 	}
 	// HAVING
-	if (!BaseExpression::Equals(having.get(), other.having.get())) {
+	if (!ParsedExpression::Equals(having, other.having)) {
 		return false;
 	}
 	// QUALIFY
-	if (!BaseExpression::Equals(qualify.get(), other.qualify.get())) {
+	if (!ParsedExpression::Equals(qualify, other.qualify)) {
 		return false;
 	}
 	return true;