Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-3582][CH] Remove ArrowParquetBlockInputFormat and OptimizedParquetBlockInputFormat #4626

Merged
merged 3 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class GlutenClickHouseTPCHParquetAQESuite
.set("spark.sql.shuffle.partitions", "5")
.set("spark.sql.autoBroadcastJoinThreshold", "10MB")
.set("spark.sql.adaptive.enabled", "true")
.set("spark.gluten.sql.columnar.backend.ch.runtime_config.use_local_format", "true")
.set("spark.gluten.sql.columnar.backend.ch.runtime_config.use_local_format", "false")
.set("spark.gluten.sql.columnar.backend.ch.shuffle.hash.algorithm", "sparkMurmurHash3_32")
}

Expand Down
2 changes: 1 addition & 1 deletion cpp-ch/local-engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ PRIVATE
substrait
)

target_link_libraries(${LOCALENGINE_SHARED_LIB} PUBLIC ch_parquet)
#TODO: target_link_libraries(${LOCALENGINE_SHARED_LIB} PUBLIC ch_parquet)

if (ENABLE_JEMALLOC)
target_link_options(${LOCALENGINE_SHARED_LIB} PRIVATE
Expand Down
117 changes: 0 additions & 117 deletions cpp-ch/local-engine/Storages/ArrowParquetBlockInputFormat.cpp

This file was deleted.

55 changes: 0 additions & 55 deletions cpp-ch/local-engine/Storages/ArrowParquetBlockInputFormat.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <Processors/Formats/Impl/ArrowBufferedStreams.h>
#include <Processors/Formats/Impl/ArrowColumnToCHColumn.h>
#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
#include <Storages/ArrowParquetBlockInputFormat.h>
#include <Storages/SubstraitSource/SubstraitFileSourceStep.h>
#include <parquet/arrow/reader.h>
#include <parquet/metadata.h>
Expand Down Expand Up @@ -80,9 +79,8 @@ FormatFile::InputFormatPtr ParquetFormatFile::createInputFormat(const DB::Block
row_group_indices.reserve(required_row_groups.size());
for (const auto & row_group : required_row_groups)
row_group_indices.emplace_back(row_group.index);

res->input
= std::make_shared<local_engine::ArrowParquetBlockInputFormat>(*(res->read_buffer), header, format_settings, row_group_indices);
//TODO: use_local_format
assert(false);
}
else
{
Expand Down
45 changes: 0 additions & 45 deletions cpp-ch/local-engine/Storages/ch_parquet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,48 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set(ARROW_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")

macro(add_headers_and_sources_including_cc prefix common_path)
add_glob(${prefix}_headers ${CMAKE_CURRENT_SOURCE_DIR} ${common_path}/*.h)
add_glob(${prefix}_sources ${common_path}/*.cpp ${common_path}/*.c ${common_path}/*.cc ${common_path}/*.h)
endmacro()

add_headers_and_sources(ch_parquet .)
add_headers_and_sources_including_cc(ch_parquet arrow)

add_library(ch_parquet ${ch_parquet_sources})

target_compile_options(ch_parquet PRIVATE -fPIC
-Wno-shorten-64-to-32
-Wno-shadow-field-in-constructor
-Wno-return-type
-Wno-reserved-identifier
-Wno-extra-semi-stmt
-Wno-extra-semi
-Wno-unused-result
-Wno-unreachable-code-return
-Wno-unused-parameter
-Wno-unreachable-code
-Wno-pessimizing-move
-Wno-unreachable-code-break
-Wno-unused-variable
-Wno-inconsistent-missing-override
-Wno-shadow-uncaptured-local
-Wno-suggest-override
-Wno-unused-member-function
-Wno-deprecated-this-capture
-Wno-tautological-unsigned-zero-compare
)

target_link_libraries(ch_parquet PUBLIC
boost::headers_only
clickhouse_common_io
)

target_include_directories(ch_parquet SYSTEM BEFORE PUBLIC
${ARROW_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/contrib/arrow-cmake/cpp/src
${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src
)
Loading
Loading