Skip to content

Commit eb679e8

Browse files
aihuaxuaihuaxu
committed
Remove version constant
1 parent 3dcb486 commit eb679e8

4 files changed

Lines changed: 27 additions & 17 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
import org.apache.parquet.Preconditions;
4444

4545
public abstract class LogicalTypeAnnotation {
46-
public static final byte VARIANT_SPEC_VERSION = 1;
47-
4846
enum LogicalTypeToken {
4947
MAP {
5048
@Override
@@ -1177,8 +1175,9 @@ protected String typeParametersAsString() {
11771175
@Override
11781176
public boolean equals(Object obj) {
11791177
if (!(obj instanceof VariantLogicalTypeAnnotation)) {
1180-
return false;
1178+
return false;
11811179
}
1180+
11821181
VariantLogicalTypeAnnotation other = (VariantLogicalTypeAnnotation) obj;
11831182
return specificationVersion == other.specificationVersion;
11841183
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MICROS;
2222
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
23-
import static org.apache.parquet.schema.LogicalTypeAnnotation.VARIANT_SPEC_VERSION;
2423
import static org.apache.parquet.schema.LogicalTypeAnnotation.timestampType;
2524
import static org.apache.parquet.schema.OriginalType.BSON;
2625
import static org.apache.parquet.schema.OriginalType.DATE;
@@ -1418,31 +1417,33 @@ public void testTimestampLogicalTypeWithUTCParameter() {
14181417

14191418
@Test
14201419
public void testVariantLogicalType() {
1420+
byte specVersion = 1;
14211421
String name = "variant_field";
14221422
GroupType variantExpected = new GroupType(
14231423
REQUIRED,
14241424
name,
1425-
LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION),
1425+
LogicalTypeAnnotation.variantType(specVersion),
14261426
new PrimitiveType(REQUIRED, BINARY, "metadata"),
14271427
new PrimitiveType(REQUIRED, BINARY, "value"));
14281428

14291429
GroupType variantActual = Types.buildGroup(REQUIRED)
14301430
.addFields(
14311431
Types.required(BINARY).named("metadata"),
14321432
Types.required(BINARY).named("value"))
1433-
.as(LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION))
1433+
.as(LogicalTypeAnnotation.variantType(specVersion))
14341434
.named(name);
14351435

14361436
assertEquals(variantExpected, variantActual);
14371437
}
14381438

14391439
@Test
14401440
public void testVariantLogicalTypeWithShredded() {
1441+
byte specVersion = 1;
14411442
String name = "variant_field";
14421443
GroupType variantExpected = new GroupType(
14431444
REQUIRED,
14441445
name,
1445-
LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION),
1446+
LogicalTypeAnnotation.variantType(specVersion),
14461447
new PrimitiveType(REQUIRED, BINARY, "metadata"),
14471448
new PrimitiveType(OPTIONAL, BINARY, "value"),
14481449
new PrimitiveType(OPTIONAL, BINARY, "typed_value", LogicalTypeAnnotation.stringType()));
@@ -1454,7 +1455,7 @@ public void testVariantLogicalTypeWithShredded() {
14541455
Types.optional(BINARY)
14551456
.as(LogicalTypeAnnotation.stringType())
14561457
.named("typed_value"))
1457-
.as(LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION))
1458+
.as(LogicalTypeAnnotation.variantType(specVersion))
14581459
.named(name);
14591460

14601461
assertEquals(variantExpected, variantActual);

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MICROS;
2222
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
2323
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.NANOS;
24-
import static org.apache.parquet.schema.LogicalTypeAnnotation.VARIANT_SPEC_VERSION;
2524
import static org.apache.parquet.schema.LogicalTypeAnnotation.bsonType;
2625
import static org.apache.parquet.schema.LogicalTypeAnnotation.dateType;
2726
import static org.apache.parquet.schema.LogicalTypeAnnotation.decimalType;
@@ -478,16 +477,17 @@ public void testFloat16LogicalType() {
478477

479478
@Test
480479
public void testVariantLogicalType() {
480+
byte specVersion = 1;
481481
String name = "variant_field";
482482
GroupType variant = new GroupType(
483483
REQUIRED,
484484
name,
485-
LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION),
485+
LogicalTypeAnnotation.variantType(specVersion),
486486
Types.required(BINARY).named("metadata"),
487487
Types.required(BINARY).named("value"));
488488

489489
assertEquals(
490-
"required group variant_field (VARIANT) {\n"
490+
"required group variant_field (VARIANT(1)) {\n"
491491
+ " required binary metadata;\n"
492492
+ " required binary value;\n"
493493
+ "}",
@@ -497,21 +497,26 @@ public void testVariantLogicalType() {
497497
assertEquals(LogicalTypeAnnotation.LogicalTypeToken.VARIANT, annotation.getType());
498498
assertNull(annotation.toOriginalType());
499499
assertTrue(annotation instanceof LogicalTypeAnnotation.VariantLogicalTypeAnnotation);
500+
assertEquals(
501+
specVersion,
502+
((LogicalTypeAnnotation.VariantLogicalTypeAnnotation) annotation).getSpecificationVersion());
500503
}
501504

502505
@Test
503506
public void testVariantLogicalTypeWithShredded() {
507+
byte specVersion = 1;
508+
504509
String name = "variant_field";
505510
GroupType variant = new GroupType(
506511
REQUIRED,
507512
name,
508-
LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION),
513+
LogicalTypeAnnotation.variantType(specVersion),
509514
Types.required(BINARY).named("metadata"),
510515
Types.optional(BINARY).named("value"),
511516
Types.optional(BINARY).as(LogicalTypeAnnotation.stringType()).named("typed_value"));
512517

513518
assertEquals(
514-
"required group variant_field (VARIANT) {\n"
519+
"required group variant_field (VARIANT(1)) {\n"
515520
+ " required binary metadata;\n"
516521
+ " optional binary value;\n"
517522
+ " optional binary typed_value (STRING);\n"
@@ -522,6 +527,9 @@ public void testVariantLogicalTypeWithShredded() {
522527
assertEquals(LogicalTypeAnnotation.LogicalTypeToken.VARIANT, annotation.getType());
523528
assertNull(annotation.toOriginalType());
524529
assertTrue(annotation instanceof LogicalTypeAnnotation.VariantLogicalTypeAnnotation);
530+
assertEquals(
531+
specVersion,
532+
((LogicalTypeAnnotation.VariantLogicalTypeAnnotation) annotation).getSpecificationVersion());
525533
}
526534

527535
/**

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MICROS;
3030
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
3131
import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.NANOS;
32-
import static org.apache.parquet.schema.LogicalTypeAnnotation.VARIANT_SPEC_VERSION;
3332
import static org.apache.parquet.schema.LogicalTypeAnnotation.bsonType;
3433
import static org.apache.parquet.schema.LogicalTypeAnnotation.dateType;
3534
import static org.apache.parquet.schema.LogicalTypeAnnotation.decimalType;
@@ -1593,9 +1592,10 @@ public void testMapConvertedTypeReadWrite() throws Exception {
15931592

15941593
@Test
15951594
public void testVariantLogicalType() {
1595+
byte specVersion = 1;
15961596
MessageType expected = Types.buildMessage()
15971597
.requiredGroup()
1598-
.as(variantType(VARIANT_SPEC_VERSION))
1598+
.as(variantType(specVersion))
15991599
.required(PrimitiveTypeName.BINARY)
16001600
.named("metadata")
16011601
.required(PrimitiveTypeName.BINARY)
@@ -1608,8 +1608,10 @@ public void testVariantLogicalType() {
16081608
MessageType schema = parquetMetadataConverter.fromParquetSchema(parquetSchema, null);
16091609
assertEquals(expected, schema);
16101610
LogicalTypeAnnotation logicalType = schema.getType("v").getLogicalTypeAnnotation();
1611-
assertEquals(LogicalTypeAnnotation.variantType(VARIANT_SPEC_VERSION), logicalType);
1612-
assertEquals(VARIANT_SPEC_VERSION, ((LogicalTypeAnnotation.VariantLogicalTypeAnnotation) logicalType).getSpecificationVersion());
1611+
assertEquals(LogicalTypeAnnotation.variantType(specVersion), logicalType);
1612+
assertEquals(
1613+
specVersion,
1614+
((LogicalTypeAnnotation.VariantLogicalTypeAnnotation) logicalType).getSpecificationVersion());
16131615
}
16141616

16151617
private void verifyMapMessageType(final MessageType messageType, final String keyValueName) throws IOException {

0 commit comments

Comments
 (0)