each query fixes

dice-group · Feb 1, 2021 · 88ba402 · 88ba402
1 parent d92f636
commit 88ba402
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java b/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java
@@ -90,14 +90,17 @@ public void receiveData(Properties p) {
 		m.add(subRes, successProperty, ResourceFactory.createTypedLiteral(success));
 		if(p.containsKey(COMMON.QUERY_HASH)) {
 			int queryHash = Integer.parseInt(p.get(COMMON.QUERY_HASH).toString());
-			m.add(subRes, queryIDProperty, ResourceFactory.createTypedLiteral(COMMON.RES_BASE_URI+queryHash+"/"+queryID));
+			m.add(subRes, queryIDProperty, ResourceFactory.createResource(COMMON.RES_BASE_URI+queryHash+"/"+queryID));
 		}
 		else{
 			m.add(subRes, queryIDProperty, ResourceFactory.createTypedLiteral(queryID));
 		}
 		m.add(subRes, runProperty, ResourceFactory.createTypedLiteral(run));
 		m.add(subRes, errorCodeProperty, ResourceFactory.createTypedLiteral(err));
-		m.add(subRes, resultSize, ResourceFactory.createTypedLiteral(p.get(COMMON.RECEIVE_DATA_SIZE)));
+		if(p.containsKey(COMMON.RECEIVE_DATA_SIZE)) {
+			long resSize = Long.parseLong(p.get(COMMON.RECEIVE_DATA_SIZE).toString());
+			m.add(subRes, resultSize, ResourceFactory.createTypedLiteral(resSize));
+		}
 
 		sendData(m);
 		queryRunMap.put(subject, run);

diff --git a/iguana.resultprocessor/src/test/resources/nt/eqtest.nt b/iguana.resultprocessor/src/test/resources/nt/eqtest.nt
@@ -6,25 +6,30 @@
 
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/time> "200.0"^^<http://www.w3.org/2001/XMLSchema#double>.
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/success> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/queryID> "sparql1".
+<http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/queryID> <http://iguana-benchmark.eu/resource/1123/sparql1>.
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/run> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/code> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
+<http://iguana-benchmark.eu/resource/1/1/1/0/sparql1/1> <http://iguana-benchmark.eu/properties/resultSize> "120"^^<http://www.w3.org/2001/XMLSchema#long>.
+
 
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/time> "150.0"^^<http://www.w3.org/2001/XMLSchema#double>.
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/success> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/queryID> "sparql1".
+<http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/queryID> <http://iguana-benchmark.eu/resource/1123/sparql1>.
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/run> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql1/1> <http://iguana-benchmark.eu/properties/code> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
 
+
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/time> "250.0"^^<http://www.w3.org/2001/XMLSchema#double>.
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/success> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/queryID> "sparql2".
+<http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/queryID> <http://iguana-benchmark.eu/resource/1125/sparql2>.
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/run> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
 <http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/code> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
+<http://iguana-benchmark.eu/resource/1/1/1/0/sparql2/1> <http://iguana-benchmark.eu/properties/resultSize> "100"^^<http://www.w3.org/2001/XMLSchema#long>.
+
 
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/time> "100.0"^^<http://www.w3.org/2001/XMLSchema#double>.
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/success> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
-<http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/queryID> "sparql2".
+<http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/queryID> <http://iguana-benchmark.eu/resource/1125/sparql2>.
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/run> "1"^^<http://www.w3.org/2001/XMLSchema#long> .
 <http://iguana-benchmark.eu/resource/1/1/1/1/sparql2/1> <http://iguana-benchmark.eu/properties/code> "-2"^^<http://www.w3.org/2001/XMLSchema#long> .