incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/2] git commit: Commiting java7 support.
Date Fri, 28 Jun 2013 18:07:23 GMT
Updated Branches:
  refs/heads/master 46836eb2a -> 7ef345f8f


Commiting java7 support.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/be55844a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/be55844a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/be55844a

Branch: refs/heads/master
Commit: be55844a7047c2a1a8026576202956f915321405
Parents: 46836eb
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Jun 28 12:42:02 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Jun 28 12:42:02 2013 -0400

----------------------------------------------------------------------
 .../apache/blur/jdbc/BlurDatabaseMetaData.java  |  3 --
 .../java/org/apache/blur/jdbc/BlurJdbc.java     |  7 ++--
 .../abstractimpl/AbstractBlurConnection.java    | 40 ++++++++++----------
 .../AbstractBlurDatabaseMetaData.java           | 22 +++++------
 4 files changed, 34 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/be55844a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
index 3859a66..1c6b020 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurDatabaseMetaData.java
@@ -415,7 +415,4 @@ public class BlurDatabaseMetaData extends AbstractBlurDatabaseMetaData
{
   public String getSystemFunctions() throws SQLException {
     return "";
   }
-
-
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/be55844a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java
index bd0ae47..5b8fb1f 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurJdbc.java
@@ -77,9 +77,8 @@ public class BlurJdbc implements Driver {
   }
 
   // java 7
-
-  // public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-  // throw new SQLFeatureNotSupportedException();
-  // }
+  public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException
{
+    throw new java.sql.SQLFeatureNotSupportedException();
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/be55844a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java
b/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java
index d6bf95d..44e991b 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurConnection.java
@@ -36,6 +36,7 @@ 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;
 
@@ -256,25 +257,24 @@ public abstract class AbstractBlurConnection implements Connection {
 
   // 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();
-  // }
+  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/be55844a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java
b/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java
index a4354b2..b94cf75 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/abstractimpl/AbstractBlurDatabaseMetaData.java
@@ -28,9 +28,9 @@ import java.sql.SQLException;
 import org.apache.blur.jdbc.util.NotImplemented;
 
 /**
- * This DatabaseMetaData implementation is simply to provide the major of the method
- * implementations that only throw not implemented exceptions. That way it's
- * easier to see what has been implemented in the real class.
+ * This DatabaseMetaData implementation is simply to provide the major of the
+ * method implementations that only throw not implemented exceptions. That way
+ * it's easier to see what has been implemented in the real class.
  */
 public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData {
 
@@ -760,12 +760,12 @@ public abstract class AbstractBlurDatabaseMetaData implements DatabaseMetaData
{
 
   // 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();
-//  }
+  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();
+  }
 }


Mime
View raw message