hirlite 0.0.2 → 0.0.2.1

data/vendor/rlite/src/scripting.h

@@ -0,0 +1,10 @@
+#ifndef _RLITE_SCRIPTING_H
+#define _RLITE_SCRIPTING_H
+
+#include "hirlite.h"
+
+void evalCommand(struct rliteClient *c);
+void evalShaCommand(struct rliteClient *c);
+void scriptCommand(rliteClient *c);
+
+#endif

data/vendor/rlite/src/solarisfixes.h

@@ -0,0 +1,54 @@
+/* Solaris specific fixes.
+ *
+ * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(__sun)
+
+#if defined(__GNUC__)
+#include <math.h>
+#undef isnan
+#define isnan(x) \
+     __extension__({ __typeof (x) __x_a = (x); \
+     __builtin_expect(__x_a != __x_a, 0); })
+
+#undef isfinite
+#define isfinite(x) \
+     __extension__ ({ __typeof (x) __x_f = (x); \
+     __builtin_expect(!isnan(__x_f - __x_f), 1); })
+
+#undef isinf
+#define isinf(x) \
+     __extension__ ({ __typeof (x) __x_i = (x); \
+     __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); })
+
+#define u_int uint
+#define u_int32_t uint32_t
+#endif /* __GNUC__ */
+
+#endif /* __sun */

data/vendor/rlite/src/sort.c

@@ -35,6 +35,8 @@
 #include <math.h> /* isnan() */
 #include <errno.h>
 
+int strcoll(const char *, const char *);
+
 static int sort_desc = 0;
 static int sort_alpha = 0;
 static int sort_bypattern = 0;
@@ -213,7 +215,7 @@ static int sortCompare(const void *s1, const void *s2) {
 	return sort_desc ? -cmp : cmp;
 }
 
