[POC-4] console, other fixes

apfadler · Jun 30, 2016 · 13c3682 · 13c3682
1 parent 5b228fe
commit 13c3682
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/common/src/main/scala/org/quil/JSON/package.scala b/common/src/main/scala/org/quil/JSON/package.scala
@@ -14,6 +14,14 @@ package org.quil.JSON {
 		implicit def documentToMap(d: Document): Map[String, Any] = d.fields
 	}
 
+	object Document {
+		def apply(fields:Map[String,Any]):Document  = {
+			val doc = new Document("{}")
+			doc.apply(fields)
+			doc
+		}
+	}
+
 	class Document(private var jsonStr:String) {
 
 		implicit val formats = org.json4s.DefaultFormats

diff --git a/qlobjects/src/main/scala/org/quil/server/Tasks/RunQLObjectsApplication.scala b/qlobjects/src/main/scala/org/quil/server/Tasks/RunQLObjectsApplication.scala
@@ -54,7 +54,7 @@ class RunQLObjectsApplication(val taskName:String, val taskDescription:String) e
         case e: Exception => {
         }
       }
-      ResultsCache.add(_taskName, _taskTag, 0, key, strVal, doubleVal, intVal)
+      ResultsCache.add(_taskName, _taskTag, 0, "",key, strVal, doubleVal, intVal)
     }
   }
 }
diff --git a/scala-console/src/main/java/org/quil/console/ScalaConsole.java b/scala-console/src/main/java/org/quil/console/ScalaConsole.java
@@ -17,7 +17,6 @@
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.quil.server.QuilServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,8 +45,14 @@ public static void main( String[] args )
 
 		CommandLineParser parser = new BasicParser();
 
-		String scriptInit = "import org.quil.server._;import org.quil.interpreter._; "+
-		"import org.quil.server.Tasks._; import org.quil.server.Tasks._; import org.quil.interpreter.QuantLibTemplates; import scala.collection.JavaConversions._;";
+		String scriptInit = "import org.quil.server._;import org.quil.interpreter._; import org.quil.JSON._;  import org.apache.ignite.scalar.scalar._;"+
+		"import org.quil.server.Tasks._; import org.quil.server.Tasks._; import org.quil.interpreter.QuantLibTemplates._; import scala.collection.JavaConversions._;"
+				+"def query(sql:String) = {\n" +
+				"    import org.apache.ignite.cache.query.SqlQuery\n" +
+				"    import org.apache.ignite.cache.query.SqlFieldsQuery\n" +
+				"    val cache = ignite$.cache(\"Tasks\")\n" +
+				"    cache.query(new SqlFieldsQuery(sql)) map { x => x }\n" +
+				"}";
 
 		String loadScript = "";
 		CommandLine cmd = null;
@@ -97,14 +102,14 @@ public static void main( String[] args )
         } catch (Exception e) {
         }
 
-        logger.info("Client mode = " + clientmode);
+        //logger.info("Client mode = " + clientmode);
 
-    	cfg.setClientMode(clientmode);
-    	cfg.setPeerClassLoadingEnabled(true);
-    	cfg.setIncludeEventTypes(EVTS_TASK_EXECUTION);
+    	//cfg.setClientMode(clientmode);
+    	//cfg.setPeerClassLoadingEnabled(true);
+    	//cfg.setIncludeEventTypes(EVTS_TASK_EXECUTION);
 
     	// Connect to ignite and run console 
-    	try (Ignite ignite =  Ignition.start(cfg)) {
+    	try (Ignite ignite =  Ignition.start("config/quil-client.xml")) {
 
 			logger.info("Connected to Ignite Cluster.");
 

diff --git a/server/src/main/java/org/quil/server/DocumentCacheAPI.java b/server/src/main/java/org/quil/server/DocumentCacheAPI.java
@@ -186,13 +186,8 @@ public String addJSONArray(@PathParam("cacheid") String cacheid, String data) {
 
 
         	DocumentCache cache = DocumentCache.getOrCreate(cacheid);
-
-        	//JSONParser parser = new JSONParser();
-        	//JSONArray jsonArray = (JSONArray) parser.parse(data);
-
-        	for (int i=0; i < starts.size(); i++ ) {
 
-                System.out.println(data.substring(starts.get(i),ends.get(i)));
+        	for (int i=0; i < starts.size(); i++ ) {
                 cache.put(cacheid+"_" + UUID.randomUUID(),
         				(Document)((new org.quil.JSON.Parser()).parse(data.substring(starts.get(i),ends.get(i)))));
         	}