You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by zi...@apache.org on 2017/11/09 16:18:11 UTC
parquet-mr git commit: PARQUET-1153: Parquet-thrift doesn't compile
with Thrift 0.10.0
Repository: parquet-mr
Updated Branches:
refs/heads/master 170cfa758 -> c532b0e63
PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
Author: Nandor Kollar <nk...@cloudera.com>
Closes #434 from nandorKollar/PARQUET-1153 and squashes the following commits:
b2da7c0 [Nandor Kollar] PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
5e96e7f [Nandor Kollar] PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
ad237b0 [Nandor Kollar] PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
0e4e0f9 [Nandor Kollar] PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
29544b3 [Nandor Kollar] PARQUET-1153: Parquet-thrift doesn't compile with Thrift 0.10.0
Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/c532b0e6
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/c532b0e6
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/c532b0e6
Branch: refs/heads/master
Commit: c532b0e637f28eb934f28f7f1d7c0889b1e5c811
Parents: 170cfa7
Author: Nandor Kollar <nk...@cloudera.com>
Authored: Thu Nov 9 17:16:53 2017 +0100
Committer: Zoltan Ivanfi <zi...@cloudera.com>
Committed: Thu Nov 9 17:16:53 2017 +0100
----------------------------------------------------------------------
.travis.yml | 2 +-
parquet-cascading/pom.xml | 6 +++---
parquet-cascading3/pom.xml | 6 +++---
.../src/main/java/org/apache/parquet/hive/HiveBinding.java | 2 +-
.../hive/ql/io/parquet/read/DataWritableReadSupport.java | 2 +-
parquet-scrooge/pom.xml | 6 +++---
parquet-thrift/pom.xml | 6 +++---
pom.xml | 6 +++---
8 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 72d7030..f4b56c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
- tar zxf thrift-0.7.0.tar.gz
- cd thrift-0.7.0
- chmod +x ./configure
- - ./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang
+ - ./configure --disable-gen-erl --disable-gen-hs --without-php --without-nodejs --without-ruby --without-haskell --without-erlang
- sudo make install
- cd ..
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-cascading/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-cascading/pom.xml b/parquet-cascading/pom.xml
index 70c7b8a..07e8f68 100644
--- a/parquet-cascading/pom.xml
+++ b/parquet-cascading/pom.xml
@@ -155,9 +155,9 @@
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.thrift.tools</groupId>
- <artifactId>maven-thrift-plugin</artifactId>
- <version>${maven-thrift-plugin.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>thrift-maven-plugin</artifactId>
+ <version>${thrift-maven-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
<thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-cascading3/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-cascading3/pom.xml b/parquet-cascading3/pom.xml
index 0f1d326..5b3d537 100644
--- a/parquet-cascading3/pom.xml
+++ b/parquet-cascading3/pom.xml
@@ -172,9 +172,9 @@
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.thrift.tools</groupId>
- <artifactId>maven-thrift-plugin</artifactId>
- <version>${maven-thrift-plugin.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>thrift-maven-plugin</artifactId>
+ <version>${thrift-maven-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
<thriftSourceRoot>../parquet-cascading-common23/src/main/thrift</thriftSourceRoot>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-hive/parquet-hive-binding/parquet-hive-binding-interface/src/main/java/org/apache/parquet/hive/HiveBinding.java
----------------------------------------------------------------------
diff --git a/parquet-hive/parquet-hive-binding/parquet-hive-binding-interface/src/main/java/org/apache/parquet/hive/HiveBinding.java b/parquet-hive/parquet-hive-binding/parquet-hive-binding-interface/src/main/java/org/apache/parquet/hive/HiveBinding.java
index 5eec8a0..1500153 100644
--- a/parquet-hive/parquet-hive-binding/parquet-hive-binding-interface/src/main/java/org/apache/parquet/hive/HiveBinding.java
+++ b/parquet-hive/parquet-hive-binding/parquet-hive-binding-interface/src/main/java/org/apache/parquet/hive/HiveBinding.java
@@ -30,7 +30,7 @@ public interface HiveBinding {
* From a string which columns names (including hive column), return a list
* of string columns
*
- * @param comma separated list of columns
+ * @param columns comma separated list of columns
* @return list with virtual columns removed
*/
public List<String> getColumns(final String columns);
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java
----------------------------------------------------------------------
diff --git a/parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java b/parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java
index fb57d57..50dc564 100644
--- a/parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java
+++ b/parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java
@@ -56,7 +56,7 @@ public class DataWritableReadSupport extends ReadSupport<ArrayWritable> {
* From a string which columns names (including hive column), return a list
* of string columns
*
- * @param comma separated list of columns
+ * @param columns comma separated list of columns
* @return list with virtual columns removed
*/
private static List<String> getColumns(final String columns) {
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-scrooge/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
index 992afbe..60867ba 100644
--- a/parquet-scrooge/pom.xml
+++ b/parquet-scrooge/pom.xml
@@ -138,9 +138,9 @@
<!--for scrooge and thrift -->
<plugin>
- <groupId>org.apache.thrift.tools</groupId>
- <artifactId>maven-thrift-plugin</artifactId>
- <version>${maven-thrift-plugin.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>thrift-maven-plugin</artifactId>
+ <version>${thrift-maven-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
</configuration>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/parquet-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index c38f595..20666bc 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -142,9 +142,9 @@
</plugin>
<!-- thrift -->
<plugin>
- <groupId>org.apache.thrift.tools</groupId>
- <artifactId>maven-thrift-plugin</artifactId>
- <version>${maven-thrift-plugin.version}</version>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>thrift-maven-plugin</artifactId>
+ <version>${thrift-maven-plugin.version}</version>
<configuration>
<thriftExecutable>${thrift.executable}</thriftExecutable>
</configuration>
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/c532b0e6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d4df8a..455c2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<github.global.server>github</github.global.server>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
- <maven-thrift-plugin.version>0.1.11</maven-thrift-plugin.version>
<jackson.groupId>org.codehaus.jackson</jackson.groupId>
<jackson.version>1.9.13</jackson.version>
<jackson.package>org.codehaus.jackson</jackson.package>
@@ -83,6 +82,7 @@
<pig.version>0.16.0</pig.version>
<pig.classifier>h2</pig.classifier>
<thrift.version>0.7.0</thrift.version>
+ <thrift-maven-plugin.version>0.10.0</thrift-maven-plugin.version>
<fastutil.version>7.0.13</fastutil.version>
<semver.api.version>0.9.33</semver.api.version>
<slf4j.version>1.7.22</slf4j.version>
@@ -445,8 +445,8 @@
<exclude>.travis.yml</exclude>
<exclude>licenses/**</exclude>
<exclude>protobuf_install/**</exclude>
- <exclude>thrift-0.7.0/**</exclude>
- <exclude>thrift-0.7.0.tar.gz</exclude>
+ <exclude>thrift-${thrift.version}/**</exclude>
+ <exclude>thrift-${thrift.version}.tar.gz</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
</excludes>
</configuration>