natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid unit conversion in DatabaseDescriptor.getMaxValueSize() for every deserializing Cell 

patch by Dmitry Konstantinov; reviewed by Francisco Guerrero for CASSANDRA-21295
This commit is contained in:
Dmitry Konstantinov 2026-04-16 18:09:21 +01:00
parent 8fd2443afc
commit 3e75652232
5 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
6.0-alpha2
* Avoid unit conversion in DatabaseDescriptor.getMaxValueSize() for every deserializing Cell (CASSANDRA-21295)
* Fix single token batch atomicity with Accord/non-Accord batches by using the batch log (CASSANDRA-20588)
* Avoid CompactionOptions parsing for every read by WithoutPurgeableTombstones (CASSANDRA-21294)
* Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246)

29
src/java/org/apache/cassandra/config/DataStorageSpec.java
View File

@ -170,6 +170,8 @@ public abstract class DataStorageSpec
*/
public final static class LongBytesBound extends DataStorageSpec
{
private final long bytes;
/**
* Creates a {@code DataStorageSpec.LongBytesBound} of the specified amount.
*
@ -178,6 +180,7 @@ public abstract class DataStorageSpec
public LongBytesBound(String value)
{
super(value, BYTES, Long.MAX_VALUE);
bytes = unit().toBytes(quantity());
}
/**
@ -189,6 +192,7 @@ public abstract class DataStorageSpec
public LongBytesBound(long quantity, DataStorageUnit unit)
{
super(quantity, unit, BYTES, Long.MAX_VALUE, quantity + unit.symbol);
bytes = unit().toBytes(quantity());
}
/**
@ -206,7 +210,7 @@ public abstract class DataStorageSpec
*/
public long toBytes()
{
return unit().toBytes(quantity());
return bytes;
}
/**
@ -225,6 +229,8 @@ public abstract class DataStorageSpec
*/
public final static class IntBytesBound extends DataStorageSpec
{
private final int bytes;
/**
* Creates a {@code DataStorageSpec.IntBytesBound} of the specified amount.
*
@ -233,6 +239,7 @@ public abstract class DataStorageSpec
public IntBytesBound(String value)
{
super(value, BYTES, Integer.MAX_VALUE);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -244,6 +251,7 @@ public abstract class DataStorageSpec
public IntBytesBound(long quantity, DataStorageUnit unit)
{
super(quantity, unit, BYTES, Integer.MAX_VALUE, quantity + unit.symbol);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -263,7 +271,7 @@ public abstract class DataStorageSpec
*/
public int toBytes()
{
return Ints.saturatedCast(unit().toBytes(quantity()));
return bytes;
}
}
@ -274,6 +282,8 @@ public abstract class DataStorageSpec
*/
public final static class IntKibibytesBound extends DataStorageSpec
{
private final int bytes;
/**
* Creates a {@code DataStorageSpec.IntKibibytesBound} of the specified amount.
*
@ -282,6 +292,7 @@ public abstract class DataStorageSpec
public IntKibibytesBound(String value)
{
super(value, KIBIBYTES, Integer.MAX_VALUE);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -293,6 +304,7 @@ public abstract class DataStorageSpec
public IntKibibytesBound(long quantity, DataStorageUnit unit)
{
super(quantity, unit, KIBIBYTES, Integer.MAX_VALUE, quantity + unit.symbol);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -312,7 +324,7 @@ public abstract class DataStorageSpec
*/
public int toBytes()
{
return Ints.saturatedCast(unit().toBytes(quantity()));
return bytes;
}
/**
@ -341,6 +353,8 @@ public abstract class DataStorageSpec
*/
public final static class LongMebibytesBound extends DataStorageSpec
{
private final long bytes;
/**
* Creates a {@code DataStorageSpec.LongMebibytesBound} of the specified amount.
*
@ -349,6 +363,7 @@ public abstract class DataStorageSpec
public LongMebibytesBound(String value)
{
super(value, MEBIBYTES, Long.MAX_VALUE);
bytes = unit().toBytes(quantity());
}
/**
@ -360,6 +375,7 @@ public abstract class DataStorageSpec
public LongMebibytesBound(long quantity, DataStorageUnit unit)
{
super(quantity, unit, MEBIBYTES, Long.MAX_VALUE, quantity + unit.symbol);
bytes = unit().toBytes(quantity());
}
/**
@ -377,7 +393,7 @@ public abstract class DataStorageSpec
*/
public long toBytes()
{
return unit().toBytes(quantity());
return bytes;
}
/**
@ -404,6 +420,7 @@ public abstract class DataStorageSpec
*/
public final static class IntMebibytesBound extends DataStorageSpec
{
private final int bytes;
/**
* Creates a {@code DataStorageSpec.IntMebibytesBound} of the specified amount.
*
@ -412,6 +429,7 @@ public abstract class DataStorageSpec
public IntMebibytesBound(String value)
{
super(value, MEBIBYTES, Integer.MAX_VALUE);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -423,6 +441,7 @@ public abstract class DataStorageSpec
public IntMebibytesBound(long quantity, DataStorageUnit unit)
{
super(quantity, unit, MEBIBYTES, Integer.MAX_VALUE, quantity + unit.symbol);
bytes = Ints.saturatedCast(unit().toBytes(quantity()));
}
/**
@ -442,7 +461,7 @@ public abstract class DataStorageSpec
*/
public int toBytes()
{
return Ints.saturatedCast(unit().toBytes(quantity()));
return bytes;
}
/**

2
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -2322,7 +2322,7 @@ public class DatabaseDescriptor
public static int getMaxValueSize()
{
return Ints.saturatedCast(conf.max_value_size.toMebibytes() * 1024L * 1024);
return conf.max_value_size.toBytes();
}
public static void setMaxValueSize(int maxValueSizeInBytes)

2
test/unit/org/apache/cassandra/config/DataStorageSpecTest.java
View File

@ -49,7 +49,9 @@ public class DataStorageSpecTest
assertEquals(10240, new DataStorageSpec.LongMebibytesBound("10MiB").toKibibytes());
assertEquals(1024 * 1024 * 1024, new DataStorageSpec.IntBytesBound("1GiB").toBytes());
assertEquals(10240, new DataStorageSpec.IntKibibytesBound("10MiB").toKibibytes());
assertEquals(10 * 1024 * 1024, new DataStorageSpec.IntKibibytesBound("10MiB").toBytes());
assertEquals(1024, new DataStorageSpec.IntMebibytesBound("1GiB").toMebibytes());
assertEquals(1024 * 1024 * 1024, new DataStorageSpec.IntMebibytesBound("1GiB").toBytes());
assertEquals(10, new DataStorageSpec.LongBytesBound(10, BYTES).toBytes());
assertEquals(10240, new DataStorageSpec.LongBytesBound(10, KIBIBYTES).toBytes());

7
test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
View File

@ -1067,4 +1067,11 @@ public class DatabaseDescriptorTest
assertThat(DatabaseDescriptor.getCommitLogWriteDiskAccessMode()).isEqualTo(mode);
}
}
@Test
public void testMaxValueSize()
{
Config config = DatabaseDescriptor.loadConfig();
Assert.assertEquals(config.max_value_size.toMebibytes() * 1024 * 1024, DatabaseDescriptor.getMaxValueSize());
}
}