-int rl_sort(struct rlite *db, unsigned char *key, long keylen, unsigned char *sortby, long sortbylen, int dontsort, int alpha, int desc, long limit_start, long limit_count, int getc, unsigned char **getv, long *getvlen, unsigned char *storekey, long storekeylen, long *retobjc, unsigned char ***retobjv, long **retobjvlen) {
+int rl_sort(struct rlite *db, unsigned char *key, long keylen, unsigned char *sortby, long sortbylen, int dontsort, int inLuaScript, int alpha, int desc, long limit_start, long limit_count, int getc, unsigned char **getv, long *getvlen, unsigned char *storekey, long storekeylen, long *retobjc, unsigned char ***retobjv, long **retobjvlen) {
 	int i, j, k, retval;
 	long vectorlen, start, end;
 	long size;
@@ -247,7 +249,7 @@ int rl_sort(struct rlite *db, unsigned char *key, long keylen, unsigned char *so
 	 * scripting and replication. */
 	if (dontsort &&
 		type == RL_TYPE_SET &&
-		storekey)
+		(storekey || inLuaScript))
 	{
 		/* Force ALPHA sorting */
 		dontsort = 0;

data/vendor/rlite/src/sort.h

@@ -14,5 +14,5 @@ typedef struct rliteSortObject {
 	} u;
 } rliteSortObject;
 
-int rl_sort(struct rlite *db, unsigned char *key, long keylen, unsigned char *sortby, long sortbylen, int dontsort, int alpha, int desc, long limit_start, long limit_count, int getc, unsigned char **getv, long *getvlen, unsigned char *storekey, long storekeylen, long *retobjc, unsigned char ***retobjv, long **retobjvlen);
+int rl_sort(struct rlite *db, unsigned char *key, long keylen, unsigned char *sortby, long sortbylen, int dontsort, int inLuaScript, int alpha, int desc, long limit_start, long limit_count, int getc, unsigned char **getv, long *getvlen, unsigned char *storekey, long storekeylen, long *retobjc, unsigned char ***retobjv, long **retobjvlen);
 #endif

data/vendor/rlite/src/type_string.c

@@ -6,7 +6,7 @@
 #include "page_multi_string.h"
 #include "type_string.h"
 #include "util.h"
-#include "../deps/hyperloglog.h"
+#include "hyperloglog.h"
 
 static int rl_string_get_objects(rlite *db, const unsigned char *key, long keylen, long *_page_number, unsigned long long *expires, long *version)
 {

data/vendor/rlite/src/util.c

@@ -2,8 +2,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include "../deps/sha1.h"
-#ifdef DEBUG
+#include "sha1.h"
+#ifdef RL_DEBUG
 #include <unistd.h>
 #include <sys/stat.h>
 #include <execinfo.h>
@@ -24,7 +24,7 @@ int _sha1_formatter(unsigned char *data, char formatted[40])
 	return RL_OK;
 }
 
-#ifdef DEBUG
+#ifdef RL_DEBUG
 
 int test_mode = 0;
 int failed = 0;
@@ -159,7 +159,7 @@ int sha1_cmp(void *v1, void *v2)
 	return memcmp(v1, v2, sizeof(unsigned char) * 20);
 }
 
-#ifdef DEBUG
+#ifdef RL_DEBUG
 int long_formatter(void *v2, char **formatted, int *size)
 {
 	*formatted = rl_malloc(sizeof(char) * 22);

data/vendor/rlite/src/util.h

@@ -5,13 +5,13 @@
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
-#include "../deps/utilfromredis.h"
+#include "utilfromredis.h"
 
 // http://stackoverflow.com/questions/1701055/what-is-the-maximum-length-in-chars-needed-to-represent-any-double-value
 #define MAX_DOUBLE_DIGITS (3 + DBL_MANT_DIG - DBL_MIN_EXP)
 #define MAX_LLONG_DIGITS 22
 
-#ifdef DEBUG
+#ifdef RL_DEBUG
 int expect_fail();
 extern int test_mode;
 void *rl_malloc(size_t size);
@@ -57,7 +57,7 @@ void put_8bytes(unsigned char *p, unsigned long long v);
 int long_cmp(void *v1, void *v2);
 int sha1_cmp(void *v1, void *v2);
 int double_cmp(void *v1, void *v2);
-#ifdef DEBUG
+#ifdef RL_DEBUG
 int long_formatter(void *v2, char **formatted, int *size);
 int sha1_formatter(void *v2, char **formatted, int *size);
 int double_formatter(void *v2, char **formatted, int *size);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirlite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Sebastian Waisbrot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,25 +71,85 @@ files:
 - lib/hirlite/rlite.rb
 - lib/hirlite/version.rb
 - vendor/rlite/Makefile
-- vendor/rlite/deps/crc64.c
-- vendor/rlite/deps/crc64.h
-- vendor/rlite/deps/endianconv.h
-- vendor/rlite/deps/hyperloglog.c
-- vendor/rlite/deps/hyperloglog.h
-- vendor/rlite/deps/lzf.h
-- vendor/rlite/deps/lzfP.h
-- vendor/rlite/deps/lzf_c.c
-- vendor/rlite/deps/lzf_d.c
-- vendor/rlite/deps/sha1.c
-- vendor/rlite/deps/sha1.h
-- vendor/rlite/deps/utilfromredis.c
-- vendor/rlite/deps/utilfromredis.h
+- vendor/rlite/deps/lua/Makefile
+- vendor/rlite/deps/lua/src/fpconv.c
+- vendor/rlite/deps/lua/src/fpconv.h
+- vendor/rlite/deps/lua/src/lapi.c
+- vendor/rlite/deps/lua/src/lapi.h
+- vendor/rlite/deps/lua/src/lauxlib.c
+- vendor/rlite/deps/lua/src/lauxlib.h
+- vendor/rlite/deps/lua/src/lbaselib.c
+- vendor/rlite/deps/lua/src/lcode.c
+- vendor/rlite/deps/lua/src/lcode.h
+- vendor/rlite/deps/lua/src/ldblib.c
+- vendor/rlite/deps/lua/src/ldebug.c
+- vendor/rlite/deps/lua/src/ldebug.h
+- vendor/rlite/deps/lua/src/ldo.c
+- vendor/rlite/deps/lua/src/ldo.h
+- vendor/rlite/deps/lua/src/ldump.c
+- vendor/rlite/deps/lua/src/lfunc.c
+- vendor/rlite/deps/lua/src/lfunc.h
+- vendor/rlite/deps/lua/src/lgc.c
+- vendor/rlite/deps/lua/src/lgc.h
+- vendor/rlite/deps/lua/src/linit.c
+- vendor/rlite/deps/lua/src/liolib.c
+- vendor/rlite/deps/lua/src/llex.c
+- vendor/rlite/deps/lua/src/llex.h
+- vendor/rlite/deps/lua/src/llimits.h
+- vendor/rlite/deps/lua/src/lmathlib.c
+- vendor/rlite/deps/lua/src/lmem.c
+- vendor/rlite/deps/lua/src/lmem.h
+- vendor/rlite/deps/lua/src/loadlib.c
+- vendor/rlite/deps/lua/src/lobject.c
+- vendor/rlite/deps/lua/src/lobject.h
+- vendor/rlite/deps/lua/src/lopcodes.c
+- vendor/rlite/deps/lua/src/lopcodes.h
+- vendor/rlite/deps/lua/src/loslib.c
+- vendor/rlite/deps/lua/src/lparser.c
+- vendor/rlite/deps/lua/src/lparser.h
+- vendor/rlite/deps/lua/src/lstate.c
+- vendor/rlite/deps/lua/src/lstate.h
+- vendor/rlite/deps/lua/src/lstring.c
+- vendor/rlite/deps/lua/src/lstring.h
+- vendor/rlite/deps/lua/src/lstrlib.c
+- vendor/rlite/deps/lua/src/ltable.c
+- vendor/rlite/deps/lua/src/ltable.h
+- vendor/rlite/deps/lua/src/ltablib.c
+- vendor/rlite/deps/lua/src/ltm.c
+- vendor/rlite/deps/lua/src/ltm.h
+- vendor/rlite/deps/lua/src/lua.c
+- vendor/rlite/deps/lua/src/lua.h
+- vendor/rlite/deps/lua/src/lua_bit.c
+- vendor/rlite/deps/lua/src/lua_cjson.c
+- vendor/rlite/deps/lua/src/lua_cmsgpack.c
+- vendor/rlite/deps/lua/src/lua_struct.c
+- vendor/rlite/deps/lua/src/luac.c
+- vendor/rlite/deps/lua/src/luaconf.h
+- vendor/rlite/deps/lua/src/lualib.h
+- vendor/rlite/deps/lua/src/lundump.c
+- vendor/rlite/deps/lua/src/lundump.h
+- vendor/rlite/deps/lua/src/lvm.c
+- vendor/rlite/deps/lua/src/lvm.h
+- vendor/rlite/deps/lua/src/lzio.c
+- vendor/rlite/deps/lua/src/lzio.h
+- vendor/rlite/deps/lua/src/print.c
+- vendor/rlite/deps/lua/src/strbuf.c
+- vendor/rlite/deps/lua/src/strbuf.h
 - vendor/rlite/src/Makefile
 - vendor/rlite/src/constants.h
+- vendor/rlite/src/crc64.c
+- vendor/rlite/src/crc64.h
 - vendor/rlite/src/dump.c
 - vendor/rlite/src/dump.h
+- vendor/rlite/src/endianconv.h
 - vendor/rlite/src/hirlite.c
 - vendor/rlite/src/hirlite.h
+- vendor/rlite/src/hyperloglog.c
+- vendor/rlite/src/hyperloglog.h
+- vendor/rlite/src/lzf.h
+- vendor/rlite/src/lzfP.h
+- vendor/rlite/src/lzf_c.c
+- vendor/rlite/src/lzf_d.c
 - vendor/rlite/src/page_btree.c
 - vendor/rlite/src/page_btree.h
 - vendor/rlite/src/page_key.c
@@ -106,10 +166,17 @@ files:
 - vendor/rlite/src/page_string.h
 - vendor/rlite/src/pqsort.c
 - vendor/rlite/src/pqsort.h
+- vendor/rlite/src/rand.c
+- vendor/rlite/src/rand.h
 - vendor/rlite/src/restore.c
 - vendor/rlite/src/restore.h
 - vendor/rlite/src/rlite.c
 - vendor/rlite/src/rlite.h
+- vendor/rlite/src/scripting.c
+- vendor/rlite/src/scripting.h
+- vendor/rlite/src/sha1.c
+- vendor/rlite/src/sha1.h
+- vendor/rlite/src/solarisfixes.h
 - vendor/rlite/src/sort.c
 - vendor/rlite/src/sort.h
 - vendor/rlite/src/status.h
@@ -125,6 +192,8 @@ files:
 - vendor/rlite/src/type_zset.h
 - vendor/rlite/src/util.c
 - vendor/rlite/src/util.h
+- vendor/rlite/src/utilfromredis.c
+- vendor/rlite/src/utilfromredis.h
 homepage: http://github.com/seppo0010/rlite-rb
 licenses:
 - BSD-3-Clause