grammar create node bug fix

swilly22 · Nov 27, 2016 · 39e3300 · 39e3300
1 parent 1e64cd2
commit 39e3300
Show file tree

Hide file tree

Showing 8 changed files with 199 additions and 170 deletions.
diff --git a/Demo/social/social_demo.py b/Demo/social/social_demo.py
@@ -68,7 +68,8 @@ def AddPersonToGraph(person, pipe):
             pipe.hmset(key, {prop: person[prop]})
 
     for country in person["visited"]:
-            pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "visited", country)
+        pipe.hmset(country, {"name": country})
+        pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "visited", country)
 
     for friend in person["friendsWith"]:
          pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "friend", friend["name"])
@@ -111,6 +112,11 @@ def main():
                 WHERE fof.status = single
                 RETURN fof.name""";
         ExecuteQuery(query)
+
+        print "Friends who've been to places I've visited"
+        query = """MATCH (ME:"Roi Lipman")-[visited]->(country)<-[visited]-(f)<-[friend]-(:"Roi Lipman")
+                RETURN f.name, country.name""";
+        ExecuteQuery(query)
 
 if __name__ == '__main__':
 	main()
diff --git a/Demo/social/social_demo_debug.py b/Demo/social/social_demo_debug.py
@@ -60,7 +60,8 @@ def AddPersonToGraph(person, pipe):
             pipe.hmset(key, {prop: person[prop]})
 
     for country in person["visited"]:
-            pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "visited", country)
+        pipe.hmset(country, {"name": country})
+        pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "visited", country)
 
     for friend in person["friendsWith"]:
          pipe.execute_command("GRAPH.ADDEDGE", graph, person["name"], "friend", friend["name"])
@@ -100,6 +101,11 @@ def main():
             WHERE fof.status = single
             RETURN fof.name""";
     ExecuteQuery(query)
+
+    print "Friends who've been to places I've visited"
+    query = """MATCH (ME:"Roi Lipman")-[visited]->(country)<-[visited]-(f)<-[friend]-(:"Roi Lipman")
+            RETURN f.name, country.name""";
+    ExecuteQuery(query)
 
 if __name__ == '__main__':
 	main()
diff --git a/Demo/social/visits.csv b/Demo/social/visits.csv
@@ -4,7 +4,6 @@ Roi Lipman,Tokyo
 Alon Fital,Prague
 Alon Fital,USA
 Alon Fital,Greece
-Alon Fital,USA
 Ori Laslo,Canada
 Ori Laslo,USA
 Ori Laslo,China

diff --git a/src/graph/graph.c b/src/graph/graph.c
@@ -26,6 +26,13 @@ Node* Graph_AddNode(Graph* g, const char* alias, const char* id) {
     if(n == NULL) {
         n = NewNode(alias, id);
         Vector_Push(g->nodes, n);
+    } else {
+        // Update node ID in case it is missing
+        if(n->id != NULL && strlen(n->id) == 0 && strlen(id) > 0) {
+            free(n->id);
+            n->id = (char*)malloc(sizeof(char) * (strlen(id) + 1));
+            strcpy(n->id, id);
+        }
     }
 
     return n;

diff --git a/src/graph/node.c b/src/graph/node.c
@@ -11,15 +11,14 @@ Node* NewNode(const char* alias, const char* id) {
 
 	if(id != NULL) {
 		node->id = (char*)malloc(sizeof(char) * (strlen(id) + 1));
+		strcpy(node->id, id);
 	}
 
 	if(alias != NULL) {
 		node->alias = (char*)malloc(sizeof(char) * (strlen(alias) + 1));
+		strcpy(node->alias, alias);
 	}
 
-	strcpy(node->id, id);
-	strcpy(node->alias, alias);
-
 	return node;
 }
 

diff --git a/src/module.c b/src/module.c
@@ -208,7 +208,6 @@ char* BuildQueryResponse(RedisModuleCtx *ctx, const ReturnNode* returnNode, cons
         Node* n = Graph_GetNodeByAlias(g, var->alias);
         // Alias maps to subject or object?
         char* elementID = n->id;
-
         RedisModuleString* keyStr = 
         RedisModule_CreateString(ctx, elementID, strlen(elementID));
 
@@ -254,7 +253,6 @@ char* BuildQueryResponse(RedisModuleCtx *ctx, const ReturnNode* returnNode, cons
     strItem[strlen(strItem)-1] = NULL;
 
     // TODO: Clean up
-
     return strItem;
 }