You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/06/17 19:23:37 UTC
phoenix git commit: PHOENIX-2276 Addednum2 to fix test failures
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 eedeaf6d7 -> ac63502e0
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/ac63502e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ac63502e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ac63502e
Branch: refs/heads/4.x-HBase-0.98
Commit: ac63502e05eb42719a488f4d0e43c8a0161aafb0
Parents: eedeaf6
Author: Samarth <sa...@salesforce.com>
Authored: Fri Jun 17 12:23:29 2016 -0700
Committer: Samarth <sa...@salesforce.com>
Committed: Fri Jun 17 12:23:29 2016 -0700
----------------------------------------------------------------------
.../it/java/org/apache/phoenix/end2end/AggregateQueryIT.java | 2 --
.../src/main/java/org/apache/phoenix/iterate/ExplainTable.java | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac63502e/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/ac63502e/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 8a74a6d..f6082c1 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
@@ -285,9 +285,9 @@ 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) {
+ //&& ((context.getConnection().getTenantId() != null && i == 0) || (context
+ // .getConnection().getTenantId() == null && i == 1))) {
appendPKColumnValue(buf, b, isNull, i, true);
} else {
appendPKColumnValue(buf, b, isNull, i, false);