ORC-1706: [C++] Fix build break w/ BUILD_CPP_ENABLE_METRICS=ON

### What changes were proposed in this pull request? 1. Fix build break w/ BUILD_CPP_ENABLE_METRICS=ON 2. Add -DBUILD_CPP_ENABLE_METRICS=ON on format check actions. 3. Fix a typo on README file name. ### Why are the changes needed? C++ build breaks when the option BUILD_CPP_ENABLE_METRICS is switched on. ### How was this patch tested? UT passed. ### Was this patch authored or co-authored using generative AI tooling? NO Closes #1915 from ffacs/ORC-1706. Authored-by: ffacs <ffacs@[email protected]> Signed-off-by: Gang Wu <[email protected]>
apache · Apr 27, 2024 · f919fab · f919fab
1 parent 3bf6ea9
commit f919fab
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -177,7 +177,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DBUILD_JAVA=OFF -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DSTOP_BUILD_ON_WARNING=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+          cmake .. -DBUILD_JAVA=OFF -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DSTOP_BUILD_ON_WARNING=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DBUILD_CPP_ENABLE_METRICS=1
           make
       - name: Check clang-tidy
         run: cd build && make check-clang-tidy

diff --git a/c++/build-support/REAMD.md → c++/build-support/README.md b/c++/build-support/REAMD.md → c++/build-support/README.md
diff --git a/c++/src/OrcFile.cc b/c++/src/OrcFile.cc
@@ -79,7 +79,7 @@ namespace orc {
     }
 
     void read(void* buf, uint64_t length, uint64_t offset) override {
-      SCOPED_STOPWATCH(metrics, IOBlockingLatencyUs, IOCount);
+      SCOPED_STOPWATCH(metrics_, IOBlockingLatencyUs, IOCount);
       if (!buf) {
         throw ParseError("Buffer is null");
       }

diff --git a/c++/src/Reader.cc b/c++/src/Reader.cc
@@ -1117,7 +1117,7 @@ namespace orc {
   }
 
   bool RowReaderImpl::next(ColumnVectorBatch& data) {
-    SCOPED_STOPWATCH(contents->readerMetrics, ReaderInclusiveLatencyUs, ReaderCall);
+    SCOPED_STOPWATCH(contents_->readerMetrics, ReaderInclusiveLatencyUs, ReaderCall);
     if (currentStripe_ >= lastStripe_) {
       data.numElements = 0;
       markEndOfFile();

diff --git a/c++/src/Writer.cc b/c++/src/Writer.cc
@@ -437,7 +437,7 @@ namespace orc {
     // Write file header
     const static size_t magicIdLength = strlen(WriterImpl::magicId);
     {
-      SCOPED_STOPWATCH(options.getWriterMetrics(), IOBlockingLatencyUs, IOCount);
+      SCOPED_STOPWATCH(options_.getWriterMetrics(), IOBlockingLatencyUs, IOCount);
       outStream_->write(WriterImpl::magicId, magicIdLength);
     }
     currentOffset_ += magicIdLength;
@@ -585,7 +585,7 @@ namespace orc {
       throw std::logic_error("Failed to write post script.");
     }
     unsigned char psLength = static_cast<unsigned char>(bufferedStream_->flush());
-    SCOPED_STOPWATCH(options.getWriterMetrics(), IOBlockingLatencyUs, IOCount);
+    SCOPED_STOPWATCH(options_.getWriterMetrics(), IOBlockingLatencyUs, IOCount);
     outStream_->write(&psLength, sizeof(unsigned char));
   }
 

diff --git a/c++/src/io/OutputStream.cc b/c++/src/io/OutputStream.cc
@@ -87,7 +87,7 @@ namespace orc {
     uint64_t dataSize = dataBuffer_->size();
     // flush data buffer into outputStream
     if (dataSize > 0) {
-      SCOPED_STOPWATCH(metrics, IOBlockingLatencyUs, IOCount);
+      SCOPED_STOPWATCH(metrics_, IOBlockingLatencyUs, IOCount);
       dataBuffer_->writeTo(outputStream_, metrics_);
     }
     dataBuffer_->resize(0);