Address comments

zanmato1984 · Dec 23, 2023 · 7819b70 · 7819b70
1 parent 7a841e4
commit 7819b70
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/cpp/src/arrow/compute/api.h b/cpp/src/arrow/compute/api.h
@@ -28,15 +28,15 @@
 /// @{
 /// @}
 
-#include "arrow/compute/api_aggregate.h"  // IWYU pragma: export
-#include "arrow/compute/api_scalar.h"     // IWYU pragma: export
-#include "arrow/compute/api_vector.h"     // IWYU pragma: export
-#include "arrow/compute/cast.h"           // IWYU pragma: export
-#include "arrow/compute/function.h"       // IWYU pragma: export
-#include "arrow/compute/kernel.h"         // IWYU pragma: export
-#include "arrow/compute/options.h"        // IWYU pragma: export
-#include "arrow/compute/registry.h"       // IWYU pragma: export
-#include "arrow/datum.h"                  // IWYU pragma: export
+#include "arrow/compute/api_aggregate.h"     // IWYU pragma: export
+#include "arrow/compute/api_scalar.h"        // IWYU pragma: export
+#include "arrow/compute/api_vector.h"        // IWYU pragma: export
+#include "arrow/compute/cast.h"              // IWYU pragma: export
+#include "arrow/compute/function.h"          // IWYU pragma: export
+#include "arrow/compute/function_options.h"  // IWYU pragma: export
+#include "arrow/compute/kernel.h"            // IWYU pragma: export
+#include "arrow/compute/registry.h"          // IWYU pragma: export
+#include "arrow/datum.h"                     // IWYU pragma: export
 
 #include "arrow/compute/expression.h"  // IWYU pragma: export
 

diff --git a/cpp/src/arrow/compute/api_aggregate.h b/cpp/src/arrow/compute/api_aggregate.h
@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#include "arrow/compute/options.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/datum.h"
 #include "arrow/result.h"
 #include "arrow/util/macros.h"

diff --git a/cpp/src/arrow/compute/api_scalar.h b/cpp/src/arrow/compute/api_scalar.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <utility>
 
-#include "arrow/compute/options.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/compute/type_fwd.h"
 #include "arrow/datum.h"
 #include "arrow/result.h"

diff --git a/cpp/src/arrow/compute/api_vector.h b/cpp/src/arrow/compute/api_vector.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <utility>
 
-#include "arrow/compute/options.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/compute/ordering.h"
 #include "arrow/result.h"
 #include "arrow/type_fwd.h"

diff --git a/cpp/src/arrow/compute/cast.h b/cpp/src/arrow/compute/cast.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "arrow/compute/function.h"
-#include "arrow/compute/options.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/compute/type_fwd.h"
 #include "arrow/result.h"
 #include "arrow/status.h"

diff --git a/cpp/src/arrow/compute/function.cc b/cpp/src/arrow/compute/function.cc
@@ -26,8 +26,8 @@
 #include "arrow/compute/exec.h"
 #include "arrow/compute/exec_internal.h"
 #include "arrow/compute/function_internal.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/compute/kernels/common_internal.h"
-#include "arrow/compute/options.h"
 #include "arrow/compute/registry.h"
 #include "arrow/datum.h"
 #include "arrow/util/cpu_info.h"

diff --git a/cpp/src/arrow/compute/options.h → cpp/src/arrow/compute/function_options.h b/cpp/src/arrow/compute/options.h → cpp/src/arrow/compute/function_options.h
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// NOTE: API is EXPERIMENTAL and will change without going through a
+// deprecation cycle.
+
 #pragma once
 
 #include "arrow/compute/type_fwd.h"

diff --git a/cpp/src/arrow/compute/registry_test.cc b/cpp/src/arrow/compute/registry_test.cc
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 
 #include "arrow/compute/function.h"
-#include "arrow/compute/options.h"
+#include "arrow/compute/function_options.h"
 #include "arrow/compute/registry.h"
 #include "arrow/result.h"
 #include "arrow/status.h"