Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-418: [C++] Array / Builder class code reorganization, flattening #236

Closed
wants to merge 5 commits into from
Closed

ARROW-418: [C++] Array / Builder class code reorganization, flattening #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cdf059
Consolidate Array and Builder classes in array.h, builder.h. Remove a…
wesm Dec 12, 2016
66ac3f7
Promote buffer.h/status.h/memory-pool.h to top level directory
wesm Dec 12, 2016
6f7ae77
Fixes, cpplint
wesm Dec 12, 2016
9dc2e22
Fix remaining old includes
wesm Dec 12, 2016
6f556ea
Add missing math.h include for clang
wesm Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,25 +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/types/construct.cc
src/arrow/types/decimal.cc
src/arrow/types/list.cc
src/arrow/types/primitive.cc
src/arrow/types/string.cc
src/arrow/types/struct.cc
src/arrow/types/union.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
Expand Down Expand Up @@ -823,7 +815,6 @@ endif()
add_subdirectory(src/arrow)
add_subdirectory(src/arrow/io)
add_subdirectory(src/arrow/util)
add_subdirectory(src/arrow/types)

#----------------------------------------------------------------------
# IPC library
Expand Down
11 changes: 11 additions & 0 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,9 +40,17 @@ install(FILES
set(ARROW_TEST_LINK_LIBS ${ARROW_MIN_TEST_LIBS})

ADD_ARROW_TEST(array-test)
ADD_ARROW_TEST(array-decimal-test)
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)
13 changes: 3 additions & 10 deletions cpp/src/arrow/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,13 @@
#define ARROW_API_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/types/construct.h"
#include "arrow/types/list.h"
#include "arrow/types/primitive.h"
#include "arrow/types/string.h"
#include "arrow/types/struct.h"

#include "arrow/util/buffer.h"
#include "arrow/util/memory-pool.h"
#include "arrow/util/status.h"

#endif // ARROW_API_H
2 changes: 1 addition & 1 deletion cpp/src/arrow/types/decimal-test.cc → cpp/src/arrow/array-decimal-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "gtest/gtest.h"

#include "arrow/types/decimal.h"
#include "arrow/type.h"

namespace arrow {

Expand Down
6 changes: 1 addition & 5 deletions cpp/src/arrow/types/list-test.cc → cpp/src/arrow/array-list-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +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/types/construct.h"
#include "arrow/types/list.h"
#include "arrow/types/primitive.h"
#include "arrow/types/test-common.h"
#include "arrow/util/status.h"

using std::shared_ptr;
using std::string;
Expand Down
8 changes: 3 additions & 5 deletions cpp/src/arrow/types/primitive-test.cc → cpp/src/arrow/array-primitive-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@

#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/types/construct.h"
#include "arrow/types/primitive.h"
#include "arrow/types/test-common.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/buffer.h"
#include "arrow/util/status.h"

using std::string;
using std::shared_ptr;
Expand Down
4 changes: 1 addition & 3 deletions cpp/src/arrow/types/string-test.cc → cpp/src/arrow/array-string-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
#include "gtest/gtest.h"

#include "arrow/array.h"
#include "arrow/builder.h"
#include "arrow/test-util.h"
#include "arrow/type.h"
#include "arrow/types/primitive.h"
#include "arrow/types/string.h"
#include "arrow/types/test-common.h"

namespace arrow {

Expand Down
7 changes: 1 addition & 6 deletions cpp/src/arrow/types/struct-test.cc → cpp/src/arrow/array-struct-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +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/types/construct.h"
#include "arrow/types/list.h"
#include "arrow/types/primitive.h"
#include "arrow/types/struct.h"
#include "arrow/types/test-common.h"
#include "arrow/util/status.h"

using std::shared_ptr;
using std::string;
Expand Down
5 changes: 2 additions & 3 deletions cpp/src/arrow/array-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +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/types/primitive.h"
#include "arrow/util/buffer.h"
#include "arrow/util/memory-pool.h"

namespace arrow {

Expand Down
Loading