Promote buffer.h/status.h/memory-pool.h to top level directory

Change-Id: If499bab530929beed1e76e631a1512d44d8f4d62

cpp/CMakeLists.txt

@@ -743,17 +743,17 @@ set(ARROW_PRIVATE_LINK_LIBS
 
 set(ARROW_SRCS
   src/arrow/array.cc
+  src/arrow/buffer.cc
   src/arrow/builder.cc
   src/arrow/column.cc
+  src/arrow/memory_pool.cc
   src/arrow/pretty_print.cc
   src/arrow/schema.cc
+  src/arrow/status.cc
   src/arrow/table.cc
   src/arrow/type.cc
 
   src/arrow/util/bit-util.cc
-  src/arrow/util/buffer.cc
-  src/arrow/util/memory-pool.cc
-  src/arrow/util/status.cc
 )
 
 add_library(arrow_objlib OBJECT

cpp/src/arrow/CMakeLists.txt

@@ -20,9 +20,12 @@ install(FILES
   api.h
   array.h
   column.h
+  buffer.h
   builder.h
+  memory_pool.h
   pretty_print.h
   schema.h
+  status.h
   table.h
   type.h
   type_fwd.h
@@ -42,10 +45,12 @@ ADD_ARROW_TEST(array-list-test)
 ADD_ARROW_TEST(array-primitive-test)
 ADD_ARROW_TEST(array-string-test)
 ADD_ARROW_TEST(array-struct-test)
-
+ADD_ARROW_TEST(buffer-test)
 ADD_ARROW_TEST(column-test)
+ADD_ARROW_TEST(memory_pool-test)
 ADD_ARROW_TEST(pretty_print-test)
 ADD_ARROW_TEST(schema-test)
+ADD_ARROW_TEST(status-test)
 ADD_ARROW_TEST(table-test)
 
 ADD_ARROW_BENCHMARK(column-benchmark)

cpp/src/arrow/api.h

@@ -26,9 +26,8 @@
 #include "arrow/schema.h"
 #include "arrow/table.h"
 #include "arrow/type.h"
-
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
+#include "arrow/buffer.h"
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 
 #endif  // ARROW_API_H

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

@@ -25,9 +25,9 @@
 
 #include "arrow/array.h"
 #include "arrow/builder.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
-#include "arrow/util/status.h"
 
 using std::shared_ptr;
 using std::string;

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

@@ -23,13 +23,13 @@
 #include "gtest/gtest.h"
 
 #include "arrow/array.h"
+#include "arrow/buffer.h"
 #include "arrow/builder.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/status.h"
 
 using std::string;
 using std::shared_ptr;

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

@@ -23,9 +23,9 @@
 
 #include "arrow/array.h"
 #include "arrow/builder.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
-#include "arrow/util/status.h"
 
 using std::shared_ptr;
 using std::string;

cpp/src/arrow/array-test.cc

@@ -24,10 +24,10 @@
 #include "gtest/gtest.h"
 
 #include "arrow/array.h"
+#include "arrow/buffer.h"
+#include "arrow/memory_pool.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
 
 namespace arrow {
 

cpp/src/arrow/array.h

@@ -21,9 +21,9 @@
 #include <cstdint>
 #include <memory>
 
+#include "arrow/buffer.h"
 #include "arrow/type.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
 
@@ -110,8 +110,7 @@ typedef std::shared_ptr<Array> ArrayPtr;
 Status ARROW_EXPORT GetEmptyBitmap(
     MemoryPool* pool, int32_t length, std::shared_ptr<MutableBuffer>* result);
 
-// Base class for fixed-size logical types.  See MakePrimitiveArray
-// (types/construct.h) for constructing a specific subclass.
+// Base class for fixed-size logical types
 class ARROW_EXPORT PrimitiveArray : public Array {
  public:
   virtual ~PrimitiveArray() {}

cpp/src/arrow/buffer-test.cc

@@ -21,9 +21,9 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/buffer.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/status.h"
 
 using std::string;
 

cpp/src/arrow/buffer.h

@@ -23,8 +23,8 @@
 #include <cstring>
 #include <memory>
 
+#include "arrow/status.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/status.h"
 #include "arrow/util/visibility.h"
 
 namespace arrow {

cpp/src/arrow/builder.h

@@ -22,11 +22,11 @@
 #include <memory>
 #include <vector>
 
+#include "arrow/buffer.h"
+#include "arrow/status.h"
 #include "arrow/type.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/status.h"
 #include "arrow/util/visibility.h"
 
 namespace arrow {

cpp/src/arrow/io/file.cc

@@ -107,9 +107,9 @@
 
 #include "arrow/io/interfaces.h"
 
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
+#include "arrow/buffer.h"
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/hdfs.cc

@@ -22,10 +22,10 @@
 #include <sstream>
 #include <string>
 
+#include "arrow/buffer.h"
 #include "arrow/io/hdfs.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/interfaces.cc

@@ -20,8 +20,8 @@
 #include <cstdint>
 #include <memory>
 
-#include "arrow/util/buffer.h"
-#include "arrow/util/status.h"
+#include "arrow/buffer.h"
+#include "arrow/status.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/io-file-test.cc

@@ -30,7 +30,7 @@
 
 #include "arrow/io/file.h"
 #include "arrow/io/test-common.h"
-#include "arrow/util/memory-pool.h"
+#include "arrow/memory_pool.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/io-hdfs-test.cc

@@ -25,8 +25,8 @@
 #include <boost/filesystem.hpp>  // NOLINT
 
 #include "arrow/io/hdfs.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
-#include "arrow/util/status.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/libhdfs_shim.cc

@@ -53,7 +53,7 @@ extern "C" {
 
 #include <boost/filesystem.hpp>  // NOLINT
 
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 #include "arrow/util/visibility.h"
 
 namespace fs = boost::filesystem;

cpp/src/arrow/io/memory.cc

@@ -38,10 +38,9 @@
 #include <sstream>
 #include <string>
 
+#include "arrow/buffer.h"
 #include "arrow/io/interfaces.h"
-
-#include "arrow/util/buffer.h"
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/io/test-common.h

@@ -32,10 +32,10 @@
 // nothing
 #endif
 
+#include "arrow/buffer.h"
 #include "arrow/io/memory.h"
+#include "arrow/memory_pool.h"
 #include "arrow/test-util.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
 
 namespace arrow {
 namespace io {

cpp/src/arrow/ipc/adapter.cc

@@ -32,7 +32,6 @@
 #include "arrow/schema.h"
 #include "arrow/table.h"
 #include "arrow/type.h"
-#include "arrow/types/construct.h"
 #include "arrow/util/bit-util.h"
 #include "arrow/util/buffer.h"
 #include "arrow/util/logging.h"

cpp/src/arrow/ipc/test-common.h

@@ -25,13 +25,13 @@
 #include <vector>
 
 #include "arrow/array.h"
+#include "arrow/buffer.h"
 #include "arrow/builder.h"
+#include "arrow/memory_pool.h"
 #include "arrow/table.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/memory-pool.h"
 
 namespace arrow {
 namespace ipc {

cpp/src/arrow/ipc/util.h

@@ -22,7 +22,7 @@
 
 #include "arrow/array.h"
 #include "arrow/io/interfaces.h"
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 namespace arrow {
 namespace ipc {

cpp/src/arrow/memory_pool-test.cc

@@ -20,9 +20,9 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 #include "arrow/test-util.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
 
 namespace arrow {
 

cpp/src/arrow/status-test.cc

@@ -17,8 +17,8 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/status.h"
 #include "arrow/test-util.h"
-#include "arrow/util/status.h"
 
 namespace arrow {
 

cpp/src/arrow/table-test.cc

@@ -24,10 +24,10 @@
 #include "arrow/array.h"
 #include "arrow/column.h"
 #include "arrow/schema.h"
+#include "arrow/status.h"
 #include "arrow/table.h"
 #include "arrow/test-util.h"
 #include "arrow/type.h"
-#include "arrow/util/status.h"
 
 using std::shared_ptr;
 using std::vector;

cpp/src/arrow/test-util.h

@@ -28,18 +28,18 @@
 #include "gtest/gtest.h"
 
 #include "arrow/array.h"
+#include "arrow/buffer.h"
 #include "arrow/builder.h"
 #include "arrow/column.h"
+#include "arrow/memory_pool.h"
 #include "arrow/schema.h"
+#include "arrow/status.h"
 #include "arrow/table.h"
 #include "arrow/type.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
 #include "arrow/util/logging.h"
-#include "arrow/util/memory-pool.h"
 #include "arrow/util/random.h"
-#include "arrow/util/status.h"
 
 #define ASSERT_RAISES(ENUM, expr)                  \
   do {                                             \

cpp/src/arrow/type.h

@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
+#include "arrow/status.h"
 #include "arrow/type_fwd.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/status.h"
 #include "arrow/util/visibility.h"
 
 namespace arrow {

cpp/src/arrow/util/CMakeLists.txt

@@ -22,12 +22,9 @@
 # Headers: top level
 install(FILES
   bit-util.h
-  buffer.h
   logging.h
   macros.h
-  memory-pool.h
   random.h
-  status.h
   visibility.h
   DESTINATION include/arrow/util)
 
@@ -72,6 +69,3 @@ if (ARROW_BUILD_BENCHMARKS)
 endif()
 
 ADD_ARROW_TEST(bit-util-test)
-ADD_ARROW_TEST(buffer-test)
-ADD_ARROW_TEST(memory-pool-test)
-ADD_ARROW_TEST(status-test)

python/src/pyarrow/adapters/builtin.cc

@@ -21,7 +21,7 @@
 #include "pyarrow/adapters/builtin.h"
 
 #include "arrow/api.h"
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 #include "pyarrow/helpers.h"
 

python/src/pyarrow/adapters/pandas.cc

@@ -31,7 +31,7 @@
 
 #include "arrow/api.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 #include "pyarrow/common.h"
 #include "pyarrow/config.h"

python/src/pyarrow/common.cc

@@ -21,8 +21,8 @@
 #include <mutex>
 #include <sstream>
 
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 
 using arrow::Status;
 

python/src/pyarrow/common.h

@@ -19,10 +19,11 @@
 #define PYARROW_COMMON_H
 
 #include "pyarrow/config.h"
-#include "arrow/util/buffer.h"
-#include "arrow/util/macros.h"
 #include "pyarrow/visibility.h"
 
+#include "arrow/buffer.h"
+#include "arrow/util/macros.h"
+
 namespace arrow { class MemoryPool; }
 
 namespace pyarrow {

python/src/pyarrow/io.cc

@@ -21,8 +21,8 @@
 #include <cstdlib>
 
 #include "arrow/io/memory.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
+#include "arrow/memory_pool.h"
+#include "arrow/status.h"
 
 #include "pyarrow/common.h"