From 7c80d9b253a84776cccd00d090be5b44436084b3 Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 25 Dec 2020 09:07:33 +0100 Subject: [PATCH 1/4] hide internal const, rename version const --- kafka.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kafka.c b/kafka.c index ccfbb3a..b96981f 100644 --- a/kafka.c +++ b/kafka.c @@ -316,18 +316,16 @@ void register_err_constants(INIT_FUNC_ARGS) /* {{{ */ */ PHP_MINIT_FUNCTION(kafka) { - COPY_CONSTANT(RD_KAFKA_CONSUMER); COPY_CONSTANT(RD_KAFKA_OFFSET_BEGINNING); COPY_CONSTANT(RD_KAFKA_OFFSET_END); COPY_CONSTANT(RD_KAFKA_OFFSET_STORED); COPY_CONSTANT(RD_KAFKA_PARTITION_UA); - COPY_CONSTANT(RD_KAFKA_PRODUCER); COPY_CONSTANT(RD_KAFKA_MSG_F_BLOCK); COPY_CONSTANT(RD_KAFKA_PURGE_F_QUEUE); COPY_CONSTANT(RD_KAFKA_PURGE_F_INFLIGHT); COPY_CONSTANT(RD_KAFKA_PURGE_F_NON_BLOCKING); - REGISTER_LONG_CONSTANT("RD_KAFKA_VERSION", rd_kafka_version(), CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("RD_KAFKA_BUILD_VERSION", RD_KAFKA_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("KAFKA_VERSION", rd_kafka_version(), CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("KAFKA_BUILD_VERSION", RD_KAFKA_VERSION, CONST_CS | CONST_PERSISTENT); register_err_constants(INIT_FUNC_ARGS_PASSTHRU); From 678a0531d7ea09789d908564187a9578d06195a6 Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 25 Dec 2020 09:13:26 +0100 Subject: [PATCH 2/4] rename consts --- kafka.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kafka.c b/kafka.c index b96981f..c88f1e8 100644 --- a/kafka.c +++ b/kafka.c @@ -324,8 +324,8 @@ PHP_MINIT_FUNCTION(kafka) COPY_CONSTANT(RD_KAFKA_PURGE_F_QUEUE); COPY_CONSTANT(RD_KAFKA_PURGE_F_INFLIGHT); COPY_CONSTANT(RD_KAFKA_PURGE_F_NON_BLOCKING); - REGISTER_LONG_CONSTANT("KAFKA_VERSION", rd_kafka_version(), CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("KAFKA_BUILD_VERSION", RD_KAFKA_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("RD_KAFKA_VERSION", rd_kafka_version(), CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("RD_KAFKA_BUILD_VERSION", RD_KAFKA_VERSION, CONST_CS | CONST_PERSISTENT); register_err_constants(INIT_FUNC_ARGS_PASSTHRU); From 31a35516376bb5c396ed160ef1eb0b4864db17cb Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 25 Dec 2020 09:14:51 +0100 Subject: [PATCH 3/4] adjust tests --- tests/init_transaction_not_configured.phpt | 3 --- tests/produce_consume.phpt | 3 --- tests/produce_consume_transactional.phpt | 3 --- tests/test_env.php.sample | 4 ---- 4 files changed, 13 deletions(-) diff --git a/tests/init_transaction_not_configured.phpt b/tests/init_transaction_not_configured.phpt index 54fb22c..0e887cf 100644 --- a/tests/init_transaction_not_configured.phpt +++ b/tests/init_transaction_not_configured.phpt @@ -5,9 +5,6 @@ initTransaction() not configured require __DIR__ . '/integration-tests-check.php'; $conf = new Kafka\Configuration(); -if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) { - $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION')); -} $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS')); diff --git a/tests/produce_consume.phpt b/tests/produce_consume.phpt index b3d23f0..1089254 100644 --- a/tests/produce_consume.phpt +++ b/tests/produce_consume.phpt @@ -10,9 +10,6 @@ require __DIR__ . '/integration-tests-check.php'; $delivered = 0; $conf = new Kafka\Configuration(); -if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) { - $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION')); -} $conf->setErrorCb(function ($producer, $errorCode, $errstr) { printf("%s: %s\n", rd_kafka_err2str($errorCode), $errstr); exit; diff --git a/tests/produce_consume_transactional.phpt b/tests/produce_consume_transactional.phpt index 0390cf2..ec9f7ca 100644 --- a/tests/produce_consume_transactional.phpt +++ b/tests/produce_consume_transactional.phpt @@ -14,9 +14,6 @@ $delivered = 0; $conf = new Kafka\Configuration(); $conf->set('transactional.id', 'transactional-producer'); -if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) { - $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION')); -} $conf->setErrorCb(function ($producer, $errorCode, $errstr) { printf("%s: %s\n", rd_kafka_err2str($errorCode), $errstr); diff --git a/tests/test_env.php.sample b/tests/test_env.php.sample index e43476a..7246cd6 100644 --- a/tests/test_env.php.sample +++ b/tests/test_env.php.sample @@ -3,7 +3,3 @@ if (false === getenv('TEST_KAFKA_BROKERS')) { putenv('TEST_KAFKA_BROKERS=localhost:9092'); } - -if (false === getenv('TEST_KAFKA_BROKER_VERSION')) { - putenv('TEST_KAFKA_BROKER_VERSION=2.3'); -} From b3f6a6cc76e3d84a2af6a89397e36555dd11a021 Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 25 Dec 2020 09:17:29 +0100 Subject: [PATCH 4/4] fix test --- tests/init_transaction_not_configured.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/init_transaction_not_configured.phpt b/tests/init_transaction_not_configured.phpt index 0e887cf..f3cfa32 100644 --- a/tests/init_transaction_not_configured.phpt +++ b/tests/init_transaction_not_configured.phpt @@ -23,4 +23,4 @@ try { _NOT_CONFIGURED -145 %s/tests/init_transaction_not_configured.php -14 +11