Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.0 test2 #178

Open
wants to merge 128 commits into
base: cassandra-4.0
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
1205a9d
Don't allow seeds to replace without using unsafe
vincewhite May 21, 2018
e5bc257
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Jul 23, 2021
35d8777
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Jul 23, 2021
3259d6d
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
michaelsembwever Mar 28, 2021
3d7c824
Offline build mode
michaelsembwever Apr 3, 2021
6bf9b8b
Update IDE, Eclipse and NetBeans, classpaths for tests
michaelsembwever Apr 5, 2021
e243026
Don't put apidocs (javadoc) into the binary artifact
michaelsembwever Apr 9, 2021
d3e174f
Fix broken IntelliJ configuration Authored by Jacek Lewandowski; revi…
jacek-lewandowski Apr 20, 2021
27de93e
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Jul 25, 2021
2fdf1d2
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
michaelsembwever Mar 28, 2021
e695051
Offline build mode
michaelsembwever Apr 3, 2021
c44dfab
Add JStackJUnitTask to avoid downloading the jar
krummas Apr 7, 2021
fd77323
Update IDE, Eclipse and NetBeans, classpaths for tests
michaelsembwever Apr 5, 2021
b2cfe2e
Fix warning about multiple versions of ant detected when running ant …
ekaterinadimitrova2 Apr 7, 2021
7fafda8
Don't fork jvms in the build
michaelsembwever Apr 9, 2021
3e54ed7
Don't put apidocs (javadoc) into the binary artifact
michaelsembwever Apr 9, 2021
8857d04
Fix broken IntelliJ configuration Authored by Jacek Lewandowski; revi…
jacek-lewandowski Apr 20, 2021
4950878
update IDEA setup generation to mark test/conf as test resources
maedhroz Jun 16, 2021
06235e9
Prepare for release 3.0.25
driftx Jul 25, 2021
4cafe22
Prepare for release 3.11.11
driftx Jul 25, 2021
77e18b1
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Jul 28, 2021
8b880f3
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Jul 28, 2021
8e9e4ae
Incrememnt version
driftx Jul 28, 2021
760c7e8
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Jul 28, 2021
7e2a965
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Jul 28, 2021
69b653a
Remove mutation data from error log message
adelapena Jul 29, 2021
01add65
Merge branch 'cassandra-3.0' into cassandra-3.11
adelapena Jul 29, 2021
bc51c57
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Jul 29, 2021
e399dea
Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID()
JeetKunDoug Jul 30, 2021
a88f4b3
Merge branch cassandra-3.0 into cassandra-3.11
blerer Jul 30, 2021
f09ef63
Merge branch cassandra-3.11 into cassandra-4.0
blerer Jul 30, 2021
d319352
Improve help, doc and error messages about sstabledump -k and -x argu…
adelapena Jul 30, 2021
f575eea
HintsBuffer rewriten CAS loops to atomic adds, CommitLogSegment adds …
michaelsembwever Jul 31, 2020
8c406b2
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Aug 1, 2021
cb37035
Avoid sending CDC column if not enabled
krummas Jun 28, 2021
0685f2d
Merge branch 'cassandra-3.11' into cassandra-4.0
krummas Aug 4, 2021
acf38bf
Use JMX to validate nodetool --jobs parameter
Aug 6, 2021
952df13
Merge branch 'cassandra-3.0' into cassandra-3.11
adelapena Aug 6, 2021
762df84
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Aug 6, 2021
09c157e
Dockerise cqlshlib tests
michaelsembwever Jul 18, 2021
5a9635b
Merge branch 'cassandra-3.0' into cassandra-3.11
michaelsembwever Aug 10, 2021
148d373
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Aug 10, 2021
7bab2da
Dockerise cqlshlib tests
michaelsembwever Jul 17, 2021
6e16921
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Aug 10, 2021
a9abccb
Fix flaky SSTableExportTest to run first the tests calling assertSche…
adelapena Aug 10, 2021
ca6bb2a
Resolve ant-junit dependency issue CASSANDRA-16827
ekaterinadimitrova2 Aug 4, 2021
112513c
Merge branch 'cassandra-3.11' into cassandra-4.0
ekaterinadimitrova2 Aug 10, 2021
979ab72
ArrayClustering.unsharedHeapSize does not include the data so underco…
dcapwell Aug 11, 2021
99e1fcc
Materialized views incorrect quoting of UDF
bereng Aug 11, 2021
f242ccb
Merge branch 'cassandra-3.11' into cassandra-4.0
bereng Aug 13, 2021
ad139da
fix incorrect error message in LegacyLayout
smiklosovic Aug 13, 2021
0f836cc
Merge branch 'cassandra-3.0' into cassandra-3.11
smiklosovic Aug 16, 2021
f194d1a
Merge branch 'cassandra-3.11' into cassandra-4.0
smiklosovic Aug 16, 2021
0770666
Build tests in CircleCI build job
adelapena Aug 16, 2021
1482ead
Merge branch 'cassandra-3.0' into cassandra-3.11
adelapena Aug 16, 2021
5f755e6
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Aug 16, 2021
ce21eb5
Add tests for the Hint service metrics
adelapena Aug 17, 2021
770dee5
Regenerate CircleCI's MIDRES config file
adelapena Aug 17, 2021
af6654c
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Aug 17, 2021
e581a85
Fixup scrub output when no data post-scrub and clear up old use of ro…
pcmanus Jul 20, 2021
cb19b39
Merge branch 'cassandra-3.11' into cassandra-4.0
ekaterinadimitrova2 Aug 17, 2021
632790f
Remove possible infinite loop in NIODataInputStreamTest
Aug 18, 2021
6eb02a2
Merge branch cassandra-3.0 into cassandra-3.11
blerer Aug 18, 2021
433274b
Merge branch cassandra-3.11 into cassandra-4.0
blerer Aug 18, 2021
23b61a5
Prevent broken concurrent schema pulls
bereng Aug 16, 2021
f80b177
Merge branch 'cassandra-3.11' into cassandra-4.0
bereng Aug 19, 2021
ddcf3e6
Avoid logging full stack trace when index summary redistribution is c…
jmckenzie-dev Aug 16, 2021
c562f1e
validate SASI tokenizer options before adding index to schema
smiklosovic Aug 18, 2021
2dc7501
Merge branch 'cassandra-3.11' into cassandra-4.0
smiklosovic Aug 23, 2021
c76ff1b
Fix secondary indexes on primary key columns skipping some writes
adelapena Aug 24, 2021
0c38f9d
Merge branch 'cassandra-3.0' into cassandra-3.11
adelapena Aug 24, 2021
31ce794
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Aug 24, 2021
b824273
Remove assumption that all urgent messages are small
beobal Aug 12, 2021
42025fd
Bump zstd-jni version to 1.5.0-4
yifan-c Aug 26, 2021
585bc69
Move RepairedDataInfo to the execution controller rather than the Rea…
beobal Jun 2, 2021
2b6799a
Harden PrunableArrayQueue against Pruner implementations that might t…
ifesdjeen Aug 13, 2021
f59411f
Tolerate missing DNS entry when completing host replacement
clohfink Aug 13, 2021
6709111
Prepare debian changelog for 4.0.1
beobal Aug 30, 2021
b0cdaec
Exclude Jackson 1.x transitive dependency of hadoop* provided depende…
michaelsembwever Aug 30, 2021
a6ea521
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Aug 30, 2021
1038f44
Remove duplicate 'lib.download.sha' entries in build-resolver.xml
michaelsembwever Aug 30, 2021
9ed0150
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Aug 30, 2021
78c6279
Replace spinAsserts code with Awaitility code
bereng Aug 18, 2021
af17f13
Fix clustering order logic in CREATE MATERIALIZED VIEW
blerer Aug 30, 2021
ca4f6b8
org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData …
dcapwell Aug 30, 2021
f9d41ff
Avoid signaling DigestResolver until the minimum number of responses …
maedhroz Aug 24, 2021
e562118
Merge branch 'cassandra-3.0' into cassandra-3.11
maedhroz Aug 31, 2021
46a740c
Merge branch 'cassandra-3.11' into cassandra-4.0
maedhroz Aug 31, 2021
c36c081
Delay auth setup until after gossip has settled to avoid unavailables…
krummas Jul 1, 2021
e4b37c3
Add resource flags to CircleCI config generation script
adelapena Aug 20, 2021
595596e
Merge branch 'cassandra-3.0' into cassandra-3.11
adelapena Sep 1, 2021
b5e1386
Merge branch 'cassandra-3.11' into cassandra-4.0
adelapena Sep 1, 2021
957c626
Nodetool setcachecapacity behaves oddly when cache disabled
bereng Aug 19, 2021
6a4a93a
Merge branch 'cassandra-3.11' into cassandra-4.0
bereng Sep 2, 2021
67eb22e
Fix materialized view schema backup as table
ekaterinadimitrova2 Jul 9, 2021
d6e1c41
Merge branch 'cassandra-3.0' into cassandra-3.11
ekaterinadimitrova2 Sep 3, 2021
49e8302
Merge branch 'cassandra-3.11' into cassandra-4.0
ekaterinadimitrova2 Sep 3, 2021
2e547df
Add python2 location to RPMs
michaelsembwever Aug 2, 2021
615372f
Merge branch 'cassandra-2.2' into cassandra-3.0
driftx Sep 3, 2021
ecf186f
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Sep 3, 2021
752160c
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Sep 3, 2021
267d3ce
make the addition of regular column to COMPACT tables throw an Invali…
smiklosovic Aug 16, 2021
29d78af
Merge branch 'cassandra-3.0' into cassandra-3.11
smiklosovic Sep 6, 2021
9c90cf7
Merge branch 'cassandra-3.11' into cassandra-4.0
smiklosovic Sep 6, 2021
57f53f5
Avoid removing batch when it's not created during view replication
ekaterinadimitrova2 Jul 16, 2021
e644a99
Merge branch 'cassandra-3.0' into cassandra-3.11
ekaterinadimitrova2 Sep 7, 2021
4ed28cb
Merge branch 'cassandra-3.11' into cassandra-4.0
ekaterinadimitrova2 Sep 7, 2021
9a34ecd
Increment version to 4.0.2
beobal Sep 7, 2021
d90cd51
Fix CHANGES.txt entries after bumping version to 4.0.2
beobal Sep 7, 2021
5cdddcf
Make assassinate more resilient to missing tokens
driftx Aug 12, 2021
ffc6593
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Sep 8, 2021
bc052fa
Remove all the state pollution between tests in SSTableReaderTest
maedhroz Sep 9, 2021
8b0b22e
Cassandra fails to process OperationExecutionException which causes C…
bereng Sep 6, 2021
636ab42
Fix missed wait latencies in the output of `nodetool tpstats -F`
adelapena Sep 10, 2021
b6f0864
Add semver4j to the default shared packages in the jvm dtests
michaelsembwever Sep 10, 2021
32194ec
Merge branch 'cassandra-3.0' into cassandra-3.11
michaelsembwever Sep 10, 2021
05e7cc1
Merge branch 'cassandra-3.11' into cassandra-4.0
michaelsembwever Sep 10, 2021
be649d5
catch UnsatisfiedLinkError in WindowsTimer
sldr Sep 15, 2021
d37a967
Merge branch 'cassandra-3.0' into cassandra-3.11
driftx Sep 15, 2021
a1790a6
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Sep 15, 2021
24b084f
include SASI components to snapshots
vincewhite May 16, 2019
57c1c61
Merge branch 'cassandra-3.11' into cassandra-4.0
smiklosovic Sep 16, 2021
b3af67f
Add test to ensure Caffeine cache does not return stale entries
azotcsit Sep 11, 2021
fa6dbc4
Merge branch 'cassandra-3.11' into cassandra-4.0
driftx Sep 17, 2021
dd3d83a
Upgrade Caffeine to 2.5.6
azotcsit Sep 17, 2021
8610aef
Update Jackson from 2.9.10 to 2.12.5
ekaterinadimitrova2 Sep 7, 2021
66a1f9b
Merge branch 'cassandra-3.11' into cassandra-4.0
ekaterinadimitrova2 Sep 17, 2021
4edece7
trash
ekaterinadimitrova2 Sep 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cassandra fails to process OperationExecutionException which causes C…
…lassCastException

