This is an automated email from the ASF dual-hosted git repository. wchevreuil pushed a commit to branch HBASE-29427 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit eadd27fe4e7876a778c8107e8f4ad89c1d3f3384 Author: Wellington Ramos Chevreuil <[email protected]> AuthorDate: Mon Dec 16 12:49:16 2024 +0000 HBASE-29425 Refine and polish code Change-Id: I85b7529da3ba5d0d734f98d2db224740f4ced26f --- .../apache/hadoop/hbase/io/hfile/BlockCache.java | 1 - .../hadoop/hbase/io/hfile/CombinedBlockCache.java | 1 - .../master/procedure/CreateTableProcedure.java | 4 +-- .../master/procedure/ModifyTableProcedure.java | 4 +-- .../hadoop/hbase/regionserver/CellTSTiering.java | 4 +-- .../regionserver/CustomCellTieredStoreEngine.java | 13 ++------- .../hbase/regionserver/CustomCellValueTiering.java | 4 +-- .../hadoop/hbase/regionserver/DataTiering.java | 1 - .../hbase/regionserver/DataTieringManager.java | 27 ------------------ .../hadoop/hbase/regionserver/DataTieringType.java | 1 - ....java => CustomCellTieredCompactionPolicy.java} | 15 +++++++--- .../compactions/CustomCellTieredCompactor.java | 2 +- ...ieringUtils.java => CustomCellTieredUtils.java} | 13 ++------- .../TestCustomCellTieredCompactionPolicy.java | 32 +++++++++++----------- .../compactions/TestCustomCellTieredCompactor.java | 2 +- 15 files changed, 41 insertions(+), 83 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java index 71121c85991..be3f8beb454 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java @@ -23,7 +23,6 @@ import java.util.Optional; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.conf.ConfigurationObserver; -import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; import org.apache.hadoop.hbase.util.Pair; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java index ae763e1d5be..e5d52858ab6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java @@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache; -import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; import org.apache.hadoop.hbase.util.Pair; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java index de2c9926340..423297f667d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException; import org.apache.hadoop.hbase.procedure2.ProcedureUtil; -import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieringUtils; +import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredUtils; import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory; import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerValidationUtils; import org.apache.hadoop.hbase.rsgroup.RSGroupInfo; @@ -315,7 +315,7 @@ public class CreateTableProcedure extends AbstractStateMachineTableProcedure<Cre StoreFileTrackerValidationUtils.checkForCreateTable(env.getMasterConfiguration(), tableDescriptor); - CustomCellTieringUtils.checkForModifyTable(tableDescriptor); + CustomCellTieredUtils.checkForModifyTable(tableDescriptor); return true; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java index bd3a9fe2fd4..d1799e231d8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java @@ -51,7 +51,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.ModifyTableState; -import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieringUtils; +import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredUtils; @InterfaceAudience.Private public class ModifyTableProcedure extends AbstractStateMachineTableProcedure<ModifyTableState> { @@ -422,7 +422,7 @@ public class ModifyTableProcedure extends AbstractStateMachineTableProcedure<Mod // check for store file tracker configurations StoreFileTrackerValidationUtils.checkForModifyTable(env.getMasterConfiguration(), unmodifiedTableDescriptor, modifiedTableDescriptor, !isTableEnabled(env)); - CustomCellTieringUtils.checkForModifyTable(modifiedTableDescriptor); + CustomCellTieredUtils.checkForModifyTable(modifiedTableDescriptor); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellTSTiering.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellTSTiering.java index 0e66a546610..393dea6e750 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellTSTiering.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellTSTiering.java @@ -14,7 +14,7 @@ public class CellTSTiering implements DataTiering { public long getTimestamp(HStoreFile hStoreFile) { OptionalLong maxTimestamp = hStoreFile.getMaximumTimestamp(); if (!maxTimestamp.isPresent()) { - LOG.info("Maximum timestamp not present for {}", hStoreFile.getPath()); + LOG.debug("Maximum timestamp not present for {}", hStoreFile.getPath()); return Long.MAX_VALUE; } return maxTimestamp.getAsLong(); @@ -23,7 +23,7 @@ public class CellTSTiering implements DataTiering { try { byte[] hFileTimeRange = hFileInfo.get(TIMERANGE_KEY); if (hFileTimeRange == null) { - LOG.info("Timestamp information not found for file: {}", + LOG.debug("Timestamp information not found for file: {}", hFileInfo.getHFileContext().getHFileName()); return Long.MAX_VALUE; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellTieredStoreEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellTieredStoreEngine.java index 4f061736612..c0fc6e04717 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellTieredStoreEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellTieredStoreEngine.java @@ -19,19 +19,12 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellComparator; -import org.apache.hadoop.hbase.regionserver.DateTieredStoreEngine; -import org.apache.hadoop.hbase.regionserver.DefaultStoreFileManager; -import org.apache.hadoop.hbase.regionserver.DefaultStoreFlusher; -import org.apache.hadoop.hbase.regionserver.HStore; -import org.apache.hadoop.hbase.regionserver.StoreFileComparators; -import org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy; +import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy; import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactor; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.hbase.regionserver.compactions.DateTieredCompactor; -import org.apache.yetus.audience.InterfaceAudience; import java.io.IOException; import static org.apache.hadoop.hbase.regionserver.DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY; -import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy.TIERING_CELL_QUALIFIER; +import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy.TIERING_CELL_QUALIFIER; /** * Extension of {@link DateTieredStoreEngine} that uses a pluggable value provider for @@ -51,7 +44,7 @@ public class CustomCellTieredStoreEngine extends DateTieredStoreEngine { conf = new Configuration(conf); conf.set(TIERING_CELL_QUALIFIER, store.conf.get(TIERING_CELL_QUALIFIER)); conf.set(DEFAULT_COMPACTION_POLICY_CLASS_KEY, - CustomCellDateTieredCompactionPolicy.class.getName()); + CustomCellTieredCompactionPolicy.class.getName()); createCompactionPolicy(conf, store); this.storeFileManager = new DefaultStoreFileManager(kvComparator, StoreFileComparators.SEQ_ID_MAX_TIMESTAMP, conf, compactionPolicy.getConf()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellValueTiering.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellValueTiering.java index 9d367c655e3..ef14ed07dba 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellValueTiering.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomCellValueTiering.java @@ -1,12 +1,10 @@ package org.apache.hadoop.hbase.regionserver; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.io.hfile.HFileInfo; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.OptionalLong; import static org.apache.hadoop.hbase.regionserver.CustomTieringMultiFileWriter.TIERING_CELL_TIME_RANGE; @InterfaceAudience.Private @@ -15,7 +13,7 @@ public class CustomCellValueTiering implements DataTiering { private long getMaxTSFromTimeRange(byte[] hFileTimeRange, String hFileName) { try { if (hFileTimeRange == null) { - LOG.info("Custom cell-based timestamp information not found for file: {}", hFileName); + LOG.debug("Custom cell-based timestamp information not found for file: {}", hFileName); return Long.MAX_VALUE; } return TimeRangeTracker.parseFrom(hFileTimeRange).getMax(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTiering.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTiering.java index a1a0984836d..20957d7b26f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTiering.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTiering.java @@ -1,6 +1,5 @@ package org.apache.hadoop.hbase.regionserver; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.io.hfile.HFileInfo; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java index ee32327a1e3..d143f45ca40 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringManager.java @@ -17,16 +17,11 @@ */ package org.apache.hadoop.hbase.regionserver; -import static org.apache.hadoop.hbase.regionserver.HStoreFile.NULL_VALUE; -import static org.apache.hadoop.hbase.regionserver.HStoreFile.TIMERANGE_KEY; - import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.OptionalLong; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; @@ -180,28 +175,6 @@ public class DataTieringManager { return true; } - /** - * Determines whether the data in the HFile at the given path is considered hot based on the - * configured data tiering type and hot data age. If the data tiering type is set to - * {@link DataTieringType#TIME_RANGE}, it validates the data against the provided maximum - * timestamp. - * @param hFilePath the path to the HFile - * @param maxTimestamp the maximum timestamp to validate against - * @return {@code true} if the data is hot, {@code false} otherwise - * @throws DataTieringException if there is an error retrieving data tiering information - - public boolean isHotData(Path hFilePath, long maxTimestamp) throws DataTieringException { - Configuration configuration = getConfiguration(hFilePath); - DataTieringType dataTieringType = getDataTieringType(configuration); - - if (!dataTieringType.equals(DataTieringType.NONE)) { - return hotDataValidator(maxTimestamp, getDataTieringHotDataAge(configuration)); - } - // DataTieringType.NONE or other types are considered hot by default - return true; - } - */ - /** * Determines whether the data in the HFile being read is considered hot based on the configured * data tiering type and hot data age. If the data tiering type is set to diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringType.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringType.java index 88c03a9e610..4e4b6edd25c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringType.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DataTieringType.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.hbase.regionserver; -import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTracker; import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Public diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellDateTieredCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactionPolicy.java similarity index 90% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellDateTieredCompactionPolicy.java rename to hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactionPolicy.java index 07e5376a389..e540bf62bf2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellDateTieredCompactionPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactionPolicy.java @@ -26,6 +26,8 @@ import org.apache.hadoop.hbase.regionserver.StoreUtils; import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.yetus.audience.InterfaceAudience; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -44,20 +46,25 @@ import static org.apache.hadoop.hbase.regionserver.CustomTieringMultiFileWriter. * */ @InterfaceAudience.Private -public class CustomCellDateTieredCompactionPolicy extends DateTieredCompactionPolicy { +public class CustomCellTieredCompactionPolicy extends DateTieredCompactionPolicy { public static final String AGE_LIMIT_MILLIS = "hbase.hstore.compaction.date.tiered.custom.age.limit.millis"; + //Defaults to 10 years + public static final long DEFAULT_AGE_LIMIT_MILLIS = (long) (10L*365.25*24L*60L*60L*1000L); + public static final String TIERING_CELL_QUALIFIER = "TIERING_CELL_QUALIFIER"; + private static final Logger LOG = LoggerFactory.getLogger(CustomCellTieredCompactionPolicy.class); + private long cutOffTimestamp; - public CustomCellDateTieredCompactionPolicy(Configuration conf, + public CustomCellTieredCompactionPolicy(Configuration conf, StoreConfigInformation storeConfigInfo) throws IOException { super(conf, storeConfigInfo); cutOffTimestamp = EnvironmentEdgeManager.currentTime() - - conf.getLong(AGE_LIMIT_MILLIS, (long) (10L*365.25*24L*60L*60L*1000L)); + conf.getLong(AGE_LIMIT_MILLIS, DEFAULT_AGE_LIMIT_MILLIS); } @@ -76,7 +83,7 @@ public class CustomCellDateTieredCompactionPolicy extends DateTieredCompactionPo minCurrent = timeRangeTracker.getMin(); maxCurrent = timeRangeTracker.getMax(); } catch (IOException e) { - //TODO debug this + LOG.warn("Got TIERING_CELL_TIME_RANGE info from file, but failed to parse it:", e); } } if(minCurrent < min.getValue()) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactor.java index 21b98b5611b..76948691d89 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredCompactor.java @@ -34,7 +34,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Optional; -import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy.TIERING_CELL_QUALIFIER; +import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy.TIERING_CELL_QUALIFIER; /** * An extension of DateTieredCompactor, overriding the decorateCells method to allow for custom diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredUtils.java similarity index 76% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java rename to hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredUtils.java index 2a8bd3b449b..e6ee4757118 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieredUtils.java @@ -20,26 +20,17 @@ package org.apache.hadoop.hbase.regionserver.compactions; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.TableDescriptor; -import org.apache.hadoop.hbase.regionserver.StoreEngine; -import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import static org.apache.hadoop.hbase.regionserver.StoreEngine.STORE_ENGINE_CLASS_KEY; -import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy.TIERING_CELL_QUALIFIER; +import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy.TIERING_CELL_QUALIFIER; @InterfaceAudience.Private -public class CustomCellTieringUtils { - - private static final Logger LOG = LoggerFactory.getLogger(CustomCellTieringUtils.class); +public class CustomCellTieredUtils { public static void checkForModifyTable(TableDescriptor newTable) throws IOException { for(ColumnFamilyDescriptor descriptor : newTable.getColumnFamilies()) { String storeEngineClassName = descriptor.getConfigurationValue(STORE_ENGINE_CLASS_KEY); - LOG.info("checking alter table for custom cell tiering on CF: {}. StoreEngine class: {}, " - + "TIERING_CELL_QUALIFIER: {}", Bytes.toString(descriptor.getName()), - storeEngineClassName, descriptor.getConfigurationValue(TIERING_CELL_QUALIFIER)); if (storeEngineClassName != null && storeEngineClassName. contains("CustomCellTieredStoreEngine")) { if( descriptor.getConfigurationValue(TIERING_CELL_QUALIFIER) == null ) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCustomCellTieredCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCustomCellTieredCompactionPolicy.java index d50d5a4acb8..18100aca050 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCustomCellTieredCompactionPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCustomCellTieredCompactionPolicy.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.RegionInfo; -import org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy; +import org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy; import org.apache.hadoop.hbase.regionserver.compactions.DateTieredCompactionRequest; import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerForTest; import org.apache.hadoop.hbase.testclassification.RegionServerTests; @@ -80,16 +80,16 @@ public class TestCustomCellTieredCompactionPolicy { return msf; } - private CustomCellDateTieredCompactionPolicy mockAndCreatePolicy() throws Exception { + private CustomCellTieredCompactionPolicy mockAndCreatePolicy() throws Exception { RegionInfo mockedRegionInfo = mockRegionInfo(); return mockAndCreatePolicy(mockedRegionInfo); } - private CustomCellDateTieredCompactionPolicy mockAndCreatePolicy(RegionInfo regionInfo) throws Exception { + private CustomCellTieredCompactionPolicy mockAndCreatePolicy(RegionInfo regionInfo) throws Exception { StoreConfigInformation mockedStoreConfig = mock(StoreConfigInformation.class); when(mockedStoreConfig.getRegionInfo()).thenReturn(regionInfo); - CustomCellDateTieredCompactionPolicy policy = - new CustomCellDateTieredCompactionPolicy(TEST_UTIL.getConfiguration(), mockedStoreConfig); + CustomCellTieredCompactionPolicy policy = + new CustomCellTieredCompactionPolicy(TEST_UTIL.getConfiguration(), mockedStoreConfig); return policy; } @@ -108,7 +108,7 @@ public class TestCustomCellTieredCompactionPolicy { } @Test public void testGetCompactBoundariesForMajorNoOld() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, EnvironmentEdgeManager.currentTime(), EnvironmentEdgeManager.currentTime(), @@ -121,7 +121,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testGetCompactBoundariesForMajorAllOld() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); //The default cut off age is 10 years, so any of the min/max value there should get in the old tier @@ -133,7 +133,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testGetCompactBoundariesForMajorOneOnEachSide() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, 0, 1, 1024, 0)); @@ -144,7 +144,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testGetCompactBoundariesForMajorOneCrossing() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, 0, EnvironmentEdgeManager.currentTime(), 1024, 0)); @@ -158,9 +158,9 @@ public class TestCustomCellTieredCompactionPolicy { } private void testShouldPerformMajorCompaction(long min, long max, int numFiles, - PolicyValidator<CustomCellDateTieredCompactionPolicy, ArrayList<HStoreFile>> validation) throws Exception { + PolicyValidator<CustomCellTieredCompactionPolicy, ArrayList<HStoreFile>> validation) throws Exception { + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); RegionInfo mockedRegionInfo = mockRegionInfo(); - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(mockedRegionInfo); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); ManualEnvironmentEdge timeMachine = new ManualEnvironmentEdge(); @@ -203,7 +203,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testSelectMinorCompactionTwoFilesNoOld() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, EnvironmentEdgeManager.currentTime(), EnvironmentEdgeManager.currentTime(), @@ -218,7 +218,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testSelectMinorCompactionThreeFilesNoOld() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, EnvironmentEdgeManager.currentTime(), EnvironmentEdgeManager.currentTime(), @@ -233,7 +233,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testSelectMinorCompactionThreeFilesAllOld() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, 0, 1, @@ -248,7 +248,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testSelectMinorCompactionThreeFilesOneOldTwoNew() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, 0, 1, @@ -263,7 +263,7 @@ public class TestCustomCellTieredCompactionPolicy { @Test public void testSelectMinorCompactionThreeFilesTwoOldOneNew() throws Exception { - CustomCellDateTieredCompactionPolicy policy = mockAndCreatePolicy(); + CustomCellTieredCompactionPolicy policy = mockAndCreatePolicy(); Path file = preparePath(); ArrayList<HStoreFile> files = new ArrayList<>(); files.add(createFile(file, 0, 1, diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCustomCellTieredCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCustomCellTieredCompactor.java index f76b6857a41..e44e0975885 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCustomCellTieredCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCustomCellTieredCompactor.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import static org.apache.hadoop.hbase.regionserver.CustomTieringMultiFileWriter.TIERING_CELL_TIME_RANGE; -import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellDateTieredCompactionPolicy.TIERING_CELL_QUALIFIER; +import static org.apache.hadoop.hbase.regionserver.compactions.CustomCellTieredCompactionPolicy.TIERING_CELL_QUALIFIER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail;
