From bb3475e8eb379ee18f3d8f37caa8040b852a6213 Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sat, 23 Mar 2024 01:21:46 +0100 Subject: all: rename redis -> redict symbols and comments Signed-off-by: Anna (navi) Figueiredo Gomes --- examples/example-push.c | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'examples/example-push.c') diff --git a/examples/example-push.c b/examples/example-push.c index ce28c38..1d6d0b5 100644 --- a/examples/example-push.c +++ b/examples/example-push.c @@ -19,12 +19,12 @@ exit(-1); \ } while (0) -static void assertReplyAndFree(redisContext *context, redisReply *reply, int type) { +static void assertReplyAndFree(redictContext *context, redictReply *reply, int type) { if (reply == NULL) panicAbort("NULL reply from server (error: %s)", context->errstr); if (reply->type != type) { - if (reply->type == REDIS_REPLY_ERROR) + if (reply->type == REDICT_REPLY_ERROR) fprintf(stderr, "Redict Error: %s\n", reply->str); panicAbort("Expected reply type %d but got type %d", type, reply->type); @@ -34,34 +34,34 @@ static void assertReplyAndFree(redisContext *context, redisReply *reply, int typ } /* Switch to the RESP3 protocol and enable client tracking */ -static void enableClientTracking(redisContext *c) { - redisReply *reply = redisCommand(c, "HELLO 3"); +static void enableClientTracking(redictContext *c) { + redictReply *reply = redictCommand(c, "HELLO 3"); if (reply == NULL || c->err) { panicAbort("NULL reply or server error (error: %s)", c->errstr); } - if (reply->type != REDIS_REPLY_MAP) { + if (reply->type != REDICT_REPLY_MAP) { fprintf(stderr, "Error: Can't send HELLO 3 command. Are you sure you're "); fprintf(stderr, "connected to redict-server >= 6.0.0?\nRedict error: %s\n", - reply->type == REDIS_REPLY_ERROR ? reply->str : "(unknown)"); + reply->type == REDICT_REPLY_ERROR ? reply->str : "(unknown)"); exit(-1); } freeReplyObject(reply); /* Enable client tracking */ - reply = redisCommand(c, "CLIENT TRACKING ON"); - assertReplyAndFree(c, reply, REDIS_REPLY_STATUS); + reply = redictCommand(c, "CLIENT TRACKING ON"); + assertReplyAndFree(c, reply, REDICT_REPLY_STATUS); } void pushReplyHandler(void *privdata, void *r) { - redisReply *reply = r; + redictReply *reply = r; int *invalidations = privdata; /* Sanity check on the invalidation reply */ - if (reply->type != REDIS_REPLY_PUSH || reply->elements != 2 || - reply->element[1]->type != REDIS_REPLY_ARRAY || - reply->element[1]->element[0]->type != REDIS_REPLY_STRING) + if (reply->type != REDICT_REPLY_PUSH || reply->elements != 2 || + reply->element[1]->type != REDICT_REPLY_ARRAY || + reply->element[1]->element[0]->type != REDICT_REPLY_STRING) { panicAbort("%s", "Can't parse PUSH message!"); } @@ -76,7 +76,7 @@ void pushReplyHandler(void *privdata, void *r) { } /* We aren't actually freeing anything here, but it is included to show that we can - * have hiredis call our data destructor when freeing the context */ + * have hiredict call our data destructor when freeing the context */ void privdata_dtor(void *privdata) { unsigned int *icount = privdata; printf("privdata_dtor(): In context privdata dtor (invalidations: %u)\n", *icount); @@ -84,55 +84,55 @@ void privdata_dtor(void *privdata) { int main(int argc, char **argv) { unsigned int j, invalidations = 0; - redisContext *c; - redisReply *reply; + redictContext *c; + redictReply *reply; const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1"; int port = (argc > 2) ? atoi(argv[2]) : 6379; - redisOptions o = {0}; - REDIS_OPTIONS_SET_TCP(&o, hostname, port); + redictOptions o = {0}; + REDICT_OPTIONS_SET_TCP(&o, hostname, port); /* Set our context privdata to the address of our invalidation counter. Each - * time our PUSH handler is called, hiredis will pass the privdata for context. + * time our PUSH handler is called, hiredict will pass the privdata for context. * * This could also be done after we create the context like so: * * c->privdata = &invalidations; * c->free_privdata = privdata_dtor; */ - REDIS_OPTIONS_SET_PRIVDATA(&o, &invalidations, privdata_dtor); + REDICT_OPTIONS_SET_PRIVDATA(&o, &invalidations, privdata_dtor); /* Set our custom PUSH message handler */ o.push_cb = pushReplyHandler; - c = redisConnectWithOptions(&o); + c = redictConnectWithOptions(&o); if (c == NULL || c->err) panicAbort("Connection error: %s", c ? c->errstr : "OOM"); /* Enable RESP3 and turn on client tracking */ enableClientTracking(c); - /* Set some keys and then read them back. Once we do that, Redis will deliver + /* Set some keys and then read them back. Once we do that, Redict will deliver * invalidation push messages whenever the key is modified */ for (j = 0; j < KEY_COUNT; j++) { - reply = redisCommand(c, "SET key:%d initial:%d", j, j); - assertReplyAndFree(c, reply, REDIS_REPLY_STATUS); + reply = redictCommand(c, "SET key:%d initial:%d", j, j); + assertReplyAndFree(c, reply, REDICT_REPLY_STATUS); - reply = redisCommand(c, "GET key:%d", j); - assertReplyAndFree(c, reply, REDIS_REPLY_STRING); + reply = redictCommand(c, "GET key:%d", j); + assertReplyAndFree(c, reply, REDICT_REPLY_STRING); } /* Trigger invalidation messages by updating keys we just read */ for (j = 0; j < KEY_COUNT; j++) { printf(" main(): SET key:%d update:%d\n", j, j); - reply = redisCommand(c, "SET key:%d update:%d", j, j); - assertReplyAndFree(c, reply, REDIS_REPLY_STATUS); + reply = redictCommand(c, "SET key:%d update:%d", j, j); + assertReplyAndFree(c, reply, REDICT_REPLY_STATUS); printf(" main(): SET REPLY OK\n"); } printf("\nTotal detected invalidations: %d, expected: %d\n", invalidations, KEY_COUNT); /* PING server */ - redisFree(c); + redictFree(c); } -- cgit v1.2.3