Skip to content

Commit d65b7b8

Browse files
rahulketchrahulketch
committed
Formatting
1 parent 26c3ddd commit d65b7b8

12 files changed

Lines changed: 56 additions & 66 deletions

File tree

‎parquet-column/src/main/java/org/apache/parquet/ValidInt96Stats.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.parquet;
2020

2121
import java.util.concurrent.atomic.AtomicBoolean;
22-
import org.apache.parquet.SemanticVersion.SemanticVersionParseException;
2322
import org.apache.parquet.VersionParser.ParsedVersion;
2423
import org.apache.parquet.VersionParser.VersionParseException;
2524
import org.slf4j.Logger;
@@ -35,7 +34,6 @@ public class ValidInt96Stats {
3534

3635
private static final Logger LOG = LoggerFactory.getLogger(ValidInt96Stats.class);
3736

38-
3937
/**
4038
* Decides if the statistics from a file created by createdBy (the created_by field from parquet format)
4139
* should be trusted for INT96 columns.

‎parquet-column/src/main/java/org/apache/parquet/schema/PrimitiveComparator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public String toString() {
206206
}
207207
};
208208

209-
/*
209+
/*
210210
* This comparator is for comparing two timestamps represented as int96 binary.
211211
*/
212212
static final PrimitiveComparator<Binary> BINARY_AS_INT_96_COMPARATOR = new BinaryComparator() {

‎parquet-column/src/main/java/org/apache/parquet/schema/PrimitiveType.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.apache.parquet.io.api.Binary;
3636
import org.apache.parquet.io.api.PrimitiveConverter;
3737
import org.apache.parquet.io.api.RecordConsumer;
38-
import org.apache.parquet.schema.ColumnOrder.ColumnOrderName;
3938
import org.apache.parquet.schema.LogicalTypeAnnotation.UUIDLogicalTypeAnnotation;
4039

4140
/**
@@ -542,9 +541,7 @@ public PrimitiveType(
542541
this.decimalMeta = decimalMeta;
543542

544543
if (columnOrder == null) {
545-
columnOrder = originalType == OriginalType.INTERVAL
546-
? ColumnOrder.undefined()
547-
: ColumnOrder.typeDefined();
544+
columnOrder = originalType == OriginalType.INTERVAL ? ColumnOrder.undefined() : ColumnOrder.typeDefined();
548545
}
549546
this.columnOrder = requireValidColumnOrder(columnOrder);
550547
}

‎parquet-column/src/test/java/org/apache/parquet/internal/column/columnindex/TestBinaryTruncator.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,11 @@ public void testContractStringTypes() {
160160
}
161161

162162
private Binary createInt96Value(long nanoseconds, int julianDay) {
163-
return Binary.fromConstantByteArray(
164-
ByteBuffer.allocate(12)
165-
.order(ByteOrder.LITTLE_ENDIAN)
166-
.putLong(nanoseconds)
167-
.putInt(julianDay)
168-
.array());
163+
return Binary.fromConstantByteArray(ByteBuffer.allocate(12)
164+
.order(ByteOrder.LITTLE_ENDIAN)
165+
.putLong(nanoseconds)
166+
.putInt(julianDay)
167+
.array());
169168
}
170169

171170
private void testInt96Truncator(PrimitiveType type, boolean strict) {

‎parquet-column/src/test/java/org/apache/parquet/schema/TestPrimitiveComparator.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package org.apache.parquet.schema;
2020

2121
import static org.apache.parquet.schema.PrimitiveComparator.BINARY_AS_FLOAT16_COMPARATOR;
22-
import static org.apache.parquet.schema.PrimitiveComparator.BINARY_AS_SIGNED_INTEGER_COMPARATOR;
2322
import static org.apache.parquet.schema.PrimitiveComparator.BINARY_AS_INT_96_COMPARATOR;
23+
import static org.apache.parquet.schema.PrimitiveComparator.BINARY_AS_SIGNED_INTEGER_COMPARATOR;
2424
import static org.apache.parquet.schema.PrimitiveComparator.BOOLEAN_COMPARATOR;
2525
import static org.apache.parquet.schema.PrimitiveComparator.DOUBLE_COMPARATOR;
2626
import static org.apache.parquet.schema.PrimitiveComparator.FLOAT_COMPARATOR;
@@ -37,8 +37,8 @@
3737
import java.time.LocalDateTime;
3838
import java.util.ArrayList;
3939
import java.util.List;
40-
import org.apache.parquet.io.api.Binary;
4140
import org.apache.parquet.example.data.simple.NanoTime;
41+
import org.apache.parquet.io.api.Binary;
4242
import org.junit.Test;
4343

4444
/*
@@ -281,22 +281,22 @@ private Binary timestampToInt96(String timestamp) {
281281
LocalDateTime dt = LocalDateTime.parse(timestamp);
282282
long julianDay = dt.toLocalDate().toEpochDay() + 2440588; // Convert to Julian Day
283283
long nanos = dt.toLocalTime().toNanoOfDay();
284-
return new NanoTime((int)julianDay, nanos).toBinary();
284+
return new NanoTime((int) julianDay, nanos).toBinary();
285285
}
286286

287287
@Test
288288
public void testInt96Comparator() {
289289
Binary[] valuesInAscendingOrder = {
290-
timestampToInt96("2020-01-01T00:00:00.000"),
291-
timestampToInt96("2020-02-29T23:59:59.999"),
292-
timestampToInt96("2020-12-31T23:59:59.999"),
293-
timestampToInt96("2021-01-01T00:00:00.000"),
294-
timestampToInt96("2023-06-15T12:30:45.500"),
295-
timestampToInt96("2024-02-29T15:45:30.750"),
296-
timestampToInt96("2024-12-25T07:00:00.000"),
297-
timestampToInt96("2025-01-01T00:00:00.000"),
298-
timestampToInt96("2025-07-04T20:00:00.000"),
299-
timestampToInt96("2025-12-31T23:59:59.999")
290+
timestampToInt96("2020-01-01T00:00:00.000"),
291+
timestampToInt96("2020-02-29T23:59:59.999"),
292+
timestampToInt96("2020-12-31T23:59:59.999"),
293+
timestampToInt96("2021-01-01T00:00:00.000"),
294+
timestampToInt96("2023-06-15T12:30:45.500"),
295+
timestampToInt96("2024-02-29T15:45:30.750"),
296+
timestampToInt96("2024-12-25T07:00:00.000"),
297+
timestampToInt96("2025-01-01T00:00:00.000"),
298+
timestampToInt96("2025-07-04T20:00:00.000"),
299+
timestampToInt96("2025-12-31T23:59:59.999")
300300
};
301301
for (int i = 0; i < valuesInAscendingOrder.length; ++i) {
302302
for (int j = 0; j < valuesInAscendingOrder.length; ++j) {

‎parquet-hadoop/src/main/java/org/apache/parquet/ParquetReadOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static org.apache.parquet.hadoop.ParquetInputFormat.HADOOP_VECTORED_IO_ENABLED;
2929
import static org.apache.parquet.hadoop.ParquetInputFormat.OFF_HEAP_DECRYPT_BUFFER_ENABLED;
3030
import static org.apache.parquet.hadoop.ParquetInputFormat.PAGE_VERIFY_CHECKSUM_ENABLED;
31-
import static org.apache.parquet.hadoop.ParquetInputFormat.RECORD_FILTERING_ENABLED;
3231
import static org.apache.parquet.hadoop.ParquetInputFormat.READ_INT96_STATS_ENABLED;
32+
import static org.apache.parquet.hadoop.ParquetInputFormat.RECORD_FILTERING_ENABLED;
3333
import static org.apache.parquet.hadoop.ParquetInputFormat.STATS_FILTERING_ENABLED;
3434
import static org.apache.parquet.hadoop.ParquetInputFormat.getFilter;
3535
import static org.apache.parquet.hadoop.UnmaterializableRecordCounter.BAD_RECORD_THRESHOLD_CONF_KEY;

‎parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import static org.apache.parquet.format.Util.readFileMetaData;
2525
import static org.apache.parquet.format.Util.writeColumnMetaData;
2626
import static org.apache.parquet.format.Util.writePageHeader;
27-
import static org.apache.parquet.hadoop.ParquetInputFormat.READ_INT96_STATS_ENABLED;
2827
import static org.apache.parquet.hadoop.ParquetInputFormat.DEFAULT_READ_INT96_STATS_ENABLED;
28+
import static org.apache.parquet.hadoop.ParquetInputFormat.READ_INT96_STATS_ENABLED;
2929

3030
import java.io.BufferedInputStream;
3131
import java.io.ByteArrayInputStream;
@@ -173,8 +173,9 @@ public ParquetMetadataConverter(int statisticsTruncateLength) {
173173
*/
174174
@Deprecated
175175
public ParquetMetadataConverter(Configuration conf) {
176-
this(conf.getBoolean("parquet.strings.signed-min-max.enabled", false), conf.getBoolean(READ_INT96_STATS_ENABLED,
177-
DEFAULT_READ_INT96_STATS_ENABLED));
176+
this(
177+
conf.getBoolean("parquet.strings.signed-min-max.enabled", false),
178+
conf.getBoolean(READ_INT96_STATS_ENABLED, DEFAULT_READ_INT96_STATS_ENABLED));
178179
}
179180

180181
public ParquetMetadataConverter(ParquetReadOptions options) {
@@ -185,7 +186,8 @@ private ParquetMetadataConverter(boolean useSignedStringMinMax, boolean readInt9
185186
this(useSignedStringMinMax, ParquetProperties.DEFAULT_STATISTICS_TRUNCATE_LENGTH, readInt96Stats);
186187
}
187188

188-
private ParquetMetadataConverter(boolean useSignedStringMinMax, int statisticsTruncateLength, boolean readInt96Stats) {
189+
private ParquetMetadataConverter(
190+
boolean useSignedStringMinMax, int statisticsTruncateLength, boolean readInt96Stats) {
189191
if (statisticsTruncateLength <= 0) {
190192
throw new IllegalArgumentException("Truncate length should be greater than 0");
191193
}
@@ -606,8 +608,10 @@ private void addRowGroup(
606608
}
607609
if (columnMetaData.getStatistics() != null
608610
&& !columnMetaData.getStatistics().isEmpty()) {
609-
metaData.setStatistics(
610-
toParquetStatistics(parquetMetadata.getFileMetaData().getCreatedBy(), columnMetaData.getStatistics(), this.statisticsTruncateLength));
611+
metaData.setStatistics(toParquetStatistics(
612+
parquetMetadata.getFileMetaData().getCreatedBy(),
613+
columnMetaData.getStatistics(),
614+
this.statisticsTruncateLength));
611615
}
612616
if (columnMetaData.getEncodingStats() != null) {
613617
metaData.setEncoding_stats(convertEncodingStats(columnMetaData.getEncodingStats()));
@@ -874,7 +878,7 @@ private boolean isMinMaxStatsReadingSupported(String createdBy, PrimitiveType ty
874878
return readInt96Stats && ValidInt96Stats.hasValidInt96Stats(createdBy);
875879
}
876880
return isMinMaxStatsWritingSupported(type);
877-
}
881+
}
878882

879883
/**
880884
* @param statistics parquet format statistics

‎parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,9 @@ public ColumnIndex readColumnIndex(ColumnChunkMetaData column) throws IOExceptio
17061706
}
17071707
}
17081708
return converter.fromParquetColumnIndex(
1709-
getFileMetaData().getCreatedBy(), column.getPrimitiveType(), Util.readColumnIndex(f, columnIndexDecryptor, columnIndexAAD));
1709+
getFileMetaData().getCreatedBy(),
1710+
column.getPrimitiveType(),
1711+
Util.readColumnIndex(f, columnIndexDecryptor, columnIndexAAD));
17101712
}
17111713

17121714
/**

‎parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,8 +1455,8 @@ public void testColumnIndexConversion() {
14551455
withSizeStats ? new SizeStatistics(type, 0, LongArrayList.of(5, 6), LongArrayList.of(2, 1)) : null);
14561456
ParquetMetadataConverter converter = new ParquetMetadataConverter();
14571457
org.apache.parquet.format.ColumnIndex parquetColumnIndex =
1458-
converter.toParquetColumnIndex(type, builder.build());
1459-
1458+
converter.toParquetColumnIndex(type, builder.build());
1459+
14601460
ColumnIndex columnIndex = converter.fromParquetColumnIndex(CREATED_BY, type, parquetColumnIndex);
14611461
assertEquals(BoundaryOrder.ASCENDING, columnIndex.getBoundaryOrder());
14621462
assertTrue(Arrays.asList(false, true, false).equals(columnIndex.getNullPages()));
@@ -1481,7 +1481,8 @@ public void testColumnIndexConversion() {
14811481
Types.required(PrimitiveTypeName.INT96).named("test_int96"), columnIndex));
14821482
assertNull(
14831483
"Should ignore unsupported types",
1484-
converter.fromParquetColumnIndex(CREATED_BY,
1484+
converter.fromParquetColumnIndex(
1485+
CREATED_BY,
14851486
Types.required(PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY)
14861487
.length(12)
14871488
.as(OriginalType.INTERVAL)

‎parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestParquetFileWriter.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
import org.apache.parquet.column.values.bloomfilter.BloomFilter;
8383
import org.apache.parquet.example.data.Group;
8484
import org.apache.parquet.example.data.simple.SimpleGroup;
85-
import org.apache.parquet.format.Statistics;
8685
import org.apache.parquet.hadoop.ParquetOutputFormat.JobSummaryLevel;
8786
import org.apache.parquet.hadoop.example.GroupReadSupport;
8887
import org.apache.parquet.hadoop.example.GroupWriteSupport;
@@ -869,12 +868,11 @@ public void testConvertToThriftStatistics() throws Exception {
869868
parquetMRstats.updateStats(l);
870869
}
871870
final String createdBy = "parquet-mr version 1.8.0 (build d4d5a07ec9bd262ca1e93c309f1d7d4a74ebda4c)";
872-
org.apache.parquet.format.converter.ParquetMetadataConverter converter = new org.apache.parquet.format.converter.ParquetMetadataConverter();
873-
org.apache.parquet.format.Statistics thriftStats =
874-
converter.toParquetStatistics(createdBy, parquetMRstats);
871+
org.apache.parquet.format.converter.ParquetMetadataConverter converter =
872+
new org.apache.parquet.format.converter.ParquetMetadataConverter();
873+
org.apache.parquet.format.Statistics thriftStats = converter.toParquetStatistics(createdBy, parquetMRstats);
875874
LongStatistics convertedBackStats =
876-
(LongStatistics) converter.fromParquetStatistics(
877-
createdBy, thriftStats, PrimitiveTypeName.INT64);
875+
(LongStatistics) converter.fromParquetStatistics(createdBy, thriftStats, PrimitiveTypeName.INT64);
878876

879877
assertEquals(parquetMRstats.getMax(), convertedBackStats.getMax());
880878
assertEquals(parquetMRstats.getMin(), convertedBackStats.getMin());

0 commit comments

Comments
 (0)