You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/03/14 06:59:49 UTC
phoenix git commit: PHOENIX-1736 Use non deprecated APIs where
possible
Repository: phoenix
Updated Branches:
refs/heads/4.0 46e99bb1b -> 7654bb585
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/7654bb58
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7654bb58
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7654bb58
Branch: refs/heads/4.0
Commit: 7654bb58572dd98ab7f59127efe203775bd30ff6
Parents: 46e99bb
Author: James Taylor <jt...@salesforce.com>
Authored: Fri Mar 13 22:59:42 2015 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri Mar 13 22:59:42 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/7654bb58/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 b3d36b2..eeb4fe2 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/7654bb58/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/7654bb58/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];
}