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

Make LWTs send resultset metadata on every request 

Patch by Alex Petrov; reviewed by Robert Stupp for CASSANDRA-13992
This commit is contained in:
Alex Petrov 2017-11-13 08:56:14 +01:00
parent 5792b667ec
commit 7eb915097d
11 changed files with 276 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.0
* Make LWTs send resultset metadata on every request (CASSANDRA-13992)
* Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild (CASSANDRA-13963)
* Introduce leaf-only iterator (CASSANDRA-9988)
* Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)

BIN
lib/cassandra-driver-core-3.4.0-3d1e4f3-java1196-SNAPSHOT-shaded.jar → lib/cassandra-driver-core-3.3.2-0461ed35-SNAPSHOT-shaded.jar
View File

Binary file not shown.

8
src/java/org/apache/cassandra/cql3/CQLStatement.java
View File

@ -67,4 +67,12 @@ public interface CQLStatement
* @return functions all functions found (may contain duplicates)
*/
public Iterable<Function> getFunctions();
/**
* Whether or not this CQL Statement has LWT conditions
*/
default public boolean hasConditions()
{
return false;
}
}

20
src/java/org/apache/cassandra/cql3/ResultSet.java
View File

@ -28,6 +28,8 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Objects;
import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.cassandra.cql3.statements.ParsedStatement;
import org.apache.cassandra.cql3.statements.SelectStatement;
@ -249,6 +251,24 @@ public class ResultSet
return names == null ? columnCount : names.size();
}
@VisibleForTesting
public EnumSet<Flag> getFlags()
{
return flags;
}
@VisibleForTesting
public int getColumnCount()
{
return columnCount;
}
@VisibleForTesting
public PagingState getPagingState()
{
return pagingState;
}
/**
* Adds the specified columns which will not be serialized.
*

5
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
View File

@ -476,6 +476,11 @@ public class BatchStatement implements CQLStatement
return Pair.create(casRequest, columnsWithConditions);
}
public boolean hasConditions()
{
return hasConditions;
}
public ResultMessage executeInternal(QueryState queryState, QueryOptions options) throws RequestValidationException, RequestExecutionException
{
if (hasConditions)

7
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
View File

@ -53,6 +53,7 @@ import org.apache.cassandra.service.paxos.Commit;
import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.triggers.TriggerExecutor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MD5Digest;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.UUIDGen;
@ -66,6 +67,8 @@ public abstract class ModificationStatement implements CQLStatement
{
protected static final Logger logger = LoggerFactory.getLogger(ModificationStatement.class);
private final static MD5Digest EMPTY_HASH = MD5Digest.wrap(new byte[] {});
public static final String CUSTOM_EXPRESSIONS_NOT_ALLOWED =
"Custom index expressions cannot be used in WHERE clauses for UPDATE or DELETE statements";
@ -502,7 +505,7 @@ public abstract class ModificationStatement implements CQLStatement
List<ColumnSpecification> specs = new ArrayList<>();
specs.add(casResultColumnSpecification(ksName, cfName));
return new ResultSet.ResultMetadata(specs);
return new ResultSet.ResultMetadata(EMPTY_HASH, specs);
}
private static ColumnSpecification casResultColumnSpecification(String ksName, String cfName)
@ -547,7 +550,7 @@ public abstract class ModificationStatement implements CQLStatement
row.addAll(right.rows.get(i));
rows.add(row);
}
return new ResultSet(new ResultSet.ResultMetadata(specs), rows);
return new ResultSet(new ResultSet.ResultMetadata(EMPTY_HASH, specs), rows);
}
private static ResultSet buildCasFailureResultSet(RowIterator partition, Iterable<ColumnMetadata> columnsWithConditions, boolean isBatch, QueryOptions options)

4
src/java/org/apache/cassandra/transport/SimpleClient.java
View File

@ -119,7 +119,7 @@ public class SimpleClient implements Closeable
this(host, port, new EncryptionOptions());
}
public void connect(boolean useCompression) throws IOException
public SimpleClient connect(boolean useCompression) throws IOException
{
establishConnection();
@ -131,6 +131,8 @@ public class SimpleClient implements Closeable
connection.setCompressor(FrameCompressor.SnappyCompressor.instance);
}
execute(new StartupMessage(options));
return this;
}
public void setEventHandler(EventHandler eventHandler)

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

@ -27,6 +27,8 @@ import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.cql3.QueryHandler;
import org.apache.cassandra.cql3.QueryOptions;
import org.apache.cassandra.cql3.ResultSet;
import org.apache.cassandra.cql3.statements.BatchStatement;
import org.apache.cassandra.cql3.statements.ModificationStatement;
import org.apache.cassandra.cql3.statements.ParsedStatement;
import org.apache.cassandra.cql3.statements.UpdateStatement;
import org.apache.cassandra.exceptions.PreparedQueryNotFoundException;
@ -167,14 +169,21 @@ public class ExecuteMessage extends Message.Request
ResultMessage.Rows rows = (ResultMessage.Rows) response;
ResultSet.ResultMetadata resultMetadata = rows.result.metadata;
if (options.getProtocolVersion().isGreaterOrEqualTo(ProtocolVersion.V5))
{
// Starting with V5 we can rely on the result metadata id coming with execute message in order to
// check if there was a change, comparing it with metadata that's about to be returned to client.
if (!resultMetadata.getResultMetadataId().equals(resultMetadataId))
resultMetadata.setMetadataChanged();
else if (options.skipMetadata())
resultMetadata.setSkipMetadata();
// For LWTs, always send a resultset metadata but avoid setting a metadata changed flag. This way
// Client will always receive fresh metadata, but will avoid caching and reusing it. See CASSANDRA-13992
// for details.
if (!statement.hasConditions())
{
// Starting with V5 we can rely on the result metadata id coming with execute message in order to
// check if there was a change, comparing it with metadata that's about to be returned to client.
if (!resultMetadata.getResultMetadataId().equals(resultMetadataId))
resultMetadata.setMetadataChanged();
else if (options.skipMetadata())
resultMetadata.setSkipMetadata();
}
}
else
{

8
src/java/org/apache/cassandra/transport/messages/ResultMessage.java
View File

@ -18,6 +18,8 @@
package org.apache.cassandra.transport.messages;
import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import org.apache.cassandra.cql3.ColumnSpecification;
@ -278,6 +280,12 @@ public abstract class ResultMessage extends Message.Response
this.resultMetadata = resultMetadata;
}
@VisibleForTesting
public Prepared withResultMetadata(ResultSet.ResultMetadata resultMetadata)
{
return new Prepared(statementId, resultMetadata.getResultMetadataId(), metadata, resultMetadata);
}
@Override
public String toString()
{

6
test/unit/org/apache/cassandra/cql3/CQLTester.java
View File

@ -47,6 +47,7 @@ import com.datastax.driver.core.ResultSet;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.concurrent.ScheduledExecutors;
import org.apache.cassandra.index.SecondaryIndexManager;
import org.apache.cassandra.config.EncryptionOptions;
import org.apache.cassandra.schema.*;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.functions.FunctionName;
@ -845,6 +846,11 @@ public abstract class CQLTester
return sessions.get(protocolVersion);
}
protected SimpleClient newSimpleClient(ProtocolVersion version, boolean compression) throws IOException
{
return new SimpleClient(nativeAddr.getHostAddress(), nativePort, version, version.isBeta(), new EncryptionOptions()).connect(compression);
}
protected String formatQuery(String query)
{
return formatQuery(KEYSPACE, query);

207
test/unit/org/apache/cassandra/cql3/PreparedStatementsTest.java
View File

@ -17,16 +17,29 @@
*/
package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Test;
import com.datastax.driver.core.*;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.SyntaxError;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.exceptions.PreparedQueryNotFoundException;
import org.apache.cassandra.index.StubIndex;
import org.apache.cassandra.serializers.BooleanSerializer;
import org.apache.cassandra.serializers.Int32Serializer;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.transport.SimpleClient;
import org.apache.cassandra.transport.messages.ResultMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class PreparedStatementsTest extends CQLTester
@ -260,6 +273,197 @@ public class PreparedStatementsTest extends CQLTester
}
}
@Test
public void testMetadataFlagsWithLWTs() throws Throwable
{
// Verify the behavior of CASSANDRA-10786 (result metadata IDs) on the protocol level.
// Tests are against an LWT statement and a "regular" SELECT statement.
// The fundamental difference between a SELECT and an LWT statement is that the result metadata
// of an LWT can change between invocations - therefore we always return the resultset metadata
// for LWTs. For "normal" SELECTs, the resultset metadata can only change when DDLs happen
// (aka the famous prepared 'SELECT * FROM ks.tab' stops working after the schema of that table
// changes). In those cases, the Result.Rows message contains a METADATA_CHANGED flag to tell
// clients that the cached metadata for this statement has changed and is included in the result,
// whereas the resultset metadata is omitted, if the metadata ID sent with the EXECUTE message
// matches the one for the (current) schema.
// Note: this test does not cover all aspects of 10786 (yet) - it was intended to test the
// changes for CASSANDRA-13992.
createTable("CREATE TABLE %s (pk int, v1 int, v2 int, PRIMARY KEY (pk))");
execute("INSERT INTO %s (pk, v1, v2) VALUES (1,1,1)");
try (SimpleClient simpleClient = newSimpleClient(ProtocolVersion.BETA.orElse(ProtocolVersion.CURRENT), false))
{
ResultMessage.Prepared prepUpdate = simpleClient.prepare(String.format("UPDATE %s.%s SET v1 = ?, v2 = ? WHERE pk = 1 IF v1 = ?",
keyspace(), currentTable()));
ResultMessage.Prepared prepSelect = simpleClient.prepare(String.format("SELECT * FROM %s.%s WHERE pk = ?",
keyspace(), currentTable()));
// This is a _successful_ LWT update
verifyMetadataFlagsWithLWTsUpdate(simpleClient,
prepUpdate,
Arrays.asList(Int32Serializer.instance.serialize(10),
Int32Serializer.instance.serialize(20),
Int32Serializer.instance.serialize(1)),
Arrays.asList("[applied]"),
Arrays.asList(BooleanSerializer.instance.serialize(true)));
prepSelect = verifyMetadataFlagsWithLWTsSelect(simpleClient,
prepSelect,
Arrays.asList("pk", "v1", "v2"),
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(10),
Int32Serializer.instance.serialize(20)),
EnumSet.of(org.apache.cassandra.cql3.ResultSet.Flag.GLOBAL_TABLES_SPEC));
// This is an _unsuccessful_ LWT update (as the condition fails)
verifyMetadataFlagsWithLWTsUpdate(simpleClient,
prepUpdate,
Arrays.asList(Int32Serializer.instance.serialize(10),
Int32Serializer.instance.serialize(20),
Int32Serializer.instance.serialize(1)),
Arrays.asList("[applied]", "v1"),
Arrays.asList(BooleanSerializer.instance.serialize(false),
Int32Serializer.instance.serialize(10)));
prepSelect = verifyMetadataFlagsWithLWTsSelect(simpleClient,
prepSelect,
Arrays.asList("pk", "v1", "v2"),
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(10),
Int32Serializer.instance.serialize(20)),
EnumSet.of(org.apache.cassandra.cql3.ResultSet.Flag.GLOBAL_TABLES_SPEC));
// force a schema change on that table
simpleClient.execute(String.format("ALTER TABLE %s.%s ADD v3 int",
keyspace(), currentTable()),
ConsistencyLevel.LOCAL_ONE);
try
{
simpleClient.executePrepared(prepUpdate,
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(30),
Int32Serializer.instance.serialize(10)),
ConsistencyLevel.LOCAL_ONE);
fail();
}
catch (RuntimeException re)
{
assertTrue(re.getCause() instanceof PreparedQueryNotFoundException);
// the prepared statement has been removed from the pstmt cache, need to re-prepare it
// only prepare the statement on the server side but don't set the variable
simpleClient.prepare(String.format("UPDATE %s.%s SET v1 = ?, v2 = ? WHERE pk = 1 IF v1 = ?",
keyspace(), currentTable()));
}
try
{
simpleClient.executePrepared(prepSelect,
Arrays.asList(Int32Serializer.instance.serialize(1)),
ConsistencyLevel.LOCAL_ONE);
fail();
}
catch (RuntimeException re)
{
assertTrue(re.getCause() instanceof PreparedQueryNotFoundException);
// the prepared statement has been removed from the pstmt cache, need to re-prepare it
// only prepare the statement on the server side but don't set the variable
simpleClient.prepare(String.format("SELECT * FROM %s.%s WHERE pk = ?",
keyspace(), currentTable()));
}
// This is a _successful_ LWT update
verifyMetadataFlagsWithLWTsUpdate(simpleClient,
prepUpdate,
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(30),
Int32Serializer.instance.serialize(10)),
Arrays.asList("[applied]"),
Arrays.asList(BooleanSerializer.instance.serialize(true)));
// Re-assign prepSelect here, as the resultset metadata changed to submit the updated
// resultset-metadata-ID in the next SELECT. This behavior does not apply to LWT statements.
prepSelect = verifyMetadataFlagsWithLWTsSelect(simpleClient,
prepSelect,
Arrays.asList("pk", "v1", "v2", "v3"),
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(30),
null),
EnumSet.of(org.apache.cassandra.cql3.ResultSet.Flag.GLOBAL_TABLES_SPEC,
org.apache.cassandra.cql3.ResultSet.Flag.METADATA_CHANGED));
// This is an _unsuccessful_ LWT update (as the condition fails)
verifyMetadataFlagsWithLWTsUpdate(simpleClient,
prepUpdate,
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(30),
Int32Serializer.instance.serialize(10)),
Arrays.asList("[applied]", "v1"),
Arrays.asList(BooleanSerializer.instance.serialize(false),
Int32Serializer.instance.serialize(1)));
verifyMetadataFlagsWithLWTsSelect(simpleClient,
prepSelect,
Arrays.asList("pk", "v1", "v2", "v3"),
Arrays.asList(Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(1),
Int32Serializer.instance.serialize(30),
null),
EnumSet.of(org.apache.cassandra.cql3.ResultSet.Flag.GLOBAL_TABLES_SPEC));
}
}
private ResultMessage.Prepared verifyMetadataFlagsWithLWTsSelect(SimpleClient simpleClient,
ResultMessage.Prepared prepSelect,
List<String> columnNames,
List<ByteBuffer> expectedRow,
EnumSet<org.apache.cassandra.cql3.ResultSet.Flag> expectedFlags)
{
ResultMessage result = simpleClient.executePrepared(prepSelect,
Collections.singletonList(Int32Serializer.instance.serialize(1)),
ConsistencyLevel.LOCAL_ONE);
ResultMessage.Rows rows = (ResultMessage.Rows) result;
EnumSet<org.apache.cassandra.cql3.ResultSet.Flag> resultFlags = rows.result.metadata.getFlags();
assertEquals(expectedFlags,
resultFlags);
assertEquals(columnNames.size(),
rows.result.metadata.getColumnCount());
assertEquals(columnNames,
rows.result.metadata.names.stream().map(cs -> cs.name.toString()).collect(Collectors.toList()));
assertEquals(1,
rows.result.size());
assertEquals(expectedRow,
rows.result.rows.get(0));
if (resultFlags.contains(org.apache.cassandra.cql3.ResultSet.Flag.METADATA_CHANGED))
prepSelect = prepSelect.withResultMetadata(rows.result.metadata);
return prepSelect;
}
private void verifyMetadataFlagsWithLWTsUpdate(SimpleClient simpleClient,
ResultMessage.Prepared prepUpdate,
List<ByteBuffer> params,
List<String> columnNames,
List<ByteBuffer> expectedRow)
{
ResultMessage result = simpleClient.executePrepared(prepUpdate,
params,
ConsistencyLevel.LOCAL_ONE);
ResultMessage.Rows rows = (ResultMessage.Rows) result;
EnumSet<org.apache.cassandra.cql3.ResultSet.Flag> resultFlags = rows.result.metadata.getFlags();
assertEquals(EnumSet.of(org.apache.cassandra.cql3.ResultSet.Flag.GLOBAL_TABLES_SPEC),
resultFlags);
assertEquals(columnNames.size(),
rows.result.metadata.getColumnCount());
assertEquals(columnNames,
rows.result.metadata.names.stream().map(cs -> cs.name.toString()).collect(Collectors.toList()));
assertEquals(1,
rows.result.size());
assertEquals(expectedRow,
rows.result.rows.get(0));
}
@Test
public void testPrepareWithLWT() throws Throwable
{
@ -267,7 +471,6 @@ public class PreparedStatementsTest extends CQLTester
testPrepareWithLWT(ProtocolVersion.V5);
}
private void testPrepareWithLWT(ProtocolVersion version) throws Throwable
{
Session session = sessionNet(version);