Merge pull request confluentinc#175 from confluentinc/none_conf

edenhill · web-flow · commit c3a60644ef45 · 2017-04-28T10:02:13.000+02:00
None conf values are now converted to NULL (closes confluentinc#133)
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -1302,29 +1302,34 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 		/*
 		 * Pass configuration property through to librdkafka.
 		 */
-		if (!(vs = cfl_PyObject_Unistr(vo))) {
-			PyErr_SetString(PyExc_TypeError,
-					"expected configuration property "
-					"value as type unicode string");
-			rd_kafka_topic_conf_destroy(tconf);
-			rd_kafka_conf_destroy(conf);
-			Py_DECREF(ks);
-			return NULL;
-		}
-		v = cfl_PyUnistr_AsUTF8(vs);
+                if (vo == Py_None) {
+                        v = NULL;
+                } else {
+                        if (!(vs = cfl_PyObject_Unistr(vo))) {
+                                PyErr_SetString(PyExc_TypeError,
+                                                "expected configuration "
+                                                "property value as type "
+                                                "unicode string");
+                                rd_kafka_topic_conf_destroy(tconf);
+                                rd_kafka_conf_destroy(conf);
+                                Py_DECREF(ks);
+                                return NULL;
+                        }
+                        v = cfl_PyUnistr_AsUTF8(vs);
+                }
 
 		if (rd_kafka_conf_set(conf, k, v, errstr, sizeof(errstr)) !=
 		    RD_KAFKA_CONF_OK) {
 			cfl_PyErr_Format(RD_KAFKA_RESP_ERR__INVALID_ARG,
 					  "%s", errstr);
 			rd_kafka_topic_conf_destroy(tconf);
 			rd_kafka_conf_destroy(conf);
-			Py_DECREF(vs);
+                        Py_XDECREF(vs);
 			Py_DECREF(ks);
 			return NULL;
 		}
 
-		Py_DECREF(vs);
+                Py_XDECREF(vs);
 		Py_DECREF(ks);
 	}
 
diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -67,3 +67,32 @@ def stats_cb(stats_json_str):
         kc.poll(timeout=1)
     kc.close()
 
+
+
+seen_stats_cb_check_no_brokers = False
+def test_conf_none():
+    """ Issue #133
+    Test that None can be passed for NULL by setting bootstrap.servers
+    to None. If None would be converted to a string then a broker would
+    show up in statistics. Verify that it doesnt. """
+
+    def stats_cb_check_no_brokers(stats_json_str):
+        """ Make sure no brokers are reported in stats """
+        global seen_stats_cb_check_no_brokers
+        stats = json.loads(stats_json_str)
+        assert len(stats['brokers']) == 0, "expected no brokers in stats: %s" % stats_json_str
+        seen_stats_cb_check_no_brokers = True
+
+
+
+    conf = {'bootstrap.servers': 'something',
+            'bootstrap.servers': None, # overwrites previous value
+            'statistics.interval.ms': 10,
+            'stats_cb': stats_cb_check_no_brokers}
+
+    p = confluent_kafka.Producer(conf)
+    p.poll(timeout=1)
+
+    global seen_stats_cb_check_no_brokers
+    assert seen_stats_cb_check_no_brokers
+
