Skip to content

Commit d6538e6

Browse files
martin-traversemartin-traverse
committed
Apply spotless
1 parent 62d08a9 commit d6538e6

File tree

3 files changed

+95
-46
lines changed

3 files changed

+95
-46
lines changed

‎adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class AvroToArrowConfig {
4242
private final Set<String> skipFieldNames;
4343

4444
/**
45-
* Use legacy-mode to keep compatibility with old behavior (pre-2025), enabled by default.
46-
* This affects how the AvroToArrow code interprets the Avro schema.
45+
* Use legacy-mode to keep compatibility with old behavior (pre-2025), enabled by default. This
46+
* affects how the AvroToArrow code interprets the Avro schema.
4747
*/
4848
private final boolean legacyMode;
4949

‎adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java‎

Lines changed: 92 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ private static Consumer createConsumer(
210210
break;
211211
case STRING:
212212
arrowType = new ArrowType.Utf8();
213-
fieldType = new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
213+
fieldType =
214+
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
214215
vector = createVector(consumerVector, fieldType, name, allocator);
215216
consumer = new AvroStringConsumer((VarCharVector) vector);
216217
break;
@@ -220,7 +221,10 @@ private static Consumer createConsumer(
220221
arrowType = createDecimalArrowType((LogicalTypes.Decimal) logicalType, schema);
221222
fieldType =
222223
new FieldType(
223-
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, extProps, config));
224+
nullable,
225+
arrowType,
226+
/* dictionary= */ null,
227+
getMetaData(schema, extProps, config));
224228
vector = createVector(consumerVector, fieldType, name, allocator);
225229
if (schema.getFixedSize() <= 16) {
226230
consumer =
@@ -235,7 +239,10 @@ private static Consumer createConsumer(
235239
arrowType = new ArrowType.FixedSizeBinary(schema.getFixedSize());
236240
fieldType =
237241
new FieldType(
238-
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, extProps, config));
242+
nullable,
243+
arrowType,
244+
/* dictionary= */ null,
245+
getMetaData(schema, extProps, config));
239246
vector = createVector(consumerVector, fieldType, name, allocator);
240247
consumer = new AvroFixedConsumer((FixedSizeBinaryVector) vector, schema.getFixedSize());
241248
}
@@ -244,94 +251,109 @@ private static Consumer createConsumer(
244251
if (logicalType instanceof LogicalTypes.Date) {
245252
arrowType = new ArrowType.Date(DateUnit.DAY);
246253
fieldType =
247-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
254+
new FieldType(
255+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
248256
vector = createVector(consumerVector, fieldType, name, allocator);
249257
consumer = new AvroDateConsumer((DateDayVector) vector);
250258
} else if (logicalType instanceof LogicalTypes.TimeMillis) {
251259
arrowType = new ArrowType.Time(TimeUnit.MILLISECOND, 32);
252260
fieldType =
253-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
261+
new FieldType(
262+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
254263
vector = createVector(consumerVector, fieldType, name, allocator);
255264
consumer = new AvroTimeMillisConsumer((TimeMilliVector) vector);
256265
} else {
257266
arrowType = new ArrowType.Int(32, /* isSigned= */ true);
258267
fieldType =
259-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
268+
new FieldType(
269+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
260270
vector = createVector(consumerVector, fieldType, name, allocator);
261271
consumer = new AvroIntConsumer((IntVector) vector);
262272
}
263273
break;
264274
case BOOLEAN:
265275
arrowType = new ArrowType.Bool();
266-
fieldType = new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
276+
fieldType =
277+
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
267278
vector = createVector(consumerVector, fieldType, name, allocator);
268279
consumer = new AvroBooleanConsumer((BitVector) vector);
269280
break;
270281
case LONG:
271282
if (logicalType instanceof LogicalTypes.TimeMicros) {
272283
arrowType = new ArrowType.Time(TimeUnit.MICROSECOND, 64);
273284
fieldType =
274-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
285+
new FieldType(
286+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
275287
vector = createVector(consumerVector, fieldType, name, allocator);
276288
consumer = new AvroTimeMicroConsumer((TimeMicroVector) vector);
277289
} else if (logicalType instanceof LogicalTypes.TimestampMillis && !config.isLegacyMode()) {
278-
// In legacy mode the timestamp-xxx types are treated as local, there is no zone aware type
290+
// In legacy mode the timestamp-xxx types are treated as local, there is no zone aware
291+
// type
279292
arrowType = new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC");
280293
fieldType =
281-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
294+
new FieldType(
295+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
282296
vector = createVector(consumerVector, fieldType, name, allocator);
283297
consumer = new AvroTimestampMillisTzConsumer((TimeStampMilliTZVector) vector);
284298
} else if (logicalType instanceof LogicalTypes.TimestampMicros && !config.isLegacyMode()) {
285299
arrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, "UTC");
286300
fieldType =
287-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
301+
new FieldType(
302+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
288303
vector = createVector(consumerVector, fieldType, name, allocator);
289304
consumer = new AvroTimestampMicrosTzConsumer((TimeStampMicroTZVector) vector);
290305
} else if (logicalType instanceof LogicalTypes.TimestampNanos && !config.isLegacyMode()) {
291306
arrowType = new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC");
292307
fieldType =
293-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
308+
new FieldType(
309+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
294310
vector = createVector(consumerVector, fieldType, name, allocator);
295311
consumer = new AvroTimestampNanosTzConsumer((TimeStampNanoTZVector) vector);
296-
} else if (logicalType instanceof LogicalTypes.LocalTimestampMillis ||
297-
(logicalType instanceof LogicalTypes.TimestampMillis && config.isLegacyMode())) {
312+
} else if (logicalType instanceof LogicalTypes.LocalTimestampMillis
313+
|| (logicalType instanceof LogicalTypes.TimestampMillis && config.isLegacyMode())) {
298314
arrowType = new ArrowType.Timestamp(TimeUnit.MILLISECOND, null);
299315
fieldType =
300-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
316+
new FieldType(
317+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
301318
vector = createVector(consumerVector, fieldType, name, allocator);
302319
consumer = new AvroTimestampMillisConsumer((TimeStampMilliVector) vector);
303-
} else if (logicalType instanceof LogicalTypes.LocalTimestampMicros ||
304-
(logicalType instanceof LogicalTypes.TimestampMicros && config.isLegacyMode())) {
320+
} else if (logicalType instanceof LogicalTypes.LocalTimestampMicros
321+
|| (logicalType instanceof LogicalTypes.TimestampMicros && config.isLegacyMode())) {
305322
// In legacy mode the timestamp-xxx types are treated as local
306323
arrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null);
307324
fieldType =
308-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
325+
new FieldType(
326+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
309327
vector = createVector(consumerVector, fieldType, name, allocator);
310328
consumer = new AvroTimestampMicrosConsumer((TimeStampMicroVector) vector);
311-
} else if (logicalType instanceof LogicalTypes.LocalTimestampNanos ||
312-
(logicalType instanceof LogicalTypes.TimestampNanos && config.isLegacyMode())) {
329+
} else if (logicalType instanceof LogicalTypes.LocalTimestampNanos
330+
|| (logicalType instanceof LogicalTypes.TimestampNanos && config.isLegacyMode())) {
313331
arrowType = new ArrowType.Timestamp(TimeUnit.NANOSECOND, null);
314332
fieldType =
315-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
333+
new FieldType(
334+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
316335
vector = createVector(consumerVector, fieldType, name, allocator);
317336
consumer = new AvroTimestampNanosConsumer((TimeStampNanoVector) vector);
318337
} else {
319338
arrowType = new ArrowType.Int(64, /* isSigned= */ true);
320339
fieldType =
321-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
340+
new FieldType(
341+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
322342
vector = createVector(consumerVector, fieldType, name, allocator);
323343
consumer = new AvroLongConsumer((BigIntVector) vector);
324344
}
325345
break;
326346
case FLOAT:
327347
arrowType = new ArrowType.FloatingPoint(SINGLE);
328-
fieldType = new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
348+
fieldType =
349+
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
329350
vector = createVector(consumerVector, fieldType, name, allocator);
330351
consumer = new AvroFloatConsumer((Float4Vector) vector);
331352
break;
332353
case DOUBLE:
333354
arrowType = new ArrowType.FloatingPoint(DOUBLE);
334-
fieldType = new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
355+
fieldType =
356+
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
335357
vector = createVector(consumerVector, fieldType, name, allocator);
336358
consumer = new AvroDoubleConsumer((Float8Vector) vector);
337359
break;
@@ -340,7 +362,8 @@ private static Consumer createConsumer(
340362
LogicalTypes.Decimal decimalType = (LogicalTypes.Decimal) logicalType;
341363
arrowType = createDecimalArrowType(decimalType, schema);
342364
fieldType =
343-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
365+
new FieldType(
366+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
344367
vector = createVector(consumerVector, fieldType, name, allocator);
345368
if (decimalType.getPrecision() <= 38) {
346369
consumer = new AvroDecimalConsumer.BytesDecimalConsumer((DecimalVector) vector);
@@ -351,14 +374,16 @@ private static Consumer createConsumer(
351374
} else {
352375
arrowType = new ArrowType.Binary();
353376
fieldType =
354-
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
377+
new FieldType(
378+
nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
355379
vector = createVector(consumerVector, fieldType, name, allocator);
356380
consumer = new AvroBytesConsumer((VarBinaryVector) vector);
357381
}
358382
break;
359383
case NULL:
360384
arrowType = new ArrowType.Null();
361-
fieldType = new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
385+
fieldType =
386+
new FieldType(nullable, arrowType, /* dictionary= */ null, getMetaData(schema, config));
362387
vector = new NullVector(name, fieldType); // Respect nullability defined in fieldType
363388
consumer = new AvroNullConsumer((NullVector) vector);
364389
break;
@@ -584,7 +609,8 @@ private static Field avroSchemaToField(
584609
children.add(avroSchemaToField(childSchema, null, nullableUnion, config, null));
585610
}
586611
fieldType =
587-
createFieldType(new ArrowType.Union(UnionMode.Sparse, null), schema, externalProps, config);
612+
createFieldType(
613+
new ArrowType.Union(UnionMode.Sparse, null), schema, externalProps, config);
588614
}
589615
break;
590616
case ARRAY:
@@ -607,7 +633,11 @@ private static Field avroSchemaToField(
607633
children.add(structField);
608634
fieldType =
609635
createFieldType(
610-
nullable, new ArrowType.Map(/* keysSorted= */ false), schema, externalProps, config);
636+
nullable,
637+
new ArrowType.Map(/* keysSorted= */ false),
638+
schema,
639+
externalProps,
640+
config);
611641
break;
612642
case RECORD:
613643
final Set<String> skipFieldNames = config.getSkipFieldNames();
@@ -628,7 +658,8 @@ private static Field avroSchemaToField(
628658
children.add(avroSchemaToField(childSchema, fullChildName, config, extProps));
629659
}
630660
}
631-
fieldType = createFieldType(nullable, new ArrowType.Struct(), schema, externalProps, config);
661+
fieldType =
662+
createFieldType(nullable, new ArrowType.Struct(), schema, externalProps, config);
632663
break;
633664
case ENUM:
634665
DictionaryProvider.MapDictionaryProvider provider = config.getProvider();
@@ -642,7 +673,8 @@ private static Field avroSchemaToField(
642673
indexType,
643674
schema,
644675
externalProps,
645-
new DictionaryEncoding(current, /* ordered= */ false, /* indexType= */ indexType), config);
676+
new DictionaryEncoding(current, /* ordered= */ false, /* indexType= */ indexType),
677+
config);
646678
break;
647679

648680
case STRING:
@@ -685,12 +717,16 @@ private static Field avroSchemaToField(
685717
} else if (logicalType instanceof LogicalTypes.TimestampNanos) {
686718
String tz = config.isLegacyMode() ? null : "UTC";
687719
longArrowType = new ArrowType.Timestamp(TimeUnit.NANOSECOND, tz);
688-
} else if (logicalType instanceof LogicalTypes.LocalTimestampMillis && !config.isLegacyMode()) {
689-
// In legacy mode the local-timestamp-xxx types are not recognized (result is just type = long)
720+
} else if (logicalType instanceof LogicalTypes.LocalTimestampMillis
721+
&& !config.isLegacyMode()) {
722+
// In legacy mode the local-timestamp-xxx types are not recognized (result is just type =
723+
// long)
690724
longArrowType = new ArrowType.Timestamp(TimeUnit.MILLISECOND, null);
691-
} else if (logicalType instanceof LogicalTypes.LocalTimestampMicros && !config.isLegacyMode()) {
725+
} else if (logicalType instanceof LogicalTypes.LocalTimestampMicros
726+
&& !config.isLegacyMode()) {
692727
longArrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null);
693-
} else if (logicalType instanceof LogicalTypes.LocalTimestampNanos && !config.isLegacyMode()) {
728+
} else if (logicalType instanceof LogicalTypes.LocalTimestampNanos
729+
&& !config.isLegacyMode()) {
694730
longArrowType = new ArrowType.Timestamp(TimeUnit.NANOSECOND, null);
695731
} else {
696732
longArrowType = new ArrowType.Int(64, /* isSigned= */ true);
@@ -699,11 +735,13 @@ private static Field avroSchemaToField(
699735
break;
700736
case FLOAT:
701737
fieldType =
702-
createFieldType(nullable, new ArrowType.FloatingPoint(SINGLE), schema, externalProps, config);
738+
createFieldType(
739+
nullable, new ArrowType.FloatingPoint(SINGLE), schema, externalProps, config);
703740
break;
704741
case DOUBLE:
705742
fieldType =
706-
createFieldType(nullable, new ArrowType.FloatingPoint(DOUBLE), schema, externalProps, config);
743+
createFieldType(
744+
nullable, new ArrowType.FloatingPoint(DOUBLE), schema, externalProps, config);
707745
break;
708746
case BYTES:
709747
final ArrowType bytesArrowType;
@@ -968,7 +1006,8 @@ private static Map<String, String> getMetaData(Schema schema, AvroToArrowConfig
9681006
return metadata;
9691007
}
9701008

971-
private static Map<String, String> getMetaData(Schema schema, Map<String, String> externalProps, AvroToArrowConfig config) {
1009+
private static Map<String, String> getMetaData(
1010+
Schema schema, Map<String, String> externalProps, AvroToArrowConfig config) {
9721011
Map<String, String> metadata = getMetaData(schema, config);
9731012
if (externalProps != null) {
9741013
metadata.putAll(externalProps);
@@ -991,13 +1030,21 @@ private static Map<String, String> createExternalProps(Schema schema, AvroToArro
9911030
}
9921031

9931032
private static FieldType createFieldType(
994-
ArrowType arrowType, Schema schema, Map<String, String> externalProps, AvroToArrowConfig config) {
1033+
ArrowType arrowType,
1034+
Schema schema,
1035+
Map<String, String> externalProps,
1036+
AvroToArrowConfig config) {
9951037
return createFieldType(arrowType, schema, externalProps, /* dictionary= */ null, config);
9961038
}
9971039

9981040
private static FieldType createFieldType(
999-
boolean nullable, ArrowType arrowType, Schema schema, Map<String, String> externalProps, AvroToArrowConfig config) {
1000-
return createFieldType(nullable, arrowType, schema, externalProps, /* dictionary= */ null, config);
1041+
boolean nullable,
1042+
ArrowType arrowType,
1043+
Schema schema,
1044+
Map<String, String> externalProps,
1045+
AvroToArrowConfig config) {
1046+
return createFieldType(
1047+
nullable, arrowType, schema, externalProps, /* dictionary= */ null, config);
10011048
}
10021049

10031050
private static FieldType createFieldType(
@@ -1007,7 +1054,8 @@ private static FieldType createFieldType(
10071054
DictionaryEncoding dictionary,
10081055
AvroToArrowConfig config) {
10091056

1010-
return createFieldType(/* nullable= */ false, arrowType, schema, externalProps, dictionary, config);
1057+
return createFieldType(
1058+
/* nullable= */ false, arrowType, schema, externalProps, dictionary, config);
10111059
}
10121060

10131061
private static FieldType createFieldType(
@@ -1018,7 +1066,8 @@ private static FieldType createFieldType(
10181066
DictionaryEncoding dictionary,
10191067
AvroToArrowConfig config) {
10201068

1021-
return new FieldType(nullable, arrowType, dictionary, getMetaData(schema, externalProps, config));
1069+
return new FieldType(
1070+
nullable, arrowType, dictionary, getMetaData(schema, externalProps, config));
10221071
}
10231072

10241073
private static String convertAliases(Set<String> aliases) {

‎adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroLogicalTypesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ public void testFailedToCreateDecimalLogicalType() throws Exception {
193193
Schema schema3 = getSchema("logical/test_decimal_invalid4.avsc");
194194
assertNull(schema3.getLogicalType());
195195
}
196-
}
196+
}

0 commit comments

Comments
 (0)