Use ARROW_DCHECK_GE/ARROW_DCHECK_GT instead of DCHECK_GE/DCHECK_GT to fix build after merge

Author: lesterfan

cpp/src/arrow/array/builder_run_end.cc

@@ -26,7 +26,7 @@
 #include "arrow/scalar.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/int_util_overflow.h"
-#include "arrow/util/logging_internal.h"
+#include "arrow/util/logging.h"
 #include "arrow/util/ree_util.h"
 
 namespace arrow {
@@ -58,7 +58,7 @@ Status RunCompressorBuilder::AppendNulls(int64_t length) {
   }
   if (ARROW_PREDICT_FALSE(current_run_length_ == 0)) {
     // Open a new NULL run
-    DCHECK_EQ(current_value_, NULLPTR);
+    ARROW_DCHECK_EQ(current_value_, NULLPTR);
     current_run_length_ = length;
   } else if (current_value_ == NULLPTR) {
     // Extend the currently open NULL run
@@ -129,7 +129,7 @@ Status RunCompressorBuilder::AppendScalars(const ScalarVector& scalars) {
 
 Status RunCompressorBuilder::AppendRunCompressedArraySlice(
     const ArraySpan& run_compressed_array, int64_t offset, int64_t length) {
-  DCHECK(!has_open_run());
+  ARROW_DCHECK(!has_open_run());
   RETURN_NOT_OK(inner_builder_->AppendArraySlice(run_compressed_array, offset, length));
   UpdateDimensions();
   return Status::OK();
@@ -197,7 +197,7 @@ Status RunEndEncodedBuilder::AppendNulls(int64_t length) {
 
 Status RunEndEncodedBuilder::AppendEmptyValues(int64_t length) {
   RETURN_NOT_OK(value_run_builder_->AppendEmptyValues(length));
-  DCHECK_EQ(value_run_builder_->open_run_length(), 0);
+  ARROW_DCHECK_EQ(value_run_builder_->open_run_length(), 0);
   UpdateDimensions(committed_logical_length_, 0);
   return Status::OK();
 }
@@ -222,8 +222,8 @@ template <typename RunEndCType>
 Status RunEndEncodedBuilder::DoAppendArraySlice(const ArraySpan& array, int64_t offset,
                                                 int64_t length) {
   ARROW_DCHECK(offset + length <= array.length);
-  DCHECK_GT(length, 0);
-  DCHECK(!value_run_builder_->has_open_run());
+  ARROW_DCHECK_GT(length, 0);
+  ARROW_DCHECK(!value_run_builder_->has_open_run());
 
   ree_util::RunEndEncodedArraySpan<RunEndCType> ree_span(array, array.offset + offset,
                                                          length);

cpp/src/arrow/util/rle_encoding_internal.h

@@ -309,7 +309,7 @@ inline bool RleDecoder::Get(T* val) {
 
 template <typename T>
 inline bool RleDecoder::GetNextRun(T* val, int* num_repeats, int batch_size) {
-  DCHECK_GE(bit_width_, 0);
+  ARROW_DCHECK_GE(bit_width_, 0);
   int values_read = 0;
 
   while (values_read == 0) {
@@ -338,15 +338,15 @@ template <typename T>
 inline bool RleDecoder::GetNextRunSpaced(T* val, bool* is_null, int* num_repeats,
                                          int batch_size, const uint8_t* valid_bits,
                                          int64_t valid_bits_offset) {
-  DCHECK_GE(bit_width_, 0);
+  ARROW_DCHECK_GE(bit_width_, 0);
   arrow::internal::BitRunReader bit_reader(valid_bits, valid_bits_offset,
                                            /*length=*/batch_size);
   arrow::internal::BitRun valid_run = bit_reader.NextRun();
   while (ARROW_PREDICT_FALSE(valid_run.length == 0)) {
     valid_run = bit_reader.NextRun();
   }
-  DCHECK_GT(batch_size, 0);
-  DCHECK_GT(valid_run.length, 0);
+  ARROW_DCHECK_GT(batch_size, 0);
+  ARROW_DCHECK_GT(valid_run.length, 0);
   if (valid_run.set) {
     return GetNextRun(
         val, num_repeats,

cpp/src/parquet/column_reader.cc

@@ -34,6 +34,7 @@
 #include "arrow/array/builder_binary.h"
 #include "arrow/array/builder_dict.h"
 #include "arrow/array/builder_primitive.h"
+#include "arrow/array/builder_run_end.h"
 #include "arrow/chunked_array.h"
 #include "arrow/type.h"
 #include "arrow/util/bit_stream_utils_internal.h"