remove demo code

Author: wgtmac

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -299,11 +299,26 @@ 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()
 
 if(ICEBERG_BUILD_BUNDLE)
   resolve_arrow_dependency()
   resolve_avro_dependency()
+  resolve_zstd_dependency()
 endif()

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
@@ -94,9 +93,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/demo_arrow.cc

@@ -123,7 +123,7 @@ class AvroReader::Impl {
     return {};
   }
 
-  Result<Data> Next() {
+  Result<std::optional<ArrowArray>> Next() {
     if (!context_) {
       ICEBERG_RETURN_UNEXPECTED(InitReadContext());
     }
@@ -191,9 +191,9 @@ class AvroReader::Impl {
     return {};
   }
 
-  Result<Data> ConvertBuilderToArrowArray() {
+  Result<std::optional<ArrowArray>> ConvertBuilderToArrowArray() {
     if (context_->builder_->length() == 0) {
-      return {};
+      return std::nullopt;
     }
 
     auto builder_result = context_->builder_->Finish();
@@ -227,7 +227,7 @@ class AvroReader::Impl {
   std::unique_ptr<ReadContext> context_;
 };
 
-Result<Reader::Data> AvroReader::Next() { return impl_->Next(); }
+Result<std::optional<ArrowArray>> AvroReader::Next() { return impl_->Next(); }
 
 Result<ArrowSchema> AvroReader::Schema() { return impl_->Schema(); }
 

src/iceberg/arrow/demo_arrow.h

@@ -35,7 +35,7 @@ class ICEBERG_BUNDLE_EXPORT AvroReader : public Reader {
 
   Status Close() final;
 
-  Result<Data> Next() final;
+  Result<std::optional<ArrowArray>> Next() final;
 
   Result<ArrowSchema> Schema() final;