Skip to content

Commit c2068e9

Browse files
nick-zhnick-zh
authored
fix rename (#29)
1 parent 85a604b commit c2068e9

26 files changed

+347
-347
lines changed

‎configuration.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static void kafka_conf_log_cb(const rd_kafka_t *rk, int level, const char *facil
305305
}
306306

307307
/* {{{ proto SimpleKafkaClient\Configuration::__construct() */
308-
ZEND_METHOD(Kafka_Configuration, __construct)
308+
ZEND_METHOD(SimpleKafkaClient_Configuration, __construct)
309309
{
310310
kafka_conf_object *intern;
311311

@@ -319,7 +319,7 @@ ZEND_METHOD(Kafka_Configuration, __construct)
319319

320320
/* {{{ proto array SimpleKafkaClient\Configuration::dump()
321321
Dump the configuration properties and values of `conf` to an array */
322-
ZEND_METHOD(Kafka_Configuration, dump)
322+
ZEND_METHOD(SimpleKafkaClient_Configuration, dump)
323323
{
324324
size_t cntp;
325325
const char **dump;
@@ -350,7 +350,7 @@ ZEND_METHOD(Kafka_Configuration, dump)
350350

351351
/* {{{ proto void SimpleKafkaClient\Configuration::set(string $name, string $value)
352352
Sets a configuration property. */
353-
ZEND_METHOD(Kafka_Configuration, set)
353+
ZEND_METHOD(SimpleKafkaClient_Configuration, set)
354354
{
355355
char *name, *value;
356356
size_t name_len, value_len;
@@ -387,7 +387,7 @@ ZEND_METHOD(Kafka_Configuration, set)
387387

388388
/* {{{ proto void SimpleKafkaClient\Configuration::setErrorCb(callable $callback)
389389
Sets the error callback */
390-
ZEND_METHOD(Kafka_Configuration, setErrorCb)
390+
ZEND_METHOD(SimpleKafkaClient_Configuration, setErrorCb)
391391
{
392392
zend_fcall_info fci;
393393
zend_fcall_info_cache fcc;
@@ -419,7 +419,7 @@ ZEND_METHOD(Kafka_Configuration, setErrorCb)
419419

420420
/* {{{ proto void SimpleKafkaClient\Configuration::setDrMsgCb(callable $callback)
421421
Sets the delivery report callback */
422-
ZEND_METHOD(Kafka_Configuration, setDrMsgCb)
422+
ZEND_METHOD(SimpleKafkaClient_Configuration, setDrMsgCb)
423423
{
424424
zend_fcall_info fci;
425425
zend_fcall_info_cache fcc;
@@ -451,7 +451,7 @@ ZEND_METHOD(Kafka_Configuration, setDrMsgCb)
451451

452452
/* {{{ proto void SimpleKafkaClient\Configuration::setStatsCb(callable $callback)
453453
Sets the statistics report callback */
454-
ZEND_METHOD(Kafka_Configuration, setStatsCb)
454+
ZEND_METHOD(SimpleKafkaClient_Configuration, setStatsCb)
455455
{
456456
zend_fcall_info fci;
457457
zend_fcall_info_cache fcc;
@@ -483,7 +483,7 @@ ZEND_METHOD(Kafka_Configuration, setStatsCb)
483483

484484
/* {{{ proto void SimpleKafkaClient\Configuration::setRebalanceCb(callback $callback)
485485
Set rebalance callback for use with coordinated consumer group balancing */
486-
ZEND_METHOD(Kafka_Configuration, setRebalanceCb)
486+
ZEND_METHOD(SimpleKafkaClient_Configuration, setRebalanceCb)
487487
{
488488
zend_fcall_info fci;
489489
zend_fcall_info_cache fcc;
@@ -515,7 +515,7 @@ ZEND_METHOD(Kafka_Configuration, setRebalanceCb)
515515

516516
/* {{{ proto void SimpleKafkaClient\Configuration::setOffsetCommitCb(callback $callback)
517517
Set offset commit callback for use with consumer groups */
518-
ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb)
518+
ZEND_METHOD(SimpleKafkaClient_Configuration, setOffsetCommitCb)
519519
{
520520
zend_fcall_info fci;
521521
zend_fcall_info_cache fcc;
@@ -547,7 +547,7 @@ ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb)
547547

548548
/* {{{ proto void SimpleKafkaClient\Configuration::setLogCb(callback $callback)
549549
Set offset commit callback for use with consumer groups */
550-
ZEND_METHOD(Kafka_Configuration, setLogCb)
550+
ZEND_METHOD(SimpleKafkaClient_Configuration, setLogCb)
551551
{
552552
zend_fcall_info fci;
553553
zend_fcall_info_cache fcc;
@@ -587,7 +587,7 @@ void kafka_conf_init(INIT_FUNC_ARGS)
587587
handlers.free_obj = kafka_conf_free;
588588
handlers.offset = XtOffsetOf(kafka_conf_object, std);
589589

590-
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Configuration", class_Kafka_Configuration_methods);
590+
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Configuration", class_SimpleKafkaClient_Configuration_methods);
591591
ce_kafka_conf = zend_register_internal_class(&tmpce);
592592
ce_kafka_conf->create_object = kafka_conf_new;
593593
}

‎configuration_arginfo.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: f629d931de4ad3a347583a46a7fce628f567f8ee */
2+
* Stub hash: 1790726e9dd0d0664baa412bb345663c4dab71b5 */
33

4-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Kafka_Configuration___construct, 0, 0, 0)
4+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration___construct, 0, 0, 0)
55
ZEND_END_ARG_INFO()
66

7-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_dump, 0, 0, IS_ARRAY, 0)
7+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_dump, 0, 0, IS_ARRAY, 0)
88
ZEND_END_ARG_INFO()
99

10-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_set, 0, 2, IS_VOID, 0)
10+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_set, 0, 2, IS_VOID, 0)
1111
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
1212
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
1313
ZEND_END_ARG_INFO()
1414

15-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Configuration_setErrorCb, 0, 1, IS_VOID, 0)
15+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Configuration_setErrorCb, 0, 1, IS_VOID, 0)
1616
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
1717
ZEND_END_ARG_INFO()
1818

