PARQUET-848: Build Thrift bits as part of main parquet_objlib component

Author: Wes McKinney <wes.mckinney@twosigma.com> Closes apache#232 from wesm/remove-libparquet_thrift and squashes the following commits: d72546b [Wes McKinney] Remove parquet/thrift subdirectory and separate parquet_thrift library component Change-Id: I3922cf10aab607e8db5ddabba888a38763ff59f7
wesm · Jan 29, 2017 · 29caeae · 29caeae
1 parent a6388df
commit 29caeae
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 61 deletions.
diff --git a/cpp/src/parquet/thrift/.gitignore → cpp/src/parquet/.gitignore b/cpp/src/parquet/thrift/.gitignore → cpp/src/parquet/.gitignore
diff --git a/cpp/src/parquet/file/file-deserialize-test.cc b/cpp/src/parquet/file/file-deserialize-test.cc
@@ -30,8 +30,8 @@
 #include "parquet/compression.h"
 #include "parquet/exception.h"
 #include "parquet/file/reader-internal.h"
-#include "parquet/thrift/parquet_types.h"
-#include "parquet/thrift/util.h"
+#include "parquet/parquet_types.h"
+#include "parquet/thrift.h"
 #include "parquet/types.h"
 #include "parquet/util/memory.h"
 #include "parquet/util/test-common.h"

diff --git a/cpp/src/parquet/file/metadata.cc b/cpp/src/parquet/file/metadata.cc
@@ -23,7 +23,7 @@
 #include "parquet/file/metadata.h"
 #include "parquet/schema-internal.h"
 #include "parquet/schema.h"
-#include "parquet/thrift/util.h"
+#include "parquet/thrift.h"
 #include "parquet/util/memory.h"
 
 #include <boost/algorithm/string.hpp>

diff --git a/cpp/src/parquet/file/reader-internal.cc b/cpp/src/parquet/file/reader-internal.cc
@@ -28,7 +28,7 @@
 #include "parquet/compression.h"
 #include "parquet/exception.h"
 #include "parquet/schema.h"
-#include "parquet/thrift/util.h"
+#include "parquet/thrift.h"
 #include "parquet/types.h"
 #include "parquet/util/memory.h"
 

diff --git a/cpp/src/parquet/file/reader-internal.h b/cpp/src/parquet/file/reader-internal.h
@@ -27,7 +27,7 @@
 #include "parquet/compression.h"
 #include "parquet/file/metadata.h"
 #include "parquet/file/reader.h"
-#include "parquet/thrift/parquet_types.h"
+#include "parquet/parquet_types.h"
 #include "parquet/types.h"
 #include "parquet/util/memory.h"
 

diff --git a/cpp/src/parquet/file/writer-internal.cc b/cpp/src/parquet/file/writer-internal.cc
@@ -20,7 +20,7 @@
 #include "parquet/column/writer.h"
 #include "parquet/schema-internal.h"
 #include "parquet/schema.h"
-#include "parquet/thrift/util.h"
+#include "parquet/thrift.h"
 #include "parquet/util/memory.h"
 
 using parquet::schema::GroupNode;

diff --git a/cpp/src/parquet/file/writer-internal.h b/cpp/src/parquet/file/writer-internal.h
@@ -25,7 +25,7 @@
 #include "parquet/compression.h"
 #include "parquet/file/metadata.h"
 #include "parquet/file/writer.h"
-#include "parquet/thrift/parquet_types.h"
+#include "parquet/parquet_types.h"
 #include "parquet/util/memory.h"
 
 namespace parquet {

diff --git a/cpp/src/parquet/thrift/parquet.thrift → cpp/src/parquet/parquet.thrift b/cpp/src/parquet/thrift/parquet.thrift → cpp/src/parquet/parquet.thrift
diff --git a/cpp/src/parquet/schema-internal.h b/cpp/src/parquet/schema-internal.h
@@ -25,8 +25,8 @@
 #include <memory>
 #include <vector>
 
+#include "parquet/parquet_types.h"
 #include "parquet/schema.h"
-#include "parquet/thrift/parquet_types.h"
 #include "parquet/types.h"
 #include "parquet/util/macros.h"
 #include "parquet/util/visibility.h"

diff --git a/cpp/src/parquet/schema-test.cc b/cpp/src/parquet/schema-test.cc
@@ -24,9 +24,9 @@
 #include <vector>
 
 #include "parquet/exception.h"
+#include "parquet/parquet_types.h"
 #include "parquet/schema-internal.h"
 #include "parquet/schema.h"
-#include "parquet/thrift/parquet_types.h"
 #include "parquet/types.h"
 
 using std::string;

diff --git a/cpp/src/parquet/schema.cc b/cpp/src/parquet/schema.cc
@@ -22,8 +22,8 @@
 #include <memory>
 
 #include "parquet/exception.h"
-#include "parquet/thrift/parquet_types.h"
-#include "parquet/thrift/util.h"
+#include "parquet/parquet_types.h"
+#include "parquet/thrift.h"
 
 using parquet::format::SchemaElement;
 

diff --git a/cpp/src/parquet/thrift/util.h → cpp/src/parquet/thrift.h b/cpp/src/parquet/thrift/util.h → cpp/src/parquet/thrift.h
@@ -35,7 +35,7 @@
 #include <thrift/transport/TBufferTransports.h>
 
 #include "parquet/exception.h"
-#include "parquet/thrift/parquet_types.h"
+#include "parquet/parquet_types.h"
 #include "parquet/util/logging.h"
 #include "parquet/util/memory.h"
 

diff --git a/cpp/src/parquet/thrift/CMakeLists.txt b/cpp/src/parquet/thrift/CMakeLists.txt