git commit: PHOENIX-1125 SQLException when connection string is of form jdbc:phoenix:localhost:1234:userName
Repository: phoenix
Updated Branches:
refs/heads/3.0 2df0594ff - af2f98123
PHOENIX-1125 SQLException when connection string is of form
jdbc:phoenix:localhost:1234:userName
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/af2f9812
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/af2f9812
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/af2f9812
Branch: refs/heads/3.0
Commit: af2f981239c5b0d8387d31ec0a291fced2a3edc9
Parents: 2df0594
Author: James Taylor jtay...@salesforce.com
Authored: Sun Jul 27 16:54:00 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Jul 27 16:54:00 2014 -0700
--
.../apache/phoenix/jdbc/PhoenixConnection.java | 22 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 4 +-
.../org/apache/phoenix/jdbc/PhoenixDriver.java | 4 +-
.../phoenix/jdbc/PhoenixEmbeddedDriver.java | 160 +++---
.../phoenix/query/BaseQueryServicesImpl.java| 4 +-
.../phoenix/query/ConnectionQueryServices.java | 2 +
.../query/ConnectionQueryServicesImpl.java | 7 +
.../query/ConnectionlessQueryServicesImpl.java | 10 +-
.../query/DelegateConnectionQueryServices.java | 5 +
.../apache/phoenix/query/QueryServicesImpl.java | 6 +-
.../phoenix/query/QueryServicesOptions.java | 4 +-
.../org/apache/phoenix/util/ReadOnlyProps.java | 21 +-
.../phoenix/jdbc/PhoenixEmbeddedDriverTest.java | 37 ++--
.../apache/phoenix/jdbc/PhoenixTestDriver.java | 6 +-
.../java/org/apache/phoenix/query/BaseTest.java | 4 +-
.../phoenix/query/ConnectionlessTest.java | 218 +++
.../phoenix/query/ConnectionlessUpsertTest.java | 182
.../phoenix/query/QueryServicesTestImpl.java| 10 +-
pom.xml | 4 +-
19 files changed, 404 insertions(+), 306 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/af2f9812/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index 4209c0f..e712819 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -41,7 +41,12 @@ import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Struct;
import java.text.Format;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
@@ -132,7 +137,6 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
this.isAutoCommit = connection.isAutoCommit;
}
-@SuppressWarnings(unchecked)
public PhoenixConnection(ConnectionQueryServices services, String url,
Properties info, PMetaData metaData) throws SQLException {
this.url = url;
// Copy so client cannot change
@@ -149,11 +153,17 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
// TODO: we could avoid creating another wrapper if the only
property
// specified was for the tenant ID
MapString, String existingProps = services.getProps().asMap();
-MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
+final MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
tmpAugmentedProps.putAll(existingProps);
-tmpAugmentedProps.putAll((Map)this.info);
-final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
-this.services = new DelegateConnectionQueryServices(services) {
+boolean needsDelegate = false;
+for (EntryObject, Object entry : this.info.entrySet()) {
+String key = entry.getKey().toString();
+String value = entry.getValue().toString();
+String oldValue = tmpAugmentedProps.put(key, value);
+needsDelegate |= !Objects.equal(oldValue, value);
+}
+this.services = !needsDelegate ? services : new
DelegateConnectionQueryServices(services) {
+final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
@Override
public ReadOnlyProps getProps() {
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
3.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1125 SQLException when connection string is of form jdbc:phoenix:localhost:1234:userName
git commit: PHOENIX-1125 SQLException when connection string is of form jdbc:phoenix:localhost:1234:userName
Repository: phoenix
Updated Branches:
refs/heads/4.0 4cced1bf4 - 57189d4d7
PHOENIX-1125 SQLException when connection string is of form
jdbc:phoenix:localhost:1234:userName
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/57189d4d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/57189d4d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/57189d4d
Branch: refs/heads/4.0
Commit: 57189d4d728f40d5c08781e9ed2d13c95a3649f5
Parents: 4cced1b
Author: James Taylor jtay...@salesforce.com
Authored: Sun Jul 27 16:54:00 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Jul 27 17:28:46 2014 -0700
--
.../apache/phoenix/jdbc/PhoenixConnection.java | 22 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 4 +-
.../org/apache/phoenix/jdbc/PhoenixDriver.java | 4 +-
.../phoenix/jdbc/PhoenixEmbeddedDriver.java | 160 --
.../phoenix/query/BaseQueryServicesImpl.java| 4 +-
.../phoenix/query/ConnectionQueryServices.java | 2 +
.../query/ConnectionQueryServicesImpl.java | 7 +
.../query/ConnectionlessQueryServicesImpl.java | 10 +-
.../query/DelegateConnectionQueryServices.java | 5 +
.../apache/phoenix/query/QueryServicesImpl.java | 6 +-
.../phoenix/query/QueryServicesOptions.java | 4 +-
.../org/apache/phoenix/util/ReadOnlyProps.java | 21 +-
.../phoenix/jdbc/PhoenixEmbeddedDriverTest.java | 37 ++--
.../apache/phoenix/jdbc/PhoenixTestDriver.java | 6 +-
.../java/org/apache/phoenix/query/BaseTest.java | 4 +-
.../phoenix/query/ConnectionlessTest.java | 220 +++
.../phoenix/query/ConnectionlessUpsertTest.java | 183 ---
.../phoenix/query/QueryServicesTestImpl.java| 10 +-
pom.xml | 6 +-
19 files changed, 407 insertions(+), 308 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/57189d4d/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index 2368211..609c2ba 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -41,7 +41,12 @@ import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Struct;
import java.text.Format;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
@@ -131,7 +136,6 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
this.isAutoCommit = connection.isAutoCommit;
}
-@SuppressWarnings(unchecked)
public PhoenixConnection(ConnectionQueryServices services, String url,
Properties info, PMetaData metaData) throws SQLException {
this.url = url;
// Copy so client cannot change
@@ -148,11 +152,17 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
// TODO: we could avoid creating another wrapper if the only
property
// specified was for the tenant ID
MapString, String existingProps = services.getProps().asMap();
-MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
+final MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
tmpAugmentedProps.putAll(existingProps);
-tmpAugmentedProps.putAll((Map)this.info);
-final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
-this.services = new DelegateConnectionQueryServices(services) {
+boolean needsDelegate = false;
+for (EntryObject, Object entry : this.info.entrySet()) {
+String key = entry.getKey().toString();
+String value = entry.getValue().toString();
+String oldValue = tmpAugmentedProps.put(key, value);
+needsDelegate |= !Objects.equal(oldValue, value);
+}
+this.services = !needsDelegate ? services : new
DelegateConnectionQueryServices(services) {
+final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
@Override
public ReadOnlyProps getProps() {
git commit: PHOENIX-1125 SQLException when connection string is of form jdbc:phoenix:localhost:1234:userName
Repository: phoenix
Updated Branches:
refs/heads/master caa3ec09b - 9185f760b
PHOENIX-1125 SQLException when connection string is of form
jdbc:phoenix:localhost:1234:userName
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9185f760
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9185f760
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9185f760
Branch: refs/heads/master
Commit: 9185f760b73cf0dd73b4d3da571eba79a823bf89
Parents: caa3ec0
Author: James Taylor jtay...@salesforce.com
Authored: Sun Jul 27 16:54:00 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Jul 27 17:33:13 2014 -0700
--
.../apache/phoenix/jdbc/PhoenixConnection.java | 22 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 4 +-
.../org/apache/phoenix/jdbc/PhoenixDriver.java | 4 +-
.../phoenix/jdbc/PhoenixEmbeddedDriver.java | 160 +++---
.../phoenix/query/BaseQueryServicesImpl.java| 4 +-
.../phoenix/query/ConnectionQueryServices.java | 2 +
.../query/ConnectionQueryServicesImpl.java | 7 +
.../query/ConnectionlessQueryServicesImpl.java | 10 +-
.../query/DelegateConnectionQueryServices.java | 5 +
.../apache/phoenix/query/QueryServicesImpl.java | 6 +-
.../phoenix/query/QueryServicesOptions.java | 4 +-
.../org/apache/phoenix/util/ReadOnlyProps.java | 21 +-
.../phoenix/jdbc/PhoenixEmbeddedDriverTest.java | 37 ++--
.../apache/phoenix/jdbc/PhoenixTestDriver.java | 6 +-
.../java/org/apache/phoenix/query/BaseTest.java | 4 +-
.../phoenix/query/ConnectionlessTest.java | 218 +++
.../phoenix/query/ConnectionlessUpsertTest.java | 182
.../phoenix/query/QueryServicesTestImpl.java| 10 +-
pom.xml | 8 +-
19 files changed, 406 insertions(+), 308 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9185f760/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index 2368211..609c2ba 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -41,7 +41,12 @@ import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Struct;
import java.text.Format;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
@@ -131,7 +136,6 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
this.isAutoCommit = connection.isAutoCommit;
}
-@SuppressWarnings(unchecked)
public PhoenixConnection(ConnectionQueryServices services, String url,
Properties info, PMetaData metaData) throws SQLException {
this.url = url;
// Copy so client cannot change
@@ -148,11 +152,17 @@ public class PhoenixConnection implements Connection,
org.apache.phoenix.jdbc.Jd
// TODO: we could avoid creating another wrapper if the only
property
// specified was for the tenant ID
MapString, String existingProps = services.getProps().asMap();
-MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
+final MapString, String tmpAugmentedProps =
Maps.newHashMapWithExpectedSize(existingProps.size() + info.size());
tmpAugmentedProps.putAll(existingProps);
-tmpAugmentedProps.putAll((Map)this.info);
-final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
-this.services = new DelegateConnectionQueryServices(services) {
+boolean needsDelegate = false;
+for (EntryObject, Object entry : this.info.entrySet()) {
+String key = entry.getKey().toString();
+String value = entry.getValue().toString();
+String oldValue = tmpAugmentedProps.put(key, value);
+needsDelegate |= !Objects.equal(oldValue, value);
+}
+this.services = !needsDelegate ? services : new
DelegateConnectionQueryServices(services) {
+final ReadOnlyProps augmentedProps = new
ReadOnlyProps(tmpAugmentedProps);
@Override
public ReadOnlyProps getProps() {
git commit: Update minor version number in preparation for release
Repository: phoenix
Updated Branches:
refs/heads/3.0 af2f98123 - 3640902c3
Update minor version number in preparation for release
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3640902c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3640902c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3640902c
Branch: refs/heads/3.0
Commit: 3640902c3f94b33af72564053f39cf6bd7d80e84
Parents: af2f981
Author: James Taylor jtay...@salesforce.com
Authored: Sun Jul 27 17:47:14 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Jul 27 17:47:14 2014 -0700
--
.../main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3640902c/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 7e2e5a9..cd4bd5e 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -56,7 +56,7 @@ import com.google.common.collect.Lists;
*/
public interface MetaDataProtocol extends CoprocessorProtocol {
public static final int PHOENIX_MAJOR_VERSION = 3;
-public static final int PHOENIX_MINOR_VERSION = 0;
+public static final int PHOENIX_MINOR_VERSION = 1;
public static final int PHOENIX_PATCH_NUMBER = 0;
public static final int PHOENIX_VERSION =
VersionUtil.encodeVersion(PHOENIX_MAJOR_VERSION,
PHOENIX_MINOR_VERSION, PHOENIX_PATCH_NUMBER);
git commit: Update minor version number in preparation for release
Repository: phoenix
Updated Branches:
refs/heads/4.0 57189d4d7 - a248a4d4a
Update minor version number in preparation for release
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a248a4d4
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a248a4d4
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a248a4d4
Branch: refs/heads/4.0
Commit: a248a4d4ab6f8970faf255cc452747ec11860ca8
Parents: 57189d4
Author: James Taylor jtay...@salesforce.com
Authored: Sun Jul 27 17:48:14 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Jul 27 17:48:14 2014 -0700
--
.../java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a248a4d4/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index ac93804..99bfaeb 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -31,7 +31,6 @@ import org.apache.phoenix.util.ByteUtil;
import com.google.common.collect.Lists;
import com.google.protobuf.ByteString;
-import com.google.protobuf.HBaseZeroCopyByteString;
/**
@@ -53,7 +52,7 @@ import com.google.protobuf.HBaseZeroCopyByteString;
*/
public abstract class MetaDataProtocol extends MetaDataService {
public static final int PHOENIX_MAJOR_VERSION = 4;
-public static final int PHOENIX_MINOR_VERSION = 0;
+public static final int PHOENIX_MINOR_VERSION = 1;
public static final int PHOENIX_PATCH_NUMBER = 0;
public static final int PHOENIX_VERSION =
VersionUtil.encodeVersion(PHOENIX_MAJOR_VERSION,
PHOENIX_MINOR_VERSION, PHOENIX_PATCH_NUMBER);
Apache-Phoenix | 4.0 | Hadoop1 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1125 SQLException when connection string is of form jdbc:phoenix:localhost:1234:userName
Jenkins build is back to normal : Phoenix | 4.0 | Hadoop1 #232
See https://builds.apache.org/job/Phoenix-4.0-hadoop1/232/changes
