update reachability

uwescience · Nov 13, 2015 · 7fb8dcc · 7fb8dcc
1 parent 3879427
commit 7fb8dcc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 67 deletions.
diff --git a/jsonQueries/reachability/ingest_g_62000.json → jsonQueries/reachability/ingest_g.json b/jsonQueries/reachability/ingest_g_62000.json → jsonQueries/reachability/ingest_g.json
diff --git a/jsonQueries/reachability/reachability.json b/jsonQueries/reachability/reachability.json
@@ -1,20 +1,6 @@
 {
 	"fragments": 
 	[
-		{
-			"operators":
-			[
-			{
-			  "opId" : 0,
-			  "opType" : "CollectConsumer",
-			  "argOperatorId" : 16
-			}
-			],
-			"overrideWorkers":
-			[
-				0
-			]
-		},
 		{
 			"operators":
 			[
@@ -113,6 +99,11 @@
 				{
 					"type" : "DupElim"
 				},
+				"relationKey" : {
+					"userName" : "jwang",
+					"programName" : "reachability",
+					"relationName" : "result"
+				},
 				"argEosControllerInput" : 7
 			},
 			{
@@ -155,30 +146,6 @@
 				}
 			}
 			]
-		},
-		{
-			"operators":
-			[
-			{
-				"opId" : 14,
-				"opType" : "LocalMultiwayConsumer",
-				"argOperatorId" : 13
-			},
-			{
-				"opId" : 15,
-				"opType" : "Aggregate",
-				"argChild" : 14,
-                "aggregators": [
-                {
-	                "type": "CountAll"
-                }]
-			},
-			{
-				"opId" : 16,
-				"opType" : "CollectProducer",
-				"argChild" : 15
-			}
-			]
 		}
 	],
 	"logicalRa": "",

diff --git a/jsonQueries/reachability/reachability.scala b/jsonQueries/reachability/reachability.scala