Skip to content

Commit 0b8d82b

Browse files
poyrazKgithub-actions[bot]
authored andcommitted
style: automated clang-format fixes
1 parent 69da2ab commit 0b8d82b

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

include/executor/operator.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ class HashJoinOperator : public Operator {
320320
void add_child(std::unique_ptr<Operator> child) override;
321321
};
322322

323-
324323
/**
325324
* @brief Limit operator
326325
*/

src/executor/operator.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,11 @@ bool HashJoinOperator::next(Tuple& out_tuple) {
639639
return true;
640640
}
641641

642-
/* No more matches for this left tuple. If (LEFT or FULL join) and no matches found, emit NULLs */
642+
/* No more matches for this left tuple. If (LEFT or FULL join) and no matches found,
643+
* emit NULLs */
643644
match_iter_ = std::nullopt;
644-
if ((join_type_ == JoinType::Left || join_type_ == JoinType::Full) && !left_had_match_) {
645+
if ((join_type_ == JoinType::Left || join_type_ == JoinType::Full) &&
646+
!left_had_match_) {
645647
std::vector<common::Value> joined_values = left_tuple_->values();
646648
for (size_t i = 0; i < right_schema.column_count(); ++i) {
647649
joined_values.push_back(common::Value::make_null());
@@ -696,7 +698,7 @@ bool HashJoinOperator::next(Tuple& out_tuple) {
696698
joined_values.insert(joined_values.end(), it->second.tuple.values().begin(),
697699
it->second.tuple.values().end());
698700
out_tuple = Tuple(std::move(joined_values));
699-
it->second.matched = true; /* Mark as emitted */
701+
it->second.matched = true; /* Mark as emitted */
700702
it++;
701703
return true;
702704
}

tests/cloudSQL_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,8 @@ TEST(ParserAdvanced, JoinAndComplexSelect) {
784784
/* 1. Left Join and multiple joins */
785785
{
786786
auto lexer = std::make_unique<Lexer>(
787-
"SELECT t1.id, t2.val FROM t1 LEFT JOIN t2 ON t1.id = t2.id JOIN t3 ON t2.x = t3.x WHERE "
787+
"SELECT t1.id, t2.val FROM t1 LEFT JOIN t2 ON t1.id = t2.id JOIN t3 ON t2.x = t3.x "
788+
"WHERE "
788789
"t1.id > 10");
789790
Parser parser(std::move(lexer));
790791
auto stmt = parser.parse_statement();

0 commit comments

Comments
 (0)