.

edgedelta · Apr 2, 2024 · c6694b7 · c6694b7
1 parent ff692d1
commit c6694b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
@@ -184,6 +184,8 @@ class ColumnFunction final : public COWHelper<IColumn, ColumnFunction>
 
  bool isShortCircuitArgument() const { return is_short_circuit_argument; }
 
+ const ColumnsWithTypeAndName & getColumnsToCapture() { return &columns_to_capture; }
+
 private:
  size_t size_;
  FunctionBasePtr function;

diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
@@ -366,10 +366,10 @@ int checkShortCircuitArguments(const ColumnsWithTypeAndName & arguments)
 
  DB::ColumnFunction *f = checkAndGetShortCircuitArgument(arguments[i].column);
 
- for (size_t j = 0; j < f->columns_to_capture.size(); j++) {
- LOG_INFO(&Poco::Logger::get("checkShortCircuitArguments"), "Checking short-circuit function argument index: {}, column name: {}, family name: {}, data type: {}", j, f->columns_to_capture[j].column->getName(), f->columns_to_capture[j].column->getFamilyName(), f->columns_to_capture[j].column->getDataType());
- if (f->columns_to_capture[i].column->getName() == "ColumnLowCardinality") {
- LOG_INFO(&Poco::Logger::get("checkShortCircuitArguments"), "Skip short-circuit evaluation for low cardinality column in function, name: {}, family name: {}, data type: {}", f->columns_to_capture[i].column->getName(), f->columns_to_capture[i].column->getFamilyName(), f->columns_to_capture[i].column->getDataType());
+ for (size_t j = 0; j < f->getColumnsToCapture().size(); j++) {
+ LOG_INFO(&Poco::Logger::get("checkShortCircuitArguments"), "Checking short-circuit function argument index: {}, column name: {}, family name: {}, data type: {}", j, f->getColumnsToCapture()[j].column->getName(), f->getColumnsToCapture()[j].column->getFamilyName(), f->getColumnsToCapture()[j].column->getDataType());
+ if (f->getColumnsToCapture()[i].column->getName() == "ColumnLowCardinality") {
+ LOG_INFO(&Poco::Logger::get("checkShortCircuitArguments"), "Skip short-circuit evaluation for low cardinality column in function, name: {}, family name: {}, data type: {}", f->getColumnsToCapture()[i].column->getName(), f->getColumnsToCapture()[i].column->getFamilyName(), f->getColumnsToCapture()[i].column->getDataType());
  return -1; // Skip short-circuit evaluation for low cardinality columns
  }
  }