Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use VARCHAR and VARBINARY types for JDBC driver #10869

Merged
merged 2 commits into from
Jun 20, 2018
Merged

Use VARCHAR and VARBINARY types for JDBC driver #10869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
727f459
Fix formatting in TestAllDatatypesFromHiveConnector
electrum Jun 20, 2018
65c28de
Use VARCHAR and VARBINARY types for JDBC driver
electrum Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions presto-jdbc/src/main/java/com/facebook/presto/jdbc/ColumnInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ private static int getType(TypeSignature type)
case "double":
return Types.DOUBLE;
case "varchar":
return Types.LONGNVARCHAR;
return Types.VARCHAR;
case "char":
return Types.CHAR;
case "varbinary":
return Types.LONGVARBINARY;
return Types.VARBINARY;
case "time":
return Types.TIME;
case "time with time zone":
Expand Down
58 changes: 29 additions & 29 deletions presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ public void testSetNull()
assertSetNull(Types.NUMERIC, Types.DECIMAL);
assertSetNull(Types.CHAR);
assertSetNull(Types.NCHAR, Types.CHAR);
assertSetNull(Types.VARCHAR, Types.LONGNVARCHAR);
assertSetNull(Types.NVARCHAR, Types.LONGNVARCHAR);
assertSetNull(Types.LONGVARCHAR, Types.LONGNVARCHAR);
assertSetNull(Types.LONGNVARCHAR, Types.LONGNVARCHAR);
assertSetNull(Types.CLOB, Types.LONGNVARCHAR);
assertSetNull(Types.NCLOB, Types.LONGNVARCHAR);
assertSetNull(Types.VARBINARY, Types.LONGVARBINARY);
assertSetNull(Types.LONGVARBINARY);
assertSetNull(Types.BLOB, Types.LONGVARBINARY);
assertSetNull(Types.VARCHAR, Types.VARCHAR);
assertSetNull(Types.NVARCHAR, Types.VARCHAR);
assertSetNull(Types.LONGVARCHAR, Types.VARCHAR);
assertSetNull(Types.VARCHAR, Types.VARCHAR);
assertSetNull(Types.CLOB, Types.VARCHAR);
assertSetNull(Types.NCLOB, Types.VARCHAR);
assertSetNull(Types.VARBINARY, Types.VARBINARY);
assertSetNull(Types.VARBINARY);
assertSetNull(Types.BLOB, Types.VARBINARY);
assertSetNull(Types.DATE);
assertSetNull(Types.TIME);
assertSetNull(Types.TIMESTAMP);
Expand Down Expand Up @@ -387,26 +387,26 @@ public void testConvertDecimal()
public void testConvertVarchar()
throws SQLException
{
assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setString(i, "hello"));
assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, "hello"));
assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setString(i, "hello"));
assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setObject(i, "hello"));

String unicodeAndNull = "abc'xyz\0\u2603\uD835\uDCABtest";
assertParameter(unicodeAndNull, Types.LONGNVARCHAR, (ps, i) -> ps.setString(i, unicodeAndNull));
assertParameter(unicodeAndNull, Types.VARCHAR, (ps, i) -> ps.setString(i, unicodeAndNull));

for (int type : asList(Types.CHAR, Types.NCHAR, Types.VARCHAR, Types.NVARCHAR, Types.LONGVARCHAR, Types.LONGNVARCHAR)) {
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (short) 123, type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123, type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123L, type));
assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123.9f, type));
assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123.9d, type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type));
assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type));
assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type));
assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, "hello", type));
assertParameter("true", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, true, type));
assertParameter("false", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, false, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (short) 123, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123L, type));
assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123.9f, type));
assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123.9d, type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type));
assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type));
assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type));
assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setObject(i, "hello", type));
assertParameter("true", Types.VARCHAR, (ps, i) -> ps.setObject(i, true, type));
assertParameter("false", Types.VARCHAR, (ps, i) -> ps.setObject(i, false, type));
}
}

Expand All @@ -417,12 +417,12 @@ public void testConvertVarbinary()
String value = "abc\0xyz";
byte[] bytes = value.getBytes(UTF_8);

assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setBytes(i, bytes));
assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, bytes));
assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setBytes(i, bytes));
assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, bytes));

for (int type : asList(Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY)) {
assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, bytes, type));
assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, value, type));
assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, bytes, type));
assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, value, type));
}
}

Expand Down
2 changes: 1 addition & 1 deletion presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void testObjectTypes()
checkRepresentation("0.0E0 / 0.0E0", Types.DOUBLE, Double.NaN);
checkRepresentation("0.1", Types.DECIMAL, new BigDecimal("0.1"));
checkRepresentation("true", Types.BOOLEAN, true);
checkRepresentation("'hello'", Types.LONGNVARCHAR, "hello");
checkRepresentation("'hello'", Types.VARCHAR, "hello");
checkRepresentation("cast('foo' as char(5))", Types.CHAR, "foo ");
checkRepresentation("ARRAY[1, 2]", Types.ARRAY, (rs, column) -> assertEquals(rs.getArray(column).getArray(), new int[] {1, 2}));
checkRepresentation("DECIMAL '0.1'", Types.DECIMAL, new BigDecimal("0.1"));
Expand Down
66 changes: 33 additions & 33 deletions presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void testDriverManager()
assertEquals(metadata.getColumnType(2), Types.BIGINT);

