From 5553f21ea80e42a48497e4828620c4cec9296a28 Mon Sep 17 00:00:00 2001 From: Haoqiong Bian Date: Thu, 19 Dec 2024 13:16:40 +0800 Subject: [PATCH] using PIXELS_SRC to replace the relative path --- examples/parquet-example/CMakeLists.txt | 1 - examples/pixels-example/CMakeLists.txt | 2 +- extension/extension_config.cmake | 2 +- scripts/parquet-multidir-generator.py | 2 +- scripts/pixels-multidir-generator.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/parquet-example/CMakeLists.txt b/examples/parquet-example/CMakeLists.txt index b09a5782cc1b..6acf32b82949 100644 --- a/examples/parquet-example/CMakeLists.txt +++ b/examples/parquet-example/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories(../../third_party/catch) include_directories(../../third_party/tpce-tool/include) include_directories(../../third_party/sqlite/include) include_directories(../../src/include) -#include_directories(../../../pixels-common/include) add_executable(parquet-example main.cpp) target_link_libraries(parquet-example duckdb) \ No newline at end of file diff --git a/examples/pixels-example/CMakeLists.txt b/examples/pixels-example/CMakeLists.txt index c4ea2c302117..9eec7bb72675 100644 --- a/examples/pixels-example/CMakeLists.txt +++ b/examples/pixels-example/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(../../third_party/catch) include_directories(../../third_party/tpce-tool/include) include_directories(../../third_party/sqlite/include) include_directories(../../src/include) -include_directories(../../../pixels-common/include) +include_directories($ENV{PIXELS_SRC}/cpp/pixels-common/include) add_executable(pixels-example main.cpp) target_link_libraries(pixels-example duckdb) diff --git a/extension/extension_config.cmake b/extension/extension_config.cmake index db990ab7aafc..eef5d5d08b64 100644 --- a/extension/extension_config.cmake +++ b/extension/extension_config.cmake @@ -11,7 +11,7 @@ duckdb_extension_load(parquet) duckdb_extension_load(tpch) duckdb_extension_load(pixels - SOURCE_DIR ../../ + SOURCE_DIR $ENV{PIXELS_SRC} ) # The Linux allocator has issues so we use jemalloc, but only on x86 because page sizes are fixed at 4KB. diff --git a/scripts/parquet-multidir-generator.py b/scripts/parquet-multidir-generator.py index 7769b4604913..02d5b485b653 100644 --- a/scripts/parquet-multidir-generator.py +++ b/scripts/parquet-multidir-generator.py @@ -6,7 +6,7 @@ # The script copies all files in ${input}/${table}/${suffix}/ directory to ${output}/${table}/${suffix}/ # input, output and suffix should be designated, while table is detected automatically. # For example, we execute the following script: -# cd pixels-duckdb +# cd pixels-duckdb/duckdb # python scripts/parquet-multidir-generator.py -i /data/tpch-300 -o /data1/tpch-300-partition1 /data2/tpch-300-partition2 # The input path layout is: # input: diff --git a/scripts/pixels-multidir-generator.py b/scripts/pixels-multidir-generator.py index cd4cf918efcf..bf68d84a43ce 100644 --- a/scripts/pixels-multidir-generator.py +++ b/scripts/pixels-multidir-generator.py @@ -6,7 +6,7 @@ # The script copies all files in ${input}/${table}/${suffix}/ directory to ${output}/${table}/${suffix}/ # input, output and suffix should be designated, while table is detected automatically. # For example, we execute the following script: -# cd pixels-duckdb +# cd pixels-duckdb/duckdb # python scripts/pixels-multidir-generator.py -i /data/tpch-300 -o /data1/tpch-300-partition1 /data2/tpch-300-partition2 # The input path layout is: # input: