Merge branch 'main' into feature/register-table

Author: lishuxu

CMakeLists.txt

@@ -28,7 +28,7 @@ project(Iceberg
         DESCRIPTION "Iceberg C++ Project"
         LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

LICENSE

@@ -202,34 +202,6 @@
 
 --------------------------------------------------------------------------------
 
-The file src/iceberg/expected.h contains code adapted from
-
-https://github.com/zeus-cpp/expected
-
-with the following license (MIT)
-
-Copyright (c) 2024 zeus-cpp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---------------------------------------------------------------------------------
-
 3rdparty dependency nlohmann-json is statically linked in certain binary
 distributions. nlohmann-json has the following license:
 

NOTICE

@@ -4,10 +4,6 @@ Copyright 2024-2025 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes code from zeus-cpp
- * Copyright (c) 2024 zeus-cpp
- * https://github.com/zeus-cpp/expected
-
 This product includes code from smhasher
  * MurmurHash3 was written by Austin Appleby, and is placed in the public
  * domain. The author hereby disclaims copyright to this source code.

README.md

@@ -24,7 +24,7 @@ C++ implementation of [Apache Iceberg™](https://iceberg.apache.org/).
 ## Requirements
 
 - CMake 3.25 or higher
-- C++20 compliant compiler
+- C++23 compliant compiler
 
 ## Build
 

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -99,7 +99,7 @@ function(resolve_arrow_dependency)
   fetchcontent_declare(VendoredArrow
                        ${FC_DECLARE_COMMON_OPTIONS}
                        GIT_REPOSITORY https://github.com/apache/arrow.git
-                       GIT_TAG 5f0aeb5de53fb25b59a52661a80071faef99a4a4
+                       GIT_TAG f12356adaaabea86638407e995e73215dbb58bb2
                        #URL ${ARROW_SOURCE_URL}
                        #URL_HASH "SHA256=${ICEBERG_ARROW_BUILD_SHA256_CHECKSUM}"
                        SOURCE_SUBDIR
@@ -282,6 +282,55 @@ function(resolve_nlohmann_json_dependency)
           LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
 endfunction()
 
+# ----------------------------------------------------------------------
+# spdlog
+
+function(resolve_spdlog_dependency)
+  prepare_fetchcontent()
+
+  find_package(Threads REQUIRED)
+
+  set(SPDLOG_USE_STD_FORMAT
+      ON
+      CACHE BOOL "" FORCE)
+  set(SPDLOG_BUILD_PIC
+      ON
+      CACHE BOOL "" FORCE)
+
+  fetchcontent_declare(spdlog
+                       ${FC_DECLARE_COMMON_OPTIONS}
+                       URL "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz"
+                           FIND_PACKAGE_ARGS
+                           NAMES
+                           spdlog
+                           CONFIG)
+  fetchcontent_makeavailable(spdlog)
+
+  if(spdlog_SOURCE_DIR)
+    set_target_properties(spdlog PROPERTIES OUTPUT_NAME "iceberg_vendored_spdlog"
+                                            POSITION_INDEPENDENT_CODE ON)
+    target_link_libraries(spdlog INTERFACE Threads::Threads)
+    install(TARGETS spdlog
+            EXPORT iceberg_targets
+            RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
+            ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
+            LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
+    set(SPDLOG_VENDORED TRUE)
+  else()
+    set(SPDLOG_VENDORED FALSE)
+    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES spdlog)
+  endif()
+
+  list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Threads)
+
+  set(ICEBERG_SYSTEM_DEPENDENCIES
+      ${ICEBERG_SYSTEM_DEPENDENCIES}
+      PARENT_SCOPE)
+  set(SPDLOG_VENDORED
+      ${SPDLOG_VENDORED}
+      PARENT_SCOPE)
+endfunction()
+
 # ----------------------------------------------------------------------
 # zlib
 
@@ -299,11 +348,27 @@ function(resolve_zlib_dependency)
 
 endfunction()
 
+# ----------------------------------------------------------------------
+# Zstd
+
+function(resolve_zstd_dependency)
+  find_package(zstd CONFIG)
+  if(zstd_FOUND)
+    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES zstd)
+    message(STATUS "Found zstd, version: ${zstd_VERSION}")
+    set(ICEBERG_SYSTEM_DEPENDENCIES
+        ${ICEBERG_SYSTEM_DEPENDENCIES}
+        PARENT_SCOPE)
+  endif()
+endfunction()
+
 resolve_zlib_dependency()
 resolve_nanoarrow_dependency()
 resolve_nlohmann_json_dependency()
+resolve_spdlog_dependency()
 
 if(ICEBERG_BUILD_BUNDLE)
   resolve_arrow_dependency()
   resolve_avro_dependency()
+  resolve_zstd_dependency()
 endif()

example/CMakeLists.txt

@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.25)
 
 project(example)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 
 find_package(Iceberg CONFIG REQUIRED)
 

