Skip to content

Commit

Permalink
ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lnkuiper committed Aug 13, 2024
1 parent c2dc2f9 commit 302a806
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/optimizer/build_probe_side_optimizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ double BuildProbeSideOptimizer::GetBuildSize(vector<LogicalType> types, const id

// There is also a cost of NextPowerOfTwo(count * 2) * sizeof(data_ptr_t) per tuple in the hash table
// This is a not a smooth cost function, so instead we do the average, which is ~3 * sizeof(data_ptr_t)
row_width += 3.0 * sizeof(data_ptr_t);
row_width += 3 * sizeof(data_ptr_t);

return static_cast<double>(row_width * cardinality);
}
Expand Down Expand Up @@ -144,6 +144,8 @@ void BuildProbeSideOptimizer::TryFlipJoinChildren(LogicalOperator &op) {
auto &left_side_build_cost = build_sizes.left_side;
auto &right_side_build_cost = build_sizes.right_side;

Printer::PrintF("LHS: %f, RHS: %f", left_side_build_cost, right_side_build_cost);

bool swap = false;

idx_t left_child_joins = ChildHasJoins(*op.children[0]);
Expand Down
2 changes: 2 additions & 0 deletions src/optimizer/join_order/relation_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,11 @@ bool ExpressionContainsColumnRef(Expression &expression) {
if (expression.type == ExpressionType::BOUND_COLUMN_REF) {
// Here you have a filter on a single column in a table. Return a binding for the column
// being filtered on so the filter estimator knows what HLL count to pull
#ifdef DEBUG
auto &colref = expression.Cast<BoundColumnRefExpression>();
D_ASSERT(colref.depth == 0);
D_ASSERT(colref.binding.table_index != DConstants::INVALID_INDEX);
#endif
// map the base table index to the relation index used by the JoinOrderOptimizer
return true;
}
Expand Down

0 comments on commit 302a806

Please sign in to comment.