Protocol updates for 0.11.0.0 (dpkp#1127)

Author: dpkp

kafka/protocol/admin.py

@@ -16,15 +16,35 @@ class ApiVersionResponse_v0(Response):
     )
 
 
+class ApiVersionResponse_v1(Response):
+    API_KEY = 18
+    API_VERSION = 1
+    SCHEMA = Schema(
+        ('error_code', Int16),
+        ('api_versions', Array(
+            ('api_key', Int16),
+            ('min_version', Int16),
+            ('max_version', Int16))),
+        ('throttle_time_ms', Int32)
+    )
+
+
 class ApiVersionRequest_v0(Request):
     API_KEY = 18
     API_VERSION = 0
     RESPONSE_TYPE = ApiVersionResponse_v0
     SCHEMA = Schema()
 
 
-ApiVersionRequest = [ApiVersionRequest_v0]
-ApiVersionResponse = [ApiVersionResponse_v0]
+class ApiVersionRequest_v1(Request):
+    API_KEY = 18
+    API_VERSION = 1
+    RESPONSE_TYPE = ApiVersionResponse_v1
+    SCHEMA = ApiVersionRequest_v0.SCHEMA
+
+
+ApiVersionRequest = [ApiVersionRequest_v0, ApiVersionRequest_v1]
+ApiVersionResponse = [ApiVersionResponse_v0, ApiVersionResponse_v1]
 
 
 class CreateTopicsResponse_v0(Response):
@@ -48,6 +68,18 @@ class CreateTopicsResponse_v1(Response):
     )
 
 
+class CreateTopicsResponse_v2(Response):
+    API_KEY = 19
+    API_VERSION = 2
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('topic_error_codes', Array(
+            ('topic', String('utf-8')),
+            ('error_code', Int16),
+            ('error_message', String('utf-8'))))
+    )
+
+
 class CreateTopicsRequest_v0(Request):
     API_KEY = 19
     API_VERSION = 0
@@ -87,8 +119,19 @@ class CreateTopicsRequest_v1(Request):
     )
 
 
-CreateTopicsRequest = [CreateTopicsRequest_v0, CreateTopicsRequest_v1]
-CreateTopicsResponse = [CreateTopicsResponse_v0, CreateTopicsResponse_v1]
+class CreateTopicsRequest_v2(Request):
+    API_KEY = 19
+    API_VERSION = 2
+    RESPONSE_TYPE = CreateTopicsResponse_v2
+    SCHEMA = CreateTopicsRequest_v1.SCHEMA
+
+
+CreateTopicsRequest = [
+    CreateTopicsRequest_v0, CreateTopicsRequest_v1, CreateTopicsRequest_v2
+]
+CreateTopicsResponse = [
+    CreateTopicsResponse_v0, CreateTopicsResponse_v1, CreateTopicsResponse_v2
+]
 
 
 class DeleteTopicsResponse_v0(Response):
@@ -101,6 +144,17 @@ class DeleteTopicsResponse_v0(Response):
     )
 
 
+class DeleteTopicsResponse_v1(Response):
+    API_KEY = 20
+    API_VERSION = 1
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('topic_error_codes', Array(
+            ('topic', String('utf-8')),
+            ('error_code', Int16)))
+    )
+
+
 class DeleteTopicsRequest_v0(Request):
     API_KEY = 20
     API_VERSION = 0
@@ -111,8 +165,15 @@ class DeleteTopicsRequest_v0(Request):
     )
 
 
-DeleteTopicsRequest = [DeleteTopicsRequest_v0]
-DeleteTopicsResponse = [DeleteTopicsResponse_v0]
+class DeleteTopicsRequest_v1(Request):
+    API_KEY = 20
+    API_VERSION = 1
+    RESPONSE_TYPE = DeleteTopicsResponse_v1
+    SCHEMA = DeleteTopicsRequest_v0.SCHEMA
+
+
+DeleteTopicsRequest = [DeleteTopicsRequest_v0, DeleteTopicsRequest_v1]
+DeleteTopicsResponse = [DeleteTopicsResponse_v0, DeleteTopicsResponse_v1]
 
 
 class ListGroupsResponse_v0(Response):
