You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2015/04/23 00:28:00 UTC
[1/2] phoenix git commit: Fix QueryMoreIT failures (Ivan Weiss)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 c00c03700 -> 3a723832c
Fix QueryMoreIT failures (Ivan Weiss)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/df6f8f87
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/df6f8f87
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/df6f8f87
Branch: refs/heads/4.x-HBase-0.98
Commit: df6f8f87f8c6e9b59ca64d25ca8c12f793a4f6a1
Parents: 4d957ee
Author: Eli Levine <el...@apache.org>
Authored: Wed Apr 22 15:25:32 2015 -0700
Committer: Eli Levine <el...@apache.org>
Committed: Wed Apr 22 15:25:32 2015 -0700
----------------------------------------------------------------------
.../src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/df6f8f87/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index e725376..a29cb0e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -104,7 +104,7 @@ public class QueryMoreIT extends BaseHBaseManagedTimeIT {
// assert query more for tenantId -> tenantIds[0]
String tenantId = tenantIds[0];
String cursorQueryId = "00TcursrqueryId";
- String tableOrViewName = queryAgainstTenantSpecificView ? ("\"HISTORY_TABLE" + "_" + tenantId + "\"") : dataTableName;
+ String tableOrViewName = queryAgainstTenantSpecificView ? ("HISTORY_TABLE_" + tenantId) : dataTableName;
assertEquals(numRowsPerTenant, upsertSelectRecordsInCursorTableForTenant(tableOrViewName, queryAgainstTenantSpecificView, tenantId, cursorQueryId));
@@ -265,7 +265,7 @@ public class QueryMoreIT extends BaseHBaseManagedTimeIT {
values[i] = rs.getObject(i + 1);
}
conn = getTenantSpecificConnection(tenantId);
- pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeValues(conn, tableOrViewName, values, columns)));
+ pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeValues(conn, tableOrViewName.toUpperCase(), values, columns)));
}
return pkIds.toArray(new String[pkIds.size()]);
}
@@ -283,7 +283,7 @@ public class QueryMoreIT extends BaseHBaseManagedTimeIT {
PreparedStatement stmt = conn.prepareStatement(query);
int bindCounter = 1;
for (int i = 0; i < cursorIds.length; i++) {
- Object[] pkParts = PhoenixRuntime.decodeValues(conn, tableName, Base64.decode(cursorIds[i]), columns);
+ Object[] pkParts = PhoenixRuntime.decodeValues(conn, tableName.toUpperCase(), Base64.decode(cursorIds[i]), columns);
for (int j = 0; j < pkParts.length; j++) {
stmt.setObject(bindCounter++, pkParts[j]);
}
[2/2] phoenix git commit: Merge branch '4.x-HBase-0.98' of
https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-0.98
Posted by el...@apache.org.
Merge branch '4.x-HBase-0.98' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-0.98
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3a723832
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3a723832
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3a723832
Branch: refs/heads/4.x-HBase-0.98
Commit: 3a723832ca6e2aacfdd2c94e9e1138c4956f18c6
Parents: df6f8f8 c00c037
Author: Eli Levine <el...@apache.org>
Authored: Wed Apr 22 15:27:54 2015 -0700
Committer: Eli Levine <el...@apache.org>
Committed: Wed Apr 22 15:27:54 2015 -0700
----------------------------------------------------------------------
.../phoenix/end2end/ToDateFunctionIT.java | 46 ++++++++++++++------
1 file changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------