Added consumer.consumer_group_metadata() for use with send_offsets_to_transaction()

edenhill · edenhill · commit 661e79942748 · 2020-03-06T21:09:56.000+01:00
diff --git a/confluent_kafka/src/Consumer.c b/confluent_kafka/src/Consumer.c
@@ -1001,6 +1001,30 @@ static PyObject *Consumer_close (Handle *self, PyObject *ignore) {
         Py_RETURN_NONE;
 }
 
+static PyObject *
+Consumer_consumer_group_metadata (Handle *self, PyObject *ignore) {
+        rd_kafka_consumer_group_metadata_t *cgmd;
+        PyObject *obj;
+
+        if (!self->rk) {
+                PyErr_SetString(PyExc_RuntimeError,
+                                "Consumer closed");
+                return NULL;
+        }
+
+        if (!(cgmd = rd_kafka_consumer_group_metadata(self->rk))) {
+                PyErr_SetString(PyExc_RuntimeError,
+                                "Consumer group metadata not available");
+                return NULL;
+        }
+
+        obj = c_cgmd_to_py(cgmd);
+
+        rd_kafka_consumer_group_metadata_destroy(cgmd);
+
+        return obj; /* Possibly NULL */
+}
+
 
 static PyMethodDef Consumer_methods[] = {
 	{ "subscribe", (PyCFunction)Consumer_subscribe,
@@ -1277,6 +1301,16 @@ static PyMethodDef Consumer_methods[] = {
         { "list_topics", (PyCFunction)list_topics, METH_VARARGS|METH_KEYWORDS,
           list_topics_doc
         },
+        { "consumer_group_metadata",
+          (PyCFunction)Consumer_consumer_group_metadata, METH_NOARGS,
+          ".. py:function:: consumer_group_metadata()\n"
+          "\n"
+          " :returns: the consumer's current group metadata. "
+          "This object should be passed to the transactional producer's "
+          "send_offsets_to_transaction() API.\n"
+          "\n"
+        },
+
 
 	{ NULL }
 };
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -1257,6 +1257,55 @@ PyObject *c_headers_to_py (rd_kafka_headers_t *headers) {
 #endif
 
 
+/**
+ * @brief Convert C rd_kafka_consumer_group_metadata_t to Python binary string
+ *
+ * @returns The new Python object, or NULL and raises an exception failure.
+ */
+PyObject *c_cgmd_to_py (const rd_kafka_consumer_group_metadata_t *cgmd) {
+	PyObject *obj;
+        void *buffer;
+        size_t size;
+        rd_kafka_error_t *error;
+
+        error = rd_kafka_consumer_group_metadata_write(cgmd, &buffer, &size);
+        if (error) {
+                cfl_PyErr_from_error_destroy(error);
+                return NULL;
+        }
+
+        obj = cfl_PyBin(_FromStringAndSize(buffer, (Py_ssize_t)size));
+        rd_kafka_mem_free(NULL, buffer);
+
+        return obj;
+}
+
+/**
+ * @brief Convert Python bytes object to C rd_kafka_consumer_group_metadata_t.
+ *
+ * @returns The new C object, or NULL and raises an exception on failure.
+ */
+rd_kafka_consumer_group_metadata_t *py_to_c_cgmd (PyObject *obj) {
+        rd_kafka_consumer_group_metadata_t *cgmd;
+        rd_kafka_error_t *error;
+        char *buffer;
+        Py_ssize_t size;
+
+        if (cfl_PyBin(_AsStringAndSize(obj, &buffer, &size)) == -1)
+                return NULL;
+
+        error = rd_kafka_consumer_group_metadata_read(&cgmd,
+                                                      (const void *)buffer,
+                                                      (size_t)size);
+        if (error) {
+                cfl_PyErr_from_error_destroy(error);
+                return NULL;
+        }
+
+        return cgmd;
+}
+
+
 /****************************************************************************
  *
  *
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -373,6 +373,10 @@ rd_kafka_headers_t *py_headers_to_c (PyObject *hdrs);
 PyObject *c_headers_to_py (rd_kafka_headers_t *headers);
 #endif
 
+PyObject *c_cgmd_to_py (const rd_kafka_consumer_group_metadata_t *cgmd);
+rd_kafka_consumer_group_metadata_t *py_to_c_cgmd (PyObject *obj);
+
+
 /****************************************************************************
  *
  *

Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,10 @@ rd_kafka_headers_t py_headers_to_c (PyObject hdrs);`
`373`	`373`	`PyObject c_headers_to_py (rd_kafka_headers_t headers);`
`374`	`374`	`#endif`
`375`	`375`
	`376`	`+PyObject c_cgmd_to_py (const rd_kafka_consumer_group_metadata_t cgmd);`
	`377`	`+rd_kafka_consumer_group_metadata_t py_to_c_cgmd (PyObject obj);`
	`378`	`+`
	`379`	`+`
`376`	`380`	`/****************************************************************************`
`377`	`381`	`*`
`378`	`382`	`*`