patch by Benjamin Lerer, Berenguer Blasi; reviewed by Benjamin Lerer, Berenguer Blasi for CASSANDRA-15269
bereng committed Sep 10, 2021
commit 8b0b22e166e2845a7c61af21cf13d8e0ff19efd6
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public ByteBuffer execute(ProtocolVersion protocolVersion, List<ByteBuffer> para
}
catch (IOException exc)
{
throw new FunctionExecutionException(NAME, Collections.singletonList("text"), String.format("Could not decode JSON string '%s': %s", jsonArg, exc.toString()));
throw FunctionExecutionException.create(NAME, Collections.singletonList("text"), String.format("Could not decode JSON string '%s': %s", jsonArg, exc.toString()));
}
catch (MarshalException exc)
{
Original file line number Diff line number Diff line change
@@ -37,11 +37,17 @@ public static FunctionExecutionException create(Function function, Throwable cau
return fee;
}

public FunctionExecutionException(FunctionName functionName, List<String> argTypes, String detail)
public static FunctionExecutionException create(FunctionName functionName, List<String> argTypes, String detail)
{
super(ExceptionCode.FUNCTION_FAILURE, "execution of '" + functionName + argTypes + "' failed: " + detail);
String msg = "execution of '" + functionName + argTypes + "' failed: " + detail;
return new FunctionExecutionException(functionName, argTypes, msg);
}

public FunctionExecutionException(FunctionName functionName, List<String> argTypes, String msg)
{
super(ExceptionCode.FUNCTION_FAILURE, msg);
this.functionName = functionName;
this.argTypes = argTypes;
this.detail = detail;
this.detail = msg;
}
}
Original file line number Diff line number Diff line change
@@ -19,12 +19,13 @@

