Skip to content

Commit 9f78eb0

Browse files
committed
Apply tidy fixes
1 parent fa50081 commit 9f78eb0

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

src/core/plan_rewrite.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,16 +1275,16 @@ static void RewriteLeftJoinMatchCount(ClientContext &context, Binder &binder, un
12751275
// the hidden binding only to the top projection leaves LPTS with a reference to a
12761276
// column that no child CTE emits.
12771277
auto agg_bindings = agg_search->GetColumnBindings();
1278-
auto agg_types = agg_search->types;
1278+
const auto &agg_types = agg_search->types;
12791279
idx_t group_count = agg.groups.size();
12801280

12811281
ColumnBinding match_binding = agg_bindings[group_count + match_count_idx];
1282-
LogicalType match_type = agg_types[group_count + match_count_idx];
1282+
const LogicalType &match_type = agg_types[group_count + match_count_idx];
12831283
PropagateHiddenBindingThroughProjectionPath(projection_path, match_binding, match_type, openivm::MATCH_COUNT_COL);
12841284

12851285
if (is_full_outer) {
12861286
ColumnBinding right_match_binding = agg_bindings[group_count + right_match_count_idx];
1287-
LogicalType right_match_type = agg_types[group_count + right_match_count_idx];
1287+
const LogicalType &right_match_type = agg_types[group_count + right_match_count_idx];
12881288
PropagateHiddenBindingThroughProjectionPath(projection_path, right_match_binding, right_match_type,
12891289
openivm::RIGHT_MATCH_COUNT_COL);
12901290
}

src/delta/operators/delim_join.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ static void AppendMultiplicityBindingsToJoinProjectionMaps(LogicalOperator &op,
114114
if (projected_idx >= child_bindings.size()) {
115115
throw InternalException(
116116
"DeltaDelimJoin: projection map index %llu out of bounds for child %llu with %llu bindings",
117-
(unsigned long long)projected_idx, (unsigned long long)child_idx,
118-
(unsigned long long)child_bindings.size());
117+
(idx_t)projected_idx, (idx_t)child_idx, (idx_t)child_bindings.size());
119118
}
120119
}
121120
for (idx_t binding_idx = 0; binding_idx < child_bindings.size(); binding_idx++) {
@@ -270,8 +269,7 @@ static ColumnBinding FindOutputBinding(const vector<ColumnBinding> &term_binding
270269
candidates += to_string(binding.table_index) + ":" + to_string(binding.column_index);
271270
}
272271
throw InternalException("DeltaDelimJoin: original output binding %llu:%llu not found in rewritten term [%s]",
273-
(unsigned long long)target.table_index, (unsigned long long)target.column_index,
274-
candidates.c_str());
272+
(idx_t)target.table_index, (idx_t)target.column_index, candidates.c_str());
275273
}
276274

277275
static bool ReplaceDelimGets(ClientContext &context, unique_ptr<LogicalOperator> &node,

src/delta/operators/join.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ void AppendMultiplicityToAncestorProjectionMaps(unique_ptr<LogicalOperator> &ter
405405
for (size_t depth = 0; depth < leaf_path.size(); depth++) {
406406
if (leaf_path[depth] >= node->children.size()) {
407407
throw InternalException("%s: leaf path child %llu out of bounds at depth %llu", context_label,
408-
(unsigned long long)leaf_path[depth], (unsigned long long)depth);
408+
(idx_t)leaf_path[depth], (idx_t)depth);
409409
}
410410
ancestors.push_back(node);
411411
node = node->children[leaf_path[depth]].get();
@@ -425,8 +425,7 @@ void AppendMultiplicityToAncestorProjectionMaps(unique_ptr<LogicalOperator> &ter
425425
if (projected_idx >= child_bindings.size()) {
426426
throw InternalException(
427427
"%s: projection map index %llu out of bounds for child %llu with %llu bindings",
428-
context_label, (unsigned long long)projected_idx, (unsigned long long)child_side,
429-
(unsigned long long)child_bindings.size());
428+
context_label, (idx_t)projected_idx, (idx_t)child_side, (idx_t)child_bindings.size());
430429
}
431430
}
432431
idx_t mul_idx = DConstants::INVALID_INDEX;

0 commit comments

Comments
 (0)