Revert "ComputeNullValues"

This reverts commit 66e1c1f.
R-JunmingChen · Nov 15, 2023 · 1cb3381 · 1cb3381
1 parent fecda42
commit 1cb3381
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 69 deletions.
diff --git a/cpp/src/arrow/array/array_dict.cc b/cpp/src/arrow/array/array_dict.cc
@@ -212,56 +212,6 @@ Result<std::shared_ptr<ArrayData>> TransposeDictIndices(
   return out_data;
 }
 
-struct CompactDictionaryNullValuesVistor {
-  const std::shared_ptr<ArrayData>& data;
-  int64_t& out_null_count;
-
-  template <typename IndexArrowType>
-  Status CompactDictionaryNullValuesImpl() {
-    int64_t index_length = data->length;
-    int64_t dict_length = data->dictionary->length;
-    const uint8_t* dictionary_null_bit_map = data->dictionary->GetValues<uint8_t>(0);
-
-    using CType = typename IndexArrowType::c_type;
-    const CType* indices_data = data->GetValues<CType>(1);
-    CType dict_len = static_cast<CType>(dict_length);
-    for (int64_t i = 0; i < index_length; i++) {
-      if (data->IsNull(i)) {
-        continue;
-      }
-
-      CType current_index = indices_data[i];
-      if (current_index < 0 || current_index >= dict_len) {
-        return Status::IndexError(
-            "Index out of bounds while counting dictionary array: ", current_index,
-            "(dictionary is ", dict_length, " long) at position ", i);
-      }
-      if (!bit_util::GetBit(dictionary_null_bit_map, current_index)) {
-        out_null_count++;
-      }
-    }
-    return Status::OK();
-  }
-
-  template <typename Type>
-  enable_if_integer<Type, Status> Visit(const Type&) {
-    return CompactDictionaryNullValuesImpl<Type>();
-  }
-
-  Status Visit(const DataType& type) {
-    return Status::TypeError("Expected an Index Type of Int or UInt");
-  }
-};
-
-Result<int64_t> CompactDictionaryNullValues(const std::shared_ptr<ArrayData>& data) {
-  int64_t out_null_count = 0;
-  const auto& dict_type = checked_cast<const DictionaryType&>(*data->type);
-  CompactDictionaryNullValuesVistor vistor{data, out_null_count};
-  RETURN_NOT_OK(VisitTypeInline(*dict_type.index_type(), &vistor));
-
-  return out_null_count;
-}
-
 struct CompactTransposeMapVistor {
   const std::shared_ptr<ArrayData>& data;
   arrow::MemoryPool* pool;
@@ -373,16 +323,6 @@ Result<std::shared_ptr<Array>> DictionaryArray::Transpose(
   return MakeArray(std::move(transposed));
 }
 
-Result<int64_t> DictionaryArray::CountNullValues() const {
-  if (this->dictionary()->null_count() == 0 || this->indices()->null_count() == 0) {
-    return this->indices()->null_count();
-  }
-
-  ARROW_ASSIGN_OR_RAISE(int64_t dictionary_null_count,
-                        CompactDictionaryNullValues(data_));
-  return dictionary_null_count + this->indices()->null_count();
-}
-
 Result<std::shared_ptr<Array>> DictionaryArray::Compact(MemoryPool* pool) const {
   std::shared_ptr<Array> compact_dictionary;
   ARROW_ASSIGN_OR_RAISE(std::unique_ptr<Buffer> transpose_map,

diff --git a/cpp/src/arrow/array/array_dict.h b/cpp/src/arrow/array/array_dict.h
@@ -96,15 +96,6 @@ class ARROW_EXPORT DictionaryArray : public Array {
       const std::shared_ptr<DataType>& type, const std::shared_ptr<Array>& dictionary,
       const int32_t* transpose_map, MemoryPool* pool = default_memory_pool()) const;
 
-  /// \brief Count the number of null values as the dictionary array is decoded.
-  Result<int64_t> CountNullValues() const;
-
-  /// \brief Compat this DictionaryArray
-  ///
-  /// This method returns a compacted dictionary array. All the
-  /// values in the dictionary are referenced by indices.
-  ///
-  /// \param[in] pool a pool to allocate the array data from
   Result<std::shared_ptr<Array>> Compact(MemoryPool* pool = default_memory_pool()) const;
 
   /// \brief Determine whether dictionary arrays may be compared without unification