@@ -126,15 +187,34 @@ class ListGroupsResponse_v0(Response):
     )
 
 
+class ListGroupsResponse_v1(Response):
+    API_KEY = 16
+    API_VERSION = 1
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('error_code', Int16),
+        ('groups', Array(
+            ('group', String('utf-8')),
+            ('protocol_type', String('utf-8'))))
+    )
+
+
 class ListGroupsRequest_v0(Request):
     API_KEY = 16
     API_VERSION = 0
     RESPONSE_TYPE = ListGroupsResponse_v0
     SCHEMA = Schema()
 
 
-ListGroupsRequest = [ListGroupsRequest_v0]
-ListGroupsResponse = [ListGroupsResponse_v0]
+class ListGroupsRequest_v1(Request):
+    API_KEY = 16
+    API_VERSION = 1
+    RESPONSE_TYPE = ListGroupsResponse_v1
+    SCHEMA = ListGroupsRequest_v0.SCHEMA
+
+
+ListGroupsRequest = [ListGroupsRequest_v0, ListGroupsRequest_v1]
+ListGroupsResponse = [ListGroupsResponse_v0, ListGroupsResponse_v1]
 
 
 class DescribeGroupsResponse_v0(Response):
@@ -156,6 +236,27 @@ class DescribeGroupsResponse_v0(Response):
     )
 
 
+class DescribeGroupsResponse_v1(Response):
+    API_KEY = 15
+    API_VERSION = 1
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('groups', Array(
+            ('error_code', Int16),
+            ('group', String('utf-8')),
+            ('state', String('utf-8')),
+            ('protocol_type', String('utf-8')),
+            ('protocol', String('utf-8')),
+            ('members', Array(
+                ('member_id', String('utf-8')),
+                ('client_id', String('utf-8')),
+                ('client_host', String('utf-8')),
+                ('member_metadata', Bytes),
+                ('member_assignment', Bytes)))))
+    )
+
+
+
 class DescribeGroupsRequest_v0(Request):
     API_KEY = 15
     API_VERSION = 0
@@ -165,8 +266,15 @@ class DescribeGroupsRequest_v0(Request):
     )
 
 
-DescribeGroupsRequest = [DescribeGroupsRequest_v0]
-DescribeGroupsResponse = [DescribeGroupsResponse_v0]
+class DescribeGroupsRequest_v1(Request):
+    API_KEY = 15
+    API_VERSION = 1
+    RESPONSE_TYPE = DescribeGroupsResponse_v1
+    SCHEMA = DescribeGroupsRequest_v0.SCHEMA
+
+
+DescribeGroupsRequest = [DescribeGroupsRequest_v0, DescribeGroupsRequest_v1]
+DescribeGroupsResponse = [DescribeGroupsResponse_v0, DescribeGroupsResponse_v1]
 
 
 class SaslHandShakeResponse_v0(Response):

kafka/protocol/commit.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from .api import Request, Response
-from .types import Array, Int16, Int32, Int64, Schema, String
+from .types import Array, Int8, Int16, Int32, Int64, Schema, String
 
 
 class OffsetCommitResponse_v0(Response):
@@ -28,6 +28,19 @@ class OffsetCommitResponse_v2(Response):
     SCHEMA = OffsetCommitResponse_v1.SCHEMA
 
 
+class OffsetCommitResponse_v3(Response):
+    API_KEY = 8
+    API_VERSION = 3
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('topics', Array(
+            ('topic', String('utf-8')),
+            ('partitions', Array(
+                ('partition', Int32),
+                ('error_code', Int16)))))
+    )
+
+
 class OffsetCommitRequest_v0(Request):
     API_KEY = 8
     API_VERSION = 0  # Zookeeper-backed storage
@@ -81,10 +94,21 @@ class OffsetCommitRequest_v2(Request):
     DEFAULT_RETENTION_TIME = -1
 
 
