Adding java7 jdbc methods, but commented out. Need to have some automatic way of compiling them for both java 6 and 7.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/cac5fb7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/cac5fb7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/cac5fb7e Branch: refs/heads/0.1.5 Commit: cac5fb7e375ee39f6549ba499864f672cc7ed8b4 Parents: b89d456 Author: Aaron McCurry <[email protected]> Authored: Sun Mar 17 15:35:16 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Sun Mar 17 15:35:16 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/blur/jdbc/BlurConnection.java | 1 - .../org/apache/blur/jdbc/BlurDatabaseMetaData.java | 4 +- .../main/java/org/apache/blur/jdbc/BlurJdbc.java | 8 ++ .../jdbc/abstractimpl/AbstractBlurConnection.java | 37 ++++++-- .../abstractimpl/AbstractBlurDatabaseMetaData.java | 69 ++++++++++----- .../AbstractBlurPreparedStatement.java | 26 ++++-- .../jdbc/abstractimpl/AbstractBlurResultSet.java | 23 ++++-- .../AbstractBlurResultSetMetaData.java | 14 ++-- .../jdbc/abstractimpl/AbstractBlurStatement.java | 24 ++++-- 9 files changed, 144 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurConnection.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurConnection.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurConnection.java index 2ba3500..ea4e145 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurConnection.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurConnection.java @@ -24,7 +24,6 @@ import java.sql.Statement; import org.apache.blur.jdbc.abstractimpl.AbstractBlurConnection; - public class BlurConnection extends AbstractBlurConnection { private boolean closed; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java index 502d7b0..299e87d 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java @@ -33,10 +33,10 @@ import org.apache.blur.jdbc.util.EmptyResultSet; import org.apache.blur.jdbc.util.SimpleStringResultSet; import org.apache.blur.thrift.BlurClientManager; import org.apache.blur.thrift.commands.BlurCommand; +import org.apache.blur.thrift.generated.Blur.Client; import org.apache.blur.thrift.generated.BlurException; import org.apache.blur.thrift.generated.Schema; import org.apache.blur.thrift.generated.TableDescriptor; -import org.apache.blur.thrift.generated.Blur.Client; import org.apache.thrift.TException; @@ -421,4 +421,6 @@ public class BlurDatabaseMetaData extends AbstractBlurDatabaseMetaData { return ""; } + + } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java index bb099c0..e4dde7c 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java @@ -20,7 +20,9 @@ import java.sql.Connection; import java.sql.Driver; import java.sql.DriverPropertyInfo; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; +import java.util.logging.Logger; public class BlurJdbc implements Driver { @@ -84,5 +86,11 @@ public class BlurJdbc implements Driver { public boolean jdbcCompliant() { return false; } + + //java 7 + +// public Logger getParentLogger() throws SQLFeatureNotSupportedException { +// throw new SQLFeatureNotSupportedException(); +// } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java index ae9a642..7269850 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java @@ -36,21 +36,22 @@ import java.sql.Statement; import java.sql.Struct; import java.util.Map; import java.util.Properties; +import java.util.concurrent.Executor; import org.apache.blur.jdbc.util.NotImplemented; - public abstract class AbstractBlurConnection implements Connection { private Connection throwExceptionDelegate; public AbstractBlurConnection() { - throwExceptionDelegate = (Connection) Proxy.newProxyInstance(Connection.class.getClassLoader(), new Class[] { Connection.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - throw new NotImplemented(method.getName()); - } - }); + throwExceptionDelegate = (Connection) Proxy.newProxyInstance(Connection.class.getClassLoader(), + new Class[] { Connection.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + throw new NotImplemented(method.getName()); + } + }); } public void clearWarnings() throws SQLException { @@ -249,4 +250,26 @@ public abstract class AbstractBlurConnection implements Connection { return throwExceptionDelegate.unwrap(iface); } + // java 7 + +// public void setSchema(String schema) throws SQLException { +// throwExceptionDelegate.setSchema(schema); +// } +// +// public String getSchema() throws SQLException { +// return throwExceptionDelegate.getSchema(); +// } +// +// public void abort(Executor executor) throws SQLException { +// throwExceptionDelegate.abort(executor); +// } +// +// public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { +// throwExceptionDelegate.setNetworkTimeout(executor, milliseconds); +// } +// +// public int getNetworkTimeout() throws SQLException { +// return throwExceptionDelegate.getNetworkTimeout(); +// } + } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java index fbc79bb..bc51a4a 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java @@ -27,22 +27,22 @@ import java.sql.SQLException; import org.apache.blur.jdbc.util.NotImplemented; - public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { private DatabaseMetaData throwExceptionDelegate; public AbstractBlurDatabaseMetaData() { - throwExceptionDelegate = (DatabaseMetaData) Proxy.newProxyInstance(DatabaseMetaData.class.getClassLoader(), new Class[] { DatabaseMetaData.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Class<?> clazz = method.getReturnType(); - if (clazz.equals(Boolean.class) || clazz.equals(Boolean.TYPE)) { - return false; - } - throw new NotImplemented(method.getName()); - } - }); + throwExceptionDelegate = (DatabaseMetaData) Proxy.newProxyInstance(DatabaseMetaData.class.getClassLoader(), + new Class[] { DatabaseMetaData.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + Class<?> clazz = method.getReturnType(); + if (clazz.equals(Boolean.class) || clazz.equals(Boolean.TYPE)) { + return false; + } + throw new NotImplemented(method.getName()); + } + }); } public boolean allProceduresAreCallable() throws SQLException { @@ -73,11 +73,13 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.doesMaxRowSizeIncludeBlobs(); } - public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException { + public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, + String attributeNamePattern) throws SQLException { return throwExceptionDelegate.getAttributes(catalog, schemaPattern, typeNamePattern, attributeNamePattern); } - public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException { + public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) + throws SQLException { return throwExceptionDelegate.getBestRowIdentifier(catalog, schema, table, scope, nullable); } @@ -97,11 +99,13 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getClientInfoProperties(); } - public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException { + public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) + throws SQLException { return throwExceptionDelegate.getColumnPrivileges(catalog, schema, table, columnNamePattern); } - public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) + throws SQLException { return throwExceptionDelegate.getColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern); } @@ -109,9 +113,10 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getConnection(); } - public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) - throws SQLException { - return throwExceptionDelegate.getCrossReference(parentCatalog, parentSchema, parentTable, foreignCatalog, foreignSchema, foreignTable); + public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, + String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException { + return throwExceptionDelegate.getCrossReference(parentCatalog, parentSchema, parentTable, foreignCatalog, + foreignSchema, foreignTable); } public int getDatabaseMajorVersion() throws SQLException { @@ -158,7 +163,8 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getExtraNameCharacters(); } - public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, + String columnNamePattern) throws SQLException { return throwExceptionDelegate.getFunctionColumns(catalog, schemaPattern, functionNamePattern, columnNamePattern); } @@ -174,7 +180,8 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getImportedKeys(catalog, schema, table); } - public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException { + public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) + throws SQLException { return throwExceptionDelegate.getIndexInfo(catalog, schema, table, unique, approximate); } @@ -274,7 +281,8 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getPrimaryKeys(catalog, schema, table); } - public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, + String columnNamePattern) throws SQLException { return throwExceptionDelegate.getProcedureColumns(catalog, schemaPattern, procedureNamePattern, columnNamePattern); } @@ -334,11 +342,13 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getSystemFunctions(); } - public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException { + public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) + throws SQLException { return throwExceptionDelegate.getTablePrivileges(catalog, schemaPattern, tableNamePattern); } - public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException { + public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) + throws SQLException { return throwExceptionDelegate.getTables(catalog, schemaPattern, tableNamePattern, types); } @@ -354,7 +364,8 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.getTypeInfo(); } - public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException { + public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) + throws SQLException { return throwExceptionDelegate.getUDTs(catalog, schemaPattern, typeNamePattern, types); } @@ -742,4 +753,14 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData { return throwExceptionDelegate.usesLocalFiles(); } + // java 7 + +// public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, +// String columnNamePattern) throws SQLException { +// return throwExceptionDelegate.getPseudoColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern); +// } +// +// public boolean generatedKeyAlwaysReturned() throws SQLException { +// return throwExceptionDelegate.generatedKeyAlwaysReturned(); +// } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java index 5231c10..99cc495 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurPreparedStatement.java @@ -44,7 +44,6 @@ import java.util.Calendar; import org.apache.blur.jdbc.util.NotImplemented; - public class AbstractBlurPreparedStatement implements PreparedStatement { private PreparedStatement throwExceptionDelegate; @@ -438,12 +437,23 @@ public class AbstractBlurPreparedStatement implements PreparedStatement { } public AbstractBlurPreparedStatement() { - throwExceptionDelegate = (PreparedStatement) Proxy.newProxyInstance(PreparedStatement.class.getClassLoader(), new Class[] { PreparedStatement.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - throw new NotImplemented(method.getName()); - } - }); - } + throwExceptionDelegate = (PreparedStatement) Proxy.newProxyInstance(PreparedStatement.class.getClassLoader(), + new Class[] { PreparedStatement.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + throw new NotImplemented(method.getName()); + } + }); + } + + // java 7 + +// public void closeOnCompletion() throws SQLException { +// throwExceptionDelegate.closeOnCompletion(); +// } +// +// public boolean isCloseOnCompletion() throws SQLException { +// return throwExceptionDelegate.isCloseOnCompletion(); +// } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java index 6846193..954643d 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSet.java @@ -43,18 +43,18 @@ import java.util.Map; import org.apache.blur.jdbc.util.NotImplemented; - public abstract class AbstractBlurResultSet implements ResultSet { private ResultSet throwExceptionDelegate; public AbstractBlurResultSet() { - throwExceptionDelegate = (ResultSet) Proxy.newProxyInstance(ResultSet.class.getClassLoader(), new Class[] { ResultSet.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - throw new NotImplemented(method.getName()); - } - }); + throwExceptionDelegate = (ResultSet) Proxy.newProxyInstance(ResultSet.class.getClassLoader(), + new Class[] { ResultSet.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + throw new NotImplemented(method.getName()); + } + }); } public boolean absolute(int row) throws SQLException { @@ -817,4 +817,13 @@ public abstract class AbstractBlurResultSet implements ResultSet { return throwExceptionDelegate.wasNull(); } + // java 7 + +// public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { +// return throwExceptionDelegate.getObject(columnIndex, type); +// } +// +// public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { +// return throwExceptionDelegate.getObject(columnLabel, type); +// } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSetMetaData.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSetMetaData.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSetMetaData.java index b65ae47..d9669ca 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSetMetaData.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurResultSetMetaData.java @@ -24,18 +24,18 @@ import java.sql.SQLException; import org.apache.blur.jdbc.util.NotImplemented; - public abstract class AbstractBlurResultSetMetaData implements ResultSetMetaData { private ResultSetMetaData throwExceptionDelegate; public AbstractBlurResultSetMetaData() { - throwExceptionDelegate = (ResultSetMetaData) Proxy.newProxyInstance(ResultSetMetaData.class.getClassLoader(), new Class[] { ResultSetMetaData.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - throw new NotImplemented(method.getName()); - } - }); + throwExceptionDelegate = (ResultSetMetaData) Proxy.newProxyInstance(ResultSetMetaData.class.getClassLoader(), + new Class[] { ResultSetMetaData.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + throw new NotImplemented(method.getName()); + } + }); } public String getCatalogName(int column) throws SQLException { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/cac5fb7e/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java ---------------------------------------------------------------------- diff --git a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java index eaf98ac..4e621c5 100644 --- a/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java +++ b/src/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurStatement.java @@ -27,18 +27,18 @@ import java.sql.Statement; import org.apache.blur.jdbc.util.NotImplemented; - public class AbstractBlurStatement implements Statement { private Statement throwExceptionDelegate; public AbstractBlurStatement() { - throwExceptionDelegate = (Statement) Proxy.newProxyInstance(Statement.class.getClassLoader(), new Class[] { Statement.class }, new InvocationHandler() { - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - throw new NotImplemented(method.getName()); - } - }); + throwExceptionDelegate = (Statement) Proxy.newProxyInstance(Statement.class.getClassLoader(), + new Class[] { Statement.class }, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + throw new NotImplemented(method.getName()); + } + }); } public void addBatch(String sql) throws SQLException { @@ -209,4 +209,14 @@ public class AbstractBlurStatement implements Statement { return throwExceptionDelegate.unwrap(iface); } + // java 7 + +// public void closeOnCompletion() throws SQLException { +// throwExceptionDelegate.closeOnCompletion(); +// } +// +// public boolean isCloseOnCompletion() throws SQLException { +// return throwExceptionDelegate.isCloseOnCompletion(); +// } + } \ No newline at end of file
