all-collecting query

ibr-alg · Apr 29, 2014 · cd976a5 · cd976a5
1 parent ca641f9
commit cd976a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/apps/generic_apps/inqp_test/app.cpp b/apps/generic_apps/inqp_test/app.cpp
@@ -37,9 +37,9 @@ class App : public AppBoilerplate {
 		void run_query(void*) {
 			//debug_->debug("QRY");
 
-			process(sizeof(op100), op100);
+			//process(sizeof(op100), op100);
 			process(sizeof(op90), op90);
-			process(sizeof(op80), op80);
+			//process(sizeof(op80), op80);
 			process(sizeof(op70), op70);
 			process(sizeof(cmd), cmd);
 			//debug_->debug("/QRY");

diff --git a/apps/generic_apps/inqp_test/static_data.h b/apps/generic_apps/inqp_test/static_data.h
@@ -23,6 +23,8 @@ const char* rdf[][3] = {
 <http://spitfire-project.eu/property/Temperature>            b23860b3
 <http://purl.oclc.org/NET/ssnx/ssn#observedProperty>         bf26b82e
  */
+
+/*
 enum { Q = Communicator::MESSAGE_ID_QUERY, OP = Communicator::MESSAGE_ID_OPERATOR };
 enum { OP_ROOT = 0 };
 enum AggregationType { GROUP = 0, SUM = 1, AVG = 2, COUNT = 3, MIN = 4, MAX = 5 };
@@ -32,6 +34,18 @@ block_data_t op90[]  = { OP , QID , 90   , 'j' , LEFT | 100 , BIN(010000) , BIN(
 block_data_t op80[]  = { OP , QID , 80   , 'g' , RIGHT | 90 , BIN(010011) , BIN(0) , BIN(0) , BIN(0) , BIN(010) , 0x4d , 0x0f , 0x60 , 0xb4 };
 block_data_t op70[]  = { OP , QID , 70   , 'g' , LEFT | 90  , BIN(11)     , BIN(0) , BIN(0) , BIN(0) , BIN(110) , 0xbf , 0x26 , 0xb8 , 0x2e    , 0xb2 , 0x38 , 0x60 , 0xb3 };
 block_data_t cmd[]   = { Q  , QID , 4 };
+*/
 
 
+/*
+ * COLLECT(?s ?p ?o) {
+ * 	?s ?p ?o .
+ */
+
+enum { Q = Communicator::MESSAGE_ID_QUERY, OP = Communicator::MESSAGE_ID_OPERATOR };
+enum { OP_ROOT = 0 };
+enum { QID = 1 };
+block_data_t op90[] = { OP , QID , 90   , 'c' , OP_ROOT    , BIN(111111) , BIN(0) , BIN(0) , BIN(0) };
+block_data_t op70[] = { OP , QID , 70   , 'g' , LEFT | 90  , BIN(111111) , BIN(0) , BIN(0) , BIN(0) , BIN(000) };
+block_data_t cmd[]  = { Q  , QID , 2 };
 
diff --git a/wiselib.testing/algorithms/rdf/inqp/query_processor.h b/wiselib.testing/algorithms/rdf/inqp/query_processor.h
@@ -243,6 +243,7 @@ namespace wiselib {
 			 * Execute the given query.
 			 */
 			void execute(Query *query) {
+				//printf("EXECUTE\n");
 				assert(query->ready());
 				query->build_tree();