Skip to content

Commit 9494cbc

Browse files
Clean up prefix sort function defaultPrefixSortConfig (facebookincubator#11533)
Summary: Pull Request resolved: facebookincubator#11533 Reviewed By: bikramSingh91 Differential Revision: D65951838 Pulled By: xiaoxmeng fbshipit-source-id: 7a4bd0601440dd65bedcf895b0747e65efaf08db
1 parent 9ebe366 commit 9494cbc

File tree

4 files changed

+9
-41
lines changed

4 files changed

+9
-41
lines changed

velox/connectors/hive/iceberg/tests/IcebergSplitReaderBenchmark.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "velox/connectors/hive/iceberg/tests/IcebergSplitReaderBenchmark.h"
1818
#include <filesystem>
19-
#include "velox/exec/tests/utils/PrefixSortUtils.h"
2019

2120
using namespace facebook::velox;
2221
using namespace facebook::velox::dwio;
@@ -312,7 +311,7 @@ void IcebergSplitReaderBenchmark::readSingleColumn(
312311
connectorPool.get(),
313312
connectorSessionProperties_.get(),
314313
nullptr,
315-
exec::test::defaultPrefixSortConfig(),
314+
common::PrefixSortConfig(),
316315
nullptr,
317316
nullptr,
318317
"query.IcebergSplitReader",

velox/connectors/hive/tests/HiveConnectorUtilTest.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "velox/connectors/hive/HiveConnectorSplit.h"
2121
#include "velox/connectors/hive/TableHandle.h"
2222
#include "velox/exec/tests/utils/HiveConnectorTestBase.h"
23-
#include "velox/exec/tests/utils/PrefixSortUtils.h"
2423

2524
#include "velox/dwio/dwrf/writer/Writer.h"
2625

@@ -53,7 +52,7 @@ TEST_F(HiveConnectorUtilTest, configureReaderOptions) {
5352
pool_.get(),
5453
&sessionProperties,
5554
nullptr,
56-
exec::test::defaultPrefixSortConfig(),
55+
common::PrefixSortConfig(),
5756
nullptr,
5857
nullptr,
5958
"query.HiveConnectorUtilTest",

velox/connectors/hive/tests/HiveDataSinkTest.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#endif
3535

3636
#include "velox/exec/tests/utils/PlanBuilder.h"
37-
#include "velox/exec/tests/utils/PrefixSortUtils.h"
3837
#include "velox/exec/tests/utils/TempDirectoryPath.h"
3938
#include "velox/vector/fuzzer/VectorFuzzer.h"
4039

@@ -126,7 +125,7 @@ class HiveDataSinkTest : public exec::test::HiveConnectorTestBase {
126125
connectorPool_.get(),
127126
connectorSessionProperties_.get(),
128127
nullptr,
129-
exec::test::defaultPrefixSortConfig(),
128+
common::PrefixSortConfig(),
130129
nullptr,
131130
nullptr,
132131
"query.HiveDataSinkTest",
@@ -736,7 +735,7 @@ DEBUG_ONLY_TEST_F(HiveDataSinkTest, memoryReclaim) {
736735
connectorPool_.get(),
737736
connectorSessionProperties_.get(),
738737
spillConfig.get(),
739-
exec::test::defaultPrefixSortConfig(),
738+
common::PrefixSortConfig(),
740739
nullptr,
741740
nullptr,
742741
"query.HiveDataSinkTest",
@@ -751,7 +750,7 @@ DEBUG_ONLY_TEST_F(HiveDataSinkTest, memoryReclaim) {
751750
connectorPool_.get(),
752751
connectorSessionProperties_.get(),
753752
nullptr,
754-
exec::test::defaultPrefixSortConfig(),
753+
common::PrefixSortConfig(),
755754
nullptr,
756755
nullptr,
757756
"query.HiveDataSinkTest",
@@ -877,7 +876,7 @@ TEST_F(HiveDataSinkTest, memoryReclaimAfterClose) {
877876
connectorPool_.get(),
878877
connectorSessionProperties_.get(),
879878
spillConfig.get(),
880-
exec::test::defaultPrefixSortConfig(),
879+
common::PrefixSortConfig(),
881880
nullptr,
882881
nullptr,
883882
"query.HiveDataSinkTest",
@@ -892,7 +891,7 @@ TEST_F(HiveDataSinkTest, memoryReclaimAfterClose) {
892891
connectorPool_.get(),
893892
connectorSessionProperties_.get(),
894893
nullptr,
895-
exec::test::defaultPrefixSortConfig(),
894+
common::PrefixSortConfig(),
896895
nullptr,
897896
nullptr,
898897
"query.HiveDataSinkTest",
@@ -1019,7 +1018,7 @@ TEST_F(HiveDataSinkTest, sortWriterMemoryReclaimDuringFinish) {
10191018
connectorPool_.get(),
10201019
connectorSessionProperties_.get(),
10211020
spillConfig.get(),
1022-
exec::test::defaultPrefixSortConfig(),
1021+
common::PrefixSortConfig(),
10231022
nullptr,
10241023
nullptr,
10251024
"query.HiveDataSinkTest",
@@ -1084,7 +1083,7 @@ DEBUG_ONLY_TEST_F(HiveDataSinkTest, sortWriterFailureTest) {
10841083
connectorPool_.get(),
10851084
connectorSessionProperties_.get(),
10861085
spillConfig.get(),
1087-
exec::test::defaultPrefixSortConfig(),
1086+
common::PrefixSortConfig(),
10881087
nullptr,
10891088
nullptr,
10901089
"query.HiveDataSinkTest",

velox/exec/tests/utils/PrefixSortUtils.h

-29
This file was deleted.

0 commit comments

Comments
 (0)