parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject parquet-cpp git commit: PARQUET-797: Updates for ARROW-418 header API changes
Date Tue, 13 Dec 2016 19:57:06 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 8487142f6 -> 0c0c3ca8c


PARQUET-797: Updates for ARROW-418 header API changes

I also changed this code to use `arrow/api.h` in some places to be less sensitive to some
kinds of header changes.

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #202 from wesm/PARQUET-797 and squashes the following commits:

d909443 [Wes McKinney] Fix arrow/util/status.h use
72758ea [Wes McKinney] Update arrow hash
4802052 [Wes McKinney] Update parquet/arrow to use arrow/api.h where relevant, ARROW-418 API
changes


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/0c0c3ca8
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/0c0c3ca8
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/0c0c3ca8

Branch: refs/heads/master
Commit: 0c0c3ca8c69798b62437e15b76b535f110517fde
Parents: 8487142
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Tue Dec 13 20:55:01 2016 +0100
Committer: Uwe L. Korn <uwelk@xhochy.com>
Committed: Tue Dec 13 20:55:01 2016 +0100

----------------------------------------------------------------------
 src/parquet/arrow/arrow-io-test.cc                 |  3 +--
 src/parquet/arrow/arrow-reader-writer-benchmark.cc |  5 +----
 src/parquet/arrow/arrow-reader-writer-test.cc      |  6 +-----
 src/parquet/arrow/arrow-schema-test.cc             |  5 +----
 src/parquet/arrow/io.cc                            |  2 +-
 src/parquet/arrow/io.h                             |  2 +-
 src/parquet/arrow/reader.cc                        |  7 +------
 src/parquet/arrow/schema.cc                        |  4 +---
 src/parquet/arrow/test-util.h                      |  3 +--
 src/parquet/arrow/utils.h                          |  2 +-
 src/parquet/arrow/writer.cc                        | 10 +++-------
 thirdparty/versions.sh                             |  2 +-
 12 files changed, 14 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/arrow-io-test.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/arrow-io-test.cc b/src/parquet/arrow/arrow-io-test.cc
index 344dd13..6d76887 100644
--- a/src/parquet/arrow/arrow-io-test.cc
+++ b/src/parquet/arrow/arrow-io-test.cc
@@ -22,10 +22,9 @@
 
 #include "gtest/gtest.h"
 
+#include "arrow/api.h"
 #include "arrow/io/memory.h"
 #include "arrow/test-util.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
 
 #include "parquet/api/io.h"
 #include "parquet/arrow/io.h"

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/arrow-reader-writer-benchmark.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/arrow-reader-writer-benchmark.cc b/src/parquet/arrow/arrow-reader-writer-benchmark.cc
index bbaefaa..89cb486 100644
--- a/src/parquet/arrow/arrow-reader-writer-benchmark.cc
+++ b/src/parquet/arrow/arrow-reader-writer-benchmark.cc
@@ -25,10 +25,7 @@
 #include "parquet/file/writer-internal.h"
 #include "parquet/util/input.h"
 
-#include "arrow/column.h"
-#include "arrow/schema.h"
-#include "arrow/table.h"
-#include "arrow/types/primitive.h"
+#include "arrow/api.h"
 
 using arrow::NumericBuilder;
 

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/arrow-reader-writer-test.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/arrow-reader-writer-test.cc b/src/parquet/arrow/arrow-reader-writer-test.cc
index 7bcb590..25ba457 100644
--- a/src/parquet/arrow/arrow-reader-writer-test.cc
+++ b/src/parquet/arrow/arrow-reader-writer-test.cc
@@ -24,13 +24,9 @@
 #include "parquet/arrow/test-util.h"
 #include "parquet/arrow/writer.h"
 
+#include "arrow/api.h"
 #include "arrow/io/memory.h"
 #include "arrow/test-util.h"
-#include "arrow/types/construct.h"
-#include "arrow/types/primitive.h"
-#include "arrow/types/string.h"
-#include "arrow/util/memory-pool.h"
-#include "arrow/util/status.h"
 
 using arrow::Array;
 using arrow::ChunkedArray;

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/arrow-schema-test.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/arrow-schema-test.cc b/src/parquet/arrow/arrow-schema-test.cc
index 3437e71..360680f 100644
--- a/src/parquet/arrow/arrow-schema-test.cc
+++ b/src/parquet/arrow/arrow-schema-test.cc
@@ -22,11 +22,8 @@
 
 #include "parquet/arrow/schema.h"
 
+#include "arrow/api.h"
 #include "arrow/test-util.h"
