More open source build fixes (#32)

Summary: Adding missing files, fixing last compilation nit exposed by clang 16, and disabling compilation of test which currently brings too many velox dependencies. Pull Request resolved: #32 Reviewed By: helfman Differential Revision: D56453875 Pulled By: pedroerp fbshipit-source-id: 88cf902a897cf35cb0c48f589e54c08328c8e799
facebookincubator · Apr 23, 2024 · bd98b28 · bd98b28
1 parent 66ae255
commit bd98b28
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/dwio/nimble/tablet/CMakeLists.txt b/dwio/nimble/tablet/CMakeLists.txt
@@ -30,6 +30,6 @@ target_include_directories(nimble_footer_fb
                            INTERFACE ${FLATBUFFERS_INCLUDE_DIR})
 add_dependencies(nimble_footer_fb nimble_footer_schema_fb)
 
-add_library(nimble_tablet Compression.cpp StreamInput.cpp Tablet.cpp)
+add_library(nimble_tablet Compression.cpp Tablet.cpp)
 
 target_link_libraries(nimble_tablet nimble_footer_fb Folly::folly)
diff --git a/dwio/nimble/velox/CMakeLists.txt b/dwio/nimble/velox/CMakeLists.txt
@@ -92,8 +92,8 @@ add_library(nimble_velox_serializer Serializer.cpp)
 target_link_libraries(nimble_velox_serializer nimble_common
                       nimble_velox_schema_builder velox_vector)
 
-add_library(nimble_velox_reader StreamInputDecoder.cpp StreamLabels.cpp
-                                VeloxReader.cpp)
+add_library(nimble_velox_reader ChunkedStream.cpp ChunkedStreamDecoder.cpp
+                                StreamLabels.cpp VeloxReader.cpp)
 target_link_libraries(
   nimble_velox_reader
   nimble_velox_schema
@@ -105,6 +105,6 @@ target_link_libraries(
 
 add_library(
   nimble_velox_writer EncodingLayoutTree.cpp FlushPolicy.cpp VeloxWriter.cpp
-                      VeloxWriterDefaultMetadataOSS.cpp)
+                      ChunkedStreamWriter.cpp VeloxWriterDefaultMetadataOSS.cpp)
 target_link_libraries(nimble_velox_writer nimble_encodings nimble_common
                       nimble_velox_metadata_fb Folly::folly)
diff --git a/dwio/nimble/velox/tests/CMakeLists.txt b/dwio/nimble/velox/tests/CMakeLists.txt
@@ -26,7 +26,9 @@ add_executable(
   SerializationTests.cpp
   TypeTests.cpp
   VeloxReaderTests.cpp
-  VeloxWriterTests.cpp)
+  # TODO: Disabled until MemoryReclaimer is decouple from velox_exec in Velox.
+  # VeloxWriterTests.cpp
+)
 add_test(nimble_velox_tests nimble_velox_tests)
 
 target_link_libraries(

diff --git a/dwio/nimble/velox/tests/VeloxReaderTests.cpp b/dwio/nimble/velox/tests/VeloxReaderTests.cpp
@@ -111,10 +111,10 @@ class VeloxMapGenerator {
         {
             .vectorSize = static_cast<size_t>(childSize),
             .nullRatio = 0.1,
+            .dictionaryHasNulls = config_.hasNulls,
             .stringLength = 20,
             .stringVariableLength = true,
             .containerLength = 5,
-            .dictionaryHasNulls = config_.hasNulls,
             .containerVariableLength = true,
         },
         leafPool_,