HBASE-25651 NORMALIZER_TARGET_REGION_SIZE needs a unit in its name (#3063)
Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> Signed-off-by: Baiqiang Zhao <ZhaoBQ>
This commit is contained in:
parent
7218c83f81
commit
560297d189
|
@ -172,7 +172,14 @@ public class TableDescriptorBuilder {
|
|||
new Bytes(Bytes.toBytes(NORMALIZER_TARGET_REGION_COUNT));
|
||||
|
||||
@InterfaceAudience.Private
|
||||
public static final String NORMALIZER_TARGET_REGION_SIZE_MB = "NORMALIZER_TARGET_REGION_SIZE_MB";
|
||||
private static final Bytes NORMALIZER_TARGET_REGION_SIZE_MB_KEY =
|
||||
new Bytes(Bytes.toBytes(NORMALIZER_TARGET_REGION_SIZE_MB));
|
||||
// TODO: Keeping backward compatability with HBASE-25651 change. Can be removed in later version
|
||||
@InterfaceAudience.Private
|
||||
@Deprecated
|
||||
public static final String NORMALIZER_TARGET_REGION_SIZE = "NORMALIZER_TARGET_REGION_SIZE";
|
||||
@Deprecated
|
||||
private static final Bytes NORMALIZER_TARGET_REGION_SIZE_KEY =
|
||||
new Bytes(Bytes.toBytes(NORMALIZER_TARGET_REGION_SIZE));
|
||||
|
||||
|
@ -884,7 +891,10 @@ public class TableDescriptorBuilder {
|
|||
*/
|
||||
@Override
|
||||
public long getNormalizerTargetRegionSize() {
|
||||
return getOrDefault(NORMALIZER_TARGET_REGION_SIZE_KEY, Long::valueOf, Long.valueOf(-1));
|
||||
long target_region_size =
|
||||
getOrDefault(NORMALIZER_TARGET_REGION_SIZE_MB_KEY, Long::valueOf, Long.valueOf(-1));
|
||||
return target_region_size == Long.valueOf(-1) ? getOrDefault(
|
||||
NORMALIZER_TARGET_REGION_SIZE_KEY, Long::valueOf, Long.valueOf(-1)) : target_region_size;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -912,7 +922,7 @@ public class TableDescriptorBuilder {
|
|||
* @return the modifyable TD
|
||||
*/
|
||||
public ModifyableTableDescriptor setNormalizerTargetRegionSize(final long regionSize) {
|
||||
return setValue(NORMALIZER_TARGET_REGION_SIZE_KEY, Long.toString(regionSize));
|
||||
return setValue(NORMALIZER_TARGET_REGION_SIZE_MB_KEY, Long.toString(regionSize));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1514,7 +1514,13 @@ module Hbase
|
|||
tdb.setMergeEnabled(JBoolean.valueOf(arg.delete(TableDescriptorBuilder::MERGE_ENABLED))) if arg.include?(TableDescriptorBuilder::MERGE_ENABLED)
|
||||
tdb.setNormalizationEnabled(JBoolean.valueOf(arg.delete(TableDescriptorBuilder::NORMALIZATION_ENABLED))) if arg.include?(TableDescriptorBuilder::NORMALIZATION_ENABLED)
|
||||
tdb.setNormalizerTargetRegionCount(JInteger.valueOf(arg.delete(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_COUNT))) if arg.include?(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_COUNT)
|
||||
tdb.setNormalizerTargetRegionSize(JLong.valueOf(arg.delete(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE))) if arg.include?(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE)
|
||||
# TODO: Keeping backward compatability for NORMALIZER_TARGET_REGION_SIZE with HBASE-25651 change. Can be removed in later version
|
||||
if arg.include?(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE)
|
||||
warn 'Use of NORMALIZER_TARGET_REGION_SIZE has been deprecated and will be removed in future version, please use NORMALIZER_TARGET_REGION_SIZE_MB instead'
|
||||
tdb.setNormalizerTargetRegionSize(JLong.valueOf(arg.delete(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE)))
|
||||
end
|
||||
tdb.setNormalizerTargetRegionSize(JLong.valueOf(arg.delete(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE_MB))) \
|
||||
if arg.include?(TableDescriptorBuilder::NORMALIZER_TARGET_REGION_SIZE_MB)
|
||||
tdb.setMemStoreFlushSize(arg.delete(TableDescriptorBuilder::MEMSTORE_FLUSHSIZE)) if arg.include?(TableDescriptorBuilder::MEMSTORE_FLUSHSIZE)
|
||||
tdb.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(TableDescriptorBuilder::DURABILITY))) if arg.include?(TableDescriptorBuilder::DURABILITY)
|
||||
tdb.setPriority(JInteger.valueOf(arg.delete(TableDescriptorBuilder::PRIORITY))) if arg.include?(TableDescriptorBuilder::PRIORITY)
|
||||
|
|
|
@ -48,7 +48,7 @@ To delete the 'f1' column family in table 'ns1:t1', use one of:
|
|||
|
||||
You can also change table-scope attributes like MAX_FILESIZE, READONLY,
|
||||
MEMSTORE_FLUSHSIZE, NORMALIZATION_ENABLED, NORMALIZER_TARGET_REGION_COUNT,
|
||||
NORMALIZER_TARGET_REGION_SIZE(MB), DURABILITY, etc. These can be put at the end;
|
||||
NORMALIZER_TARGET_REGION_SIZE_MB, DURABILITY, etc. These can be put at the end;
|
||||
for example, to change the max size of a region to 128MB, do:
|
||||
|
||||
hbase> alter 't1', MAX_FILESIZE => '134217728'
|
||||
|
|
|
@ -917,6 +917,13 @@ module Hbase
|
|||
assert_match(/12345678/, admin.describe(@test_name))
|
||||
end
|
||||
|
||||
define_test 'alter should be able to set the TargetRegionSizeMB and TargetRegionCount' do
|
||||
command(:alter, @test_name, 'NORMALIZER_TARGET_REGION_COUNT' => 156)
|
||||
assert_match(/156/, admin.describe(@test_name))
|
||||
command(:alter, @test_name, 'NORMALIZER_TARGET_REGION_SIZE_MB' => 234)
|
||||
assert_match(/234/, admin.describe(@test_name))
|
||||
end
|
||||
|
||||
define_test 'alter should be able to set the TargetRegionSize and TargetRegionCount' do
|
||||
command(:alter, @test_name, 'NORMALIZER_TARGET_REGION_COUNT' => 156)
|
||||
assert_match(/156/, admin.describe(@test_name))
|
||||
|
|
Loading…
Reference in New Issue