import java.util.List;

import org.apache.cassandra.cql3.functions.OperationFcts;
import org.apache.cassandra.db.marshal.AbstractType;

/**
* Thrown when an operation problem has occured (e.g. division by zero with integer).
*/
public final class OperationExecutionException extends RequestExecutionException
public final class OperationExecutionException extends FunctionExecutionException
{

/**
@@ -38,20 +39,19 @@ public final class OperationExecutionException extends RequestExecutionException
public static OperationExecutionException create(char operator, List<AbstractType<?>> argTypes, Exception e)
{
List<String> cqlTypes = AbstractType.asCQLTypeStringList(argTypes);
return new OperationExecutionException(String.format("the operation '%s %s %s' failed: %s",
cqlTypes.get(0),
operator,
cqlTypes.get(1),
e.getMessage()));
String msg = String.format("the operation '%s %s %s' failed: %s", cqlTypes.get(0), operator, cqlTypes.get(1), e.getMessage());
return new OperationExecutionException(operator, cqlTypes, msg);
}

/**
* Creates an <code>OperationExecutionException</code> with the specified message.
* @param operator the operator
* @param argTypes the argument types
* @param msg the error message
*/
public OperationExecutionException(String msg)
public OperationExecutionException(char operator, List<String> argTypes, String msg)
{
super(ExceptionCode.FUNCTION_FAILURE, msg);
super(OperationFcts.getFunctionNameFromOperator(operator), argTypes, msg);
}

}
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@ public ErrorMessage decode(ByteBuf body, ProtocolVersion version)
String fKeyspace = CBUtil.readString(body);
String fName = CBUtil.readString(body);
List<String> argTypes = CBUtil.readStringList(body);
te = new FunctionExecutionException(new FunctionName(fKeyspace, fName), argTypes, msg);
te = FunctionExecutionException.create(new FunctionName(fKeyspace, fName), argTypes, msg);
break;
case UNPREPARED:
{
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
import java.util.Optional;

import org.junit.Test;

@@ -28,6 +29,7 @@
import org.apache.cassandra.exceptions.OperationExecutionException;
import org.apache.cassandra.serializers.SimpleDateSerializer;
import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.transport.ProtocolVersion;

public class OperationFctsTest extends CQLTester
{
@@ -861,4 +863,17 @@ private int toDate(String dateAsString)
{
return SimpleDateSerializer.dateStringToDays(dateAsString);
}

@Test
public void testFunctionException() throws Throwable
{
createTable("CREATE TABLE %s (pk int, c1 int, c2 int, v text, PRIMARY KEY(pk, c1, c2))");
execute("INSERT INTO %s (pk, c1, c2, v) VALUES (1, 0, 2, 'test')");

assertInvalidThrowMessage(Optional.of(ProtocolVersion.CURRENT),
"the operation 'int / int' failed: / by zero",
com.datastax.driver.core.exceptions.FunctionExecutionException.class,
"SELECT c2 / c1 FROM %s WHERE pk = 1");
}

}