19-
#define arginfo_class_Kafka_Configuration_setDrMsgCb arginfo_class_Kafka_Configuration_setErrorCb
19+
#define arginfo_class_SimpleKafkaClient_Configuration_setDrMsgCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb
2020

21-
#define arginfo_class_Kafka_Configuration_setStatsCb arginfo_class_Kafka_Configuration_setErrorCb
21+
#define arginfo_class_SimpleKafkaClient_Configuration_setStatsCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb
2222

23-
#define arginfo_class_Kafka_Configuration_setRebalanceCb arginfo_class_Kafka_Configuration_setErrorCb
23+
#define arginfo_class_SimpleKafkaClient_Configuration_setRebalanceCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb
2424

25-
#define arginfo_class_Kafka_Configuration_setOffsetCommitCb arginfo_class_Kafka_Configuration_setErrorCb
25+
#define arginfo_class_SimpleKafkaClient_Configuration_setOffsetCommitCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb
2626

27-
#define arginfo_class_Kafka_Configuration_setLogCb arginfo_class_Kafka_Configuration_setErrorCb
27+
#define arginfo_class_SimpleKafkaClient_Configuration_setLogCb arginfo_class_SimpleKafkaClient_Configuration_setErrorCb
2828

2929

30-
ZEND_METHOD(Kafka_Configuration, __construct);
31-
ZEND_METHOD(Kafka_Configuration, dump);
32-
ZEND_METHOD(Kafka_Configuration, set);
33-
ZEND_METHOD(Kafka_Configuration, setErrorCb);
34-
ZEND_METHOD(Kafka_Configuration, setDrMsgCb);
35-
ZEND_METHOD(Kafka_Configuration, setStatsCb);
36-
ZEND_METHOD(Kafka_Configuration, setRebalanceCb);
37-
ZEND_METHOD(Kafka_Configuration, setOffsetCommitCb);
38-
ZEND_METHOD(Kafka_Configuration, setLogCb);
30+
ZEND_METHOD(SimpleKafkaClient_Configuration, __construct);
31+
ZEND_METHOD(SimpleKafkaClient_Configuration, dump);
32+
ZEND_METHOD(SimpleKafkaClient_Configuration, set);
33+
ZEND_METHOD(SimpleKafkaClient_Configuration, setErrorCb);
34+
ZEND_METHOD(SimpleKafkaClient_Configuration, setDrMsgCb);
35+
ZEND_METHOD(SimpleKafkaClient_Configuration, setStatsCb);
36+
ZEND_METHOD(SimpleKafkaClient_Configuration, setRebalanceCb);
37+
ZEND_METHOD(SimpleKafkaClient_Configuration, setOffsetCommitCb);
38+
ZEND_METHOD(SimpleKafkaClient_Configuration, setLogCb);
3939

