phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject phoenix git commit: Fix PhoenixCalciteFactory for Avatica 1.10.0-SNAPSHOT
Date Tue, 09 May 2017 09:46:51 GMT
Repository: phoenix
Updated Branches:
  refs/heads/calcite bcb2d59e8 -> 40d677256


Fix PhoenixCalciteFactory for Avatica 1.10.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/40d67725
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/40d67725
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/40d67725

Branch: refs/heads/calcite
Commit: 40d6772561bb029c28afb1a0674125aab6d31645
Parents: bcb2d59
Author: Ankit Singhal <ankitsinghal59@gmail.com>
Authored: Tue May 9 15:16:32 2017 +0530
Committer: Ankit Singhal <ankitsinghal59@gmail.com>
Committed: Tue May 9 15:16:32 2017 +0530

----------------------------------------------------------------------
 .../calcite/jdbc/PhoenixCalciteFactory.java     | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/40d67725/phoenix-core/src/main/java/org/apache/calcite/jdbc/PhoenixCalciteFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/calcite/jdbc/PhoenixCalciteFactory.java
b/phoenix-core/src/main/java/org/apache/calcite/jdbc/PhoenixCalciteFactory.java
index 7fc949c..ff499ca 100644
--- a/phoenix-core/src/main/java/org/apache/calcite/jdbc/PhoenixCalciteFactory.java
+++ b/phoenix-core/src/main/java/org/apache/calcite/jdbc/PhoenixCalciteFactory.java
@@ -6,13 +6,13 @@ import java.io.Reader;
 import java.sql.DatabaseMetaData;
 import java.sql.Date;
 import java.sql.NClob;
+import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLXML;
 import java.sql.Savepoint;
-import java.sql.ResultSet;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +31,8 @@ import org.apache.calcite.avatica.AvaticaStatement;
 import org.apache.calcite.avatica.Meta;
 import org.apache.calcite.avatica.Meta.Signature;
 import org.apache.calcite.avatica.Meta.StatementHandle;
+import org.apache.calcite.avatica.QueryState;
+import org.apache.calcite.avatica.UnregisteredDriver;
 import org.apache.calcite.avatica.remote.AvaticaHttpClientFactory;
 import org.apache.calcite.avatica.remote.Service.Factory;
 import org.apache.calcite.avatica.remote.TypedValue;
@@ -39,11 +41,6 @@ import org.apache.calcite.avatica.util.Quoting;
 import org.apache.calcite.config.CalciteConnectionConfig;
 import org.apache.calcite.config.Lex;
 import org.apache.calcite.config.NullCollation;
-import org.apache.calcite.avatica.QueryState;
-import org.apache.calcite.avatica.UnregisteredDriver;
-import org.apache.calcite.jdbc.CalciteConnectionImpl;
-import org.apache.calcite.jdbc.CalciteFactory;
-import org.apache.calcite.jdbc.Driver;
 import org.apache.calcite.linq4j.Enumerable;
 import org.apache.calcite.linq4j.Ord;
 import org.apache.calcite.model.JsonSchema.Type;
@@ -128,7 +125,7 @@ public class PhoenixCalciteFactory extends CalciteFactory {
     private static class PhoenixCalciteConnection extends CalciteConnectionImpl {
         private final Map<Meta.StatementHandle, ImmutableList<RuntimeContext>>
runtimeContextMap =
                 new ConcurrentHashMap<Meta.StatementHandle, ImmutableList<RuntimeContext>>();
-        
+
         public PhoenixCalciteConnection(Driver driver, AvaticaFactory factory, String url,
                 Properties info, final CalciteSchema rootSchema,
                 JavaTypeFactory typeFactory) {
@@ -732,5 +729,15 @@ public class PhoenixCalciteFactory extends CalciteFactory {
         public boolean approximateDecimal() {
             return delegate.approximateDecimal();
         }
+
+        @Override
+        public File truststore() {
+            return delegate.truststore();
+        }
+
+        @Override
+        public String truststorePassword() {
+            return delegate.truststorePassword();
+        }
     }
 }


Mime
View raw message