From 1411c0275266b73db4eecc668613279e24a2450b Mon Sep 17 00:00:00 2001 From: vibhatha Date: Wed, 24 Jan 2024 13:51:01 +0530 Subject: [PATCH 01/16] fix: adapter module --- .../arrow/adapter/avro/AvroToArrowUtils.java | 28 +++++++++---------- .../avro/AvroToArrowVectorIterator.java | 2 ++ .../adapter/avro/consumers/Consumer.java | 1 + .../arrow/adapter/avro/AvroSkipFieldTest.java | 9 +++--- .../arrow/adapter/avro/AvroTestBase.java | 4 +-- .../adapter/avro/AvroToArrowIteratorTest.java | 4 +-- .../arrow/adapter/avro/AvroToArrowTest.java | 2 -- .../adapter/jdbc/consumer/BinaryConsumer.java | 2 +- .../adapter/jdbc/consumer/ClobConsumer.java | 8 +++--- .../adapter/jdbc/consumer/JdbcConsumer.java | 1 + .../adapter/jdbc/JdbcParameterBinderTest.java | 10 +++---- .../jdbc/JdbcToArrowCommentMetadataTest.java | 9 ------ .../adapter/jdbc/JdbcToArrowConfigTest.java | 9 +++--- .../adapter/jdbc/JdbcToArrowTestHelper.java | 7 +++-- .../arrow/adapter/jdbc/ResultSetUtility.java | 23 ++++++--------- .../adapter/jdbc/UnreliableMetaDataTest.java | 3 -- .../adapter/jdbc/h2/JdbcAliasToArrowTest.java | 4 +-- .../adapter/jdbc/h2/JdbcToArrowArrayTest.java | 3 +- .../jdbc/h2/JdbcToArrowCharSetTest.java | 3 ++ .../jdbc/h2/JdbcToArrowDataTypesTest.java | 2 ++ .../jdbc/h2/JdbcToArrowMapDataTypeTest.java | 2 ++ .../adapter/jdbc/h2/JdbcToArrowNullTest.java | 2 ++ .../h2/JdbcToArrowOptionalColumnsTest.java | 2 ++ .../adapter/jdbc/h2/JdbcToArrowTest.java | 2 ++ .../jdbc/h2/JdbcToArrowTimeZoneTest.java | 2 ++ 25 files changed, 74 insertions(+), 70 deletions(-) diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java index 1f5ad9e7689..c949f4b1ec5 100644 --- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java +++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -95,7 +96,6 @@ import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; -import org.apache.avro.Schema.Type; import org.apache.avro.io.Decoder; /** @@ -159,7 +159,7 @@ private static Consumer createConsumer( final BufferAllocator allocator = config.getAllocator(); - final Type type = schema.getType(); + final Schema.Type type = schema.getType(); final LogicalType logicalType = schema.getLogicalType(); final ArrowType arrowType; @@ -215,7 +215,7 @@ private static Consumer createConsumer( vector = createVector(consumerVector, fieldType, name, allocator); consumer = new AvroTimeMillisConsumer((TimeMilliVector) vector); } else { - arrowType = new ArrowType.Int(32, /*signed=*/true); + arrowType = new ArrowType.Int(32, /*isSigned=*/true); fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema)); vector = createVector(consumerVector, fieldType, name, allocator); consumer = new AvroIntConsumer((IntVector) vector); @@ -244,7 +244,7 @@ private static Consumer createConsumer( vector = createVector(consumerVector, fieldType, name, allocator); consumer = new AvroTimestampMicrosConsumer((TimeStampMicroVector) vector); } else { - arrowType = new ArrowType.Int(64, /*signed=*/true); + arrowType = new ArrowType.Int(64, /*isSigned=*/true); fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema)); vector = createVector(consumerVector, fieldType, name, allocator); consumer = new AvroLongConsumer((BigIntVector) vector); @@ -278,7 +278,7 @@ private static Consumer createConsumer( case NULL: arrowType = new ArrowType.Null(); fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema)); - vector = fieldType.createNewSingleVector(name, allocator, /*schemaCallback=*/null); + vector = fieldType.createNewSingleVector(name, allocator, /*schemaCallBack=*/null); consumer = new AvroNullConsumer((NullVector) vector); break; default: @@ -305,7 +305,7 @@ private static ArrowType createDecimalArrowType(LogicalTypes.Decimal logicalType private static Consumer createSkipConsumer(Schema schema) { SkipFunction skipFunction; - Type type = schema.getType(); + Schema.Type type = schema.getType(); switch (type) { case UNION: @@ -391,7 +391,7 @@ static CompositeAvroConsumer createCompositeConsumer( final Set skipFieldNames = config.getSkipFieldNames(); Schema.Type type = schema.getType(); - if (type == Type.RECORD) { + if (type == Schema.Type.RECORD) { for (Schema.Field field : schema.getFields()) { if (skipFieldNames.contains(field.name())) { consumers.add(createSkipConsumer(field.schema())); @@ -416,7 +416,7 @@ private static FieldVector createVector(FieldVector consumerVector, FieldType fi private static String getDefaultFieldName(ArrowType type) { Types.MinorType minorType = Types.getMinorTypeForArrowType(type); - return minorType.name().toLowerCase(); + return minorType.name().toLowerCase(Locale.ROOT); } private static Field avroSchemaToField(Schema schema, String name, AvroToArrowConfig config) { @@ -429,7 +429,7 @@ private static Field avroSchemaToField( AvroToArrowConfig config, Map externalProps) { - final Type type = schema.getType(); + final Schema.Type type = schema.getType(); final LogicalType logicalType = schema.getLogicalType(); final List children = new ArrayList<>(); final FieldType fieldType; @@ -457,7 +457,7 @@ private static Field avroSchemaToField( FieldType structFieldType = new FieldType(false, new ArrowType.Struct(), /*dictionary=*/null); Field structField = new Field("internal", structFieldType, Arrays.asList(keyField, valueField)); children.add(structField); - fieldType = createFieldType(new ArrowType.Map(/*keySorted=*/false), schema, externalProps); + fieldType = createFieldType(new ArrowType.Map(/*keysSorted=*/false), schema, externalProps); break; case RECORD: final Set skipFieldNames = config.getSkipFieldNames(); @@ -509,7 +509,7 @@ private static Field avroSchemaToField( } else if (logicalType instanceof LogicalTypes.TimeMillis) { intArrowType = new ArrowType.Time(TimeUnit.MILLISECOND, 32); } else { - intArrowType = new ArrowType.Int(32, /*signed=*/true); + intArrowType = new ArrowType.Int(32, /*isSigned=*/true); } fieldType = createFieldType(intArrowType, schema, externalProps); break; @@ -525,7 +525,7 @@ private static Field avroSchemaToField( } else if (logicalType instanceof LogicalTypes.TimestampMicros) { longArrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null); } else { - longArrowType = new ArrowType.Int(64, /*signed=*/true); + longArrowType = new ArrowType.Int(64, /*isSigned=*/true); } fieldType = createFieldType(longArrowType, schema, externalProps); break; @@ -668,7 +668,7 @@ private static Consumer createUnionConsumer(Schema schema, String name, AvroToAr FieldVector consumerVector) { final int size = schema.getTypes().size(); - final boolean nullable = schema.getTypes().stream().anyMatch(t -> t.getType() == Type.NULL); + final boolean nullable = schema.getTypes().stream().anyMatch(t -> t.getType() == Schema.Type.NULL); UnionVector unionVector; if (consumerVector == null) { @@ -709,7 +709,7 @@ static VectorSchemaRoot avroToArrowVectors( final Set skipFieldNames = config.getSkipFieldNames(); Schema.Type type = schema.getType(); - if (type == Type.RECORD) { + if (type == Schema.Type.RECORD) { for (Schema.Field field : schema.getFields()) { if (skipFieldNames.contains(field.name())) { consumers.add(createSkipConsumer(field.schema())); diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java index 4a439ade811..9a0cfd97a49 100644 --- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java +++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java @@ -162,6 +162,7 @@ public boolean hasNext() { /** * Gets the next vector. The user is responsible for freeing its resources. */ + @Override public VectorSchemaRoot next() { Preconditions.checkArgument(hasNext()); VectorSchemaRoot returned = nextBatch; @@ -177,6 +178,7 @@ public VectorSchemaRoot next() { /** * Clean up resources. */ + @Override public void close() { if (nextBatch != null) { nextBatch.close(); diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java index c2ae1ce77b2..8eaaf74cff6 100644 --- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java +++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java @@ -53,6 +53,7 @@ public interface Consumer extends AutoCloseable { /** * Close this consumer when occurs exception to avoid potential leak. */ + @Override void close() throws Exception; /** diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java index a37eca6514e..54fa26afe3f 100644 --- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java +++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -223,7 +224,7 @@ public void testSkipStringField() throws Exception { ArrayList expectedData = new ArrayList<>(); for (int i = 0; i < 5; i++) { - final byte[] testBytes = ("test" + i).getBytes(); + final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8); GenericRecord record = new GenericData.Record(schema); GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema()); fixed.bytes(testBytes); @@ -257,7 +258,7 @@ public void testSkipBytesField() throws Exception { ArrayList expectedData = new ArrayList<>(); for (int i = 0; i < 5; i++) { - final byte[] testBytes = ("test" + i).getBytes(); + final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8); GenericRecord record = new GenericData.Record(schema); GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema()); fixed.bytes(testBytes); @@ -291,7 +292,7 @@ public void testSkipFixedField() throws Exception { ArrayList expectedData = new ArrayList<>(); for (int i = 0; i < 5; i++) { - final byte[] testBytes = ("test" + i).getBytes(); + final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8); GenericRecord record = new GenericData.Record(schema); GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema()); fixed.bytes(testBytes); @@ -325,7 +326,7 @@ public void testSkipEnumField() throws Exception { ArrayList expectedData = new ArrayList<>(); for (int i = 0; i < 5; i++) { - final byte[] testBytes = ("test" + i).getBytes(); + final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8); GenericRecord record = new GenericData.Record(schema); GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema()); fixed.bytes(testBytes); diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java index 60a3a285db3..a91bba7b84f 100644 --- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java +++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java @@ -145,7 +145,7 @@ protected void checkPrimitiveResult(List data, FieldVector vector) { } } - protected void checkRecordResult(Schema schema, ArrayList data, VectorSchemaRoot root) { + protected void checkRecordResult(Schema schema, List data, VectorSchemaRoot root) { assertEquals(data.size(), root.getRowCount()); assertEquals(schema.getFields().size(), root.getFieldVectors().size()); @@ -194,7 +194,7 @@ protected void checkArrayResult(List> expected, List vectors } } - protected void checkRecordResult(Schema schema, ArrayList data, List roots) { + protected void checkRecordResult(Schema schema, List data, List roots) { roots.forEach(root -> { assertEquals(schema.getFields().size(), root.getFieldVectors().size()); }); diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java index 02f7a373373..7f2edb08fda 100644 --- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java +++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java @@ -181,13 +181,13 @@ public void runLargeNumberOfRows() throws Exception { } } - assertEquals(x, targetRows); + assertEquals(targetRows, x); } /** * Fake avro decoder to test large data. */ - private class FakeDecoder extends Decoder { + private static class FakeDecoder extends Decoder { private int numRows; diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java index 1c642041917..26f72173b6b 100644 --- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java +++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java @@ -87,10 +87,8 @@ public void testFixedAttributes() throws Exception { Schema schema = getSchema("attrs/test_fixed_attr.avsc"); List data = new ArrayList<>(); - List expected = new ArrayList<>(); for (int i = 0; i < 5; i++) { byte[] value = ("value" + i).getBytes(StandardCharsets.UTF_8); - expected.add(value); GenericData.Fixed fixed = new GenericData.Fixed(schema); fixed.bytes(value); data.add(fixed); diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java index 8c5f61169d4..538d161f9e9 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java @@ -74,7 +74,7 @@ public void consume(InputStream is) throws IOException { vector.getDataBuffer().setBytes(startOffset + dataLength, reuseBytes, 0, read); dataLength += read; } - offsetBuffer.setInt((currentIndex + 1) * VarBinaryVector.OFFSET_WIDTH, startOffset + dataLength); + offsetBuffer.setInt((currentIndex + 1) * ((long) VarBinaryVector.OFFSET_WIDTH), startOffset + dataLength); BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex); vector.setLastSet(currentIndex); } diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java index a52d9b73b4d..3ed0c2d3cbb 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java @@ -88,7 +88,7 @@ public void consume(ResultSet resultSet) throws SQLException { ArrowBuf dataBuffer = vector.getDataBuffer(); ArrowBuf offsetBuffer = vector.getOffsetBuffer(); - int startIndex = offsetBuffer.getInt(currentIndex * 4); + int startIndex = offsetBuffer.getInt(currentIndex * 4L); while (read <= length) { String str = clob.getSubString(read, readSize); byte[] bytes = str.getBytes(StandardCharsets.UTF_8); @@ -106,7 +106,7 @@ public void consume(ResultSet resultSet) throws SQLException { totalBytes += bytes.length; read += readSize; } - offsetBuffer.setInt((currentIndex + 1) * 4, startIndex + totalBytes); + offsetBuffer.setInt((currentIndex + 1) * 4L, startIndex + totalBytes); BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex); vector.setLastSet(currentIndex); } @@ -139,7 +139,7 @@ public void consume(ResultSet resultSet) throws SQLException { ArrowBuf dataBuffer = vector.getDataBuffer(); ArrowBuf offsetBuffer = vector.getOffsetBuffer(); - int startIndex = offsetBuffer.getInt(currentIndex * 4); + int startIndex = offsetBuffer.getInt(currentIndex * 4L); while (read <= length) { String str = clob.getSubString(read, readSize); byte[] bytes = str.getBytes(StandardCharsets.UTF_8); @@ -157,7 +157,7 @@ public void consume(ResultSet resultSet) throws SQLException { totalBytes += bytes.length; read += readSize; } - offsetBuffer.setInt((currentIndex + 1) * 4, startIndex + totalBytes); + offsetBuffer.setInt((currentIndex + 1) * 4L, startIndex + totalBytes); BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex); vector.setLastSet(currentIndex); } diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java index 480dfe3a1c5..7c867c7ad64 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java @@ -37,6 +37,7 @@ public interface JdbcConsumer extends AutoCloseable { /** * Close this consumer, do some clean work such as clear reuse ArrowBuf. */ + @Override void close() throws Exception; /** diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java index 15b9ab03861..a94f0aa454f 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java @@ -109,8 +109,8 @@ void bindOrder() throws SQLException { final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) { final JdbcParameterBinder binder = JdbcParameterBinder.builder(statement, root) - .bind(/*paramIndex=*/ 1, /*colIndex=*/ 2) - .bind(/*paramIndex=*/ 2, /*colIndex=*/ 0) + .bind(/*parameterIndex=*/ 1, /*columnIndex=*/ 2) + .bind(/*parameterIndex=*/ 2, /*columnIndex=*/ 0) .build(); assertThat(binder.next()).isFalse(); @@ -169,7 +169,7 @@ void customBinder() throws SQLException { final JdbcParameterBinder binder = JdbcParameterBinder.builder(statement, root) .bind( - /*paramIndex=*/ 1, + /*parameterIndex=*/ 1, new ColumnBinder() { private final IntVector vector = (IntVector) root.getVector(0); @Override @@ -275,11 +275,11 @@ void time32() throws SQLException { @Test void time64() throws SQLException { testSimpleType(new ArrowType.Time(TimeUnit.MICROSECOND, 64), Types.TIME, - (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() * 1_000)), + (valueVectors, index, value) -> valueVectors.setSafe(index, (value.getTime() * 1_000)), TimeMicroVector::setNull, Arrays.asList(new Time(-128_000), new Time(104_000), new Time(-42_000))); testSimpleType(new ArrowType.Time(TimeUnit.NANOSECOND, 64), Types.TIME, - (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() * 1_000_000)), + (valueVectors, index, value) -> valueVectors.setSafe(index, (value.getTime() * 1_000_000)), TimeNanoVector::setNull, Arrays.asList(new Time(-128), new Time(104), new Time(-42))); } diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java index 07cab0d829f..4ee65944c3a 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java @@ -19,9 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; @@ -34,7 +31,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Objects; import java.util.Set; import org.apache.arrow.memory.RootAllocator; @@ -228,9 +224,4 @@ private String getColumnComment(DatabaseMetaData metaData, String tableName, Str } return null; } - - private String getExpectedSchema(String expectedResource) throws java.io.IOException, java.net.URISyntaxException { - return new String(Files.readAllBytes(Paths.get(Objects.requireNonNull( - JdbcToArrowCommentMetadataTest.class.getResource(expectedResource)).toURI())), StandardCharsets.UTF_8); - } } diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java index 68a681b052c..bd941146ddb 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java @@ -27,6 +27,7 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Locale; +import java.util.Objects; import java.util.TimeZone; import org.apache.arrow.memory.BufferAllocator; @@ -89,8 +90,8 @@ public void testConfig() { JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(allocator, calendar); JdbcToArrowConfig config = builder.build(); - assertTrue(allocator == config.getAllocator()); - assertTrue(calendar == config.getCalendar()); + assertTrue(Objects.equals(allocator, config.getAllocator())); + assertTrue(Objects.equals(calendar, config.getCalendar())); Calendar newCalendar = Calendar.getInstance(); BufferAllocator newAllocator = new RootAllocator(Integer.SIZE); @@ -98,8 +99,8 @@ public void testConfig() { builder.setAllocator(newAllocator).setCalendar(newCalendar); config = builder.build(); - assertTrue(newAllocator == config.getAllocator()); - assertTrue(newCalendar == config.getCalendar()); + assertTrue(Objects.equals(newAllocator, config.getAllocator())); + assertTrue(Objects.equals(newCalendar, config.getCalendar())); } @Test diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java index 91f2f465dd9..7dd881b3f7c 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java @@ -24,6 +24,7 @@ import java.math.BigDecimal; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.AbstractMap; @@ -399,7 +400,7 @@ public static byte[][] getCharArray(String[] values, String dataType) { byte[][] valueArr = new byte[dataArr.length][]; int i = 0; for (String data : dataArr) { - valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes(); + valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes(StandardCharsets.UTF_8); } return valueArr; } @@ -419,11 +420,12 @@ public static byte[][] getBinaryValues(String[] values, String dataType) { byte[][] valueArr = new byte[dataArr.length][]; int i = 0; for (String data : dataArr) { - valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes(); + valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes(StandardCharsets.UTF_8); } return valueArr; } + @SuppressWarnings("StringSplitter") public static String[] getValues(String[] values, String dataType) { String value = ""; for (String val : values) { @@ -440,6 +442,7 @@ public static Integer[][] getListValues(String[] values, String dataType) { return getListValues(dataArr); } + @SuppressWarnings("StringSplitter") public static Integer[][] getListValues(String[] dataArr) { Integer[][] valueArr = new Integer[dataArr.length][]; int i = 0; diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java index ccc7681c5bc..b05a59a9a04 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java @@ -66,17 +66,17 @@ public static MockResultSet generateBasicResultSet(int rows) throws SQLException } public static class MockResultSet extends ThrowingResultSet { - private final ArrayList rows; + private final List rows; private int index = 0; private boolean isClosed = false; private ResultSetMetaData metadata; private boolean wasNull; - public MockResultSet(ArrayList rows) throws SQLException { + public MockResultSet(List rows) throws SQLException { this(rows, MockResultSetMetaData.fromRows(rows)); } - public MockResultSet(ArrayList rows, ResultSetMetaData metadata) { + public MockResultSet(List rows, ResultSetMetaData metadata) { this.rows = rows; this.metadata = metadata; this.wasNull = false; @@ -252,8 +252,8 @@ public Builder addDataElement(Object val, int sqlType) { return this.addDataElement(new MockDataElement(val, sqlType)); } - public Builder setMetaData(ResultSetMetaData metaData) { - this.metadata = metaData; + public Builder setMetaData(ResultSetMetaData metadata) { + this.metadata = metadata; return this; } @@ -318,7 +318,7 @@ public String getColumnTypeName(int column) throws SQLException { return columns.get(column - 1).getTypeName(); } - public static MockResultSetMetaData fromRows(ArrayList rows) throws SQLException { + public static MockResultSetMetaData fromRows(List rows) throws SQLException { // Note: This attempts to dynamically construct ResultSetMetaData from the first row in a given result set. // If there are now rows, or the result set contains no columns, this cannot be dynamically generated and // an exception will be thrown. @@ -338,7 +338,6 @@ public static MockResultSetMetaData fromRows(ArrayList rows) throws SQL } public static class MockColumnMetaData { - private int index; private int sqlType; private int precision; private int scale; @@ -385,7 +384,6 @@ private int getDisplaySize() { public static MockColumnMetaData fromDataElement(MockDataElement element, int i) throws SQLException { return MockColumnMetaData.builder() - .index(i) .sqlType(element.getSqlType()) .precision(element.getPrecision()) .scale(element.getScale()) @@ -403,11 +401,6 @@ public static Builder builder() { public static class Builder { private MockColumnMetaData columnMetaData = new MockColumnMetaData(); - public Builder index(int index) { - this.columnMetaData.index = index; - return this; - } - public Builder label(String label) { this.columnMetaData.label = label; return this; @@ -453,9 +446,9 @@ public MockColumnMetaData build() { } public static class MockRow { - private final ArrayList dataElements; + private final List dataElements; - public MockRow(ArrayList elements) { + public MockRow(List elements) { this.dataElements = elements; } diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java index 3eb886faabc..053604073fd 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java @@ -171,7 +171,6 @@ public void testIncorrectNullability() throws Exception { // ARROW-17005: ResultSetMetaData may indicate a field is non-nullable even when there are nulls ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData = ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder() - .index(1) .sqlType(Types.INTEGER) .nullable(ResultSetMetaData.columnNoNulls) .build(); @@ -257,7 +256,6 @@ public void testIncorrectNullability() throws Exception { private ResultSet buildIncorrectPrecisionAndScaleMetaDataResultSet() throws SQLException { ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData = ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder() - .index(1) .sqlType(Types.DECIMAL) .precision(0) .scale(0) @@ -277,7 +275,6 @@ private ResultSet buildIncorrectPrecisionAndScaleMetaDataResultSet() throws SQLE private ResultSet buildVaryingPrecisionAndScaleResultSet() throws SQLException { ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData = ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder() - .index(1) .sqlType(Types.DECIMAL) .precision(0) .scale(0) diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java index d9acfe88f4f..d32c2bbab91 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java @@ -111,8 +111,8 @@ public void testJdbcAliasToArrow() throws Exception { assertEquals(rowCount, vector.getRowCount()); Schema vectorSchema = vector.getSchema(); List vectorFields = vectorSchema.getFields(); - assertEquals(vectorFields.get(0).getName(), COLUMN_A); - assertEquals(vectorFields.get(1).getName(), COLUMN_B); + assertEquals(COLUMN_A, vectorFields.get(0).getName()); + assertEquals(COLUMN_B, vectorFields.get(1).getName()); } } diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java index 377e332b43a..eabbdc5a25e 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import java.nio.charset.StandardCharsets; import java.sql.Array; import java.sql.Connection; import java.sql.DriverManager; @@ -284,7 +285,7 @@ private void assertStringVectorEquals(ListVector listVector, int rowCount, Strin assertEquals(1, listVector.isSet(row)); assertEquals(expectedValues[row].length, offset - prevOffset); for (int i = prevOffset; i < offset; ++i) { - assertArrayEquals(expectedValues[row][i - prevOffset].getBytes(), vector.get(i)); + assertArrayEquals(expectedValues[row][i - prevOffset].getBytes(StandardCharsets.UTF_8), vector.get(i)); } prevOffset = offset; diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java index 422b55070aa..ab1b4b7fc2f 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java @@ -76,6 +76,7 @@ public JdbcToArrowCharSetTest(Table table) { * @throws ClassNotFoundException on error */ @Before + @Override public void setUp() throws SQLException, ClassNotFoundException { String url = "jdbc:h2:mem:JdbcToArrowTest?characterEncoding=UTF-8"; String driver = "org.h2.Driver"; @@ -107,6 +108,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * the multi-byte CJK characters. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false); @@ -142,6 +144,7 @@ public void testJdbcSchemaMetadata() throws SQLException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java index ae4fffd0f94..54e7d5ffb27 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java @@ -145,6 +145,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false); @@ -185,6 +186,7 @@ public void testJdbcSchemaMetadata() throws SQLException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java index 43862a93c39..a5d1ffa3f64 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java @@ -45,6 +45,7 @@ public JdbcToArrowMapDataTypeTest() throws IOException { * Test Method to test JdbcToArrow Functionality for Map form Types.OTHER column */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { Calendar calendar = Calendar.getInstance(); ResultSetMetaData rsmd = getQueryMetaData(table.getQuery()); @@ -68,6 +69,7 @@ public void testJdbcToArrowValues() throws SQLException, IOException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { assertMapVectorValues((MapVector) root.getVector(MAP), table.getRowCount(), getMapValues(table.getValues(), MAP)); diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java index 5731f27c5b3..31d32bd6489 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java @@ -124,6 +124,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with null values. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false); @@ -168,6 +169,7 @@ public void testJdbcSchemaMetadata() throws SQLException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java index eebcbe64c0e..4d0bbfc7a99 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java @@ -70,6 +70,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * Test Method to test JdbcToArrow Functionality for dealing with nullable and non-nullable columns. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false); } @@ -82,6 +83,7 @@ public void testJdbcToArrowValues() throws SQLException, IOException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java index 7641fa7f165..a925dd7ee32 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java @@ -101,6 +101,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with only one test data file. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false); @@ -149,6 +150,7 @@ public void testJdbcSchemaMetadata() throws SQLException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); assertBigIntVectorValues((BigIntVector) root.getVector(BIGINT), table.getRowCount(), diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java index 462a75da514..fe08db161c8 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java @@ -103,6 +103,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo * Time and Timestamp datatype. */ @Test + @Override public void testJdbcToArrowValues() throws SQLException, IOException { testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))), false); @@ -139,6 +140,7 @@ public void testJdbcSchemaMetadata() throws SQLException { * @param isIncludeMapVector is this dataset checks includes map column. * Jdbc type to 'map' mapping declared in configuration only manually */ + @Override public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) { JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root); From eca49233069eb94d06a22087ad80c08b11c1214c Mon Sep 17 00:00:00 2001 From: vibhatha Date: Wed, 24 Jan 2024 14:59:47 +0530 Subject: [PATCH 02/16] fix: c module --- .../main/java/org/apache/arrow/c/Format.java | 3 ++- .../apache/arrow/c/jni/CDataJniException.java | 4 +-- .../org/apache/arrow/c/DictionaryTest.java | 25 ++++++++++--------- .../org/apache/arrow/c/NativeUtilTest.java | 2 +- .../org/apache/arrow/c/RoundtripTest.java | 4 +-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/java/c/src/main/java/org/apache/arrow/c/Format.java b/java/c/src/main/java/org/apache/arrow/c/Format.java index 2875e46f749..a5f44859e83 100644 --- a/java/c/src/main/java/org/apache/arrow/c/Format.java +++ b/java/c/src/main/java/org/apache/arrow/c/Format.java @@ -18,6 +18,7 @@ package org.apache.arrow.c; import java.util.Arrays; +import java.util.Locale; import java.util.stream.Collectors; import org.apache.arrow.util.Preconditions; @@ -127,7 +128,7 @@ static String asString(ArrowType arrowType) { String.format("Int type with bitwidth %d is unsupported", type.getBitWidth())); } if (type.getIsSigned()) { - format = format.toLowerCase(); + format = format.toLowerCase(Locale.ROOT); } return format; } diff --git a/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java b/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java index bebd434f3db..df16839c78a 100644 --- a/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java +++ b/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java @@ -36,10 +36,10 @@ public int getErrno() { } @Override - public String toString() { + public String getMessage() { return "CDataJniException{" + "errno=" + errno + - ", message=" + getMessage() + + ", message=" + super.getMessage() + '}'; } } diff --git a/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java b/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java index d892781756e..3416547fca3 100644 --- a/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java +++ b/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java @@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.channels.Channels; +import java.nio.charset.StandardCharsets; import java.util.Collections; import org.apache.arrow.c.ArrowArray; @@ -95,9 +96,9 @@ public void testWithDictionary() throws Exception { // create dictionary and provider final VarCharVector dictVector = new VarCharVector("dict", allocator); dictVector.allocateNewSafe(); - dictVector.setSafe(0, "aa".getBytes()); - dictVector.setSafe(1, "bb".getBytes()); - dictVector.setSafe(2, "cc".getBytes()); + dictVector.setSafe(0, "aa".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8)); dictVector.setValueCount(3); Dictionary dictionary = new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */null)); @@ -106,10 +107,10 @@ public void testWithDictionary() throws Exception { // create vector and encode it final VarCharVector vector = new VarCharVector("vector", allocator); vector.allocateNewSafe(); - vector.setSafe(0, "bb".getBytes()); - vector.setSafe(1, "bb".getBytes()); - vector.setSafe(2, "cc".getBytes()); - vector.setSafe(3, "aa".getBytes()); + vector.setSafe(0, "bb".getBytes(StandardCharsets.UTF_8)); + vector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8)); + vector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8)); + vector.setSafe(3, "aa".getBytes(StandardCharsets.UTF_8)); vector.setValueCount(4); // get the encoded vector @@ -163,11 +164,11 @@ private ArrowStreamReader createMultiBatchReader() throws IOException { // create dictionary and provider DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider(); dictVector.allocateNewSafe(); - dictVector.setSafe(0, "aa".getBytes()); - dictVector.setSafe(1, "bb".getBytes()); - dictVector.setSafe(2, "cc".getBytes()); - dictVector.setSafe(3, "dd".getBytes()); - dictVector.setSafe(4, "ee".getBytes()); + dictVector.setSafe(0, "aa".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(3, "dd".getBytes(StandardCharsets.UTF_8)); + dictVector.setSafe(4, "ee".getBytes(StandardCharsets.UTF_8)); dictVector.setValueCount(5); Dictionary dictionary = new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */null)); provider.put(dictionary); diff --git a/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java b/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java index f46a0128c86..9a322b76379 100644 --- a/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java +++ b/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java @@ -64,7 +64,7 @@ public void testString() { @Test public void testToJavaArray() { long[] nativeArray = new long[] { 1, 2, 3 }; - try (ArrowBuf buffer = allocator.buffer(Long.BYTES * nativeArray.length, null)) { + try (ArrowBuf buffer = allocator.buffer(Long.BYTES * ((long) nativeArray.length), null)) { for (long value : nativeArray) { buffer.writeLong(value); } diff --git a/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java b/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java index 768394ef7ab..8dcd2ff9a23 100644 --- a/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java +++ b/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java @@ -511,7 +511,7 @@ public void testNullVector() { @Test public void testVarBinaryVector() { try (final VarBinaryVector vector = new VarBinaryVector("v", allocator)) { - setVector(vector, "abc".getBytes(), "def".getBytes(), null); + setVector(vector, "abc".getBytes(StandardCharsets.UTF_8), "def".getBytes(StandardCharsets.UTF_8), null); assertTrue(roundtrip(vector, VarBinaryVector.class)); } } @@ -537,7 +537,7 @@ public void testLargeVarBinaryVector() { String str = "hello world"; try (ArrowBuf buf = allocator.buffer(16)) { - buf.setBytes(0, str.getBytes()); + buf.setBytes(0, str.getBytes(StandardCharsets.UTF_8)); binHolder.start = 0; binHolder.end = str.length(); binHolder.buffer = buf; From e7195d91c88aeed066dd5f11087c74e6ef6a59ee Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Thu, 1 Feb 2024 15:37:14 +0530 Subject: [PATCH 03/16] fix: format module --- java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/BinaryView.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/BodyCompression.java | 2 +- .../java/org/apache/arrow/flatbuf/BodyCompressionMethod.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/CompressionType.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Date.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java | 2 +- .../main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Duration.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Endianness.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Field.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Int.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Interval.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeBinary.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeList.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeListView.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/List.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/ListView.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Map.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Message.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/MessageHeader.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Null.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Precision.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/RecordBatch.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java | 2 +- .../org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/SparseTensor.java | 2 +- .../main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/TensorDim.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Time.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Timestamp.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Type.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Union.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/UnionMode.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java index 08674cbccae..f20f53d2205 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java @@ -42,7 +42,7 @@ public final class Binary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Binary getRootAsBinary(ByteBuffer _bb) { return getRootAsBinary(_bb, new Binary()); } - public static Binary getRootAsBinary(ByteBuffer _bb, Binary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Binary getRootAsBinary(ByteBuffer _bb, Binary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Binary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java index 6b58f1c6738..950f7562811 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java @@ -48,7 +48,7 @@ public final class BinaryView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static BinaryView getRootAsBinaryView(ByteBuffer _bb) { return getRootAsBinaryView(_bb, new BinaryView()); } - public static BinaryView getRootAsBinaryView(ByteBuffer _bb, BinaryView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static BinaryView getRootAsBinaryView(ByteBuffer _bb, BinaryView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public BinaryView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java index b3300608115..a899868927b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java @@ -44,7 +44,7 @@ public final class BodyCompression extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb) { return getRootAsBodyCompression(_bb, new BodyCompression()); } - public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb, BodyCompression obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb, BodyCompression obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public BodyCompression __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java index eb63b073d70..6f832d8f422 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java @@ -37,7 +37,7 @@ private BodyCompressionMethod() { } */ public static final byte BUFFER = 0; - public static final String[] names = { "BUFFER", }; + private static final String[] names = { "BUFFER", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java index 1f0ec75d692..49e071d70cc 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java @@ -39,7 +39,7 @@ public final class Bool extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Bool getRootAsBool(ByteBuffer _bb) { return getRootAsBool(_bb, new Bool()); } - public static Bool getRootAsBool(ByteBuffer _bb, Bool obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Bool getRootAsBool(ByteBuffer _bb, Bool obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Bool __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java index c9850a2633f..9b46fd75019 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java @@ -24,7 +24,7 @@ private CompressionType() { } public static final byte LZ4_FRAME = 0; public static final byte ZSTD = 1; - public static final String[] names = { "LZ4_FRAME", "ZSTD", }; + private static final String[] names = { "LZ4_FRAME", "ZSTD", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java index d52b0b18864..2038a4270d7 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java @@ -47,7 +47,7 @@ public final class Date extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Date getRootAsDate(ByteBuffer _bb) { return getRootAsDate(_bb, new Date()); } - public static Date getRootAsDate(ByteBuffer _bb, Date obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Date getRootAsDate(ByteBuffer _bb, Date obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Date __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java index 75b8b4cf7a3..d4998dbe885 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java @@ -24,7 +24,7 @@ private DateUnit() { } public static final short DAY = 0; public static final short MILLISECOND = 1; - public static final String[] names = { "DAY", "MILLISECOND", }; + private static final String[] names = { "DAY", "MILLISECOND", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java index 87c7c7bc05d..907d361dfdc 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java @@ -45,7 +45,7 @@ public final class Decimal extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Decimal getRootAsDecimal(ByteBuffer _bb) { return getRootAsDecimal(_bb, new Decimal()); } - public static Decimal getRootAsDecimal(ByteBuffer _bb, Decimal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Decimal getRootAsDecimal(ByteBuffer _bb, Decimal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Decimal __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java index f0e894238e9..d41696fe64d 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java @@ -47,7 +47,7 @@ public final class DictionaryBatch extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb) { return getRootAsDictionaryBatch(_bb, new DictionaryBatch()); } - public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb, DictionaryBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb, DictionaryBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public DictionaryBatch __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java index c314ebb124e..4ace94d7cc6 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java @@ -39,7 +39,7 @@ public final class DictionaryEncoding extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb) { return getRootAsDictionaryEncoding(_bb, new DictionaryEncoding()); } - public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb, DictionaryEncoding obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb, DictionaryEncoding obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public DictionaryEncoding __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java index ed9337a5602..aa854e9bcef 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java @@ -30,7 +30,7 @@ public final class DictionaryKind { private DictionaryKind() { } public static final short DenseArray = 0; - public static final String[] names = { "DenseArray", }; + private static final String[] names = { "DenseArray", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java index 1518bd599da..0b37b393d07 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java @@ -39,7 +39,7 @@ public final class Duration extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Duration getRootAsDuration(ByteBuffer _bb) { return getRootAsDuration(_bb, new Duration()); } - public static Duration getRootAsDuration(ByteBuffer _bb, Duration obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Duration getRootAsDuration(ByteBuffer _bb, Duration obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Duration __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java index 266cb73d505..e2785f3adab 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java @@ -28,7 +28,7 @@ private Endianness() { } public static final short Little = 0; public static final short Big = 1; - public static final String[] names = { "Little", "Big", }; + private static final String[] names = { "Little", "Big", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java index 9724070bc00..45f1fcdc088 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java @@ -44,7 +44,7 @@ public final class Field extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Field getRootAsField(ByteBuffer _bb) { return getRootAsField(_bb, new Field()); } - public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Field __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java index 8e090a30e1a..7caa8e0d799 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java @@ -39,7 +39,7 @@ public final class FixedSizeBinary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb) { return getRootAsFixedSizeBinary(_bb, new FixedSizeBinary()); } - public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb, FixedSizeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb, FixedSizeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FixedSizeBinary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java index ce967718191..02f853e84c6 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java @@ -39,7 +39,7 @@ public final class FixedSizeList extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb) { return getRootAsFixedSizeList(_bb, new FixedSizeList()); } - public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb, FixedSizeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb, FixedSizeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FixedSizeList __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java index e602ebedd35..ccd1d83bd3a 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java @@ -39,7 +39,7 @@ public final class FloatingPoint extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb) { return getRootAsFloatingPoint(_bb, new FloatingPoint()); } - public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb, FloatingPoint obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb, FloatingPoint obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FloatingPoint __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java index 9cc7d67bcb9..d29ae298ae0 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java @@ -44,7 +44,7 @@ public final class Footer extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Footer getRootAsFooter(ByteBuffer _bb) { return getRootAsFooter(_bb, new Footer()); } - public static Footer getRootAsFooter(ByteBuffer _bb, Footer obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Footer getRootAsFooter(ByteBuffer _bb, Footer obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Footer __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java index 8bb2866c384..49f4e67c5ce 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java @@ -39,7 +39,7 @@ public final class Int extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Int getRootAsInt(ByteBuffer _bb) { return getRootAsInt(_bb, new Int()); } - public static Int getRootAsInt(ByteBuffer _bb, Int obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Int getRootAsInt(ByteBuffer _bb, Int obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Int __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java index c2cd1e5d6ac..fb60346819d 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java @@ -39,7 +39,7 @@ public final class Interval extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Interval getRootAsInterval(ByteBuffer _bb) { return getRootAsInterval(_bb, new Interval()); } - public static Interval getRootAsInterval(ByteBuffer _bb, Interval obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Interval getRootAsInterval(ByteBuffer _bb, Interval obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Interval __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java index 8a8332468b7..4257570e70c 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java @@ -25,7 +25,7 @@ private IntervalUnit() { } public static final short DAY_TIME = 1; public static final short MONTH_DAY_NANO = 2; - public static final String[] names = { "YEAR_MONTH", "DAY_TIME", "MONTH_DAY_NANO", }; + private static final String[] names = { "YEAR_MONTH", "DAY_TIME", "MONTH_DAY_NANO", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java index dcbd0744fd0..ccbd3863d0d 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java @@ -44,7 +44,7 @@ public final class KeyValue extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static KeyValue getRootAsKeyValue(ByteBuffer _bb) { return getRootAsKeyValue(_bb, new KeyValue()); } - public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public KeyValue __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java index 65d93148588..9834285d72e 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java @@ -43,7 +43,7 @@ public final class LargeBinary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb) { return getRootAsLargeBinary(_bb, new LargeBinary()); } - public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb, LargeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb, LargeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeBinary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java index 144454d5bfa..5b4fa8cb36e 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java @@ -43,7 +43,7 @@ public final class LargeList extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeList getRootAsLargeList(ByteBuffer _bb) { return getRootAsLargeList(_bb, new LargeList()); } - public static LargeList getRootAsLargeList(ByteBuffer _bb, LargeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static LargeList getRootAsLargeList(ByteBuffer _bb, LargeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeList __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java index c88ff0bdc95..9ff46a98a0f 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java @@ -43,7 +43,7 @@ public final class LargeListView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeListView getRootAsLargeListView(ByteBuffer _bb) { return getRootAsLargeListView(_bb, new LargeListView()); } - public static LargeListView getRootAsLargeListView(ByteBuffer _bb, LargeListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static LargeListView getRootAsLargeListView(ByteBuffer _bb, LargeListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeListView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java index 4c3532250dd..0308d9a121a 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java @@ -43,7 +43,7 @@ public final class LargeUtf8 extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb) { return getRootAsLargeUtf8(_bb, new LargeUtf8()); } - public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb, LargeUtf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb, LargeUtf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeUtf8 __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java index 00b56652da8..d123863f83b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java @@ -39,7 +39,7 @@ public final class List extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static List getRootAsList(ByteBuffer _bb) { return getRootAsList(_bb, new List()); } - public static List getRootAsList(ByteBuffer _bb, List obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static List getRootAsList(ByteBuffer _bb, List obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public List __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java index e211600c0ee..ea31af3d052 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java @@ -44,7 +44,7 @@ public final class ListView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static ListView getRootAsListView(ByteBuffer _bb) { return getRootAsListView(_bb, new ListView()); } - public static ListView getRootAsListView(ByteBuffer _bb, ListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static ListView getRootAsListView(ByteBuffer _bb, ListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public ListView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java index b8a36a8b19f..0ca508c9c3b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java @@ -66,7 +66,7 @@ public final class Map extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Map getRootAsMap(ByteBuffer _bb) { return getRootAsMap(_bb, new Map()); } - public static Map getRootAsMap(ByteBuffer _bb, Map obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Map getRootAsMap(ByteBuffer _bb, Map obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Map __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java index 32941ad7b3d..41ef6cc14d7 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java @@ -39,7 +39,7 @@ public final class Message extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Message getRootAsMessage(ByteBuffer _bb) { return getRootAsMessage(_bb, new Message()); } - public static Message getRootAsMessage(ByteBuffer _bb, Message obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Message getRootAsMessage(ByteBuffer _bb, Message obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Message __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java index cc23ce3728c..5d1e304f696 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java @@ -38,7 +38,7 @@ private MessageHeader() { } public static final byte Tensor = 4; public static final byte SparseTensor = 5; - public static final String[] names = { "NONE", "Schema", "DictionaryBatch", "RecordBatch", "Tensor", "SparseTensor", }; + private static final String[] names = { "NONE", "Schema", "DictionaryBatch", "RecordBatch", "Tensor", "SparseTensor", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java index 83b44b50668..6a881c934f8 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java @@ -48,7 +48,7 @@ private MetadataVersion() { } */ public static final short V5 = 4; - public static final String[] names = { "V1", "V2", "V3", "V4", "V5", }; + private static final String[] names = { "V1", "V2", "V3", "V4", "V5", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java index e0cbf21b723..80a3e5fcc56 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java @@ -42,7 +42,7 @@ public final class Null extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Null getRootAsNull(ByteBuffer _bb) { return getRootAsNull(_bb, new Null()); } - public static Null getRootAsNull(ByteBuffer _bb, Null obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Null getRootAsNull(ByteBuffer _bb, Null obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Null __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java index ff368825767..50a16db1ae9 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java @@ -25,7 +25,7 @@ private Precision() { } public static final short SINGLE = 1; public static final short DOUBLE = 2; - public static final String[] names = { "HALF", "SINGLE", "DOUBLE", }; + private static final String[] names = { "HALF", "SINGLE", "DOUBLE", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java index 286ef0840a6..c19f2ae69c5 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java @@ -44,7 +44,7 @@ public final class RecordBatch extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb) { return getRootAsRecordBatch(_bb, new RecordBatch()); } - public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb, RecordBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb, RecordBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public RecordBatch __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java index 89e8f0039a5..2fc34b8f569 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java @@ -46,7 +46,7 @@ public final class RunEndEncoded extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb) { return getRootAsRunEndEncoded(_bb, new RunEndEncoded()); } - public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb, RunEndEncoded obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb, RunEndEncoded obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public RunEndEncoded __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java index a81c052ec09..8a1be702710 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java @@ -43,7 +43,7 @@ public final class Schema extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Schema getRootAsSchema(ByteBuffer _bb) { return getRootAsSchema(_bb, new Schema()); } - public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Schema __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java index ddfc63a1186..af75448474f 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java @@ -24,7 +24,7 @@ private SparseMatrixCompressedAxis() { } public static final short Row = 0; public static final short Column = 1; - public static final String[] names = { "Row", "Column", }; + private static final String[] names = { "Row", "Column", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java index 98748991411..70f662fe8f7 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java @@ -42,7 +42,7 @@ public final class SparseMatrixIndexCSX extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb) { return getRootAsSparseMatrixIndexCSX(_bb, new SparseMatrixIndexCSX()); } - public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb, SparseMatrixIndexCSX obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb, SparseMatrixIndexCSX obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseMatrixIndexCSX __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java index 62b4274146c..c6bc63d5697 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java @@ -39,7 +39,7 @@ public final class SparseTensor extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb) { return getRootAsSparseTensor(_bb, new SparseTensor()); } - public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb, SparseTensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb, SparseTensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java index f2a0455312b..1108b75b224 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java @@ -26,7 +26,7 @@ private SparseTensorIndex() { } public static final byte SparseMatrixIndexCSX = 2; public static final byte SparseTensorIndexCSF = 3; - public static final String[] names = { "NONE", "SparseTensorIndexCOO", "SparseMatrixIndexCSX", "SparseTensorIndexCSF", }; + private static final String[] names = { "NONE", "SparseTensorIndexCOO", "SparseMatrixIndexCSX", "SparseTensorIndexCSF", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java index 80c524c75c7..7570ffd985b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java @@ -73,7 +73,7 @@ public final class SparseTensorIndexCOO extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb) { return getRootAsSparseTensorIndexCOO(_bb, new SparseTensorIndexCOO()); } - public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb, SparseTensorIndexCOO obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb, SparseTensorIndexCOO obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensorIndexCOO __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java index 87f269de551..61b6064e0c0 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java @@ -42,7 +42,7 @@ public final class SparseTensorIndexCSF extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb) { return getRootAsSparseTensorIndexCSF(_bb, new SparseTensorIndexCSF()); } - public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb, SparseTensorIndexCSF obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb, SparseTensorIndexCSF obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensorIndexCSF __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java index 0517be6153c..7f7a1b5e18e 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java @@ -44,7 +44,7 @@ public final class Struct_ extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Struct_ getRootAsStruct_(ByteBuffer _bb) { return getRootAsStruct_(_bb, new Struct_()); } - public static Struct_ getRootAsStruct_(ByteBuffer _bb, Struct_ obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Struct_ getRootAsStruct_(ByteBuffer _bb, Struct_ obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Struct_ __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java index 5892b6aca90..6b49fc80b55 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java @@ -39,7 +39,7 @@ public final class Tensor extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Tensor getRootAsTensor(ByteBuffer _bb) { return getRootAsTensor(_bb, new Tensor()); } - public static Tensor getRootAsTensor(ByteBuffer _bb, Tensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Tensor getRootAsTensor(ByteBuffer _bb, Tensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Tensor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java index 3c85786f409..613ac63d3b6 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java @@ -44,7 +44,7 @@ public final class TensorDim extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static TensorDim getRootAsTensorDim(ByteBuffer _bb) { return getRootAsTensorDim(_bb, new TensorDim()); } - public static TensorDim getRootAsTensorDim(ByteBuffer _bb, TensorDim obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static TensorDim getRootAsTensorDim(ByteBuffer _bb, TensorDim obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public TensorDim __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java index d5a320f4935..ed4e32ca185 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java @@ -55,7 +55,7 @@ public final class Time extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Time getRootAsTime(ByteBuffer _bb) { return getRootAsTime(_bb, new Time()); } - public static Time getRootAsTime(ByteBuffer _bb, Time obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Time getRootAsTime(ByteBuffer _bb, Time obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Time __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java index 2a7bfad5c61..80ac6fb45cc 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java @@ -26,7 +26,7 @@ private TimeUnit() { } public static final short MICROSECOND = 2; public static final short NANOSECOND = 3; - public static final String[] names = { "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND", }; + private static final String[] names = { "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java index d906fbeea1b..2c642cebf72 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java @@ -146,7 +146,7 @@ public final class Timestamp extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Timestamp getRootAsTimestamp(ByteBuffer _bb) { return getRootAsTimestamp(_bb, new Timestamp()); } - public static Timestamp getRootAsTimestamp(ByteBuffer _bb, Timestamp obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Timestamp getRootAsTimestamp(ByteBuffer _bb, Timestamp obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Timestamp __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java index 07bb34b11ca..1e517dbfdbc 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java @@ -54,7 +54,7 @@ private Type() { } public static final byte ListView = 25; public static final byte LargeListView = 26; - public static final String[] names = { "NONE", "Null", "Int", "FloatingPoint", "Binary", "Utf8", "Bool", "Decimal", "Date", "Time", "Timestamp", "Interval", "List", "Struct_", "Union", "FixedSizeBinary", "FixedSizeList", "Map", "Duration", "LargeBinary", "LargeUtf8", "LargeList", "RunEndEncoded", "BinaryView", "Utf8View", "ListView", "LargeListView", }; + private static final String[] names = { "NONE", "Null", "Int", "FloatingPoint", "Binary", "Utf8", "Bool", "Decimal", "Date", "Time", "Timestamp", "Interval", "List", "Struct_", "Union", "FixedSizeBinary", "FixedSizeList", "Map", "Duration", "LargeBinary", "LargeUtf8", "LargeList", "RunEndEncoded", "BinaryView", "Utf8View", "ListView", "LargeListView", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java index 1a106919cb1..00389844799 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java @@ -45,7 +45,7 @@ public final class Union extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Union getRootAsUnion(ByteBuffer _bb) { return getRootAsUnion(_bb, new Union()); } - public static Union getRootAsUnion(ByteBuffer _bb, Union obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Union getRootAsUnion(ByteBuffer _bb, Union obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Union __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java index d66ddc318e8..fdba0d99a1a 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java @@ -24,7 +24,7 @@ private UnionMode() { } public static final short Sparse = 0; public static final short Dense = 1; - public static final String[] names = { "Sparse", "Dense", }; + private static final String[] names = { "Sparse", "Dense", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java index 60933cf25af..6dea6262b79 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java @@ -42,7 +42,7 @@ public final class Utf8 extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Utf8 getRootAsUtf8(ByteBuffer _bb) { return getRootAsUtf8(_bb, new Utf8()); } - public static Utf8 getRootAsUtf8(ByteBuffer _bb, Utf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Utf8 getRootAsUtf8(ByteBuffer _bb, Utf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Utf8 __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java index 377ba034cbb..2d26b06c898 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java @@ -48,7 +48,7 @@ public final class Utf8View extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Utf8View getRootAsUtf8View(ByteBuffer _bb) { return getRootAsUtf8View(_bb, new Utf8View()); } - public static Utf8View getRootAsUtf8View(ByteBuffer _bb, Utf8View obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public static Utf8View getRootAsUtf8View(ByteBuffer _bb, Utf8View obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Utf8View __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } From c29d6a01aa1d7e5cd2852913976b5a4cedc73dc6 Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Thu, 1 Feb 2024 16:08:18 +0530 Subject: [PATCH 04/16] fix: format memory-core --- .../org/apache/arrow/memory/TestArrowBuf.java | 2 +- .../arrow/memory/TestBaseAllocator.java | 4 +--- .../memory/TestLowCostIdentityHashMap.java | 2 +- .../memory/util/TestArrowBufPointer.java | 20 +++++++++---------- .../memory/util/TestByteFunctionHelpers.java | 6 ++++-- .../memory/util/hash/TestArrowBufHasher.java | 12 +++++------ .../memory/netty/TestNettyAllocator.java | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java index b4385b72a38..f01d152f84b 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java @@ -141,7 +141,7 @@ public void testSetBytesBigEndian() { } @Test - /** + /* * Test that allocation history is not recorded even though * assertions are enabled in tests (GH-34338). */ diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java index 535d5c15e89..26e2952342b 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java @@ -374,7 +374,7 @@ public void testCustomizedAllocationManager() { assertEquals(1, arrowBuf1.getInt(0)); try { - final ArrowBuf arrowBuf2 = allocator.buffer(1); + allocator.buffer(1); fail("allocated memory beyond max allowed"); } catch (OutOfMemoryException e) { // expected @@ -1077,8 +1077,6 @@ public void testMemoryLeakWithReservation() throws Exception { "child2", 1024, MAX_ALLOCATION); rootAllocator.verify(); - ArrowBuf buff = childAllocator2.buffer(256); - Exception exception = assertThrows(IllegalStateException.class, () -> { childAllocator2.close(); }); diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java index 0cabc4a0571..234a6447ddb 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java @@ -147,7 +147,7 @@ public void testLargeMap() throws Exception { assertTrue(hashMap.isEmpty()); } - private class StringWithKey implements ValueWithKeyIncluded { + private static class StringWithKey implements ValueWithKeyIncluded { private String myValue; private String myKey; diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java index a1d5624a7e8..04e588ed16f 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java @@ -55,16 +55,16 @@ public void testArrowBufPointersEqual() { try (ArrowBuf buf1 = allocator.buffer(BUFFER_LENGTH); ArrowBuf buf2 = allocator.buffer(BUFFER_LENGTH)) { for (int i = 0; i < BUFFER_LENGTH / 4; i++) { - buf1.setInt(i * 4, i * 1234); - buf2.setInt(i * 4, i * 1234); + buf1.setInt(i * 4L, i * 1234); + buf2.setInt(i * 4L, i * 1234); } ArrowBufPointer ptr1 = new ArrowBufPointer(null, 0, 100); ArrowBufPointer ptr2 = new ArrowBufPointer(null, 100, 5032); assertTrue(ptr1.equals(ptr2)); for (int i = 0; i < BUFFER_LENGTH / 4; i++) { - ptr1.set(buf1, i * 4, 4); - ptr2.set(buf2, i * 4, 4); + ptr1.set(buf1, i * 4L, 4); + ptr2.set(buf2, i * 4L, 4); assertTrue(ptr1.equals(ptr2)); } } @@ -76,8 +76,8 @@ public void testArrowBufPointersHashCode() { try (ArrowBuf buf1 = allocator.buffer(vectorLength * 4); ArrowBuf buf2 = allocator.buffer(vectorLength * 4)) { for (int i = 0; i < vectorLength; i++) { - buf1.setInt(i * 4, i); - buf2.setInt(i * 4, i); + buf1.setInt(i * 4L, i); + buf2.setInt(i * 4L, i); } CounterHasher hasher1 = new CounterHasher(); @@ -90,8 +90,8 @@ public void testArrowBufPointersHashCode() { assertEquals(ArrowBufPointer.NULL_HASH_CODE, pointer2.hashCode()); for (int i = 0; i < vectorLength; i++) { - pointer1.set(buf1, i * 4, 4); - pointer2.set(buf2, i * 4, 4); + pointer1.set(buf1, i * 4L, 4); + pointer2.set(buf2, i * 4L, 4); assertEquals(pointer1.hashCode(), pointer2.hashCode()); @@ -188,7 +188,7 @@ public void testArrowBufPointersComparison() { * Hasher with a counter that increments each time a hash code is calculated. * This is to validate that the hash code in {@link ArrowBufPointer} is reused. */ - class CounterHasher implements ArrowBufHasher { + static class CounterHasher implements ArrowBufHasher { protected int counter = 0; @@ -211,7 +211,7 @@ public int hashCode() { @Override public boolean equals(Object o) { - return o != null && this.getClass() == o.getClass(); + return o instanceof CounterHasher; } } } diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java index 04a715962df..7a44a5f2d72 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java @@ -19,6 +19,8 @@ import static org.junit.Assert.assertEquals; +import java.nio.charset.StandardCharsets; + import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; @@ -121,9 +123,9 @@ public void testStringCompare() { String rightStr = rightStrings[i]; ArrowBuf left = allocator.buffer(SIZE); - left.setBytes(0, leftStr.getBytes()); + left.setBytes(0, leftStr.getBytes(StandardCharsets.UTF_8)); ArrowBuf right = allocator.buffer(SIZE); - right.setBytes(0, rightStr.getBytes()); + right.setBytes(0, rightStr.getBytes(StandardCharsets.UTF_8)); assertEquals(leftStr.compareTo(rightStr) < 0 ? -1 : 1, ByteFunctionHelpers.compare(left, 0, leftStr.length(), right, 0, rightStr.length())); diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java index 3da0602bdfd..cc5ce49e548 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java @@ -66,8 +66,8 @@ public void testHasher() { ArrowBuf buf2 = allocator.buffer(BUFFER_LENGTH)) { // prepare data for (int i = 0; i < BUFFER_LENGTH / 4; i++) { - buf1.setFloat(i * 4, i / 10.0f); - buf2.setFloat(i * 4, i / 10.0f); + buf1.setFloat(i * 4L, i / 10.0f); + buf2.setFloat(i * 4L, i / 10.0f); } verifyHashCodesEqual(buf1, 0, 100, buf2, 0, 100); @@ -95,7 +95,7 @@ public void testHasherNegative() { try (ArrowBuf buf = allocator.buffer(BUFFER_LENGTH)) { // prepare data for (int i = 0; i < BUFFER_LENGTH / 4; i++) { - buf.setFloat(i * 4, i / 10.0f); + buf.setFloat(i * 4L, i / 10.0f); } assertThrows(IllegalArgumentException.class, () -> { @@ -120,13 +120,13 @@ public void testHasherLessThanInt() { buf2.writeBytes("bar2".getBytes(StandardCharsets.UTF_8)); for (int i = 1; i <= 4; i ++) { - verifyHashCodeNotEqual(buf1, 0, i, buf2, 0, i); + verifyHashCodeNotEqual(buf1, i, buf2, i); } } } - private void verifyHashCodeNotEqual(ArrowBuf buf1, int offset1, int length1, - ArrowBuf buf2, int offset2, int length2) { + private void verifyHashCodeNotEqual(ArrowBuf buf1, int length1, + ArrowBuf buf2, int length2) { int hashCode1 = hasher.hashCode(buf1, 0, length1); int hashCode2 = hasher.hashCode(buf2, 0, length2); assertNotEquals(hashCode1, hashCode2); diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java index a6da36bb35a..6f001143a54 100644 --- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java +++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java @@ -40,7 +40,7 @@ public class TestNettyAllocator { @Test public void testMemoryUsage() { - ListAppender memoryLogsAppender = new ListAppender<>(); + final ListAppender memoryLogsAppender = new ListAppender<>(); memoryLogsAppender.list = Collections.synchronizedList(memoryLogsAppender.list); Logger logger = (Logger) LoggerFactory.getLogger("arrow.allocator"); try { From bf02c42f46c2654ec15c1ab7cc18ec076f51a7dd Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Thu, 1 Feb 2024 16:31:03 +0530 Subject: [PATCH 05/16] fix: memory-netty-buffer-patch module --- .../java/io/netty/buffer/NettyArrowBuf.java | 2 +- .../buffer/UnsafeDirectLittleEndian.java | 19 ++++++------------- .../buffer/TestUnsafeDirectLittleEndian.java | 3 +-- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java index 466444c7d53..ae1f30a8684 100644 --- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java +++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java @@ -413,7 +413,7 @@ protected int _getUnsignedMedium(int index) { protected int _getUnsignedMediumLE(int index) { this.chk(index, 3); long addr = this.addr(index); - return PlatformDependent.getByte(addr) & 255 | + return (PlatformDependent.getByte(addr) & 255) | (Short.reverseBytes(PlatformDependent.getShort(addr + 1L)) & '\uffff') << 8; } diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java index e51c6c3d488..ab0cd0c9e6e 100644 --- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java +++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java @@ -36,19 +36,12 @@ public class UnsafeDirectLittleEndian extends WrappedByteBuf { private final AbstractByteBuf wrapped; private final long memoryAddress; - UnsafeDirectLittleEndian(DuplicatedByteBuf buf) { - this(buf, true); - } - - UnsafeDirectLittleEndian(LargeBuffer buf) { - this(buf, true); - } - - UnsafeDirectLittleEndian(PooledUnsafeDirectByteBuf buf) { - this(buf, true); - } - - private UnsafeDirectLittleEndian(AbstractByteBuf buf, boolean fake) { + /** + * Constructs a new instance. + * + * @param buf The buffer to wrap + */ + public UnsafeDirectLittleEndian(AbstractByteBuf buf) { super(buf); this.wrapped = buf; diff --git a/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java b/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java index 043c2c1605a..4717e48f27b 100644 --- a/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java +++ b/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java @@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import org.junit.Test; @@ -34,9 +33,9 @@ import io.netty.buffer.UnsafeDirectLittleEndian; public class TestUnsafeDirectLittleEndian { - private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN; @Test + @SuppressWarnings("CatchAndPrintStackTrace") public void testPrimitiveGetSet() { ByteBuf byteBuf = Unpooled.directBuffer(64); UnsafeDirectLittleEndian unsafeDirect = new UnsafeDirectLittleEndian(new LargeBuffer(byteBuf)); From c2da46c04d3a5dd9ac35a143917326362b006d9a Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Thu, 1 Feb 2024 16:47:03 +0530 Subject: [PATCH 06/16] fix: memory-netty module --- .../memory/netty/NettyAllocationManager.java | 4 +--- .../arrow/memory/netty/TestEndianness.java | 16 ++++++++-------- .../arrow/memory/netty/TestNettyAllocator.java | 1 + 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java index 58354d0c2ee..1e4e06df7e9 100644 --- a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java +++ b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java @@ -68,11 +68,9 @@ public ArrowBuf empty() { /** * The cut-off value for switching allocation strategies. */ - private final int allocationCutOffValue; NettyAllocationManager(BufferAllocator accountingAllocator, long requestedSize, int allocationCutOffValue) { super(accountingAllocator); - this.allocationCutOffValue = allocationCutOffValue; if (requestedSize > allocationCutOffValue) { this.memoryChunk = null; @@ -92,7 +90,7 @@ public ArrowBuf empty() { /** * Get the underlying memory chunk managed by this AllocationManager. * @return the underlying memory chunk if the request size is not greater than the - * {@link NettyAllocationManager#allocationCutOffValue}, or null otherwise. + * cutoff value provided in the constructor , or null otherwise. * * @deprecated this method will be removed in a future release. */ diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java index a782523cbc6..0c99062021f 100644 --- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java +++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java @@ -36,15 +36,15 @@ public void testNativeEndian() { final ByteBuf b = NettyArrowBuf.unwrapBuffer(a.buffer(4)); b.setInt(0, 35); if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { - assertEquals(b.getByte(0), 35); - assertEquals(b.getByte(1), 0); - assertEquals(b.getByte(2), 0); - assertEquals(b.getByte(3), 0); + assertEquals(35, b.getByte(0)); + assertEquals(0, b.getByte(1)); + assertEquals(0, b.getByte(2)); + assertEquals(0, b.getByte(3)); } else { - assertEquals(b.getByte(0), 0); - assertEquals(b.getByte(1), 0); - assertEquals(b.getByte(2), 0); - assertEquals(b.getByte(3), 35); + assertEquals(0, b.getByte(0)); + assertEquals(0, b.getByte(1)); + assertEquals(0, b.getByte(2)); + assertEquals(35, b.getByte(3)); } b.release(); a.close(); diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java index 6f001143a54..43c6bb0abe4 100644 --- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java +++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java @@ -39,6 +39,7 @@ public class TestNettyAllocator { @Test + @SuppressWarnings("SynchronizeOnNonFinalField") public void testMemoryUsage() { final ListAppender memoryLogsAppender = new ListAppender<>(); memoryLogsAppender.list = Collections.synchronizedList(memoryLogsAppender.list); From 4a90cdee8cac5319bece924c2832ccaae8b7e6ce Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Thu, 1 Feb 2024 23:58:47 +0530 Subject: [PATCH 07/16] fix: minor change --- .../java/org/apache/arrow/memory/netty/TestNettyAllocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java index 43c6bb0abe4..792ae53a940 100644 --- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java +++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java @@ -41,7 +41,7 @@ public class TestNettyAllocator { @Test @SuppressWarnings("SynchronizeOnNonFinalField") public void testMemoryUsage() { - final ListAppender memoryLogsAppender = new ListAppender<>(); + ListAppender memoryLogsAppender = new ListAppender<>(); memoryLogsAppender.list = Collections.synchronizedList(memoryLogsAppender.list); Logger logger = (Logger) LoggerFactory.getLogger("arrow.allocator"); try { From bf996ad84c2016b629eacdb8a76ca8b9c769fd09 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Wed, 29 May 2024 13:32:52 +0530 Subject: [PATCH 08/16] fix: addressing reviews --- .../apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java | 9 ++++----- .../java/org/apache/arrow/memory/TestBaseAllocator.java | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java index bd941146ddb..d4fb7c32997 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java @@ -27,7 +27,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Locale; -import java.util.Objects; import java.util.TimeZone; import org.apache.arrow.memory.BufferAllocator; @@ -90,8 +89,8 @@ public void testConfig() { JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(allocator, calendar); JdbcToArrowConfig config = builder.build(); - assertTrue(Objects.equals(allocator, config.getAllocator())); - assertTrue(Objects.equals(calendar, config.getCalendar())); + assertEquals(allocator, config.getAllocator()); + assertEquals(calendar, config.getCalendar()); Calendar newCalendar = Calendar.getInstance(); BufferAllocator newAllocator = new RootAllocator(Integer.SIZE); @@ -99,8 +98,8 @@ public void testConfig() { builder.setAllocator(newAllocator).setCalendar(newCalendar); config = builder.build(); - assertTrue(Objects.equals(newAllocator, config.getAllocator())); - assertTrue(Objects.equals(newCalendar, config.getCalendar())); + assertEquals(newAllocator, config.getAllocator()); + assertEquals(newCalendar, config.getCalendar()); } @Test diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java index 26e2952342b..1f9e65831b4 100644 --- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java +++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java @@ -1077,6 +1077,8 @@ public void testMemoryLeakWithReservation() throws Exception { "child2", 1024, MAX_ALLOCATION); rootAllocator.verify(); + childAllocator2.buffer(256); + Exception exception = assertThrows(IllegalStateException.class, () -> { childAllocator2.close(); }); From dfb05d90fd51f5aa85c1a7229efff18cd9f4a4f4 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Wed, 29 May 2024 18:31:44 +0530 Subject: [PATCH 09/16] fix: reverting flatbuf changes --- java/format/pom.xml | 8 ++++++++ .../src/main/java/org/apache/arrow/flatbuf/Binary.java | 2 +- .../main/java/org/apache/arrow/flatbuf/BinaryView.java | 2 +- .../java/org/apache/arrow/flatbuf/BodyCompression.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Bool.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Date.java | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/java/format/pom.xml b/java/format/pom.xml index e9eded79de6..fe0dca44e20 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -41,6 +41,14 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + false + + diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java index f20f53d2205..08674cbccae 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java @@ -42,7 +42,7 @@ public final class Binary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Binary getRootAsBinary(ByteBuffer _bb) { return getRootAsBinary(_bb, new Binary()); } - public static Binary getRootAsBinary(ByteBuffer _bb, Binary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Binary getRootAsBinary(ByteBuffer _bb, Binary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Binary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java index 950f7562811..6b58f1c6738 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java @@ -48,7 +48,7 @@ public final class BinaryView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static BinaryView getRootAsBinaryView(ByteBuffer _bb) { return getRootAsBinaryView(_bb, new BinaryView()); } - public static BinaryView getRootAsBinaryView(ByteBuffer _bb, BinaryView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static BinaryView getRootAsBinaryView(ByteBuffer _bb, BinaryView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public BinaryView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java index a899868927b..b3300608115 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java @@ -44,7 +44,7 @@ public final class BodyCompression extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb) { return getRootAsBodyCompression(_bb, new BodyCompression()); } - public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb, BodyCompression obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb, BodyCompression obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public BodyCompression __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java index 49e071d70cc..1f0ec75d692 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java @@ -39,7 +39,7 @@ public final class Bool extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Bool getRootAsBool(ByteBuffer _bb) { return getRootAsBool(_bb, new Bool()); } - public static Bool getRootAsBool(ByteBuffer _bb, Bool obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Bool getRootAsBool(ByteBuffer _bb, Bool obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Bool __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java index 2038a4270d7..d52b0b18864 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java @@ -47,7 +47,7 @@ public final class Date extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Date getRootAsDate(ByteBuffer _bb) { return getRootAsDate(_bb, new Date()); } - public static Date getRootAsDate(ByteBuffer _bb, Date obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Date getRootAsDate(ByteBuffer _bb, Date obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Date __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } From 65aa1e5838d51d4e2bbac74a639687cb8f7634e3 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Fri, 31 May 2024 14:05:44 +0530 Subject: [PATCH 10/16] fix: omitting error prone on format module --- docs/source/developers/java/development.rst | 11 +++++++++++ java/format/pom.xml | 8 -------- .../apache/arrow/flatbuf/BodyCompressionMethod.java | 2 +- java/pom.xml | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index 3f0ff6cdd01..d0465f50d26 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -137,3 +137,14 @@ This applies the style to all pom.xml files under the current directory or from .. _conbench: https://github.com/conbench/conbench .. _checkstyle: https://github.com/apache/arrow/blob/main/java/dev/checkstyle/checkstyle.xml .. _Apache Maven pom.xml guidelines: https://maven.apache.org/developers/conventions/code.html#pom-code-convention + + +Error Prone +=========== + +In relation to code formatting and standards, ``Error Prone`` compiler analysis may use cache to avoid +showing the warnings if attempted re-run of `mvn clean install`. To avoid the cache to include the +warnings, use `mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false` +instead. + +Also note that Error Prone must be disabled for auto generated content. diff --git a/java/format/pom.xml b/java/format/pom.xml index fe0dca44e20..e9eded79de6 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -41,14 +41,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - false - - diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java index 6f832d8f422..eb63b073d70 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java @@ -37,7 +37,7 @@ private BodyCompressionMethod() { } */ public static final byte BUFFER = 0; - private static final String[] names = { "BUFFER", }; + public static final String[] names = { "BUFFER", }; public static String name(int e) { return names[e]; } } diff --git a/java/pom.xml b/java/pom.xml index 9be9d431d47..26b4c1c570c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -995,7 +995,7 @@ UTF-8 -XDcompilePolicy=simple - -Xplugin:ErrorProne -XepExcludedPaths:.*/(target/generated-sources)/.* + -Xplugin:ErrorProne -XepExcludedPaths:.*/(target/generated-source|format/src/main/java/org/apache/arrow/flatbuf)/.* -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED From 966973c324aa51e6e31e7beb6a6aefb181575249 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Fri, 31 May 2024 15:08:08 +0530 Subject: [PATCH 11/16] fix: lint --- docs/source/developers/java/development.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index d0465f50d26..16a9bed2e75 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -143,8 +143,8 @@ Error Prone =========== In relation to code formatting and standards, ``Error Prone`` compiler analysis may use cache to avoid -showing the warnings if attempted re-run of `mvn clean install`. To avoid the cache to include the -warnings, use `mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false` +showing the warnings if attempted re-run of ``mvn clean install``. To avoid the cache to include the +warnings, use ``mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false`` instead. Also note that Error Prone must be disabled for auto generated content. From 1de219b1094aec80029179164841a1a43b71cba3 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Fri, 31 May 2024 15:26:41 +0530 Subject: [PATCH 12/16] fix: reverting changes on auto generated content --- .../src/main/java/org/apache/arrow/flatbuf/CompressionType.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java | 2 +- .../main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Duration.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Endianness.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Field.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Int.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Interval.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeBinary.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeList.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeListView.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/List.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/ListView.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Map.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Message.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/MessageHeader.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Null.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Precision.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/RecordBatch.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java | 2 +- .../org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/SparseTensor.java | 2 +- .../main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java | 2 +- .../java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/TensorDim.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Time.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/Timestamp.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Type.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Union.java | 2 +- .../src/main/java/org/apache/arrow/flatbuf/UnionMode.java | 2 +- java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java | 2 +- .../format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java index 9b46fd75019..c9850a2633f 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java @@ -24,7 +24,7 @@ private CompressionType() { } public static final byte LZ4_FRAME = 0; public static final byte ZSTD = 1; - private static final String[] names = { "LZ4_FRAME", "ZSTD", }; + public static final String[] names = { "LZ4_FRAME", "ZSTD", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java index d4998dbe885..75b8b4cf7a3 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java @@ -24,7 +24,7 @@ private DateUnit() { } public static final short DAY = 0; public static final short MILLISECOND = 1; - private static final String[] names = { "DAY", "MILLISECOND", }; + public static final String[] names = { "DAY", "MILLISECOND", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java index 907d361dfdc..87c7c7bc05d 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java @@ -45,7 +45,7 @@ public final class Decimal extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Decimal getRootAsDecimal(ByteBuffer _bb) { return getRootAsDecimal(_bb, new Decimal()); } - public static Decimal getRootAsDecimal(ByteBuffer _bb, Decimal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Decimal getRootAsDecimal(ByteBuffer _bb, Decimal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Decimal __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java index d41696fe64d..f0e894238e9 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java @@ -47,7 +47,7 @@ public final class DictionaryBatch extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb) { return getRootAsDictionaryBatch(_bb, new DictionaryBatch()); } - public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb, DictionaryBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb, DictionaryBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public DictionaryBatch __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java index 4ace94d7cc6..c314ebb124e 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java @@ -39,7 +39,7 @@ public final class DictionaryEncoding extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb) { return getRootAsDictionaryEncoding(_bb, new DictionaryEncoding()); } - public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb, DictionaryEncoding obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb, DictionaryEncoding obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public DictionaryEncoding __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java index aa854e9bcef..ed9337a5602 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java @@ -30,7 +30,7 @@ public final class DictionaryKind { private DictionaryKind() { } public static final short DenseArray = 0; - private static final String[] names = { "DenseArray", }; + public static final String[] names = { "DenseArray", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java index 0b37b393d07..1518bd599da 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java @@ -39,7 +39,7 @@ public final class Duration extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Duration getRootAsDuration(ByteBuffer _bb) { return getRootAsDuration(_bb, new Duration()); } - public static Duration getRootAsDuration(ByteBuffer _bb, Duration obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Duration getRootAsDuration(ByteBuffer _bb, Duration obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Duration __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java index e2785f3adab..266cb73d505 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java @@ -28,7 +28,7 @@ private Endianness() { } public static final short Little = 0; public static final short Big = 1; - private static final String[] names = { "Little", "Big", }; + public static final String[] names = { "Little", "Big", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java index 45f1fcdc088..9724070bc00 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java @@ -44,7 +44,7 @@ public final class Field extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Field getRootAsField(ByteBuffer _bb) { return getRootAsField(_bb, new Field()); } - public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Field __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java index 7caa8e0d799..8e090a30e1a 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java @@ -39,7 +39,7 @@ public final class FixedSizeBinary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb) { return getRootAsFixedSizeBinary(_bb, new FixedSizeBinary()); } - public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb, FixedSizeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb, FixedSizeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FixedSizeBinary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java index 02f853e84c6..ce967718191 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java @@ -39,7 +39,7 @@ public final class FixedSizeList extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb) { return getRootAsFixedSizeList(_bb, new FixedSizeList()); } - public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb, FixedSizeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb, FixedSizeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FixedSizeList __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java index ccd1d83bd3a..e602ebedd35 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java @@ -39,7 +39,7 @@ public final class FloatingPoint extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb) { return getRootAsFloatingPoint(_bb, new FloatingPoint()); } - public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb, FloatingPoint obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb, FloatingPoint obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FloatingPoint __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java index d29ae298ae0..9cc7d67bcb9 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java @@ -44,7 +44,7 @@ public final class Footer extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Footer getRootAsFooter(ByteBuffer _bb) { return getRootAsFooter(_bb, new Footer()); } - public static Footer getRootAsFooter(ByteBuffer _bb, Footer obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Footer getRootAsFooter(ByteBuffer _bb, Footer obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Footer __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java index 49f4e67c5ce..8bb2866c384 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java @@ -39,7 +39,7 @@ public final class Int extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Int getRootAsInt(ByteBuffer _bb) { return getRootAsInt(_bb, new Int()); } - public static Int getRootAsInt(ByteBuffer _bb, Int obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Int getRootAsInt(ByteBuffer _bb, Int obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Int __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java index fb60346819d..c2cd1e5d6ac 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java @@ -39,7 +39,7 @@ public final class Interval extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Interval getRootAsInterval(ByteBuffer _bb) { return getRootAsInterval(_bb, new Interval()); } - public static Interval getRootAsInterval(ByteBuffer _bb, Interval obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Interval getRootAsInterval(ByteBuffer _bb, Interval obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Interval __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java index 4257570e70c..8a8332468b7 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java @@ -25,7 +25,7 @@ private IntervalUnit() { } public static final short DAY_TIME = 1; public static final short MONTH_DAY_NANO = 2; - private static final String[] names = { "YEAR_MONTH", "DAY_TIME", "MONTH_DAY_NANO", }; + public static final String[] names = { "YEAR_MONTH", "DAY_TIME", "MONTH_DAY_NANO", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java index ccbd3863d0d..dcbd0744fd0 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java @@ -44,7 +44,7 @@ public final class KeyValue extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static KeyValue getRootAsKeyValue(ByteBuffer _bb) { return getRootAsKeyValue(_bb, new KeyValue()); } - public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public KeyValue __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java index 9834285d72e..65d93148588 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java @@ -43,7 +43,7 @@ public final class LargeBinary extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb) { return getRootAsLargeBinary(_bb, new LargeBinary()); } - public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb, LargeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb, LargeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeBinary __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java index 5b4fa8cb36e..144454d5bfa 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java @@ -43,7 +43,7 @@ public final class LargeList extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeList getRootAsLargeList(ByteBuffer _bb) { return getRootAsLargeList(_bb, new LargeList()); } - public static LargeList getRootAsLargeList(ByteBuffer _bb, LargeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static LargeList getRootAsLargeList(ByteBuffer _bb, LargeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeList __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java index 9ff46a98a0f..c88ff0bdc95 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java @@ -43,7 +43,7 @@ public final class LargeListView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeListView getRootAsLargeListView(ByteBuffer _bb) { return getRootAsLargeListView(_bb, new LargeListView()); } - public static LargeListView getRootAsLargeListView(ByteBuffer _bb, LargeListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static LargeListView getRootAsLargeListView(ByteBuffer _bb, LargeListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeListView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java index 0308d9a121a..4c3532250dd 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java @@ -43,7 +43,7 @@ public final class LargeUtf8 extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb) { return getRootAsLargeUtf8(_bb, new LargeUtf8()); } - public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb, LargeUtf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb, LargeUtf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public LargeUtf8 __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java index d123863f83b..00b56652da8 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java @@ -39,7 +39,7 @@ public final class List extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static List getRootAsList(ByteBuffer _bb) { return getRootAsList(_bb, new List()); } - public static List getRootAsList(ByteBuffer _bb, List obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static List getRootAsList(ByteBuffer _bb, List obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public List __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java index ea31af3d052..e211600c0ee 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java @@ -44,7 +44,7 @@ public final class ListView extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static ListView getRootAsListView(ByteBuffer _bb) { return getRootAsListView(_bb, new ListView()); } - public static ListView getRootAsListView(ByteBuffer _bb, ListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static ListView getRootAsListView(ByteBuffer _bb, ListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public ListView __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java index 0ca508c9c3b..b8a36a8b19f 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java @@ -66,7 +66,7 @@ public final class Map extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Map getRootAsMap(ByteBuffer _bb) { return getRootAsMap(_bb, new Map()); } - public static Map getRootAsMap(ByteBuffer _bb, Map obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Map getRootAsMap(ByteBuffer _bb, Map obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Map __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java index 41ef6cc14d7..32941ad7b3d 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java @@ -39,7 +39,7 @@ public final class Message extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Message getRootAsMessage(ByteBuffer _bb) { return getRootAsMessage(_bb, new Message()); } - public static Message getRootAsMessage(ByteBuffer _bb, Message obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Message getRootAsMessage(ByteBuffer _bb, Message obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Message __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java index 5d1e304f696..cc23ce3728c 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java @@ -38,7 +38,7 @@ private MessageHeader() { } public static final byte Tensor = 4; public static final byte SparseTensor = 5; - private static final String[] names = { "NONE", "Schema", "DictionaryBatch", "RecordBatch", "Tensor", "SparseTensor", }; + public static final String[] names = { "NONE", "Schema", "DictionaryBatch", "RecordBatch", "Tensor", "SparseTensor", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java index 6a881c934f8..83b44b50668 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java @@ -48,7 +48,7 @@ private MetadataVersion() { } */ public static final short V5 = 4; - private static final String[] names = { "V1", "V2", "V3", "V4", "V5", }; + public static final String[] names = { "V1", "V2", "V3", "V4", "V5", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java index 80a3e5fcc56..e0cbf21b723 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java @@ -42,7 +42,7 @@ public final class Null extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Null getRootAsNull(ByteBuffer _bb) { return getRootAsNull(_bb, new Null()); } - public static Null getRootAsNull(ByteBuffer _bb, Null obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Null getRootAsNull(ByteBuffer _bb, Null obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Null __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java index 50a16db1ae9..ff368825767 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java @@ -25,7 +25,7 @@ private Precision() { } public static final short SINGLE = 1; public static final short DOUBLE = 2; - private static final String[] names = { "HALF", "SINGLE", "DOUBLE", }; + public static final String[] names = { "HALF", "SINGLE", "DOUBLE", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java index c19f2ae69c5..286ef0840a6 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java @@ -44,7 +44,7 @@ public final class RecordBatch extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb) { return getRootAsRecordBatch(_bb, new RecordBatch()); } - public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb, RecordBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb, RecordBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public RecordBatch __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java index 2fc34b8f569..89e8f0039a5 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java @@ -46,7 +46,7 @@ public final class RunEndEncoded extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb) { return getRootAsRunEndEncoded(_bb, new RunEndEncoded()); } - public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb, RunEndEncoded obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb, RunEndEncoded obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public RunEndEncoded __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java index 8a1be702710..a81c052ec09 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java @@ -43,7 +43,7 @@ public final class Schema extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Schema getRootAsSchema(ByteBuffer _bb) { return getRootAsSchema(_bb, new Schema()); } - public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Schema __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java index af75448474f..ddfc63a1186 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java @@ -24,7 +24,7 @@ private SparseMatrixCompressedAxis() { } public static final short Row = 0; public static final short Column = 1; - private static final String[] names = { "Row", "Column", }; + public static final String[] names = { "Row", "Column", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java index 70f662fe8f7..98748991411 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java @@ -42,7 +42,7 @@ public final class SparseMatrixIndexCSX extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb) { return getRootAsSparseMatrixIndexCSX(_bb, new SparseMatrixIndexCSX()); } - public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb, SparseMatrixIndexCSX obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb, SparseMatrixIndexCSX obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseMatrixIndexCSX __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java index c6bc63d5697..62b4274146c 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java @@ -39,7 +39,7 @@ public final class SparseTensor extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb) { return getRootAsSparseTensor(_bb, new SparseTensor()); } - public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb, SparseTensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb, SparseTensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java index 1108b75b224..f2a0455312b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java @@ -26,7 +26,7 @@ private SparseTensorIndex() { } public static final byte SparseMatrixIndexCSX = 2; public static final byte SparseTensorIndexCSF = 3; - private static final String[] names = { "NONE", "SparseTensorIndexCOO", "SparseMatrixIndexCSX", "SparseTensorIndexCSF", }; + public static final String[] names = { "NONE", "SparseTensorIndexCOO", "SparseMatrixIndexCSX", "SparseTensorIndexCSF", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java index 7570ffd985b..80c524c75c7 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java @@ -73,7 +73,7 @@ public final class SparseTensorIndexCOO extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb) { return getRootAsSparseTensorIndexCOO(_bb, new SparseTensorIndexCOO()); } - public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb, SparseTensorIndexCOO obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb, SparseTensorIndexCOO obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensorIndexCOO __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java index 61b6064e0c0..87f269de551 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java @@ -42,7 +42,7 @@ public final class SparseTensorIndexCSF extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb) { return getRootAsSparseTensorIndexCSF(_bb, new SparseTensorIndexCSF()); } - public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb, SparseTensorIndexCSF obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb, SparseTensorIndexCSF obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public SparseTensorIndexCSF __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java index 7f7a1b5e18e..0517be6153c 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java @@ -44,7 +44,7 @@ public final class Struct_ extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Struct_ getRootAsStruct_(ByteBuffer _bb) { return getRootAsStruct_(_bb, new Struct_()); } - public static Struct_ getRootAsStruct_(ByteBuffer _bb, Struct_ obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Struct_ getRootAsStruct_(ByteBuffer _bb, Struct_ obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Struct_ __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java index 6b49fc80b55..5892b6aca90 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java @@ -39,7 +39,7 @@ public final class Tensor extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Tensor getRootAsTensor(ByteBuffer _bb) { return getRootAsTensor(_bb, new Tensor()); } - public static Tensor getRootAsTensor(ByteBuffer _bb, Tensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Tensor getRootAsTensor(ByteBuffer _bb, Tensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Tensor __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java index 613ac63d3b6..3c85786f409 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java @@ -44,7 +44,7 @@ public final class TensorDim extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static TensorDim getRootAsTensorDim(ByteBuffer _bb) { return getRootAsTensorDim(_bb, new TensorDim()); } - public static TensorDim getRootAsTensorDim(ByteBuffer _bb, TensorDim obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static TensorDim getRootAsTensorDim(ByteBuffer _bb, TensorDim obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public TensorDim __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java index ed4e32ca185..d5a320f4935 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java @@ -55,7 +55,7 @@ public final class Time extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Time getRootAsTime(ByteBuffer _bb) { return getRootAsTime(_bb, new Time()); } - public static Time getRootAsTime(ByteBuffer _bb, Time obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Time getRootAsTime(ByteBuffer _bb, Time obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Time __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java index 80ac6fb45cc..2a7bfad5c61 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java @@ -26,7 +26,7 @@ private TimeUnit() { } public static final short MICROSECOND = 2; public static final short NANOSECOND = 3; - private static final String[] names = { "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND", }; + public static final String[] names = { "SECOND", "MILLISECOND", "MICROSECOND", "NANOSECOND", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java index 2c642cebf72..d906fbeea1b 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java @@ -146,7 +146,7 @@ public final class Timestamp extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Timestamp getRootAsTimestamp(ByteBuffer _bb) { return getRootAsTimestamp(_bb, new Timestamp()); } - public static Timestamp getRootAsTimestamp(ByteBuffer _bb, Timestamp obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Timestamp getRootAsTimestamp(ByteBuffer _bb, Timestamp obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Timestamp __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java index 1e517dbfdbc..07bb34b11ca 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java @@ -54,7 +54,7 @@ private Type() { } public static final byte ListView = 25; public static final byte LargeListView = 26; - private static final String[] names = { "NONE", "Null", "Int", "FloatingPoint", "Binary", "Utf8", "Bool", "Decimal", "Date", "Time", "Timestamp", "Interval", "List", "Struct_", "Union", "FixedSizeBinary", "FixedSizeList", "Map", "Duration", "LargeBinary", "LargeUtf8", "LargeList", "RunEndEncoded", "BinaryView", "Utf8View", "ListView", "LargeListView", }; + public static final String[] names = { "NONE", "Null", "Int", "FloatingPoint", "Binary", "Utf8", "Bool", "Decimal", "Date", "Time", "Timestamp", "Interval", "List", "Struct_", "Union", "FixedSizeBinary", "FixedSizeList", "Map", "Duration", "LargeBinary", "LargeUtf8", "LargeList", "RunEndEncoded", "BinaryView", "Utf8View", "ListView", "LargeListView", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java index 00389844799..1a106919cb1 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java @@ -45,7 +45,7 @@ public final class Union extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Union getRootAsUnion(ByteBuffer _bb) { return getRootAsUnion(_bb, new Union()); } - public static Union getRootAsUnion(ByteBuffer _bb, Union obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Union getRootAsUnion(ByteBuffer _bb, Union obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Union __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java index fdba0d99a1a..d66ddc318e8 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java @@ -24,7 +24,7 @@ private UnionMode() { } public static final short Sparse = 0; public static final short Dense = 1; - private static final String[] names = { "Sparse", "Dense", }; + public static final String[] names = { "Sparse", "Dense", }; public static String name(int e) { return names[e]; } } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java index 6dea6262b79..60933cf25af 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java @@ -42,7 +42,7 @@ public final class Utf8 extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Utf8 getRootAsUtf8(ByteBuffer _bb) { return getRootAsUtf8(_bb, new Utf8()); } - public static Utf8 getRootAsUtf8(ByteBuffer _bb, Utf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Utf8 getRootAsUtf8(ByteBuffer _bb, Utf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Utf8 __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java index 2d26b06c898..377ba034cbb 100644 --- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java +++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java @@ -48,7 +48,7 @@ public final class Utf8View extends Table { public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); } public static Utf8View getRootAsUtf8View(ByteBuffer _bb) { return getRootAsUtf8View(_bb, new Utf8View()); } - public static Utf8View getRootAsUtf8View(ByteBuffer _bb, Utf8View obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb); } + public static Utf8View getRootAsUtf8View(ByteBuffer _bb, Utf8View obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public Utf8View __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } From 028e9d74e5d8276581eec180a89ae322971cbc28 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Sat, 1 Jun 2024 16:35:13 +0530 Subject: [PATCH 13/16] fix: addressing warnings in memory-core --- java/memory/memory-core/pom.xml | 28 +++++++++++++++++++ .../memory/AllocationOutcomeDetails.java | 18 ++++++------ .../arrow/memory/AllocationReservation.java | 2 +- .../apache/arrow/memory/BaseAllocator.java | 6 +++- .../org/apache/arrow/memory/BufferLedger.java | 3 +- .../apache/arrow/memory/BufferManager.java | 2 +- .../apache/arrow/memory/CheckAllocator.java | 1 + .../apache/arrow/memory/ChildAllocator.java | 1 + .../arrow/memory/LowCostIdentityHashMap.java | 3 +- .../rounding/DefaultRoundingPolicy.java | 4 --- .../arrow/memory/util/ArrowBufPointer.java | 3 +- .../org/apache/arrow/memory/util/Float16.java | 4 +-- .../arrow/memory/util/HistoricalLog.java | 18 ++++++++---- .../apache/arrow/memory/util/MemoryUtil.java | 1 + .../arrow/memory/util/hash/MurmurHasher.java | 2 +- .../arrow/memory/util/hash/SimpleHasher.java | 1 + java/pom.xml | 2 ++ 17 files changed, 69 insertions(+), 30 deletions(-) diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml index 1e29ccf8ab9..9d323c9dd80 100644 --- a/java/memory/memory-core/pom.xml +++ b/java/memory/memory-core/pom.xml @@ -161,5 +161,33 @@ + + error-prone-jdk8 + + 1.8 + + + + + com.google.errorprone + error_prone_annotations + ${error_prone_annotations.version.jdk8} + + + + + error-prone-jdk11+ + + [11,) + + + + + com.google.errorprone + error_prone_annotations + ${error_prone_annotations.version.jdk11} + + + diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java index 3ceda71cce0..fd534b18998 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java @@ -119,16 +119,14 @@ public boolean isAllocationFailed() { @Override public String toString() { - return new StringBuilder() - .append("allocator[" + accountant.getName() + "]") - .append(" reservation: " + accountant.getInitReservation()) - .append(" limit: " + limit) - .append(" used: " + used) - .append(" requestedSize: " + requestedSize) - .append(" allocatedSize: " + allocatedSize) - .append(" localAllocationStatus: " + (allocationFailed ? "fail" : "success")) - .append("\n") - .toString(); + return "allocator[" + accountant.getName() + "]" + + " reservation: " + accountant.getInitReservation() + + " limit: " + limit + + " used: " + used + + " requestedSize: " + requestedSize + + " allocatedSize: " + allocatedSize + + " localAllocationStatus: " + (allocationFailed ? "fail" : "success") + + "\n"; } } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java index c672dc48d79..cc6cbf7e6f2 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java @@ -84,5 +84,5 @@ public interface AllocationReservation extends AutoCloseable { */ boolean isClosed(); - void close(); + @Override void close(); } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java index 189c800ba0f..340e1e050c6 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java @@ -36,6 +36,9 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.immutables.value.Value; +import com.google.errorprone.annotations.FormatMethod; +import com.google.errorprone.annotations.FormatString; + /** * A base-class that implements all functionality of {@linkplain BufferAllocator}s. * @@ -532,7 +535,8 @@ public String toVerboseString() { return sb.toString(); } - private void hist(String noteFormat, Object... args) { + @FormatMethod + private void hist(@FormatString String noteFormat, Object... args) { if (historicalLog != null) { historicalLog.recordEvent(noteFormat, args); } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java index 62d268a1f44..c610066c982 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java @@ -58,6 +58,7 @@ boolean isOwningLedger() { return this == allocationManager.getOwningLedger(); } + @Override public BufferAllocator getKey() { return allocator; } @@ -419,7 +420,7 @@ public TransferResult transferOwnership(final ArrowBuf srcBuffer, final BufferAl /** * The outcome of a Transfer. */ - public class TransferResult implements OwnershipTransferResult { + public static class TransferResult implements OwnershipTransferResult { // Whether this transfer fit within the target allocator's capacity. final boolean allocationFit; diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java index 6b622e71927..e7877d7a3e2 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java @@ -49,5 +49,5 @@ public interface BufferManager extends AutoCloseable { */ ArrowBuf getManagedBuffer(long size); - void close(); + @Override void close(); } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java index dac4a3fcff5..bfbf1f212e6 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java @@ -60,6 +60,7 @@ static String check() { } } + @SuppressWarnings("URLEqualsHashCode") private static Set scanClasspath() { // LinkedHashSet appropriate here because it preserves insertion order // during iteration diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java index 67156f89d13..33ab4ef18ae 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java @@ -26,6 +26,7 @@ *

Child allocators can only be created by the root, or other children, so * this class is package private.

*/ +@SuppressWarnings("InvalidInlineTag") class ChildAllocator extends BaseAllocator { /** diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java index 740233ef411..251028aff0e 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java @@ -255,7 +255,7 @@ void rehash() { } private void computeMaxSize() { - threshold = (int) ((long) (elementData.length) * LOAD_FACTOR / 10000); + threshold = (int) ((long) elementData.length * LOAD_FACTOR / 10000); } /** @@ -309,7 +309,6 @@ private void computeMaxSize() { elementData[index] = null; } } - return (V) result; } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java index 7ba231b0c20..5939e803fdc 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java @@ -44,20 +44,16 @@ public class DefaultRoundingPolicy implements RoundingPolicy { static { int defaultPageSize = Integer.getInteger("org.apache.memory.allocator.pageSize", 8192); - Throwable pageSizeFallbackCause = null; try { validateAndCalculatePageShifts(defaultPageSize); } catch (Throwable t) { - pageSizeFallbackCause = t; defaultPageSize = 8192; } int defaultMaxOrder = Integer.getInteger("org.apache.memory.allocator.maxOrder", 11); - Throwable maxOrderFallbackCause = null; try { validateAndCalculateChunkSize(defaultPageSize, defaultMaxOrder); } catch (Throwable t) { - maxOrderFallbackCause = t; defaultMaxOrder = 11; } DEFAULT_CHUNK_SIZE = validateAndCalculateChunkSize(defaultPageSize, defaultMaxOrder); diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java index b41576847d6..5775dd79434 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java @@ -27,7 +27,7 @@ * Pointer to a memory region within an {@link ArrowBuf}. * It will be used as the basis for calculating hash code within a vector, and equality determination. */ -public final class ArrowBufPointer { +public final class ArrowBufPointer implements Comparable { /** * The hash code when the arrow buffer is null. @@ -174,6 +174,7 @@ public int hashCode() { * a positive integer if this pointer is larger; * a negative integer if this pointer is smaller. */ + @Override public int compareTo(ArrowBufPointer that) { if (this.buf == null || that.buf == null) { if (this.buf == null && that.buf == null) { diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java index 8040158fd09..5b80816d48f 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java @@ -161,7 +161,7 @@ public static float toFloat(short b) { int bits = b & 0xffff; int s = bits & SIGN_MASK; int e = (bits >>> EXPONENT_SHIFT) & SHIFTED_EXPONENT_MASK; - int m = (bits) & SIGNIFICAND_MASK; + int m = bits & SIGNIFICAND_MASK; int outE = 0; int outM = 0; if (e == 0) { // Denormal or 0 @@ -209,7 +209,7 @@ public static short toFloat16(float f) { int bits = Float.floatToRawIntBits(f); int s = (bits >>> FP32_SIGN_SHIFT); int e = (bits >>> FP32_EXPONENT_SHIFT) & FP32_SHIFTED_EXPONENT_MASK; - int m = (bits) & FP32_SIGNIFICAND_MASK; + int m = bits & FP32_SIGNIFICAND_MASK; int outE = 0; int outM = 0; if (e == 0xff) { // Infinite or NaN diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java index 21f063c939e..e94429df2b1 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java @@ -17,12 +17,15 @@ package org.apache.arrow.memory.util; +import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedList; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; +import com.google.errorprone.annotations.FormatMethod; +import com.google.errorprone.annotations.FormatString; + /** * Utility class that can be used to log activity within a class * for later logging and debugging. Supports recording events and @@ -30,7 +33,7 @@ */ public class HistoricalLog { - private final LinkedList history = new LinkedList<>(); + private final ArrayList history = new ArrayList<>(); private final String idString; // the formatted id string private final int limit; // the limit on the number of events kept private @Nullable Event firstEvent; // the first stack trace recorded @@ -44,7 +47,8 @@ public class HistoricalLog { * associated with the object instance is best. * @param args for the format string, or nothing if none are required */ - public HistoricalLog(final String idStringFormat, Object... args) { + @FormatMethod + public HistoricalLog(@FormatString final String idStringFormat, Object... args) { this(Integer.MAX_VALUE, idStringFormat, args); } @@ -66,7 +70,8 @@ public HistoricalLog(final String idStringFormat, Object... args) { * associated with the object instance is best. * @param args for the format string, or nothing if none are required */ - public HistoricalLog(final int limit, final String idStringFormat, Object... args) { + @FormatMethod + public HistoricalLog(final int limit, @FormatString final String idStringFormat, Object... args) { this.limit = limit; this.idString = String.format(idStringFormat, args); this.firstEvent = null; @@ -80,14 +85,15 @@ public HistoricalLog(final int limit, final String idStringFormat, Object... arg * @param noteFormat {@link String#format} format string that describes the event * @param args for the format string, or nothing if none are required */ - public synchronized void recordEvent(final String noteFormat, Object... args) { + @FormatMethod + public synchronized void recordEvent(@FormatString final String noteFormat, Object... args) { final String note = String.format(noteFormat, args); final Event event = new Event(note); if (firstEvent == null) { firstEvent = event; } if (history.size() == limit) { - history.removeFirst(); + history.remove(0); } history.add(event); } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java index 2f74a985a3f..727e3531ee8 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java @@ -58,6 +58,7 @@ public class MemoryUtil { public static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN; // Java 1.8, 9, 11, 17, 21 becomes 1, 9, 11, 17, and 21. + @SuppressWarnings("StringSplitter") private static final int majorVersion = Integer.parseInt(System.getProperty("java.specification.version").split("\\D+")[0]); diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java index 5de98d23bb8..9c5d0b90861 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java @@ -162,7 +162,7 @@ public boolean equals(@Nullable Object o) { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof MurmurHasher)) { return false; } MurmurHasher that = (MurmurHasher) o; diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java index 3bf3c2a8283..670129d3fb2 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java @@ -53,6 +53,7 @@ protected SimpleHasher() { * @param length length of the memory region. * @return the hash code. */ + @Override public int hashCode(long address, long length) { int hashValue = 0; int index = 0; diff --git a/java/pom.xml b/java/pom.xml index 26b4c1c570c..a59d29c5763 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -95,6 +95,8 @@ true 9+181-r4173-1 2.24.0 + 2.24.0 + 2.10.0 3.12.1 5.11.0 5.2.0 From 0f3a44a9323fb3bcd049cdfe7de754ddf0ecdbb1 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Tue, 4 Jun 2024 09:07:09 +0530 Subject: [PATCH 14/16] fix: addressing reviews latest v1 --- java/memory/memory-core/pom.xml | 28 ------------------- .../apache/arrow/memory/BaseAllocator.java | 8 ++---- .../arrow/memory/util/HistoricalLog.java | 25 +++++++++-------- 3 files changed, 16 insertions(+), 45 deletions(-) diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml index 9d323c9dd80..1e29ccf8ab9 100644 --- a/java/memory/memory-core/pom.xml +++ b/java/memory/memory-core/pom.xml @@ -161,33 +161,5 @@ - - error-prone-jdk8 - - 1.8 - - - - - com.google.errorprone - error_prone_annotations - ${error_prone_annotations.version.jdk8} - - - - - error-prone-jdk11+ - - [11,) - - - - - com.google.errorprone - error_prone_annotations - ${error_prone_annotations.version.jdk11} - - - diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java index 340e1e050c6..89b8ffd322a 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java @@ -36,9 +36,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.immutables.value.Value; -import com.google.errorprone.annotations.FormatMethod; -import com.google.errorprone.annotations.FormatString; - /** * A base-class that implements all functionality of {@linkplain BufferAllocator}s. * @@ -535,8 +532,9 @@ public String toVerboseString() { return sb.toString(); } - @FormatMethod - private void hist(@FormatString String noteFormat, Object... args) { + /* Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 */ + @SuppressWarnings("FormatStringAnnotation") + private void hist(String noteFormat, Object... args) { if (historicalLog != null) { historicalLog.recordEvent(noteFormat, args); } diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java index e94429df2b1..910cc1c21d7 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java @@ -17,15 +17,13 @@ package org.apache.arrow.memory.util; -import java.util.ArrayList; +import java.util.ArrayDeque; import java.util.Arrays; +import java.util.Deque; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; -import com.google.errorprone.annotations.FormatMethod; -import com.google.errorprone.annotations.FormatString; - /** * Utility class that can be used to log activity within a class * for later logging and debugging. Supports recording events and @@ -33,7 +31,7 @@ */ public class HistoricalLog { - private final ArrayList history = new ArrayList<>(); + private final Deque history = new ArrayDeque<>(); private final String idString; // the formatted id string private final int limit; // the limit on the number of events kept private @Nullable Event firstEvent; // the first stack trace recorded @@ -47,8 +45,9 @@ public class HistoricalLog { * associated with the object instance is best. * @param args for the format string, or nothing if none are required */ - @FormatMethod - public HistoricalLog(@FormatString final String idStringFormat, Object... args) { + @SuppressWarnings("FormatStringAnnotation") + /* Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 */ + public HistoricalLog(final String idStringFormat, Object... args) { this(Integer.MAX_VALUE, idStringFormat, args); } @@ -70,8 +69,9 @@ public HistoricalLog(@FormatString final String idStringFormat, Object... args) * associated with the object instance is best. * @param args for the format string, or nothing if none are required */ - @FormatMethod - public HistoricalLog(final int limit, @FormatString final String idStringFormat, Object... args) { + @SuppressWarnings("AnnotateFormatMethod") + public HistoricalLog(final int limit, final String idStringFormat, Object... args) { + // Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 this.limit = limit; this.idString = String.format(idStringFormat, args); this.firstEvent = null; @@ -85,15 +85,16 @@ public HistoricalLog(final int limit, @FormatString final String idStringFormat, * @param noteFormat {@link String#format} format string that describes the event * @param args for the format string, or nothing if none are required */ - @FormatMethod - public synchronized void recordEvent(@FormatString final String noteFormat, Object... args) { + @SuppressWarnings("AnnotateFormatMethod") + public synchronized void recordEvent(final String noteFormat, Object... args) { + // Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 final String note = String.format(noteFormat, args); final Event event = new Event(note); if (firstEvent == null) { firstEvent = event; } if (history.size() == limit) { - history.remove(0); + history.removeFirst(); } history.add(event); } From a70932ae92acf64b4b2f7dbf9d9703046c61fcf0 Mon Sep 17 00:00:00 2001 From: Vibhatha Abeykoon Date: Tue, 4 Jun 2024 09:38:06 +0530 Subject: [PATCH 15/16] fix: addressing reviews latest v1 --- .../src/main/java/org/apache/arrow/memory/ChildAllocator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java index 33ab4ef18ae..f3132cb46a2 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java @@ -21,12 +21,11 @@ /** * Child allocator class. Only slightly different from the {@see RootAllocator}, * in that these can't be created directly, but must be obtained from - * {@see BufferAllocator#newChildAllocator(AllocatorOwner, long, long, int)}. + * {@link BufferAllocator#newChildAllocator(String, AllocationListener, long, long)}. * *

Child allocators can only be created by the root, or other children, so * this class is package private.

*/ -@SuppressWarnings("InvalidInlineTag") class ChildAllocator extends BaseAllocator { /** From c1284f344eb6d9d007b466f6d297a0c26d50e018 Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Tue, 4 Jun 2024 09:40:32 +0530 Subject: [PATCH 16/16] fix(suggestions): Update docs/source/developers/java/development.rst Co-authored-by: David Li --- docs/source/developers/java/development.rst | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst index 16a9bed2e75..9f78eccf6c5 100644 --- a/docs/source/developers/java/development.rst +++ b/docs/source/developers/java/development.rst @@ -139,12 +139,17 @@ This applies the style to all pom.xml files under the current directory or from .. _Apache Maven pom.xml guidelines: https://maven.apache.org/developers/conventions/code.html#pom-code-convention -Error Prone -=========== +Build Caching +============= -In relation to code formatting and standards, ``Error Prone`` compiler analysis may use cache to avoid -showing the warnings if attempted re-run of ``mvn clean install``. To avoid the cache to include the -warnings, use ``mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false`` -instead. +Build caching is done through Develocity (formerly Maven Enterprise). To force +a build without the cache, run:: -Also note that Error Prone must be disabled for auto generated content. + mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false + +This can be useful to make sure you see all warnings from ErrorProne, for example. + +ErrorProne +========== + +ErrorProne should be disabled for generated code.