4040

41-
static const zend_function_entry class_Kafka_Configuration_methods[] = {
42-
ZEND_ME(Kafka_Configuration, __construct, arginfo_class_Kafka_Configuration___construct, ZEND_ACC_PUBLIC)
43-
ZEND_ME(Kafka_Configuration, dump, arginfo_class_Kafka_Configuration_dump, ZEND_ACC_PUBLIC)
44-
ZEND_ME(Kafka_Configuration, set, arginfo_class_Kafka_Configuration_set, ZEND_ACC_PUBLIC)
45-
ZEND_ME(Kafka_Configuration, setErrorCb, arginfo_class_Kafka_Configuration_setErrorCb, ZEND_ACC_PUBLIC)
46-
ZEND_ME(Kafka_Configuration, setDrMsgCb, arginfo_class_Kafka_Configuration_setDrMsgCb, ZEND_ACC_PUBLIC)
47-
ZEND_ME(Kafka_Configuration, setStatsCb, arginfo_class_Kafka_Configuration_setStatsCb, ZEND_ACC_PUBLIC)
48-
ZEND_ME(Kafka_Configuration, setRebalanceCb, arginfo_class_Kafka_Configuration_setRebalanceCb, ZEND_ACC_PUBLIC)
49-
ZEND_ME(Kafka_Configuration, setOffsetCommitCb, arginfo_class_Kafka_Configuration_setOffsetCommitCb, ZEND_ACC_PUBLIC)
50-
ZEND_ME(Kafka_Configuration, setLogCb, arginfo_class_Kafka_Configuration_setLogCb, ZEND_ACC_PUBLIC)
41+
static const zend_function_entry class_SimpleKafkaClient_Configuration_methods[] = {
42+
ZEND_ME(SimpleKafkaClient_Configuration, __construct, arginfo_class_SimpleKafkaClient_Configuration___construct, ZEND_ACC_PUBLIC)
43+
ZEND_ME(SimpleKafkaClient_Configuration, dump, arginfo_class_SimpleKafkaClient_Configuration_dump, ZEND_ACC_PUBLIC)
44+
ZEND_ME(SimpleKafkaClient_Configuration, set, arginfo_class_SimpleKafkaClient_Configuration_set, ZEND_ACC_PUBLIC)
45+
ZEND_ME(SimpleKafkaClient_Configuration, setErrorCb, arginfo_class_SimpleKafkaClient_Configuration_setErrorCb, ZEND_ACC_PUBLIC)
46+
ZEND_ME(SimpleKafkaClient_Configuration, setDrMsgCb, arginfo_class_SimpleKafkaClient_Configuration_setDrMsgCb, ZEND_ACC_PUBLIC)
47+
ZEND_ME(SimpleKafkaClient_Configuration, setStatsCb, arginfo_class_SimpleKafkaClient_Configuration_setStatsCb, ZEND_ACC_PUBLIC)
48+
ZEND_ME(SimpleKafkaClient_Configuration, setRebalanceCb, arginfo_class_SimpleKafkaClient_Configuration_setRebalanceCb, ZEND_ACC_PUBLIC)
49+
ZEND_ME(SimpleKafkaClient_Configuration, setOffsetCommitCb, arginfo_class_SimpleKafkaClient_Configuration_setOffsetCommitCb, ZEND_ACC_PUBLIC)
50+
ZEND_ME(SimpleKafkaClient_Configuration, setLogCb, arginfo_class_SimpleKafkaClient_Configuration_setLogCb, ZEND_ACC_PUBLIC)
5151
ZEND_FE_END
5252
};

‎consumer.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static int has_group_id(rd_kafka_conf_t *conf) { /* {{{ */
120120
} /* }}} */
121121

122122
/* {{{ proto SimpleKafkaClient\Consumer::__construct(SimpleKafkaClient\Configuration $conf) */
123-
ZEND_METHOD(Kafka_Consumer, __construct)
123+
ZEND_METHOD(SimpleKafkaClient_Consumer, __construct)
124124
{
125125
zval *zconf;
126126
char errstr[512];
@@ -170,7 +170,7 @@ ZEND_METHOD(Kafka_Consumer, __construct)
170170

171171
/* {{{ proto void SimpleKafkaClient\Consumer::assign([array $topics])
172172
Atomic assignment of partitions to consume */
173-
ZEND_METHOD(Kafka_Consumer, assign)
173+
ZEND_METHOD(SimpleKafkaClient_Consumer, assign)
174174
{
175175
HashTable *htopars = NULL;
176176
rd_kafka_topic_partition_list_t *topics;
@@ -215,7 +215,7 @@ ZEND_METHOD(Kafka_Consumer, assign)
215215

216216
/* {{{ proto array SimpleKafkaClient\Consumer::getAssignment()
217217
Returns the current partition getAssignment */
218-
ZEND_METHOD(Kafka_Consumer, getAssignment)
218+
ZEND_METHOD(SimpleKafkaClient_Consumer, getAssignment)
219219
{
220220
rd_kafka_resp_err_t err;
221221
rd_kafka_topic_partition_list_t *topics;
@@ -243,7 +243,7 @@ ZEND_METHOD(Kafka_Consumer, getAssignment)
243243

244244
/* {{{ proto void SimpleKafkaClient\Consumer::subscribe(array $topics)
245245
Update the subscription set to $topics */
246-
ZEND_METHOD(Kafka_Consumer, subscribe)
246+
ZEND_METHOD(SimpleKafkaClient_Consumer, subscribe)
247247
{
248248
HashTable *htopics;
249249
HashPosition pos;
@@ -283,7 +283,7 @@ ZEND_METHOD(Kafka_Consumer, subscribe)
283283

284284
/* {{{ proto array SimpleKafkaClient\Consumer::getSubscription()
285285
Returns the current subscription as set by subscribe() */
286-
ZEND_METHOD(Kafka_Consumer, getSubscription)
286+
ZEND_METHOD(SimpleKafkaClient_Consumer, getSubscription)
287287
{
288288
rd_kafka_resp_err_t err;
289289
rd_kafka_topic_partition_list_t *topics;
@@ -317,7 +317,7 @@ ZEND_METHOD(Kafka_Consumer, getSubscription)
317317

318318
/* {{{ proto void SimpleKafkaClient\Consumer::unsubsribe()
319319
Unsubscribe from the current subscription set */
320-
ZEND_METHOD(Kafka_Consumer, unsubscribe)
320+
ZEND_METHOD(SimpleKafkaClient_Consumer, unsubscribe)
321321
{
322322
object_intern *intern;
323323
rd_kafka_resp_err_t err;
@@ -341,7 +341,7 @@ ZEND_METHOD(Kafka_Consumer, unsubscribe)
341341

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

459459
/* {{{ proto void SimpleKafkaClient\Consumer::commit([mixed $message_or_offsets])
460460
Commit offsets */
461-
ZEND_METHOD(Kafka_Consumer, commit)
461+
ZEND_METHOD(SimpleKafkaClient_Consumer, commit)
462462
{
463463
consumer_commit(0, INTERNAL_FUNCTION_PARAM_PASSTHRU);
464464
}
465465
/* }}} */
466466

467467
/* {{{ proto void SimpleKafkaClient\Consumer::commitAsync([mixed $message_or_offsets])
468468
Commit offsets */
469-
ZEND_METHOD(Kafka_Consumer, commitAsync)
469+
ZEND_METHOD(SimpleKafkaClient_Consumer, commitAsync)
470470
{
471471
consumer_commit(1, INTERNAL_FUNCTION_PARAM_PASSTHRU);
472472
}
473473
/* }}} */
474474

475475
/* {{{ proto void SimpleKafkaClient\Consumer::close()
476476
Close connection */
477-
ZEND_METHOD(Kafka_Consumer, close)
477+
ZEND_METHOD(SimpleKafkaClient_Consumer, close)
478478
{
479479
object_intern *intern;
480480

@@ -493,7 +493,7 @@ ZEND_METHOD(Kafka_Consumer, close)
493493

494494
/* {{{ proto Metadata SimpleKafkaClient\Consumer::getMetadata(bool all_topics, int timeout_ms, SimpleKafkaClient\Topic only_topic = null)
495495
Request Metadata from broker */
496-
ZEND_METHOD(Kafka_Consumer, getMetadata)
496+
ZEND_METHOD(SimpleKafkaClient_Consumer, getMetadata)
497497
{
498498
zend_bool all_topics;
499499
zval *only_zrkt = NULL;
@@ -535,7 +535,7 @@ ZEND_METHOD(Kafka_Consumer, getMetadata)
535535

536536
/* {{{ proto SimpleKafkaClient\ConsumerTopic SimpleKafkaClient\Consumer::getTopicHandle(string $topic)
537537
Returns a SimpleKafkaClient\ConsumerTopic object */
538-
ZEND_METHOD(Kafka_Consumer, getTopicHandle)
538+
ZEND_METHOD(SimpleKafkaClient_Consumer, getTopicHandle)
539539
{
540540
char *topic;
541541
size_t topic_len;
@@ -573,7 +573,7 @@ ZEND_METHOD(Kafka_Consumer, getTopicHandle)
573573

574574
/* {{{ proto array SimpleKafkaClient\Consumer::getCommittedOffsets(array $topics, int timeout_ms)
575575
Retrieve committed offsets for topics+partitions */
576-
ZEND_METHOD(Kafka_Consumer, getCommittedOffsets)
576+
ZEND_METHOD(SimpleKafkaClient_Consumer, getCommittedOffsets)
577577
{
578578
HashTable *htopars = NULL;
579579
zend_long timeout_ms;
@@ -612,7 +612,7 @@ ZEND_METHOD(Kafka_Consumer, getCommittedOffsets)
612612

613613
/* {{{ proto array SimpleKafkaClient\Consumer::getOffsetPositions(array $topics)
614614
Retrieve current offsets for topics+partitions */
615-
ZEND_METHOD(Kafka_Consumer, getOffsetPositions)
615+
ZEND_METHOD(SimpleKafkaClient_Consumer, getOffsetPositions)
616616
{
617617
HashTable *htopars = NULL;
618618
object_intern *intern;
@@ -647,7 +647,7 @@ ZEND_METHOD(Kafka_Consumer, getOffsetPositions)
647647

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

685685
/* {{{ proto void SimpleKafkaClient\Consumer::queryWatermarkOffsets(string $topic, int $partition, int &$low, int &$high, int $timeout_ms)
686686
Query broker for low (oldest/beginning) or high (newest/end) offsets for partition */
687-
ZEND_METHOD(Kafka_Consumer, queryWatermarkOffsets)
687+
ZEND_METHOD(SimpleKafkaClient_Consumer, queryWatermarkOffsets)
688688
{
689689
object_intern *intern;
690690
char *topic;
@@ -726,7 +726,7 @@ void kafka_consumer_init(INIT_FUNC_ARGS) /* {{{ */
726726
{
727727
zend_class_entry tmpce;
728728

729-
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Consumer", class_Kafka_Consumer_methods);
729+
INIT_NS_CLASS_ENTRY(tmpce, "SimpleKafkaClient", "Consumer", class_SimpleKafkaClient_Consumer_methods);
730730
ce = zend_register_internal_class(&tmpce);
731731
ce->create_object = kafka_consumer_new;
732732

0 commit comments

Comments
 (0)