[06/50] [abbrv] hbase git commit: HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true
HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/072c503e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/072c503e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/072c503e Branch: refs/heads/HBASE-19064 Commit: 072c503ec75300c180065378287f8426f399231b Parents: 35b4adf Author: Toshihiro Suzuki Authored: Thu Mar 22 13:57:00 2018 +0900 Committer: tedyu Committed: Wed Apr 11 09:59:45 2018 -0700 -- .../regionserver/ReversedRegionScannerImpl.java | 7 +- .../hbase/regionserver/TestJoinedScanners.java | 157 --- 2 files changed, 100 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/072c503e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java index 0ae8fac..3ca064f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.List; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.PrivateCellUtil; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * ReversibleRegionScannerImpl extends from RegionScannerImpl, and is used to @@ -53,8 +53,7 @@ class ReversedRegionScannerImpl extends RegionScannerImpl { List joinedScanners, HRegion region) throws IOException { this.storeHeap = new ReversedKeyValueHeap(scanners, comparator); if (!joinedScanners.isEmpty()) { - this.joinedHeap = new ReversedKeyValueHeap(joinedScanners, - comparator); + throw new DoNotRetryIOException("Reverse scan with loading CFs on demand is not supported"); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/072c503e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 3434d93..3e23eea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -21,23 +21,32 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; + +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -66,13 +75,12 @@ public class TestJoinedScanners { private static final Logger LOG = LoggerFa
hbase git commit: HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true
Repository: hbase Updated Branches: refs/heads/branch-2 b43a2eb49 -> f3089704d HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f3089704 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f3089704 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f3089704 Branch: refs/heads/branch-2 Commit: f3089704d2879f7b67168b1f73cdb850964bab9a Parents: b43a2eb Author: Toshihiro Suzuki Authored: Thu Mar 22 13:57:00 2018 +0900 Committer: Michael Stack Committed: Wed Apr 11 12:27:28 2018 -0700 -- .../regionserver/ReversedRegionScannerImpl.java | 7 +- .../hbase/regionserver/TestJoinedScanners.java | 157 --- 2 files changed, 100 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f3089704/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java index 0ae8fac..3ca064f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.List; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.PrivateCellUtil; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * ReversibleRegionScannerImpl extends from RegionScannerImpl, and is used to @@ -53,8 +53,7 @@ class ReversedRegionScannerImpl extends RegionScannerImpl { List joinedScanners, HRegion region) throws IOException { this.storeHeap = new ReversedKeyValueHeap(scanners, comparator); if (!joinedScanners.isEmpty()) { - this.joinedHeap = new ReversedKeyValueHeap(joinedScanners, - comparator); + throw new DoNotRetryIOException("Reverse scan with loading CFs on demand is not supported"); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/f3089704/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 3434d93..3e23eea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -21,23 +21,32 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; + +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -66,13 +75,12 @@ public class Te
hbase git commit: HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true
Repository: hbase Updated Branches: refs/heads/branch-2.0 907b264ec -> 0e8d42ba9 HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e8d42ba Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0e8d42ba Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0e8d42ba Branch: refs/heads/branch-2.0 Commit: 0e8d42ba952ee3dc4379221122f672c82fe8baae Parents: 907b264 Author: Toshihiro Suzuki Authored: Thu Mar 22 13:57:00 2018 +0900 Committer: Michael Stack Committed: Wed Apr 11 12:20:54 2018 -0700 -- .../regionserver/ReversedRegionScannerImpl.java | 7 +- .../hbase/regionserver/TestJoinedScanners.java | 157 --- 2 files changed, 100 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0e8d42ba/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java index 0ae8fac..3ca064f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.List; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.PrivateCellUtil; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * ReversibleRegionScannerImpl extends from RegionScannerImpl, and is used to @@ -53,8 +53,7 @@ class ReversedRegionScannerImpl extends RegionScannerImpl { List joinedScanners, HRegion region) throws IOException { this.storeHeap = new ReversedKeyValueHeap(scanners, comparator); if (!joinedScanners.isEmpty()) { - this.joinedHeap = new ReversedKeyValueHeap(joinedScanners, - comparator); + throw new DoNotRetryIOException("Reverse scan with loading CFs on demand is not supported"); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/0e8d42ba/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 3434d93..3e23eea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -21,23 +21,32 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; + +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -66,13 +75,12 @@ public clas
hbase git commit: HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true
Repository: hbase Updated Branches: refs/heads/master 35b4adf3e -> 072c503ec HBASE-20219 An error occurs when scanning with reversed=true and loadColumnFamiliesOnDemand=true Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/072c503e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/072c503e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/072c503e Branch: refs/heads/master Commit: 072c503ec75300c180065378287f8426f399231b Parents: 35b4adf Author: Toshihiro Suzuki Authored: Thu Mar 22 13:57:00 2018 +0900 Committer: tedyu Committed: Wed Apr 11 09:59:45 2018 -0700 -- .../regionserver/ReversedRegionScannerImpl.java | 7 +- .../hbase/regionserver/TestJoinedScanners.java | 157 --- 2 files changed, 100 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/072c503e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java index 0ae8fac..3ca064f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.List; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.PrivateCellUtil; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.yetus.audience.InterfaceAudience; /** * ReversibleRegionScannerImpl extends from RegionScannerImpl, and is used to @@ -53,8 +53,7 @@ class ReversedRegionScannerImpl extends RegionScannerImpl { List joinedScanners, HRegion region) throws IOException { this.storeHeap = new ReversedKeyValueHeap(scanners, comparator); if (!joinedScanners.isEmpty()) { - this.joinedHeap = new ReversedKeyValueHeap(joinedScanners, - comparator); + throw new DoNotRetryIOException("Reverse scan with loading CFs on demand is not supported"); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/072c503e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index 3434d93..3e23eea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -21,23 +21,32 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; + +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -66,13 +75,12 @@ publ