ARROW-7531: [C++] Reduce header inclusion cost slightly

cpp/src/arrow/array/array_binary_test.cc

@@ -25,8 +25,8 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_binary.h"
 #include "arrow/buffer.h"
-#include "arrow/builder.h"
 #include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

cpp/src/arrow/array/array_dict_test.cc

@@ -25,7 +25,9 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
-#include "arrow/builder.h"
+#include "arrow/array/builder_decimal.h"
+#include "arrow/array/builder_dict.h"
+#include "arrow/array/builder_nested.h"
 #include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

cpp/src/arrow/array/array_list_test.cc

@@ -23,8 +23,8 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_nested.h"
 #include "arrow/buffer.h"
-#include "arrow/builder.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/gtest_util.h"

cpp/src/arrow/array/array_struct_test.cc

@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "arrow/array.h"
-#include "arrow/builder.h"
+#include "arrow/array/builder_nested.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/gtest_util.h"

cpp/src/arrow/array/array_test.cc

@@ -16,11 +16,9 @@
 // under the License.
 
 #include <algorithm>
-#include <array>
 #include <cmath>
 #include <cstdint>
 #include <cstring>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <numeric>
@@ -43,9 +41,7 @@
 #include "arrow/array/util.h"
 #include "arrow/buffer.h"
 #include "arrow/buffer_builder.h"
-#include "arrow/builder.h"
 #include "arrow/compare.h"
-#include "arrow/memory_pool.h"
 #include "arrow/result.h"
 #include "arrow/scalar.h"
 #include "arrow/status.h"

cpp/src/arrow/array/array_union_test.cc

@@ -20,6 +20,8 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_nested.h"
+#include "arrow/array/builder_union.h"
 // TODO ipc shouldn't be included here
 #include "arrow/ipc/test_common.h"
 #include "arrow/testing/gtest_util.h"

cpp/src/arrow/array/builder_base.h

@@ -29,7 +29,7 @@
 #include "arrow/buffer.h"
 #include "arrow/buffer_builder.h"
 #include "arrow/status.h"
-#include "arrow/type.h"
+#include "arrow/type_fwd.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
 
@@ -247,4 +247,24 @@ class ARROW_EXPORT ArrayBuilder {
   ARROW_DISALLOW_COPY_AND_ASSIGN(ArrayBuilder);
 };
 
+/// \brief Construct an empty ArrayBuilder corresponding to the data
+/// type
+/// \param[in] pool the MemoryPool to use for allocations
+/// \param[in] type the data type to create the builder for
+/// \param[out] out the created ArrayBuilder
+ARROW_EXPORT
+Status MakeBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
+                   std::unique_ptr<ArrayBuilder>* out);
+
+/// \brief Construct an empty DictionaryBuilder initialized optionally
+/// with a pre-existing dictionary
+/// \param[in] pool the MemoryPool to use for allocations
+/// \param[in] type the dictionary type to create the builder for
+/// \param[in] dictionary the initial dictionary, if any. May be nullptr
+/// \param[out] out the created ArrayBuilder
+ARROW_EXPORT
+Status MakeDictionaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
+                             const std::shared_ptr<Array>& dictionary,
+                             std::unique_ptr<ArrayBuilder>* out);
+
 }  // namespace arrow

cpp/src/arrow/array/concatenate_test.cc

@@ -31,9 +31,9 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_binary.h"
 #include "arrow/array/concatenate.h"
 #include "arrow/buffer.h"
-#include "arrow/builder.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/random.h"

cpp/src/arrow/array/diff_test.cc

@@ -16,10 +16,8 @@
 // under the License.
 
 #include <algorithm>
-#include <array>
 #include <cstdint>
 #include <cstring>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <numeric>
@@ -31,8 +29,6 @@
 
 #include "arrow/array.h"
 #include "arrow/array/diff.h"
-#include "arrow/buffer.h"
-#include "arrow/builder.h"
 #include "arrow/compute/api.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

cpp/src/arrow/builder.h

