Repository: phoenix Updated Branches: refs/heads/master 66fb38cad -> ee4db402e
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/ee4db402 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ee4db402 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ee4db402 Branch: refs/heads/master Commit: ee4db402efbd91f234457829f3dbb016da18012d Parents: 66fb38c Author: James Taylor <[email protected]> Authored: Fri Mar 13 22:59:42 2015 -0700 Committer: James Taylor <[email protected]> Committed: Fri Mar 13 23:02:25 2015 -0700 ---------------------------------------------------------------------- .../index/covered/EndToEndCoveredColumnsIndexBuilderIT.java | 2 +- .../apache/phoenix/filter/SingleKeyValueComparisonFilter.java | 4 ++-- .../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ee4db402/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 880c1d5..d90733f 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 @@ -151,7 +151,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/ee4db402/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/ee4db402/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 ab3c284..7688531 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]; }
