Rename columnar/ directory to array/

Change-Id: I7fac456a34aa81683fa7315ae1b287be7f0d16e0

cpp/src/arrow/CMakeLists.txt

@@ -53,8 +53,17 @@ endfunction()
 
 set(ARROW_SRCS
   array.cc
-  buffer.cc
+
   builder.cc
+  array/builder_adaptive.cc
+  array/builder_base.cc
+  array/builder_binary.cc
+  array/builder_decimal.cc
+  array/builder_dict.cc
+  array/builder_nested.cc
+  array/builder_primitive.cc
+
+  buffer.cc
   compare.cc
   memory_pool.cc
   pretty_print.cc
@@ -66,14 +75,6 @@ set(ARROW_SRCS
   type.cc
   visitor.cc
 
-  columnar/builder_adaptive.cc
-  columnar/builder_base.cc
-  columnar/builder_binary.cc
-  columnar/builder_decimal.cc
-  columnar/builder_dict.cc
-  columnar/builder_nested.cc
-  columnar/builder_primitive.cc
-
   csv/converter.cc
   csv/chunker.cc
   csv/column-builder.cc
@@ -302,7 +303,7 @@ ADD_ARROW_TEST(tensor-test)
 ADD_ARROW_BENCHMARK(builder-benchmark)
 ADD_ARROW_BENCHMARK(column-benchmark)
 
-add_subdirectory(columnar)
+add_subdirectory(array)
 add_subdirectory(csv)
 add_subdirectory(io)
 add_subdirectory(util)

cpp/src/arrow/array/CMakeLists.txt

@@ -24,4 +24,4 @@ install(FILES
   builder_dict.h
   builder_nested.h
   builder_primitive.h
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/columnar")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/array")

cpp/src/arrow/array/README.md

@@ -0,0 +1,20 @@
+<!---
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+## Implementation details related to columnnar (array) data structures

cpp/src/arrow/array/builder_adaptive.cc

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

cpp/src/arrow/array/builder_adaptive.h

@@ -19,7 +19,7 @@
 
 #include <memory>
 
-#include "arrow/columnar/builder_base.h"
+#include "arrow/array/builder_base.h"
 
 namespace arrow {
 

cpp/src/arrow/array/builder_base.cc

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

cpp/src/arrow/array/builder_base.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "arrow/columnar/builder_base.h"
+#include "arrow/array/builder_base.h"
 
 #include <algorithm>  // IWYU pragma: keep
 #include <array>

cpp/src/arrow/array/builder_binary.cc

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

cpp/src/arrow/array/builder_binary.h

@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "arrow/array.h"
-#include "arrow/columnar/builder_base.h"
+#include "arrow/array/builder_base.h"
 #include "arrow/status.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/macros.h"

cpp/src/arrow/array/builder_decimal.cc

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

cpp/src/arrow/array/builder_decimal.h

@@ -19,8 +19,8 @@
 
 #include <memory>
 
-#include "arrow/columnar/builder_base.h"
-#include "arrow/columnar/builder_binary.h"
+#include "arrow/array/builder_base.h"
+#include "arrow/array/builder_binary.h"
 
 namespace arrow {
 

cpp/src/arrow/array/builder_dict.cc

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

cpp/src/arrow/array/builder_dict.h

@@ -19,8 +19,8 @@
 
 #include <memory>
 
-#include "arrow/columnar/builder_adaptive.h"  // IWYU pragma: export
-#include "arrow/columnar/builder_base.h"      // IWYU pragma: export
+#include "arrow/array/builder_adaptive.h"  // IWYU pragma: export
+#include "arrow/array/builder_base.h"      // IWYU pragma: export
 
 namespace arrow {
 

cpp/src/arrow/array/builder_nested.cc

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

cpp/src/arrow/array/builder_nested.h

@@ -20,7 +20,7 @@
 #include <memory>
 #include <vector>
 
-#include "arrow/columnar/builder_base.h"
+#include "arrow/array/builder_base.h"
 
 namespace arrow {
 

cpp/src/arrow/array/builder_primitive.cc

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

cpp/src/arrow/array/builder_primitive.h

@@ -21,7 +21,7 @@
 #include <memory>
 #include <vector>
 
-#include "arrow/columnar/builder_base.h"
+#include "arrow/array/builder_base.h"
 #include "arrow/type.h"
 
 namespace arrow {

cpp/src/arrow/builder.h

@@ -19,13 +19,13 @@
 
 #include <memory>
 
-#include "arrow/columnar/builder_adaptive.h"   // IWYU pragma: export
-#include "arrow/columnar/builder_base.h"       // IWYU pragma: export
-#include "arrow/columnar/builder_binary.h"     // IWYU pragma: export
-#include "arrow/columnar/builder_decimal.h"    // IWYU pragma: export
-#include "arrow/columnar/builder_dict.h"       // IWYU pragma: export
-#include "arrow/columnar/builder_nested.h"     // IWYU pragma: export
-#include "arrow/columnar/builder_primitive.h"  // IWYU pragma: export
+#include "arrow/array/builder_adaptive.h"   // IWYU pragma: export
+#include "arrow/array/builder_base.h"       // IWYU pragma: export
+#include "arrow/array/builder_binary.h"     // IWYU pragma: export
+#include "arrow/array/builder_decimal.h"    // IWYU pragma: export
+#include "arrow/array/builder_dict.h"       // IWYU pragma: export
+#include "arrow/array/builder_nested.h"     // IWYU pragma: export
+#include "arrow/array/builder_primitive.h"  // IWYU pragma: export
 #include "arrow/status.h"
 #include "arrow/util/visibility.h"