Skip to content

fix rename #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static void kafka_conf_log_cb(const rd_kafka_t *rk, int level, const char *facil
}

/* {{{ proto SimpleKafkaClient\Configuration::__construct() */
ZEND_METHOD(Kafka_Configuration, __construct)
ZEND_METHOD(SimpleKafkaClient_Configuration, __construct)
{
kafka_conf_object *intern;

Expand All @@ -319,7 +319,7 @@ ZEND_METHOD(Kafka_Configuration, __construct)

/* {{{ proto array SimpleKafkaClient\Configuration::dump()
Dump the configuration properties and values of `conf` to an array */
ZEND_METHOD(Kafka_Configuration, dump)
ZEND_METHOD(SimpleKafkaClient_Configuration, dump)
{
size_t cntp;
const char **dump;
Expand Down Expand Up @@ -350,7 +350,7 @@ ZEND_METHOD(Kafka_Configuration, dump)

/* {{{ proto void SimpleKafkaClient\Configuration::set(string $name, string $value)
Sets a configuration property. */
ZEND_METHOD(Kafka_Configuration, set)
ZEND_METHOD(SimpleKafkaClient_Configuration, set)
{
char *name, *value;
size_t name_len, value_len;
Expand Down Expand Up @@ -387,7 +387,7 @@ ZEND_METHOD(Kafka_Configuration, set)

/* {{{ proto void SimpleKafkaClient\Configuration::setErrorCb(callable $callback)
Sets the error callback */
ZEND_METHOD(Kafka_Configuration, setErrorCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setErrorCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -419,7 +419,7 @@ ZEND_METHOD(Kafka_Configuration, setErrorCb)

/* {{{ proto void SimpleKafkaClient\Configuration::setDrMsgCb(callable $callback)
Sets the delivery report callback */
ZEND_METHOD(Kafka_Configuration, setDrMsgCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setDrMsgCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -451,7 +451,7 @@ ZEND_METHOD(Kafka_Configuration, setDrMsgCb)

/* {{{ proto void SimpleKafkaClient\Configuration::setStatsCb(callable $callback)
Sets the statistics report callback */
ZEND_METHOD(Kafka_Configuration, setStatsCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setStatsCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -483,7 +483,7 @@ ZEND_METHOD(Kafka_Configuration, setStatsCb)

/* {{{ proto void SimpleKafkaClient\Configuration::setRebalanceCb(callback $callback)
Set rebalance callback for use with coordinated consumer group balancing */
ZEND_METHOD(Kafka_Configuration, setRebalanceCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setRebalanceCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -515,7 +515,7 @@ ZEND_METHOD(Kafka_Configuration, setRebalanceCb)

/* {{{ proto void SimpleKafkaClient\Configuration::setOffsetCommitCb(callback $callback)
Set offset commit callback for use with consumer groups */
ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setOffsetCommitCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -547,7 +547,7 @@ ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb)

/* {{{ proto void SimpleKafkaClient\Configuration::setLogCb(callback $callback)
Set offset commit callback for use with consumer groups */
ZEND_METHOD(Kafka_Configuration, setLogCb)
ZEND_METHOD(SimpleKafkaClient_Configuration, setLogCb)
{
zend_fcall_info fci;
zend_fcall_info_cache fcc;
Expand Down Expand Up @@ -587,7 +587,7 @@ void kafka_conf_init(INIT_FUNC_ARGS)
handlers.free_obj = kafka_conf_free;
handlers.offset = XtOffsetOf(kafka_conf_object, std);

INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Configuration", class_Kafka_Configuration_methods);
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Configuration", class_SimpleKafkaClient_Configuration_methods);
ce_kafka_conf = zend_register_internal_class(&tmpce);
ce_kafka_conf->create_object = kafka_conf_new;
}
58 changes: 29 additions & 29 deletions configuration_arginfo.h
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: f629d931de4ad3a347583a46a7fce628f567f8ee */
* Stub hash: 1790726e9dd0d0664baa412bb345663c4dab71b5 */

ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Kafka_Configuration___construct, 0, 0, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration___construct, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_dump, 0, 0, IS_ARRAY, 0)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_dump, 0, 0, IS_ARRAY, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_set, 0, 2, IS_VOID, 0)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_set, 0, 2, IS_VOID, 0)
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_setErrorCb, 0, 1, IS_VOID, 0)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_setErrorCb, 0, 1, IS_VOID, 0)
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
ZEND_END_ARG_INFO()

#define arginfo_class_Kafka_Configuration_setDrMsgCb arginfo_class_Kafka_Configuration_setErrorCb
#define arginfo_class_SimpleKafkaClient_Configuration_setDrMsgCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb

#define arginfo_class_Kafka_Configuration_setStatsCb arginfo_class_Kafka_Configuration_setErrorCb
#define arginfo_class_SimpleKafkaClient_Configuration_setStatsCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb

#define arginfo_class_Kafka_Configuration_setRebalanceCb arginfo_class_Kafka_Configuration_setErrorCb
#define arginfo_class_SimpleKafkaClient_Configuration_setRebalanceCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb

#define arginfo_class_Kafka_Configuration_setOffsetCommitCb arginfo_class_Kafka_Configuration_setErrorCb
#define arginfo_class_SimpleKafkaClient_Configuration_setOffsetCommitCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb

#define arginfo_class_Kafka_Configuration_setLogCb arginfo_class_Kafka_Configuration_setErrorCb
#define arginfo_class_SimpleKafkaClient_Configuration_setLogCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb


ZEND_METHOD(Kafka_Configuration, __construct);
ZEND_METHOD(Kafka_Configuration, dump);
ZEND_METHOD(Kafka_Configuration, set);
ZEND_METHOD(Kafka_Configuration, setErrorCb);
ZEND_METHOD(Kafka_Configuration, setDrMsgCb);
ZEND_METHOD(Kafka_Configuration, setStatsCb);
ZEND_METHOD(Kafka_Configuration, setRebalanceCb);
ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb);
ZEND_METHOD(Kafka_Configuration, setLogCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, __construct);
ZEND_METHOD(SimpleKafkaClient_Configuration, dump);
ZEND_METHOD(SimpleKafkaClient_Configuration, set);
ZEND_METHOD(SimpleKafkaClient_Configuration, setErrorCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, setDrMsgCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, setStatsCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, setRebalanceCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, setOffsetCommitCb);
ZEND_METHOD(SimpleKafkaClient_Configuration, setLogCb);


