[fix] fixing kn.py script. improving readability of our use cases

Author: filipecosta90

benchmark/redisgraph/README.md

@@ -27,9 +27,12 @@ sudo pip install --upgrade pip
 ## Current use cases
 This article documents the details on how to reproduce the graph database benchmark result on RedisGraph.
 Currently, RedisGraph benchmark supports two use cases:
- - graph500 
-- twitter 
-                                                                                                                                                                                                                   
+
+
+Name | Description and Source | Vertices | Edges
+-- | -- | -- | --
+graph500 | Synthetic Kronecker graphhttp://graph500.org | 2.4 M | 64 M
+twitter | Twitter user-follower directed graphhttp://an.kaist.ac.kr/traces/WWW2010.html | 41.6 M | 1.47 B                                                                                                                                                                                                 
 
 ### How to use the benchmark
 
@@ -95,26 +98,26 @@ Results will be stored in "result_redisgraph" output directory.
 ##### Graph500
 
 ```bash
-# 300 seeds, depth 1
-nohup python kn.py -g graph500 -s graph500_22_seed -c 300 -d 6 -p redisgraph -l graph500_22_unique_node -t 22 -i 1
-# 300 seeds, depth 2
-nohup python kn.py -g graph500 -s graph500_22_seed -c 300 -d 6 -p redisgraph -l graph500_22_unique_node -t 22 -i 2
-# 10 seeds, depth 3
+# 300 seeds, depth 1, 3 iterations per query
+nohup python kn.py -g graph500 -s graph500_22_seed -c 300 -d 1 -p redisgraph -l graph500_22_unique_node -t 22 -i 3
+# 300 seeds, depth 2, 3 iterations per query
+nohup python kn.py -g graph500 -s graph500_22_seed -c 300 -d 2 -p redisgraph -l graph500_22_unique_node -t 22 -i 3
+# 10 seeds, depth 3, 3 iterations per query
+nohup python kn.py -g graph500 -s graph500_22_seed -c 10 -d 3 -p redisgraph -l graph500_22_unique_node -t 22 -i 3
+# 10 seeds, depth 6, 3 iterations per query
 nohup python kn.py -g graph500 -s graph500_22_seed -c 10 -d 6 -p redisgraph -l graph500_22_unique_node -t 22 -i 3
-# 10 seeds, depth 6
-nohup python kn.py -g graph500 -s graph500_22_seed -c 10 -d 6 -p redisgraph -l graph500_22_unique_node -t 22 -i 6
 ```
 
 
 ##### Twitter Benchmark
 
 ```bash
-# 300 seeds, depth 1
-nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 300 -d 6 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 1
-# 300 seeds, depth 2
-nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 300 -d 6 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 2
-# 10 seeds, depth 3
+# 300 seeds, depth 1, 3 iterations per query
+nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 300 -d 1 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 3
+# 300 seeds, depth 2, 3 iterations per query
+nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 300 -d 2 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 3
+# 10 seeds, depth 3, 3 iterations per query
+nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 10 -d 3 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 3
+# 10 seeds, depth 6, 3 iterations per query
 nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 10 -d 6 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 3
-# 10 seeds, depth 6
-nohup python kn.py -g twitter_rv -s twitter_rv_net_seed -c 10 -d 6 -p redisgraph -l twitter_rv_net_unique_node -t 22 -i 6
 ```

benchmark/redisgraph/graph_query.py

@@ -31,6 +31,6 @@
 
     # Attempt to verify that RedisGraph module is loaded
     try:
-        module_list = client.execute_command("GRAPH.QUERY {} {}".format(args.name, args.query))
+        module_list = client.execute_command("GRAPH.QUERY {} \"{}\"".format(args.name, args.query))
     except redis.exceptions.ResponseError as e:
         raise e

benchmark/redisgraph/kn.py

@@ -104,9 +104,9 @@ def GetSeeds(seed_file_path, count):
 # function: thread worker, pull work item from pool
 # and execute query via runner
 ################################################################
-def RunKNLatencyThread(graphid, threadId, depth, provider, label, seedPool, reportQueue, iterations):
+def RunKNLatencyThread(graphid, threadId, depth, provider, label, seedPool, reportQueue, iterations, url):
     if provider == "redisgraph":
-        runner = RedisGraphQueryRunner(graphid, label)
+        runner = RedisGraphQueryRunner(graphid, label, url)
     elif provider == "tigergraph":
         runner = TigerGraphQueryRunner()
     else:
@@ -151,19 +151,22 @@ def RunKNLatencyThread(graphid, threadId, depth, provider, label, seedPool, repo
 # query for a given set of seeds.
 ################################################################
 @click.command()
-@click.option('--graphid', '-g', default='graph500-22',
-              type=click.Choice(['graph500-22', 'twitter_rv_net']), help="graph id")
+@click.option('--graphid', '-g', default='graph500_22',
+              type=click.Choice(['graph500_22', 'twitter_rv_net']), help="graph id")
 @click.option('--count', '-c', default=20, help="number of seeds")
 @click.option('--depth', '-d', default=1, help="number of hops to perform")
 @click.option('--provider', '-p', default='redisgraph', help="graph identifier")
+@click.option('--url', '-u', default='127.0.0.1:6379', help="DB url")
 @click.option('--label', '-l', default='label', help="node label")
+# @click.option('--seed', '-s', default='seed', help="seed file")
 @click.option('--threads', '-t', default=2, help="number of querying threads")
 @click.option('--iterations', '-i', default=10, help="number of iterations per query")
-def RunKNLatency(graphid, count, depth, provider, label, threads, iterations):
+def RunKNLatency(graphid, count, depth, provider, label, threads, iterations,url):
     # create result folder
     global seedReports
-    seedfile = os.path.join('data', graphid + '-seed')
+    seedfile = os.path.join('data', graphid + '_seed')
     seeds = GetSeeds(seedfile, count)
+    print "## Seeds len {}".format(len(seeds))
 
     # Create a pool of seeds.
     seedPool = multiprocessing.Queue(len(seeds) * iterations)
@@ -181,7 +184,7 @@ def RunKNLatency(graphid, count, depth, provider, label, threads, iterations):
     threadsProc = []
     for tid in range(threads):
         p = multiprocessing.Process(target=RunKNLatencyThread,
-                                    args=(graphid, tid, depth, provider, label, seedPool, reportQueue, iterations))
+                                    args=(graphid, tid, depth, provider, label, seedPool, reportQueue, iterations,url))
         threadsProc.append(p)
 
     # Launch threads

benchmark/redisgraph/requirements.txt

@@ -1,2 +1,3 @@
-redis>=2.10.6
-click>=6.7
+Click>=7.0
+redis>=3.3.8
+requests>=2.22.0