[43/50] [abbrv] phoenix git commit: fix test failures
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/0f58bc92 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0f58bc92 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0f58bc92 Branch: refs/heads/system-catalog Commit: 0f58bc92db3c6101361b6a9b6cffaf340865a856 Parents: f8ce60c Author: Thomas D'Silva Authored: Fri Apr 27 10:16:28 2018 -0700 Committer: Thomas D'Silva Committed: Fri Apr 27 10:16:28 2018 -0700 -- .../MigrateSystemTablesToSystemNamespaceIT.java | 2 +- .../SystemCatalogCreationOnConnectionIT.java| 34 +--- .../org/apache/phoenix/schema/PTableImpl.java | 2 +- .../org/apache/phoenix/util/UpgradeUtil.java| 3 ++ 4 files changed, 28 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0f58bc92/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java index 7960543..a4350ef 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MigrateSystemTablesToSystemNamespaceIT.java @@ -63,7 +63,7 @@ public class MigrateSystemTablesToSystemNamespaceIT extends BaseTest { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", -"SYSTEM.MUTEX","SYSTEM.LOG")); +"SYSTEM.MUTEX","SYSTEM.LOG", "SYSTEM.CHILD_LINK")); private static final Set PHOENIX_NAMESPACE_MAPPED_SYSTEM_TABLES = new HashSet<>( Arrays.asList("SYSTEM:CATALOG", "SYSTEM:SEQUENCE", "SYSTEM:STATS", "SYSTEM:FUNCTION", "SYSTEM:MUTEX","SYSTEM:LOG", "SYSTEM:CHILD_LINK")); http://git-wip-us.apache.org/repos/asf/phoenix/blob/0f58bc92/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java index 689eb20..aa2d971 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogCreationOnConnectionIT.java @@ -17,6 +17,22 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeoutException; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; @@ -28,7 +44,11 @@ import org.apache.phoenix.exception.UpgradeRequiredException; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver; import org.apache.phoenix.jdbc.PhoenixTestDriver; -import org.apache.phoenix.query.*; +import org.apache.phoenix.query.ConnectionQueryServices; +import org.apache.phoenix.query.ConnectionQueryServicesImpl; +import org.apache.phoenix.query.QueryConstants; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.query.QueryServicesTestImpl; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.UpgradeUtil; import org.junit.After; @@ -36,14 +56,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.IOException; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.*; -import java.util.concurrent.TimeoutException; - -import static org.junit.Assert.*; - @Category(NeedsOwnMiniClusterTest.class) public class SystemCatalogCreationOnConnectionIT { private HBaseTestingUtility testUtil = null; @@ -60,11 +72,11 @@ public class SystemCatalogCreationOnConnectionIT { private static final Set PHOENIX_SYSTEM_TABLES = new HashSet<>(Arrays.asList( "SYSTEM.CATALOG", "SYSTEM.SEQUENCE", "SYSTEM.STATS", "SYSTEM.FUNCTION", - "SYSTEM.MUTEX", "SYSTEM.LO
[35/50] [abbrv] phoenix git commit: fix test failures
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/f8ce60c0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f8ce60c0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f8ce60c0 Branch: refs/heads/system-catalog Commit: f8ce60c0655f012d01db4a863c0734475b2b2973 Parents: d615dc0 Author: Thomas D'Silva Authored: Wed Apr 25 14:45:33 2018 -0700 Committer: Thomas D'Silva Committed: Wed Apr 25 14:45:33 2018 -0700 -- .../query/ConnectionQueryServicesImpl.java | 9 +- .../query/ConnectionlessQueryServicesImpl.java | 6 +- .../apache/phoenix/query/QueryConstants.java| 406 --- .../org/apache/phoenix/schema/PTableImpl.java | 2 +- 4 files changed, 191 insertions(+), 232 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f8ce60c0/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index c453e13..45016c6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -2473,6 +2473,11 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement protected String getLogTableDDL() { return setSystemLogDDLProperties(QueryConstants.CREATE_LOG_METADATA); } + +// Available for testing +protected String getChildLinkDDL() { +return setSystemDDLProperties(QueryConstants.CREATE_CHILD_LINK_METADATA); +} private String setSystemDDLProperties(String ddl) { return String.format(ddl, @@ -2693,7 +2698,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement metaConnection.createStatement().execute(getLogTableDDL()); } catch (TableAlreadyExistsException ignore) {} try { - metaConnection.createStatement().executeUpdate(QueryConstants.CREATE_CHILD_LINK_METADATA); +metaConnection.createStatement().executeUpdate(getChildLinkDDL()); } catch (TableAlreadyExistsException e) {} // Catch the IOException to log the error message and then bubble it up for the client to retry. try { @@ -3129,7 +3134,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement metaConnection.createStatement().executeUpdate(getLogTableDDL()); } catch (NewerTableAlreadyExistsException e) {} catch (TableAlreadyExistsException e) {} try { - metaConnection.createStatement().executeUpdate(QueryConstants.CREATE_CHILD_LINK_METADATA); + metaConnection.createStatement().executeUpdate(getChildLinkDDL()); } catch (NewerTableAlreadyExistsException e) {} catch (TableAlreadyExistsException e) {} // In case namespace mapping is enabled and system table to system namespace mapping is also enabled, http://git-wip-us.apache.org/repos/asf/phoenix/blob/f8ce60c0/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java index 21f4f74..0fdf5e6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java @@ -166,6 +166,10 @@ public class ConnectionlessQueryServicesImpl extends DelegateQueryServices imple protected String getLogTableDDL() { return setSystemLogDDLProperties(QueryConstants.CREATE_LOG_METADATA); } + +protected String getChildLinkDDL() { +return setSystemDDLProperties(QueryConstants.CREATE_CHILD_LINK_METADATA); +} private String setSystemDDLProperties(String ddl) { return String.format(ddl, @@ -367,7 +371,7 @@ public class ConnectionlessQueryServicesImpl extends DelegateQueryServices imple } catch (NewerTableAlreadyExistsException ignore) {} try { metaConnection.createStatement() - .executeUpdate(QueryConstants.CREATE_CHILD_LINK_METADATA); +.executeUpdate(getChildLinkDDL()); } catch (NewerTableAlreadyExistsException ignore) {
phoenix git commit: Fix test failures
Repository: phoenix Updated Branches: refs/heads/encodecolumns2 8d91690d3 -> 8370f6ee3 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/8370f6ee Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8370f6ee Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8370f6ee Branch: refs/heads/encodecolumns2 Commit: 8370f6ee38011ddf628d955733ff0d46af4d20a4 Parents: 8d91690 Author: Samarth Authored: Sat Feb 25 13:51:23 2017 -0800 Committer: Samarth Committed: Sat Feb 25 13:51:23 2017 -0800 -- .../it/java/org/apache/phoenix/end2end/StatsCollectorIT.java | 5 + .../phoenix/coprocessor/BaseScannerRegionObserver.java | 8 +--- 2 files changed, 10 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8370f6ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java index 135bf09..040c92c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java @@ -92,6 +92,11 @@ public class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT { sb.append(","); } sb.append("COLUMN_ENCODED_BYTES=0"); +} else { +if (sb.length()>0) { +sb.append(","); +} +sb.append("COLUMN_ENCODED_BYTES=4"); } if (!mutable) { if (sb.length()>0) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/8370f6ee/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java index 6a815d4..01498ed 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java @@ -19,6 +19,7 @@ package org.apache.phoenix.coprocessor; import java.io.IOException; import java.util.List; +import java.util.ListIterator; import java.util.Set; import org.apache.hadoop.conf.Configuration; @@ -554,14 +555,15 @@ abstract public class BaseScannerRegionObserver extends BaseRegionObserver { Cell rowKv = result.get(0); for (KeyValueColumnExpression kvExp : arrayKVRefs) { if (kvExp.evaluate(tuple, ptr)) { -for (int idx = tuple.size() - 1; idx >= 0; idx--) { -Cell kv = tuple.getValue(idx); +ListIterator itr = result.listIterator(); +while (itr.hasNext()) { +Cell kv = itr.next(); if (Bytes.equals(kvExp.getColumnFamily(), 0, kvExp.getColumnFamily().length, kv.getFamilyArray(), kv.getFamilyOffset(), kv.getFamilyLength()) && Bytes.equals(kvExp.getColumnQualifier(), 0, kvExp.getColumnQualifier().length, kv.getQualifierArray(), kv.getQualifierOffset(), kv.getQualifierLength())) { // remove the kv that has the full array values. -result.remove(idx); +itr.remove(); break; } }
phoenix git commit: Fix test failures
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 Authored: Sat Feb 25 00:24:37 2017 -0800 Committer: Samarth 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 COLUM
phoenix git commit: Fix test failures in partial index rebuild tool
Repository: phoenix Updated Branches: refs/heads/encodecolumns2 b49fc0d1d -> 4044378fa Fix test failures in partial index rebuild tool Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4044378f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4044378f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4044378f Branch: refs/heads/encodecolumns2 Commit: 4044378fabc836f48d1dc0ce045c0684272dcffc Parents: b49fc0d Author: Samarth Authored: Tue Feb 14 18:43:10 2017 -0800 Committer: Samarth Committed: Tue Feb 14 18:43:10 2017 -0800 -- .../phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4044378f/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java index 47a38a7..54dc748 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/PhoenixIndexPartialBuildMapper.java @@ -113,7 +113,7 @@ public class PhoenixIndexPartialBuildMapper extends TableMapper
[37/42] phoenix git commit: Fix test failures
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/4128b563 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4128b563 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4128b563 Branch: refs/heads/encodecolumns2 Commit: 4128b5632a6fa5524155362964edf5246b8741da Parents: 3426262 Author: Samarth Authored: Tue Nov 22 22:32:42 2016 -0800 Committer: Thomas D'Silva Committed: Thu Dec 22 13:00:44 2016 -0800 -- .../org/apache/phoenix/compile/WhereCompilerTest.java | 4 ++-- .../org/apache/phoenix/execute/MutationStateTest.java | 4 ++-- .../org/apache/phoenix/query/ConnectionlessTest.java | 14 ++ 3 files changed, 10 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4128b563/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 c65408e..06c20d3 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 @@ -121,7 +121,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { Filter filter = scan.getFilter(); Expression idExpression = new ColumnRef(plan.getTableRef(), plan.getTableRef().getTable().getPColumnForColumnName("ID").getPosition()).newColumnExpression(); Expression id = new RowKeyColumnExpression(idExpression,new RowKeyValueAccessor(plan.getTableRef().getTable().getPKColumns(),0)); -Expression company = new KeyValueColumnExpression(plan.getTableRef().getTable().getPColumnForColumnName("COMPANY"), false); +Expression company = new KeyValueColumnExpression(plan.getTableRef().getTable().getPColumnForColumnName("COMPANY"), true); // FilterList has no equals implementation assertTrue(filter instanceof FilterList); FilterList filterList = (FilterList)filter; @@ -153,7 +153,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { assertEquals( singleKVFilter(constantComparison( CompareOp.EQUAL, -new KeyValueColumnExpression(column, false), +new KeyValueColumnExpression(column, true), "c3")), filter); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/4128b563/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java b/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java index 276d946..8553b73 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java @@ -127,11 +127,11 @@ public class MutationStateTest { private void assertTable(String tableName1,List keyValues1,String tableName2,List keyValues2) { assertTrue("MUTATION_TEST1".equals(tableName1)); assertTrue(Bytes.equals(PUnsignedInt.INSTANCE.toBytes(111),CellUtil.cloneRow(keyValues1.get(0; - assertTrue("app1".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues1.get(0); + assertTrue("app1".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues1.get(1); assertTrue("MUTATION_TEST2".equals(tableName2)); assertTrue(Bytes.equals(PUnsignedInt.INSTANCE.toBytes(222),CellUtil.cloneRow(keyValues2.get(0; - assertTrue("app2".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues2.get(0); + assertTrue("app2".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues2.get(1); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/4128b563/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java index 089c5f1..84cc65c 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java @@ -141,31 +141,29 @@ public class ConnectionlessTest { assertTrue(iterator.hasNext()); kv = iterator.next(); assertArrayEquals(expectedRo
phoenix git commit: Fix test failures
Repository: phoenix Updated Branches: refs/heads/encodecolumns2 23de55fe4 -> 56eaa8680 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/56eaa868 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/56eaa868 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/56eaa868 Branch: refs/heads/encodecolumns2 Commit: 56eaa8680ce9bb24697243e9d2f9d70d3c146166 Parents: 23de55f Author: Samarth Authored: Tue Nov 22 22:32:42 2016 -0800 Committer: Samarth Committed: Tue Nov 22 22:32:42 2016 -0800 -- .../org/apache/phoenix/compile/WhereCompilerTest.java | 4 ++-- .../org/apache/phoenix/execute/MutationStateTest.java | 4 ++-- .../org/apache/phoenix/query/ConnectionlessTest.java | 14 ++ 3 files changed, 10 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/56eaa868/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 c65408e..06c20d3 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 @@ -121,7 +121,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { Filter filter = scan.getFilter(); Expression idExpression = new ColumnRef(plan.getTableRef(), plan.getTableRef().getTable().getPColumnForColumnName("ID").getPosition()).newColumnExpression(); Expression id = new RowKeyColumnExpression(idExpression,new RowKeyValueAccessor(plan.getTableRef().getTable().getPKColumns(),0)); -Expression company = new KeyValueColumnExpression(plan.getTableRef().getTable().getPColumnForColumnName("COMPANY"), false); +Expression company = new KeyValueColumnExpression(plan.getTableRef().getTable().getPColumnForColumnName("COMPANY"), true); // FilterList has no equals implementation assertTrue(filter instanceof FilterList); FilterList filterList = (FilterList)filter; @@ -153,7 +153,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest { assertEquals( singleKVFilter(constantComparison( CompareOp.EQUAL, -new KeyValueColumnExpression(column, false), +new KeyValueColumnExpression(column, true), "c3")), filter); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/56eaa868/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java b/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java index 276d946..8553b73 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/MutationStateTest.java @@ -127,11 +127,11 @@ public class MutationStateTest { private void assertTable(String tableName1,List keyValues1,String tableName2,List keyValues2) { assertTrue("MUTATION_TEST1".equals(tableName1)); assertTrue(Bytes.equals(PUnsignedInt.INSTANCE.toBytes(111),CellUtil.cloneRow(keyValues1.get(0; - assertTrue("app1".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues1.get(0); + assertTrue("app1".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues1.get(1); assertTrue("MUTATION_TEST2".equals(tableName2)); assertTrue(Bytes.equals(PUnsignedInt.INSTANCE.toBytes(222),CellUtil.cloneRow(keyValues2.get(0; - assertTrue("app2".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues2.get(0); + assertTrue("app2".equals(PVarchar.INSTANCE.toObject(CellUtil.cloneValue(keyValues2.get(1); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/56eaa868/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java index 089c5f1..84cc65c 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionlessTest.java @@ -141,31 +141,29 @@ public class ConnectionlessTest { assertTrue(itera
[12/12] phoenix git commit: Fix test failures
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/c1958d07 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c1958d07 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c1958d07 Branch: refs/heads/encodecolumns2 Commit: c1958d07e4b8777d5ab7ff30f36450d19dce69a7 Parents: 23a8798 Author: Samarth Authored: Wed Oct 19 11:57:48 2016 -0700 Committer: Samarth Committed: Wed Oct 19 11:57:48 2016 -0700 -- .../AlterMultiTenantTableWithViewsIT.java | 25 +- .../apache/phoenix/end2end/AlterTableIT.java| 98 +--- .../phoenix/end2end/AlterTableWithViewsIT.java | 139 ++- .../phoenix/end2end/StatsCollectorIT.java | 8 +- .../apache/phoenix/end2end/StoreNullsIT.java| 41 +++- .../phoenix/end2end/index/DropMetadataIT.java | 2 +- .../end2end/index/IndexExpressionIT.java| 7 +- .../end2end/index/MutableIndexFailureIT.java| 2 + .../phoenix/compile/CreateTableCompiler.java| 13 +- .../phoenix/compile/ExpressionCompiler.java | 4 +- .../compile/PostLocalIndexDDLCompiler.java | 7 +- .../apache/phoenix/compile/WhereCompiler.java | 21 -- .../GroupedAggregateRegionObserver.java | 14 +- .../coprocessor/MetaDataEndpointImpl.java | 95 +--- .../phoenix/coprocessor/ScanRegionObserver.java | 10 +- .../UngroupedAggregateRegionObserver.java | 4 +- .../expression/ArrayColumnExpression.java | 116 + .../expression/KeyValueColumnExpression.java| 2 +- ...lumnWithKeyValueColumnExpressionVisitor.java | 37 --- .../filter/MultiKeyValueComparisonFilter.java | 5 - .../filter/SingleKeyValueComparisonFilter.java | 6 - .../apache/phoenix/index/IndexMaintainer.java | 108 + .../apache/phoenix/index/PhoenixIndexCodec.java | 2 +- .../index/PhoenixIndexFailurePolicy.java| 5 +- .../phoenix/iterate/BaseResultIterators.java| 1 - .../iterate/RegionScannerResultIterator.java| 4 +- .../apache/phoenix/schema/MetaDataClient.java | 127 +- .../tuple/EncodedColumnQualiferCellsList.java | 71 -- .../tuple/PositionBasedMultiKeyValueTuple.java | 4 +- .../schema/tuple/PositionBasedResultTuple.java | 1 + .../apache/phoenix/util/EncodedColumnsUtil.java | 7 +- .../java/org/apache/phoenix/util/IndexUtil.java | 240 ++- .../org/apache/phoenix/util/MetaDataUtil.java | 6 + .../java/org/apache/phoenix/util/ScanUtil.java | 4 +- .../phoenix/index/IndexMaintainerTest.java | 2 +- 35 files changed, 696 insertions(+), 542 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1958d07/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java index adadca7..8275f3f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java @@ -17,6 +17,7 @@ */ package org.apache.phoenix.end2end; +import static org.apache.phoenix.exception.SQLExceptionCode.CANNOT_MUTATE_TABLE; import static org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT; import static org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT; import static org.junit.Assert.assertEquals; @@ -476,14 +477,14 @@ public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT { // For a diverged view, only base table's pk column will be added and that too at the end. assertTableDefinition(conn, divergedView, PTableType.VIEW, baseTable, 2, 7, DIVERGED_VIEW_BASE_COLUMN_COUNT, "TENANT_ID", "PK1", "V1", "V3", "VIEW_COL1", "VIEW_COL2", "PK2"); -// Add existing column VIEW_COL2 to the base table +// Adding existing column VIEW_COL2 to the base table isn't allowed. alterBaseTable = "ALTER TABLE " + baseTable + " ADD VIEW_COL2 CHAR(256)"; -conn.createStatement().execute(alterBaseTable); - -// For the non-diverged view, adding the column VIEW_COL2 will end up changing its ordinal position in the view. -assertTableDefinition(conn, view1, PTableType.VIEW, baseTable, 2, 9, 8, "TENANT_ID", "PK1", "V1", "V2", "V3", "KV", "PK2", "VIEW_COL2", "VIEW_COL1"); -// For the diverged view, adding the column VIEW_COL2 will not change its ordinal position in the view. It also won't change the base column count or the sequence
[11/12] phoenix git commit: Fix test failures
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1958d07/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java index b1dd5f4..edf27eb 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java @@ -23,6 +23,7 @@ import java.io.DataInputStream; import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; +import java.nio.ByteBuffer; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; @@ -60,7 +61,6 @@ import org.apache.phoenix.expression.ExpressionType; import org.apache.phoenix.expression.KeyValueColumnExpression; import org.apache.phoenix.expression.LiteralExpression; import org.apache.phoenix.expression.visitor.KeyValueExpressionVisitor; -import org.apache.phoenix.expression.visitor.ReplaceArrayColumnWithKeyValueColumnExpressionVisitor; import org.apache.phoenix.hbase.index.ValueGetter; import org.apache.phoenix.hbase.index.covered.update.ColumnReference; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; @@ -337,13 +337,7 @@ public class IndexMaintainer implements Writable, Iterable { this.isMultiTenant = dataTable.isMultiTenant(); this.viewIndexId = index.getViewIndexId() == null ? null : MetaDataUtil.getViewIndexIdDataType().toBytes(index.getViewIndexId()); this.isLocalIndex = index.getIndexType() == IndexType.LOCAL; -/* - * There is nothing to prevent new indexes on existing tables to have encoded column names. - * Except, due to backward compatibility reasons, we aren't able to change IndexMaintainer and the state - * that is serialized in it. Because of this we are forced to have the indexes inherit the - * storage scheme of the parent data tables. - */ -this.usesEncodedColumnNames = EncodedColumnsUtil.usesEncodedColumnNames(dataTable); +this.usesEncodedColumnNames = EncodedColumnsUtil.usesEncodedColumnNames(index); byte[] indexTableName = index.getPhysicalName().getBytes(); // Use this for the nDataSaltBuckets as we need this for local indexes // TODO: persist nDataSaltBuckets separately, but maintain b/w compat. @@ -526,7 +520,7 @@ public class IndexMaintainer implements Writable, Iterable { initCachedState(); } -public byte[] buildRowKey(ValueGetter valueGetter, ImmutableBytesWritable rowKeyPtr, byte[] regionStartKey, byte[] regionEndKey, boolean convertArrayColToKeyValueCol) { +public byte[] buildRowKey(ValueGetter valueGetter, ImmutableBytesWritable rowKeyPtr, byte[] regionStartKey, byte[] regionEndKey) { ImmutableBytesWritable ptr = new ImmutableBytesWritable(); boolean prependRegionStartKey = isLocalIndex && regionStartKey != null; boolean isIndexSalted = !isLocalIndex && nIndexSaltBuckets > 0; @@ -595,9 +589,6 @@ public class IndexMaintainer implements Writable, Iterable { SortOrder dataSortOrder; if (dataPkPosition[i] == EXPRESSION_NOT_PRESENT) { Expression expression = expressionIterator.next(); - if (convertArrayColToKeyValueCol) { - expression = expression.accept(new ReplaceArrayColumnWithKeyValueColumnExpressionVisitor()); - } dataColumnType = expression.getDataType(); dataSortOrder = expression.getSortOrder(); isNullable = expression.isNullable(); @@ -930,11 +921,11 @@ public class IndexMaintainer implements Writable, Iterable { return indexRowKeySchema; } -public Put buildUpdateMutation(KeyValueBuilder kvBuilder, ValueGetter valueGetter, ImmutableBytesWritable dataRowKeyPtr, long ts, byte[] regionStartKey, byte[] regionEndKey, boolean convertArrayColToKeyValueCol) throws IOException { -Put put = null; +public Put buildUpdateMutation(KeyValueBuilder kvBuilder, ValueGetter valueGetter, ImmutableBytesWritable dataRowKeyPtr, long ts, byte[] regionStartKey, byte[] regionEndKey) throws IOException { + byte[] indexRowKey = this.buildRowKey(valueGetter, dataRowKeyPtr, regionStartKey, regionEndKey); + Put put = null; // New row being inserted: add the empty key value if (valueGetter.getLatestValue(dataEmptyKeyValueRef) == null) { -byte[] indexRowKey = this.buildRowKey(valueGetter, dataRowKeyPtr, regionStartKey, regionEndKey, convertArrayColToKeyValueCol); put = new Put(indexRowKey); // add the keyvalue for the empty row put.add(kvBuilder.buildPut(new Immutabl
phoenix git commit: Fix test failures
Repository: phoenix Updated Branches: refs/heads/encodecolumns 3e7aa0065 -> 29dbf051c 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/29dbf051 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/29dbf051 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/29dbf051 Branch: refs/heads/encodecolumns Commit: 29dbf051c87eb7b0c7d6e3e6b1d899745ecc75ae Parents: 3e7aa00 Author: Samarth Authored: Thu Sep 22 18:02:43 2016 -0700 Committer: Samarth Committed: Thu Sep 22 18:02:43 2016 -0700 -- .../apache/phoenix/end2end/AlterTableIT.java| 47 +++ .../coprocessor/MetaDataEndpointImpl.java | 38 - .../apache/phoenix/schema/DelegateTable.java| 4 +- .../apache/phoenix/schema/MetaDataClient.java | 22 ++- .../java/org/apache/phoenix/schema/PTable.java | 9 +-- .../org/apache/phoenix/schema/PTableImpl.java | 60 +++- .../apache/phoenix/util/EncodedColumnsUtil.java | 4 +- 7 files changed, 108 insertions(+), 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/29dbf051/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 d4de783..223f368 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 @@ -2305,20 +2305,34 @@ public class AlterTableIT extends BaseOwnClusterHBaseManagedTimeIT { // assert that the client side cache is updated. baseTable = phxConn.getTable(new PTableKey(phxConn.getTenantId(), fullTableName)); EncodedCQCounter encodedCqCounter = baseTable.getEncodedCQCounter(); -assertEquals((Integer)(ENCODED_CQ_COUNTER_INITIAL_VALUE + 3), encodedCqCounter.getValue(DEFAULT_COLUMN_FAMILY)); +assertEquals((Integer)(ENCODED_CQ_COUNTER_INITIAL_VALUE + 2), encodedCqCounter.getValue(DEFAULT_COLUMN_FAMILY)); +assertEquals((Integer)(ENCODED_CQ_COUNTER_INITIAL_VALUE + 1), encodedCqCounter.getValue("B")); // assert that the server side metadata is updated correctly. -assertEncodedCQCounter(DEFAULT_COLUMN_FAMILY, schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 3, true); +assertEncodedCQCounter(DEFAULT_COLUMN_FAMILY, schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 2, true); +assertEncodedCQCounter("B", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 1, true); + +// assert that the server side metadata for columns is updated correctly. assertEncodedCQValue(DEFAULT_COLUMN_FAMILY, "COL4", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE); assertEncodedCQValue(DEFAULT_COLUMN_FAMILY, "COL5", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 1); -assertEncodedCQValue("B", "COL6", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 2); +assertEncodedCQValue("B", "COL6", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE); assertSequenceNumber(schemaName, baseTableName, initBaseTableSeqNumber + 1); // Create a view String viewDDL = "CREATE VIEW " + fullViewName + " ( VIEW_COL1 INTEGER, A.VIEW_COL2 VARCHAR ) AS SELECT * FROM " + fullTableName; conn.createStatement().execute(viewDDL); + +// assert that the server side metadata is updated correctly. +assertEncodedCQCounter(DEFAULT_COLUMN_FAMILY, schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 3, true); +assertEncodedCQCounter("A", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 1, true); +assertEncodedCQCounter("B", schemaName, baseTableName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 1, true); + +// assert that the server side metadata for columns is updated correctly. +assertEncodedCQValue(DEFAULT_COLUMN_FAMILY, "VIEW_COL1", schemaName, viewName, ENCODED_CQ_COUNTER_INITIAL_VALUE + 2); +assertEncodedCQValue("A", "VIEW_COL2", schemaName, viewName, ENCODED_CQ_COUNTER_INITIAL_VALUE); // Creating a view that adds its own columns should increment the base table's sequence number too. assertSequenceNumber(schemaName, baseTableName, initBaseTableSeqNumber + 2); + // Add column to the view viewDDL = "ALTER VIEW " + fullViewName + " ADD VIEW_COL3 DECIMAL(10, 2), A.VI
phoenix git commit: Fix test failures
Repository: phoenix Updated Branches: refs/heads/encodecolumns 920be8fec -> 3e7aa0065 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/3e7aa006 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3e7aa006 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3e7aa006 Branch: refs/heads/encodecolumns Commit: 3e7aa0065a856bb6e0c839da65d5855b219a65aa Parents: 920be8f Author: Samarth Authored: Tue Sep 20 16:00:04 2016 -0700 Committer: Samarth Committed: Tue Sep 20 16:00:04 2016 -0700 -- .../src/main/java/org/apache/phoenix/schema/MetaDataClient.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e7aa006/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 18176b9..3eca340 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -2086,7 +2086,7 @@ public class MetaDataClient { } else { storageScheme = StorageScheme.ENCODED_COLUMN_NAMES; } -cqCounter = storageScheme != StorageScheme.ENCODED_COLUMN_NAMES ? new EncodedCQCounter() : NULL_COUNTER; +cqCounter = storageScheme != StorageScheme.NON_ENCODED_COLUMN_NAMES ? new EncodedCQCounter() : NULL_COUNTER; } Map changedCqCounters = new HashMap<>(colDefs.size());
phoenix git commit: Fix test failures due to use of priority queue for merge sort (Ankit Singhal/Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 f930e56a8 -> a185340a7 Fix test failures due to use of priority queue for merge sort (Ankit Singhal/Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a185340a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a185340a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a185340a Branch: refs/heads/4.x-HBase-1.0 Commit: a185340a726551f5ec9f31aa4ad006327bfe668b Parents: f930e56 Author: Samarth Authored: Fri Nov 13 10:11:07 2015 -0800 Committer: Samarth Committed: Fri Nov 13 10:11:07 2015 -0800 -- .../iterate/MergeSortResultIterator.java| 80 +--- 1 file changed, 34 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a185340a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java index 75843eb..e076a40 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java @@ -34,7 +34,6 @@ import org.apache.phoenix.util.ServerUtil; public abstract class MergeSortResultIterator implements PeekingResultIterator { protected final ResultIterators resultIterators; protected final ImmutableBytesWritable tempPtr = new ImmutableBytesWritable(); -private List iterators; private PriorityQueue minHeap; private final IteratorComparator itrComparator = new IteratorComparator(); @@ -42,34 +41,6 @@ public abstract class MergeSortResultIterator implements PeekingResultIterator { this.resultIterators = iterators; } -private List getIterators() throws SQLException { -if (iterators == null) { -iterators = resultIterators.getIterators(); -} -return iterators; -} - -private PriorityQueue getMinHeap() throws SQLException { -if (minHeap == null) { -List iterators = getIterators(); -minHeap = new PriorityQueue(iterators.size()); -for (PeekingResultIterator itr : iterators) { -if (itr.peek() == null) { -itr.close(); -continue; -} -minHeap.add(new MaterializedComparableResultIterator(itr, itrComparator)); -} -} -return minHeap; -} - -private class IteratorComparator implements Comparator { -public int compare(Tuple c1, Tuple c2) { -return MergeSortResultIterator.this.compare(c1, c2); -} -} - @Override public void close() throws SQLException { SQLException toThrow = null; @@ -81,8 +52,8 @@ public abstract class MergeSortResultIterator implements PeekingResultIterator { toThrow = ServerUtil.parseServerException(e); } finally { try { -if (iterators != null) { -SQLCloseables.closeAll(iterators); +if (minHeap != null) { +SQLCloseables.closeAllQuietly(minHeap); } } catch (Exception e) { if (toThrow == null) { @@ -91,36 +62,24 @@ public abstract class MergeSortResultIterator implements PeekingResultIterator { toThrow.setNextException(ServerUtil.parseServerException(e)); } } finally { -if (toThrow != null) { -throw toThrow; -} +if (toThrow != null) { throw toThrow; } } } } abstract protected int compare(Tuple t1, Tuple t2); -private MaterializedComparableResultIterator minIterator() throws SQLException { -PriorityQueue minHeap = getMinHeap(); -MaterializedComparableResultIterator minIterator = minHeap.peek(); -return minIterator; -} - @Override public Tuple peek() throws SQLException { MaterializedComparableResultIterator iterator = minIterator(); -if (iterator == null) { -return null; -} +if (iterator == null) { return null; } return iterator.peek(); } @Override public Tuple next() throws SQLException { MaterializedComparableResultIterator iterator = minIterator(); -if (iterator == null) { -return null; -} +if (iterator == null) { return null; } Tuple next = iterator.next(); minHeap.poll();
phoenix git commit: Fix test failures
Repository: phoenix Updated Branches: refs/heads/txn 59ba25a59 -> b14e88551 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/b14e8855 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b14e8855 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b14e8855 Branch: refs/heads/txn Commit: b14e8855188ca472ed0ea291105d75bdca418ba5 Parents: 59ba25a Author: Thomas D'Silva Authored: Tue Nov 10 15:47:39 2015 -0800 Committer: Thomas D'Silva Committed: Tue Nov 10 15:48:31 2015 -0800 -- .../phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java | 6 +++--- .../it/java/org/apache/phoenix/execute/PartialCommitIT.java| 2 +- .../main/java/org/apache/phoenix/jdbc/PhoenixConnection.java | 4 3 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b14e8855/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java index d2e9dd0..6191a4f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorWithSplitsAndMultiCFIT.java @@ -133,7 +133,7 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends StatsCollectorAbstract Collection infos = TestUtil.getGuidePostsList(conn, STATS_TEST_TABLE_NAME_NEW); long[] rowCountArr = new long[]{25, 20, 25, 25}; // CF A alone has double the bytecount because it has column qualifier A and column qualifier _0 -long[] byteCountArr = new long[]{12168, 5540, 6652, 6652}; +long[] byteCountArr = new long[]{12144, 5540, 6652, 6652}; int i = 0; for(GuidePostsInfo info : infos) { assertRowCountAndByteCount(info, rowCountArr[i], byteCountArr[i]); @@ -176,7 +176,7 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends StatsCollectorAbstract Collection infos = TestUtil.getGuidePostsList(conn, STATS_TEST_TABLE_NAME); for (GuidePostsInfo info : infos) { assertEquals(20, info.getRowCount()); -assertEquals(11060, info.getByteCount()); +assertEquals(11040, info.getByteCount()); break; } List keyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME); @@ -269,7 +269,7 @@ public class StatsCollectorWithSplitsAndMultiCFIT extends StatsCollectorAbstract infos = TestUtil.getGuidePostsList(conn, STATS_TEST_TABLE_NAME); for (GuidePostsInfo info : infos) { assertEquals(20, info.getRowCount()); -assertEquals(9954, info.getByteCount()); +assertEquals(9936, info.getByteCount()); break; } conn.close(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/b14e8855/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index b3b3316..a9ac5fa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -259,7 +259,7 @@ public class PartialCommitIT { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); final Map> mutations = Maps.newTreeMap(new TableRefComparator()); -return new PhoenixConnection(phxCon) { +return new PhoenixConnection(phxCon, null) { @Override protected MutationState newMutationState(int maxSize) { return new MutationState(maxSize, this, mutations, null); http://git-wip-us.apache.org/repos/asf/phoenix/blob/b14e8855/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java index 0a28f8e..ee71a96 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java @@ -172,6 +172,10 @@ public class PhoenixConnection implements Connection, org.apache.p