main commit

venv/lib/python3.12/site-packages/kafka/protocol/fetch.py

@@ -1,15 +1,9 @@
 from __future__ import absolute_import
 
-import collections
-
 from kafka.protocol.api import Request, Response
 from kafka.protocol.types import Array, Int8, Int16, Int32, Int64, Schema, String, Bytes
 
 
-AbortedTransaction = collections.namedtuple("AbortedTransaction",
-    ["producer_id", "first_offset"])
-
-
 class FetchResponse_v0(Response):
     API_KEY = 1
     API_VERSION = 0
@@ -20,7 +14,7 @@ class FetchResponse_v0(Response):
                 ('partition', Int32),
                 ('error_code', Int16),
                 ('highwater_offset', Int64),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -35,7 +29,7 @@ class FetchResponse_v1(Response):
                 ('partition', Int32),
                 ('error_code', Int16),
                 ('highwater_offset', Int64),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -52,7 +46,6 @@ class FetchResponse_v3(Response):
 
 
 class FetchResponse_v4(Response):
-    # Adds message format v2
     API_KEY = 1
     API_VERSION = 4
     SCHEMA = Schema(
@@ -67,7 +60,7 @@ class FetchResponse_v4(Response):
                 ('aborted_transactions', Array(
                     ('producer_id', Int64),
                     ('first_offset', Int64))),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -87,7 +80,7 @@ class FetchResponse_v5(Response):
                 ('aborted_transactions', Array(
                     ('producer_id', Int64),
                     ('first_offset', Int64))),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -122,7 +115,7 @@ class FetchResponse_v7(Response):
                 ('aborted_transactions', Array(
                     ('producer_id', Int64),
                     ('first_offset', Int64))),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -163,7 +156,7 @@ class FetchResponse_v11(Response):
                     ('producer_id', Int64),
                     ('first_offset', Int64))),
                 ('preferred_read_replica', Int32),
-                ('records', Bytes)))))
+                ('message_set', Bytes)))))
     )
 
 
@@ -218,7 +211,6 @@ class FetchRequest_v3(Request):
 
 class FetchRequest_v4(Request):
     # Adds isolation_level field
-    # Adds message format v2
     API_KEY = 1
     API_VERSION = 4
     RESPONSE_TYPE = FetchResponse_v4
@@ -272,7 +264,7 @@ class FetchRequest_v6(Request):
 
 class FetchRequest_v7(Request):
     """
-    Add incremental fetch requests (see KIP-227)
+    Add incremental fetch requests
     """
     API_KEY = 1
     API_VERSION = 7
@@ -293,7 +285,7 @@ class FetchRequest_v7(Request):
                 ('log_start_offset', Int64),
                 ('max_bytes', Int32))))),
         ('forgotten_topics_data', Array(
-            ('topic', String('utf-8')),
+            ('topic', String),
             ('partitions', Array(Int32))
         )),
     )
@@ -333,7 +325,7 @@ class FetchRequest_v9(Request):
                 ('log_start_offset', Int64),
                 ('max_bytes', Int32))))),
         ('forgotten_topics_data', Array(
-            ('topic', String('utf-8')),
+            ('topic', String),
             ('partitions', Array(Int32)),
         )),
     )
@@ -373,7 +365,7 @@ class FetchRequest_v11(Request):
                 ('log_start_offset', Int64),
                 ('max_bytes', Int32))))),
         ('forgotten_topics_data', Array(
-            ('topic', String('utf-8')),
+            ('topic', String),
             ('partitions', Array(Int32))
         )),
         ('rack_id', String('utf-8')),