[arrow] branch master updated: ARROW-5289: [C++] Move arrow/util/concatenate* to arrow/array

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emkornfield pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new aa18d25  ARROW-5289: [C++] Move arrow/util/concatenate* to arrow/array
aa18d25 is described below

commit aa18d257d0acee781e4fd3be169e3ec4033c8c55
Author: Wes McKinney <we...@apache.org>
AuthorDate: Fri May 31 23:11:20 2019 -0700

    ARROW-5289: [C++] Move arrow/util/concatenate* to arrow/array
    
    The array/ subfolder is a more natural place to organize algorithms and other code relating to manipulating columnar array objects
    
    Author: Wes McKinney <we...@apache.org>
    
    Closes #4445 from wesm/ARROW-5289 and squashes the following commits:
    
    002dfc987 <Wes McKinney> Move arrow/util/concatenate* to arrow/array
---
 cpp/src/arrow/CMakeLists.txt                      | 2 +-
 cpp/src/arrow/array/CMakeLists.txt                | 2 ++
 cpp/src/arrow/{util => array}/concatenate-test.cc | 2 +-
 cpp/src/arrow/{util => array}/concatenate.cc      | 2 +-
 cpp/src/arrow/{util => array}/concatenate.h       | 0
 cpp/src/arrow/util/CMakeLists.txt                 | 1 -
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index c182ddb..a6c64dc 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/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
diff --git a/cpp/src/arrow/array/CMakeLists.txt b/cpp/src/arrow/array/CMakeLists.txt
index 1051863..88bc4ea 100644
--- a/cpp/src/arrow/array/CMakeLists.txt
+++ b/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")
diff --git a/cpp/src/arrow/util/concatenate-test.cc b/cpp/src/arrow/array/concatenate-test.cc
similarity index 99%
rename from cpp/src/arrow/util/concatenate-test.cc
rename to cpp/src/arrow/array/concatenate-test.cc
index 0a4d851..90f55bf 100644
--- a/cpp/src/arrow/util/concatenate-test.cc
+++ b/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 {
 
diff --git a/cpp/src/arrow/util/concatenate.cc b/cpp/src/arrow/array/concatenate.cc
similarity index 99%
rename from cpp/src/arrow/util/concatenate.cc
rename to cpp/src/arrow/array/concatenate.cc
index f0bbaff..ff6ead3 100644
--- a/cpp/src/arrow/util/concatenate.cc
+++ b/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>
diff --git a/cpp/src/arrow/util/concatenate.h b/cpp/src/arrow/array/concatenate.h
similarity index 100%
rename from cpp/src/arrow/util/concatenate.h
rename to cpp/src/arrow/array/concatenate.h
diff --git a/cpp/src/arrow/util/CMakeLists.txt b/cpp/src/arrow/util/CMakeLists.txt
index 159374b..a4eb5e8 100644
--- a/cpp/src/arrow/util/CMakeLists.txt
+++ b/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)