Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit bcd5bf7

Browse files
ienkovichienkovich
committed
Remove ExecutionResult::getDataPtr.
Signed-off-by: ienkovich <[email protected]>
1 parent a51fb90 commit bcd5bf7

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

‎omniscidb/QueryEngine/Descriptors/RelAlgExecutionDescriptor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ class ExecutionResult {
5151

5252
bool empty() const { return !result_token_; }
5353

54-
ResultSetPtr getDataPtr() const { return getRows(); }
55-
5654
const std::vector<TargetMetaInfo>& getTargetsMeta() const { return targets_meta_; }
5755

5856
const std::vector<PushedDownFilterInfo>& getPushedDownFilterInfo() const;

‎omniscidb/Tests/ArrowTestHelpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ std::shared_ptr<arrow::Table> toArrow(const ExecutionResult& res) {
182182
col_names.push_back(target.get_resname());
183183
}
184184
auto converter =
185-
std::make_unique<ArrowResultSetConverter>(res.getDataPtr(), col_names, -1);
185+
std::make_unique<ArrowResultSetConverter>(res.getRows(), col_names, -1);
186186
return converter->convertToArrowTable();
187187
}
188188

‎omniscidb/Tests/ResultSetArrowConversion.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ std::shared_ptr<arrow::RecordBatch> getArrowRecordBatch(const ExecutionResult& r
112112
col_names.push_back(target.get_resname());
113113
}
114114
auto converter =
115-
std::make_unique<ArrowResultSetConverter>(res.getDataPtr(), col_names, -1);
115+
std::make_unique<ArrowResultSetConverter>(res.getRows(), col_names, -1);
116116
return converter->convertToArrow();
117117
}
118118

@@ -122,7 +122,7 @@ std::shared_ptr<arrow::Table> getArrowTable(const ExecutionResult& res) {
122122
col_names.push_back(target.get_resname());
123123
}
124124
auto converter =
125-
std::make_unique<ArrowResultSetConverter>(res.getDataPtr(), col_names, -1);
125+
std::make_unique<ArrowResultSetConverter>(res.getRows(), col_names, -1);
126126
return converter->convertToArrowTable();
127127
}
128128

@@ -426,10 +426,10 @@ TEST(ArrowTable, SameLimitedOffsetSelection) {
426426

427427
auto res = runSqlQuery(
428428
"SELECT * FROM LargeTable offset 2 limit 2;", ExecutorDeviceType::CPU, true);
429-
ASSERT_EQ(res.getDataPtr()->getLimit(), 2);
430-
ASSERT_EQ(res.getDataPtr()->getOffset(), 2);
429+
ASSERT_EQ(res.getRows()->getLimit(), 2);
430+
ASSERT_EQ(res.getRows()->getOffset(), 2);
431431
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)2);
432-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(0), true);
432+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(0), true);
433433

434434
auto table = getArrowTable(res);
435435
ASSERT_NE(table, nullptr);
@@ -484,15 +484,15 @@ TEST(ArrowTable, ColumnarLimitedJoin) {
484484
ExecutorDeviceType::CPU,
485485
true);
486486

487-
ASSERT_EQ(res.getDataPtr()->getLimit(), 2);
488-
ASSERT_EQ(res.getDataPtr()->getOffset(), 5);
487+
ASSERT_EQ(res.getRows()->getLimit(), 2);
488+
ASSERT_EQ(res.getRows()->getOffset(), 5);
489489
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)1);
490-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(1), true);
491-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(2), true);
492-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(3), true);
493-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(4), true);
494-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(5), true);
495-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(6), true);
490+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(1), true);
491+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(2), true);
492+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(3), true);
493+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(4), true);
494+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(5), true);
495+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(6), true);
496496

497497
auto table = getArrowTable(res);
498498
ASSERT_NE(table, nullptr);
@@ -533,8 +533,8 @@ TEST(ArrowTable, ColumnarEmptyLimitedJoin) {
533533
auto res = runSqlQuery(
534534
"SELECT * FROM test_chunked offset 8 limit 2;", ExecutorDeviceType::CPU, true);
535535

536-
ASSERT_EQ(res.getDataPtr()->getLimit(), 2);
537-
ASSERT_EQ(res.getDataPtr()->getOffset(), 8);
536+
ASSERT_EQ(res.getRows()->getLimit(), 2);
537+
ASSERT_EQ(res.getRows()->getOffset(), 8);
538538
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)0);
539539

540540
auto table = getArrowTable(res);
@@ -557,12 +557,12 @@ TEST(ArrowTable, ColumnarMultiStoragedJoin) {
557557
auto res = runSqlQuery(
558558
"SELECT * FROM test_chunked offset 3 limit 7;", ExecutorDeviceType::CPU, true);
559559

560-
ASSERT_EQ(res.getDataPtr()->getLimit(), 7);
561-
ASSERT_EQ(res.getDataPtr()->getOffset(), 3);
560+
ASSERT_EQ(res.getRows()->getLimit(), 7);
561+
ASSERT_EQ(res.getRows()->getOffset(), 3);
562562
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)3);
563-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(1), true);
564-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(2), true);
565-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(3), true);
563+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(1), true);
564+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(2), true);
565+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(3), true);
566566

567567
auto table = getArrowTable(res);
568568
ASSERT_NE(table, nullptr);
@@ -593,12 +593,12 @@ TEST(ArrowTable, ColumnarMultiStoraged) {
593593
auto res = runSqlQuery(
594594
"SELECT * FROM test_chunked offset 5 limit 7;", ExecutorDeviceType::CPU, true);
595595

596-
ASSERT_EQ(res.getDataPtr()->getLimit(), 7);
597-
ASSERT_EQ(res.getDataPtr()->getOffset(), 5);
596+
ASSERT_EQ(res.getRows()->getLimit(), 7);
597+
ASSERT_EQ(res.getRows()->getOffset(), 5);
598598
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)1);
599-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(1), true);
600-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(2), true);
601-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(3), true);
599+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(1), true);
600+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(2), true);
601+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(3), true);
602602

603603
auto table = getArrowTable(res);
604604
ASSERT_NE(table, nullptr);
@@ -638,10 +638,10 @@ TEST(ArrowTable, ColumnarLargeStoraged) {
638638
auto res = runSqlQuery(
639639
"SELECT * FROM LargeTable offset 7000 limit 3000;", ExecutorDeviceType::CPU, true);
640640

641-
ASSERT_EQ(res.getDataPtr()->getLimit(), 3000);
642-
ASSERT_EQ(res.getDataPtr()->getOffset(), 7000);
641+
ASSERT_EQ(res.getRows()->getLimit(), 3000);
642+
ASSERT_EQ(res.getRows()->getOffset(), 7000);
643643
ASSERT_EQ(res.getRows()->rowCount(), (int64_t)3000);
644-
ASSERT_EQ(res.getDataPtr()->isChunkedZeroCopyColumnarConversionPossible(0), true);
644+
ASSERT_EQ(res.getRows()->isChunkedZeroCopyColumnarConversionPossible(0), true);
645645

646646
auto table = getArrowTable(res);
647647
ASSERT_NE(table, nullptr);

0 commit comments

Comments
 (0)