Initial renaming of hiredis-cluster code.

valkey-io · Jun 19, 2024 · f38dc71 · f38dc71
1 parent 69d2ce7
commit f38dc71
Show file tree

Hide file tree

Showing 63 changed files with 2,673 additions and 2,767 deletions.
diff --git a/libvalkeycluster/adapters/ae.h b/libvalkeycluster/adapters/ae.h
@@ -28,27 +28,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __HIREDIS_CLUSTER_AE_H__
-#define __HIREDIS_CLUSTER_AE_H__
+#ifndef __VALKEYCLUSTER_AE_H__
+#define __VALKEYCLUSTER_AE_H__
 
-#include "../hircluster.h"
-#include <hiredis/adapters/ae.h>
+#include "../valkeycluster.h"
+#include <valkey/adapters/ae.h>
 
-static int redisAeAttach_link(redisAsyncContext *ac, void *base) {
-    return redisAeAttach((aeEventLoop *)base, ac);
+static int valkeyAeAttach_link(valkeyAsyncContext *ac, void *base) {
+    return valkeyAeAttach((aeEventLoop *)base, ac);
 }
 
-static int redisClusterAeAttach(aeEventLoop *loop,
-                                redisClusterAsyncContext *acc) {
+static int valkeyClusterAeAttach(aeEventLoop *loop,
+                                valkeyClusterAsyncContext *acc) {
 
     if (acc == NULL || loop == NULL) {
-        return REDIS_ERR;
+        return VALKEY_ERR;
     }
 
     acc->adapter = loop;
-    acc->attach_fn = redisAeAttach_link;
+    acc->attach_fn = valkeyAeAttach_link;
 
-    return REDIS_OK;
+    return VALKEY_OK;
 }
 
 #endif
diff --git a/libvalkeycluster/adapters/glib.h b/libvalkeycluster/adapters/glib.h
@@ -28,34 +28,34 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __HIREDIS_CLUSTER_GLIB_H__
-#define __HIREDIS_CLUSTER_GLIB_H__
+#ifndef __VALKEYCLUSTER_GLIB_H__
+#define __VALKEYCLUSTER_GLIB_H__
 
-#include "../hircluster.h"
-#include <hiredis/adapters/glib.h>
+#include "../valkeycluster.h"
+#include <valkey/adapters/glib.h>
 
-typedef struct redisClusterGlibAdapter {
+typedef struct valkeyClusterGlibAdapter {
     GMainContext *context;
-} redisClusterGlibAdapter;
+} valkeyClusterGlibAdapter;
 
-static int redisGlibAttach_link(redisAsyncContext *ac, void *adapter) {
-    GMainContext *context = ((redisClusterGlibAdapter *)adapter)->context;
-    if (g_source_attach(redis_source_new(ac), context) > 0) {
-        return REDIS_OK;
+static int valkeyGlibAttach_link(valkeyAsyncContext *ac, void *adapter) {
+    GMainContext *context = ((valkeyClusterGlibAdapter *)adapter)->context;
+    if (g_source_attach(valkey_source_new(ac), context) > 0) {
+        return VALKEY_OK;
     }
-    return REDIS_ERR;
+    return VALKEY_ERR;
 }
 
-static int redisClusterGlibAttach(redisClusterAsyncContext *acc,
-                                  redisClusterGlibAdapter *adapter) {
+static int valkeyClusterGlibAttach(valkeyClusterAsyncContext *acc,
+                                  valkeyClusterGlibAdapter *adapter) {
     if (acc == NULL || adapter == NULL) {
-        return REDIS_ERR;
+        return VALKEY_ERR;
     }
 
     acc->adapter = adapter;
-    acc->attach_fn = redisGlibAttach_link;
+    acc->attach_fn = valkeyGlibAttach_link;
 
-    return REDIS_OK;
+    return VALKEY_OK;
 }
 
 #endif
diff --git a/libvalkeycluster/adapters/libev.h b/libvalkeycluster/adapters/libev.h
@@ -28,26 +28,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __HIREDIS_CLUSTER_LIBEV_H__
-#define __HIREDIS_CLUSTER_LIBEV_H__
+#ifndef __LIBVALKEYCLUSTER_LIBEV_H__
+#define __LIBVALKEYCLUSTER_LIBEV_H__
 
-#include "../hircluster.h"
-#include <hiredis/adapters/libev.h>
+#include "../valkeycluster.h"
+#include <valkey/adapters/libev.h>
 
-static int redisLibevAttach_link(redisAsyncContext *ac, void *loop) {
-    return redisLibevAttach((struct ev_loop *)loop, ac);
+static int valkeyLibevAttach_link(valkeyAsyncContext *ac, void *loop) {
+    return valkeyLibevAttach((struct ev_loop *)loop, ac);
 }
 
-static int redisClusterLibevAttach(redisClusterAsyncContext *acc,
+static int valkeyClusterLibevAttach(valkeyClusterAsyncContext *acc,
                                    struct ev_loop *loop) {
     if (loop == NULL || acc == NULL) {
-        return REDIS_ERR;
+        return VALKEY_ERR;
     }
 
     acc->adapter = loop;
-    acc->attach_fn = redisLibevAttach_link;
+    acc->attach_fn = valkeyLibevAttach_link;
 
-    return REDIS_OK;
+    return VALKEY_OK;
 }
 
 #endif
diff --git a/libvalkeycluster/adapters/libevent.h b/libvalkeycluster/adapters/libevent.h
@@ -28,27 +28,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __HIREDIS_CLUSTER_LIBEVENT_H__
-#define __HIREDIS_CLUSTER_LIBEVENT_H__
+#ifndef __LIBVALKEYCLUSTER_LIBEVENT_H__
+#define __LIBVALKEYCLUSTER_LIBEVENT_H__
 
-#include "../hircluster.h"
-#include <hiredis/adapters/libevent.h>
+#include "../valkeycluster.h"
+#include <valkey/adapters/libevent.h>
 
-static int redisLibeventAttach_link(redisAsyncContext *ac, void *base) {
-    return redisLibeventAttach(ac, (struct event_base *)base);
+static int valkeyLibeventAttach_link(valkeyAsyncContext *ac, void *base) {
+    return valkeyLibeventAttach(ac, (struct event_base *)base);
 }
 
-static int redisClusterLibeventAttach(redisClusterAsyncContext *acc,
+static int valkeyClusterLibeventAttach(valkeyClusterAsyncContext *acc,
                                       struct event_base *base) {
 
     if (acc == NULL || base == NULL) {
-        return REDIS_ERR;
+        return VALKEY_ERR;
     }
 
     acc->adapter = base;
-    acc->attach_fn = redisLibeventAttach_link;
+    acc->attach_fn = valkeyLibeventAttach_link;
 
-    return REDIS_OK;
+    return VALKEY_OK;
 }
 
 #endif
diff --git a/libvalkeycluster/adapters/libuv.h b/libvalkeycluster/adapters/libuv.h
@@ -28,27 +28,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __HIREDIS_CLUSTER_LIBUV_H__
-#define __HIREDIS_CLUSTER_LIBUV_H__
+#ifndef __LIBVALKEYCLUSTER_LIBUV_H__
+#define __LIBVALKEYCLUSTER_LIBUV_H__
 
-#include "../hircluster.h"
-#include <hiredis/adapters/libuv.h>
+#include "../valkeycluster.h"
+#include <valkey/adapters/libuv.h>
 
-static int redisLibuvAttach_link(redisAsyncContext *ac, void *loop) {
-    return redisLibuvAttach(ac, (uv_loop_t *)loop);
+static int valkeyLibuvAttach_link(valkeyAsyncContext *ac, void *loop) {
+    return valkeyLibuvAttach(ac, (uv_loop_t *)loop);
 }
 
-static int redisClusterLibuvAttach(redisClusterAsyncContext *acc,
+static int valkeyClusterLibuvAttach(valkeyClusterAsyncContext *acc,
                                    uv_loop_t *loop) {
 
     if (acc == NULL || loop == NULL) {
-        return REDIS_ERR;
+        return VALKEY_ERR;
     }
 
     acc->adapter = loop;
-    acc->attach_fn = redisLibuvAttach_link;
+    acc->attach_fn = valkeyLibuvAttach_link;
 
-    return REDIS_OK;
+    return VALKEY_OK;
 }
 
 #endif
diff --git a/libvalkeycluster/adlist.c b/libvalkeycluster/adlist.c
@@ -27,11 +27,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <hiredis/alloc.h>
+#include <valkey/alloc.h>
 #include <stdlib.h>
 
 #include "adlist.h"
-#include "hiutil.h"
+#include "vkutil.h"
 
 /* Create a new list. The created list can be freed with
  * AlFreeList(), but private value of every node need to be freed
@@ -41,7 +41,7 @@
 hilist *listCreate(void) {
     struct hilist *list;
 
-    if ((list = hi_malloc(sizeof(*list))) == NULL)
+    if ((list = vk_malloc(sizeof(*list))) == NULL)
         return NULL;
     list->head = list->tail = NULL;
     list->len = 0;
@@ -64,10 +64,10 @@ void listRelease(hilist *list) {
         next = current->next;
         if (list->free)
             list->free(current->value);
-        hi_free(current);
+        vk_free(current);
         current = next;
     }
-    hi_free(list);
+    vk_free(list);
 }
 
 /* Add a new node to the list, to head, containing the specified 'value'
@@ -79,7 +79,7 @@ void listRelease(hilist *list) {
 hilist *listAddNodeHead(hilist *list, void *value) {
     listNode *node;
 
-    if ((node = hi_malloc(sizeof(*node))) == NULL)
+    if ((node = vk_malloc(sizeof(*node))) == NULL)
         return NULL;
     node->value = value;
     if (list->len == 0) {
@@ -104,7 +104,7 @@ hilist *listAddNodeHead(hilist *list, void *value) {
 hilist *listAddNodeTail(hilist *list, void *value) {
     listNode *node;
 
-    if ((node = hi_malloc(sizeof(*node))) == NULL)
+    if ((node = vk_malloc(sizeof(*node))) == NULL)
         return NULL;
     node->value = value;
     if (list->len == 0) {
@@ -124,7 +124,7 @@ hilist *listInsertNode(hilist *list, listNode *old_node, void *value,
                        int after) {
     listNode *node;
 
-    if ((node = hi_malloc(sizeof(*node))) == NULL)
+    if ((node = vk_malloc(sizeof(*node))) == NULL)
         return NULL;
     node->value = value;
     if (after) {
@@ -165,7 +165,7 @@ void listDelNode(hilist *list, listNode *node) {
         list->tail = node->prev;
     if (list->free)
         list->free(node->value);
-    hi_free(node);
+    vk_free(node);
     list->len--;
 }
 
@@ -176,7 +176,7 @@ void listDelNode(hilist *list, listNode *node) {
 listIter *listGetIterator(hilist *list, int direction) {
     listIter *iter;
 
-    if ((iter = hi_malloc(sizeof(*iter))) == NULL)
+    if ((iter = vk_malloc(sizeof(*iter))) == NULL)
         return NULL;
     if (direction == AL_START_HEAD)
         iter->next = list->head;
@@ -187,7 +187,7 @@ listIter *listGetIterator(hilist *list, int direction) {
 }
 
 /* Release the iterator memory */
-void listReleaseIterator(listIter *iter) { hi_free(iter); }
+void listReleaseIterator(listIter *iter) { vk_free(iter); }
 
 /* Create an iterator in the list private iterator structure */
 void listRewind(hilist *list, listIter *li) {