You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/05/06 15:29:23 UTC
[cassandra] branch cassandra-4.0 updated (a867abf -> 34a1e5f)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from a867abf Add back validation for AlterTableStatements
new 4e370c7 Ninja: add comments for enums used in serialization
new b52c926 Merge branch 'cassandra-3.0' into cassandra-3.11
new 34a1e5f Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/db/filter/ColumnSubselection.java | 1 +
src/java/org/apache/cassandra/tracing/Tracing.java | 1 +
2 files changed, 2 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 34a1e5f57aecba81e88c3a1f55fa08dd8ced7f34
Merge: a867abf b52c926
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu May 6 10:28:37 2021 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
src/java/org/apache/cassandra/db/filter/ColumnSubselection.java | 1 +
src/java/org/apache/cassandra/tracing/Tracing.java | 1 +
2 files changed, 2 insertions(+)
diff --cc src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
index d0cc514,2fdb3e1..dbb415a
--- a/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
@@@ -43,11 -42,12 +43,12 @@@ public abstract class ColumnSubselectio
{
public static final Serializer serializer = new Serializer();
+ /* this enum is used in serialization; preserve order for compatibility */
private enum Kind { SLICE, ELEMENT }
- protected final ColumnDefinition column;
+ protected final ColumnMetadata column;
- protected ColumnSubselection(ColumnDefinition column)
+ protected ColumnSubselection(ColumnMetadata column)
{
this.column = column;
}
diff --cc src/java/org/apache/cassandra/tracing/Tracing.java
index 311685b,8c08151..7d72224
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@@ -52,24 -48,10 +52,25 @@@ import org.apache.cassandra.utils.UUIDG
*/
public abstract class Tracing implements ExecutorLocal<TraceState>
{
- public static final String TRACE_HEADER = "TraceSession";
- public static final String TRACE_TYPE = "TraceType";
+ public static final IVersionedSerializer<TraceType> traceTypeSerializer = new IVersionedSerializer<TraceType>()
+ {
+ public void serialize(TraceType traceType, DataOutputPlus out, int version) throws IOException
+ {
+ out.write((byte)traceType.ordinal());
+ }
+
+ public TraceType deserialize(DataInputPlus in, int version) throws IOException
+ {
+ return TraceType.deserialize(in.readByte());
+ }
+
+ public long serializedSize(TraceType traceType, int version)
+ {
+ return 1;
+ }
+ };
+ /* this enum is used in serialization; preserve order for compatibility */
public enum TraceType
{
NONE,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org