Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 f49c8a724 -> 4c379d764
PHOENIX-4620 Fix compilation issues against hbase-2.0.0-beta2 Signed-off-by: Sergey Soldatov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4c379d76 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4c379d76 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4c379d76 Branch: refs/heads/5.x-HBase-2.0 Commit: 4c379d76426ad33cef2fe65e36240f02d345efa9 Parents: f49c8a7 Author: Josh Elser <[email protected]> Authored: Thu Mar 15 13:22:11 2018 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Mar 15 15:57:37 2018 -0400 ---------------------------------------------------------------------- .../wal/WALReplayWithIndexWritesAndCompressedWALIT.java | 2 +- .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 3 ++- .../apache/phoenix/replication/SystemCatalogWALEntryFilter.java | 2 +- .../hbase/index/write/recovery/TestPerRegionIndexWriteCache.java | 2 +- pom.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c379d76/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 e1101b0..52cdc0c 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 @@ -189,7 +189,7 @@ public class WALReplayWithIndexWritesAndCompressedWALIT { CoveredColumnIndexSpecifierBuilder builder = new CoveredColumnIndexSpecifierBuilder(); builder.addIndexGroup(fam1); builder.build(htd); - WALFactory walFactory = new WALFactory(this.conf, null, "localhost,1234"); + WALFactory walFactory = new WALFactory(this.conf, "localhost,1234"); WAL wal = createWAL(this.conf, walFactory); // create the region + its WAL http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c379d76/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index ce25e7f..2fd58bd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@ -246,7 +246,8 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver Mutation[] mutationArray = new Mutation[mutations.size()]; // When memstore size reaches blockingMemstoreSize we are waiting 3 seconds for the // flush happen which decrease the memstore size and then writes allowed on the region. - for (int i = 0; region.getMemStoreSize() > blockingMemstoreSize && i < 30; i++) { + for (int i = 0; (region.getMemStoreHeapSize() + region.getMemStoreOffHeapSize()) > blockingMemstoreSize + && i < 30; i++) { try { checkForRegionClosing(); Thread.sleep(100); http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c379d76/phoenix-core/src/main/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilter.java index d1b71ef..0bdc63e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilter.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/replication/SystemCatalogWALEntryFilter.java @@ -48,7 +48,7 @@ public class SystemCatalogWALEntryFilter implements WALEntryFilter { //if the WAL.Entry's table isn't System.Catalog, it auto-passes this filter //TODO: when Phoenix drops support for pre-1.3 versions of HBase, redo as a WALCellFilter - if (!SchemaUtil.isMetaTable(entry.getKey().getTablename().getName())){ + if (!SchemaUtil.isMetaTable(entry.getKey().getTableName().getName())){ return entry; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c379d76/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java index 2ec1a8d..700fd97 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/recovery/TestPerRegionIndexWriteCache.java @@ -105,7 +105,7 @@ public class TestPerRegionIndexWriteCache { Path basedir = FSUtils.getTableDir(hbaseRootDir, tableName); Random rn = new Random(); tableName = TableName.valueOf("TestPerRegion" + rn.nextInt()); - WALFactory walFactory = new WALFactory(TEST_UTIL.getConfiguration(), null, getClass().getSimpleName()); + WALFactory walFactory = new WALFactory(TEST_UTIL.getConfiguration(), getClass().getSimpleName()); wal = walFactory.getWAL(RegionInfoBuilder.newBuilder(TableName.valueOf("logs")).build()); TableDescriptor htd = TableDescriptorBuilder http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c379d76/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6abc4b4..b0f442f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ <top.dir>${project.basedir}</top.dir> <!-- Hadoop Versions --> - <hbase.version>2.0.0-beta-1</hbase.version> + <hbase.version>2.0.0-beta-2</hbase.version> <hadoop.version>3.0.0</hadoop.version> <!-- Dependency versions -->
