You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/11/30 23:13:39 UTC
[1/2] phoenix git commit: PHOENIX-2461 Reverting Tweak shutdown of
ConnectionQueryService during testing
Repository: phoenix
Updated Branches:
refs/heads/master 3eb17d43f -> 21e7c7dd2
PHOENIX-2461 Reverting Tweak shutdown of ConnectionQueryService during testing
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/bf7187c6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bf7187c6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bf7187c6
Branch: refs/heads/master
Commit: bf7187c63c84bdb7d59c47f5625a94a14322a133
Parents: 3eb17d4
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Nov 30 11:58:21 2015 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Nov 30 11:58:21 2015 -0800
----------------------------------------------------------------------
.../phoenix/end2end/ConnectionQueryServicesTestImpl.java | 9 +--------
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 3 +--
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf7187c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index d3b3f8a..2028223 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -63,14 +63,7 @@ public class ConnectionQueryServicesTestImpl extends ConnectionQueryServicesImpl
try {
clearCache();
} finally {
- try {
- // Since ConnectionQueryServicesTestImpl is a singleton
- // during testing, attempt to stop the Zookeeper client
- // service when the driver is closed.
- // if (zkClientService != null) zkClientService.stopAndWait();
- } finally {
- super.close();
- }
+ super.close();
}
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf7187c6/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 7e1aee0..17df42d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -220,7 +220,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
private HConnection connection;
private TransactionServiceClient txServiceClient;
- protected volatile ZKClientService zkClientService;
private volatile boolean initialized;
private volatile int nSequenceSaltBuckets;
@@ -306,7 +305,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
private void initTxServiceClient() {
String zkQuorumServersString = connectionInfo.getZookeeperQuorum()+":"+connectionInfo.getPort();
- zkClientService = ZKClientServices.delegate(
+ ZKClientService zkClientService = ZKClientServices.delegate(
ZKClients.reWatchOnExpire(
ZKClients.retryOnFailure(
ZKClientService.Builder.of(zkQuorumServersString)
[2/2] phoenix git commit: PHOENIX-2465 Upgrade ANTLR version to
correct generation (Gabor Liptak)
Posted by ja...@apache.org.
PHOENIX-2465 Upgrade ANTLR version to correct generation (Gabor Liptak)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/21e7c7dd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/21e7c7dd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/21e7c7dd
Branch: refs/heads/master
Commit: 21e7c7dd20f19e3f2d30387d472940983bf50d02
Parents: bf7187c
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Nov 30 14:10:34 2015 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Nov 30 14:10:34 2015 -0800
----------------------------------------------------------------------
phoenix-core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/21e7c7dd/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 5c73ed4..d003e8a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
- <version>3.5</version>
+ <version>3.5.2</version>
<executions>
<execution>
<goals>