Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 07fb31ef2 -> 8134d2824
Fix WALReplayWithIndexWritesAndCompressedWALIT failure in 4.x-HBase-0.98 branch Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8134d282 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8134d282 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8134d282 Branch: refs/heads/4.x-HBase-0.98 Commit: 8134d28243af1c48f419aa416ac4feebfbe18b33 Parents: 07fb31e Author: Vincent Poon <vincentp...@apache.org> Authored: Fri Apr 27 10:26:38 2018 -0700 Committer: Vincent Poon <vincentp...@apache.org> Committed: Fri Apr 27 11:24:45 2018 -0700 ---------------------------------------------------------------------- .../wal/WALReplayWithIndexWritesAndCompressedWALIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8134d282/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java index 06b7f6c..bfa8b57 100644 --- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java +++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java @@ -44,6 +44,7 @@ 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.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.RegionServerAccounting; import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.util.Bytes; @@ -187,7 +188,7 @@ public class WALReplayWithIndexWritesAndCompressedWALIT { region0.close(); region0.getLog().closeAndDelete(); HLog wal = createWAL(this.conf); - RegionServerServices mockRS = Mockito.mock(RegionServerServices.class); + RegionServerServices mockRS = Mockito.mock(HRegionServer.class); // mock out some of the internals of the RSS, so we can run CPs Mockito.when(mockRS.getWAL(null)).thenReturn(wal); RegionServerAccounting rsa = Mockito.mock(RegionServerAccounting.class);