diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java index c65523d837f..daee64d9308 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java @@ -18,17 +18,11 @@ package org.apache.arrow.adapter.jdbc; import java.io.IOException; -import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; -import java.util.Calendar; import org.apache.arrow.memory.BufferAllocator; -import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.util.Preconditions; -import org.apache.arrow.vector.VectorSchemaRoot; -import org.apache.arrow.vector.util.ValueVectorUtility; /** * Utility class to convert JDBC objects to columnar Arrow format objects. @@ -64,170 +58,6 @@ */ public class JdbcToArrow { - /** - * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. - * This method uses the default Calendar instance with default TimeZone and Locale as returned by the JVM. - * If you wish to use specific TimeZone or Locale for any Date, Time and Timestamp datasets, you may want use - * overloaded API that taken Calendar object instance. - * - * @param connection Database connection to be used. This method will not close the passed connection object. Since - * the caller has passed the connection object it's the responsibility of the caller to close or - * return the connection to the pool. - * @param query The DB Query to fetch the data. - * @param allocator Memory allocator - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as - * ResultSet and Statement objects. - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(Connection connection, String query, BufferAllocator allocator) - throws SQLException, IOException { - Preconditions.checkNotNull(allocator, "Memory allocator object can not be null"); - - JdbcToArrowConfig config = - new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar()); - return sqlToArrow(connection, query, config); - } - - /** - * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. - * - * @param connection Database connection to be used. This method will not close the passed connection object. Since - * the caller has passed the connection object it's the responsibility of the caller to close or - * return the connection to the pool. - * @param query The DB Query to fetch the data. - * @param allocator Memory allocator - * @param calendar Calendar object to use to handle Date, Time and Timestamp datasets. - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as - * ResultSet and Statement objects. - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow( - Connection connection, - String query, - BufferAllocator allocator, - Calendar calendar) throws SQLException, IOException { - - Preconditions.checkNotNull(allocator, "Memory allocator object can not be null"); - Preconditions.checkNotNull(calendar, "Calendar object can not be null"); - - return sqlToArrow(connection, query, new JdbcToArrowConfig(allocator, calendar)); - } - - /** - * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. - * - * @param connection Database connection to be used. This method will not close the passed connection object. - * Since the caller has passed the connection object it's the responsibility of the caller - * to close or return the connection to the pool. - * @param query The DB Query to fetch the data. - * @param config Configuration - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as - * ResultSet and Statement objects. - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(Connection connection, String query, JdbcToArrowConfig config) - throws SQLException, IOException { - Preconditions.checkNotNull(connection, "JDBC connection object can not be null"); - Preconditions.checkArgument(query != null && query.length() > 0, "SQL query can not be null or empty"); - - try (Statement stmt = connection.createStatement()) { - return sqlToArrow(stmt.executeQuery(query), config); - } - } - - /** - * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. This - * method uses the default RootAllocator and Calendar object. - * - * @param resultSet ResultSet to use to fetch the data from underlying database - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException on error - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(ResultSet resultSet) throws SQLException, IOException { - Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); - - return sqlToArrow(resultSet, JdbcToArrowUtils.getUtcCalendar()); - } - - /** - * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. - * - * @param resultSet ResultSet to use to fetch the data from underlying database - * @param allocator Memory allocator - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException on error - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, BufferAllocator allocator) - throws SQLException, IOException { - Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null"); - - JdbcToArrowConfig config = - new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar()); - return sqlToArrow(resultSet, config); - } - - /** - * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. - * - * @param resultSet ResultSet to use to fetch the data from underlying database - * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or null if none. - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException on error - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, Calendar calendar) throws SQLException, IOException { - Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); - return sqlToArrow(resultSet, new JdbcToArrowConfig(new RootAllocator(Integer.MAX_VALUE), calendar)); - } - - /** - * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. - * - * @param resultSet ResultSet to use to fetch the data from underlying database - * @param allocator Memory allocator to use. - * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or null if none. - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException on error - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow( - ResultSet resultSet, - BufferAllocator allocator, - Calendar calendar) - throws SQLException, IOException { - Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null"); - - return sqlToArrow(resultSet, new JdbcToArrowConfig(allocator, calendar)); - } - - /** - * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. - * - * @param resultSet ResultSet to use to fetch the data from underlying database - * @param config Configuration of the conversion from JDBC to Arrow. - * @return Arrow Data Objects {@link VectorSchemaRoot} - * @throws SQLException on error - */ - @Deprecated - public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, JdbcToArrowConfig config) - throws SQLException, IOException { - Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); - Preconditions.checkNotNull(config, "The configuration cannot be null"); - - VectorSchemaRoot root = VectorSchemaRoot.create( - JdbcToArrowUtils.jdbcToArrowSchema(resultSet.getMetaData(), config), config.getAllocator()); - if (config.getTargetBatchSize() != JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE) { - ValueVectorUtility.preAllocate(root, config.getTargetBatchSize()); - } - JdbcToArrowUtils.jdbcToArrowVectors(resultSet, root, config); - return root; - } - /*----------------------------------------------------------------* | | | Partial Convert API | diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java index 616363ecf64..747e84e89e9 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java @@ -20,10 +20,16 @@ import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.Calendar; +import org.apache.arrow.memory.BufferAllocator; +import org.apache.arrow.memory.RootAllocator; +import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.VectorSchemaRoot; +import org.apache.arrow.vector.util.ValueVectorUtility; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -140,4 +146,160 @@ public static Object[][] prepareTestData(String[] testFiles, @SuppressWarnings(" */ public abstract void testDataSets(VectorSchemaRoot root); + /** + * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. + * This method uses the default Calendar instance with default TimeZone and Locale as returned by the JVM. + * If you wish to use specific TimeZone or Locale for any Date, Time and Timestamp datasets, you may want use + * overloaded API that taken Calendar object instance. + * + * @param connection Database connection to be used. This method will not close the passed connection object. Since + * the caller has passed the connection object it's the responsibility of the caller to close or + * return the connection to the pool. + * @param query The DB Query to fetch the data. + * @param allocator Memory allocator + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as + * ResultSet and Statement objects. + */ + public static VectorSchemaRoot sqlToArrow(Connection connection, String query, BufferAllocator allocator) + throws SQLException, IOException { + Preconditions.checkNotNull(allocator, "Memory allocator object can not be null"); + + JdbcToArrowConfig config = + new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar()); + return sqlToArrow(connection, query, config); + } + + /** + * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. + * + * @param connection Database connection to be used. This method will not close the passed connection object. Since + * the caller has passed the connection object it's the responsibility of the caller to close or + * return the connection to the pool. + * @param query The DB Query to fetch the data. + * @param allocator Memory allocator + * @param calendar Calendar object to use to handle Date, Time and Timestamp datasets. + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as + * ResultSet and Statement objects. + */ + public static VectorSchemaRoot sqlToArrow( + Connection connection, + String query, + BufferAllocator allocator, + Calendar calendar) throws SQLException, IOException { + + Preconditions.checkNotNull(allocator, "Memory allocator object can not be null"); + Preconditions.checkNotNull(calendar, "Calendar object can not be null"); + + return sqlToArrow(connection, query, new JdbcToArrowConfig(allocator, calendar)); + } + + /** + * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects. + * + * @param connection Database connection to be used. This method will not close the passed connection object. + * Since the caller has passed the connection object it's the responsibility of the caller + * to close or return the connection to the pool. + * @param query The DB Query to fetch the data. + * @param config Configuration + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as + * ResultSet and Statement objects. + */ + public static VectorSchemaRoot sqlToArrow(Connection connection, String query, JdbcToArrowConfig config) + throws SQLException, IOException { + Preconditions.checkNotNull(connection, "JDBC connection object can not be null"); + Preconditions.checkArgument(query != null && query.length() > 0, "SQL query can not be null or empty"); + + try (Statement stmt = connection.createStatement()) { + return sqlToArrow(stmt.executeQuery(query), config); + } + } + + /** + * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. This + * method uses the default RootAllocator and Calendar object. + * + * @param resultSet ResultSet to use to fetch the data from underlying database + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException on error + */ + public static VectorSchemaRoot sqlToArrow(ResultSet resultSet) throws SQLException, IOException { + Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); + + return sqlToArrow(resultSet, JdbcToArrowUtils.getUtcCalendar()); + } + + /** + * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. + * + * @param resultSet ResultSet to use to fetch the data from underlying database + * @param allocator Memory allocator + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException on error + */ + public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, BufferAllocator allocator) + throws SQLException, IOException { + Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null"); + + JdbcToArrowConfig config = + new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar()); + return sqlToArrow(resultSet, config); + } + + /** + * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. + * + * @param resultSet ResultSet to use to fetch the data from underlying database + * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or null if none. + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException on error + */ + public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, Calendar calendar) throws SQLException, IOException { + Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); + return sqlToArrow(resultSet, new JdbcToArrowConfig(new RootAllocator(Integer.MAX_VALUE), calendar)); + } + + /** + * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. + * + * @param resultSet ResultSet to use to fetch the data from underlying database + * @param allocator Memory allocator to use. + * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or null if none. + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException on error + */ + public static VectorSchemaRoot sqlToArrow( + ResultSet resultSet, + BufferAllocator allocator, + Calendar calendar) + throws SQLException, IOException { + Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null"); + + return sqlToArrow(resultSet, new JdbcToArrowConfig(allocator, calendar)); + } + + /** + * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. + * + * @param resultSet ResultSet to use to fetch the data from underlying database + * @param config Configuration of the conversion from JDBC to Arrow. + * @return Arrow Data Objects {@link VectorSchemaRoot} + * @throws SQLException on error + */ + public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, JdbcToArrowConfig config) + throws SQLException, IOException { + Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null"); + Preconditions.checkNotNull(config, "The configuration cannot be null"); + + VectorSchemaRoot root = VectorSchemaRoot.create( + JdbcToArrowUtils.jdbcToArrowSchema(resultSet.getMetaData(), config), config.getAllocator()); + if (config.getTargetBatchSize() != JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE) { + ValueVectorUtility.preAllocate(root, config.getTargetBatchSize()); + } + JdbcToArrowUtils.jdbcToArrowVectors(resultSet, root, config); + return root; + } + } 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 f44818a9f09..a6e6b22fcb4 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 @@ -17,6 +17,7 @@ package org.apache.arrow.adapter.jdbc.h2; +import static org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest.sqlToArrow; import static org.junit.Assert.assertEquals; import java.sql.Connection; @@ -28,7 +29,6 @@ import java.sql.Statement; import java.util.List; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.VectorSchemaRoot; import org.apache.arrow.vector.types.pojo.Field; @@ -106,7 +106,7 @@ public void testJdbcAliasToArrow() throws Exception { try (ResultSet resultSet = conn.createStatement().executeQuery(QUERY)) { final VectorSchemaRoot vector = - JdbcToArrow.sqlToArrow(resultSet, new RootAllocator(Integer.MAX_VALUE)); + sqlToArrow(resultSet, new RootAllocator(Integer.MAX_VALUE)); assertEquals(rowCount, vector.getRowCount()); Schema vectorSchema = vector.getSchema(); 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 31f7db549e9..cff14c84395 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 @@ -17,6 +17,7 @@ package org.apache.arrow.adapter.jdbc.h2; +import static org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest.sqlToArrow; import static org.junit.Assert.*; import java.sql.Array; @@ -32,7 +33,6 @@ import java.util.Map; import org.apache.arrow.adapter.jdbc.JdbcFieldInfo; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowUtils; @@ -160,7 +160,7 @@ public void testJdbcToArrow() throws Exception { final JdbcToArrowConfig config = builder.build(); try (ResultSet resultSet = conn.createStatement().executeQuery(QUERY)) { - final VectorSchemaRoot vector = JdbcToArrow.sqlToArrow(resultSet, config); + final VectorSchemaRoot vector = sqlToArrow(resultSet, config); assertEquals(rowCount, vector.getRowCount()); @@ -204,7 +204,7 @@ public void testJdbcToArrowWithNulls() throws Exception { final JdbcToArrowConfig config = builder.build(); try (ResultSet resultSet = conn.createStatement().executeQuery(QUERY)) { - final VectorSchemaRoot vector = JdbcToArrow.sqlToArrow(resultSet, config); + final VectorSchemaRoot vector = sqlToArrow(resultSet, config); assertEquals(rowCount, vector.getRowCount()); 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 b2ac349b596..b548c9169af 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 @@ -31,7 +31,6 @@ import java.util.Collection; import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper; @@ -109,20 +108,20 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn.createStatement().executeQuery(table.getQuery()), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn, table.getQuery(), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); 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 2be6a83c342..40db5c23579 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 @@ -41,7 +41,6 @@ import java.util.Collection; import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper; @@ -143,19 +142,19 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); + testDataSets(sqlToArrow( conn.createStatement().executeQuery(table.getQuery()), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn, table.getQuery(), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); 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 fd373091f93..71cc700568f 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 @@ -49,7 +49,6 @@ import java.util.Collection; import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper; @@ -120,19 +119,19 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); + testDataSets(sqlToArrow( conn.createStatement().executeQuery(table.getQuery()), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn, table.getQuery(), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); 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 4ab9017e247..84960dc8880 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 @@ -26,7 +26,6 @@ import java.util.Collection; import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper; import org.apache.arrow.adapter.jdbc.Table; import org.apache.arrow.memory.RootAllocator; @@ -72,7 +71,7 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); } /** 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 8c5a17c37f7..5957eee742b 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 @@ -135,20 +135,20 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()))); + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn.createStatement().executeQuery(table.getQuery()), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn, table.getQuery(), new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build())); 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 7062fa6aec1..f5ddbdb9bf0 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 @@ -30,7 +30,6 @@ import java.util.TimeZone; import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest; -import org.apache.arrow.adapter.jdbc.JdbcToArrow; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper; @@ -105,18 +104,18 @@ public static Collection getTestData() throws SQLException, ClassNotFo */ @Test public void testJdbcToArrowValues() throws SQLException, IOException { - testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), + testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone())))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone())))); - testDataSets(JdbcToArrow.sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), + testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone())))); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn.createStatement().executeQuery(table.getQuery()), new JdbcToArrowConfigBuilder( new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))).build())); - testDataSets(JdbcToArrow.sqlToArrow( + testDataSets(sqlToArrow( conn, table.getQuery(), new JdbcToArrowConfigBuilder( diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java index ea5e29f7253..42003060565 100644 --- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java +++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java @@ -1194,52 +1194,4 @@ public ArrowBuf reallocIfNeeded(final long size) { "Realloc is only available in the context of operator's UDFs"); } } - - /** - * Following are wrapper methods to keep this backward compatible. - */ - @Deprecated - public void release() { - referenceManager.release(); - } - - @Deprecated - public void release(int decrement) { - referenceManager.release(decrement); - } - - @Deprecated - public void retain() { - referenceManager.retain(); - } - - @Deprecated - public void retain(int increment) { - referenceManager.retain(increment); - } - - @Deprecated - public ArrowBuf clear() { - this.readerIndex = this.writerIndex = 0; - return this; - } - - /** - * Initialize the reader and writer index. - * @param readerIndex index to read from - * @param writerIndex index to write to - * @return this - */ - @Deprecated - public ArrowBuf setIndex(int readerIndex, int writerIndex) { - if (readerIndex >= 0 && readerIndex <= writerIndex && writerIndex <= this.capacity()) { - this.readerIndex = readerIndex; - this.writerIndex = writerIndex; - return this; - } else { - throw new IndexOutOfBoundsException(String.format("readerIndex: %d, writerIndex: %d " + - "(expected:0 <= readerIndex <= writerIndex <= capacity(%d))", readerIndex, writerIndex, this.capacity())); - } - } - } diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index bd5202977b8..b1b3d12e77f 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -114,11 +114,6 @@ public static UnionVector empty(String name, BufferAllocator allocator) { return new UnionVector(name, allocator, fieldType, null); } - @Deprecated - public UnionVector(String name, BufferAllocator allocator, CallBack callBack) { - this(name, allocator, null, callBack); - } - public UnionVector(String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) { super(name, allocator, callBack); this.fieldType = fieldType; @@ -190,7 +185,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use geFieldBuffers"); } @@ -522,7 +516,7 @@ private class TransferImpl implements TransferPair { private final UnionVector to; public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) { - to = new UnionVector(name, allocator, callBack); + to = new UnionVector(name, allocator, null, callBack); internalStructVectorTransferPair = internalStruct.makeTransferPair(to.internalStruct); } diff --git a/java/vector/src/main/codegen/templates/ValueHolders.java b/java/vector/src/main/codegen/templates/ValueHolders.java index 789c00af085..a70dcf63478 100644 --- a/java/vector/src/main/codegen/templates/ValueHolders.java +++ b/java/vector/src/main/codegen/templates/ValueHolders.java @@ -53,17 +53,15 @@ public final class ${className} implements ValueHolder{ <#list fields as field> public ${field.type} ${field.name}; - - @Deprecated + public int hashCode(){ throw new UnsupportedOperationException(); } /* - * Reason for deprecation is that ValueHolders are potential scalar replacements - * and hence we don't want any methods to be invoked on them. + * Reason for not supporting the operation is that ValueHolders are potential scalar + * replacements and hence we don't want any methods to be invoked on them. */ - @Deprecated public String toString(){ throw new UnsupportedOperationException(); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java index ea31a4f7846..b7218a34a15 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java @@ -458,7 +458,6 @@ public void reAlloc() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java index 7fd19196733..06a289ea8f9 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java @@ -273,7 +273,6 @@ public void clear() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } @@ -1215,17 +1214,6 @@ protected final void setBytes(int index, byte[] value, int start, int length) { valueBuffer.setBytes(startOffset, value, start, length); } - /** - * Gets the starting offset of a record, given its index. - * This method is deprecated. Please use {@link BaseVariableWidthVector#getStartOffset(int)} instead. - * @param index index of the record. - * @return the starting offset of the record. - */ - @Deprecated - protected final int getstartOffset(int index) { - return getStartOffset(index); - } - public final int getStartOffset(int index) { return offsetBuffer.getInt((long) index * OFFSET_WIDTH); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java index ec73382a0ef..3745c5a75c3 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java @@ -88,16 +88,6 @@ public static void setBit(ArrowBuf validityBuffer, long index) { validityBuffer.setByte(byteIndex, currentByte); } - /** - * Set the bit at provided index to 1. - * - * @deprecated Please use {@link BitVectorHelper#setBit(ArrowBuf, long)} instead.. - */ - @Deprecated - public static void setValidityBitToOne(ArrowBuf validityBuffer, int index) { - setBit(validityBuffer, index); - } - /** * Set the bit at provided index to 0. * diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java index f96c7423050..d75eb0834b7 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java @@ -139,7 +139,6 @@ protected void reallocOffsetBuffer() { } @Override - @Deprecated public UInt4Vector getOffsetVector() { throw new UnsupportedOperationException("There is no inner offset vector"); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java index c22cba43c56..8783b7b72c1 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java @@ -50,7 +50,6 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.Types.MinorType; import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.DictionaryEncoding; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.CallBack; @@ -77,20 +76,6 @@ public static FixedSizeListVector empty(String name, int size, BufferAllocator a private int valueCount; private int validityAllocationSizeInBytes; - /** - * Creates a new instance. - * - * @deprecated use FieldType or static constructor instead. - */ - @Deprecated - public FixedSizeListVector(String name, - BufferAllocator allocator, - int listSize, - DictionaryEncoding dictionary, - CallBack schemaChangeCallback) { - this(name, allocator, new FieldType(true, new ArrowType.FixedSizeList(listSize), dictionary), schemaChangeCallback); - } - /** * Creates a new instance. * @@ -184,7 +169,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } @@ -407,7 +391,7 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector(name, allocator, null); + UnionVector vector = new UnionVector(name, allocator, null, null); this.vector.clear(); this.vector = vector; invalidateReader(); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java index 31e30cc44d4..6168d515d60 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java @@ -274,7 +274,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } @@ -541,7 +540,7 @@ protected void replaceDataVector(FieldVector v) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector("$data$", allocator, callBack); + UnionVector vector = new UnionVector("$data$", allocator, null, callBack); replaceDataVector(vector); invalidateReader(); if (callBack != null) { diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java index 7e969263cb9..3f712aa1c24 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java @@ -50,7 +50,6 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.Types.MinorType; import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.DictionaryEncoding; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.CallBack; @@ -84,26 +83,6 @@ public static ListVector empty(String name, BufferAllocator allocator) { */ private int lastSet; - /** - * Creates a ListVector. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public ListVector(String name, BufferAllocator allocator, CallBack callBack) { - this(name, allocator, FieldType.nullable(ArrowType.List.INSTANCE), callBack); - } - - /** - * Creates a ListVector. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public ListVector(String name, BufferAllocator allocator, DictionaryEncoding dictionary, CallBack callBack) { - this(name, allocator, new FieldType(true, ArrowType.List.INSTANCE, dictionary, null), callBack); - } - /** * Constructs a new instance. * @@ -247,7 +226,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } @@ -680,7 +658,7 @@ public ArrowBuf[] getBuffers(boolean clear) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector("$data$", allocator, callBack); + UnionVector vector = new UnionVector("$data$", allocator, null, callBack); replaceDataVector(vector); invalidateReader(); if (callBack != null) { diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java index 18d8eec615d..6d93ef5d474 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java @@ -142,7 +142,6 @@ private void setReaderAndWriterIndex() { } @Override - @Deprecated public List getFieldInnerVectors() { throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers"); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java index f2854c95c30..69275f13c37 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java @@ -231,7 +231,7 @@ private void writeFromVectorIntoJson(Field field, FieldVector vector) throws IOE ArrowBuf vectorBufferTmp = vector.getAllocator().buffer(4); vectorBufferTmp.setInt(0, 0); writeValueToGenerator(bufferType, vectorBufferTmp, null, vector, i); - vectorBufferTmp.release(); + vectorBufferTmp.close(); } else { writeValueToGenerator(bufferType, vectorBuffer, null, vector, i); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java index d4fdb9a15ec..2eeb3bea449 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java @@ -94,26 +94,6 @@ private Field(String name, FieldType fieldType, List children, TypeLayout this.children = children == null ? Collections.emptyList() : children.stream().collect(Collectors.toList()); } - /** - * Creates a new field. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public Field(String name, boolean nullable, ArrowType type, List children) { - this(name, new FieldType(nullable, type, null, null), children); - } - - /** - * Creates a new field. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public Field(String name, boolean nullable, ArrowType type, DictionaryEncoding dictionary, List children) { - this(name, new FieldType(nullable, type, dictionary, null), children); - } - public Field(String name, FieldType fieldType, List children) { this(name, fieldType, children, fieldType == null ? null : TypeLayout.getTypeLayout(fieldType.getType())); } diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java deleted file mode 100644 index 2faa1ff74c7..00000000000 --- a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.arrow.vector.util; - -import org.apache.arrow.memory.ArrowBuf; - -/** - * Helper class for comparing byte buffers. - * - * @deprecated This class will be removed. Please use org.apache.arrow.memory.util.ByteFunctionHelpers instead. - */ -@Deprecated -public class ByteFunctionHelpers { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ByteFunctionHelpers.class); - - private ByteFunctionHelpers() {} - - /** - * Helper function to check for equality of bytes in two ArrowBufs. - * - * @param left Left ArrowBuf for comparison - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right Right ArrowBuf for comparison - * @param rStart start offset in the buffer - * @param rEnd end offset in the buffer - * @return 1 if equals, 0 otherwise - */ - @Deprecated - public static final int equal(final ArrowBuf left, int lStart, int lEnd, final ArrowBuf right, int rStart, int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.equal(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Helper function to compare a set of bytes in two ArrowBufs. - * Function will check data before completing in the case that - * - * @param left Left ArrowBuf to compare - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right Right ArrowBuf to compare - * @param rStart start offset in the buffer - * @param rEnd end offset in the buffer - * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise - */ - @Deprecated - public static final int compare( - final ArrowBuf left, - int lStart, - int lEnd, - final ArrowBuf right, - int rStart, - int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.compare(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Helper function to compare a set of bytes in ArrowBuf to a ByteArray. - * - * @param left Left ArrowBuf for comparison purposes - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right second input to be compared - * @param rStart start offset in the byte array - * @param rEnd end offset in the byte array - * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise - */ - @Deprecated - public static final int compare( - final ArrowBuf left, - int lStart, - int lEnd, - final byte[] right, - int rStart, - final int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.compare(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Compares the two specified {@code long} values, treating them as unsigned values between - * {@code 0} and {@code 2^64 - 1} inclusive. - * - * @param a the first unsigned {@code long} to compare - * @param b the second unsigned {@code long} to compare - * @return a negative value if {@code a} is less than {@code b}; a positive value if {@code a} is - * greater than {@code b}; or zero if they are equal - */ - @Deprecated - public static int unsignedLongCompare(long a, long b) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.unsignedLongCompare(a, b); - } - - @Deprecated - public static int unsignedIntCompare(int a, int b) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.unsignedIntCompare(a, b); - } -} diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java index 4b48876ff16..9c7e1979d2b 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java @@ -164,8 +164,8 @@ public void testConcatBits() { final int maxCount = 100; for (int i = 0; i < maxCount; i++) { if (i % 3 == 0) { - BitVectorHelper.setValidityBitToOne(buf1, i); - BitVectorHelper.setValidityBitToOne(buf2, i); + BitVectorHelper.setBit(buf1, i); + BitVectorHelper.setBit(buf2, i); } } @@ -199,8 +199,8 @@ public void testConcatBitsInPlace() { final int maxCount = 100; for (int i = 0; i < maxCount; i++) { if (i % 3 == 0) { - BitVectorHelper.setValidityBitToOne(buf1, i); - BitVectorHelper.setValidityBitToOne(buf2, i); + BitVectorHelper.setBit(buf1, i); + BitVectorHelper.setBit(buf2, i); } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java index 165cb7bad3e..3f0251c9958 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java @@ -306,8 +306,8 @@ public void testEncodeBinaryVector() { @Test public void testEncodeUnion() { // Create a new value vector - try (final UnionVector vector = new UnionVector("vector", allocator, null); - final UnionVector dictionaryVector = new UnionVector("dict", allocator, null);) { + try (final UnionVector vector = new UnionVector("vector", allocator, null, null); + final UnionVector dictionaryVector = new UnionVector("dict", allocator, null, null);) { final NullableUInt4Holder uintHolder1 = new NullableUInt4Holder(); uintHolder1.value = 10; @@ -494,8 +494,8 @@ public void testStructEquals() { @Test public void testUnionEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, null, null); + final UnionVector vector2 = new UnionVector("union", allocator, null, null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java index 365789e04c8..9d7e413a739 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java @@ -165,8 +165,10 @@ public void testNestedInList() { @Test public void testTransferPair() { - try (FixedSizeListVector from = new FixedSizeListVector("from", allocator, 2, null, null); - FixedSizeListVector to = new FixedSizeListVector("to", allocator, 2, null, null)) { + try (FixedSizeListVector from = new FixedSizeListVector( + "from", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null); + FixedSizeListVector to = new FixedSizeListVector( + "to", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null)) { Float4Vector nested = (Float4Vector) from.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType())) .getVector(); from.allocateNew(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java index 962c233889d..a57f80f0aa2 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java @@ -69,7 +69,7 @@ public void testUnionVector() throws Exception { uInt4Holder.value = 100; uInt4Holder.isSet = 1; - try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { unionVector.allocateNew(); // write some data @@ -96,7 +96,7 @@ public void testUnionVector() throws Exception { @Test public void testUnionVectorMapValue() throws Exception { - try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { unionVector.allocateNew(); UnionWriter writer = (UnionWriter) unionVector.getWriter(); @@ -157,7 +157,7 @@ public void testUnionVectorMapValue() throws Exception { @Test public void testTransfer() throws Exception { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { srcVector.allocateNew(); // write some data @@ -171,7 +171,7 @@ public void testTransfer() throws Exception { srcVector.setSafe(5, newBitHolder(false)); srcVector.setValueCount(6); - try (UnionVector destVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector destVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { TransferPair pair = srcVector.makeTransferPair(destVector); // Creating the transfer should transfer the type of the field at least. @@ -206,7 +206,7 @@ public void testTransfer() throws Exception { @Test public void testSplitAndTransfer() throws Exception { - try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { sourceVector.allocateNew(); @@ -256,7 +256,7 @@ public void testSplitAndTransfer() throws Exception { assertEquals(false, sourceVector.isNull(9)); assertEquals(50, sourceVector.getObject(9)); - try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { final TransferPair transferPair = sourceVector.makeTransferPair(toVector); @@ -286,7 +286,7 @@ public void testSplitAndTransfer() throws Exception { @Test public void testSplitAndTransferWithMixedVectors() throws Exception { - try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { sourceVector.allocateNew(); @@ -345,7 +345,7 @@ public void testSplitAndTransferWithMixedVectors() throws Exception { assertEquals(false, sourceVector.isNull(9)); assertEquals(30.5f, sourceVector.getObject(9)); - try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { final TransferPair transferPair = sourceVector.makeTransferPair(toVector); @@ -410,7 +410,7 @@ public void testGetFieldTypeInfo() throws Exception { @Test public void testGetBufferAddress() throws Exception { - try (UnionVector vector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector vector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { boolean error = false; vector.allocateNew(); @@ -467,7 +467,7 @@ public void testGetBufferAddress() throws Exception { @Test public void testSetGetNull() { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { srcVector.allocateNew(); final NullableIntHolder holder = new NullableIntHolder(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java index 0be5e1e963c..87ef0ceffca 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java @@ -2646,8 +2646,8 @@ public void testStructVectorEqualsWithDiffChild() { @Test public void testUnionVectorEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, null, null); + final UnionVector vector2 = new UnionVector("union", allocator, null, null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; @@ -2716,7 +2716,7 @@ public void testVariableWidthVectorNullHashCode() { @Test public void testUnionNullHashCode() { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) { srcVector.allocateNew(); final NullableIntHolder holder = new NullableIntHolder(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java index fae50c9dffc..2f276590490 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java @@ -421,7 +421,7 @@ public void testFixedSizeListVectorClearAndSet() { @Test public void testUnionVectorClearAndSet() { - try (final UnionVector vector = new UnionVector("", allocator, null)) { + try (final UnionVector vector = new UnionVector("", allocator, null, null)) { vector.allocateNewSafe(); // Initial allocation NullableIntHolder holder = new NullableIntHolder(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java index adb51960ecd..3d384b7da7c 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java @@ -153,7 +153,7 @@ public void testStructTypeReset() { @Test public void testUnionTypeReset() { - try (final UnionVector vector = new UnionVector("Union", allocator, null); + try (final UnionVector vector = new UnionVector("Union", allocator, null, null); final IntVector dataVector = new IntVector("Int", allocator) ) { vector.getBufferSize(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java index c691f72d308..7b3da61ed00 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java @@ -270,8 +270,8 @@ public void testStructVectorRangeEquals() { @Test public void testUnionVectorRangeEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, null, null); + final UnionVector vector2 = new UnionVector("union", allocator, null, null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; @@ -547,9 +547,9 @@ public void testStructVectorApproxEquals() { @Test public void testUnionVectorApproxEquals() { - try (final UnionVector right = new UnionVector("union", allocator, null); - final UnionVector left1 = new UnionVector("union", allocator, null); - final UnionVector left2 = new UnionVector("union", allocator, null);) { + try (final UnionVector right = new UnionVector("union", allocator, null, null); + final UnionVector left1 = new UnionVector("union", allocator, null, null); + final UnionVector left2 = new UnionVector("union", allocator, null, null);) { final NullableFloat4Holder float4Holder = new NullableFloat4Holder(); float4Holder.value = 1.01f; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java index 4195c8811ee..52884eb4e7a 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java @@ -127,9 +127,9 @@ public void testStructTypeEquals() { @Test public void testUnionTypeEquals() { - try (final UnionVector right = new UnionVector("union", allocator, null); - final UnionVector left1 = new UnionVector("union", allocator, null); - final UnionVector left2 = new UnionVector("union", allocator, null)) { + try (final UnionVector right = new UnionVector("union", allocator, null, null); + final UnionVector left1 = new UnionVector("union", allocator, null, null); + final UnionVector left2 = new UnionVector("union", allocator, null, null)) { right.addVector(new IntVector("int", allocator)); left1.addVector(new IntVector("int", allocator)); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java index d44ada2f30f..09307ac7a55 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java @@ -604,7 +604,7 @@ private void checkListMap(ListVector listVector) { @Test public void simpleUnion() { - UnionVector vector = new UnionVector("union", allocator, null); + UnionVector vector = new UnionVector("union", allocator, null, null); UnionWriter unionWriter = new UnionWriter(vector); unionWriter.allocate(); for (int i = 0; i < COUNT; i++) { diff --git a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java index 8c291e01a36..5cc0d080053 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java @@ -144,7 +144,7 @@ public void nestedSchema() { Collections2.asImmutableList( new Field("child5.1", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, null)), null), new Field("child5.2", FieldType.nullable(new FloatingPoint(DOUBLE)), Collections.emptyList()), - new Field("child5.3", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null) + new Field("child5.3", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, "UTC")), null) ))); Schema initialSchema = new Schema(children); run(initialSchema); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java index 804092ed94a..94741dbcf6d 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java @@ -41,7 +41,8 @@ public void testSetLongInDecimalArrowBuf() { ) { int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0}; for (int val : intValues) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeLongToArrowBuf((long) val, buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = BigDecimal.valueOf(val); @@ -60,7 +61,8 @@ public void testSetByteArrayInDecimalArrowBuf() { ) { int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0}; for (int val : intValues) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeByteArrayToArrowBuf(BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = BigDecimal.valueOf(val); @@ -69,7 +71,8 @@ public void testSetByteArrayInDecimalArrowBuf() { long [] longValues = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE}; for (long val : longValues) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeByteArrayToArrowBuf(BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = BigDecimal.valueOf(val); @@ -78,7 +81,8 @@ public void testSetByteArrayInDecimalArrowBuf() { BigInteger [] decimals = new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]}; for (BigInteger val : decimals) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeByteArrayToArrowBuf(val.toByteArray(), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = new BigDecimal(val); @@ -97,7 +101,8 @@ public void testSetBigDecimalInDecimalArrowBuf() { ) { int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0}; for (int val : intValues) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeBigDecimalToArrowBuf(BigDecimal.valueOf(val), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = BigDecimal.valueOf(val); @@ -106,7 +111,8 @@ public void testSetBigDecimalInDecimalArrowBuf() { long [] longValues = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE}; for (long val : longValues) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeBigDecimalToArrowBuf(BigDecimal.valueOf(val), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = BigDecimal.valueOf(val); @@ -115,7 +121,8 @@ public void testSetBigDecimalInDecimalArrowBuf() { BigInteger [] decimals = new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]}; for (BigInteger val : decimals) { - buf.clear(); + buf.readerIndex(0L); + buf.writerIndex(0L); DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(val), buf, 0, byteLengths[x]); BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]); BigDecimal expected = new BigDecimal(val);