hirlite 0.0.2.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 230e3116dc619903ad5ccacfc55db410285d49df
-  data.tar.gz: a5a2438d15aee3f321ae07292f716133c566f01b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjUxZDMzOWRkZTFmMzM5MzczYWM4ODMwMDNhNjdiNzQ0N2M5ZDBkOQ==
+  data.tar.gz: !binary |-
+    ZTVlOGRiYjkyZGIzZGFlOGFlNTg0YzBhZWJhMWZjYjE2ZmM0Y2U2OA==
 SHA512:
-  metadata.gz: 9d8409500bc29bbcb49c2789e84e2b8472a4ead6c28aac001433193c068aaf4d82525ef7aa555a3f5a6a18f13fc329a5996cc005f58c7cdfb530095ab4374acf
-  data.tar.gz: 24887f0b6bab58f80d42860c9093be592b27a77f3d5ff7075cfc1a720fc400eb8b265a6ee2a80b7109791025d585eb0461579b0281377fa85af3698fc73d2f15
+  metadata.gz: !binary |-
+    NjBjNDIxZjdiYTUwM2FlOWQ1ODFjOGI0Yjg3ZTllMmE3ZmU0NGYzZWYyNDMy
+    YzNkYzliYThhMjlhYWQ5NTBiNmJiOGY3YjhjYjAyOWZjNmE3MzFiZTY4YTBj
+    MmU0YzBlYWM3NDlhNGNkMTY2ZmM2Yzk3ZjUzMzI1MjEyMDliNjA=
+  data.tar.gz: !binary |-
+    NDYwOWQ5YWE5OWI0MWFmNGQ4ZDk1YzIxZDU1MDliN2QyMDk0NTkzYWM0YTI1
+    NjgxNDY1MTZlZmM0YWE3MzI5NWRiYzZlNzI4MjhmMjg2MTVhMjVjOTJlZmFj
+    MTM0NWQzNTQ2NDYzNzZmNmQ2ZjNlOTAxMzhmMDY3OTVlYWVkODc=

data/ext/hirlite_ext/hirlite_ext.h

@@ -8,7 +8,7 @@
  */
 #define RSTRING_NOT_MODIFIED
 
-#include "hirlite.h"
+#include "rlite/hirlite.h"
 #include "ruby.h"
 
 /* Defined in hirlite_ext.c */

data/ext/hirlite_ext/rlite.c

@@ -95,7 +95,7 @@ static VALUE rlite_parent_context_alloc(VALUE klass) {
     return Data_Wrap_Struct(klass, parent_context_mark, parent_context_free, pc);
 }
 
