Repository: phoenix Updated Branches: refs/heads/encodecolumns2 0feac8a86 -> 8d91690d3
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/8d91690d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8d91690d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8d91690d Branch: refs/heads/encodecolumns2 Commit: 8d91690d37b72cf69d48eee6a7c3f390b5aad7da Parents: 0feac8a Author: Samarth <[email protected]> Authored: Sat Feb 25 00:24:37 2017 -0800 Committer: Samarth <[email protected]> Committed: Sat Feb 25 00:24:37 2017 -0800 ---------------------------------------------------------------------- .../it/java/org/apache/phoenix/end2end/AlterTableIT.java | 2 +- .../it/java/org/apache/phoenix/end2end/CreateTableIT.java | 8 ++++---- .../phoenix/compile/SelectStatementRewriterTest.java | 6 +++--- .../org/apache/phoenix/compile/WhereCompilerTest.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d91690d/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java index 5a2ae2e..15f60df 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java @@ -2511,7 +2511,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT { ResultSet rs = stmt.executeQuery(); assertTrue(rs.next()); if (columnEncoded) { - assertTrue(Bytes.equals(QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS.encode(expectedValue), rs.getBytes(1))); + assertTrue(Bytes.equals(QualifierEncodingScheme.TWO_BYTE_QUALIFIERS.encode(expectedValue), rs.getBytes(1))); } else { assertTrue(Bytes.equals(columnName.getBytes(), rs.getBytes(1))); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d91690d/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java index 16f6687..633d93c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java @@ -522,7 +522,7 @@ public class CreateTableIT extends BaseClientManagedTimeIT { String createTableDDL = "CREATE TABLE IF NOT EXISTS " + tableName + " (pk INTEGER PRIMARY KEY)"; try (Connection conn = DriverManager.getConnection(getUrl(), props)) { conn.createStatement().execute(createTableDDL); - assertColumnEncodingMetadata(QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); + assertColumnEncodingMetadata(QualifierEncodingScheme.TWO_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); } // Execute the ddl again props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(nextTimestamp())); @@ -530,7 +530,7 @@ public class CreateTableIT extends BaseClientManagedTimeIT { conn.createStatement().execute(createTableDDL); ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + tableName); assertFalse(rs.next()); - assertColumnEncodingMetadata(QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); + assertColumnEncodingMetadata(QualifierEncodingScheme.TWO_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); } // Now execute the ddl with a different COLUMN_ENCODED_BYTES. This shouldn't change the original encoded bytes setting. props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(nextTimestamp())); @@ -538,7 +538,7 @@ public class CreateTableIT extends BaseClientManagedTimeIT { conn.createStatement().execute(createTableDDL + " COLUMN_ENCODED_BYTES = 1"); ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + tableName); assertFalse(rs.next()); - assertColumnEncodingMetadata(QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); + assertColumnEncodingMetadata(QualifierEncodingScheme.TWO_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); } // Now execute the ddl where COLUMN_ENCODED_BYTES=0. This shouldn't change the original encoded bytes setting. props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(nextTimestamp())); @@ -546,7 +546,7 @@ public class CreateTableIT extends BaseClientManagedTimeIT { conn.createStatement().execute(createTableDDL + " COLUMN_ENCODED_BYTES = 0"); ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + tableName); assertFalse(rs.next()); - assertColumnEncodingMetadata(QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); + assertColumnEncodingMetadata(QualifierEncodingScheme.TWO_BYTE_QUALIFIERS, ImmutableStorageScheme.ONE_CELL_PER_COLUMN, tableName, conn); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d91690d/phoenix-core/src/test/java/org/apache/phoenix/compile/SelectStatementRewriterTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/SelectStatementRewriterTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/SelectStatementRewriterTest.java index 9da5d9d..0f31c2d 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/SelectStatementRewriterTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/SelectStatementRewriterTest.java @@ -17,7 +17,7 @@ */ package org.apache.phoenix.compile; -import static org.apache.phoenix.schema.PTable.QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS; +import static org.apache.phoenix.schema.PTable.QualifierEncodingScheme.TWO_BYTE_QUALIFIERS; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.apache.phoenix.util.TestUtil.and; import static org.apache.phoenix.util.TestUtil.constantComparison; @@ -87,7 +87,7 @@ public class SelectStatementRewriterTest extends BaseConnectionlessQueryTest { constantComparison( CompareOp.EQUAL, A_STRING, "foo") - ), FOUR_BYTE_QUALIFIERS), + ), TWO_BYTE_QUALIFIERS), filter); } @@ -111,7 +111,7 @@ public class SelectStatementRewriterTest extends BaseConnectionlessQueryTest { constantComparison( CompareOp.EQUAL, A_STRING, "foo") - ), FOUR_BYTE_QUALIFIERS), + ), TWO_BYTE_QUALIFIERS), filter); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d91690d/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java index 303f8dd..8506f93 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java @@ -17,7 +17,7 @@ */ package org.apache.phoenix.compile; -import static org.apache.phoenix.schema.PTable.QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS; +import static org.apache.phoenix.schema.PTable.QualifierEncodingScheme.TWO_BYTE_QUALIFIERS; import static org.apache.phoenix.util.TestUtil.ATABLE_NAME; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.apache.phoenix.util.TestUtil.and; @@ -266,7 +266,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { multiEncodedKVFilter(columnComparison( CompareOp.EQUAL, A_STRING, - B_STRING), FOUR_BYTE_QUALIFIERS), + B_STRING), TWO_BYTE_QUALIFIERS), filter); } @@ -306,7 +306,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { constantComparison( CompareOp.EQUAL, A_STRING, - "foo")), FOUR_BYTE_QUALIFIERS), + "foo")), TWO_BYTE_QUALIFIERS), filter); } @@ -953,7 +953,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { constantComparison( CompareOp.EQUAL, aString, - "foo")), FOUR_BYTE_QUALIFIERS), + "foo")), TWO_BYTE_QUALIFIERS), filter); byte[] startRow = PVarchar.INSTANCE.toBytes(tenantId + tenantTypeId); @@ -987,7 +987,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { constantComparison( CompareOp.EQUAL, aString, - "foo")), FOUR_BYTE_QUALIFIERS), + "foo")), TWO_BYTE_QUALIFIERS), filter); byte[] startRow = PVarchar.INSTANCE.toBytes(tenantId);
