Skip to content

Commit e6724a0

Browse files
xin-zhang2xin-zhang2
committed
rename
1 parent 4abbc3e commit e6724a0

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎presto-native-execution/presto_cpp/main/tvf/exec/LeafTableFunctionOperator.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@ using namespace facebook::velox::exec;
2727
LeafTableFunctionOperator::LeafTableFunctionOperator(
2828
int32_t operatorId,
2929
DriverCtx* driverCtx,
30-
const TableFunctionProcessorNodePtr& tableFunctionNode)
30+
const TableFunctionProcessorNodePtr& tableFunctionProcessorNode)
3131
: SourceOperator(
3232
driverCtx,
33-
tableFunctionNode->outputType(),
33+
tableFunctionProcessorNode->outputType(),
3434
operatorId,
35-
tableFunctionNode->id(),
35+
tableFunctionProcessorNode->id(),
3636
"LeafTableFunctionOperator"),
3737
driverCtx_(driverCtx),
3838
pool_(pool()),
3939
stringAllocator_(pool_),
40-
tableFunctionNode_(tableFunctionNode),
40+
tableFunctionProcessorNode_(tableFunctionProcessorNode),
4141
result_(nullptr) {
42-
VELOX_CHECK(tableFunctionNode->sources().empty());
43-
VELOX_CHECK(tableFunctionNode->partitionKeys().empty());
44-
VELOX_CHECK(tableFunctionNode->sortingKeys().empty());
45-
VELOX_CHECK(tableFunctionNode->sortingOrders().empty());
42+
VELOX_CHECK(tableFunctionProcessorNode->sources().empty());
43+
VELOX_CHECK(tableFunctionProcessorNode->partitionKeys().empty());
44+
VELOX_CHECK(tableFunctionProcessorNode->sortingKeys().empty());
45+
VELOX_CHECK(tableFunctionProcessorNode->sortingOrders().empty());
4646
}
4747

4848
void LeafTableFunctionOperator::initialize() {
4949
Operator::initialize();
50-
VELOX_CHECK_NOT_NULL(tableFunctionNode_);
51-
createTableFunction(tableFunctionNode_);
50+
VELOX_CHECK_NOT_NULL(tableFunctionProcessorNode_);
51+
createTableFunction(tableFunctionProcessorNode_);
5252
// TODO: Why was this needed
53-
// tableFunctionNode_.reset();
53+
// tableFunctionProcessorNode_.reset();
5454
}
5555

5656
void LeafTableFunctionOperator::createTableFunction(

‎presto-native-execution/presto_cpp/main/tvf/exec/LeafTableFunctionOperator.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class LeafTableFunctionOperator : public velox::exec::SourceOperator {
3030
LeafTableFunctionOperator(
3131
int32_t operatorId,
3232
velox::exec::DriverCtx* driverCtx,
33-
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionNode);
33+
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionProcessorNode);
3434

3535
void initialize() override;
3636

@@ -55,7 +55,7 @@ class LeafTableFunctionOperator : public velox::exec::SourceOperator {
5555
}
5656

5757
void createTableFunction(
58-
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionNode);
58+
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionProcessorNode);
5959

6060
void clear();
6161

