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

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Stefan Miklosovic 2025-03-06 14:28:29 +01:00
parent 4d29990c47 4f382d93f5
commit cc63d3cd83
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 126 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.build/parent-pom-template.xml
View File

@ -302,7 +302,7 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.5-1</version>
<version>1.5.7-1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

2
CHANGES.txt
View File

@ -192,6 +192,8 @@ Merged from 4.1:
* Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
Merged from 4.0:
* Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
* Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
* Fix autocompletion for role names/user names (CASSANDRA-20175)
* Tighten up permissions in dc and cidr authorizers (CASSANDRA-20225)
* CBUtil serialization of UTF8 does not handle all UTF8 properly (CASSANDRA-20234)

2
ide/nbproject/project.xml
View File

File diff suppressed because one or more lines are too long

122
test/distributed/org/apache/cassandra/distributed/upgrade/CompressionUpgradeTest.java Normal file
View File

@ -0,0 +1,122 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cassandra.distributed.upgrade;
import org.junit.Test;
import org.apache.cassandra.io.compress.DeflateCompressor;
import org.apache.cassandra.io.compress.LZ4Compressor;
import org.apache.cassandra.io.compress.SnappyCompressor;
import org.apache.cassandra.io.compress.ZstdCompressor;
import static java.lang.String.format;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL;
import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
import static org.apache.cassandra.distributed.api.Feature.NETWORK;
import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
import static org.apache.cassandra.distributed.shared.AssertUtils.fail;
import static org.apache.cassandra.distributed.shared.AssertUtils.row;
public class CompressionUpgradeTest extends UpgradeTestBase
{
@Test
public void testCompressors() throws Throwable
{
String[][] zstdQueries = forZstd();
run(new String[][]{
zstdQueries[0], // min
zstdQueries[1], // max
zstdQueries[2], // default
forCompressor(SnappyCompressor.class),
forCompressor(DeflateCompressor.class),
forCompressor(LZ4Compressor.class)
});
}
private String[][] forZstd()
{
String tableTemplate = "CREATE TABLE %s.%s (pk int, ck int, v int, PRIMARY KEY (pk, ck)) WITH compression = {'class': '" + ZstdCompressor.class.getSimpleName() + "', 'compression_level': %s}";
String insertTemplate = "INSERT INTO %s.%s (pk, ck, v) VALUES (1, 1, 1)";
String selectTemplate = "SELECT * FROM %s.%s WHERE pk = 1";
// Zstd min and max compression levels, (Zstd.{min,default,max}CompressionLevel())
// It should be possible to create a table with this level in each version and read / write data with it
String[][] params = new String[][]{ { "tbl_zstd_min_compression_level", Integer.toString(-131072) },
{ "tbl_zstd_max_compression_level", Integer.toString(22) },
{ "tbl_zstd_default_compression_level", Integer.toString(3) } };
String[][] zstdQueries = new String[params.length][params.length];
for (int i = 0; i < params.length; i++)
{
zstdQueries[i][0] = format(tableTemplate, KEYSPACE, params[i][0], params[i][1]);
zstdQueries[i][1] = format(insertTemplate, KEYSPACE, params[i][0]);
zstdQueries[i][2] = format(selectTemplate, KEYSPACE, params[i][0]);
}
return zstdQueries;
}
private String[] forCompressor(Class<?> compressorClass)
{
String compressorName = compressorClass.getSimpleName();
return new String[]{
"CREATE TABLE " + KEYSPACE + ".tbl_" + compressorName + " (pk int, ck int, v int, PRIMARY KEY (pk, ck)) WITH compression = {'class': '" + compressorName + "'}",
"INSERT INTO " + KEYSPACE + ".tbl_" + compressorName + " (pk, ck, v) VALUES (1, 1, 1)",
"SELECT * FROM " + KEYSPACE + ".tbl_" + compressorName + " WHERE pk = 1"
};
}
private void run(String[][] queries) throws Throwable
{
new TestCase()
.nodes(2)
.nodesToUpgrade(1)
.withConfig((cfg) -> cfg.with(NETWORK, GOSSIP))
.upgradesToCurrentFrom(OLDEST)
.setup((cluster) -> {
for (int i = 0; i < queries.length; i++)
{
try
{
cluster.schemaChange(queries[i][0]);
cluster.coordinator(1).execute(queries[i][1], ALL);
}
catch (Throwable t)
{
fail(format("Detected error against table %s", queries[i][0]));
}
}
})
.runAfterNodeUpgrade((cluster, node) -> {
for (int i : new int[]{ 1, 2 })
for (int j = 0; j < queries.length; j++)
{
try
{
assertRows(cluster.coordinator(i).execute(queries[j][2], ALL), row(1, 1, 1));
}
catch (AssertionError e)
{
fail(format("Detected failed response from coordinator %s against table %s", i, queries[j][0]));
}
}
}).run();
}
}