Clang initial

itamarhaber · itamarhaber · commit 6fa40a1e52f0 · 2017-05-16T02:45:24.000+03:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,42 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+
+# Python
+.env/
+*.pyc
+
+# mkdocs
+site/
+
+.vscode/
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,36 @@
-FROM sonarsource/local-travis
+FROM ubuntu:xenial
+LABEL Description="This image is used to Redis with ReJSON under valgrind" Vendor="Redis Labs" Version="1.0"
 
-RUN apt-get -y update && apt-get install -y build-essential cmake python python-pip
-RUN pip install redis
+RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y install \
+        apt-utils \
+        build-essential \
+        wget \
+        zip \
+        valgrind
+
+RUN mkdir /build
+WORKDIR /build
+
+RUN wget https://github.com/antirez/redis/archive/unstable.zip && \
+    unzip unstable.zip && \
+    rm unstable.zip && \
+    mv redis-unstable redis
+
+WORKDIR /build/redis
+RUN make distclean
+RUN make valgrind
+
+WORKDIR /build/rejson
+COPY ./deps deps/
+COPY ./src src/
+COPY ./test test/
+COPY ./Makefile ./
+ENV DEBUG 1
+# RUN make all
+
+EXPOSE 6379
+WORKDIR /build
+CMD ["bash"]
+# CMD ["valgrind", "--tool=memcheck", "--leak-check=full", "--track-origins=yes", "--show-reachable=no", "--show-possibly-lost=no", "--suppressions=redis/src/valgrind.sup", "redis/src/redis-server", "--protected-mode", "no", "--loadmodule", "/build/rejson/src/rejson.so"]
diff --git a/Makefile b/Makefile
@@ -5,8 +5,12 @@ test:
 	$(MAKE) -C ./test all
 .PHONY: test
 
+docker:
+	docker pull ubuntu:latest
+	docker pull ubuntu:xenial
+	docker build . -t rejson:latest
+
 clean:
 	find ./ -name "*.[oa]" -exec rm {} \; -print
 	find ./ -name "*.so" -exec rm {} \; -print
-	find ./ -name "*.out" -exec rm {} \; -print
-
+	find ./ -name "*.out" -exec rm {} \; -print
diff --git a/src/json_object.c b/src/json_object.c
@@ -52,14 +52,16 @@ inline static int errorCallback(jsonsl_t jsn, jsonsl_error_t err, struct jsonsl_
 inline static void pushCallback(jsonsl_t jsn, jsonsl_action_t action, struct jsonsl_state_st *state,
                   const jsonsl_char_t *at) {
     JsonObjectContext *joctx = (JsonObjectContext *)jsn->data;
-
+    Node *n = NULL;
     // only objects (dictionaries) and lists (arrays) create a container on push
     switch (state->type) {
         case JSONSL_T_OBJECT:
-            _pushNode(joctx, NewDictNode(1));
+            n = NewDictNode(1);
+            _pushNode(joctx, n);
             break;
         case JSONSL_T_LIST:
-            _pushNode(joctx, NewArrayNode(1));
+            n = NewArrayNode(1);
+            _pushNode(joctx, n);
             break;
         default:
             break;
@@ -152,16 +154,21 @@ inline static void popCallback(jsonsl_t jsn, jsonsl_action_t action, struct json
     // anything that pops needs to be set in its parent, except the root element and keys
     if (joctx->nlen > 1 && state->type != JSONSL_T_HKEY) {
         NodeType p = joctx->nodes[joctx->nlen - 2]->type;
+        Node *n = NULL;
         switch (p) {
             case N_DICT:
-                Node_DictSetKeyVal(joctx->nodes[joctx->nlen - 1], _popNode(joctx));
+                n = _popNode(joctx);
+                Node_DictSetKeyVal(joctx->nodes[joctx->nlen - 1], n);
                 break;
             case N_ARRAY:
-                Node_ArrayAppend(joctx->nodes[joctx->nlen - 1], _popNode(joctx));
+                n = _popNode(joctx);
+                Node_ArrayAppend(joctx->nodes[joctx->nlen - 1], n);
                 break;
             case N_KEYVAL:
-                joctx->nodes[joctx->nlen - 2]->value.kvval.val = _popNode(joctx);
-                Node_DictSetKeyVal(joctx->nodes[joctx->nlen - 1], _popNode(joctx));
+                n = _popNode(joctx);                
+                joctx->nodes[joctx->nlen - 2]->value.kvval.val = n;
+                n = _popNode(joctx);
+                Node_DictSetKeyVal(joctx->nodes[joctx->nlen - 1], n);
                 break;
             default:
                 break;
diff --git a/test/Makefile b/test/Makefile
@@ -33,7 +33,7 @@ test: test_object test_json_object test_json_validator unittest
 build: object json_object json_validator
 
 # Dependency libraries
-LIBS = $(RM_INCLUDE_DIR)/librejson.a $(DEPS_DIR)/RedisModuleSDK/rmutil/librmutil.a $(DEPS_DIR)/jsonsl/libjsonsl.a -lm -lrt
+LIBS = $(RM_INCLUDE_DIR)/librejson.a $(DEPS_DIR)/RedisModuleSDK/rmutil/librmutil.a $(DEPS_DIR)/jsonsl/libjsonsl.a -lm
 # Compile flags for linux / osx
 ifeq ($(uname_S),Linux)
 	LIBS += -lrt
