You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2021/01/22 14:46:14 UTC

[cassandra] 01/02: Merge branch 'cassandra-3.11' into trunk

This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4262ef3a44e7155d2740833a319d01a6c800f060
Merge: a0441eb 0ed819d
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Fri Jan 22 14:32:22 2021 +0000

    Merge branch 'cassandra-3.11' into trunk

 doc/native_protocol_v4.spec | 17 +++++++++++---
 doc/native_protocol_v5.spec | 55 +++++++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --cc doc/native_protocol_v5.spec
index d279453,5cda1f1..0af8f10
--- a/doc/native_protocol_v5.spec
+++ b/doc/native_protocol_v5.spec
@@@ -109,34 -109,36 +109,32 @@@ Table of Content
  
  2.2. flags
  
--  Flags applying to this frame. The flags have the following meaning (described
++  Flags applying to this envelope. The flags have the following meaning (described
    by the mask that allows selecting them):
--    0x01: Compression flag. If set, the frame body is compressed. The actual
--          compression to use should have been set up beforehand through the
--          Startup message (which thus cannot be compressed; Section 4.1.1).
--    0x02: Tracing flag. For a request frame, this indicates the client requires
--          tracing of the request. Note that only QUERY, PREPARE and EXECUTE queries
++    0x01: Compression flag. In protocol v5 this flag is deprecated and ignored.
++    0x02: Tracing flag. For a request, this indicates the client requires tracing
++          of the request. Note that only QUERY, PREPARE and EXECUTE queries
            support tracing. Other requests will simply ignore the tracing flag if
--          set. If a request supports tracing and the tracing flag is set, the response
--          to this request will have the tracing flag set and contain tracing
--          information.
--          If a response frame has the tracing flag set, its body contains
--          a tracing ID. The tracing ID is a [uuid] and is the first thing in
-           the frame body. The rest of the body will then be the usual body
-           corresponding to the response opcode.
 -          the frame body.
--    0x04: Custom payload flag. For a request or response frame, this indicates
--          that a generic key-value custom payload for a custom QueryHandler
--          implementation is present in the frame. Such a custom payload is simply
--          ignored by the default QueryHandler implementation.
--          Currently, only QUERY, PREPARE, EXECUTE and BATCH requests support
--          payload.
-           Type of custom payload is [bytes map] (see below).
++          set. If a request supports tracing and the tracing flag is set, the
++          response to this request will have the tracing flag set and contain
++          tracing information.
++          If a response has the tracing flag set, its body contains a tracing ID.
++          The tracing ID is a [uuid] and is the first thing in the body.
++    0x04: Custom payload flag. For a request or response, this indicates that a
++          generic key-value custom payload for a custom QueryHandler implementation
++          is present. Such a custom payload is simply ignored by the default
++          QueryHandler implementation. Currently, only QUERY, PREPARE, EXECUTE and
++          BATCH requests support custom payloads.
+           Type of custom payload is [bytes map] (see below). If either or both
+           of the tracing and warning flags are set, the custom payload will follow
 -          those indicated elements in the frame body. If neither are set, the custom
 -          payload will be the first value in the frame body.
++          those indicated elements in the body. If neither are set, the custom
++          payload will be the first value in the body.
      0x08: Warning flag. The response contains warnings which were generated by the
            server to go along with this response.
--          If a response frame has the warning flag set, its body will contain the
--          text of the warnings. The warnings are a [string list] and will be the
--          first value in the frame body if the tracing flag is not set, or directly
--          after the tracing ID if it is.
++          If a response has the warning flag set, its body will contain the text of
++          the warnings. The warnings are a [string list] and will be the first value
++          in the body if the tracing flag is not set, or directly after the tracing
++          ID if it is.
      0x10: Use beta flag. Indicates that the client opts in to use protocol version
            that is currently in beta. Server will respond with ERROR if protocol
            version is marked as beta on server and client does not provide this flag.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org