You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ra...@apache.org on 2018/04/07 03:57:09 UTC
phoenix git commit: PHOENIX-672 Add GRANT and REVOKE commands using
HBase AccessController-addendum
Repository: phoenix
Updated Branches:
refs/heads/5.x-HBase-2.0 6521c87a0 -> 1e9099106
PHOENIX-672 Add GRANT and REVOKE commands using HBase AccessController-addendum
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1e909910
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1e909910
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1e909910
Branch: refs/heads/5.x-HBase-2.0
Commit: 1e90991066d12517d4cf2fea3d47be5f6c358f25
Parents: 6521c87
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Sat Apr 7 09:26:52 2018 +0530
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Sat Apr 7 09:26:52 2018 +0530
----------------------------------------------------------------------
.../org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java | 2 +-
.../src/main/java/org/apache/phoenix/util/MetaDataUtil.java | 2 +-
phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java | 2 +-
pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e909910/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
index d930d08..3984048 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
@@ -103,7 +103,7 @@ import com.google.common.collect.Maps;
* @since 0.1
*/
public class ConnectionlessQueryServicesImpl extends DelegateQueryServices implements ConnectionQueryServices {
- private static ServerName SERVER_NAME = ServerName.parseServerName(HConstants.LOCALHOST + Addressing.HOSTNAME_PORT_SEPARATOR + HConstants.DEFAULT_ZOOKEEPER_CLIENT_PORT);
+ private static ServerName SERVER_NAME = ServerName.parseServerName(HConstants.LOCALHOST + Addressing.HOSTNAME_PORT_SEPARATOR + HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT);
private PMetaData metaData;
private final Map<SequenceKey, SequenceInfo> sequenceMap = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e909910/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java
index 0eb44e3..e31d9ab 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java
@@ -643,7 +643,7 @@ public class MetaDataUtil {
public static String getJdbcUrl(RegionCoprocessorEnvironment env) {
String zkQuorum = env.getConfiguration().get(HConstants.ZOOKEEPER_QUORUM);
String zkClientPort = env.getConfiguration().get(HConstants.ZOOKEEPER_CLIENT_PORT,
- Integer.toString(HConstants.DEFAULT_ZOOKEEPER_CLIENT_PORT));
+ Integer.toString(HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT));
String zkParentNode = env.getConfiguration().get(HConstants.ZOOKEEPER_ZNODE_PARENT,
HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
return PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e909910/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 9295289..d7154a1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -400,7 +400,7 @@ public final class QueryUtil {
public static String getConnectionUrl(Properties props, Configuration conf, String principal)
throws ClassNotFoundException, SQLException {
// read the hbase properties from the configuration
- int port = getInt(HConstants.ZOOKEEPER_CLIENT_PORT, HConstants.DEFAULT_ZOOKEEPER_CLIENT_PORT, props, conf);
+ int port = getInt(HConstants.ZOOKEEPER_CLIENT_PORT, HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT, props, conf);
// Build the ZK quorum server string with "server:clientport" list, separated by ','
final String server = getString(HConstants.ZOOKEEPER_QUORUM, HConstants.LOCALHOST, props, conf);
String znodeParent = getString(HConstants.ZOOKEEPER_ZNODE_PARENT, HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT, props, conf);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e909910/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e4ed97..1ab0080 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<top.dir>${project.basedir}</top.dir>
<!-- Hadoop Versions -->
- <hbase.version>2.1.0-SNAPSHOT</hbase.version>
+ <hbase.version>2.0.0</hbase.version>
<hadoop.version>3.0.0</hadoop.version>
<!-- Dependency versions -->