parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject parquet-mr git commit: PARQUET-262: Restore semver checks.
Date Thu, 21 May 2015 23:18:12 GMT
Repository: parquet-mr
Updated Branches:
  refs/heads/master ded56ffd5 -> 8769d0f2c


PARQUET-262: Restore semver checks.

Because 1.6.0 to 1.7.0 was a breaking rename, semver was turned off
until the 1.7.0 artifacts were released. Now that they are available,
the check needs to be restored.

There were already 2 breaking changes that are fixed by this commit:
* A field in AvroReadSupport was made final
* An accessor method in ThriftSchemaConvertVisitor was removed

Author: Ryan Blue <blue@apache.org>

Closes #200 from rdblue/PARQUET-262-restore-semver and squashes the following commits:

09aeaf4 [Ryan Blue] PARQUET-262: Restore semver checks.


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/8769d0f2
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/8769d0f2
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/8769d0f2

Branch: refs/heads/master
Commit: 8769d0f2cc4b7555dc025b7c0e49a81346a1e2dd
Parents: ded56ff
Author: Ryan Blue <blue@apache.org>
Authored: Thu May 21 16:18:03 2015 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Thu May 21 16:18:03 2015 -0700

----------------------------------------------------------------------
 .../org/apache/parquet/avro/AvroReadSupport.java |  3 ++-
 .../thrift/ThriftSchemaConvertVisitor.java       |  8 ++++++++
 pom.xml                                          | 19 +++++++++----------
 3 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/8769d0f2/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java
----------------------------------------------------------------------
diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java
index bf12cf8..9036a63 100644
--- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java
+++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java
@@ -43,7 +43,8 @@ public class AvroReadSupport<T> extends ReadSupport<T> {
   static final String OLD_AVRO_SCHEMA_METADATA_KEY = "avro.schema";
   private static final String AVRO_READ_SCHEMA_METADATA_KEY = "avro.read.schema";
 
-  public static final String AVRO_DATA_SUPPLIER = "parquet.avro.data.supplier";
+  // TODO: for 2.0.0, make this final (breaking change)
+  public static String AVRO_DATA_SUPPLIER = "parquet.avro.data.supplier";
 
   public static final String AVRO_COMPATIBILITY = "parquet.avro.compatible";
   public static final boolean AVRO_DEFAULT_COMPATIBILITY = true;

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/8769d0f2/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConvertVisitor.java
----------------------------------------------------------------------
diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConvertVisitor.java
b/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConvertVisitor.java
index 25347f8..97d90e4 100644
--- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConvertVisitor.java
+++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConvertVisitor.java
@@ -94,6 +94,14 @@ public class ThriftSchemaConvertVisitor implements ThriftType.TypeVisitor<Conver
     return new MessageType(state.name, converted.asKeep().getType().asGroupType().getFields());
   }
 
+  /**
+   * @deprecated this will be removed in 2.0.0.
+   */
+  @Deprecated
+  public FieldProjectionFilter getFieldProjectionFilter() {
+    return fieldProjectionFilter;
+  }
+
   @Override
   public ConvertedField visit(MapType mapType, State state) {
     ThriftField keyField = mapType.getKey();

http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/8769d0f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dfe2cd8..2476a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
     <cascading.version>2.5.3</cascading.version>
     <parquet.format.version>2.3.0-incubating</parquet.format.version>
     <log4j.version>1.2.17</log4j.version>
-    <previous.version>1.5.0</previous.version>
+    <previous.version>1.7.0</previous.version>
     <thrift.executable>thrift</thrift.executable>
     <scala.version>2.10.4</scala.version>
     <!-- scala.binary.version is used for projects that fetch dependencies that are in
scala -->
@@ -222,7 +222,6 @@
             </dependency>
          </dependencies>
          <executions>
-           <!--
            <execution>
              <id>check</id>
              <phase>verify</phase>
@@ -235,19 +234,19 @@
                    <dumpDetails>true</dumpDetails>
                    <previousVersion>${previous.version}</previousVersion>
                    <excludes>
-                     <exclude>parquet/hadoop/thrift/**</exclude>
-                     <exclude>parquet/thrift/projection/**</exclude>
-                     <exclude>parquet/thrift/ThriftSchemaConverter</exclude>
-                     <exclude>parquet/filter2/**</exclude>
-                     <exclude>parquet/org/**</exclude>
-                     <exclude>parquet/column/**</exclude>
-                     <exclude>parquet/hadoop/ParquetInputSplit</exclude>
+                     <exclude>org/apache/parquet/hadoop/thrift/**</exclude>
+                     <exclude>org/apache/parquet/thrift/projection/**</exclude>
+                     <exclude>org/apache/parquet/thrift/ThriftSchemaConverter</exclude>
+                     <exclude>org/apache/parquet/filter2/**</exclude>
+                     <exclude>org/apache/parquet/column/**</exclude>
+                     <exclude>org/apache/parquet/hadoop/ParquetInputSplit</exclude>
+                     <exclude>shaded/**</exclude> <!-- shaded by parquet -->
+                     <exclude>parquet/**</exclude> <!-- shaded by parquet-format
-->
                    </excludes>
                  </requireBackwardCompatibility>
                </rules>
              </configuration>
            </execution>
-           -->
          </executions>
         </plugin>
         <plugin>


Mime
View raw message