@@ -66,7 +66,7 @@ class LeafTableFunctionOperator : public velox::exec::SourceOperator {
6666
// buffers.
6767
velox::HashStringAllocator stringAllocator_;
6868

69-
std::shared_ptr<const TableFunctionProcessorNode> tableFunctionNode_;
69+
std::shared_ptr<const TableFunctionProcessorNode> tableFunctionProcessorNode_;
7070

7171
std::shared_ptr<TableFunctionResult> result_;
7272

‎presto-native-execution/presto_cpp/main/tvf/exec/TableFunctionOperator.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ using namespace facebook::velox::exec;
2828
namespace {
2929

3030
const RowTypePtr requiredColumnType(
31-
const TableFunctionProcessorNodePtr& tableFunctionNode) {
32-
VELOX_CHECK_GT(tableFunctionNode->requiredColumns().size(), 0);
33-
auto columns = tableFunctionNode->requiredColumns();
31+
const TableFunctionProcessorNodePtr& tableFunctionProcessorNode) {
32+
VELOX_CHECK_GT(tableFunctionProcessorNode->requiredColumns().size(), 0);
33+
auto columns = tableFunctionProcessorNode->requiredColumns();
3434

3535
// TODO: This assumes single source.
36-
auto inputType = tableFunctionNode->sources()[0]->outputType();
36+
auto inputType = tableFunctionProcessorNode->sources()[0]->outputType();
3737
std::vector<std::string> names;
3838
std::vector<TypePtr> types;
3939
for (const auto& idx : columns) {
@@ -47,29 +47,29 @@ const RowTypePtr requiredColumnType(
4747
TableFunctionOperator::TableFunctionOperator(
4848
int32_t operatorId,
4949
DriverCtx* driverCtx,
50-
const TableFunctionProcessorNodePtr& tableFunctionNode)
50+
const TableFunctionProcessorNodePtr& tableFunctionProcessorNode)
5151
: Operator(
5252
driverCtx,
53-
tableFunctionNode->outputType(),
53+
tableFunctionProcessorNode->outputType(),
5454
operatorId,
55-
tableFunctionNode->id(),
55+
tableFunctionProcessorNode->id(),
5656
"TableFunctionOperator",
57-
tableFunctionNode->canSpill(driverCtx->queryConfig())
57+
tableFunctionProcessorNode->canSpill(driverCtx->queryConfig())
5858
? driverCtx->makeSpillConfig(operatorId)
5959
: std::nullopt),
6060
pool_(pool()),
6161
stringAllocator_(pool_),
62-
tableFunctionNode_(tableFunctionNode),
63-
inputType_(tableFunctionNode->sources()[0]->outputType()),
64-
requiredColummType_(requiredColumnType(tableFunctionNode)),
62+
tableFunctionProcessorNode_(tableFunctionProcessorNode),
63+
inputType_(tableFunctionProcessorNode->sources()[0]->outputType()),
64+
requiredColummType_(requiredColumnType(tableFunctionProcessorNode)),
6565
tableFunctionPartition_(nullptr),
6666
needsInput_(true),
6767
input_(nullptr) {
6868
tablePartitionBuild_ = std::make_unique<TablePartitionBuild>(
6969
inputType_,
70-
tableFunctionNode->partitionKeys(),
71-
tableFunctionNode->sortingKeys(),
72-
tableFunctionNode->sortingOrders(),
70+
tableFunctionProcessorNode->partitionKeys(),
71+
tableFunctionProcessorNode->sortingKeys(),
72+
tableFunctionProcessorNode->sortingOrders(),
7373
pool(),
7474
common::PrefixSortConfig{
7575
driverCtx->queryConfig().prefixSortNormalizedKeyMaxBytes(),
@@ -80,8 +80,8 @@ TableFunctionOperator::TableFunctionOperator(
8080

8181
void TableFunctionOperator::initialize() {
8282
Operator::initialize();
83-
VELOX_CHECK_NOT_NULL(tableFunctionNode_);
84-
createTableFunction(tableFunctionNode_);
83+
VELOX_CHECK_NOT_NULL(tableFunctionProcessorNode_);
84+
createTableFunction(tableFunctionProcessorNode_);
8585
}
8686

8787
void TableFunctionOperator::createTableFunction(

‎presto-native-execution/presto_cpp/main/tvf/exec/TableFunctionOperator.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TableFunctionOperator : public velox::exec::Operator {
3131
TableFunctionOperator(
3232
int32_t operatorId,
3333
velox::exec::DriverCtx* driverCtx,
34-
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionNode);
34+
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionProcessorNode);
3535

3636
void initialize() override;
3737

@@ -65,7 +65,7 @@ class TableFunctionOperator : public velox::exec::Operator {
6565
}
6666

6767
void createTableFunction(
68-
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionNode);
68+
const std::shared_ptr<const TableFunctionProcessorNode>& tableFunctionProcessorNode);
6969

7070
void assembleInput();
7171

@@ -74,7 +74,7 @@ class TableFunctionOperator : public velox::exec::Operator {
7474
// buffers.
7575
velox::HashStringAllocator stringAllocator_;
7676

77-
std::shared_ptr<const TableFunctionProcessorNode> tableFunctionNode_;
77+
std::shared_ptr<const TableFunctionProcessorNode> tableFunctionProcessorNode_;
7878

7979
// TODO : Figure how this works for a multi-input table parameter case.
8080
velox::RowTypePtr inputType_;

‎presto-native-execution/presto_cpp/main/tvf/exec/TableFunctionTranslator.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ class TableFunctionTranslator
3030
velox::exec::DriverCtx* ctx,
3131
int32_t id,
3232
const velox::core::PlanNodePtr& node) {
33-
if (auto tableFunctionNodeNode =
33+
if (auto tableFunctionProcessorNode =
3434
std::dynamic_pointer_cast<const TableFunctionProcessorNode>(node)) {
35-
if (tableFunctionNodeNode->sources().empty()) {
36-
return std::make_unique<LeafTableFunctionOperator>(id, ctx, tableFunctionNodeNode);
35+
if (tableFunctionProcessorNode->sources().empty()) {
36+
return std::make_unique<LeafTableFunctionOperator>(id, ctx, tableFunctionProcessorNode);
3737
}
3838
return std::make_unique<TableFunctionOperator>(
39-
id, ctx, tableFunctionNodeNode);
39+
id, ctx, tableFunctionProcessorNode);
4040
}
4141
return nullptr;
4242
}

0 commit comments

Comments
 (0)