Repository: hbase Updated Branches: refs/heads/HBASE-14070.HLC e9d962a87 -> b2a184806
Fix TestStoreScanner to again use a mocked store (change was lost from most recent merge) Signed-off-by: Michael Stack <st...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b2a18480 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b2a18480 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b2a18480 Branch: refs/heads/HBASE-14070.HLC Commit: b2a184806e2bbe2f4bb528feef00a4446f66e8af Parents: e9d962a Author: Amit Patel <iamnota...@gmail.com> Authored: Mon Aug 21 14:31:55 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Mon Aug 21 14:35:17 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/TestStoreScanner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b2a18480/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java index a3ceb14..c754f5f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java @@ -1044,9 +1044,10 @@ public class TestStoreScanner { HConstants.DEFAULT_BLOCKSIZE /* block size */, 200, /* timeToPurgeDeletes */ CellComparator.COMPARATOR, false); + Store store = mock(HStore.class); + when(store.getClock()).thenReturn(clock); try (StoreScanner scanner = - new StoreScanner(scan, scanInfo, - ScanType.COMPACT_DROP_DELETES, null, scanners, + new StoreScanner(store, scan, scanInfo, ScanType.COMPACT_DROP_DELETES, null, scanners, HConstants.OLDEST_TIMESTAMP)) { List<Cell> results = new ArrayList<>(); results = new ArrayList<>();