More fixes to cmake build (#39)

Summary: Pull Request resolved: #39 Reviewed By: zzhao0 Differential Revision: D56554925 Pulled By: pedroerp fbshipit-source-id: b502390b8998b6f3fe5c328e54b9b4bf97b71a8b
facebookincubator · Apr 25, 2024 · 57e9c86 · 57e9c86
1 parent af5949d
commit 57e9c86
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -40,14 +40,16 @@ jobs:
         shell: bash
         working-directory: nimble
     steps:
-      - uses: actions/checkout@v4
+      - name: "Checkout"
+        uses: actions/checkout@v4
         with:
           path: nimble
 
       - name: Install Dependencies
         run: |
           sudo apt install -y \
             clang-15 \
+            ccache \
             flatbuffers-compiler \
             libflatbuffers-dev \
             libgflags-dev \
@@ -63,10 +65,15 @@ jobs:
             flex \
             libfl-dev
 
-      - name: Build
+      - name: "Build"
         env:
           CC: "clang-15"
           CXX: "clang++-15"
         run: |
           $CXX --version
           make
+
+      - name: "Post Build"
+        run: |
+          # Print and zero cache stats.
+          ccache -szv
diff --git a/dwio/nimble/encodings/CMakeLists.txt b/dwio/nimble/encodings/CMakeLists.txt
@@ -23,6 +23,7 @@ add_library(
   RleEncoding.cpp
   SparseBoolEncoding.cpp
   Statistics.cpp
-  TrivialEncoding.cpp)
+  TrivialEncoding.cpp
+  ZstdCompressor.cpp)
 
 target_link_libraries(nimble_encodings Folly::folly absl::flat_hash_map)
diff --git a/dwio/nimble/tablet/CMakeLists.txt b/dwio/nimble/tablet/CMakeLists.txt
@@ -30,6 +30,11 @@ 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 TabletReader.cpp TabletWriter.cpp)
+add_library(nimble_tablet_common Compression.cpp)
+target_link_libraries(nimble_tablet_common nimble_footer_fb Folly::folly)
 
-target_link_libraries(nimble_tablet nimble_footer_fb Folly::folly)
+add_library(nimble_tablet_reader TabletReader.cpp)
+target_link_libraries(nimble_tablet_reader nimble_tablet_common)
+
+add_library(nimble_tablet_writer TabletWriter.cpp)
+target_link_libraries(nimble_tablet_writer nimble_tablet_common)
diff --git a/dwio/nimble/tablet/tests/CMakeLists.txt b/dwio/nimble/tablet/tests/CMakeLists.txt
@@ -17,7 +17,8 @@ add_test(nimble_tabletReader_tests nimble_tabletReader_tests)
 
 target_link_libraries(
   nimble_tabletReader_tests
-  nimble_tablet
+  nimble_tablet_reader
+  nimble_tablet_writer
   nimble_common
   velox_memory
   velox_file

diff --git a/dwio/nimble/tools/CMakeLists.txt b/dwio/nimble/tools/CMakeLists.txt
@@ -13,4 +13,4 @@
 # limitations under the License.
 add_library(nimble_tools_common EncodingUtilities.cpp)
 
-target_link_libraries(nimble_tools_common nimble_common nimble_tablet)
+target_link_libraries(nimble_tools_common nimble_common)
diff --git a/dwio/nimble/velox/CMakeLists.txt b/dwio/nimble/velox/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(nimble_velox_field_reader nimble_velox_schema_reader
 
 add_library(nimble_velox_flatmap_layout_planner FlatMapLayoutPlanner.cpp)
 target_link_libraries(nimble_velox_flatmap_layout_planner
-                      nimble_velox_schema_reader nimble_tablet velox_file)
+                      nimble_velox_schema_reader velox_file)
 
 add_library(nimble_velox_field_writer BufferGrowthPolicy.cpp FieldWriter.cpp)
 target_link_libraries(nimble_velox_field_writer nimble_velox_schema
@@ -82,11 +82,19 @@ target_link_libraries(
   nimble_velox_schema_serialization
   nimble_velox_schema_fb
   nimble_velox_metadata_fb
+  nimble_velox_field_reader
+  nimble_tablet_reader
   nimble_common
   Folly::folly)
 
 add_library(
   nimble_velox_writer EncodingLayoutTree.cpp FlushPolicy.cpp VeloxWriter.cpp
                       ChunkedStreamWriter.cpp VeloxWriterDefaultMetadataOSS.cpp)
-target_link_libraries(nimble_velox_writer nimble_encodings nimble_common
-                      nimble_velox_metadata_fb Folly::folly)
+target_link_libraries(
+  nimble_velox_writer
+  nimble_encodings
+  nimble_common
+  nimble_tablet_writer
+  nimble_velox_metadata_fb
+  velox_dwio_common
+  Folly::folly)
diff --git a/dwio/nimble/velox/tests/CMakeLists.txt b/dwio/nimble/velox/tests/CMakeLists.txt
@@ -25,9 +25,7 @@ add_executable(
   SchemaTests.cpp
   TypeTests.cpp
   VeloxReaderTests.cpp
-  # TODO: Disabled until MemoryReclaimer is decouple from velox_exec in Velox.
-  # VeloxWriterTests.cpp
-)
+  VeloxWriterTests.cpp)
 add_test(nimble_velox_tests nimble_velox_tests)
 
 target_link_libraries(