Skip to content

Commit 368e268

Browse files
committed
Merge branch 'main' into table-scan
2 parents 5248e22 + c00ee8f commit 368e268

34 files changed

+2779
-185
lines changed

.github/workflows/sanitizer_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ jobs:
5050
- name: Run Tests
5151
working-directory: build
5252
env:
53-
ASAN_OPTIONS: log_path=out.log:detect_leaks=1:symbolize=1:strict_string_checks=1:halt_on_error=0:detect_container_overflow=0
53+
ASAN_OPTIONS: log_path=out.log:detect_leaks=1:symbolize=1:strict_string_checks=1:halt_on_error=1:detect_container_overflow=0
5454
LSAN_OPTIONS: suppressions=${{ github.workspace }}/.github/lsan-suppressions.txt
55-
UBSAN_OPTIONS: log_path=out.log:halt_on_error=0:print_stacktrace=1:suppressions=${{ github.workspace }}/.github/ubsan-suppressions.txt
55+
UBSAN_OPTIONS: log_path=out.log:halt_on_error=1:print_stacktrace=1:suppressions=${{ github.workspace }}/.github/ubsan-suppressions.txt
5656
run: |
5757
ctest --output-on-failure
5858
- name: Save the test output

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ set(CMAKE_CXX_STANDARD 20)
3232
set(CMAKE_CXX_STANDARD_REQUIRED ON)
3333
set(CMAKE_CXX_EXTENSIONS OFF)
3434
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
35+
set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
3536

3637
option(ICEBERG_BUILD_STATIC "Build static library" ON)
3738
option(ICEBERG_BUILD_SHARED "Build shared library" OFF)

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ function(resolve_arrow_dependency)
7171
set(ARROW_FILESYSTEM
7272
ON
7373
CACHE BOOL "" FORCE)
74+
set(ARROW_JSON
75+
ON
76+
CACHE BOOL "" FORCE)
7477
set(ARROW_PARQUET
7578
ON
7679
CACHE BOOL "" FORCE)
@@ -95,8 +98,8 @@ function(resolve_arrow_dependency)
9598

9699
fetchcontent_declare(VendoredArrow
97100
${FC_DECLARE_COMMON_OPTIONS}
98-
GIT_REPOSITORY https://github.com/wgtmac/arrow.git
99-
GIT_TAG 7d50c4ac803ad983734de5f418b7cd18f25b0dc9
101+
GIT_REPOSITORY https://github.com/apache/arrow.git
102+
GIT_TAG 5f0aeb5de53fb25b59a52661a80071faef99a4a4
100103
#URL ${ARROW_SOURCE_URL}
101104
#URL_HASH "SHA256=${ICEBERG_ARROW_BUILD_SHA256_CHECKSUM}"
102105
SOURCE_SUBDIR

src/iceberg/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ set(ICEBERG_SOURCES
2222
catalog/in_memory_catalog.cc
2323
demo.cc
2424
expression/expression.cc
25+
expression/literal.cc
2526
file_reader.cc
2627
json_internal.cc
2728
manifest_entry.cc
@@ -38,6 +39,7 @@ set(ICEBERG_SOURCES
3839
sort_field.cc
3940
sort_order.cc
4041
statistics_file.cc
42+
table.cc
4143
table_metadata.cc
4244
table_scan.cc
4345
transform.cc

0 commit comments

Comments
 (0)