example/demo_example.cc

@@ -19,13 +19,16 @@
 
 #include <iostream>
 
-#include "iceberg/arrow/demo_arrow.h"
-#include "iceberg/avro/demo_avro.h"
-#include "iceberg/demo.h"
+#include "iceberg/avro/avro_reader.h"
+#include "iceberg/file_reader.h"
 
 int main() {
-  std::cout << iceberg::Demo().print() << std::endl;
-  std::cout << iceberg::arrow::DemoArrow().print() << std::endl;
-  std::cout << iceberg::avro::DemoAvro().print() << std::endl;
+  iceberg::avro::AvroReader::Register();
+  auto open_result = iceberg::ReaderFactoryRegistry::Open(
+      iceberg::FileFormatType::kAvro, {.path = "non-existing-file.avro"});
+  if (!open_result.has_value()) {
+    std::cerr << "Failed to open avro file" << std::endl;
+    return 1;
+  }
   return 0;
 }

src/iceberg/CMakeLists.txt

@@ -20,7 +20,6 @@ set(ICEBERG_INCLUDES "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
 set(ICEBERG_SOURCES
     arrow_c_data_internal.cc
     catalog/in_memory_catalog.cc
-    demo.cc
     expression/expression.cc
     expression/literal.cc
     file_reader.cc
@@ -41,12 +40,12 @@ set(ICEBERG_SOURCES
     statistics_file.cc
     table.cc
     table_metadata.cc
+    table_scan.cc
     transform.cc
     transform_function.cc
     type.cc
     util/murmurhash3_internal.cc
     util/timepoint.cc
-    util/unreachable.cc
     util/gzip_internal.cc)
 
 set(ICEBERG_STATIC_BUILD_INTERFACE_LIBS)
@@ -58,16 +57,24 @@ list(APPEND
      ICEBERG_STATIC_BUILD_INTERFACE_LIBS
      nanoarrow::nanoarrow
      nlohmann_json::nlohmann_json
+     spdlog::spdlog
      ZLIB::ZLIB)
 list(APPEND
      ICEBERG_SHARED_BUILD_INTERFACE_LIBS
      nanoarrow::nanoarrow
      nlohmann_json::nlohmann_json
+     spdlog::spdlog
      ZLIB::ZLIB)
-list(APPEND ICEBERG_STATIC_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow"
-     "Iceberg::nlohmann_json")
-list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow"
-     "Iceberg::nlohmann_json")
+list(APPEND
+     ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
+     "Iceberg::nanoarrow"
+     "Iceberg::nlohmann_json"
+     "$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
+list(APPEND
+     ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
+     "Iceberg::nanoarrow"
+     "Iceberg::nlohmann_json"
+     "$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
 
 add_iceberg_lib(iceberg
                 SOURCES
@@ -94,9 +101,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_export.h
 
 if(ICEBERG_BUILD_BUNDLE)
   set(ICEBERG_BUNDLE_SOURCES
-      arrow/demo_arrow.cc
       arrow/arrow_fs_file_io.cc
-      avro/demo_avro.cc
       avro/avro_data_util.cc
       avro/avro_reader.cc
       avro/avro_schema_util.cc

src/iceberg/arrow/arrow_error_transform_internal.h

@@ -38,8 +38,8 @@ inline ErrorKind ToErrorKind(const ::arrow::Status& status) {
 #define ICEBERG_ARROW_ASSIGN_OR_RETURN_IMPL(result_name, lhs, rexpr, error_transform) \
   auto&& result_name = (rexpr);                                                       \
   if (!result_name.ok()) {                                                            \
-    return unexpected<Error>{{.kind = error_transform(result_name.status()),          \
-                              .message = result_name.status().ToString()}};           \
+    return std::unexpected<Error>{{.kind = error_transform(result_name.status()),     \
+                                   .message = result_name.status().ToString()}};      \
   }                                                                                   \
   lhs = std::move(result_name).ValueOrDie();
 
@@ -51,7 +51,7 @@ inline ErrorKind ToErrorKind(const ::arrow::Status& status) {
   do {                                                                    \
     auto&& _status = (expr);                                              \
     if (!_status.ok()) {                                                  \
-      return unexpected<Error>{                                           \
+      return std::unexpected<Error>{                                      \
           {.kind = ToErrorKind(_status), .message = _status.ToString()}}; \
     }                                                                     \
   } while (0)