Ran clang tidy.

substrait-io · Jan 30, 2024 · 6758f3f · 6758f3f
1 parent 0ea3c42
commit 6758f3f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 27 deletions.
diff --git a/src/substrait/textplan/SymbolTable.h b/src/substrait/textplan/SymbolTable.h
@@ -174,7 +174,9 @@ class SymbolTable {
  std::unordered_set<SymbolType> types) const;
 
  [[nodiscard]] const SymbolInfo* lookupSymbolByParentQueryAndType(
- const Location& location, int index, SymbolType type) const;
+ const Location& location,
+ int index,
+ SymbolType type) const;
 
  [[nodiscard]] const SymbolInfo& nthSymbolByType(uint32_t n, SymbolType type)
  const;

diff --git a/src/substrait/textplan/SymbolTablePrinter.h b/src/substrait/textplan/SymbolTablePrinter.h
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "SymbolTable.h"
 #include "SubstraitErrorListener.h"
+#include "SymbolTable.h"
 
 namespace substrait::proto {
 class Expression;

diff --git a/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp b/src/substrait/textplan/converter/InitialPlanProtoVisitor.cpp
@@ -149,20 +149,16 @@ std::any InitialPlanProtoVisitor::visitExpression(
  const ::substrait::proto::Rel* subqueryRelation;
  switch (expression.subquery().subquery_type_case()) {
  case ::substrait::proto::Expression_Subquery::kScalar:
- subqueryRelation =
- &expression.subquery().scalar().input();
+ subqueryRelation = &expression.subquery().scalar().input();
  break;
  case ::substrait::proto::Expression_Subquery::kInPredicate:
- subqueryRelation =
- &expression.subquery().in_predicate().haystack();
+ subqueryRelation = &expression.subquery().in_predicate().haystack();
  break;
  case ::substrait::proto::Expression_Subquery::kSetPredicate:
- subqueryRelation =
- &expression.subquery().set_predicate().tuples();
+ subqueryRelation = &expression.subquery().set_predicate().tuples();
  break;
  case ::substrait::proto::Expression_Subquery::kSetComparison:
- subqueryRelation =
- &expression.subquery().set_comparison().right();
+ subqueryRelation = &expression.subquery().set_comparison().right();
  break;
  case ::substrait::proto::Expression_Subquery::SUBQUERY_TYPE_NOT_SET:
  errorListener_->addError("Subquery type not set.");

diff --git a/src/substrait/textplan/converter/PipelineVisitor.cpp b/src/substrait/textplan/converter/PipelineVisitor.cpp
@@ -18,20 +18,16 @@ std::any PipelineVisitor::visitExpression(
  const ::substrait::proto::Rel* subqueryRelation;
  switch (expression.subquery().subquery_type_case()) {
  case ::substrait::proto::Expression_Subquery::kScalar:
- subqueryRelation =
- &expression.subquery().scalar().input();
+ subqueryRelation = &expression.subquery().scalar().input();
  break;
  case ::substrait::proto::Expression_Subquery::kInPredicate:
- subqueryRelation =
- &expression.subquery().in_predicate().haystack();
+ subqueryRelation = &expression.subquery().in_predicate().haystack();
  break;
  case ::substrait::proto::Expression_Subquery::kSetPredicate:
- subqueryRelation =
- &expression.subquery().set_predicate().tuples();
+ subqueryRelation = &expression.subquery().set_predicate().tuples();
  break;
  case ::substrait::proto::Expression_Subquery::kSetComparison:
- subqueryRelation =
- &expression.subquery().set_comparison().right();
+ subqueryRelation = &expression.subquery().set_comparison().right();
  break;
  case ::substrait::proto::Expression_Subquery::SUBQUERY_TYPE_NOT_SET:
  // No need to raise as this would have been exposed earlier.
@@ -44,7 +40,8 @@ std::any PipelineVisitor::visitExpression(
 
  auto subquerySymbol = symbolTable_->lookupSymbolByLocationAndType(
  PROTO_LOCATION(*subqueryRelation), SymbolType::kRelation);
- auto currentRelationData = ANY_CAST(std::shared_ptr<RelationData>, currentRelationScope_->blob);
+ auto currentRelationData =
+ ANY_CAST(std::shared_ptr<RelationData>, currentRelationScope_->blob);
  currentRelationData->subQueryPipelines.push_back(subquerySymbol);
 
  // Populate the start of the pipeline for easy later access.

diff --git a/src/substrait/textplan/converter/PipelineVisitor.h b/src/substrait/textplan/converter/PipelineVisitor.h
@@ -20,7 +20,7 @@ class PipelineVisitor : public BasePlanProtoVisitor {
 
  private:
  std::any visitExpression(
- const ::substrait::proto::Expression& expression) override;
+  const ::substrait::proto::Expression& expression) override;
 
  std::any visitRelation(const ::substrait::proto::Rel& relation) override;
 

diff --git a/src/substrait/textplan/converter/Tool.cpp b/src/substrait/textplan/converter/Tool.cpp
@@ -23,8 +23,8 @@ void convertPlanToText(const char* filename) {
 
  auto result = parseBinaryPlan(*planOrError);
  SubstraitErrorListener errorListener;
- auto textResult = SymbolTablePrinter::outputToText(result.getSymbolTable(),
-   &errorListener);
+ auto textResult =
+ SymbolTablePrinter::outputToText(result.getSymbolTable(), &errorListener);
  result.addErrors(errorListener.getErrorMessages());
  auto errors = result.getAllErrors();
  if (!errors.empty()) {

diff --git a/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanVisitor.cpp
@@ -314,8 +314,7 @@ std::any SubstraitPlanVisitor::visitRelation_type(
  {"aggregate", RelationType::kAggregate},
  {"sort", RelationType::kSort},
  {"filter", RelationType::kFilter},
- {"set", RelationType::kSet}
- };
+ {"set", RelationType::kSet}};
  auto it = relationTypeMap.find(id);
  if (it != relationTypeMap.end()) {
  return it->second;

diff --git a/src/substrait/textplan/tests/RoundtripTest.cpp b/src/substrait/textplan/tests/RoundtripTest.cpp
@@ -82,9 +82,8 @@ TEST_P(RoundTripBinaryToTextFixture, RoundTrip) {
  auto textSymbols = textResult.getSymbolTable().getSymbols();
 
  SubstraitErrorListener errorListener;
- std::string outputText =
- SymbolTablePrinter::outputToText(textResult.getSymbolTable(),
- &errorListener);
+ std::string outputText = SymbolTablePrinter::outputToText(
+ textResult.getSymbolTable(), &errorListener);
  textResult.addErrors(errorListener.getErrorMessages());
 
  ASSERT_THAT(textResult, ParsesOk())