assertEquals(metadata.getColumnLabel(3), "_varchar");
assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(3), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(4), "_double");
assertEquals(metadata.getColumnType(4), Types.DOUBLE);
Expand All @@ -196,7 +196,7 @@ public void testDriverManager()
assertEquals(metadata.getColumnType(5), Types.BOOLEAN);

assertEquals(metadata.getColumnLabel(6), "_varbinary");
assertEquals(metadata.getColumnType(6), Types.LONGVARBINARY);
assertEquals(metadata.getColumnType(6), Types.VARBINARY);

assertEquals(metadata.getColumnLabel(7), "_decimal_short");
assertEquals(metadata.getColumnType(7), Types.DECIMAL);
Expand Down Expand Up @@ -381,7 +381,7 @@ public void testGetCatalogs()
ResultSetMetaData metadata = rs.getMetaData();
assertEquals(metadata.getColumnCount(), 1);
assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(1), Types.VARCHAR);
}
}
}
Expand Down Expand Up @@ -514,10 +514,10 @@ private static void assertGetSchemasResult(ResultSet rs, List<List<String>> expe
assertEquals(metadata.getColumnCount(), 2);

assertEquals(metadata.getColumnLabel(1), "TABLE_SCHEM");
assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(1), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(2), "TABLE_CATALOG");
assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(2), Types.VARCHAR);
}

@Test
Expand Down Expand Up @@ -703,34 +703,34 @@ private static void assertTableMetadata(ResultSet rs)
assertEquals(metadata.getColumnCount(), 10);

assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(1), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(2), "TABLE_SCHEM");
assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(2), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(3), "TABLE_NAME");
assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(3), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(4), "TABLE_TYPE");
assertEquals(metadata.getColumnType(4), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(4), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(5), "REMARKS");
assertEquals(metadata.getColumnType(5), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(5), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(6), "TYPE_CAT");
assertEquals(metadata.getColumnType(6), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(6), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(7), "TYPE_SCHEM");
assertEquals(metadata.getColumnType(7), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(7), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(8), "TYPE_NAME");
assertEquals(metadata.getColumnType(8), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(8), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(9), "SELF_REFERENCING_COL_NAME");
assertEquals(metadata.getColumnType(9), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(9), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(10), "REF_GENERATION");
assertEquals(metadata.getColumnType(10), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(10), Types.VARCHAR);
}

@Test
Expand All @@ -746,7 +746,7 @@ public void testGetTableTypes()
assertEquals(metadata.getColumnCount(), 1);

assertEquals(metadata.getColumnLabel(1), "TABLE_TYPE");
assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(1), Types.VARCHAR);
}
}
}
Expand All @@ -763,7 +763,7 @@ public void testGetColumns()
assertEquals(rs.getString("TABLE_SCHEM"), "information_schema");
assertEquals(rs.getString("TABLE_NAME"), "tables");
assertEquals(rs.getString("COLUMN_NAME"), "table_name");
assertEquals(rs.getInt("DATA_TYPE"), Types.LONGNVARCHAR);
assertEquals(rs.getInt("DATA_TYPE"), Types.VARCHAR);
assertTrue(rs.next());
assertEquals(rs.getString("TABLE_CAT"), "system");
assertEquals(rs.getString("TABLE_SCHEM"), "information_schema");
Expand Down Expand Up @@ -858,10 +858,10 @@ public void testGetColumns()
assertColumnSpec(rs, Types.TINYINT, 3L, 10L, null, null, TinyintType.TINYINT);
assertColumnSpec(rs, Types.REAL, 24L, 2L, null, null, RealType.REAL);
assertColumnSpec(rs, Types.DOUBLE, 53L, 2L, null, null, DoubleType.DOUBLE);
assertColumnSpec(rs, Types.LONGNVARCHAR, 1234L, null, null, 1234L, createVarcharType(1234));
assertColumnSpec(rs, Types.LONGNVARCHAR, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, createUnboundedVarcharType());
assertColumnSpec(rs, Types.VARCHAR, 1234L, null, null, 1234L, createVarcharType(1234));
assertColumnSpec(rs, Types.VARCHAR, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, createUnboundedVarcharType());
assertColumnSpec(rs, Types.CHAR, 345L, null, null, 345L, createCharType(345));
assertColumnSpec(rs, Types.LONGVARBINARY, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, VarbinaryType.VARBINARY);
assertColumnSpec(rs, Types.VARBINARY, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, VarbinaryType.VARBINARY);
assertColumnSpec(rs, Types.TIME, 8L, null, null, null, TimeType.TIME);
assertColumnSpec(rs, Types.TIME_WITH_TIMEZONE, 14L, null, null, null, TimeWithTimeZoneType.TIME_WITH_TIME_ZONE);
assertColumnSpec(rs, Types.TIMESTAMP, 23L, null, null, null, TimestampType.TIMESTAMP);
Expand Down Expand Up @@ -895,22 +895,22 @@ private static void assertColumnMetadata(ResultSet rs)
assertEquals(metadata.getColumnCount(), 24);

assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(1), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(2), "TABLE_SCHEM");
assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(2), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(3), "TABLE_NAME");
assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(3), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(4), "COLUMN_NAME");
assertEquals(metadata.getColumnType(4), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(4), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(5), "DATA_TYPE");
assertEquals(metadata.getColumnType(5), Types.BIGINT);

assertEquals(metadata.getColumnLabel(6), "TYPE_NAME");
assertEquals(metadata.getColumnType(6), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(6), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(7), "COLUMN_SIZE");
assertEquals(metadata.getColumnType(7), Types.BIGINT);
Expand All @@ -928,10 +928,10 @@ private static void assertColumnMetadata(ResultSet rs)
assertEquals(metadata.getColumnType(11), Types.BIGINT);

assertEquals(metadata.getColumnLabel(12), "REMARKS");
assertEquals(metadata.getColumnType(12), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(12), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(13), "COLUMN_DEF");
assertEquals(metadata.getColumnType(13), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(13), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(14), "SQL_DATA_TYPE");
assertEquals(metadata.getColumnType(14), Types.BIGINT);
Expand All @@ -946,25 +946,25 @@ private static void assertColumnMetadata(ResultSet rs)
assertEquals(metadata.getColumnType(17), Types.BIGINT);

assertEquals(metadata.getColumnLabel(18), "IS_NULLABLE");
assertEquals(metadata.getColumnType(18), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(18), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(19), "SCOPE_CATALOG");
assertEquals(metadata.getColumnType(19), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(19), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(20), "SCOPE_SCHEMA");
assertEquals(metadata.getColumnType(20), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(20), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(21), "SCOPE_TABLE");
assertEquals(metadata.getColumnType(21), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(21), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(22), "SOURCE_DATA_TYPE");
assertEquals(metadata.getColumnType(22), Types.BIGINT);

assertEquals(metadata.getColumnLabel(23), "IS_AUTOINCREMENT");
assertEquals(metadata.getColumnType(23), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(23), Types.VARCHAR);

assertEquals(metadata.getColumnLabel(24), "IS_GENERATEDCOLUMN");
assertEquals(metadata.getColumnType(24), Types.LONGNVARCHAR);
assertEquals(metadata.getColumnType(24), Types.VARCHAR);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions presto-main/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ static int jdbcDataType(Type type)
return Types.DECIMAL;
}
if (isVarcharType(type)) {
return Types.LONGNVARCHAR;
return Types.VARCHAR;
}
if (isCharType(type)) {
return Types.CHAR;
}
if (type.equals(VARBINARY)) {
return Types.LONGVARBINARY;
return Types.VARBINARY;
}
if (type.equals(TIME)) {
return Types.TIME;
Expand Down
24 changes: 3 additions & 21 deletions presto-product-tests/src/main/java/com/facebook/presto/tests/JmxConnectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,11 @@
import io.prestodb.tempto.ProductTest;
import org.testng.annotations.Test;

import java.sql.Connection;

import static com.facebook.presto.tests.TestGroups.JDBC;
import static com.facebook.presto.tests.TestGroups.JMX_CONNECTOR;
import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingPrestoJdbcDriver;
import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver;
import static io.prestodb.tempto.assertions.QueryAssert.assertThat;
import static io.prestodb.tempto.query.QueryExecutor.defaultQueryExecutor;
import static io.prestodb.tempto.query.QueryExecutor.query;
import static java.sql.JDBCType.BIGINT;
import static java.sql.JDBCType.LONGNVARCHAR;
import static java.sql.JDBCType.VARCHAR;

public class JmxConnectorTests
Expand All @@ -35,22 +29,10 @@ public class JmxConnectorTests
@Test(groups = {JMX_CONNECTOR, JDBC})
public void selectFromJavaRuntimeJmxMBean()
{
Connection connection = defaultQueryExecutor().getConnection();
String sql = "SELECT node, vmname, vmversion FROM jmx.current.\"java.lang:type=runtime\"";

if (usingPrestoJdbcDriver(connection)) {
assertThat(query(sql))
.hasColumns(LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR)
.hasAnyRows();
}
else if (usingTeradataJdbcDriver(connection)) {
assertThat(query(sql))
.hasColumns(VARCHAR, VARCHAR, VARCHAR)
.hasAnyRows();
}
else {
throw new IllegalStateException();
}
assertThat(query(sql))
.hasColumns(VARCHAR, VARCHAR, VARCHAR)
.hasAnyRows();
}

@Test(groups = JMX_CONNECTOR)
Expand Down
Loading