@@ -30,30 +30,3 @@
 #include "arrow/array/builder_union.h"      // IWYU pragma: keep
 #include "arrow/status.h"
 #include "arrow/util/visibility.h"
-
-namespace arrow {
-
-class DataType;
-class MemoryPool;
-
-/// \brief Construct an empty ArrayBuilder corresponding to the data
-/// type
-/// \param[in] pool the MemoryPool to use for allocations
-/// \param[in] type the data type to create the builder for
-/// \param[out] out the created ArrayBuilder
-ARROW_EXPORT
-Status MakeBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
-                   std::unique_ptr<ArrayBuilder>* out);
-
-/// \brief Construct an empty DictionaryBuilder initialized optionally
-/// with a pre-existing dictionary
-/// \param[in] pool the MemoryPool to use for allocations
-/// \param[in] type the dictionary type to create the builder for
-/// \param[in] dictionary the initial dictionary, if any. May be nullptr
-/// \param[out] out the created ArrayBuilder
-ARROW_EXPORT
-Status MakeDictionaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
-                             const std::shared_ptr<Array>& dictionary,
-                             std::unique_ptr<ArrayBuilder>* out);
-
-}  // namespace arrow

cpp/src/arrow/compute/kernels/aggregate_benchmark.cc

@@ -19,7 +19,6 @@
 
 #include <vector>
 
-#include "arrow/builder.h"
 #include "arrow/compute/api.h"
 #include "arrow/memory_pool.h"
 #include "arrow/testing/gtest_util.h"

cpp/src/arrow/compute/kernels/scalar_cast_boolean.cc

@@ -17,6 +17,7 @@
 
 // Cast types to boolean
 
+#include "arrow/array/builder_primitive.h"
 #include "arrow/compute/kernels/common.h"
 #include "arrow/compute/kernels/scalar_cast_internal.h"
 #include "arrow/util/value_parsing.h"

cpp/src/arrow/compute/kernels/scalar_cast_internal.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "arrow/builder.h"
 #include "arrow/compute/api_vector.h"
 #include "arrow/compute/cast.h"           // IWYU pragma: export
 #include "arrow/compute/cast_internal.h"  // IWYU pragma: export

cpp/src/arrow/compute/kernels/scalar_cast_nested.cc

@@ -20,6 +20,7 @@
 #include <utility>
 #include <vector>
 
+#include "arrow/array/builder_nested.h"
 #include "arrow/compute/cast.h"
 #include "arrow/compute/kernels/common.h"
 #include "arrow/compute/kernels/scalar_cast_internal.h"

cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc

@@ -17,6 +17,7 @@
 
 // Implementation of casting to integer, floating point, or decimal types
 
+#include "arrow/array/builder_primitive.h"
 #include "arrow/compute/kernels/common.h"
 #include "arrow/compute/kernels/scalar_cast_internal.h"
 #include "arrow/util/bit_block_counter.h"

cpp/src/arrow/compute/kernels/scalar_cast_string.cc

@@ -18,6 +18,7 @@
 // Implementation of casting to integer or floating point types
 
 #include "arrow/array/array_base.h"
+#include "arrow/array/builder_binary.h"
 #include "arrow/compute/kernels/common.h"
 #include "arrow/compute/kernels/scalar_cast_internal.h"
 #include "arrow/result.h"

cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc

@@ -19,6 +19,7 @@
 
 #include <limits>
 
+#include "arrow/array/builder_time.h"
 #include "arrow/compute/kernels/common.h"
 #include "arrow/compute/kernels/scalar_cast_internal.h"
 #include "arrow/util/bitmap_reader.h"

cpp/src/arrow/compute/kernels/scalar_cast_test.cc

@@ -26,10 +26,10 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_decimal.h"
 #include "arrow/buffer.h"
 #include "arrow/chunked_array.h"
 #include "arrow/extension_type.h"
-#include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/testing/extension_type.h"
 #include "arrow/testing/gtest_common.h"

cpp/src/arrow/compute/kernels/scalar_set_lookup_test.cc

@@ -30,6 +30,7 @@
 
 #include "arrow/array/array_base.h"
 #include "arrow/array/builder_binary.h"
