hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [3/4] hbase git commit: Revert "HBASE-15477 Purge 'next block header' from cached blocks" Overcommit. Revert.
Date Wed, 23 Mar 2016 01:39:49 GMT
Revert "HBASE-15477 Purge 'next block header' from cached blocks"
Overcommit. Revert.

This reverts commit ef94b552399d75c0c16aca0109a39b66f15af892.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c49d0caf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c49d0caf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c49d0caf

Branch: refs/heads/master
Commit: c49d0caf53b27c0c22481e074c807a5ad4753eda
Parents: 54a543d
Author: stack <stack@apache.org>
Authored: Tue Mar 22 18:38:29 2016 -0700
Committer: stack <stack@apache.org>
Committed: Tue Mar 22 18:38:29 2016 -0700

----------------------------------------------------------------------
 .../hbase/regionserver/KeyValueScanner.java.rej    | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c49d0caf/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java.rej
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java.rej
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java.rej
deleted file mode 100644
index 4e3ebd4..0000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-diff a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueScanner.java	(rejected
hunks)
-@@ -29,7 +30,7 @@ import org.apache.hadoop.hbase.client.Scan;
-  * Scanner that returns the next KeyValue.
-  */
- @InterfaceAudience.Private
--public interface KeyValueScanner extends Shipper {
-+public interface KeyValueScanner extends Shipper, Closeable {
-   /**
-    * The byte array represents for NO_NEXT_INDEXED_KEY;
-    * The actual value is irrelevant because this is always compared by reference.
-@@ -165,4 +167,4 @@ public interface KeyValueScanner extends Shipper {
-    * if known, or null otherwise
-    */
-   public Cell getNextIndexedKey();
--}
-+}
-\ No newline at end of file


Mime
View raw message