-static VALUE rlite_generic_connect(VALUE self, rliteContext *c, VALUE arg_timeout) {
+static VALUE rlite_generic_connect(VALUE self, rliteContext *c) {
     rliteParentContext *pc;
 
     Data_Get_Struct(self,rliteParentContext,pc);
@@ -127,50 +127,30 @@ static VALUE rlite_connect(int argc, VALUE *argv, VALUE self) {
     rliteContext *c;
     VALUE arg_host = Qnil;
     VALUE arg_port = Qnil;
-    VALUE arg_timeout = Qnil;
 
     if (argc == 2 || argc == 3) {
         arg_host = argv[0];
         arg_port = argv[1];
-
-        if (argc == 3) {
-            arg_timeout = argv[2];
-
-            /* Sanity check */
-            if (NUM2INT(arg_timeout) <= 0) {
-                rb_raise(rb_eArgError, "timeout should be positive");
-            }
-        }
     } else {
         rb_raise(rb_eArgError, "invalid number of arguments");
     }
 
     c = rliteConnectNonBlock(StringValuePtr(arg_host), NUM2INT(arg_port));
-    return rlite_generic_connect(self,c,arg_timeout);
+    return rlite_generic_connect(self,c);
 }
 
 static VALUE rlite_connect_unix(int argc, VALUE *argv, VALUE self) {
     rliteContext *c;
     VALUE arg_path = Qnil;
-    VALUE arg_timeout = Qnil;
 
     if (argc == 1 || argc == 2) {
         arg_path = argv[0];
-
-        if (argc == 2) {
-            arg_timeout = argv[1];
-
-            /* Sanity check */
-            if (NUM2INT(arg_timeout) <= 0) {
-                rb_raise(rb_eArgError, "timeout should be positive");
-            }
-        }
     } else {
         rb_raise(rb_eArgError, "invalid number of arguments");
     }
 
     c = rliteConnectUnixNonBlock(StringValuePtr(arg_path));
-    return rlite_generic_connect(self,c,arg_timeout);
+    return rlite_generic_connect(self,c);
 }
 
 static VALUE rlite_is_connected(VALUE self) {

data/lib/hirlite/connection.rb

@@ -50,6 +50,10 @@ class Rlite
 
       def read
         reply = @connection.read
+        if reply == nil
+            write(['__rlite_poll'])
+            reply = @connection.read
+        end
         reply = CommandError.new(reply.message) if reply.is_a?(RuntimeError)
         reply
       rescue Errno::EAGAIN

data/lib/hirlite/version.rb

@@ -1,3 +1,3 @@
 module Hirlite
-  VERSION = "0.0.2.2"
+  VERSION = "0.1.0"
 end

data/vendor/rlite/deps/lua/src/lua_cjson.c

@@ -46,7 +46,7 @@
 #include "strbuf.h"
 #include "fpconv.h"
 
-#include "../../../src/solarisfixes.h"
+#include "../../../src/rlite/solarisfixes.h"
 
 #ifndef CJSON_MODNAME
 #define CJSON_MODNAME   "cjson"

data/vendor/rlite/src/Makefile

@@ -8,7 +8,8 @@
 
 uname_S:= $(shell sh -c 'uname -s 2>/dev/null || echo not')
 
-OBJ=rlite.o page_skiplist.o page_string.o page_list.o page_btree.o page_key.o page_multi_string.o page_long.o type_string.o type_list.o type_set.o type_zset.o type_hash.o util.o restore.o dump.o sort.o pqsort.o utilfromredis.o hyperloglog.o sha1.o crc64.o lzf_c.o lzf_d.o scripting.o rand.o hirlite.o
+OBJ=rlite.o page_skiplist.o page_string.o page_list.o page_btree.o page_key.o page_multi_string.o page_long.o type_string.o type_list.o type_set.o type_zset.o type_hash.o util.o restore.o dump.o sort.o pqsort.o utilfromredis.o hyperloglog.o sha1.o crc64.o lzf_c.o lzf_d.o scripting.o rand.o flock_posix.o signal_posix.o pubsub.o wal.o hirlite.o
+LUA_OBJ=../deps/lua/src/lapi.o ../deps/lua/src/lcode.o ../deps/lua/src/ldebug.o ../deps/lua/src/ldo.o ../deps/lua/src/ldump.o ../deps/lua/src/lfunc.o ../deps/lua/src/lgc.o ../deps/lua/src/llex.o ../deps/lua/src/lmem.o ../deps/lua/src/lobject.o ../deps/lua/src/lopcodes.o ../deps/lua/src/lparser.o ../deps/lua/src/lstate.o  ../deps/lua/src/lstring.o ../deps/lua/src/ltable.o ../deps/lua/src/ltm.o ../deps/lua/src/lundump.o ../deps/lua/src/lvm.o ../deps/lua/src/lzio.o ../deps/lua/src/strbuf.o ../deps/lua/src/fpconv.o ../deps/lua/src/lauxlib.o ../deps/lua/src/lbaselib.o ../deps/lua/src/ldblib.o ../deps/lua/src/liolib.o ../deps/lua/src/lmathlib.o ../deps/lua/src/loslib.o ../deps/lua/src/ltablib.o ../deps/lua/src/lstrlib.o ../deps/lua/src/loadlib.o ../deps/lua/src/linit.o ../deps/lua/src/lua_cjson.o ../deps/lua/src/lua_struct.o ../deps/lua/src/lua_cmsgpack.o ../deps/lua/src/lua_bit.o
 LIBNAME=libhirlite
 PKGCONFNAME=hirlite.pc
 
@@ -27,7 +28,6 @@ endif
 
 CFLAGS +=  -I./ -I../deps/lua/src/
 
-DEBUG.gcc += -rdynamic
 CFLAGS.gcc += -std=c99
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
@@ -38,7 +38,7 @@ DEBUG += ${DEBUG.gcc}
 CFLAGS += ${CFLAGS.gcc}
 endif
 
-LIBS=-lm
+LIBS=-lm -lpthread
 
 INSTALL?= cp -a
 # Installation related variables and target
@@ -70,19 +70,11 @@ STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
 
 all: $(DYLIBNAME) $(STLIBNAME)
 
-gcov: CFLAGS += -fprofile-arcs -ftest-coverage
-gcov: clean test
-
-builddebug: CFLAGS += -DDEBUG=1
-builddebug: clean buildtest
-
-debug: builddebug vtest
-
 ifeq ($(uname_S),SunOS)
 	# Make isinf() available
 	LUA_CFLAGS= -D__C99FEATURES__=1
 endif
-LUA_CFLAGS+= -O2 -Wall -DENABLE_CJSON_GLOBAL $(CFLAGS)
+LUA_CFLAGS+= -O2 -Wall -DENABLE_CJSON_GLOBAL -fPIC $(CFLAGS)
 LUA_LDFLAGS+= $(LDFLAGS)
 LUA_STLIB=../deps/lua/src/liblua.a
 AR=ar
@@ -96,9 +88,6 @@ lcov: gcov
 	lcov --directory . --capture --output-file lcov/app.info
 	genhtml  lcov/app.info -o lcov/html
 
-full-lcov: CFLAGS += -fprofile-arcs -ftest-coverage -DDEBUG=1
-full-lcov: clean buildtest
-
 clang-analyzer:
 	rm -rf analyzer
 	scan-build -o analyzer $(MAKE)
@@ -107,22 +96,19 @@ clang-analyzer:
 	$(CC) $(ARCH) $(DEBUG) $(CFLAGS) -c $<
 
 $(DYLIBNAME): $(OBJ) lua
-	$(DYLIB_MAKE_CMD) $(LUA_STLIB) $(OBJ)
+	$(DYLIB_MAKE_CMD) $(LUA_OBJ) $(OBJ)
 
 $(STLIBNAME): $(OBJ)
 	ar -cq libhirlite.a $(OBJ)
 
-buildtest: $(STLIBNAME) test/rlite-test.o test/btree-test.o test/list-test.o test/string-test.o test/multi_string-test.o test/multi-test.o test/key-test.o test/type_string-test.o test/type_list-test.o test/type_set-test.o test/type_zset-test.o test/type_hash-test.o test/skiplist-test.o test/long-test.o test/restore-test.o test/hyperloglog-test.o test/dump-test.o test/sort-test.o test/test_util.o test/test.o test/echo.o test/hash.o test/list.o test/parser.o test/set.o test/string.o test/test_hirlite.o test/zset.o test/db.o test/multi.o test/hsort.o test/scripting-test.o
-	$(CC) $(DEBUG) $(CFLAGS) -o rlite-test test.o rlite-test.o btree-test.o list-test.o string-test.o multi_string-test.o multi-test.o key-test.o type_string-test.o type_list-test.o type_set-test.o type_zset-test.o type_hash-test.o skiplist-test.o long-test.o restore-test.o hyperloglog-test.o dump-test.o sort-test.o test_util.o $(STLIBNAME) $(LIBS)
-	$(CC) $(DEBUG) $(CFLAGS) -o hirlite-test echo.o hash.o list.o parser.o set.o string.o test_hirlite.o zset.o db.o multi.o hsort.o scripting-test.o $(STLIBNAME) $(LUA_STLIB) $(LIBS)
+buildtest: $(STLIBNAME)
+	cd ../tests/ && $(MAKE) buildtest
 
-test: buildtest
-	./rlite-test
-	./hirlite-test
+test: $(STLIBNAME)
+	cd ../tests/ && $(MAKE) test
 
-vtest: buildtest
-	valgrind --track-origins=yes --leak-check=full --show-reachable=yes ./rlite-test
-	valgrind --track-origins=yes --leak-check=full --show-reachable=yes ./hirlite-test
+vtest: $(STLIBNAME)
+	cd ../tests/ && $(MAKE) vtest
 
 $(PKGCONFNAME): hirlite.h
 	@echo "Generating $@ for pkgconfig..."
@@ -149,3 +135,4 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
 
 clean:
 	rm -rf *-test *.o *.a *.dSYM *.gcda *.gcno lcov *.dylib ./deps/lua/src/*.a
+	cd ../tests && $(MAKE) clean

data/vendor/rlite/src/dump.c

@@ -1,8 +1,8 @@
 #include <arpa/inet.h>
 #include "rlite.h"
-#include "util.h"
-#include "crc64.h"
-#include "endianconv.h"
+#include "rlite/util.h"
+#include "rlite/crc64.h"
+#include "rlite/endianconv.h"
 
 int rl_dump(struct rlite *db, const unsigned char *key, long keylen, unsigned char **data, long *datalen)
 {

data/vendor/rlite/src/flock_posix.c

@@ -0,0 +1,79 @@
+#include <sys/fcntl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "rlite.h"
+
+int rl_flock(FILE *fp, int type)
+{
+	int fd = fileno(fp);
+	int locktype;
+	if (type == RLITE_FLOCK_SH) {
+		locktype = LOCK_SH;
+	} else if (type == RLITE_FLOCK_EX) {
+		locktype = LOCK_EX;
+	} else if (type == RLITE_FLOCK_UN) {
+		locktype = LOCK_UN;
+	} else {
+		return RL_UNEXPECTED;
+	}
+	flock(fd, locktype);
+	return RL_OK;
+}
+
+int rl_is_flocked(const char *path, int type)
+{
+	int retval, oflags = O_NONBLOCK;
+	int locktype;
+
+	if (type == RLITE_FLOCK_SH) {
+		oflags |= O_RDONLY;
+		// we want to know if someone has a shared lock
+		// if we can get an exclusive, we know they do not
+		// if we cannot, we will try to get a shared to discard someone
+		// having an exclusive one
+		locktype = LOCK_EX;
+	} else if (type == RLITE_FLOCK_EX) {
+		oflags |= O_WRONLY;
+		// we'll get a shared lock iff nobody has an exclusive lock
+		locktype = LOCK_SH;
+	} else {
+		return RL_UNEXPECTED;
+	}
+	int fd = open(path, oflags);
+	if (fd == -1) {
+		// if the file does not exist, the lock is not found
+		if (errno == ENOENT || errno == EACCES) {
+			return RL_NOT_FOUND;
+		}
+		return RL_UNEXPECTED;
+	}
+
+	retval = flock(fd, locktype | LOCK_NB);
+	if (retval == 0) {
+		retval = RL_NOT_FOUND;
+		goto cleanup;
+	}
+	if (errno == EWOULDBLOCK) {
+		if (type == RLITE_FLOCK_SH) {
+			retval = flock(fd, LOCK_SH | LOCK_NB);
+			if (retval == 0) {
+				// can get a shared lock but not an exclusive
+				// thus someone has a shared lock
+				retval = RL_FOUND;
+				goto cleanup;
+			} else {
+				retval = RL_NOT_FOUND;
+				goto cleanup;
+			}
+		}
+		retval = RL_FOUND;
+		goto cleanup;
+	}
+	retval = RL_UNEXPECTED;
+cleanup:
+	close(fd);
+	return retval;
+}

data/vendor/rlite/src/flock_win.c

@@ -0,0 +1,6 @@
+#include "rlite.h"
+
+int rl_flock(FILE *fp, int type) {
+	// TODO: implement flock
+	return RL_OK;
+}

data/vendor/rlite/src/hirlite.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "constants.h"
+#include "rlite/constants.h"
 #include <assert.h>
 #include <errno.h>
 #include <ctype.h>
@@ -11,10 +11,11 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "hyperloglog.h"
-#include "hirlite.h"
-#include "scripting.h"
-#include "util.h"
+#include "rlite/hyperloglog.h"
+#include "rlite/hirlite.h"
+#include "rlite/scripting.h"
+#include "rlite/util.h"
+#include "rlite/pubsub.h"
 
 #define UNSIGN(val) ((unsigned char *)val)
 
@@ -23,9 +24,13 @@
 		c->reply = createErrorObject(RLITE_WRONGTYPEERR);\
 		goto cleanup;\
 	}\
+	if (retval == RL_UNEXPECTED) {\
+		c->reply = createErrorObject("ERR unexpected");\
+		goto cleanup;\
+	}\
 	if (retval == RL_OVERFLOW) {\
 		c->reply = createErrorObject("ERR increment would produce NaN or Infinity");\
-		return;\
+		goto cleanup;\
 	}\
 	if (retval == RL_NAN) {\
 		c->reply = createErrorObject("ERR resulting score is not a number (NaN)");\
@@ -188,8 +193,7 @@ static int addReply(rliteContext* c, rliteReply *reply) {
 		c->replies = tmp;
 	}
 
-	c->replies[c->replyPosition] = reply;
-	c->replyLength++;
+	c->replies[c->replyLength++] = reply;
 	return RLITE_OK;
 }
 
@@ -605,6 +609,10 @@ int rliteFormatCommandArgv(rliteClient *client, int argc, char **argv, size_t *a
 	return RLITE_OK;
 }
 
+static int refresh_rlite_fp(rliteContext* context) {
+	return rl_refresh(context->db);
+}
+
 #define DEFAULT_REPLIES_SIZE 16
 static rliteContext *_rliteConnect(const char *path) {
 	rliteContext *context = malloc(sizeof(*context));
@@ -617,6 +625,15 @@ static rliteContext *_rliteConnect(const char *path) {
 		context = NULL;
 		goto cleanup;
 	}
+	size_t pathlen = 1 + strlen(path);
+	context->path = malloc(sizeof(char) * pathlen);
+	if (!context->path) {
+		free(context->replies);
+		free(context);
+		context = NULL;
+		goto cleanup;
+	}
+	memcpy(context->path, path, pathlen);
 	context->err = 0;
 	context->writeCommand = NULL;
 	context->replyPosition = 0;
@@ -627,18 +644,31 @@ static rliteContext *_rliteConnect(const char *path) {
 	context->cluster_enabled = 0;
 	context->hashtableLimitValue = 0;
 	context->inLuaScript = 0;
-	int retval = rl_open(path, &context->db, RLITE_OPEN_READWRITE | RLITE_OPEN_CREATE);
-	if (retval != RL_OK) {
-		free(context);
-		context = NULL;
-		goto cleanup;
-	}
 	context->inTransaction = 0;
 	context->transactionFailed = 0;
 	context->watchedKeysLength = context->enqueuedCommandsLength = 0;
 	context->watchedKeysAlloc = context->enqueuedCommandsAlloc = 0;
 	context->watchedKeys = NULL;
 	context->enqueuedCommands = NULL;
+	context->db = NULL;
+	int retval = rl_open(context->path, &context->db, RLITE_OPEN_READWRITE | RLITE_OPEN_CREATE);;
+	if (retval != RL_OK) {
+		free(context->path);
+		free(context->replies);
+		free(context);
+		context = NULL;
+		goto cleanup;
+	}
+	// if created, need to release locks
+	retval = rl_commit(context->db);
+	if (retval != RL_OK) {
+		rl_close(context->db);
+		free(context->path);
+		free(context->replies);
+		free(context);
+		context = NULL;
+		goto cleanup;
+	}
 cleanup:
 	return context;
 }
@@ -682,12 +712,15 @@ int rliteEnableKeepAlive(rliteContext *UNUSED(c)) {
 	return 0;
 }
 void rliteFree(rliteContext *c) {
-	rl_close(c->db);
+	if (c->db) {
+		rl_close(c->db);
+	}
 	int i;
 	for (i = c->replyPosition; i < c->replyLength; i++) {
 		rliteFreeReplyObject(c->replies[i]);
 	}
 	free(c->replies);
+	free(c->path);
 	free(c);
 }
 
@@ -759,6 +792,7 @@ static void execCommand(rliteClient *c) {
 		c->reply = createErrorObject("EXECABORT Transaction discarded because of previous errors.");
 		goto cleanup;
 	}
+	RL_CALL(refresh_rlite_fp, RL_OK, c->context);
 	retval = rl_check_watched_keys(c->context->db, c->context->watchedKeysLength, c->context->watchedKeys);
 	RLITE_SERVER_ERR(c, retval);
 	if (retval != RL_OK) {
@@ -797,7 +831,7 @@ static void execCommand(rliteClient *c) {
 					if (command->sflags[i] == 'w') {
 						char *argv[] = {"multi"};
 						size_t argvlen[] = {5};
-						c->context->writeCommand(c->context->db->selected_database, 1, argv, argvlen);
+						c->context->writeCommand(rl_get_selected_db(c->context->db), 1, argv, argvlen);
 						written = 1;
 						break;
 					}
@@ -805,7 +839,7 @@ static void execCommand(rliteClient *c) {
 			}
 			RL_CALL(rl_dirty_hash, RL_OK, client->context->db, &newhash);
 			if (newhash && (!oldhash || memcmp(newhash, oldhash, 20) != 0)) {
-				client->context->writeCommand(client->context->db->selected_database, client->argc, client->argv, client->argvlen);
+				client->context->writeCommand(rl_get_selected_db(client->context->db), client->argc, client->argv, client->argvlen);
 			}
 		}
 		rl_free(oldhash);
@@ -817,7 +851,7 @@ static void execCommand(rliteClient *c) {
 	if (written) {
 		char *argv[] = {"exec"};
 		size_t argvlen[] = {4};
-		c->context->writeCommand(c->context->db->selected_database, 1, argv, argvlen);
+		c->context->writeCommand(rl_get_selected_db(c->context->db), 1, argv, argvlen);
 	}
 
 	retval = rl_commit(c->context->db);
@@ -888,6 +922,18 @@ static void unwatchCommand(rliteClient *c) {
 	c->reply = createStatusObject(RLITE_STR_OK);
 }
 
+static rliteReply *pollToReply(long elementc, unsigned char **elements, long *elementslen) {
+	long i;
+	rliteReply *reply = createArrayObject(elementc);
+	for (i = 0; i < elementc; i++) {
+		reply->element[i] = createStringObject((char *)elements[i], elementslen[i]);
+		rl_free(elements[i]);
+	}
+	rl_free(elements);
+	rl_free(elementslen);
+	return reply;
+}
+
 static void *_popReply(rliteContext *c) {
 	if (c->replyPosition < c->replyLength) {
 		void *ret;
@@ -897,6 +943,18 @@ static void *_popReply(rliteContext *c) {
 			c->replyPosition = c->replyLength = 0;
 		}
 		return ret;
+	} else if (c->replyPosition == c->replyLength && c->db->subscriber_id) {
+		int elementc;
+		unsigned char **elements;
+		long *elementslen;
+		int retval = rl_poll_wait(c->db, &elementc, &elements, &elementslen, NULL);
+		if (retval == RL_NOT_FOUND) {
+			return createReplyObject(RLITE_REPLY_NIL);
+		} else if (retval == RL_OK) {
+			return pollToReply(elementc, elements, elementslen);
+		} else {
+			return createErrorObject("unknown retval");
+		}
 	} else {
 		return NULL;
 	}
@@ -931,6 +989,8 @@ int rliteAppendCommandClient(rliteClient *client) {
 		retval = addReplyErrorFormat(client->context, "wrong number of arguments for '%s' command", command->name);
 		flagTransactions(client);
 	} else {
+		RL_CALL(refresh_rlite_fp, RL_OK, client->context);
+
 		if (client->context->inTransaction && (command->proc != execCommand && command->proc != discardCommand &&
 					command->proc != multiCommand && command->proc != watchCommand)) {
 			if (client->context->enqueuedCommandsLength == client->context->enqueuedCommandsAlloc) {
@@ -984,7 +1044,7 @@ int rliteAppendCommandClient(rliteClient *client) {
 			if (client->context->writeCommand) {
 				RL_CALL(rl_dirty_hash, RL_OK, client->context->db, &newhash);
 				if (newhash && (!oldhash || memcmp(newhash, oldhash, 20) != 0)) {
-					client->context->writeCommand(client->context->db->selected_database, client->argc, client->argv, client->argvlen);
+					client->context->writeCommand(rl_get_selected_db(client->context->db), client->argc, client->argv, client->argvlen);
 				}
 			}
 			RL_CALL(rl_commit, RL_OK, client->context->db);
@@ -3819,6 +3879,185 @@ cleanup:
 	free(getvlen);
 }
 
+static void pubsubVarargCommandProcessed(rliteClient *c, const char *type, int argc, unsigned char **args, long *argslen, int func(rlite *db, int argc, unsigned char **argv, long *argvlen)) {
+	int i, retval;
+	retval = func(c->context->db, argc, args, argslen);
+	RLITE_SERVER_ERR(c, retval);
+
+	long count = 0;
+	int subscribing = !strcasecmp(type, "subscribe") || !strcasecmp(type, "psubscribe");
+	rl_pubsub_count_subscriptions(c->context->db, &count);
+	for (i = 0; i < argc; i++) {
+		rliteReply *reply = createArrayObject(3);;
+		if (reply) {
+			reply->element[0] = createCStringObject(type);
+			reply->element[1] = createStringObject((char *)args[i], argslen[i]);
+			// TODO: count might be off if a clients connects to the same channel multiple times
+			reply->element[2] = createLongLongObject(subscribing ? (count - argc + i + 1) : (count + argc - i - 1));
+			addReply(c->context, reply);
+		}
+	}
+	retval = RL_OK;
+cleanup:
+	return;
+}
+
+static void pubsubVarargCommand(rliteClient *c, const char *type, int func(rlite *db, int argc, unsigned char **argv, long *argvlen)) {
+	int i = 0, argc = c->argc - 1;
+	unsigned char **args = NULL;
+	long *argslen = NULL;
+
+	args = malloc(sizeof(unsigned char *) * argc);
+	if (!args) {
+		__rliteSetError(c->context, RLITE_ERR_OOM, "Out of memory");
+		goto cleanup;
+	}
+	argslen = malloc(sizeof(long) * argc);
+	if (!argslen) {
+		__rliteSetError(c->context, RLITE_ERR_OOM, "Out of memory");
+		goto cleanup;
+	}
+	for (i = 0; i < argc; i++) {
+		args[i] = (unsigned char *)c->argv[1 + i];
+		argslen[i] = (long)c->argvlen[1 + i];
+	}
+	pubsubVarargCommandProcessed(c, type, argc, args, argslen, func);
+cleanup:
+	rl_free(args);
+	rl_free(argslen);
+}
+
+static void subscribeCommand(rliteClient *c) {
+	pubsubVarargCommand(c, "subscribe", rl_subscribe);
+}
+
+static void unsubscribeCommand(rliteClient *c) {
+	long i, channelc = 0;
+	unsigned char **channelv = NULL;
+	long *channelvlen = NULL;
+	if (c->argc == 1) {
+		int retval = rl_pubsub_channels(c->context->db, NULL, 0, &channelc, &channelv, &channelvlen);
+		RLITE_SERVER_ERR(c, retval);
+		pubsubVarargCommandProcessed(c, "unsubscribe", channelc, channelv, channelvlen, rl_unsubscribe);
+	} else {
+		pubsubVarargCommand(c, "unsubscribe", rl_unsubscribe);
+	}
+
+cleanup:
+	for (i = 0; i < channelc; i++) {
+		rl_free(channelv[i]);
+	}
+	rl_free(channelv);
+	rl_free(channelvlen);
+}
+
+static void psubscribeCommand(rliteClient *c) {
+	pubsubVarargCommand(c, "psubscribe", rl_psubscribe);
+}
+
+static void punsubscribeCommand(rliteClient *c) {
+	long i, patternc = 0;
+	unsigned char **patternv = NULL;
+	long *patternvlen = NULL;
+	if (c->argc == 1) {
+		int retval = rl_pubsub_patterns(c->context->db, &patternc, &patternv, &patternvlen);
+		RLITE_SERVER_ERR(c, retval);
+		pubsubVarargCommandProcessed(c, "punsubscribe", patternc, patternv, patternvlen, rl_punsubscribe);
+	} else {
+		pubsubVarargCommand(c, "punsubscribe", rl_punsubscribe);
+	}
+
+cleanup:
+	for (i = 0; i < patternc; i++) {
+		rl_free(patternv[i]);
+	}
+	rl_free(patternv);
+	rl_free(patternvlen);
+}
+
+static void publishCommand(rliteClient *c) {
+	unsigned char *channel = (unsigned char *)c->argv[1];
+	size_t channellen = c->argvlen[1];
+	char *data = c->argv[2];
+	size_t datalen = c->argvlen[2];
+	long recipients = 0;
+	int retval = rl_publish(c->context->db, channel, channellen, data, datalen, &recipients);
+	RLITE_SERVER_ERR(c, retval);
+	c->reply = createLongLongObject(recipients);
+cleanup:
+	return;
+}
+
+static void pubsubCommand(rliteClient *c) {
+	long i, channelc = 0;
+	unsigned char **channelv = NULL;
+	long *channelvlen = NULL;
+	int retval;
+	if (!strcasecmp(c->argv[1],"channels")) {
+		unsigned char *pattern = NULL;
+		long patternlen = 0;
+		if (c->argc >= 3) {
+			pattern = (unsigned char *)c->argv[2];
+			patternlen = c->argvlen[2];
+		}
+		retval = rl_pubsub_channels(c->context->db, pattern, patternlen, &channelc, &channelv, &channelvlen);
+		RLITE_SERVER_ERR(c, retval);
+		c->reply = createArrayObject(channelc);
+		if (c->reply == NULL) {
+			goto cleanup;
+		}
+		for (i = 0; i < channelc; i++) {
+			c->reply->element[i] = createStringObject((char *)channelv[i], channelvlen[i]);
+		}
+	} else if (!strcasecmp(c->argv[1],"numsub")) {
+		long numsub;
+		retval = rl_pubsub_numsub(c->context->db, c->argc - 2, (unsigned char **)&c->argv[2], (long *)&c->argvlen[2], &numsub);
+		c->reply = createLongLongObject(numsub);
+	} else if (!strcasecmp(c->argv[1],"numpat")) {
+		long numpat;
+		retval = rl_pubsub_numpat(c->context->db, &numpat);
+		c->reply = createLongLongObject(numpat);
+	}
+cleanup:
+	for (i = 0; i < channelc; i++) {
+		rl_free(channelv[i]);
+	}
+	rl_free(channelv);
+	rl_free(channelvlen);
+	return;
+}
+
+void pubsubPollCommand(rliteClient *c) {
+	int retval;
+	int elementc;
+	unsigned char **elements;
+	long *elementslen;
+	if (c->argc >= 2) {
+		long timeout_param;
+		struct timeval timeout;
+		if ((getLongFromObjectOrReply(c, c->argv[1], c->argvlen[1], &timeout_param, NULL) != RLITE_OK)) {
+			return;
+		}
+		if (timeout_param != 0) {
+			timeout.tv_sec = 0;
+			timeout.tv_usec = timeout_param;
+		}
+		retval = rl_poll_wait(c->context->db, &elementc, &elements, &elementslen, timeout_param == 0 ? NULL : &timeout);
+	} else {
+		retval = rl_poll(c->context->db, &elementc, &elements, &elementslen);
+	}
+	RLITE_SERVER_ERR(c, retval);
+	if (retval == RL_NOT_FOUND) {
+		c->reply = createReplyObject(RLITE_REPLY_NIL);
+	} else if (retval == RL_OK) {
+		c->reply = pollToReply(elementc, elements, elementslen);
+	} else {
+		addReplyErrorFormat(c->context, "unknown retval %d", retval);
+	}
+cleanup:
+	return;
+}
+
 static struct rliteCommand rliteCommandTable[] = {
 	{"get",getCommand,2,"rF",0,1,1,1,0,0},
 	{"set",setCommand,-3,"wm",0,1,1,1,0,0},
@@ -3949,12 +4188,13 @@ static struct rliteCommand rliteCommandTable[] = {
 	// {"role",roleCommand,1,"last",0,NULL,0,0,0,0,0},
 	{"debug",debugCommand,-2,"as",0,0,0,0,0,0},
 	// {"config",configCommand,-2,"art",0,NULL,0,0,0,0,0},
-	// {"subscribe",subscribeCommand,-2,"rpslt",0,NULL,0,0,0,0,0},
-	// {"unsubscribe",unsubscribeCommand,-1,"rpslt",0,NULL,0,0,0,0,0},
-	// {"psubscribe",psubscribeCommand,-2,"rpslt",0,NULL,0,0,0,0,0},
-	// {"punsubscribe",punsubscribeCommand,-1,"rpslt",0,NULL,0,0,0,0,0},
-	// {"publish",publishCommand,3,"pltrF",0,NULL,0,0,0,0,0},
-	// {"pubsub",pubsubCommand,-2,"pltrR",0,NULL,0,0,0,0,0},
+	{"subscribe",subscribeCommand,-2,"rpslt",0,0,0,0,0,0},
+	{"unsubscribe",unsubscribeCommand,-1,"rpslt",0,0,0,0,0,0},
+	{"psubscribe",psubscribeCommand,-2,"rpslt",0,0,0,0,0,0},
+	{"punsubscribe",punsubscribeCommand,-1,"rpslt",0,0,0,0,0,0},
+	{"publish",publishCommand,3,"pltrF",0,0,0,0,0,0},
+	{"pubsub",pubsubCommand,-2,"pltrR",0,0,0,0,0,0},
+	{"__rlite_poll",pubsubPollCommand,-1,"pltrR",0,0,0,0,0,0},
 	{"watch",watchCommand,-2,"rsF",0,1,-1,1,0,0},
 	{"unwatch",unwatchCommand,1,"rsF",0,0,0,0,0,0},
 	// {"cluster",clusterCommand,-2,"ar",0,NULL,0,0,0,0,0},