phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sama...@apache.org
Subject phoenix git commit: PHOENIX-2276 Addednum2 to fix test failures
Date Fri, 17 Jun 2016 19:30:58 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 365133c18 -> 52a40f3bf


PHOENIX-2276 Addednum2 to fix test failures


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 52a40f3bfd13a45f26d25651c7f81333590b80ea
Parents: 365133c
Author: Samarth <samarth.jain@salesforce.com>
Authored: Fri Jun 17 12:30:50 2016 -0700
Committer: Samarth <samarth.jain@salesforce.com>
Committed: Fri Jun 17 12:30:50 2016 -0700

----------------------------------------------------------------------
 .../src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java | 2 --
 .../src/main/java/org/apache/phoenix/iterate/ExplainTable.java   | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/52a40f3b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
index b92e8b8..f23b5eb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
@@ -36,13 +36,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.util.ByteUtil;
-import org.apache.phoenix.util.MetaDataUtil;
 import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/52a40f3b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
index 73d1cea..96e4d81 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
@@ -289,9 +289,7 @@ public abstract class ExplainTable {
                     minMaxIterator = Iterators.emptyIterator();
                 }
             }
-            if (isLocalIndex
-                    && ((context.getConnection().getTenantId() != null &&
i == 0) || (context
-                            .getConnection().getTenantId() == null && i == 1))) {
+            if (isLocalIndex && i == 0) {
                 appendPKColumnValue(buf, b, isNull, i, true);
             } else {
                 appendPKColumnValue(buf, b, isNull, i, false);


Mime
View raw message