You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2015/03/13 19:52:34 UTC
[1/4] phoenix git commit: PHOENIX-1731 Add getNextIndexedKey() to
IndexHalfStoreFileReader and FilteredKeyValueScanner.
Repository: phoenix
Updated Branches:
refs/heads/4.0 46d365a96 -> 46e99bb1b
refs/heads/4.2 a66a02cbd -> 63bc8a72e
refs/heads/4.3 16df2344c -> 83dae8d2a
refs/heads/master 36b88651c -> 66fb38cad
PHOENIX-1731 Add getNextIndexedKey() to IndexHalfStoreFileReader and FilteredKeyValueScanner.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/66fb38ca
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/66fb38ca
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/66fb38ca
Branch: refs/heads/master
Commit: 66fb38cade511d3544a748eb1a2c9da446cf2984
Parents: 36b8865
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri Mar 13 11:50:04 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri Mar 13 11:50:04 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 7 +++++++
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/66fb38ca/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index fa1def3..172486d 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -363,6 +363,13 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader {
public boolean isSeeked() {
return this.delegate.isSeeked();
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
};
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/66fb38ca/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
index 16080d1..9e5d9b2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
@@ -157,4 +157,11 @@ public class FilteredKeyValueScanner implements KeyValueScanner {
public boolean seekToPreviousRow(KeyValue arg0) throws IOException {
return this.delegate.seekToPreviousRow(arg0);
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
}
\ No newline at end of file
[3/4] phoenix git commit: PHOENIX-1731 Add getNextIndexedKey() to
IndexHalfStoreFileReader and FilteredKeyValueScanner.
Posted by la...@apache.org.
PHOENIX-1731 Add getNextIndexedKey() to IndexHalfStoreFileReader and FilteredKeyValueScanner.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/83dae8d2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83dae8d2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83dae8d2
Branch: refs/heads/4.3
Commit: 83dae8d2a14d52915eead26402eefc306661a866
Parents: 16df234
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri Mar 13 11:50:04 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri Mar 13 11:51:35 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 7 +++++++
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83dae8d2/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index fa1def3..172486d 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -363,6 +363,13 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader {
public boolean isSeeked() {
return this.delegate.isSeeked();
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
};
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83dae8d2/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
index c36e7ea..1f16bef 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
@@ -158,4 +158,11 @@ public class FilteredKeyValueScanner implements KeyValueScanner {
public boolean seekToPreviousRow(KeyValue arg0) throws IOException {
return this.delegate.seekToPreviousRow(arg0);
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
}
\ No newline at end of file
[4/4] phoenix git commit: PHOENIX-1731 Add getNextIndexedKey() to
IndexHalfStoreFileReader and FilteredKeyValueScanner.
Posted by la...@apache.org.
PHOENIX-1731 Add getNextIndexedKey() to IndexHalfStoreFileReader and FilteredKeyValueScanner.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/63bc8a72
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/63bc8a72
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/63bc8a72
Branch: refs/heads/4.2
Commit: 63bc8a72e26e8565ccb2a5e5b756e4e122dc4d4d
Parents: a66a02c
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri Mar 13 11:50:04 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri Mar 13 11:52:04 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 7 +++++++
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/63bc8a72/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index d8650cf..5b68196 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -352,6 +352,13 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader {
public boolean isSeeked() {
return this.delegate.isSeeked();
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
};
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/63bc8a72/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
index c36e7ea..1f16bef 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
@@ -158,4 +158,11 @@ public class FilteredKeyValueScanner implements KeyValueScanner {
public boolean seekToPreviousRow(KeyValue arg0) throws IOException {
return this.delegate.seekToPreviousRow(arg0);
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
}
\ No newline at end of file
[2/4] phoenix git commit: PHOENIX-1731 Add getNextIndexedKey() to
IndexHalfStoreFileReader and FilteredKeyValueScanner.
Posted by la...@apache.org.
PHOENIX-1731 Add getNextIndexedKey() to IndexHalfStoreFileReader and FilteredKeyValueScanner.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/46e99bb1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/46e99bb1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/46e99bb1
Branch: refs/heads/4.0
Commit: 46e99bb1b65b677c5d867f068b2d76a41923b0c1
Parents: 46d365a
Author: Lars Hofhansl <la...@apache.org>
Authored: Fri Mar 13 11:50:04 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Fri Mar 13 11:50:58 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 7 +++++++
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 7 +++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/46e99bb1/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index fa1def3..172486d 100644
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -363,6 +363,13 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader {
public boolean isSeeked() {
return this.delegate.isSeeked();
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
};
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/46e99bb1/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
index c36e7ea..1f16bef 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java
@@ -158,4 +158,11 @@ public class FilteredKeyValueScanner implements KeyValueScanner {
public boolean seekToPreviousRow(KeyValue arg0) throws IOException {
return this.delegate.seekToPreviousRow(arg0);
}
+
+ // Added for compatibility with HBASE-13109
+ // Once we drop support for older versions, add an @override annotation here
+ // and figure out how to get the next indexed key
+ public byte[] getNextIndexedKey() {
+ return null; // indicate that we cannot use the optimization
+ }
}
\ No newline at end of file