Repository: phoenix Updated Branches: refs/heads/4.3 83dae8d2a -> d7fac8a1c
PHOENIX-1736 Use non deprecated APIs where possible Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d7fac8a1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d7fac8a1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d7fac8a1 Branch: refs/heads/4.3 Commit: d7fac8a1caae58c566b5e5f151fe4bbeae07238b Parents: 83dae8d Author: James Taylor <[email protected]> Authored: Fri Mar 13 22:59:42 2015 -0700 Committer: James Taylor <[email protected]> Committed: Sat Mar 14 09:51:44 2015 -0700 ---------------------------------------------------------------------- .../index/covered/EndToEndCoveredColumnsIndexBuilderIT.java | 2 +- .../phoenix/filter/SingleKeyValueComparisonFilter.java | 4 ++-- .../main/java/org/apache/phoenix/schema/MetaDataClient.java | 3 ++- .../src/test/java/org/apache/phoenix/query/BaseTest.java | 8 +++++--- 4 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7fac8a1/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java index 9aae820..98b6f90 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java @@ -152,7 +152,7 @@ public class EndToEndCoveredColumnsIndexBuilderIT { ((LocalTableState) state).getIndexedColumnsTableState(Arrays.asList(columns)).getFirst(); int count = 0; - KeyValue kv; + Cell kv; while ((kv = kvs.next()) != null) { Cell next = expectedKvs.get(count++); assertEquals( http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7fac8a1/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java index c7ead67..8929f8a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java @@ -83,8 +83,8 @@ public abstract class SingleKeyValueComparisonFilter extends BooleanExpressionFi // We found all the columns, but did not match the expression, so skip to next row return ReturnCode.NEXT_ROW; } - byte[] buf = keyValue.getValueArray(); - if (compare(buf, keyValue.getFamilyOffset(), keyValue.getFamilyLength(), buf, keyValue.getQualifierOffset(), keyValue.getQualifierLength()) != 0) { + if (compare(keyValue.getFamilyArray(), keyValue.getFamilyOffset(), keyValue.getFamilyLength(), + keyValue.getQualifierArray(), keyValue.getQualifierOffset(), keyValue.getQualifierLength()) != 0) { // Remember the key in case this is the only key value we see. // We'll need it if we have row key columns too. inputTuple.setKey(KeyValueUtil.ensureKeyValue(keyValue)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7fac8a1/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 831616b..f14db23 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 @@ -1096,7 +1096,8 @@ public class MetaDataClient { dataTable.getTimeStamp()); long[] seqValues = new long[1]; SQLException[] sqlExceptions = new SQLException[1]; - connection.getQueryServices().incrementSequences(Collections.singletonList(key), timestamp, seqValues, sqlExceptions); + connection.getQueryServices().incrementSequences(Collections.singletonList(key), + Math.max(timestamp, dataTable.getTimeStamp()), seqValues, sqlExceptions); if (sqlExceptions[0] != null) { throw sqlExceptions[0]; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/d7fac8a1/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 9947440..e4ec56a 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -485,8 +485,7 @@ public abstract class BaseTest { } /** - * Set up the test hbase cluster. - * @param props TODO + * Set up the test hbase cluster. * @return url to be used by clients to connect to the cluster. */ protected static String setUpTestCluster(@Nonnull Configuration conf, ReadOnlyProps overrideProps) { @@ -631,7 +630,7 @@ public abstract class BaseTest { * the threads limit imposed by the OS. */ conf.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 5); - conf.setInt(HConstants.REGION_SERVER_META_HANDLER_COUNT, 2); + conf.setInt("hbase.regionserver.metahandler.count", 2); conf.setInt(HConstants.MASTER_HANDLER_COUNT, 2); conf.setClass("hbase.coprocessor.regionserver.classes", LocalIndexMerger.class, RegionServerObserver.class); @@ -769,6 +768,7 @@ public abstract class BaseTest { protected static void deletePriorTables(long ts, String tenantId, String url) throws Exception { Properties props = new Properties(); + props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1024)); if (ts != HConstants.LATEST_TIMESTAMP) { props.setProperty(CURRENT_SCN_ATTRIB, Long.toString(ts)); } @@ -842,6 +842,8 @@ public abstract class BaseTest { conn = DriverManager.getConnection(url, props); lastTenantId = tenantId; } + + logger.info("DROP SEQUENCE STATEMENT: DROP SEQUENCE " + SchemaUtil.getEscapedTableName(rs.getString(2), rs.getString(3))); conn.createStatement().execute("DROP SEQUENCE " + SchemaUtil.getEscapedTableName(rs.getString(2), rs.getString(3))); } }