+#include "arrow/array/builder_decimal.h"
 #include "arrow/array/builder_primitive.h"
 #include "arrow/chunked_array.h"
 #include "arrow/compute/api.h"

cpp/src/arrow/compute/kernels/vector_hash_benchmark.cc

@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "arrow/builder.h"
+#include "arrow/array/builder_binary.h"
 #include "arrow/memory_pool.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/random.h"

cpp/src/arrow/compute/kernels/vector_hash_test.cc

@@ -29,13 +29,14 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_decimal.h"
 #include "arrow/buffer.h"
 #include "arrow/chunked_array.h"
-#include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/util.h"
 #include "arrow/type.h"
+#include "arrow/type_fwd.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/decimal.h"

cpp/src/arrow/csv/column_builder.cc

@@ -25,16 +25,16 @@
 #include <vector>
 
 #include "arrow/array.h"
-#include "arrow/builder.h"
+#include "arrow/array/builder_base.h"
 #include "arrow/chunked_array.h"
 #include "arrow/csv/column_builder.h"
 #include "arrow/csv/converter.h"
 #include "arrow/csv/inference_internal.h"
 #include "arrow/csv/options.h"
 #include "arrow/csv/parser.h"
-#include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/type.h"
+#include "arrow/type_fwd.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/task_group.h"
 

cpp/src/arrow/csv/column_decoder.cc

@@ -25,15 +25,15 @@
 #include <vector>
 
 #include "arrow/array.h"
-#include "arrow/builder.h"
+#include "arrow/array/builder_base.h"
 #include "arrow/csv/column_decoder.h"
 #include "arrow/csv/converter.h"
 #include "arrow/csv/inference_internal.h"
 #include "arrow/csv/options.h"
 #include "arrow/csv/parser.h"
-#include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/type.h"
+#include "arrow/type_fwd.h"
 #include "arrow/util/future.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/task_group.h"

cpp/src/arrow/csv/converter.cc

@@ -24,11 +24,14 @@
 #include <type_traits>
 #include <vector>
 
-#include "arrow/builder.h"
+#include "arrow/array/builder_binary.h"
+#include "arrow/array/builder_decimal.h"
+#include "arrow/array/builder_dict.h"
+#include "arrow/array/builder_primitive.h"
 #include "arrow/csv/parser.h"
-#include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/type.h"
+#include "arrow/type_fwd.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/decimal.h"

cpp/src/arrow/csv/converter_test.cc

@@ -24,6 +24,7 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_decimal.h"
 #include "arrow/csv/converter.h"
 #include "arrow/csv/options.h"
 #include "arrow/csv/test_common.h"

cpp/src/arrow/dataset/file_base.h

@@ -22,7 +22,6 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 

cpp/src/arrow/dataset/file_parquet.h

@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <string>
-#include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>

cpp/src/arrow/dataset/filter.cc

@@ -22,13 +22,11 @@
 #include <memory>
 #include <numeric>
 #include <string>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
+#include "arrow/array/builder_primitive.h"
 #include "arrow/buffer.h"
-#include "arrow/buffer_builder.h"
-#include "arrow/builder.h"
 #include "arrow/compute/api.h"
 #include "arrow/dataset/dataset.h"
 #include "arrow/io/memory.h"

cpp/src/arrow/dataset/scanner.h

@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <string>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 

cpp/src/arrow/dataset/test_util.h

@@ -22,6 +22,7 @@
 #include <functional>
 #include <memory>
 #include <string>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 

cpp/src/arrow/flight/flight_benchmark.cc

@@ -29,7 +29,6 @@
 
 #include <gflags/gflags.h>
 
-#include "arrow/api.h"
 #include "arrow/io/memory.h"
 #include "arrow/ipc/api.h"
 #include "arrow/record_batch.h"

cpp/src/arrow/io/file_benchmark.cc

@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/api.h"
 #include "arrow/io/buffered.h"
 #include "arrow/io/file.h"
 #include "arrow/testing/gtest_util.h"