Update Zstd library to 1.5.7-1

patch by Stefan Miklosovic; reviewed by Yifan Cai for CASSANDRA-20367
This commit is contained in:
Stefan Miklosovic 2025-02-28 14:13:27 +01:00
parent 914046ae46
commit ef354d0d5e
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 97 additions and 2 deletions

View File

@ -1,4 +1,6 @@
4.0.18
* Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
* Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
4.0.17

View File

@ -547,7 +547,7 @@
<dependencyManagement>
<dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.10.4"/>
<dependency groupId="org.lz4" artifactId="lz4-java" version="1.8.0"/>
<dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.5-1"/>
<dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.7-1"/>
<dependency groupId="com.google.guava" artifactId="guava" version="27.0-jre">
<exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
<exclusion groupId="org.codehaus.mojo" artifactId="animal-sniffer-annotations" />

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,93 @@
/*
* 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 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
{
run(new String[][]{
forCompressor(SnappyCompressor.class),
forCompressor(DeflateCompressor.class),
forCompressor(LZ4Compressor.class)
});
}
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))
.upgradesFrom(v3X)
.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();
}
}