diff --git a/parquet-benchmarks/src/main/java/org/apache/parquet/variant/VariantBuilderBenchmark.java b/parquet-benchmarks/src/main/java/org/apache/parquet/variant/VariantBuilderBenchmark.java index 65a000d826..d3e4c7d331 100644 --- a/parquet-benchmarks/src/main/java/org/apache/parquet/variant/VariantBuilderBenchmark.java +++ b/parquet-benchmarks/src/main/java/org/apache/parquet/variant/VariantBuilderBenchmark.java @@ -159,24 +159,34 @@ private static int count() { * the variant builder and (b) add the type to a GroupBuilder. */ private enum FieldType { - String((o, builder) -> builder.appendString(((String) o) + count()), b -> b.optional(PrimitiveTypeName.BINARY) - .as(LogicalTypeAnnotation.stringType()) - .named("typed_value")), - Int((o, builder) -> builder.appendInt((Integer) o), b -> b.optional(PrimitiveTypeName.INT32) - .named("typed_value")), - Long((o, builder) -> builder.appendLong((Long) o), b -> b.optional(PrimitiveTypeName.INT64) - .named("typed_value")), - Float((o, builder) -> builder.appendFloat((Float) o), b -> b.optional(PrimitiveTypeName.FLOAT) - .named("typed_value")), - Double((o, builder) -> builder.appendDouble((Double) o), b -> b.optional(PrimitiveTypeName.DOUBLE) - .named("typed_value")), - BigDecimal((o, builder) -> builder.appendDecimal((BigDecimal) o), b -> b.optional(PrimitiveTypeName.INT32) - .as(LogicalTypeAnnotation.decimalType(0, 9)) - .named("typed_value")), - UUID((o, builder) -> builder.appendUUID((UUID) o), b -> b.optional(PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) - .length(16) - .as(LogicalTypeAnnotation.uuidType()) - .named("typed_value")), + String( + (o, builder) -> builder.appendString(((String) o) + count()), + b -> b.optional(PrimitiveTypeName.BINARY) + .as(LogicalTypeAnnotation.stringType()) + .named("typed_value")), + Int( + (o, builder) -> builder.appendInt((Integer) o), + b -> b.optional(PrimitiveTypeName.INT32).named("typed_value")), + Long( + (o, builder) -> builder.appendLong((Long) o), + b -> b.optional(PrimitiveTypeName.INT64).named("typed_value")), + Float( + (o, builder) -> builder.appendFloat((Float) o), + b -> b.optional(PrimitiveTypeName.FLOAT).named("typed_value")), + Double( + (o, builder) -> builder.appendDouble((Double) o), + b -> b.optional(PrimitiveTypeName.DOUBLE).named("typed_value")), + BigDecimal( + (o, builder) -> builder.appendDecimal((BigDecimal) o), + b -> b.optional(PrimitiveTypeName.INT32) + .as(LogicalTypeAnnotation.decimalType(0, 9)) + .named("typed_value")), + UUID( + (o, builder) -> builder.appendUUID((UUID) o), + b -> b.optional(PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) + .length(16) + .as(LogicalTypeAnnotation.uuidType()) + .named("typed_value")), /** Nested MUST be the last in the enum. */ Nested( (o, builder) -> { diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java index 5142506d2a..b722ce3941 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnIndexValidator.java @@ -460,12 +460,14 @@ private static class PageValidator { if (isNullPage) { // By specification null pages have empty byte arrays as min/max values - validateContract(!minValue.hasRemaining(), NULL_PAGE_HAS_NO_MIN, () -> statValueBuilder - .build(minValue) - .toString()); - validateContract(!maxValue.hasRemaining(), NULL_PAGE_HAS_NO_MAX, () -> statValueBuilder - .build(maxValue) - .toString()); + validateContract( + !minValue.hasRemaining(), + NULL_PAGE_HAS_NO_MIN, + () -> statValueBuilder.build(minValue).toString()); + validateContract( + !maxValue.hasRemaining(), + NULL_PAGE_HAS_NO_MAX, + () -> statValueBuilder.build(maxValue).toString()); } else if (prevMinValue != null) { validateBoundaryOrder( statValueBuilder.build(prevMinValue), statValueBuilder.build(prevMaxValue), boundaryOrder); diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java index f85b65ea3d..d6c9aeb1eb 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/rewrite/RewriteOptions.java @@ -587,8 +587,9 @@ public RewriteOptions build() { renameColumns == null ? new HashMap<>() : renameColumns.entrySet().stream() - .collect(Collectors.toMap(x -> x.getKey().trim(), x -> x.getValue() - .trim())), + .collect(Collectors.toMap( + x -> x.getKey().trim(), + x -> x.getValue().trim())), encryptColumns, fileEncryptionProperties, indexCacheStrategy, diff --git a/pom.xml b/pom.xml index 8564229b44..d32590b6bc 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 2.22 0.26.3 1.3.2 - 3.8.0 + 3.10.4 shaded.parquet 3.3.0