diff --git a/parquet-thrift/src/main/java/org/apache/parquet/hadoop/thrift/ThriftReadSupport.java b/parquet-thrift/src/main/java/org/apache/parquet/hadoop/thrift/ThriftReadSupport.java index cb9bf661cf..a859128a74 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/hadoop/thrift/ThriftReadSupport.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/hadoop/thrift/ThriftReadSupport.java @@ -52,7 +52,7 @@ public class ThriftReadSupport extends ReadSupport { * Accepts a ";" delimited list of globs in the syntax implemented by {@link DeprecatedFieldProjectionFilter} */ @Deprecated - public static final String DEPRECATED_THRIFT_COLUMN_FILTER_KEY = "parquet.thrift.column.filter"; + public static final String THRIFT_COLUMN_FILTER_KEY = "parquet.thrift.column.filter"; /** * Accepts a ";" delimited list of glob paths, in the syntax implemented by {@link StrictFieldProjectionFilter} @@ -99,7 +99,7 @@ public static void setRecordConverterClass(Configuration conf, @Deprecated public static void setProjectionPushdown(JobConf jobConf, String projectionString) { - jobConf.set(DEPRECATED_THRIFT_COLUMN_FILTER_KEY, projectionString); + jobConf.set(THRIFT_COLUMN_FILTER_KEY, projectionString); } public static void setStrictFieldProjectionFilter(Configuration conf, String semicolonDelimitedGlobs) { @@ -107,7 +107,7 @@ public static void setStrictFieldProjectionFilter(Configuration conf, String sem } public static FieldProjectionFilter getFieldProjectionFilter(Configuration conf) { - String deprecated = conf.get(DEPRECATED_THRIFT_COLUMN_FILTER_KEY); + String deprecated = conf.get(THRIFT_COLUMN_FILTER_KEY); String strict = conf.get(STRICT_THRIFT_COLUMN_FILTER_KEY); if (Strings.isNullOrEmpty(deprecated) && Strings.isNullOrEmpty(strict)) { @@ -117,18 +117,18 @@ public static FieldProjectionFilter getFieldProjectionFilter(Configuration conf) if(!Strings.isNullOrEmpty(deprecated) && !Strings.isNullOrEmpty(strict)) { throw new ThriftProjectionException( "You cannot provide both " - + DEPRECATED_THRIFT_COLUMN_FILTER_KEY + + THRIFT_COLUMN_FILTER_KEY + " and " + STRICT_THRIFT_COLUMN_FILTER_KEY +"! " - + DEPRECATED_THRIFT_COLUMN_FILTER_KEY + + THRIFT_COLUMN_FILTER_KEY + " is deprecated." ); } if (!Strings.isNullOrEmpty(deprecated)) { LOG.warn(String.format("Using %s is deprecated. Please see the docs for %s!", - DEPRECATED_THRIFT_COLUMN_FILTER_KEY, STRICT_THRIFT_COLUMN_FILTER_KEY)); + THRIFT_COLUMN_FILTER_KEY, STRICT_THRIFT_COLUMN_FILTER_KEY)); return new DeprecatedFieldProjectionFilter(deprecated); } @@ -162,7 +162,7 @@ public org.apache.parquet.hadoop.api.ReadSupport.ReadContext init(InitContext co throw new ThriftProjectionException( String.format("You cannot provide both a partial schema and field projection filter." + "Only one of (%s, %s, %s) should be set.", - PARQUET_READ_SCHEMA, STRICT_THRIFT_COLUMN_FILTER_KEY, DEPRECATED_THRIFT_COLUMN_FILTER_KEY)); + PARQUET_READ_SCHEMA, STRICT_THRIFT_COLUMN_FILTER_KEY, THRIFT_COLUMN_FILTER_KEY)); } //set requestedProjections only when it's specified diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/DeprecatedFieldProjectionFilter.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/DeprecatedFieldProjectionFilter.java index 78eef098ca..f84f957e17 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/DeprecatedFieldProjectionFilter.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/DeprecatedFieldProjectionFilter.java @@ -28,7 +28,7 @@ /** * Filter thrift attributes using glob syntax. - * This is used for parsing values assigned to ThriftReadSupport.DEPRECATED_THRIFT_COLUMN_FILTER_KEY + * This is used for parsing values assigned to ThriftReadSupport.THRIFT_COLUMN_FILTER_KEY * @author Tianshuo Deng */ @Deprecated diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java index 0893ab45f1..e576e97410 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java @@ -27,7 +27,7 @@ * Enhanced version of GlobPattern class that is defined in hadoop with extra capability of matching * full path separated by '/', and double star matching * - * This is used for parsing values assigned to ThriftReadSupport.DEPRECATED_THRIFT_COLUMN_FILTER_KEY + * This is used for parsing values assigned to ThriftReadSupport.THRIFT_COLUMN_FILTER_KEY * * @author Tianshuo Deng */ diff --git a/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestParquetToThriftReadWriteAndProjection.java b/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestParquetToThriftReadWriteAndProjection.java index aa0b81d524..4869460b1a 100644 --- a/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestParquetToThriftReadWriteAndProjection.java +++ b/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestParquetToThriftReadWriteAndProjection.java @@ -337,7 +337,7 @@ public void testPullInPrimitiveValues() throws Exception { private void shouldDoProjectionWithThriftColumnFilter(String filterDesc, TBase toWrite, TBase toRead, Class> thriftClass) throws Exception { Configuration conf = new Configuration(); - conf.set(ThriftReadSupport.DEPRECATED_THRIFT_COLUMN_FILTER_KEY, filterDesc); + conf.set(ThriftReadSupport.THRIFT_COLUMN_FILTER_KEY, filterDesc); shouldDoProjection(conf, toWrite, toRead, thriftClass); } diff --git a/pom.xml b/pom.xml index 271d40fb77..088f9d21e8 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,6 @@ true ${previous.version} - org/apache/parquet/hadoop/thrift/** org/apache/parquet/thrift/projection/** org/apache/parquet/thrift/ThriftSchemaConverter org/apache/parquet/filter2/**