static const zend_function_entry class_Kafka_Configuration_methods[] = {
ZEND_ME(Kafka_Configuration, __construct, arginfo_class_Kafka_Configuration___construct, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, dump, arginfo_class_Kafka_Configuration_dump, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, set, arginfo_class_Kafka_Configuration_set, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setErrorCb, arginfo_class_Kafka_Configuration_setErrorCb, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setDrMsgCb, arginfo_class_Kafka_Configuration_setDrMsgCb, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setStatsCb, arginfo_class_Kafka_Configuration_setStatsCb, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setRebalanceCb, arginfo_class_Kafka_Configuration_setRebalanceCb, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setOffsetCommitCb, arginfo_class_Kafka_Configuration_setOffsetCommitCb, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Configuration, setLogCb, arginfo_class_Kafka_Configuration_setLogCb, ZEND_ACC_PUBLIC)
static const zend_function_entry class_SimpleKafkaClient_Configuration_methods[] = {
ZEND_ME(SimpleKafkaClient_Configuration, __construct, arginfo_class_SimpleKafkaClient_Configuration___construct, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, dump, arginfo_class_SimpleKafkaClient_Configuration_dump, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, set, arginfo_class_SimpleKafkaClient_Configuration_set, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setErrorCb, arginfo_class_SimpleKafkaClient_Configuration_setErrorCb, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setDrMsgCb, arginfo_class_SimpleKafkaClient_Configuration_setDrMsgCb, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setStatsCb, arginfo_class_SimpleKafkaClient_Configuration_setStatsCb, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setRebalanceCb, arginfo_class_SimpleKafkaClient_Configuration_setRebalanceCb, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setOffsetCommitCb, arginfo_class_SimpleKafkaClient_Configuration_setOffsetCommitCb, ZEND_ACC_PUBLIC)
ZEND_ME(SimpleKafkaClient_Configuration, setLogCb, arginfo_class_SimpleKafkaClient_Configuration_setLogCb, ZEND_ACC_PUBLIC)
ZEND_FE_END
};
34 changes: 17 additions & 17 deletions consumer.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static int has_group_id(rd_kafka_conf_t *conf) { /* {{{ */
} /* }}} */

/* {{{ proto SimpleKafkaClient\Consumer::__construct(SimpleKafkaClient\Configuration $conf) */
ZEND_METHOD(Kafka_Consumer, __construct)
ZEND_METHOD(SimpleKafkaClient_Consumer, __construct)
{
zval *zconf;
char errstr[512];
Expand Down Expand Up @@ -170,7 +170,7 @@ ZEND_METHOD(Kafka_Consumer, __construct)

/* {{{ proto void SimpleKafkaClient\Consumer::assign([array $topics])
Atomic assignment of partitions to consume */
ZEND_METHOD(Kafka_Consumer, assign)
ZEND_METHOD(SimpleKafkaClient_Consumer, assign)
{
HashTable *htopars = NULL;
rd_kafka_topic_partition_list_t *topics;
Expand Down Expand Up @@ -215,7 +215,7 @@ ZEND_METHOD(Kafka_Consumer, assign)

/* {{{ proto array SimpleKafkaClient\Consumer::getAssignment()
Returns the current partition getAssignment */
ZEND_METHOD(Kafka_Consumer, getAssignment)
ZEND_METHOD(SimpleKafkaClient_Consumer, getAssignment)
{
rd_kafka_resp_err_t err;
rd_kafka_topic_partition_list_t *topics;
Expand Down Expand Up @@ -243,7 +243,7 @@ ZEND_METHOD(Kafka_Consumer, getAssignment)

/* {{{ proto void SimpleKafkaClient\Consumer::subscribe(array $topics)
Update the subscription set to $topics */
ZEND_METHOD(Kafka_Consumer, subscribe)
ZEND_METHOD(SimpleKafkaClient_Consumer, subscribe)
{
HashTable *htopics;
HashPosition pos;
Expand Down Expand Up @@ -283,7 +283,7 @@ ZEND_METHOD(Kafka_Consumer, subscribe)

/* {{{ proto array SimpleKafkaClient\Consumer::getSubscription()
Returns the current subscription as set by subscribe() */
ZEND_METHOD(Kafka_Consumer, getSubscription)
ZEND_METHOD(SimpleKafkaClient_Consumer, getSubscription)
{
rd_kafka_resp_err_t err;
rd_kafka_topic_partition_list_t *topics;
Expand Down Expand Up @@ -317,7 +317,7 @@ ZEND_METHOD(Kafka_Consumer, getSubscription)

/* {{{ proto void SimpleKafkaClient\Consumer::unsubsribe()
Unsubscribe from the current subscription set */
ZEND_METHOD(Kafka_Consumer, unsubscribe)
ZEND_METHOD(SimpleKafkaClient_Consumer, unsubscribe)
{
object_intern *intern;
rd_kafka_resp_err_t err;
Expand All @@ -341,7 +341,7 @@ ZEND_METHOD(Kafka_Consumer, unsubscribe)

/* {{{ proto Message SimpleKafkaClient\Consumer::consume()
Consume message or get error event, triggers callbacks */
ZEND_METHOD(Kafka_Consumer, consume)
ZEND_METHOD(SimpleKafkaClient_Consumer, consume)
{
object_intern *intern;
zend_long timeout_ms;
Expand Down Expand Up @@ -458,23 +458,23 @@ static void consumer_commit(int async, INTERNAL_FUNCTION_PARAMETERS) /* {{{ */

/* {{{ proto void SimpleKafkaClient\Consumer::commit([mixed $message_or_offsets])
Commit offsets */
ZEND_METHOD(Kafka_Consumer, commit)
ZEND_METHOD(SimpleKafkaClient_Consumer, commit)
{
consumer_commit(0, INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
/* }}} */

/* {{{ proto void SimpleKafkaClient\Consumer::commitAsync([mixed $message_or_offsets])
Commit offsets */
ZEND_METHOD(Kafka_Consumer, commitAsync)
ZEND_METHOD(SimpleKafkaClient_Consumer, commitAsync)
{
consumer_commit(1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
/* }}} */

/* {{{ proto void SimpleKafkaClient\Consumer::close()
Close connection */
ZEND_METHOD(Kafka_Consumer, close)
ZEND_METHOD(SimpleKafkaClient_Consumer, close)
{
object_intern *intern;

Expand All @@ -493,7 +493,7 @@ ZEND_METHOD(Kafka_Consumer, close)

/* {{{ proto Metadata SimpleKafkaClient\Consumer::getMetadata(bool all_topics, int timeout_ms, SimpleKafkaClient\Topic only_topic = null)
Request Metadata from broker */
ZEND_METHOD(Kafka_Consumer, getMetadata)
ZEND_METHOD(SimpleKafkaClient_Consumer, getMetadata)
{
zend_bool all_topics;
zval *only_zrkt = NULL;
Expand Down Expand Up @@ -535,7 +535,7 @@ ZEND_METHOD(Kafka_Consumer, getMetadata)

/* {{{ proto SimpleKafkaClient\ConsumerTopic SimpleKafkaClient\Consumer::getTopicHandle(string $topic)
Returns a SimpleKafkaClient\ConsumerTopic object */
ZEND_METHOD(Kafka_Consumer, getTopicHandle)
ZEND_METHOD(SimpleKafkaClient_Consumer, getTopicHandle)
{
char *topic;
size_t topic_len;
Expand Down Expand Up @@ -573,7 +573,7 @@ ZEND_METHOD(Kafka_Consumer, getTopicHandle)

/* {{{ proto array SimpleKafkaClient\Consumer::getCommittedOffsets(array $topics, int timeout_ms)
Retrieve committed offsets for topics+partitions */
ZEND_METHOD(Kafka_Consumer, getCommittedOffsets)
ZEND_METHOD(SimpleKafkaClient_Consumer, getCommittedOffsets)
{
HashTable *htopars = NULL;
zend_long timeout_ms;
Expand Down Expand Up @@ -612,7 +612,7 @@ ZEND_METHOD(Kafka_Consumer, getCommittedOffsets)

/* {{{ proto array SimpleKafkaClient\Consumer::getOffsetPositions(array $topics)
Retrieve current offsets for topics+partitions */
ZEND_METHOD(Kafka_Consumer, getOffsetPositions)
ZEND_METHOD(SimpleKafkaClient_Consumer, getOffsetPositions)
{
HashTable *htopars = NULL;
object_intern *intern;
Expand Down Expand Up @@ -647,7 +647,7 @@ ZEND_METHOD(Kafka_Consumer, getOffsetPositions)

/* {{{ proto void SimpleKafkaClient\Consumer::offsetsForTimes(array $topicPartitions, int $timeout_ms)
Look up the offsets for the given partitions by timestamp. */
ZEND_METHOD(Kafka_Consumer, offsetsForTimes)
ZEND_METHOD(SimpleKafkaClient_Consumer, offsetsForTimes)
{
HashTable *htopars = NULL;
object_intern *intern;
Expand Down Expand Up @@ -684,7 +684,7 @@ ZEND_METHOD(Kafka_Consumer, offsetsForTimes)

/* {{{ proto void SimpleKafkaClient\Consumer::queryWatermarkOffsets(string $topic, int $partition, int &$low, int &$high, int $timeout_ms)
Query broker for low (oldest/beginning) or high (newest/end) offsets for partition */
ZEND_METHOD(Kafka_Consumer, queryWatermarkOffsets)
ZEND_METHOD(SimpleKafkaClient_Consumer, queryWatermarkOffsets)
{
object_intern *intern;
char *topic;
Expand Down Expand Up @@ -726,7 +726,7 @@ void kafka_consumer_init(INIT_FUNC_ARGS) /* {{{ */
{
zend_class_entry tmpce;

INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Consumer", class_Kafka_Consumer_methods);
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Consumer", class_SimpleKafkaClient_Consumer_methods);
ce = zend_register_internal_class(&tmpce);
ce->create_object = kafka_consumer_new;

Expand Down
Loading