Repository: phoenix Updated Branches: refs/heads/master f956a736b -> 8daa52c47
PHOENIX-1682 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/8daa52c4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8daa52c4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8daa52c4 Branch: refs/heads/master Commit: 8daa52c47fdc0301eac33235c2f7d145d103b1d0 Parents: f956a73 Author: Eli Levine <elilev...@apache.org> Authored: Wed Apr 22 15:32:44 2015 -0700 Committer: Eli Levine <elilev...@apache.org> Committed: Wed Apr 22 15:32:44 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/8daa52c4/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]); }
