diff --git a/cpp/src/arrow/acero/aggregate_node_test.cc b/cpp/src/arrow/acero/aggregate_node_test.cc index 83f877106b6df..f980496d527d1 100644 --- a/cpp/src/arrow/acero/aggregate_node_test.cc +++ b/cpp/src/arrow/acero/aggregate_node_test.cc @@ -33,6 +33,8 @@ namespace arrow { +using compute::ExecBatchFromJSON; + namespace acero { Result> TableGroupBy( diff --git a/cpp/src/arrow/acero/asof_join_node_test.cc b/cpp/src/arrow/acero/asof_join_node_test.cc index 52d58ec4e74e9..c726ac7c821a7 100644 --- a/cpp/src/arrow/acero/asof_join_node_test.cc +++ b/cpp/src/arrow/acero/asof_join_node_test.cc @@ -68,6 +68,7 @@ namespace arrow { using compute::Cast; using compute::Divide; +using compute::ExecBatchFromJSON; using compute::Multiply; using compute::Subtract; diff --git a/cpp/src/arrow/acero/hash_aggregate_test.cc b/cpp/src/arrow/acero/hash_aggregate_test.cc index 769ac2164b348..7f4b6dd75272f 100644 --- a/cpp/src/arrow/acero/hash_aggregate_test.cc +++ b/cpp/src/arrow/acero/hash_aggregate_test.cc @@ -69,9 +69,11 @@ using internal::checked_cast; using internal::checked_pointer_cast; using internal::ToChars; +using compute::ArgShape; using compute::CallFunction; using compute::CountOptions; using compute::default_exec_context; +using compute::ExecBatchFromJSON; using compute::ExecSpan; using compute::FunctionOptions; using compute::Grouper; @@ -83,6 +85,7 @@ using compute::SortKey; using compute::SortOrder; using compute::Take; using compute::TDigestOptions; +using compute::ValidateOutput; using compute::VarianceOptions; namespace acero { diff --git a/cpp/src/arrow/acero/hash_join_node_test.cc b/cpp/src/arrow/acero/hash_join_node_test.cc index 671257b2e27af..94504ccc9ba75 100644 --- a/cpp/src/arrow/acero/hash_join_node_test.cc +++ b/cpp/src/arrow/acero/hash_join_node_test.cc @@ -49,6 +49,7 @@ using compute::and_; using compute::call; using compute::default_exec_context; using compute::ExecBatchBuilder; +using compute::ExecBatchFromJSON; using compute::ExecSpan; using compute::field_ref; using compute::SortIndices; diff --git a/cpp/src/arrow/acero/plan_test.cc b/cpp/src/arrow/acero/plan_test.cc index 9b0ea8c564ad9..61ab09f6674d9 100644 --- a/cpp/src/arrow/acero/plan_test.cc +++ b/cpp/src/arrow/acero/plan_test.cc @@ -52,8 +52,10 @@ using testing::UnorderedElementsAreArray; namespace arrow { +using compute::ArgShape; using compute::call; using compute::CountOptions; +using compute::ExecBatchFromJSON; using compute::field_ref; using compute::ScalarAggregateOptions; using compute::SortKey; diff --git a/cpp/src/arrow/acero/test_util_internal.cc b/cpp/src/arrow/acero/test_util_internal.cc index 312a78fec2324..2748d4107ed36 100644 --- a/cpp/src/arrow/acero/test_util_internal.cc +++ b/cpp/src/arrow/acero/test_util_internal.cc @@ -60,6 +60,7 @@ namespace arrow { using arrow::internal::CpuInfo; using arrow::internal::Executor; +using compute::ExecBatchFromJSON; using compute::SortKey; using compute::Take; diff --git a/cpp/src/arrow/compute/kernels/scalar_compare_benchmark.cc b/cpp/src/arrow/compute/kernels/scalar_compare_benchmark.cc index 5d5e20d2f0de9..fdfd63498f5a8 100644 --- a/cpp/src/arrow/compute/kernels/scalar_compare_benchmark.cc +++ b/cpp/src/arrow/compute/kernels/scalar_compare_benchmark.cc @@ -20,7 +20,6 @@ #include #include "arrow/compute/api_scalar.h" -#include "arrow/compute/function.h" #include "arrow/compute/kernels/test_util_internal.h" #include "arrow/testing/gtest_util.h" #include "arrow/testing/random.h" diff --git a/cpp/src/arrow/compute/kernels/scalar_random_benchmark.cc b/cpp/src/arrow/compute/kernels/scalar_random_benchmark.cc index a78548efaa592..bf4a339a9bd81 100644 --- a/cpp/src/arrow/compute/kernels/scalar_random_benchmark.cc +++ b/cpp/src/arrow/compute/kernels/scalar_random_benchmark.cc @@ -19,7 +19,6 @@ #include "arrow/compute/api_scalar.h" #include "arrow/compute/exec.h" -#include "arrow/compute/function.h" #include "arrow/testing/gtest_util.h" #include "arrow/util/benchmark_util.h" diff --git a/cpp/src/arrow/compute/kernels/scalar_string_benchmark.cc b/cpp/src/arrow/compute/kernels/scalar_string_benchmark.cc index 299c61c171c26..a2cfbd0597437 100644 --- a/cpp/src/arrow/compute/kernels/scalar_string_benchmark.cc +++ b/cpp/src/arrow/compute/kernels/scalar_string_benchmark.cc @@ -22,7 +22,7 @@ #include "arrow/array.h" #include "arrow/chunked_array.h" #include "arrow/compute/api_scalar.h" -#include "arrow/compute/function.h" +#include "arrow/compute/exec.h" #include "arrow/datum.h" #include "arrow/testing/gtest_util.h" #include "arrow/testing/random.h" diff --git a/cpp/src/arrow/compute/kernels/vector_sort_benchmark.cc b/cpp/src/arrow/compute/kernels/vector_sort_benchmark.cc index fd739c29ead9f..5c31d4da38add 100644 --- a/cpp/src/arrow/compute/kernels/vector_sort_benchmark.cc +++ b/cpp/src/arrow/compute/kernels/vector_sort_benchmark.cc @@ -20,7 +20,7 @@ #include "arrow/array.h" #include "arrow/chunked_array.h" #include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" +#include "arrow/compute/exec.h" #include "arrow/datum.h" #include "arrow/table.h" #include "arrow/testing/gtest_util.h" diff --git a/cpp/src/arrow/compute/kernels/vector_topk_benchmark.cc b/cpp/src/arrow/compute/kernels/vector_topk_benchmark.cc index 77a918b51f08f..44452471b25ab 100644 --- a/cpp/src/arrow/compute/kernels/vector_topk_benchmark.cc +++ b/cpp/src/arrow/compute/kernels/vector_topk_benchmark.cc @@ -20,7 +20,7 @@ #include "arrow/array.h" #include "arrow/chunked_array.h" #include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" +#include "arrow/compute/exec.h" #include "arrow/datum.h" #include "arrow/testing/gtest_util.h" #include "arrow/testing/random.h" diff --git a/cpp/src/arrow/compute/test_util_internal.cc b/cpp/src/arrow/compute/test_util_internal.cc index 92652b6126129..23ed5909ee0fd 100644 --- a/cpp/src/arrow/compute/test_util_internal.cc +++ b/cpp/src/arrow/compute/test_util_internal.cc @@ -29,7 +29,7 @@ #include "arrow/util/logging.h" #include "arrow/util/vector.h" -namespace arrow { +namespace arrow::compute { using compute::ExecBatch; using internal::MapVector; @@ -120,4 +120,4 @@ void ValidateOutput(const Datum& output) { } } -} // namespace arrow +} // namespace arrow::compute diff --git a/cpp/src/arrow/compute/test_util_internal.h b/cpp/src/arrow/compute/test_util_internal.h index b3e581c449edc..6a172b07692ec 100644 --- a/cpp/src/arrow/compute/test_util_internal.h +++ b/cpp/src/arrow/compute/test_util_internal.h @@ -23,7 +23,7 @@ #include "arrow/compute/exec.h" #include "arrow/type_fwd.h" -namespace arrow { +namespace arrow::compute { using compute::ExecBatch; @@ -39,4 +39,4 @@ ExecBatch ExecBatchFromJSON(const std::vector& types, void ValidateOutput(const Datum& output); -} // namespace arrow +} // namespace arrow::compute diff --git a/cpp/src/arrow/dataset/file_test.cc b/cpp/src/arrow/dataset/file_test.cc index 9986b49f3ad86..5d6068557f047 100644 --- a/cpp/src/arrow/dataset/file_test.cc +++ b/cpp/src/arrow/dataset/file_test.cc @@ -43,6 +43,7 @@ namespace cp = arrow::compute; namespace arrow { +using compute::ExecBatchFromJSON; using internal::TemporaryDir; namespace dataset {