Move arrow/util/concatenate* to arrow/array

cpp/src/arrow/CMakeLists.txt

@@ -85,6 +85,7 @@ set(ARROW_SRCS
     array/builder_nested.cc
     array/builder_primitive.cc
     array/builder_union.cc
+    array/concatenate.cc
     buffer.cc
     compare.cc
     extension_type.cc
@@ -125,7 +126,6 @@ set(ARROW_SRCS
     testing/util.cc
     util/basic_decimal.cc
     util/bit-util.cc
-    util/concatenate.cc
     util/compression.cc
     util/cpu-info.cc
     util/decimal.cc

cpp/src/arrow/array/CMakeLists.txt

@@ -15,5 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+add_arrow_test(concatenate-test)
+
 # Headers: top level
 arrow_install_all_headers("arrow/array")

cpp/src/arrow/array/concatenate-test.cc

@@ -30,13 +30,13 @@
 #include <gtest/gtest.h>
 
 #include "arrow/array.h"
+#include "arrow/array/concatenate.h"
 #include "arrow/buffer.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/random.h"
 #include "arrow/testing/util.h"
 #include "arrow/type.h"
-#include "arrow/util/concatenate.h"
 
 namespace arrow {
 

cpp/src/arrow/array/concatenate.cc

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/util/concatenate.h"
+#include "arrow/array/concatenate.h"
 
 #include <algorithm>
 #include <limits>

cpp/src/arrow/util/CMakeLists.txt

@@ -29,7 +29,6 @@ arrow_install_all_headers("arrow/util")
 add_arrow_test(bit-util-test)
 add_arrow_test(checked-cast-test)
 add_arrow_test(compression-test)
-add_arrow_test(concatenate-test)
 add_arrow_test(decimal-test)
 add_arrow_test(hashing-test)
 add_arrow_test(int-util-test)