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

Merge branch 'cassandra-4.1' into cassandra-5.0 

* cassandra-4.1:
  Fix rendering UNSET collection types in query tracing
This commit is contained in:
Jacek Lewandowski 2024-08-30 10:41:41 +02:00
parent c3c44a7feb 505aff4517
commit 2521b83c92
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -4,7 +4,9 @@
* Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
* Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
* Add java.base/java.lang.reflect among opens for jvm11-client.options (CASSANDRA-19780)
Merged from 4.1:
Merged from 4.0:
* Fix rendering UNSET collection types in query tracing (CASSANDRA-19880)
* Fix latency reported by ideal consistency level monitoring (CASSANDRA-19651)
* Do not spam log with SSLExceptions (CASSANDRA-18839)

5
src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
View File

@ -17,6 +17,7 @@
*/
package org.apache.cassandra.transport.messages;
import java.nio.ByteBuffer;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
@ -39,6 +40,7 @@ import org.apache.cassandra.transport.Dispatcher;
import org.apache.cassandra.transport.Message;
import org.apache.cassandra.transport.ProtocolException;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.MD5Digest;
import org.apache.cassandra.utils.NoSpamLogger;
@ -224,7 +226,8 @@ public class ExecuteMessage extends Message.Request
{
ColumnSpecification cs = prepared.statement.getBindVariables().get(i);
String boundName = cs.name.toString();
String boundValue = cs.type.asCQL3Type().toCQLLiteral(options.getValues().get(i));
ByteBuffer bytes = options.getValues().get(i);
String boundValue = (bytes == ByteBufferUtil.UNSET_BYTE_BUFFER) ? "<unset>" : cs.type.asCQL3Type().toCQLLiteral(bytes);
if (boundValue.length() > 1000)
boundValue = boundValue.substring(0, 1000) + "...'";

29
test/unit/org/apache/cassandra/cql3/TraceCqlTest.java
View File

@ -18,10 +18,16 @@
package org.apache.cassandra.cql3;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.CodecRegistry;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.PreparedStatement;
@ -140,6 +146,29 @@ public class TraceCqlTest extends CQLTester
//when tracing is done, this boundValue will be surrounded by single quote, and first 1000 characters
//will be filtered. Here we take into account single quotes by adding them to the expected output
assertEquals("'" + boundValue.substring(0, 999) + "...'", trace.getParameters().get("bound_var_0_value(v3)"));
pstmt = session.prepare("INSERT INTO " + KEYSPACE + '.' + currentTable() + " (id, v1, v2, v3) values (?, ?, ?, ?)").enableTracing();
BoundStatement boundStatement = pstmt.bind(13, "lukasz", value, map(2024, "birthday", 40, "anniversary"));
boundStatement.unset(3); // test query tracing after UNSET collection type
trace = session.execute(boundStatement).getExecutionInfo().getQueryTrace();
Map<String, String> boundParameters = getBoundParameters(trace);
assertEquals(Arrays.asList("13", "'lukasz'", "(3, 'bar', 2.1)", "<unset>"), new ArrayList<>(boundParameters.values()));
boundStatement.unset(2); // test query tracing after UNSET tuple type
trace = session.execute(boundStatement).getExecutionInfo().getQueryTrace();
boundParameters = getBoundParameters(trace);
assertEquals(Arrays.asList("13", "'lukasz'", "<unset>", "<unset>"), new ArrayList<>(boundParameters.values()));
}
}
private Map<String, String> getBoundParameters(QueryTrace trace) {
Map<String, String> boundParameters = new LinkedHashMap<>();
trace.getParameters().forEach((paramName, paramValue) -> {
if (paramName.startsWith("bound_")) {
boundParameters.put(paramName, paramValue);
}
});
return boundParameters;
}
}