Merge 37844bc into 38670e9

uwescience · Mar 20, 2014 · e235625 · e235625
2 parents 38670e9 + 37844bc
commit e235625
Show file tree

Hide file tree

Showing 39 changed files with 1,029 additions and 738 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,4 @@ build
 *NodeLocalParallel
 *catalog-journal
 englink-log4j.log
-profile.log
 /bin
diff --git a/build.gradle b/build.gradle
@@ -98,7 +98,7 @@ repositories.localRepository {
 }
 
 /* List constants that we use in multiple places. */
-ext.slf4jVersion = "1.7.5"
+ext.slf4jVersion = "1.7.6"
 ext.jerseyVersion = "1.18"
 ext.swaggerVersion = "2.10"
 ext.swaggerMinorVersion = "1.3.2"

diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -23,22 +23,11 @@ log4j.appender.A1=org.apache.log4j.FileAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%-5p %d [%t] %C{1} - %m%n
 
-
-# PROFILE is a FileAppender
-#
-log4j.appender.PROFILE.Append=true
-log4j.appender.PROFILE.File=profile.log
-log4j.appender.PROFILE.Threshold=DEBUG
-log4j.appender.PROFILE=org.apache.log4j.FileAppender
-log4j.appender.PROFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.PROFILE.layout.ConversionPattern=%m%n
-
 # do not let profiling logs go to root 
 log4j.additivity.profile=false
 
 # Log4j configuration file.
 log4j.rootLogger=INFO,A1,stdout,stderr
-log4j.logger.profile=INFO,PROFILE
 
 #
 #set level

diff --git a/jsonQueries/join_for_vis_dominik/ingest_twitterk.json b/jsonQueries/join_for_vis_dominik/ingest_twitterk.json
@@ -1,13 +1,16 @@
 {
   "relationKey" : {
     "userName" : "public",
-    "programName" : "join",
+    "programName" : "adhoc",
     "relationName" : "TwitterK"
   },
   "schema" : {
     "columnTypes" : ["LONG_TYPE", "LONG_TYPE"],
     "columnNames" : ["follower", "followee"]
   },
-  "file_name" : "/Users/dominik/Developer/Workspace/myria/data_nocommit/TwitterK.csv",
+  "source" : {
+    "dataType" : "File",
+    "filename" : "/disk2/TwitterK.csv"
+  },
   "delimiter": ","
 }
diff --git a/jsonQueries/join_for_vis_dominik/ingest_twittersmall.json b/jsonQueries/join_for_vis_dominik/ingest_twittersmall.json
@@ -0,0 +1,16 @@
+{
+  "relationKey" : {
+    "userName" : "public",
+    "programName" : "adhoc",
+    "relationName" : "TwitterSmall"
+  },
+  "schema" : {
+    "columnTypes" : ["LONG_TYPE", "LONG_TYPE"],
+    "columnNames" : ["follower", "followee"]
+  },
+  "source" : {
+    "dataType" : "File",
+    "filename" : "/disk2/TwitterSmall.csv"
+  },
+  "delimiter": ","
+}
diff --git a/jsonQueries/join_for_vis_dominik/join.json b/jsonQueries/join_for_vis_dominik/join.json
@@ -6,14 +6,13 @@
                     "opName":"Scan(R)",
                     "opType":"TableScan",
                     "relationKey":{
-                        "programName":"join",
-                        "relationName":"TwitterK",
+                        "programName":"adhoc",
+                        "relationName":"TwitterSmall",
                         "userName":"public"
                     }
                 },
                 {
                     "argChild":"Scan(R)",
-                    "argOperatorId":"hash(followee)",
                     "argPf":{
                         "index":1,
                         "type":"SingleFieldHash"
@@ -29,14 +28,13 @@
                     "opName":"Scan(S)",
                     "opType":"TableScan",
                     "relationKey":{
-                        "programName":"join",
-                        "relationName":"TwitterK",
+                        "programName":"adhoc",
+                        "relationName":"TwitterSmall",
                         "userName":"public"
                     }
                 },
                 {
                     "argChild":"Scan(S)",
-                    "argOperatorId":"hash(follower)",
                     "argPf":{
                         "index":0,
                         "type":"SingleFieldHash"
@@ -96,8 +94,8 @@
                     "opName":"Insert",
                     "opType":"DbInsert",
                     "relationKey":{
-                        "programName":"join",
-                        "relationName":"twitterK_join",
+                        "programName":"adhoc",
+                        "relationName":"TwitterJoin",
                         "userName":"public"
                     }
                 }
@@ -107,7 +105,8 @@
             ]
         }
     ],
-    "logicalRa":"join",
+    "logicalRa":"Join Twitter",
     "profilingMode":true,
-    "rawDatalog":"join"
+    "rawDatalog":"Join Twitter"
 }
+
diff --git a/jsonQueries/multiwayJoin_shumo/twitterTriangleJoinSystemTest.json b/jsonQueries/multiwayJoin_shumo/twitterTriangleJoinSystemTest.json
@@ -73,6 +73,6 @@
         }
     ],
     "logicalRa":"local triangle ",
-    "profilingMode":true,
+    "profilingMode":false,
     "rawDatalog":"T(x,y,z) =: S(x,y), R(y,z), T(z,x)"
 } 
diff --git a/jsonQueries/multiwayJoin_shumo/twoWayJoinSystemTest.json b/jsonQueries/multiwayJoin_shumo/twoWayJoinSystemTest.json
@@ -93,6 +93,6 @@
         }
     ],
     "logicalRa":"T(x,y,x,z) := S(x, y), R(y, z)",
-    "profilingMode":true,
+    "profilingMode":false,
     "rawDatalog":"T(x,y,x,z) := S(x, y), R(y, z)"
 }