-OffsetCommitRequest = [OffsetCommitRequest_v0, OffsetCommitRequest_v1,
-                       OffsetCommitRequest_v2]
-OffsetCommitResponse = [OffsetCommitResponse_v0, OffsetCommitResponse_v1,
-                        OffsetCommitResponse_v2]
+class OffsetCommitRequest_v3(Request):
+    API_KEY = 8
+    API_VERSION = 3
+    RESPONSE_TYPE = OffsetCommitResponse_v3
+    SCHEMA = OffsetCommitRequest_v2.SCHEMA
+
+
+OffsetCommitRequest = [
+    OffsetCommitRequest_v0, OffsetCommitRequest_v1,
+    OffsetCommitRequest_v2, OffsetCommitRequest_v3
+]
+OffsetCommitResponse = [
+    OffsetCommitResponse_v0, OffsetCommitResponse_v1,
+    OffsetCommitResponse_v2, OffsetCommitResponse_v3
+]
 
 
 class OffsetFetchResponse_v0(Response):
@@ -123,6 +147,22 @@ class OffsetFetchResponse_v2(Response):
     )
 
 
+class OffsetFetchResponse_v3(Response):
+    API_KEY = 9
+    API_VERSION = 3
+    SCHEMA = Schema(
+        ('throttle_time_ms', Int32),
+        ('topics', Array(
+            ('topic', String('utf-8')),
+            ('partitions', Array(
+                ('partition', Int32),
+                ('offset', Int64),
+                ('metadata', String('utf-8')),
+                ('error_code', Int16))))),
+        ('error_code', Int16)
+    )
+
+
 class OffsetFetchRequest_v0(Request):
     API_KEY = 9
     API_VERSION = 0  # zookeeper-backed storage
@@ -152,10 +192,21 @@ class OffsetFetchRequest_v2(Request):
     SCHEMA = OffsetFetchRequest_v1.SCHEMA
 
 
-OffsetFetchRequest = [OffsetFetchRequest_v0, OffsetFetchRequest_v1,
-    OffsetFetchRequest_v2]
-OffsetFetchResponse = [OffsetFetchResponse_v0, OffsetFetchResponse_v1,
-    OffsetFetchResponse_v2]
+class OffsetFetchRequest_v3(Request):
+    API_KEY = 9
+    API_VERSION = 3
+    RESPONSE_TYPE = OffsetFetchResponse_v3
+    SCHEMA = OffsetFetchRequest_v2.SCHEMA
+
+
+OffsetFetchRequest = [
+    OffsetFetchRequest_v0, OffsetFetchRequest_v1,
+    OffsetFetchRequest_v2, OffsetFetchRequest_v3,
+]
+OffsetFetchResponse = [
+    OffsetFetchResponse_v0, OffsetFetchResponse_v1,
+    OffsetFetchResponse_v2, OffsetFetchResponse_v3,
+]
 
 
 class GroupCoordinatorResponse_v0(Response):
@@ -169,6 +220,18 @@ class GroupCoordinatorResponse_v0(Response):
     )
 
 
+class GroupCoordinatorResponse_v1(Response):
+    API_KEY = 10
+    API_VERSION = 1
+    SCHEMA = Schema(
+        ('error_code', Int16),
+        ('error_message', String('utf-8')),
+        ('coordinator_id', Int32),
+        ('host', String('utf-8')),
+        ('port', Int32)
+    )
+
+
 class GroupCoordinatorRequest_v0(Request):
     API_KEY = 10
     API_VERSION = 0
@@ -178,5 +241,15 @@ class GroupCoordinatorRequest_v0(Request):
     )
 
 
-GroupCoordinatorRequest = [GroupCoordinatorRequest_v0]
-GroupCoordinatorResponse = [GroupCoordinatorResponse_v0]
+class GroupCoordinatorRequest_v1(Request):
+    API_KEY = 10
+    API_VERSION = 1
+    RESPONSE_TYPE = GroupCoordinatorResponse_v1
+    SCHEMA = Schema(
+        ('coordinator_key', String('utf-8')),
+        ('coordinator_type', Int8)
+    )
+
+
+GroupCoordinatorRequest = [GroupCoordinatorRequest_v0, GroupCoordinatorRequest_v1]
+GroupCoordinatorResponse = [GroupCoordinatorResponse_v0, GroupCoordinatorResponse_v1]