duckdb 0.8.2-dev2700.0 → 0.8.2-dev2842.0

package/src/duckdb/src/optimizer/join_order/join_node.cpp

@@ -6,15 +6,11 @@
 
 namespace duckdb {
 
-JoinNode::JoinNode(JoinRelationSet &set, const double base_cardinality)
-    : set(set), info(nullptr), has_filter(false), left(nullptr), right(nullptr), base_cardinality(base_cardinality) {
-	estimated_props = make_uniq<EstimatedProperties>(base_cardinality, 0);
+JoinNode::JoinNode(JoinRelationSet &set) : set(set) {
 }
 
-JoinNode::JoinNode(JoinRelationSet &set, optional_ptr<NeighborInfo> info, JoinNode &left, JoinNode &right,
-                   const double base_cardinality, double cost)
-    : set(set), info(info), has_filter(false), left(&left), right(&right), base_cardinality(base_cardinality) {
-	estimated_props = make_uniq<EstimatedProperties>(base_cardinality, cost);
+JoinNode::JoinNode(JoinRelationSet &set, optional_ptr<NeighborInfo> info, JoinNode &left, JoinNode &right, double cost)
+    : set(set), info(info), left(&left), right(&right), cost(cost) {
 }
 
 unique_ptr<EstimatedProperties> EstimatedProperties::Copy() {
@@ -22,39 +18,10 @@ unique_ptr<EstimatedProperties> EstimatedProperties::Copy() {
 	return result;
 }
 
-double JoinNode::GetCost() {
-	return estimated_props->GetCost<double>();
-}
-
-void JoinNode::SetCost(double cost) {
-	estimated_props->SetCost(cost);
-}
-
-double JoinNode::GetBaseTableCardinality() {
-	if (set.count > 1) {
-		throw InvalidInputException("Cannot call get base table cardinality on intermediate join node");
-	}
-	return base_cardinality;
-}
-
-void JoinNode::SetBaseTableCardinality(double base_card) {
-	base_cardinality = base_card;
-}
-
-void JoinNode::SetEstimatedCardinality(double estimated_card) {
-	estimated_props->SetCardinality(estimated_card);
-}
-
 string JoinNode::ToString() {
 	string result = "-------------------------------\n";
 	result += set.ToString() + "\n";
-	result += "card = " + to_string(GetCardinality<double>()) + "\n";
-	bool is_cartesian = false;
-	if (left && right) {
-		is_cartesian = (GetCardinality<double>() == left->GetCardinality<double>() * right->GetCardinality<double>());
-	}
-	result += "cartesian = " + to_string(is_cartesian) + "\n";
-	result += "cost = " + to_string(estimated_props->GetCost<double>()) + "\n";
+	result += "cost = " + to_string(cost) + "\n";
 	result += "left = \n";
 	if (left) {
 		result += left->ToString();
@@ -65,4 +32,5 @@ string JoinNode::ToString() {
 	}
 	return result;
 }
+
 } // namespace duckdb