Repository: calcite Updated Branches: refs/heads/master 87b0eb55b -> ba9783f30
http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaDataImpl.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaDataImpl.java b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaDataImpl.java new file mode 100644 index 0000000..70d107f --- /dev/null +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaDatabaseMetaDataImpl.java @@ -0,0 +1,1460 @@ +/* + * 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.calcite.avatica; + +import org.apache.calcite.avatica.AvaticaConnection.CallableWithoutException; +import org.apache.calcite.avatica.Meta.DatabaseProperty; +import org.apache.calcite.avatica.remote.MetaDataOperation; +import org.apache.calcite.avatica.util.Casing; +import org.apache.calcite.avatica.util.Quoting; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.RowIdLifetime; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; + +import static org.apache.calcite.avatica.InternalProperty.CASE_SENSITIVE; +import static org.apache.calcite.avatica.InternalProperty.NULL_SORTING; +import static org.apache.calcite.avatica.InternalProperty.NullSorting; +import static org.apache.calcite.avatica.InternalProperty.QUOTED_CASING; +import static org.apache.calcite.avatica.InternalProperty.QUOTING; +import static org.apache.calcite.avatica.InternalProperty.UNQUOTED_CASING; + +/** + * Implementation of {@link java.sql.DatabaseMetaData} + * for the Avatica engine. + * + * <p>This class has sub-classes which implement JDBC 3.0 and JDBC 4.0 APIs; + * it is instantiated using {@link AvaticaFactory#newDatabaseMetaData}.</p> + */ +public class AvaticaDatabaseMetaDataImpl implements AvaticaDatabaseMetaData { + private final AvaticaConnection connection; + + protected AvaticaDatabaseMetaDataImpl(AvaticaConnection connection) { + this.connection = connection; + } + + // Helper methods + + private NullSorting nullSorting() { + return NULL_SORTING.getEnum(getProperties(), NullSorting.class); + } + + private Quoting quoting() { + return QUOTING.getEnum(getProperties(), Quoting.class); + } + + private Casing unquotedCasing() { + return UNQUOTED_CASING.getEnum(getProperties(), Casing.class); + } + + private Casing quotedCasing() { + return QUOTED_CASING.getEnum(getProperties(), Casing.class); + } + + private boolean caseSensitive() { + return CASE_SENSITIVE.getBoolean(getProperties()); + } + + // JDBC methods + + public boolean allProceduresAreCallable() throws SQLException { + return true; + } + + public boolean allTablesAreSelectable() throws SQLException { + return true; + } + + public String getURL() throws SQLException { + return connection.url; + } + + public String getUserName() throws SQLException { + return connection.info.getProperty("user"); + } + + public boolean isReadOnly() throws SQLException { + return true; + } + + public boolean nullsAreSortedHigh() throws SQLException { + return nullSorting() == NullSorting.HIGH; + } + + public boolean nullsAreSortedLow() throws SQLException { + return nullSorting() == NullSorting.LOW; + } + + public boolean nullsAreSortedAtStart() throws SQLException { + return nullSorting() == NullSorting.START; + } + + public boolean nullsAreSortedAtEnd() throws SQLException { + return nullSorting() == NullSorting.END; + } + + public String getDatabaseProductName() throws SQLException { + return connection.driver.version.productName; + } + + public String getDatabaseProductVersion() throws SQLException { + return connection.driver.version.productVersion; + } + + public String getDriverName() throws SQLException { + return connection.driver.version.name; + } + + public String getDriverVersion() throws SQLException { + return connection.driver.version.versionString; + } + + public int getDriverMajorVersion() { + return connection.driver.getMajorVersion(); + } + + public int getDriverMinorVersion() { + return connection.driver.getMinorVersion(); + } + + public boolean usesLocalFiles() throws SQLException { + return false; + } + + public boolean usesLocalFilePerTable() throws SQLException { + return false; + } + + public boolean storesMixedCaseIdentifiers() throws SQLException { + return !caseSensitive() && unquotedCasing() == Casing.UNCHANGED; + } + + public boolean supportsMixedCaseIdentifiers() throws SQLException { + return caseSensitive() && unquotedCasing() == Casing.UNCHANGED; + } + + public boolean storesUpperCaseIdentifiers() throws SQLException { + return unquotedCasing() == Casing.TO_UPPER; + } + + public boolean storesLowerCaseIdentifiers() throws SQLException { + return unquotedCasing() == Casing.TO_LOWER; + } + + public boolean storesMixedCaseQuotedIdentifiers() throws SQLException { + return !caseSensitive() && quotedCasing() == Casing.UNCHANGED; + } + + public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException { + return caseSensitive() && quotedCasing() == Casing.UNCHANGED; + } + + public boolean storesUpperCaseQuotedIdentifiers() throws SQLException { + return quotedCasing() == Casing.TO_UPPER; + } + + public boolean storesLowerCaseQuotedIdentifiers() throws SQLException { + return quotedCasing() == Casing.TO_LOWER; + } + + public String getIdentifierQuoteString() throws SQLException { + return quoting().string; + } + + private Map<InternalProperty, Object> getProperties() { + return connection.properties; + } + + public String getSQLKeywords() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<String>() { + public String call() { + return Meta.DatabaseProperty.GET_S_Q_L_KEYWORDS + .getProp(connection.meta, connection.handle, String.class); + } + }); + } + + public String getNumericFunctions() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<String>() { + public String call() { + return Meta.DatabaseProperty.GET_NUMERIC_FUNCTIONS + .getProp(connection.meta, connection.handle, String.class); + } + }); + } + + public String getStringFunctions() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<String>() { + public String call() { + return Meta.DatabaseProperty.GET_STRING_FUNCTIONS + .getProp(connection.meta, connection.handle, String.class); + } + }); + } + + public String getSystemFunctions() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<String>() { + public String call() { + return Meta.DatabaseProperty.GET_SYSTEM_FUNCTIONS + .getProp(connection.meta, connection.handle, String.class); + } + }); + } + + public String getTimeDateFunctions() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<String>() { + public String call() { + return Meta.DatabaseProperty.GET_TIME_DATE_FUNCTIONS + .getProp(connection.meta, connection.handle, String.class); + } + }); + } + + public String getSearchStringEscape() throws SQLException { + return "\\"; + } + + public String getExtraNameCharacters() throws SQLException { + return ""; + } + + public boolean supportsAlterTableWithAddColumn() throws SQLException { + return false; + } + + public boolean supportsAlterTableWithDropColumn() throws SQLException { + return false; + } + + public boolean supportsColumnAliasing() throws SQLException { + return true; + } + + public boolean nullPlusNonNullIsNull() throws SQLException { + return true; + } + + public boolean supportsConvert() throws SQLException { + return true; + } + + public boolean supportsConvert(int fromType, int toType) throws SQLException { + return false; // TODO: more detail + } + + public boolean supportsTableCorrelationNames() throws SQLException { + return true; + } + + public boolean supportsDifferentTableCorrelationNames() throws SQLException { + return true; + } + + public boolean supportsExpressionsInOrderBy() throws SQLException { + return true; + } + + public boolean supportsOrderByUnrelated() throws SQLException { + return true; + } + + public boolean supportsGroupBy() throws SQLException { + return true; + } + + public boolean supportsGroupByUnrelated() throws SQLException { + return true; + } + + public boolean supportsGroupByBeyondSelect() throws SQLException { + return true; + } + + public boolean supportsLikeEscapeClause() throws SQLException { + return true; + } + + public boolean supportsMultipleResultSets() throws SQLException { + return false; + } + + public boolean supportsMultipleTransactions() throws SQLException { + return false; + } + + public boolean supportsNonNullableColumns() throws SQLException { + return true; + } + + public boolean supportsMinimumSQLGrammar() throws SQLException { + return true; + } + + public boolean supportsCoreSQLGrammar() throws SQLException { + return true; + } + + public boolean supportsExtendedSQLGrammar() throws SQLException { + return true; + } + + public boolean supportsANSI92EntryLevelSQL() throws SQLException { + return true; + } + + public boolean supportsANSI92IntermediateSQL() throws SQLException { + return true; + } + + public boolean supportsANSI92FullSQL() throws SQLException { + return true; + } + + public boolean supportsIntegrityEnhancementFacility() throws SQLException { + return false; + } + + public boolean supportsOuterJoins() throws SQLException { + return true; + } + + public boolean supportsFullOuterJoins() throws SQLException { + return true; + } + + public boolean supportsLimitedOuterJoins() throws SQLException { + return true; + } + + public String getSchemaTerm() throws SQLException { + return "schema"; + } + + public String getProcedureTerm() throws SQLException { + return "procedure"; + } + + public String getCatalogTerm() throws SQLException { + return "catalog"; + } + + public boolean isCatalogAtStart() throws SQLException { + return true; + } + + public String getCatalogSeparator() throws SQLException { + return "."; + } + + public boolean supportsSchemasInDataManipulation() throws SQLException { + return true; + } + + public boolean supportsSchemasInProcedureCalls() throws SQLException { + return true; + } + + public boolean supportsSchemasInTableDefinitions() throws SQLException { + return true; + } + + public boolean supportsSchemasInIndexDefinitions() throws SQLException { + return true; // except that we don't support index definitions + } + + public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException { + return true; // except that we don't support privilege definitions + } + + public boolean supportsCatalogsInDataManipulation() throws SQLException { + return true; + } + + public boolean supportsCatalogsInProcedureCalls() throws SQLException { + return true; + } + + public boolean supportsCatalogsInTableDefinitions() throws SQLException { + return true; + } + + public boolean supportsCatalogsInIndexDefinitions() throws SQLException { + return true; // except that we don't support index definitions + } + + public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException { + return true; // except that we don't support privilege definitions + } + + public boolean supportsPositionedDelete() throws SQLException { + return false; + } + + public boolean supportsPositionedUpdate() throws SQLException { + return false; + } + + public boolean supportsSelectForUpdate() throws SQLException { + return false; + } + + public boolean supportsStoredProcedures() throws SQLException { + return false; + } + + public boolean supportsSubqueriesInComparisons() throws SQLException { + return true; + } + + public boolean supportsSubqueriesInExists() throws SQLException { + return true; + } + + public boolean supportsSubqueriesInIns() throws SQLException { + return true; + } + + public boolean supportsSubqueriesInQuantifieds() throws SQLException { + return false; + } + + public boolean supportsCorrelatedSubqueries() throws SQLException { + return true; + } + + public boolean supportsUnion() throws SQLException { + return true; + } + + public boolean supportsUnionAll() throws SQLException { + return true; + } + + public boolean supportsOpenCursorsAcrossCommit() throws SQLException { + return false; + } + + public boolean supportsOpenCursorsAcrossRollback() throws SQLException { + return false; + } + + public boolean supportsOpenStatementsAcrossCommit() throws SQLException { + return false; + } + + public boolean supportsOpenStatementsAcrossRollback() throws SQLException { + return false; + } + + public int getMaxBinaryLiteralLength() throws SQLException { + return 0; + } + + public int getMaxCharLiteralLength() throws SQLException { + return 0; + } + + public int getMaxColumnNameLength() throws SQLException { + return 0; + } + + public int getMaxColumnsInGroupBy() throws SQLException { + return 0; + } + + public int getMaxColumnsInIndex() throws SQLException { + return 0; + } + + public int getMaxColumnsInOrderBy() throws SQLException { + return 0; + } + + public int getMaxColumnsInSelect() throws SQLException { + return 0; + } + + public int getMaxColumnsInTable() throws SQLException { + return 0; + } + + public int getMaxConnections() throws SQLException { + return 0; + } + + public int getMaxCursorNameLength() throws SQLException { + return 0; + } + + public int getMaxIndexLength() throws SQLException { + return 0; + } + + public int getMaxSchemaNameLength() throws SQLException { + return 0; + } + + public int getMaxProcedureNameLength() throws SQLException { + return 0; + } + + public int getMaxCatalogNameLength() throws SQLException { + return 0; + } + + public int getMaxRowSize() throws SQLException { + return 0; + } + + public boolean doesMaxRowSizeIncludeBlobs() throws SQLException { + return false; + } + + public int getMaxStatementLength() throws SQLException { + return 0; + } + + public int getMaxStatements() throws SQLException { + return 0; + } + + public int getMaxTableNameLength() throws SQLException { + return 0; + } + + public int getMaxTablesInSelect() throws SQLException { + return 0; + } + + public int getMaxUserNameLength() throws SQLException { + return 0; + } + + public int getDefaultTransactionIsolation() throws SQLException { + return connection.invokeWithRetries( + new CallableWithoutException<Integer>() { + public Integer call() { + return Meta.DatabaseProperty.GET_DEFAULT_TRANSACTION_ISOLATION + .getProp(connection.meta, connection.handle, Integer.class); + } + }); + } + + public boolean supportsTransactions() throws SQLException { + return false; + } + + public boolean supportsTransactionIsolationLevel(int level) + throws SQLException { + return level == Connection.TRANSACTION_NONE; + } + + public boolean supportsDataDefinitionAndDataManipulationTransactions() + throws SQLException { + return false; + } + + public boolean supportsDataManipulationTransactionsOnly() + throws SQLException { + return true; + } + + public boolean dataDefinitionCausesTransactionCommit() throws SQLException { + return true; + } + + public boolean dataDefinitionIgnoredInTransactions() throws SQLException { + return false; + } + + public ResultSet getProcedures( + final String catalog, + final String schemaPattern, + final String procedureNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getProcedures(connection.handle, catalog, pat(schemaPattern), + pat(procedureNamePattern)), + new QueryState(MetaDataOperation.GET_PROCEDURES, catalog, schemaPattern, + procedureNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getProcedureColumns( + final String catalog, + final String schemaPattern, + final String procedureNamePattern, + final String columnNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getProcedureColumns(connection.handle, catalog, + pat(schemaPattern), pat(procedureNamePattern), pat(columnNamePattern)), + new QueryState(MetaDataOperation.GET_PROCEDURE_COLUMNS, catalog, schemaPattern, + procedureNamePattern, columnNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getTables( + final String catalog, + final String schemaPattern, + final String tableNamePattern, + final String[] types) throws SQLException { + final List<String> typeList = types == null ? null : Arrays.asList(types); + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getTables(connection.handle, catalog, pat(schemaPattern), + pat(tableNamePattern), typeList), + new QueryState(MetaDataOperation.GET_TABLES, catalog, schemaPattern, + tableNamePattern, types)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + private static Meta.Pat pat(String schemaPattern) { + return Meta.Pat.of(schemaPattern); + } + + public ResultSet getSchemas( + final String catalog, final String schemaPattern) throws SQLException { + // TODO: add a 'catch ... throw new SQLException' logic to this and other + // getXxx methods. Right now any error will throw a RuntimeException + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getSchemas(connection.handle, catalog, pat(schemaPattern)), + new QueryState(MetaDataOperation.GET_SCHEMAS_WITH_ARGS, catalog, + schemaPattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getSchemas() throws SQLException { + return getSchemas(null, null); + } + + public ResultSet getCatalogs() throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet(connection.meta.getCatalogs(connection.handle), + new QueryState(MetaDataOperation.GET_CATALOGS)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getTableTypes() throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet(connection.meta.getTableTypes(connection.handle), + new QueryState(MetaDataOperation.GET_TABLE_TYPES)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getColumns( + final String catalog, + final String schemaPattern, + final String tableNamePattern, + final String columnNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getColumns(connection.handle, catalog, pat(schemaPattern), + pat(tableNamePattern), pat(columnNamePattern)), + new QueryState(MetaDataOperation.GET_COLUMNS, catalog, schemaPattern, + tableNamePattern, columnNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getColumnPrivileges( + final String catalog, + final String schema, + final String table, + final String columnNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getColumnPrivileges(connection.handle, catalog, schema, table, + pat(columnNamePattern)), + new QueryState(MetaDataOperation.GET_COLUMN_PRIVILEGES, catalog, schema, table, + columnNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getTablePrivileges( + final String catalog, + final String schemaPattern, + final String tableNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getTablePrivileges(connection.handle, catalog, + pat(schemaPattern), pat(tableNamePattern)), + new QueryState(MetaDataOperation.GET_TABLE_PRIVILEGES, catalog, schemaPattern, + tableNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getBestRowIdentifier( + final String catalog, + final String schema, + final String table, + final int scope, + final boolean nullable) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getBestRowIdentifier(connection.handle, catalog, schema, table, + scope, nullable), + new QueryState(MetaDataOperation.GET_BEST_ROW_IDENTIFIER, catalog, table, scope, + nullable)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getVersionColumns( + final String catalog, final String schema, final String table) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getVersionColumns(connection.handle, catalog, schema, table), + new QueryState(MetaDataOperation.GET_VERSION_COLUMNS, catalog, schema, table)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getPrimaryKeys( + final String catalog, final String schema, final String table) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getPrimaryKeys(connection.handle, catalog, schema, table), + new QueryState(MetaDataOperation.GET_PRIMARY_KEYS, catalog, schema, table)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getImportedKeys( + final String catalog, final String schema, final String table) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getImportedKeys(connection.handle, catalog, schema, table), + new QueryState(MetaDataOperation.GET_IMPORTED_KEYS, catalog, schema, table)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getExportedKeys( + final String catalog, final String schema, final String table) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getExportedKeys(connection.handle, catalog, schema, table), + new QueryState(MetaDataOperation.GET_EXPORTED_KEYS, catalog, schema, table)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getCrossReference( + final String parentCatalog, + final String parentSchema, + final String parentTable, + final String foreignCatalog, + final String foreignSchema, + final String foreignTable) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getCrossReference(connection.handle, parentCatalog, + parentSchema, parentTable, foreignCatalog, foreignSchema, foreignTable), + new QueryState(MetaDataOperation.GET_CROSS_REFERENCE, parentCatalog, + parentSchema, parentTable, foreignCatalog, foreignSchema, foreignTable)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getTypeInfo() throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet(connection.meta.getTypeInfo(connection.handle), + new QueryState(MetaDataOperation.GET_TYPE_INFO)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getIndexInfo( + final String catalog, + final String schema, + final String table, + final boolean unique, + final boolean approximate) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getIndexInfo(connection.handle, catalog, schema, table, unique, + approximate), + new QueryState(MetaDataOperation.GET_INDEX_INFO, catalog, schema, table, unique, + approximate)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public boolean supportsResultSetType(int type) throws SQLException { + return type == ResultSet.TYPE_FORWARD_ONLY; + } + + public boolean supportsResultSetConcurrency( + int type, int concurrency) throws SQLException { + return type == ResultSet.TYPE_FORWARD_ONLY + && concurrency == ResultSet.CONCUR_READ_ONLY; + } + + public boolean ownUpdatesAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean ownDeletesAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean ownInsertsAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean othersUpdatesAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean othersDeletesAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean othersInsertsAreVisible(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean updatesAreDetected(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean deletesAreDetected(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean insertsAreDetected(int type) throws SQLException { + throw connection.helper.todo(); + } + + public boolean supportsBatchUpdates() throws SQLException { + return false; + } + + public ResultSet getUDTs( + final String catalog, + final String schemaPattern, + final String typeNamePattern, + final int[] types) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getUDTs(connection.handle, catalog, pat(schemaPattern), + pat(typeNamePattern), types), + new QueryState(MetaDataOperation.GET_UDTS, catalog, schemaPattern, + typeNamePattern, types)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public Connection getConnection() throws SQLException { + return connection; + } + + public boolean supportsSavepoints() throws SQLException { + return false; + } + + public boolean supportsNamedParameters() throws SQLException { + return false; + } + + public boolean supportsMultipleOpenResults() throws SQLException { + return false; + } + + public boolean supportsGetGeneratedKeys() throws SQLException { + return false; + } + + public ResultSet getSuperTypes( + final String catalog, + final String schemaPattern, + final String typeNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getSuperTypes(connection.handle, catalog, pat(schemaPattern), + pat(typeNamePattern)), + new QueryState(MetaDataOperation.GET_SUPER_TYPES, catalog, schemaPattern, + typeNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getSuperTables( + final String catalog, + final String schemaPattern, + final String tableNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getSuperTables(connection.handle, catalog, pat(schemaPattern), + pat(tableNamePattern)), + new QueryState(MetaDataOperation.GET_SUPER_TABLES, catalog, schemaPattern, + tableNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getAttributes( + final String catalog, + final String schemaPattern, + final String typeNamePattern, + final String attributeNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getAttributes(connection.handle, catalog, pat(schemaPattern), + pat(typeNamePattern), pat(attributeNamePattern)), + new QueryState(MetaDataOperation.GET_ATTRIBUTES, catalog, schemaPattern, + typeNamePattern, attributeNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public boolean supportsResultSetHoldability(int holdability) + throws SQLException { + throw connection.helper.todo(); + } + + public int getResultSetHoldability() { + return ResultSet.HOLD_CURSORS_OVER_COMMIT; + } + + public int getDatabaseMajorVersion() throws SQLException { + return connection.driver.version.databaseMajorVersion; + } + + public int getDatabaseMinorVersion() throws SQLException { + return connection.driver.version.databaseMinorVersion; + } + + public int getJDBCMajorVersion() throws SQLException { + return connection.factory.getJdbcMajorVersion(); + } + + public int getJDBCMinorVersion() throws SQLException { + return connection.factory.getJdbcMinorVersion(); + } + + public int getSQLStateType() throws SQLException { + return sqlStateSQL; + } + + public boolean locatorsUpdateCopy() throws SQLException { + return true; + } + + public boolean supportsStatementPooling() throws SQLException { + return false; + } + + public RowIdLifetime getRowIdLifetime() throws SQLException { + return RowIdLifetime.ROWID_UNSUPPORTED; + } + + public boolean supportsStoredFunctionsUsingCallSyntax() + throws SQLException { + return true; + } + + public boolean autoCommitFailureClosesAllResultSets() throws SQLException { + return false; + } + + public ResultSet getClientInfoProperties() throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getClientInfoProperties(connection.handle), + new QueryState(MetaDataOperation.GET_CLIENT_INFO_PROPERTIES)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getFunctions( + final String catalog, + final String schemaPattern, + final String functionNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getFunctions(connection.handle, catalog, pat(schemaPattern), + pat(functionNamePattern)), + new QueryState(MetaDataOperation.GET_FUNCTIONS, catalog, schemaPattern, + functionNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getFunctionColumns( + final String catalog, + final String schemaPattern, + final String functionNamePattern, + final String columnNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getFunctionColumns(connection.handle, catalog, + pat(schemaPattern), pat(functionNamePattern), pat(columnNamePattern)), + new QueryState(MetaDataOperation.GET_FUNCTION_COLUMNS, catalog, + schemaPattern, functionNamePattern, columnNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public ResultSet getPseudoColumns( + final String catalog, + final String schemaPattern, + final String tableNamePattern, + final String columnNamePattern) throws SQLException { + try { + return connection.invokeWithRetries( + new CallableWithoutException<ResultSet>() { + public ResultSet call() { + try { + return connection.createResultSet( + connection.meta.getPseudoColumns(connection.handle, catalog, pat(schemaPattern), + pat(tableNamePattern), pat(columnNamePattern)), + new QueryState(MetaDataOperation.GET_PSEUDO_COLUMNS, catalog, schemaPattern, + tableNamePattern, columnNamePattern)); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + }); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLException) { + throw (SQLException) cause; + } + throw e; + } + } + + public boolean generatedKeyAlwaysReturned() throws SQLException { + return false; + } + + // implement Wrapper + + @Override public <T> T unwrap(Class<T> iface) throws SQLException { + if (iface.isInstance(this)) { + return iface.cast(this); + } + + if (Properties.class.equals(iface)) { + return iface.cast(getRemoteAvaticaProperties()); + } + + throw connection.helper.createException( + "does not implement '" + iface + "'"); + } + + @Override public boolean isWrapperFor(Class<?> iface) throws SQLException { + return iface.isInstance(this) || Properties.class.equals(iface); + } + + // Not JDBC Methods + + @Override public Properties getRemoteAvaticaProperties() { + Map<DatabaseProperty, Object> propertyMap = connection.invokeWithRetries( + new CallableWithoutException<Map<DatabaseProperty, Object>>() { + public Map<DatabaseProperty, Object> call() { + return connection.meta.getDatabaseProperties(connection.handle); + } + }); + + final Properties properties = new Properties(); + for (Entry<DatabaseProperty, Object> entry: propertyMap.entrySet()) { + properties.setProperty(entry.getKey().name(), entry.getValue().toString()); + } + + return properties; + } + + /** + * Fetches the Avatica version from the given server. + * + * @return The Avatica version string or null if the server did not provide the version. + */ + @Override public String getAvaticaServerVersion() { + Map<DatabaseProperty, Object> properties = connection.invokeWithRetries( + new CallableWithoutException<Map<DatabaseProperty, Object>>() { + public Map<DatabaseProperty, Object> call() { + return connection.meta.getDatabaseProperties(connection.handle); + } + }); + Object o = properties.get(DatabaseProperty.AVATICA_VERSION); + if (null == o) { + return null; + } + return (String) o; + } +} + +// End AvaticaDatabaseMetaDataImpl.java http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java index f410dc8..497fa43 100644 --- a/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/AvaticaJdbc41Factory.java @@ -246,7 +246,7 @@ class AvaticaJdbc41Factory implements AvaticaFactory { /** Implementation of DatabaseMetaData for JDBC 4.1. */ private static class AvaticaJdbc41DatabaseMetaData - extends AvaticaDatabaseMetaData { + extends AvaticaDatabaseMetaDataImpl { AvaticaJdbc41DatabaseMetaData(AvaticaConnection connection) { super(connection); } http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java b/avatica/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java index a5a3852..52a984b 100644 --- a/avatica/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/InternalProperty.java @@ -24,7 +24,7 @@ import java.util.Map; /** * Definitions of properties that drive the behavior of - * {@link org.apache.calcite.avatica.AvaticaDatabaseMetaData}. + * {@link org.apache.calcite.avatica.AvaticaDatabaseMetaDataImpl}. */ public enum InternalProperty { /** Whether identifiers are matched case-sensitively. */ http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/Meta.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/Meta.java b/avatica/core/src/main/java/org/apache/calcite/avatica/Meta.java index 41ca0ee..80f384f 100644 --- a/avatica/core/src/main/java/org/apache/calcite/avatica/Meta.java +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/Meta.java @@ -18,6 +18,7 @@ package org.apache.calcite.avatica; import org.apache.calcite.avatica.proto.Common; import org.apache.calcite.avatica.remote.TypedValue; +import org.apache.calcite.avatica.util.FilteredConstants; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -385,22 +386,71 @@ public interface Meta { /** Database property containing the value of * {@link DatabaseMetaData#getDefaultTransactionIsolation()}. */ - GET_DEFAULT_TRANSACTION_ISOLATION(Connection.TRANSACTION_NONE); + GET_DEFAULT_TRANSACTION_ISOLATION(Connection.TRANSACTION_NONE), + + /** Database property which is the Avatica version */ + AVATICA_VERSION(FilteredConstants.VERSION), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDriverVersion()}. */ + GET_DRIVER_VERSION(""), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDriverMinorVersion()}. */ + GET_DRIVER_MINOR_VERSION(-1), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDriverMajorVersion()}. */ + GET_DRIVER_MAJOR_VERSION(-1), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDriverName()}. */ + GET_DRIVER_NAME(""), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDatabaseMinorVersion()}. */ + GET_DATABASE_MINOR_VERSION(-1), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDatabaseMajorVersion()}. */ + GET_DATABASE_MAJOR_VERSION(-1), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDatabaseProductName()}. */ + GET_DATABASE_PRODUCT_NAME(""), + + /** Database property containing the value of + * {@link DatabaseMetaData#getDatabaseProductVersion()}. */ + GET_DATABASE_PRODUCT_VERSION(""); public final Class<?> type; public final Object defaultValue; public final Method method; + public final boolean isJdbc; <T> DatabaseProperty(T defaultValue) { this.defaultValue = defaultValue; final String methodName = AvaticaUtils.toCamelCase(name()); + Method localMethod = null; try { - this.method = DatabaseMetaData.class.getMethod(methodName); + localMethod = DatabaseMetaData.class.getMethod(methodName); } catch (NoSuchMethodException e) { - throw new RuntimeException(e); + // Pass, localMethod stays null. } - this.type = AvaticaUtils.box(method.getReturnType()); - assert defaultValue == null || defaultValue.getClass() == type; + + if (null == localMethod) { + this.method = null; + this.type = null; + this.isJdbc = false; + } else { + this.method = localMethod; + this.type = AvaticaUtils.box(method.getReturnType()); + this.isJdbc = true; + } + + // It's either: 1) not a JDBC method, 2) has no default value, + // 3) the defaultValue is of the expected type + assert !isJdbc || defaultValue == null || defaultValue.getClass() == type; } /** Returns a value of this property, using the default value if the map http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java index 80a5f81..35df7c1 100644 --- a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/ProtobufTranslationImpl.java @@ -256,8 +256,9 @@ public class ProtobufTranslationImpl implements ProtobufTranslation { * class name is not found. */ public static RequestTranslator getParserForRequest(String className) { - if (null == className) { - throw new IllegalArgumentException("Cannot fetch parser for null class name"); + if (null == className || className.isEmpty()) { + throw new IllegalArgumentException("Cannot fetch parser for Request with " + + (null == className ? "null" : "missing") + " class name"); } RequestTranslator translator = REQUEST_PARSERS.get(className); @@ -277,8 +278,9 @@ public class ProtobufTranslationImpl implements ProtobufTranslation { * class name is not found. */ public static ResponseTranslator getParserForResponse(String className) { - if (null == className) { - throw new IllegalArgumentException("Cannot fetch parser for null class name"); + if (null == className || className.isEmpty()) { + throw new IllegalArgumentException("Cannot fetch parser for Response with " + + (null == className ? "null" : "missing") + " class name"); } ResponseTranslator translator = RESPONSE_PARSERS.get(className); http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java index 0f45947..daaf5f0 100644 --- a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java +++ b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java @@ -2118,7 +2118,18 @@ public interface Service { obj = (int) value.getNumberValue(); break; default: - throw new RuntimeException("Unhandled DatabaseProperty"); + switch (value.getType()) { + case INTEGER: + obj = Long.valueOf(value.getNumberValue()).intValue(); + break; + case STRING: + obj = value.getStringValue(); + break; + default: + throw new IllegalArgumentException("Unhandled value type, " + value.getType()); + } + + break; } properties.put(dbProp, obj); @@ -2164,7 +2175,19 @@ public interface Service { valueBuilder.setType(Common.Rep.INTEGER).setNumberValue(((Integer) obj).longValue()); break; default: - throw new RuntimeException("Unhandled DatabaseProperty"); + if (obj instanceof Integer) { + valueBuilder.setType(Common.Rep.INTEGER).setNumberValue((Integer) obj); + } else { + String value; + if (obj instanceof String) { + value = (String) obj; + } else { + value = obj.toString(); + } + valueBuilder.setType(Common.Rep.STRING).setStringValue(value); + } + + break; } builder.addProps(Responses.DatabasePropertyElement.newBuilder() http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/pom.xml ---------------------------------------------------------------------- diff --git a/avatica/pom.xml b/avatica/pom.xml index c97cdb3..65084a4 100644 --- a/avatica/pom.xml +++ b/avatica/pom.xml @@ -50,6 +50,7 @@ limitations under the License. <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <top.dir>${project.basedir}</top.dir> + <avatica.release.version>${project.version}</avatica.release.version> <version.major>1</version.major> <version.minor>7</version.minor> http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java b/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java index 4e6c67f..d2da076 100644 --- a/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java +++ b/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcMeta.java @@ -279,7 +279,8 @@ public class JdbcMeta implements ProtobufMeta { public Map<DatabaseProperty, Object> getDatabaseProperties(ConnectionHandle ch) { try { final Map<DatabaseProperty, Object> map = new HashMap<>(); - final DatabaseMetaData metaData = getConnection(ch.id).getMetaData(); + final Connection conn = getConnection(ch.id); + final DatabaseMetaData metaData = conn.getMetaData(); for (DatabaseProperty p : DatabaseProperty.values()) { addProperty(map, metaData, p); } @@ -291,11 +292,18 @@ public class JdbcMeta implements ProtobufMeta { private static Object addProperty(Map<DatabaseProperty, Object> map, DatabaseMetaData metaData, DatabaseProperty p) throws SQLException { - try { - return map.put(p, p.method.invoke(metaData)); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); + Object propertyValue; + if (p.isJdbc) { + try { + propertyValue = p.method.invoke(metaData); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new RuntimeException(e); + } + } else { + propertyValue = p.defaultValue; } + + return map.put(p, propertyValue); } public MetaResultSet getTables(ConnectionHandle ch, String catalog, Pat schemaPattern, http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java index e6c2fed..9f37db5 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java @@ -16,6 +16,7 @@ */ package org.apache.calcite.avatica; +import org.apache.calcite.avatica.Meta.DatabaseProperty; import org.apache.calcite.avatica.jdbc.JdbcMeta; import org.apache.calcite.avatica.remote.JsonService; import org.apache.calcite.avatica.remote.LocalJsonService; @@ -58,6 +59,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.TimeZone; import java.util.UUID; import java.util.concurrent.Callable; @@ -65,8 +67,10 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -1422,6 +1426,35 @@ public class RemoteDriverTest { } } + @Test public void testDatabaseMetaData() throws Exception { + ConnectionSpec.getDatabaseLock().lock(); + try (Connection conn = getLocalConnection()) { + DatabaseMetaData metadata = conn.getMetaData(); + assertTrue(metadata.isWrapperFor(AvaticaDatabaseMetaData.class)); + assertTrue(metadata.isWrapperFor(Properties.class)); + Properties props = metadata.unwrap(Properties.class); + assertNotNull(props); + + final Object productName = props.get(DatabaseProperty.GET_DATABASE_PRODUCT_NAME.name()); + assertThat(productName, instanceOf(String.class)); + assertThat((String) productName, startsWith("HSQL")); + + final Object driverName = props.get(DatabaseProperty.GET_DRIVER_NAME.name()); + assertThat(driverName, instanceOf(String.class)); + assertThat((String) driverName, startsWith("HSQL")); + + final Object driverVersion = props.get(DatabaseProperty.GET_DRIVER_VERSION.name()); + final Object driverMinVersion = props.get(DatabaseProperty.GET_DRIVER_MINOR_VERSION.name()); + final Object driverMajVersion = props.get(DatabaseProperty.GET_DRIVER_MAJOR_VERSION.name()); + assertThat(driverVersion, instanceOf(String.class)); + assertThat(driverMinVersion, instanceOf(String.class)); + assertThat(driverMajVersion, instanceOf(String.class)); + assertThat((String) driverVersion, startsWith(driverMajVersion + "." + driverMinVersion)); + } finally { + ConnectionSpec.getDatabaseLock().unlock(); + } + } + /** * Factory that creates a service based on a local JDBC connection. */ http://git-wip-us.apache.org/repos/asf/calcite/blob/ba9783f3/avatica/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java index e4a8528..43beba8 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java @@ -17,12 +17,14 @@ package org.apache.calcite.avatica.remote; import org.apache.calcite.avatica.AvaticaConnection; +import org.apache.calcite.avatica.AvaticaDatabaseMetaData; import org.apache.calcite.avatica.AvaticaSqlException; import org.apache.calcite.avatica.AvaticaStatement; import org.apache.calcite.avatica.AvaticaUtils; import org.apache.calcite.avatica.ConnectionPropertiesImpl; import org.apache.calcite.avatica.ConnectionSpec; import org.apache.calcite.avatica.Meta; +import org.apache.calcite.avatica.Meta.DatabaseProperty; import org.apache.calcite.avatica.jdbc.JdbcMeta; import org.apache.calcite.avatica.remote.Service.ErrorResponse; import org.apache.calcite.avatica.remote.Service.Response; @@ -32,6 +34,7 @@ import org.apache.calcite.avatica.server.HttpServer; import org.apache.calcite.avatica.server.Main; import org.apache.calcite.avatica.server.Main.HandlerFactory; import org.apache.calcite.avatica.util.ArrayImpl; +import org.apache.calcite.avatica.util.FilteredConstants; import com.google.common.base.Throwables; import com.google.common.cache.Cache; @@ -50,6 +53,7 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.sql.Array; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -60,6 +64,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Random; import java.util.UUID; @@ -616,6 +621,25 @@ public class RemoteMetaTest { } } + @Test public void getAvaticaVersion() throws Exception { + ConnectionSpec.getDatabaseLock().lock(); + try (final Connection conn = DriverManager.getConnection(url)) { + DatabaseMetaData metadata = conn.getMetaData(); + assertTrue("DatabaseMetaData is not an instance of AvaticaDatabaseMetaData", + metadata instanceof AvaticaDatabaseMetaData); + AvaticaDatabaseMetaData avaticaMetadata = (AvaticaDatabaseMetaData) metadata; + // We should get the same version back from the server + assertEquals(FilteredConstants.VERSION, avaticaMetadata.getAvaticaServerVersion()); + + Properties avaticaProps = avaticaMetadata.unwrap(Properties.class); + assertNotNull(avaticaProps); + assertEquals(FilteredConstants.VERSION, + avaticaProps.get(DatabaseProperty.AVATICA_VERSION.name())); + } finally { + ConnectionSpec.getDatabaseLock().unlock(); + } + } + /** Factory that provides a {@link JdbcMeta}. */ public static class FullyRemoteJdbcMetaFactory implements Meta.Factory {