-#include "arrow/type.h"
-#include "arrow/types/datetime.h"
-#include "arrow/types/decimal.h"
-#include "arrow/util/status.h"
 
 using arrow::Field;
 

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/io.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/io.cc b/src/parquet/arrow/io.cc
index 74464f2..2b1f99d 100644
--- a/src/parquet/arrow/io.cc
+++ b/src/parquet/arrow/io.cc
@@ -23,7 +23,7 @@
 #include "parquet/api/io.h"
 #include "parquet/arrow/utils.h"
 
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 
 using arrow::Status;
 using arrow::MemoryPool;

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/io.h
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/io.h b/src/parquet/arrow/io.h
index a068a4e..a1de936 100644
--- a/src/parquet/arrow/io.h
+++ b/src/parquet/arrow/io.h
@@ -26,7 +26,7 @@
 #include "parquet/api/io.h"
 
 #include "arrow/io/interfaces.h"
-#include "arrow/util/memory-pool.h"
+#include "arrow/memory_pool.h"
 
 namespace parquet {
 

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/reader.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
index 35afb47..f2d4639 100644
--- a/src/parquet/arrow/reader.cc
+++ b/src/parquet/arrow/reader.cc
@@ -26,13 +26,8 @@
 #include "parquet/arrow/schema.h"
 #include "parquet/arrow/utils.h"
 
-#include "arrow/column.h"
-#include "arrow/schema.h"
-#include "arrow/table.h"
-#include "arrow/types/primitive.h"
-#include "arrow/types/string.h"
+#include "arrow/api.h"
 #include "arrow/util/bit-util.h"
-#include "arrow/util/status.h"
 
 using arrow::Array;
 using arrow::Column;

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/schema.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/schema.cc b/src/parquet/arrow/schema.cc
index fe1db7a..2875dc6 100644
--- a/src/parquet/arrow/schema.cc
+++ b/src/parquet/arrow/schema.cc
@@ -23,9 +23,7 @@
 #include "parquet/api/schema.h"
 #include "parquet/arrow/utils.h"
 
-#include "arrow/types/decimal.h"
-#include "arrow/types/string.h"
-#include "arrow/util/status.h"
+#include "arrow/api.h"
 
 using arrow::Field;
 using arrow::Status;

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/test-util.h
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/test-util.h b/src/parquet/arrow/test-util.h
index dedd398..bdb2bab 100644
--- a/src/parquet/arrow/test-util.h
+++ b/src/parquet/arrow/test-util.h
@@ -18,9 +18,8 @@
 #include <string>
 #include <vector>
 
+#include "arrow/api.h"
 #include "arrow/test-util.h"
-#include "arrow/types/primitive.h"
-#include "arrow/types/string.h"
 
 namespace parquet {
 namespace arrow {

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/utils.h
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/utils.h b/src/parquet/arrow/utils.h
index 87f39b0..015421b 100644
--- a/src/parquet/arrow/utils.h
+++ b/src/parquet/arrow/utils.h
@@ -20,7 +20,7 @@
 
 #include <sstream>
 
-#include "arrow/util/status.h"
+#include "arrow/status.h"
 #include "parquet/exception.h"
 
 namespace parquet {

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/src/parquet/arrow/writer.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/writer.cc b/src/parquet/arrow/writer.cc
index b7c7d20..e588c84 100644
--- a/src/parquet/arrow/writer.cc
+++ b/src/parquet/arrow/writer.cc
@@ -20,17 +20,13 @@
 #include <algorithm>
 #include <vector>
 
+#include "parquet/util/logging.h"
+
 #include "parquet/arrow/io.h"
 #include "parquet/arrow/schema.h"
 #include "parquet/arrow/utils.h"
 
-#include "arrow/array.h"
-#include "arrow/column.h"
-#include "arrow/table.h"
-#include "arrow/types/construct.h"
-#include "arrow/types/primitive.h"
-#include "arrow/types/string.h"
-#include "arrow/util/status.h"
+#include "arrow/api.h"
 
 using arrow::MemoryPool;
 using arrow::PoolBuffer;

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/0c0c3ca8/thirdparty/versions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/versions.sh b/thirdparty/versions.sh
index f877b33..c968c7b 100755
--- a/thirdparty/versions.sh
+++ b/thirdparty/versions.sh
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARROW_VERSION="86f56a6073c3254487ede3aff1dc9d117d24adaf"
+ARROW_VERSION="2c10d7ccec3c07fb061e1988be16aecaf9916af4"
 ARROW_URL="https://github.com/apache/arrow/archive/${ARROW_VERSION}.tar.gz"
 ARROW_BASEDIR="arrow-${ARROW_VERSION}"
 


Mime
View raw message