Strabon

changeset 27:4caa89c66104

Undo replacing LEFT JOIN wiht INNER JOIN for MonetDB
author Giorgos Garbis <ggarbis@di.uoa.gr>
date Tue Feb 28 20:23:15 2012 +0200 (2012-02-28)
parents dbc0ec959bfa
children bf7e497a0b9e
files monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBEvaluation.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java
line diff
     1.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBEvaluation.java	Fri Feb 24 18:45:08 2012 +0200
     1.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBEvaluation.java	Tue Feb 28 20:23:15 2012 +0200
     1.3 @@ -58,7 +58,7 @@
     1.4  			QueryBindingSet bindings = new QueryBindingSet(b);
     1.5  			String query = toQueryString(qb, bindings, parameters);
     1.6  			// FIXME MonetDB doesn't handle outer joins correctly so I replace them with inner
     1.7 -			query = query.replace("LEFT", "INNER");
     1.8 +//			query = query.replace("LEFT", "INNER");
     1.9  			
    1.10  			try {
    1.11  				Connection conn = triples.getConnection();
     2.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Fri Feb 24 18:45:08 2012 +0200
     2.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Tue Feb 28 20:23:15 2012 +0200
     2.3 @@ -189,10 +189,14 @@
     2.4  	
     2.5  			
     2.6  				while (result.hasNext()) {
     2.7 -					BindingSet bindingSet = result.next();			
     2.8 -					System.out.println(bindingSet.toString());
     2.9 -	
    2.10 -					ret.add(bindingSet.toString());
    2.11 +					
    2.12 +					BindingSet bindingSet = result.next();
    2.13 +//					try {
    2.14 +						System.out.println(bindingSet.toString());
    2.15 +						ret.add(bindingSet.toString());
    2.16 +//					} catch (NullPointerException e) {
    2.17 +//						 System.err.println("Null pointer");
    2.18 +//					}
    2.19  				}
    2.20  			
    2.21  			//System.out.println("-------------------------------------------");