You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2021/05/17 03:29:22 UTC
[arrow] branch master updated: ARROW-12679: [Java] JDBC->Arrow for
NOT NULL columns.
This is an automated email from the ASF dual-hosted git repository.
liyafan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 9067829 ARROW-12679: [Java] JDBC->Arrow for NOT NULL columns.
9067829 is described below
commit 9067829cf0d5da3184f37844813732b5074add91
Author: Joris Peeters <jo...@gmail.com>
AuthorDate: Mon May 17 11:27:29 2021 +0800
ARROW-12679: [Java] JDBC->Arrow for NOT NULL columns.
Prior to this patch, the VectorSchemaRoot's schema coming out of the JDBC adaptor always has all columns as nullable, even when the SQL column is NOT NULL. Even if this has no immediate impact on performance, it throws away information that can be useful downstream.
The fix just replaces the `true` (for nullable) by the actual `isNullableColumn` information.
Closes #10285 from jmgpeeters/ARROW-12679
Authored-by: Joris Peeters <jo...@gmail.com>
Signed-off-by: liyafan82 <fa...@foxmail.com>
---
.../arrow/adapter/jdbc/JdbcToArrowUtils.java | 9 ++-
.../adapter/jdbc/h2/JdbcToArrowCharSetTest.java | 2 +-
.../adapter/jdbc/h2/JdbcToArrowDataTypesTest.java | 2 +-
.../arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java | 2 +-
.../jdbc/h2/JdbcToArrowOptionalColumnsTest.java | 91 ++++++++++++++++++++++
.../arrow/adapter/jdbc/h2/JdbcToArrowTest.java | 2 +-
.../adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java | 2 +-
.../jdbc/h2/JdbcToArrowVectorIteratorTest.java | 2 +-
.../test/resources/h2/test1_null_and_notnull.yml | 26 +++++++
9 files changed, 130 insertions(+), 8 deletions(-)
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
index 8361c11..9f773e8 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
@@ -155,7 +155,8 @@ public class JdbcToArrowUtils {
final ArrowType arrowType = config.getJdbcToArrowTypeConverter().apply(new JdbcFieldInfo(rsmd, i));
if (arrowType != null) {
- final FieldType fieldType = new FieldType(true, arrowType, /* dictionary encoding */ null, metadata);
+ final FieldType fieldType = new FieldType(
+ isColumnNullable(rsmd, i), arrowType, /* dictionary encoding */ null, metadata);
List<Field> children = null;
if (arrowType.getTypeID() == ArrowType.List.TYPE_TYPE) {
@@ -219,7 +220,11 @@ public class JdbcToArrowUtils {
}
static boolean isColumnNullable(ResultSet resultSet, int index) throws SQLException {
- int nullableValue = resultSet.getMetaData().isNullable(index);
+ return isColumnNullable(resultSet.getMetaData(), index);
+ }
+
+ static boolean isColumnNullable(ResultSetMetaData resultSetMetadata, int index) throws SQLException {
+ int nullableValue = resultSetMetadata.isNullable(index);
return nullableValue == ResultSetMetaData.columnNullable ||
nullableValue == ResultSetMetaData.columnNullableUnknown;
}
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 f4c78d0..b2ac349 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
@@ -62,7 +62,7 @@ public class JdbcToArrowCharSetTest extends AbstractJdbcToArrowTest {
};
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table oject
*/
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 cafb7a0..2be6a83 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
@@ -117,7 +117,7 @@ public class JdbcToArrowDataTypesTest extends AbstractJdbcToArrowTest {
};
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table object
*/
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 57fcf56..fd37309 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
@@ -94,7 +94,7 @@ public class JdbcToArrowNullTest extends AbstractJdbcToArrowTest {
};
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table object
*/
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
new file mode 100644
index 0000000..4ab9017
--- /dev/null
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.adapter.jdbc.h2;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Arrays;
+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;
+import org.apache.arrow.vector.VectorSchemaRoot;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality for
+ * (non-)optional columns, in particular with regard to the ensuing VectorSchemaRoot's schema.
+ */
+@RunWith(Parameterized.class)
+public class JdbcToArrowOptionalColumnsTest extends AbstractJdbcToArrowTest {
+ private static final String[] testFiles = {
+ "h2/test1_null_and_notnull.yml"
+ };
+
+ /**
+ * Constructor which populates the table object for each test iteration.
+ *
+ * @param table Table object
+ */
+ public JdbcToArrowOptionalColumnsTest(Table table) {
+ this.table = table;
+ }
+
+ /**
+ * Get the test data as a collection of Table objects for each test iteration.
+ *
+ * @return Collection of Table objects
+ * @throws SQLException on error
+ * @throws ClassNotFoundException on error
+ * @throws IOException on error
+ */
+ @Parameterized.Parameters
+ public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
+ return Arrays.asList(prepareTestData(testFiles, JdbcToArrowOptionalColumnsTest.class));
+ }
+
+ /**
+ * Test Method to test JdbcToArrow Functionality for dealing with nullable and non-nullable columns.
+ */
+ @Test
+ public void testJdbcToArrowValues() throws SQLException, IOException {
+ testDataSets(JdbcToArrow.sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)));
+ }
+
+ /**
+ * This method calls the assert methods for various DataSets. We verify that a SQL `NULL` column becomes
+ * nullable in the VectorSchemaRoot, and that a SQL `NOT NULL` column becomes non-nullable.
+ *
+ * @param root VectorSchemaRoot for test
+ */
+ public void testDataSets(VectorSchemaRoot root) {
+ JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
+
+ assertTrue(root.getSchema().getFields().get(0).isNullable());
+ assertFalse(root.getSchema().getFields().get(1).isNullable());
+ }
+
+}
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 76bb56d..85c42c0 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
@@ -109,7 +109,7 @@ public class JdbcToArrowTest extends AbstractJdbcToArrowTest {
private static final String[] testFiles = {"h2/test1_all_datatypes_h2.yml"};
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table object
*/
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 ef2b406..7062fa6 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
@@ -78,7 +78,7 @@ public class JdbcToArrowTimeZoneTest extends AbstractJdbcToArrowTest {
};
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table object
*/
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
index 36a2370..edd1952 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
@@ -74,7 +74,7 @@ import org.junit.runners.Parameterized;
public class JdbcToArrowVectorIteratorTest extends JdbcToArrowTest {
/**
- * Constructor which populate table object for each test iteration.
+ * Constructor which populates the table object for each test iteration.
*
* @param table Table object
*/
diff --git a/java/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml b/java/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml
new file mode 100644
index 0000000..20e9e5e
--- /dev/null
+++ b/java/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml
@@ -0,0 +1,26 @@
+#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.
+
+name: 'table1'
+
+type: 'nullnotnull'
+
+create: 'CREATE TABLE table1 (int_field_null INT, int_field_notnull INT NOT NULL);'
+
+data:
+ - 'INSERT INTO table1 VALUES (0, 0);'
+ - 'INSERT INTO table1 VALUES (1, 1);'
+
+rowCount: '2'
+
+query: 'select int_field_null, int_field_notnull from table1;'
+
+drop: 'DROP table table1;'
\ No newline at end of file