1.1 --- a/generaldb/pom.xml	Wed May 23 21:42:05 2012 +0300
     1.2 +++ b/generaldb/pom.xml	Thu May 24 13:58:55 2012 +0300
     1.3 @@ -24,7 +24,7 @@
     1.4  		</dependency>
     1.5  		<dependency>
     1.6  			<groupId>org.openrdf.sesame</groupId>
     1.7 -			<artifactId>sesame-sail-rdbms</artifactId>
     1.8 +			<artifactId>sesame-sail-rdbms-caches</artifactId>
     1.9  		</dependency>
    1.10  		<dependency>
    1.11  			<groupId>org.openrdf.sesame</groupId>

     2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java	Wed May 23 21:42:05 2012 +0300
     2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java	Thu May 24 13:58:55 2012 +0300
     2.3 @@ -111,25 +111,25 @@
     2.4  	throws SQLException
     2.5  	{
     2.6  		
     2.7 -		/// debug
     2.8 -		for(int i=1; i<12;i++) {
     2.9 -			Object o = rs.getObject(i);
    2.10 -			if (o instanceof byte[] ) {
    2.11 -				byte[] label = rs.getBytes(i);
    2.12 -				int srid = rs.getInt(i + 1);
    2.13 -				GeneralDBPolyhedron g = vf.getRdbmsPolyhedron(114, StrabonPolyhedron.ogcGeometry, label, srid);
    2.14 -				System.out.println(i+": "+g.getPolyhedronStringRep());
    2.15 -			} else if (o instanceof Blob ) {
    2.16 -				Blob labelBlob = rs.getBlob(i); 
    2.17 -				byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length());
    2.18 -				int srid = rs.getInt(i + 1);
    2.19 -				GeneralDBPolyhedron g = vf.getRdbmsPolyhedron(114, StrabonPolyhedron.ogcGeometry, label, srid);
    2.20 -				System.out.println(i+": "+g.getPolyhedronStringRep());
    2.21 -			}  
    2.22 -			else 
    2.23 -				System.out.println(i+": "+rs.getObject(i));
    2.24 -		}
    2.25 -		///
    2.26 +//		/// debug
    2.27 +//		for(int i=1; i<12;i++) {
    2.28 +//			Object o = rs.getObject(i);
    2.29 +//			if (o instanceof byte[] ) {
    2.30 +//				byte[] label = rs.getBytes(i);
    2.31 +//				int srid = rs.getInt(i + 1);
    2.32 +//				GeneralDBPolyhedron g = vf.getRdbmsPolyhedron(114, StrabonPolyhedron.ogcGeometry, label, srid);
    2.33 +//				System.out.println(i+": "+g.getPolyhedronStringRep());
    2.34 +//			} else if (o instanceof Blob ) {
    2.35 +//				Blob labelBlob = rs.getBlob(i); 
    2.36 +//				byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length());
    2.37 +//				int srid = rs.getInt(i + 1);
    2.38 +//				GeneralDBPolyhedron g = vf.getRdbmsPolyhedron(114, StrabonPolyhedron.ogcGeometry, label, srid);
    2.39 +//				System.out.println(i+": "+g.getPolyhedronStringRep());
    2.40 +//			}  
    2.41 +//			else 
    2.42 +//				System.out.println(i+": "+rs.getObject(i));
    2.43 +//		}
    2.44 +//		///
    2.45  
    2.46  		QueryBindingSet result = new QueryBindingSet(bindings);
    2.47  		for (GeneralDBColumnVar var : projections) {

     3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/TripleTable.java	Wed May 23 21:42:05 2012 +0300
     3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/TripleTable.java	Thu May 24 13:58:55 2012 +0300
     3.3 @@ -5,10 +5,18 @@
     3.4   */
     3.5  package org.openrdf.sail.generaldb.schema;
     3.6  
     3.7 +import java.io.DataInputStream;
     3.8 +import java.io.DataOutputStream;
     3.9 +import java.io.File;
    3.10 +import java.io.FileInputStream;
    3.11 +import java.io.FileNotFoundException;
    3.12 +import java.io.FileOutputStream;
    3.13 +import java.io.IOException;
    3.14  import java.sql.SQLException;
    3.15  import java.util.List;
    3.16  import java.util.Map;
    3.17  
    3.18 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    3.19  import org.openrdf.sail.rdbms.schema.RdbmsTable;
    3.20  import org.openrdf.sail.rdbms.schema.ValueTypes;
    3.21  import org.openrdf.sail.rdbms.schema.ValueType;
    3.22 @@ -53,6 +61,12 @@
    3.23  
    3.24  	private IdSequence ids;
    3.25  
    3.26 +	/**
    3.27 +	 * My additions in order to avoid the expensive initialization queries
    3.28 +	 */
    3.29 +	private int[] subjAggregates;
    3.30 +	private int[] objAggregates;
    3.31 +
    3.32  	public TripleTable(RdbmsTable table) {
    3.33  		this.table = table;
    3.34  	}
    3.35 @@ -74,8 +88,8 @@
    3.36  	}
    3.37  
    3.38  	public synchronized void initTable()
    3.39 -		throws SQLException
    3.40 -	{
    3.41 +			throws SQLException
    3.42 +			{
    3.43  		if (initialize)
    3.44  			return;
    3.45  		table.createTransactionalTable(buildTableColumns());
    3.46 @@ -95,62 +109,241 @@
    3.47  			createIndex();
    3.48  		}
    3.49  		initialize = true;
    3.50 -	}
    3.51 +			}
    3.52  
    3.53 +	/**
    3.54 +	 *  TODO Steps:
    3.55 +	 *  
    3.56 +	 *  During 1st run, use the original code of reload enhanced only with the two additional int tables. Also 
    3.57 +	 *  use the altered form of close()
    3.58 +	 *  
    3.59 +	 *  2nd run: replace reload() code and keep original close()
    3.60 +	 */
    3.61 +
    3.62 +	//Original
    3.63 +	//	public void reload()
    3.64 +	//	throws SQLException
    3.65 +	//	{
    3.66 +	//		table.count();
    3.67 +	//		if (table.size() > 0) {
    3.68 +	//			//XXX uncomment during 1st run!! --> Original code
    3.69 +	//			ValueType[] values = ValueType.values();
    3.70 +	//			String[] OBJ_CONTAINS = new String[values.length];
    3.71 +	//			String[] SUBJ_CONTAINS = new String[values.length];
    3.72 +	//			StringBuilder sb = new StringBuilder();
    3.73 +	//			for (int i = 0, n = values.length; i < n; i++) {
    3.74 +	//				sb.delete(0, sb.length());
    3.75 +	//				ValueType code = values[i];
    3.76 +	//				sb.append("MAX(CASE WHEN obj BETWEEN ").append(ids.minId(code));
    3.77 +	//				sb.append(" AND ").append(ids.maxId(code));
    3.78 +	//				sb.append(" THEN 1 ELSE 0 END)");
    3.79 +	//				OBJ_CONTAINS[i] = sb.toString();
    3.80 +	//				sb.delete(0, sb.length());
    3.81 +	//				sb.append("MAX(CASE WHEN subj BETWEEN ").append(ids.minId(code));
    3.82 +	//				sb.append(" AND ").append(ids.maxId(code));
    3.83 +	//				sb.append(" THEN 1 ELSE 0 END)");
    3.84 +	//				SUBJ_CONTAINS[i] = sb.toString();
    3.85 +	//			}
    3.86 +	//			int[] aggregate = table.aggregate(OBJ_CONTAINS);
    3.87 +	//			//XXX mine
    3.88 +	//			objAggregates = aggregate;
    3.89 +	//			//
    3.90 +	//			for (int i = 0; i < aggregate.length; i++) {
    3.91 +	//				if (aggregate[i] == 1) {
    3.92 +	//					objTypes.add(values[i]);
    3.93 +	//				}
    3.94 +	//			}
    3.95 +	//			aggregate = table.aggregate(SUBJ_CONTAINS);
    3.96 +	//			//XXX mine
    3.97 +	//			subjAggregates = aggregate;
    3.98 +	//			//
    3.99 +	//			for (int i = 0; i < aggregate.length; i++) {
   3.100 +	//				if (aggregate[i] == 1) {
   3.101 +	//					subjTypes.add(values[i]);
   3.102 +	//				}
   3.103 +	//			}
   3.104 +	//		}
   3.105 +	//		initialize = true;
   3.106 +	//	}
   3.107 +
   3.108 +
   3.109 +	//2nd version of reload
   3.110  	public void reload()
   3.111 -		throws SQLException
   3.112 -	{
   3.113 -		table.count();
   3.114 -		if (table.size() > 0) {
   3.115 -			ValueType[] values = ValueType.values();
   3.116 -			String[] OBJ_CONTAINS = new String[values.length];
   3.117 -			String[] SUBJ_CONTAINS = new String[values.length];
   3.118 -			StringBuilder sb = new StringBuilder();
   3.119 -			for (int i = 0, n = values.length; i < n; i++) {
   3.120 -				sb.delete(0, sb.length());
   3.121 -				ValueType code = values[i];
   3.122 -				sb.append("MAX(CASE WHEN obj BETWEEN ").append(ids.minId(code));
   3.123 -				sb.append(" AND ").append(ids.maxId(code));
   3.124 -				sb.append(" THEN 1 ELSE 0 END)");
   3.125 -				OBJ_CONTAINS[i] = sb.toString();
   3.126 -				sb.delete(0, sb.length());
   3.127 -				sb.append("MAX(CASE WHEN subj BETWEEN ").append(ids.minId(code));
   3.128 -				sb.append(" AND ").append(ids.maxId(code));
   3.129 -				sb.append(" THEN 1 ELSE 0 END)");
   3.130 -				SUBJ_CONTAINS[i] = sb.toString();
   3.131 -			}
   3.132 -			int[] aggregate = table.aggregate(OBJ_CONTAINS);
   3.133 -			for (int i = 0; i < aggregate.length; i++) {
   3.134 -				if (aggregate[i] == 1) {
   3.135 -					objTypes.add(values[i]);
   3.136 +			throws SQLException
   3.137 +			{
   3.138 +		//File existing = new File(StrabonPolyhedron.CACHEPATH+"initialized.bin");
   3.139 +		File file = new File(StrabonPolyhedron.CACHEPATH+"tableProperties/"+this.getName());
   3.140 +		//if(!existing.exists())
   3.141 +		if(!file.exists())
   3.142 +		{			
   3.143 +			long start = System.nanoTime();
   3.144 +			table.count();
   3.145 +			if (table.size() > 0) {
   3.146 +
   3.147 +				ValueType[] values = ValueType.values();
   3.148 +				String[] OBJ_CONTAINS = new String[values.length];
   3.149 +				String[] SUBJ_CONTAINS = new String[values.length];
   3.150 +				StringBuilder sb = new StringBuilder();
   3.151 +				for (int i = 0, n = values.length; i < n; i++) {
   3.152 +					sb.delete(0, sb.length());
   3.153 +					ValueType code = values[i];
   3.154 +					sb.append("MAX(CASE WHEN obj BETWEEN ").append(ids.minId(code));
   3.155 +					sb.append(" AND ").append(ids.maxId(code));
   3.156 +					sb.append(" THEN 1 ELSE 0 END)");
   3.157 +					OBJ_CONTAINS[i] = sb.toString();
   3.158 +					sb.delete(0, sb.length());
   3.159 +					sb.append("MAX(CASE WHEN subj BETWEEN ").append(ids.minId(code));
   3.160 +					sb.append(" AND ").append(ids.maxId(code));
   3.161 +					sb.append(" THEN 1 ELSE 0 END)");
   3.162 +					SUBJ_CONTAINS[i] = sb.toString();
   3.163 +				}
   3.164 +				int[] aggregate = table.aggregate(OBJ_CONTAINS);
   3.165 +
   3.166 +				objAggregates = aggregate;
   3.167 +
   3.168 +				for (int i = 0; i < aggregate.length; i++) {
   3.169 +					if (aggregate[i] == 1) {
   3.170 +						objTypes.add(values[i]);
   3.171 +					}
   3.172 +				}
   3.173 +				aggregate = table.aggregate(SUBJ_CONTAINS);
   3.174 +
   3.175 +				subjAggregates = aggregate;
   3.176 +
   3.177 +				for (int i = 0; i < aggregate.length; i++) {
   3.178 +					if (aggregate[i] == 1) {
   3.179 +						subjTypes.add(values[i]);
   3.180 +					}
   3.181  				}
   3.182  			}
   3.183 -			aggregate = table.aggregate(SUBJ_CONTAINS);
   3.184 -			for (int i = 0; i < aggregate.length; i++) {
   3.185 -				if (aggregate[i] == 1) {
   3.186 -					subjTypes.add(values[i]);
   3.187 +			initialize = true;
   3.188 +			//System.out.println("["+this.getName()+"] Cache TRIPLETABLE file not found. Initialization took "+(System.nanoTime()-start)+" nanoseconds.");
   3.189 +		}
   3.190 +		else
   3.191 +		{
   3.192 +			long start = System.nanoTime();
   3.193 +			//System.out.println("Everything is cached");
   3.194 +			table.count();
   3.195 +			if (table.size() > 0) {
   3.196 +
   3.197 +
   3.198 +				try {
   3.199 +					ValueType[] values = ValueType.values();
   3.200 +					//KKFileInputStream fstream = new FileInputStream(new File(StrabonPolyhedron.TABLE_SUBJ_OBJ_TYPES));
   3.201 +					FileInputStream fstream = new FileInputStream(file);
   3.202 +					DataInputStream dis = new DataInputStream(fstream);
   3.203 +					//KKboolean foundName = false;
   3.204 +					//KKwhile(!foundName)
   3.205 +					//KK{
   3.206 +					//KKString potentialName = dis.readUTF();
   3.207 +					//KKif(table.getName().equals(potentialName))//found table name
   3.208 +					//KK{
   3.209 +					//KK	foundName = true;
   3.210 +					int[] aggregate = new int[16];
   3.211 +					for(int i=0;i<16;i++)
   3.212 +					{
   3.213 +						aggregate[i] = dis.readInt();
   3.214 +						if (aggregate[i] == 1) {
   3.215 +							subjTypes.add(values[i]);
   3.216 +
   3.217 +						}
   3.218 +					}
   3.219 +
   3.220 +					for(int i=0;i<16;i++)
   3.221 +					{
   3.222 +						aggregate[i] = dis.readInt();
   3.223 +						if (aggregate[i] == 1) {
   3.224 +							objTypes.add(values[i]);
   3.225 +
   3.226 +						}
   3.227 +					}
   3.228 +
   3.229 +					dis.close();
   3.230 +					//KK}
   3.231 +				//KKelse //skip line
   3.232 +					//KK{
   3.233 +					//KKwhile(dis.readChar()!='\n')
   3.234 +					//KK{
   3.235 +					//KK//just loop till you find next line
   3.236 +					//KK}
   3.237 +					//KK}}
   3.238 +					//KK}
   3.239 +				} catch (FileNotFoundException e) {
   3.240 +
   3.241 +					e.printStackTrace();
   3.242 +				} catch (IOException e) {
   3.243 +
   3.244 +					e.printStackTrace();
   3.245  				}
   3.246 +
   3.247 +			}
   3.248 +			initialize = true;
   3.249 +			//System.out.println("["+this.getName()+"] Cache TRIPLETABLE file found. Initialization took "+(System.nanoTime()-start)+" nanoseconds.");
   3.250 +		}
   3.251  			}
   3.252  
   3.253 +	public void close()
   3.254 +			throws SQLException
   3.255 +			{
   3.256 +		//XXX uncomment during 1st run in order to fill properties file
   3.257 +		//KKFile output = new File(StrabonPolyhedron.TABLE_SUBJ_OBJ_TYPES);
   3.258 +		File output = new File(StrabonPolyhedron.CACHEPATH+"tableProperties/"+this.getName());
   3.259 +		//File existing = new File(StrabonPolyhedron.CACHEPATH+"initialized.bin");
   3.260 +		if(!output.exists()&&subjAggregates!=null)
   3.261 +		{
   3.262 +			System.out.println("["+this.getName()+"] Cache TRIPLETABLE file not found. Storing cache details...");
   3.263 +			FileOutputStream fstream = null;
   3.264 +			DataOutputStream dos = null;
   3.265 +			try {
   3.266 +				//KKfstream = new FileOutputStream(output,true);
   3.267 +				fstream = new FileOutputStream(output,false);
   3.268 +
   3.269 +				dos = new DataOutputStream(fstream);
   3.270 +
   3.271 +				//KKdos.writeUTF(table.getName());
   3.272 +				//dos.writeChar(';');
   3.273 +				for(int ii=0;ii<subjAggregates.length;ii++)
   3.274 +				{
   3.275 +					dos.writeInt(subjAggregates[ii]);
   3.276 +				}
   3.277 +
   3.278 +				//dos.writeChar(';');
   3.279 +				for(int ii=0;ii<objAggregates.length;ii++)
   3.280 +				{
   3.281 +					dos.writeInt(objAggregates[ii]);
   3.282 +				}
   3.283 +
   3.284 +				//KKdos.writeChar('\n');
   3.285 +				dos.close();
   3.286 +
   3.287 +			} catch (IOException e) {
   3.288 +
   3.289 +				e.printStackTrace();
   3.290 +			}
   3.291  		}
   3.292 -		initialize = true;
   3.293 -	}
   3.294  
   3.295 -	public void close()
   3.296 -		throws SQLException
   3.297 -	{
   3.298 +
   3.299 +
   3.300  		table.close();
   3.301 -	}
   3.302 +			}
   3.303 +
   3.304 +
   3.305 +	//	//Original close
   3.306 +	//	public void close()
   3.307 +	//		throws SQLException
   3.308 +	//	{
   3.309 +	//		table.close();
   3.310 +	//	}
   3.311  
   3.312  	public boolean isIndexed()
   3.313 -		throws SQLException
   3.314 -	{
   3.315 +			throws SQLException
   3.316 +			{
   3.317  		return table.getIndexes().size() > 1;
   3.318 -	}
   3.319 +			}
   3.320  
   3.321  	public void createIndex()
   3.322 -		throws SQLException
   3.323 -	{
   3.324 +			throws SQLException
   3.325 +			{
   3.326  		if (isPredColumnPresent()) {
   3.327  			table.index(PRED_INDEX);
   3.328  			total_st++;
   3.329 @@ -161,42 +354,42 @@
   3.330  		total_st++;
   3.331  		table.index(EXPL_INDEX);
   3.332  		total_st++;
   3.333 -	}
   3.334 +			}
   3.335  
   3.336  	public void dropIndex()
   3.337 -		throws SQLException
   3.338 -	{
   3.339 +			throws SQLException
   3.340 +			{
   3.341  		for (Map.Entry<String, List<String>> e : table.getIndexes().entrySet()) {
   3.342  			if (!e.getValue().contains("OBJ") && !e.getValue().contains("obj")) {
   3.343  				table.dropIndex(e.getKey());
   3.344  			}
   3.345  		}
   3.346 -	}
   3.347 +			}
   3.348  
   3.349  	public boolean isReady() {
   3.350  		return initialize;
   3.351  	}
   3.352  
   3.353  	public void blockUntilReady()
   3.354 -		throws SQLException
   3.355 -	{
   3.356 +			throws SQLException
   3.357 +			{
   3.358  		if (initialize)
   3.359  			return;
   3.360  		initTable();
   3.361 -	}
   3.362 +			}
   3.363  
   3.364  	public String getName()
   3.365 -		throws SQLException
   3.366 -	{
   3.367 +			throws SQLException
   3.368 +			{
   3.369  		return table.getName();
   3.370 -	}
   3.371 +			}
   3.372  
   3.373  	public String getNameWhenReady()
   3.374 -		throws SQLException
   3.375 -	{
   3.376 +			throws SQLException
   3.377 +			{
   3.378  		blockUntilReady();
   3.379  		return table.getName();
   3.380 -	}
   3.381 +			}
   3.382  
   3.383  	public ValueTypes getObjTypes() {
   3.384  		return objTypes;
   3.385 @@ -215,8 +408,8 @@
   3.386  	}
   3.387  
   3.388  	public void modified(int addedCount, int removedCount)
   3.389 -		throws SQLException
   3.390 -	{
   3.391 +			throws SQLException
   3.392 +			{
   3.393  		blockUntilReady();
   3.394  		table.modified(addedCount, removedCount);
   3.395  		table.optimize();
   3.396 @@ -224,14 +417,14 @@
   3.397  			objTypes.reset();
   3.398  			subjTypes.reset();
   3.399  		}
   3.400 -	}
   3.401 +			}
   3.402  
   3.403  	public boolean isEmpty()
   3.404 -		throws SQLException
   3.405 -	{
   3.406 +			throws SQLException
   3.407 +			{
   3.408  		blockUntilReady();
   3.409  		return table.size() == 0;
   3.410 -	}
   3.411 +			}
   3.412  
   3.413  	@Override
   3.414  	public String toString() {
   3.415 @@ -239,11 +432,11 @@
   3.416  	}
   3.417  
   3.418  	public void drop()
   3.419 -		throws SQLException
   3.420 -	{
   3.421 +			throws SQLException
   3.422 +			{
   3.423  		blockUntilReady();
   3.424  		table.drop();
   3.425 -	}
   3.426 +			}
   3.427  
   3.428  	protected CharSequence buildTableColumns() {
   3.429  		StringBuilder sb = new StringBuilder();

     4.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/ValueTable.java	Wed May 23 21:42:05 2012 +0300
     4.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/ValueTable.java	Thu May 24 13:58:55 2012 +0300
     4.3 @@ -5,6 +5,14 @@
     4.4   */
     4.5  package org.openrdf.sail.generaldb.schema;
     4.6  
     4.7 +import java.io.DataInputStream;
     4.8 +import java.io.DataOutputStream;
     4.9 +import java.io.EOFException;
    4.10 +import java.io.File;
    4.11 +import java.io.FileInputStream;
    4.12 +import java.io.FileNotFoundException;
    4.13 +import java.io.FileOutputStream;
    4.14 +import java.io.IOException;
    4.15  import java.sql.PreparedStatement;
    4.16  import java.sql.ResultSet;
    4.17  import java.sql.SQLException;
    4.18 @@ -13,6 +21,7 @@
    4.19  import java.util.List;
    4.20  import java.util.concurrent.BlockingQueue;
    4.21  
    4.22 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    4.23  import org.openrdf.sail.generaldb.GeneralDBSqlTable;
    4.24  import org.openrdf.sail.rdbms.schema.RdbmsTable;
    4.25  
    4.26 @@ -58,6 +67,11 @@
    4.27  
    4.28  	private PreparedStatement insertSelect;
    4.29  
    4.30 +	//XXX addition in order to avoid costly select - hack
    4.31 +	private List<Long> maxIds = new ArrayList<Long>();
    4.32 +	private boolean isHashTable = false;
    4.33 +	////
    4.34 +
    4.35  	public void setQueue(BlockingQueue<Batch> queue) {
    4.36  		this.queue = queue;
    4.37  	}
    4.38 @@ -123,12 +137,12 @@
    4.39  	}
    4.40  
    4.41  	public void initialize()
    4.42 -		throws SQLException
    4.43 -	{
    4.44 +			throws SQLException
    4.45 +			{
    4.46  		StringBuilder sb = new StringBuilder();
    4.47  		/****************/
    4.48 -//		sb.append("INSERT INTO ").append(getInsertTable().getName());
    4.49 -//		sb.append(" (id, value) VALUES (?, ?)");
    4.50 +		//		sb.append("INSERT INTO ").append(getInsertTable().getName());
    4.51 +		//		sb.append(" (id, value) VALUES (?, ?)");
    4.52  		sb.append("INSERT INTO ").append(getInsertTable().getName());
    4.53  		GeneralDBSqlTable table = (GeneralDBSqlTable)getInsertTable();
    4.54  		sb.append(table.buildInsertValue(sql(sqlType, length)));
    4.55 @@ -160,11 +174,46 @@
    4.56  		if (temporary != null && !temporary.isCreated()) {
    4.57  			createTemporaryTable(temporary);
    4.58  		}
    4.59 -	}
    4.60 +			}
    4.61  
    4.62  	public void close()
    4.63 -		throws SQLException
    4.64 -	{
    4.65 +			throws SQLException
    4.66 +			{
    4.67 +		//XXX uncomment during 1st run in order to fill properties file
    4.68 +		//File will only have one line
    4.69 +
    4.70 +		File output = new File(StrabonPolyhedron.TABLE_SHIFTING);
    4.71 +		File existing = new File(StrabonPolyhedron.CACHEPATH+"initialized.bin");
    4.72 +		if((!existing.exists()) || (!output.exists()))
    4.73 +		{			
    4.74 +			if(isHashTable)
    4.75 +			{
    4.76 +				System.out.println("["+this.getName()+"] Cache VALUETABLE file not found. Storing cache details...");
    4.77 +
    4.78 +				FileOutputStream fstream = null;
    4.79 +				DataOutputStream dos = null;
    4.80 +				try {
    4.81 +					fstream = new FileOutputStream(output,true);
    4.82 +
    4.83 +					dos = new DataOutputStream(fstream);
    4.84 +
    4.85 +					//dos.writeUTF(table.getName());
    4.86 +
    4.87 +					for(Long tmp : maxIds)
    4.88 +					{
    4.89 +						dos.writeLong(tmp);
    4.90 +					}
    4.91 +
    4.92 +					//dos.writeChar('\n');
    4.93 +					dos.close();
    4.94 +				} catch (IOException e) {
    4.95 +
    4.96 +					e.printStackTrace();
    4.97 +				}
    4.98 +			}
    4.99 +		}
   4.100 +		//end of addition
   4.101 +
   4.102  		if (insertSelect != null) {
   4.103  			insertSelect.close();
   4.104  		}
   4.105 @@ -172,11 +221,11 @@
   4.106  			temporary.close();
   4.107  		}
   4.108  		table.close();
   4.109 -	}
   4.110 +			}
   4.111  
   4.112  	public synchronized void insert(Number id, String value)
   4.113 -		throws SQLException, InterruptedException
   4.114 -	{
   4.115 +			throws SQLException, InterruptedException
   4.116 +			{
   4.117  		ValueBatch batch = getValueBatch();
   4.118  		if (isExpired(batch)) {
   4.119  			batch = newValueBatch();
   4.120 @@ -186,11 +235,11 @@
   4.121  		batch.setString(2, value);
   4.122  		batch.addBatch();
   4.123  		queue(batch);
   4.124 -	}
   4.125 +			}
   4.126  
   4.127  	public synchronized void insert(Number id, Number value)
   4.128 -		throws SQLException, InterruptedException
   4.129 -	{
   4.130 +			throws SQLException, InterruptedException
   4.131 +			{
   4.132  		ValueBatch batch = getValueBatch();
   4.133  		if (isExpired(batch)) {
   4.134  			batch = newValueBatch();
   4.135 @@ -200,7 +249,7 @@
   4.136  		batch.setObject(2, value);
   4.137  		batch.addBatch();
   4.138  		queue(batch);
   4.139 -	}
   4.140 +			}
   4.141  
   4.142  	public ValueBatch getValueBatch() {
   4.143  		return this.batch;
   4.144 @@ -217,8 +266,8 @@
   4.145  	}
   4.146  
   4.147  	public void initBatch(ValueBatch batch)
   4.148 -		throws SQLException
   4.149 -	{
   4.150 +			throws SQLException
   4.151 +			{
   4.152  		batch.setTable(table);
   4.153  		batch.setBatchStatement(prepareInsert(INSERT));
   4.154  		batch.setMaxBatchSize(getBatchSize());
   4.155 @@ -229,11 +278,11 @@
   4.156  			}
   4.157  			batch.setInsertStatement(insertSelect);
   4.158  		}
   4.159 -	}
   4.160 +			}
   4.161  
   4.162  	public void queue(ValueBatch batch)
   4.163 -		throws SQLException, InterruptedException
   4.164 -	{
   4.165 +			throws SQLException, InterruptedException
   4.166 +			{
   4.167  		this.batch = batch;
   4.168  		if (queue == null) {
   4.169  			batch.flush();
   4.170 @@ -241,17 +290,17 @@
   4.171  		else {
   4.172  			queue.put(batch);
   4.173  		}
   4.174 -	}
   4.175 +			}
   4.176  
   4.177  	public void optimize()
   4.178 -		throws SQLException
   4.179 -	{
   4.180 +			throws SQLException
   4.181 +			{
   4.182  		table.optimize();
   4.183 -	}
   4.184 +			}
   4.185  
   4.186  	public boolean expunge(String condition)
   4.187 -		throws SQLException
   4.188 -	{
   4.189 +			throws SQLException
   4.190 +			{
   4.191  		synchronized (table) {
   4.192  			int count = table.executeUpdate(EXPUNGE + condition);
   4.193  			if (count < 1)
   4.194 @@ -259,73 +308,117 @@
   4.195  			table.modified(0, count);
   4.196  			return true;
   4.197  		}
   4.198 -	}
   4.199 +			}
   4.200  
   4.201  	public List<Long> maxIds(int shift, int mod)
   4.202 -		throws SQLException
   4.203 -	{
   4.204 -		String column = "id";
   4.205 -		StringBuilder expr = new StringBuilder();
   4.206 -		expr.append("MOD((").append(column);
   4.207 -		expr.append(" >> ").append(shift);
   4.208 -		expr.append(") + ").append(mod).append(", ");
   4.209 -		expr.append(mod);
   4.210 -		expr.append(")");
   4.211 -		StringBuilder sb = new StringBuilder();
   4.212 -		sb.append("SELECT ");
   4.213 -		sb.append("MAX(");
   4.214 -		sb.append(column);
   4.215 -		sb.append("), ").append(expr).append(" AS grp");
   4.216 -		sb.append("\nFROM ").append(getName());
   4.217 -		sb.append("\nGROUP BY grp");
   4.218 -		String query = sb.toString();
   4.219 -		PreparedStatement st = table.prepareStatement(query);
   4.220 -		try {
   4.221 -			ResultSet rs = st.executeQuery();
   4.222 +			throws SQLException
   4.223 +			{
   4.224 +
   4.225 +		File existing = new File(StrabonPolyhedron.CACHEPATH+"initialized.bin");
   4.226 +		if(!existing.exists())
   4.227 +		{
   4.228 +			String column = "id";
   4.229 +			StringBuilder expr = new StringBuilder();
   4.230 +			expr.append("MOD((").append(column);
   4.231 +			expr.append(" >> ").append(shift);
   4.232 +			expr.append(") + ").append(mod).append(", ");
   4.233 +			expr.append(mod);
   4.234 +			expr.append(")");
   4.235 +			StringBuilder sb = new StringBuilder();
   4.236 +			sb.append("SELECT ");
   4.237 +			sb.append("MAX(");
   4.238 +			sb.append(column);
   4.239 +			sb.append("), ").append(expr).append(" AS grp");
   4.240 +			sb.append("\nFROM ").append(getName());
   4.241 +			sb.append("\nGROUP BY grp");
   4.242 +			String query = sb.toString();
   4.243 +			PreparedStatement st = table.prepareStatement(query);
   4.244  			try {
   4.245 -				List<Long> result = new ArrayList<Long>();
   4.246 -				while (rs.next()) {
   4.247 -					result.add(rs.getLong(1));
   4.248 +				ResultSet rs = st.executeQuery();
   4.249 +				try {
   4.250 +					List<Long> result = new ArrayList<Long>();
   4.251 +					while (rs.next()) {
   4.252 +						result.add(rs.getLong(1));
   4.253 +					}
   4.254 +
   4.255 +					//XXX addition --> will use in close()
   4.256 +					maxIds.addAll(result);
   4.257 +					isHashTable = true;
   4.258 +
   4.259 +					return result;
   4.260  				}
   4.261 -				return result;
   4.262 +
   4.263 +				finally {
   4.264 +					rs.close();
   4.265 +				}
   4.266  			}
   4.267  			finally {
   4.268 -				rs.close();
   4.269 +				st.close();
   4.270  			}
   4.271  		}
   4.272 -		finally {
   4.273 -			st.close();
   4.274 +		else
   4.275 +		{
   4.276 +			long start = System.nanoTime();
   4.277 +			try 
   4.278 +			{
   4.279 +				FileInputStream fstream = new FileInputStream(new File(StrabonPolyhedron.TABLE_SHIFTING));
   4.280 +				DataInputStream dis = new DataInputStream(fstream);
   4.281 +
   4.282 +
   4.283 +				while(true)
   4.284 +				{
   4.285 +					try
   4.286 +					{
   4.287 +						long read = dis.readLong();
   4.288 +						maxIds.add(read);
   4.289 +					}
   4.290 +					catch(EOFException e)
   4.291 +					{
   4.292 +						break;
   4.293 +					}
   4.294 +				}
   4.295 +
   4.296 +
   4.297 +			} catch (FileNotFoundException e) {
   4.298 +
   4.299 +				e.printStackTrace();
   4.300 +			} catch (IOException e) {
   4.301 +
   4.302 +				e.printStackTrace();
   4.303 +			}
   4.304 +			//System.out.println("["+this.getName()+"] Cache VALUETABLE file found. Initialization took "+(System.nanoTime()-start)+" nanoseconds.");
   4.305 +			return maxIds;
   4.306  		}
   4.307 -	}
   4.308 +			}
   4.309  
   4.310  	public String sql(int type, int length) {
   4.311  		switch (type) {
   4.312 -			case Types.VARCHAR:
   4.313 -				if (length > 0)
   4.314 -					return "VARCHAR(" + length + ")";
   4.315 -				return "TEXT";
   4.316 -			case Types.LONGVARCHAR:
   4.317 -				if (length > 0)
   4.318 -					return "LONGVARCHAR(" + length + ")";
   4.319 -				return "TEXT";
   4.320 -			case Types.BIGINT:
   4.321 -				return "BIGINT";
   4.322 -			case Types.INTEGER:
   4.323 -				return "INTEGER";
   4.324 -			case Types.SMALLINT:
   4.325 -				return "SMALLINT";
   4.326 -			case Types.FLOAT:
   4.327 -				return "FLOAT";
   4.328 -			case Types.DOUBLE:
   4.329 -				return "DOUBLE";
   4.330 -			case Types.DECIMAL:
   4.331 -				return "DECIMAL";
   4.332 -			case Types.BOOLEAN:
   4.333 -				return "BOOLEAN";
   4.334 -			case Types.TIMESTAMP:
   4.335 -				return "TIMESTAMP";
   4.336 -			default:
   4.337 -				throw new AssertionError("Unsupported SQL Type: " + type);
   4.338 +		case Types.VARCHAR:
   4.339 +			if (length > 0)
   4.340 +				return "VARCHAR(" + length + ")";
   4.341 +			return "TEXT";
   4.342 +		case Types.LONGVARCHAR:
   4.343 +			if (length > 0)
   4.344 +				return "LONGVARCHAR(" + length + ")";
   4.345 +			return "TEXT";
   4.346 +		case Types.BIGINT:
   4.347 +			return "BIGINT";
   4.348 +		case Types.INTEGER:
   4.349 +			return "INTEGER";
   4.350 +		case Types.SMALLINT:
   4.351 +			return "SMALLINT";
   4.352 +		case Types.FLOAT:
   4.353 +			return "FLOAT";
   4.354 +		case Types.DOUBLE:
   4.355 +			return "DOUBLE";
   4.356 +		case Types.DECIMAL:
   4.357 +			return "DECIMAL";
   4.358 +		case Types.BOOLEAN:
   4.359 +			return "BOOLEAN";
   4.360 +		case Types.TIMESTAMP:
   4.361 +			return "TIMESTAMP";
   4.362 +		default:
   4.363 +			throw new AssertionError("Unsupported SQL Type: " + type);
   4.364  		}
   4.365  	}
   4.366  
   4.367 @@ -343,34 +436,34 @@
   4.368  	}
   4.369  
   4.370  	protected PreparedStatement prepareInsert(String sql)
   4.371 -		throws SQLException
   4.372 -	{
   4.373 +			throws SQLException
   4.374 +			{
   4.375  		return table.prepareStatement(sql);
   4.376 -	}
   4.377 +			}
   4.378  
   4.379  	protected PreparedStatement prepareInsertSelect(String sql)
   4.380 -		throws SQLException
   4.381 -	{
   4.382 +			throws SQLException
   4.383 +			{
   4.384  		return table.prepareStatement(sql);
   4.385 -	}
   4.386 +			}
   4.387  
   4.388  	protected void createTable(RdbmsTable table)
   4.389 -		throws SQLException
   4.390 -	{
   4.391 +			throws SQLException
   4.392 +			{
   4.393  		StringBuilder sb = new StringBuilder();
   4.394  		sb.append("  id ").append(sql(idType, -1)).append(" NOT NULL,\n");
   4.395  		sb.append("  value ").append(sql(sqlType, length));
   4.396  		sb.append(" NOT NULL\n");
   4.397  		table.createTable(sb);
   4.398 -	}
   4.399 +			}
   4.400  
   4.401  	protected void createTemporaryTable(RdbmsTable table)
   4.402 -		throws SQLException
   4.403 -	{
   4.404 +			throws SQLException
   4.405 +			{
   4.406  		StringBuilder sb = new StringBuilder();
   4.407  		sb.append("  id ").append(sql(idType, -1)).append(" NOT NULL,\n");
   4.408  		sb.append("  value ").append(sql(sqlType, length));
   4.409  		sb.append(" NOT NULL\n");
   4.410  		table.createTemporaryTable(sb);
   4.411 -	}
   4.412 +			}
   4.413  }

     5.1 --- a/monetdb/pom.xml	Wed May 23 21:42:05 2012 +0300
     5.2 +++ b/monetdb/pom.xml	Thu May 24 13:58:55 2012 +0300
     5.3 @@ -28,7 +28,7 @@
     5.4  		</dependency>
     5.5  		<dependency>
     5.6  			<groupId>org.openrdf.sesame</groupId>
     5.7 -			<artifactId>sesame-sail-rdbms</artifactId>
     5.8 +			<artifactId>sesame-sail-rdbms-caches</artifactId>
     5.9  		</dependency>
    5.10  		<dependency>
    5.11  			<groupId>org.openrdf.sesame</groupId>

     6.1 --- a/pom.xml	Wed May 23 21:42:05 2012 +0300
     6.2 +++ b/pom.xml	Thu May 24 13:58:55 2012 +0300
     6.3 @@ -26,6 +26,7 @@
     6.4  		<module>generaldb</module>
     6.5  		<module>resultio</module>
     6.6  		<module>endpoint</module>
     6.7 +		<module>rdbms</module>
     6.8  	</modules>
     6.9  
    6.10  	<properties>
    6.11 @@ -45,6 +46,13 @@
    6.12  	<dependencyManagement>
    6.13  		<dependencies>
    6.14  			<!-- Strabon dependencies -->
    6.15 +			
    6.16 +			<dependency>
    6.17 +				<groupId>org.openrdf.sesame</groupId>
    6.18 +				<artifactId>sesame-sail-rdbms-caches</artifactId>
    6.19 +				<version>${eu.earthobservatory.version}</version>
    6.20 +			</dependency>
    6.21 +			
    6.22  			<dependency>
    6.23  				<groupId>org.openrdf.sesame</groupId>
    6.24  				<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    6.25 @@ -150,12 +158,6 @@
    6.26  
    6.27  			<dependency>
    6.28  				<groupId>org.openrdf.sesame</groupId>
    6.29 -				<artifactId>sesame-sail-rdbms</artifactId>
    6.30 -				<version>${sesame.version}</version>
    6.31 -			</dependency>
    6.32 -
    6.33 -			<dependency>
    6.34 -				<groupId>org.openrdf.sesame</groupId>
    6.35  				<artifactId>sesame-repository-sparql</artifactId>
    6.36  				<version>${sesame.version}</version>
    6.37  			</dependency>

     7.1 --- a/postgis/pom.xml	Wed May 23 21:42:05 2012 +0300
     7.2 +++ b/postgis/pom.xml	Thu May 24 13:58:55 2012 +0300
     7.3 @@ -28,7 +28,7 @@
     7.4  		</dependency>
     7.5  		<dependency>
     7.6  			<groupId>org.openrdf.sesame</groupId>
     7.7 -			<artifactId>sesame-sail-rdbms</artifactId>
     7.8 +			<artifactId>sesame-sail-rdbms-caches</artifactId>
     7.9  		</dependency>
    7.10  		<dependency>
    7.11  			<groupId>org.openrdf.sesame</groupId>

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/rdbms/pom.xml	Thu May 24 13:58:55 2012 +0300
     8.3 @@ -0,0 +1,66 @@
     8.4 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     8.5 +  <modelVersion>4.0.0</modelVersion>
     8.6 +  <parent>
     8.7 +    <artifactId>strabon</artifactId>
     8.8 +    <groupId>eu.earthobservatory</groupId>
     8.9 +    <version>3.1.10-SNAPSHOT</version>
    8.10 +    <relativePath>..</relativePath>
    8.11 +  </parent>
    8.12 +  <groupId>org.openrdf.sesame</groupId>
    8.13 +  <artifactId>sesame-sail-rdbms-caches</artifactId>
    8.14 +  <name>Open RDF Sesame: RDBMS Sail Extension</name>
    8.15 +  <description>RDBMS Sail Extension accommodating our needs for caches</description>
    8.16 +  <packaging>jar</packaging>
    8.17 +  
    8.18 +  <dependencies>
    8.19 +		<dependency>
    8.20 +			<groupId>org.openrdf.sesame</groupId>
    8.21 +			<artifactId>sesame-sail-api</artifactId>
    8.22 +		</dependency>
    8.23 +
    8.24 +		<dependency>
    8.25 +			<groupId>org.openrdf.sesame</groupId>
    8.26 +			<artifactId>sesame-queryalgebra-evaluation</artifactId>
    8.27 +		</dependency>
    8.28 +		<dependency>
    8.29 +			<groupId>org.openrdf.sesame</groupId>
    8.30 +			<artifactId>sesame-queryalgebra-model</artifactId>
    8.31 +		</dependency>
    8.32 +		<dependency>
    8.33 +			<groupId>org.openrdf.sesame</groupId>
    8.34 +			<artifactId>sesame-query</artifactId>
    8.35 +		</dependency>
    8.36 +
    8.37 +		<dependency>
    8.38 +			<groupId>org.openrdf.sesame</groupId>
    8.39 +			<artifactId>sesame-model</artifactId>
    8.40 +		</dependency>
    8.41 +
    8.42 +		<dependency>
    8.43 +			<groupId>org.slf4j</groupId>
    8.44 +			<artifactId>slf4j-api</artifactId>
    8.45 +		</dependency>
    8.46 +
    8.47 +		<dependency>
    8.48 +			<groupId>commons-dbcp</groupId>
    8.49 +			<artifactId>commons-dbcp</artifactId>
    8.50 +		</dependency>
    8.51 +
    8.52 +		<dependency>
    8.53 +			<groupId>junit</groupId>
    8.54 +			<artifactId>junit</artifactId>
    8.55 +		</dependency>
    8.56 +
    8.57 +		<dependency>
    8.58 +			<groupId>postgresql</groupId>
    8.59 +			<artifactId>postgresql</artifactId>
    8.60 +			<scope>provided</scope>
    8.61 +		</dependency>
    8.62 +
    8.63 +		<dependency>
    8.64 +			<groupId>org.openrdf.sesame</groupId>
    8.65 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    8.66 +		</dependency>
    8.67 +	</dependencies>
    8.68 +</project>
    8.69 +

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsConnection.java	Thu May 24 13:58:55 2012 +0300
     9.3 @@ -0,0 +1,309 @@
     9.4 +/*
     9.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
     9.6 + *
     9.7 + * Licensed under the Aduna BSD-style license.
     9.8 + */
     9.9 +package org.openrdf.sail.rdbms;
    9.10 +
    9.11 +import java.sql.SQLException;
    9.12 +import java.util.Collection;
    9.13 +
    9.14 +import info.aduna.concurrent.locks.ExclusiveLockManager;
    9.15 +import info.aduna.concurrent.locks.Lock;
    9.16 +import info.aduna.iteration.CloseableIteration;
    9.17 +
    9.18 +import org.openrdf.model.Namespace;
    9.19 +import org.openrdf.model.Resource;
    9.20 +import org.openrdf.model.Statement;
    9.21 +import org.openrdf.model.URI;
    9.22 +import org.openrdf.model.Value;
    9.23 +import org.openrdf.query.BindingSet;
    9.24 +import org.openrdf.query.Dataset;
    9.25 +import org.openrdf.query.QueryEvaluationException;
    9.26 +import org.openrdf.query.algebra.TupleExpr;
    9.27 +import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
    9.28 +import org.openrdf.query.impl.EmptyBindingSet;
    9.29 +import org.openrdf.sail.SailConnection;
    9.30 +import org.openrdf.sail.SailException;
    9.31 +import org.openrdf.sail.helpers.DefaultSailChangedEvent;
    9.32 +import org.openrdf.sail.helpers.SailConnectionBase;
    9.33 +import org.openrdf.sail.rdbms.evaluation.RdbmsEvaluationFactory;
    9.34 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
    9.35 +import org.openrdf.sail.rdbms.iteration.NamespaceIteration;
    9.36 +import org.openrdf.sail.rdbms.iteration.RdbmsResourceIteration;
    9.37 +import org.openrdf.sail.rdbms.managers.NamespaceManager;
    9.38 +import org.openrdf.sail.rdbms.model.RdbmsResource;
    9.39 +import org.openrdf.sail.rdbms.model.RdbmsURI;
    9.40 +import org.openrdf.sail.rdbms.model.RdbmsValue;
    9.41 +import org.openrdf.sail.rdbms.optimizers.RdbmsQueryOptimizer;
    9.42 +
    9.43 +/**
    9.44 + * Coordinates the triple store, namespace manager, optimizer, and evaluation
    9.45 + * strategy into the {@link SailConnection} interface.
    9.46 + * 
    9.47 + * @author James Leigh
    9.48 + * 
    9.49 + */
    9.50 +public class RdbmsConnection extends SailConnectionBase {
    9.51 +
    9.52 +	private RdbmsStore sail;
    9.53 +
    9.54 +	private RdbmsValueFactory vf;
    9.55 +
    9.56 +	private RdbmsTripleRepository triples;
    9.57 +
    9.58 +	private NamespaceManager namespaces;
    9.59 +
    9.60 +	private RdbmsQueryOptimizer optimizer;
    9.61 +
    9.62 +	private RdbmsEvaluationFactory factory;
    9.63 +
    9.64 +	private ExclusiveLockManager lockManager;
    9.65 +
    9.66 +	private Lock lock;
    9.67 +
    9.68 +	public RdbmsConnection(RdbmsStore sail, RdbmsTripleRepository triples) {
    9.69 +		super(sail);
    9.70 +		this.sail = sail;
    9.71 +		this.vf = sail.getValueFactory();
    9.72 +		this.triples = triples;
    9.73 +	}
    9.74 +
    9.75 +	public void setNamespaces(NamespaceManager namespaces) {
    9.76 +		this.namespaces = namespaces;
    9.77 +	}
    9.78 +
    9.79 +	public void setRdbmsQueryOptimizer(RdbmsQueryOptimizer optimizer) {
    9.80 +		this.optimizer = optimizer;
    9.81 +	}
    9.82 +
    9.83 +	public void setRdbmsEvaluationFactory(RdbmsEvaluationFactory factory) {
    9.84 +		this.factory = factory;
    9.85 +	}
    9.86 +
    9.87 +	public void setLockManager(ExclusiveLockManager lock) {
    9.88 +		this.lockManager = lock;
    9.89 +	}
    9.90 +
    9.91 +	@Override
    9.92 +	protected void addStatementInternal(Resource subj, URI pred, Value obj, Resource... contexts)
    9.93 +		throws SailException
    9.94 +	{
    9.95 +		try {
    9.96 +			if (contexts.length == 0) {
    9.97 +				triples.add(vf.createStatement(subj, pred, obj));
    9.98 +			}
    9.99 +			else {
   9.100 +				for (Resource ctx : contexts) {
   9.101 +					triples.add(vf.createStatement(subj, pred, obj, ctx));
   9.102 +				}
   9.103 +			}
   9.104 +		}
   9.105 +		catch (SQLException e) {
   9.106 +			throw new RdbmsException(e);
   9.107 +		}
   9.108 +		catch (InterruptedException e) {
   9.109 +			throw new RdbmsException(e);
   9.110 +		}
   9.111 +	}
   9.112 +
   9.113 +	@Override
   9.114 +	protected void clearInternal(Resource... contexts)
   9.115 +		throws SailException
   9.116 +	{
   9.117 +		removeStatementsInternal(null, null, null, contexts);
   9.118 +	}
   9.119 +
   9.120 +	@Override
   9.121 +	protected void closeInternal()
   9.122 +		throws SailException
   9.123 +	{
   9.124 +		try {
   9.125 +			triples.close();
   9.126 +		}
   9.127 +		catch (SQLException e) {
   9.128 +			throw new RdbmsException(e);
   9.129 +		}
   9.130 +		finally {
   9.131 +			unlock();
   9.132 +		}
   9.133 +	}
   9.134 +
   9.135 +	@Override
   9.136 +	protected void commitInternal()
   9.137 +		throws SailException
   9.138 +	{
   9.139 +		try {
   9.140 +			triples.commit();
   9.141 +			unlock();
   9.142 +		}
   9.143 +		catch (SQLException e) {
   9.144 +			throw new RdbmsException(e);
   9.145 +		}
   9.146 +		catch (InterruptedException e) {
   9.147 +			throw new RdbmsException(e);
   9.148 +		}
   9.149 +
   9.150 +		// create a fresh event object.
   9.151 +		triples.setSailChangedEvent(new DefaultSailChangedEvent(sail));
   9.152 +	}
   9.153 +
   9.154 +	@Override
   9.155 +	protected RdbmsResourceIteration getContextIDsInternal()
   9.156 +		throws SailException
   9.157 +	{
   9.158 +		try {
   9.159 +			return triples.findContexts();
   9.160 +		}
   9.161 +		catch (SQLException e) {
   9.162 +			throw new RdbmsException(e);
   9.163 +		}
   9.164 +	}
   9.165 +
   9.166 +	@Override
   9.167 +	protected CloseableIteration<? extends Statement, SailException> getStatementsInternal(Resource subj,
   9.168 +			URI pred, Value obj, boolean includeInferred, Resource... contexts)
   9.169 +		throws SailException
   9.170 +	{
   9.171 +		RdbmsResource s = vf.asRdbmsResource(subj);
   9.172 +		RdbmsURI p = vf.asRdbmsURI(pred);
   9.173 +		RdbmsValue o = vf.asRdbmsValue(obj);
   9.174 +		RdbmsResource[] c = vf.asRdbmsResource(contexts);
   9.175 +		return triples.find(s, p, o, c);
   9.176 +	}
   9.177 +
   9.178 +	@Override
   9.179 +	protected void removeStatementsInternal(Resource subj, URI pred, Value obj, Resource... contexts)
   9.180 +		throws SailException
   9.181 +	{
   9.182 +		RdbmsResource s = vf.asRdbmsResource(subj);
   9.183 +		RdbmsURI p = vf.asRdbmsURI(pred);
   9.184 +		RdbmsValue o = vf.asRdbmsValue(obj);
   9.185 +		RdbmsResource[] c = vf.asRdbmsResource(contexts);
   9.186 +		triples.remove(s, p, o, c);
   9.187 +	}
   9.188 +
   9.189 +	@Override
   9.190 +	protected void rollbackInternal()
   9.191 +		throws SailException
   9.192 +	{
   9.193 +		try {
   9.194 +			triples.rollback();
   9.195 +		}
   9.196 +		catch (SQLException e) {
   9.197 +			throw new RdbmsException(e);
   9.198 +		}
   9.199 +		finally {
   9.200 +			unlock();
   9.201 +		}
   9.202 +	}
   9.203 +
   9.204 +	@Override
   9.205 +	protected CloseableIteration<BindingSet, QueryEvaluationException> evaluateInternal(TupleExpr expr,
   9.206 +			Dataset dataset, BindingSet bindings, boolean includeInferred)
   9.207 +		throws SailException
   9.208 +	{
   9.209 +		triples.flush();
   9.210 +		try {
   9.211 +			TupleExpr tupleExpr;
   9.212 +			EvaluationStrategy strategy;
   9.213 +			strategy = factory.createRdbmsEvaluation(dataset);
   9.214 +			tupleExpr = optimizer.optimize(expr, dataset, bindings, strategy);
   9.215 +			return strategy.evaluate(tupleExpr, EmptyBindingSet.getInstance());
   9.216 +		}
   9.217 +		catch (QueryEvaluationException e) {
   9.218 +			throw new SailException(e);
   9.219 +		}
   9.220 +	}
   9.221 +
   9.222 +	@Override
   9.223 +	protected void clearNamespacesInternal()
   9.224 +		throws SailException
   9.225 +	{
   9.226 +		namespaces.clearPrefixes();
   9.227 +	}
   9.228 +
   9.229 +	@Override
   9.230 +	protected String getNamespaceInternal(String prefix)
   9.231 +		throws SailException
   9.232 +	{
   9.233 +		Namespace ns = namespaces.findByPrefix(prefix);
   9.234 +		if (ns == null)
   9.235 +			return null;
   9.236 +		return ns.getName();
   9.237 +	}
   9.238 +
   9.239 +	@Override
   9.240 +	protected CloseableIteration<? extends Namespace, SailException> getNamespacesInternal()
   9.241 +		throws SailException
   9.242 +	{
   9.243 +		Collection<? extends Namespace> ns = namespaces.getNamespacesWithPrefix();
   9.244 +		return new NamespaceIteration(ns.iterator());
   9.245 +	}
   9.246 +
   9.247 +	@Override
   9.248 +	protected void removeNamespaceInternal(String prefix)
   9.249 +		throws SailException
   9.250 +	{
   9.251 +		namespaces.removePrefix(prefix);
   9.252 +	}
   9.253 +
   9.254 +	@Override
   9.255 +	protected void setNamespaceInternal(String prefix, String name)
   9.256 +		throws SailException
   9.257 +	{
   9.258 +		namespaces.setPrefix(prefix, name);
   9.259 +	}
   9.260 +
   9.261 +	@Override
   9.262 +	protected long sizeInternal(Resource... contexts)
   9.263 +		throws SailException
   9.264 +	{
   9.265 +		try {
   9.266 +			return triples.size(vf.asRdbmsResource(contexts));
   9.267 +		}
   9.268 +		catch (SQLException e) {
   9.269 +			throw new RdbmsException(e);
   9.270 +		}
   9.271 +	}
   9.272 +
   9.273 +	@Override
   9.274 +	protected void startTransactionInternal()
   9.275 +		throws SailException
   9.276 +	{
   9.277 +		try {
   9.278 +			lock();
   9.279 +			triples.begin();
   9.280 +		}
   9.281 +		catch (SQLException e) {
   9.282 +			unlock();
   9.283 +			throw new RdbmsException(e);
   9.284 +		}
   9.285 +		catch (InterruptedException e) {
   9.286 +			unlock();
   9.287 +			throw new RdbmsException(e);
   9.288 +		}
   9.289 +	}
   9.290 +
   9.291 +	@Override
   9.292 +	protected void finalize()
   9.293 +		throws Throwable
   9.294 +	{
   9.295 +		unlock();
   9.296 +		super.finalize();
   9.297 +	}
   9.298 +
   9.299 +	private void lock() throws InterruptedException {
   9.300 +		if (lockManager != null) {
   9.301 +			lock = lockManager.getExclusiveLock();
   9.302 +		}
   9.303 +	}
   9.304 +
   9.305 +	private void unlock() {
   9.306 +		if (lockManager != null && lock != null) {
   9.307 +			lock.release();
   9.308 +			lock = null;
   9.309 +		}
   9.310 +	}
   9.311 +
   9.312 +}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsConnectionFactory.java	Thu May 24 13:58:55 2012 +0300
    10.3 @@ -0,0 +1,437 @@
    10.4 +/*
    10.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    10.6 + *
    10.7 + * Licensed under the Aduna BSD-style license.
    10.8 + */
    10.9 +package org.openrdf.sail.rdbms;
   10.10 +
   10.11 +import static java.sql.Connection.TRANSACTION_READ_COMMITTED;
   10.12 +
   10.13 +import java.sql.Connection;
   10.14 +import java.sql.SQLException;
   10.15 +
   10.16 +import javax.sql.DataSource;
   10.17 +
   10.18 +import info.aduna.concurrent.locks.ExclusiveLockManager;
   10.19 +import info.aduna.concurrent.locks.Lock;
   10.20 +
   10.21 +import org.openrdf.model.impl.ValueFactoryImpl;
   10.22 +import org.openrdf.sail.SailConnection;
   10.23 +import org.openrdf.sail.SailException;
   10.24 +import org.openrdf.sail.helpers.DefaultSailChangedEvent;
   10.25 +import org.openrdf.sail.rdbms.evaluation.QueryBuilderFactory;
   10.26 +import org.openrdf.sail.rdbms.evaluation.RdbmsEvaluationFactory;
   10.27 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
   10.28 +import org.openrdf.sail.rdbms.managers.BNodeManager;
   10.29 +import org.openrdf.sail.rdbms.managers.HashManager;
   10.30 +import org.openrdf.sail.rdbms.managers.LiteralManager;
   10.31 +import org.openrdf.sail.rdbms.managers.NamespaceManager;
   10.32 +import org.openrdf.sail.rdbms.managers.PredicateManager;
   10.33 +import org.openrdf.sail.rdbms.managers.TransTableManager;
   10.34 +import org.openrdf.sail.rdbms.managers.TripleManager;
   10.35 +import org.openrdf.sail.rdbms.managers.TripleTableManager;
   10.36 +import org.openrdf.sail.rdbms.managers.UriManager;
   10.37 +import org.openrdf.sail.rdbms.optimizers.RdbmsQueryOptimizer;
   10.38 +import org.openrdf.sail.rdbms.optimizers.SelectQueryOptimizerFactory;
   10.39 +import org.openrdf.sail.rdbms.schema.BNodeTable;
   10.40 +import org.openrdf.sail.rdbms.schema.HashTable;
   10.41 +import org.openrdf.sail.rdbms.schema.IdSequence;
   10.42 +import org.openrdf.sail.rdbms.schema.IntegerIdSequence;
   10.43 +import org.openrdf.sail.rdbms.schema.LiteralTable;
   10.44 +import org.openrdf.sail.rdbms.schema.LongIdSequence;
   10.45 +import org.openrdf.sail.rdbms.schema.NamespacesTable;
   10.46 +import org.openrdf.sail.rdbms.schema.TableFactory;
   10.47 +import org.openrdf.sail.rdbms.schema.URITable;
   10.48 +import org.openrdf.sail.rdbms.schema.ValueTableFactory;
   10.49 +import org.openrdf.sail.rdbms.util.DatabaseLockManager;
   10.50 +import org.openrdf.sail.rdbms.util.Tracer;
   10.51 +
   10.52 +/**
   10.53 + * Responsible to initialise and wire all components together that will be
   10.54 + * needed to satisfy any sail connection request.
   10.55 + * 
   10.56 + * @author James Leigh
   10.57 + */
   10.58 +public class RdbmsConnectionFactory {
   10.59 +
   10.60 +	private RdbmsStore sail;
   10.61 +
   10.62 +	private DataSource ds;
   10.63 +
   10.64 +	private String user;
   10.65 +
   10.66 +	private String password;
   10.67 +
   10.68 +	private Connection resourceInserts;
   10.69 +
   10.70 +	private Connection literalInserts;
   10.71 +
   10.72 +	private Connection hashLookups;
   10.73 +
   10.74 +	private Connection nsAndTableIndexes;
   10.75 +
   10.76 +	private NamespaceManager namespaces;
   10.77 +
   10.78 +	private TripleTableManager tripleTableManager;
   10.79 +
   10.80 +	private HashManager hashManager;
   10.81 +
   10.82 +	private RdbmsValueFactory vf;
   10.83 +
   10.84 +	private UriManager uriManager;
   10.85 +
   10.86 +	private BNodeManager bnodeManager;
   10.87 +
   10.88 +	private LiteralManager literalManager;
   10.89 +
   10.90 +	private PredicateManager predicateManager;
   10.91 +
   10.92 +	private int maxTripleTables;
   10.93 +
   10.94 +	private boolean triplesIndexed = true;
   10.95 +
   10.96 +	private boolean sequenced;
   10.97 +
   10.98 +	private HashTable hashTable;
   10.99 +
  10.100 +	private URITable uriTable;
  10.101 +
  10.102 +	private BNodeTable bnodeTable;
  10.103 +
  10.104 +	private LiteralTable literalTable;
  10.105 +
  10.106 +	private IdSequence ids;
  10.107 +
  10.108 +	private final ExclusiveLockManager lock = new ExclusiveLockManager();
  10.109 +
  10.110 +	private Lock databaseLock;
  10.111 +
  10.112 +	public void setSail(RdbmsStore sail) {
  10.113 +		this.sail = sail;
  10.114 +	}
  10.115 +
  10.116 +	public DataSource getDataSource() {
  10.117 +		return ds;
  10.118 +	}
  10.119 +
  10.120 +	public void setDataSource(DataSource ds) {
  10.121 +		if (Tracer.isTraceEnabled()) {
  10.122 +			this.ds = Tracer.traceDataSource(ds);
  10.123 +		}
  10.124 +		else {
  10.125 +			this.ds = ds;
  10.126 +		}
  10.127 +	}
  10.128 +
  10.129 +	public void setDataSource(DataSource ds, String user, String password) {
  10.130 +		setDataSource(ds);
  10.131 +		this.user = user;
  10.132 +		this.password = password;
  10.133 +	}
  10.134 +
  10.135 +	public int getMaxNumberOfTripleTables() {
  10.136 +		return maxTripleTables;
  10.137 +	}
  10.138 +
  10.139 +	public void setMaxNumberOfTripleTables(int max) {
  10.140 +		maxTripleTables = max;
  10.141 +	}
  10.142 +
  10.143 +	public boolean isSequenced() {
  10.144 +		return sequenced || hashManager != null;
  10.145 +	}
  10.146 +
  10.147 +	public void setSequenced(boolean useSequence) {
  10.148 +		this.sequenced = useSequence;
  10.149 +	}
  10.150 +
  10.151 +	public boolean isTriplesIndexed() {
  10.152 +		return triplesIndexed;
  10.153 +	}
  10.154 +
  10.155 +	public void setTriplesIndexed(boolean triplesIndexed)
  10.156 +		throws SailException
  10.157 +	{
  10.158 +		this.triplesIndexed = triplesIndexed;
  10.159 +		if (tripleTableManager != null) {
  10.160 +			try {
  10.161 +				if (triplesIndexed) {
  10.162 +					tripleTableManager.createTripleIndexes();
  10.163 +				}
  10.164 +				else {
  10.165 +					tripleTableManager.dropTripleIndexes();
  10.166 +				}
  10.167 +			}
  10.168 +			catch (SQLException e) {
  10.169 +				throw new RdbmsException(e);
  10.170 +			}
  10.171 +		}
  10.172 +	}
  10.173 +
  10.174 +	public RdbmsValueFactory getValueFactory() {
  10.175 +		return vf;
  10.176 +	}
  10.177 +
  10.178 +	public void init()
  10.179 +		throws SailException
  10.180 +	{
  10.181 +		databaseLock = createDatabaseLock();
  10.182 +		try {
  10.183 +			nsAndTableIndexes = getConnection();
  10.184 +			resourceInserts = getConnection();
  10.185 +			literalInserts = getConnection();
  10.186 +			nsAndTableIndexes.setAutoCommit(true);
  10.187 +			resourceInserts.setAutoCommit(true);
  10.188 +			literalInserts.setAutoCommit(true);
  10.189 +			bnodeManager = new BNodeManager();
  10.190 +			uriManager = new UriManager();
  10.191 +			literalManager = new LiteralManager();
  10.192 +			ValueTableFactory tables = createValueTableFactory();
  10.193 +			tables.setSequenced(sequenced);
  10.194 +			if (sequenced) {
  10.195 +				ids = new IntegerIdSequence();
  10.196 +				tables.setIdSequence(ids);
  10.197 +				hashLookups = getConnection();
  10.198 +				hashLookups.setAutoCommit(true);
  10.199 +				hashManager = new HashManager();
  10.200 +				hashTable = tables.createHashTable(hashLookups, hashManager.getQueue());
  10.201 +				ids.setHashTable(hashTable);
  10.202 +				ids.init();
  10.203 +				hashManager.setHashTable(hashTable);
  10.204 +				hashManager.setBNodeManager(bnodeManager);
  10.205 +				hashManager.setLiteralManager(literalManager);
  10.206 +				hashManager.setUriManager(uriManager);
  10.207 +				hashManager.setIdSequence(ids);
  10.208 +				hashManager.init();
  10.209 +			}
  10.210 +			else {
  10.211 +				ids = new LongIdSequence();
  10.212 +				ids.init();
  10.213 +				tables.setIdSequence(ids);
  10.214 +			}
  10.215 +			namespaces = new NamespaceManager();
  10.216 +			namespaces.setConnection(resourceInserts);
  10.217 +			NamespacesTable nsTable = tables.createNamespacesTable(nsAndTableIndexes);
  10.218 +			nsTable.initialize();
  10.219 +			namespaces.setNamespacesTable(nsTable);
  10.220 +			namespaces.initialize();
  10.221 +			bnodeManager.setHashManager(hashManager);
  10.222 +			bnodeManager.setIdSequence(ids);
  10.223 +			uriManager.setHashManager(hashManager);
  10.224 +			uriManager.setIdSequence(ids);
  10.225 +			bnodeTable = tables.createBNodeTable(resourceInserts, bnodeManager.getQueue());
  10.226 +			uriTable = tables.createURITable(resourceInserts, uriManager.getQueue());
  10.227 +			literalManager.setHashManager(hashManager);
  10.228 +			literalManager.setIdSequence(ids);
  10.229 +			literalTable = tables.createLiteralTable(literalInserts, literalManager.getQueue());
  10.230 +			literalTable.setIdSequence(ids);
  10.231 +			vf = new RdbmsValueFactory();
  10.232 +			vf.setDelegate(ValueFactoryImpl.getInstance());
  10.233 +			vf.setIdSequence(ids);
  10.234 +			uriManager.setUriTable(uriTable);
  10.235 +			uriManager.init();
  10.236 +			predicateManager = new PredicateManager();
  10.237 +			predicateManager.setUriManager(uriManager);
  10.238 +			tripleTableManager = new TripleTableManager(tables);
  10.239 +			tripleTableManager.setConnection(nsAndTableIndexes);
  10.240 +			tripleTableManager.setIdSequence(ids);
  10.241 +			tripleTableManager.setBNodeManager(bnodeManager);
  10.242 +			tripleTableManager.setUriManager(uriManager);
  10.243 +			tripleTableManager.setLiteralManager(literalManager);
  10.244 +			tripleTableManager.setHashManager(hashManager);
  10.245 +			tripleTableManager.setPredicateManager(predicateManager);
  10.246 +			tripleTableManager.setMaxNumberOfTripleTables(maxTripleTables);
  10.247 +			tripleTableManager.setIndexingTriples(triplesIndexed);
  10.248 +			tripleTableManager.initialize();
  10.249 +			if (triplesIndexed) {
  10.250 +				tripleTableManager.createTripleIndexes();
  10.251 +			}
  10.252 +			else {
  10.253 +				tripleTableManager.dropTripleIndexes();
  10.254 +			}
  10.255 +			bnodeManager.setTable(bnodeTable);
  10.256 +			bnodeManager.init();
  10.257 +			vf.setBNodeManager(bnodeManager);
  10.258 +			vf.setURIManager(uriManager);
  10.259 +			literalManager.setTable(literalTable);
  10.260 +			literalManager.init();
  10.261 +			vf.setLiteralManager(literalManager);
  10.262 +			vf.setPredicateManager(predicateManager);
  10.263 +		}
  10.264 +		catch (SQLException e) {
  10.265 +			throw new RdbmsException(e);
  10.266 +		}
  10.267 +	}
  10.268 +
  10.269 +	public boolean isWritable()
  10.270 +		throws SailException
  10.271 +	{
  10.272 +		try {
  10.273 +			return !nsAndTableIndexes.isReadOnly();
  10.274 +		}
  10.275 +		catch (SQLException e) {
  10.276 +			throw new RdbmsException(e);
  10.277 +		}
  10.278 +	}
  10.279 +
  10.280 +	public SailConnection createConnection()
  10.281 +		throws SailException
  10.282 +	{
  10.283 +		try {
  10.284 +			Connection db = getConnection();
  10.285 +			db.setAutoCommit(true);
  10.286 +			if (db.getTransactionIsolation() != TRANSACTION_READ_COMMITTED) {
  10.287 +				db.setTransactionIsolation(TRANSACTION_READ_COMMITTED);
  10.288 +			}
  10.289 +			TripleManager tripleManager = new TripleManager();
  10.290 +			RdbmsTripleRepository s = new RdbmsTripleRepository();
  10.291 +			s.setTripleManager(tripleManager);
  10.292 +			s.setValueFactory(vf);
  10.293 +			s.setConnection(db);
  10.294 +			s.setBNodeTable(bnodeTable);
  10.295 +			s.setURITable(uriTable);
  10.296 +			s.setLiteralTable(literalTable);
  10.297 +			s.setIdSequence(ids);
  10.298 +			DefaultSailChangedEvent sailChangedEvent = new DefaultSailChangedEvent(sail);
  10.299 +			s.setSailChangedEvent(sailChangedEvent);
  10.300 +			TableFactory tables = createTableFactory();
  10.301 +			TransTableManager trans = createTransTableManager();
  10.302 +			trans.setIdSequence(ids);
  10.303 +			tripleManager.setTransTableManager(trans);
  10.304 +			trans.setBatchQueue(tripleManager.getQueue());
  10.305 +			trans.setSailChangedEvent(sailChangedEvent);
  10.306 +			trans.setConnection(db);
  10.307 +			trans.setTemporaryTableFactory(tables);
  10.308 +			trans.setStatementsTable(tripleTableManager);
  10.309 +			trans.setFromDummyTable(getFromDummyTable());
  10.310 +			trans.initialize();
  10.311 +			s.setTransaction(trans);
  10.312 +			QueryBuilderFactory bfactory = createQueryBuilderFactory();
  10.313 +			bfactory.setValueFactory(vf);
  10.314 +			bfactory.setUsingHashTable(hashManager != null);
  10.315 +			s.setQueryBuilderFactory(bfactory);
  10.316 +			RdbmsConnection conn = new RdbmsConnection(sail, s);
  10.317 +			conn.setNamespaces(namespaces);
  10.318 +			RdbmsEvaluationFactory efactory = new RdbmsEvaluationFactory();
  10.319 +			efactory.setQueryBuilderFactory(bfactory);
  10.320 +			efactory.setRdbmsTripleRepository(s);
  10.321 +			efactory.setIdSequence(ids);
  10.322 +			conn.setRdbmsEvaluationFactory(efactory);
  10.323 +			RdbmsQueryOptimizer optimizer = createOptimizer();
  10.324 +			SelectQueryOptimizerFactory selectOptimizerFactory = createSelectQueryOptimizerFactory();
  10.325 +			selectOptimizerFactory.setTransTableManager(trans);
  10.326 +			selectOptimizerFactory.setValueFactory(vf);
  10.327 +			selectOptimizerFactory.setIdSequence(ids);
  10.328 +			optimizer.setSelectQueryOptimizerFactory(selectOptimizerFactory);
  10.329 +			optimizer.setValueFactory(vf);
  10.330 +			optimizer.setBnodeTable(bnodeTable);
  10.331 +			optimizer.setUriTable(uriTable);
  10.332 +			optimizer.setLiteralTable(literalTable);
  10.333 +			optimizer.setHashTable(hashTable);
  10.334 +			conn.setRdbmsQueryOptimizer(optimizer);
  10.335 +			conn.setLockManager(lock);
  10.336 +			return conn;
  10.337 +		}
  10.338 +		catch (SQLException e) {
  10.339 +			throw new RdbmsException(e);
  10.340 +		}
  10.341 +	}
  10.342 +
  10.343 +	public void shutDown()
  10.344 +		throws SailException
  10.345 +	{
  10.346 +		try {
  10.347 +			if (tripleTableManager != null) {
  10.348 +				tripleTableManager.close();
  10.349 +			}
  10.350 +			if (uriManager != null) {
  10.351 +				uriManager.close();
  10.352 +			}
  10.353 +			if (bnodeManager != null) {
  10.354 +				bnodeManager.close();
  10.355 +			}
  10.356 +			if (literalManager != null) {
  10.357 +				literalManager.close();
  10.358 +			}
  10.359 +			if (hashManager != null) {
  10.360 +				hashManager.close();
  10.361 +			}
  10.362 +			if (resourceInserts != null) {
  10.363 +				resourceInserts.close();
  10.364 +				resourceInserts = null;
  10.365 +			}
  10.366 +			if (literalInserts != null) {
  10.367 +				literalInserts.close();
  10.368 +				literalInserts = null;
  10.369 +			}
  10.370 +			if (hashLookups != null) {
  10.371 +				hashLookups.close();
  10.372 +				hashLookups = null;
  10.373 +			}
  10.374 +			if (nsAndTableIndexes != null) {
  10.375 +				nsAndTableIndexes.close();
  10.376 +				nsAndTableIndexes = null;
  10.377 +			}
  10.378 +		}
  10.379 +		catch (SQLException e) {
  10.380 +			throw new RdbmsException(e);
  10.381 +		}
  10.382 +		finally {
  10.383 +			if (databaseLock != null) {
  10.384 +				databaseLock.release();
  10.385 +			}
  10.386 +		}
  10.387 +	}
  10.388 +
  10.389 +	protected Lock createDatabaseLock()
  10.390 +		throws SailException
  10.391 +	{
  10.392 +		DatabaseLockManager manager;
  10.393 +		manager = new DatabaseLockManager(ds, user, password);
  10.394 +		if (manager.isDebugEnabled())
  10.395 +			return manager.tryLock();
  10.396 +		return manager.lockOrFail();
  10.397 +	}
  10.398 +
  10.399 +	protected QueryBuilderFactory createQueryBuilderFactory() {
  10.400 +		return new QueryBuilderFactory();
  10.401 +	}
  10.402 +
  10.403 +	protected ValueTableFactory createValueTableFactory() {
  10.404 +		return new ValueTableFactory(createTableFactory());
  10.405 +	}
  10.406 +
  10.407 +	protected TableFactory createTableFactory() {
  10.408 +		return new TableFactory();
  10.409 +	}
  10.410 +
  10.411 +	protected TransTableManager createTransTableManager() {
  10.412 +		return new TransTableManager();
  10.413 +	}
  10.414 +
  10.415 +	protected RdbmsQueryOptimizer createOptimizer() {
  10.416 +		return new RdbmsQueryOptimizer();
  10.417 +	}
  10.418 +
  10.419 +	protected SelectQueryOptimizerFactory createSelectQueryOptimizerFactory() {
  10.420 +		return new SelectQueryOptimizerFactory();
  10.421 +	}
  10.422 +
  10.423 +	/**
  10.424 +	 * FROM DUAL
  10.425 +	 * 
  10.426 +	 * @return from clause or empty string
  10.427 +	 */
  10.428 +	protected String getFromDummyTable() {
  10.429 +		return "";
  10.430 +	}
  10.431 +
  10.432 +	protected Connection getConnection()
  10.433 +		throws SQLException
  10.434 +	{
  10.435 +		if (user == null)
  10.436 +			return ds.getConnection();
  10.437 +		return ds.getConnection(user, password);
  10.438 +	}
  10.439 +
  10.440 +}

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsProvider.java	Thu May 24 13:58:55 2012 +0300
    11.3 @@ -0,0 +1,20 @@
    11.4 +/*
    11.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    11.6 + *
    11.7 + * Licensed under the Aduna BSD-style license.
    11.8 + */
    11.9 +package org.openrdf.sail.rdbms;
   11.10 +
   11.11 +/**
   11.12 + * Each supported relation store should implement this service provider
   11.13 + * interface to initiate a connection factory tailored to the given product name
   11.14 + * and version. If a provider does not support the given database name and
   11.15 + * version it should not return a connection factory, but rather a null value.
   11.16 + * 
   11.17 + * @author James Leigh
   11.18 + * 
   11.19 + */
   11.20 +public interface RdbmsProvider {
   11.21 +
   11.22 +	RdbmsConnectionFactory createRdbmsConnectionFactory(String dbName, String dbVersion);
   11.23 +}

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsStore.java	Thu May 24 13:58:55 2012 +0300
    12.3 @@ -0,0 +1,258 @@
    12.4 +/*
    12.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    12.6 + *
    12.7 + * Licensed under the Aduna BSD-style license.
    12.8 + */
    12.9 +package org.openrdf.sail.rdbms;
   12.10 +
   12.11 +import java.sql.Connection;
   12.12 +import java.sql.DatabaseMetaData;
   12.13 +import java.sql.SQLException;
   12.14 +import java.util.Iterator;
   12.15 +
   12.16 +import javax.imageio.spi.ServiceRegistry;
   12.17 +import javax.naming.InitialContext;
   12.18 +import javax.naming.NamingException;
   12.19 +import javax.sql.DataSource;
   12.20 +
   12.21 +import org.apache.commons.dbcp.BasicDataSource;
   12.22 +
   12.23 +import org.openrdf.sail.SailConnection;
   12.24 +import org.openrdf.sail.SailException;
   12.25 +import org.openrdf.sail.helpers.SailBase;
   12.26 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
   12.27 +
   12.28 +/**
   12.29 + * The RDBMS SAIL for relational database storage in Sesame. This class acts
   12.30 + * both as a base class for database specific stores as well as a generic store
   12.31 + * that can infer the type of database through the JDBC connection.
   12.32 + * 
   12.33 + * @author James Leigh
   12.34 + */
   12.35 +public class RdbmsStore extends SailBase {
   12.36 +
   12.37 +	private RdbmsConnectionFactory factory;
   12.38 +
   12.39 +	private String jdbcDriver;
   12.40 +
   12.41 +	private String url;
   12.42 +
   12.43 +	private String user;
   12.44 +
   12.45 +	private String password;
   12.46 +
   12.47 +	private int maxTripleTables;
   12.48 +
   12.49 +	private boolean triplesIndexed = true;
   12.50 +
   12.51 +	private boolean sequenced = true;
   12.52 +
   12.53 +	private BasicDataSource ds;
   12.54 +
   12.55 +	public RdbmsStore() {
   12.56 +		super();
   12.57 +	}
   12.58 +
   12.59 +	/**
   12.60 +	 * Creates a new RDBMS RDF Store using the provided database connection.
   12.61 +	 * 
   12.62 +	 * @param url
   12.63 +	 *        JDNI url of a DataSource
   12.64 +	 */
   12.65 +	public RdbmsStore(String url) {
   12.66 +		this.url = url;
   12.67 +	}
   12.68 +
   12.69 +	/**
   12.70 +	 * Creates a new RDBMS RDF Store using the provided database connection.
   12.71 +	 * 
   12.72 +	 * @param url
   12.73 +	 *        JDNI url of a DataSource
   12.74 +	 * @param user
   12.75 +	 * @param password
   12.76 +	 */
   12.77 +	public RdbmsStore(String url, String user, String password) {
   12.78 +		this.url = url;
   12.79 +		this.user = user;
   12.80 +		this.password = password;
   12.81 +	}
   12.82 +
   12.83 +	/**
   12.84 +	 * Creates a new RDBMS RDF Store using the provided database connection.
   12.85 +	 * 
   12.86 +	 * @param jdbcDriver
   12.87 +	 * @param jdbcUrl
   12.88 +	 */
   12.89 +	public RdbmsStore(String jdbcDriver, String jdbcUrl) {
   12.90 +		this.jdbcDriver = jdbcDriver;
   12.91 +		this.url = jdbcUrl;
   12.92 +	}
   12.93 +
   12.94 +	/**
   12.95 +	 * Creates a new RDBMS RDF Store using the provided database connection.
   12.96 +	 * 
   12.97 +	 * @param jdbcDriver
   12.98 +	 * @param jdbcUrl
   12.99 +	 * @param user
  12.100 +	 * @param password
  12.101 +	 */
  12.102 +	public RdbmsStore(String jdbcDriver, String jdbcUrl, String user, String password) {
  12.103 +		this.jdbcDriver = jdbcDriver;
  12.104 +		this.url = jdbcUrl;
  12.105 +		this.user = user;
  12.106 +		this.password = password;
  12.107 +	}
  12.108 +
  12.109 +	public int getMaxNumberOfTripleTables() {
  12.110 +		return maxTripleTables;
  12.111 +	}
  12.112 +
  12.113 +	public void setMaxNumberOfTripleTables(int max) {
  12.114 +		maxTripleTables = max;
  12.115 +	}
  12.116 +
  12.117 +	public boolean isIndexed() {
  12.118 +		return triplesIndexed;
  12.119 +	}
  12.120 +
  12.121 +	public void setIndexed(boolean indexed)
  12.122 +		throws SailException
  12.123 +	{
  12.124 +		triplesIndexed = indexed;
  12.125 +		if (factory != null) {
  12.126 +			factory.setTriplesIndexed(triplesIndexed);
  12.127 +		}
  12.128 +	}
  12.129 +
  12.130 +	public boolean isSequenced() {
  12.131 +		return sequenced;
  12.132 +	}
  12.133 +
  12.134 +	public void setSequenced(boolean useSequence) {
  12.135 +		this.sequenced = useSequence;
  12.136 +	}
  12.137 +
  12.138 +	@Override
  12.139 +	protected void initializeInternal()
  12.140 +		throws SailException
  12.141 +	{
  12.142 +		if (factory == null) {
  12.143 +			try {
  12.144 +				factory = createFactory(jdbcDriver, url, user, password);
  12.145 +			}
  12.146 +			catch (SailException e) {
  12.147 +				throw e;
  12.148 +			}
  12.149 +			catch (Exception e) {
  12.150 +				throw new RdbmsException(e);
  12.151 +			}
  12.152 +		}
  12.153 +		factory.setMaxNumberOfTripleTables(maxTripleTables);
  12.154 +		factory.setTriplesIndexed(triplesIndexed);
  12.155 +		factory.setSequenced(sequenced);
  12.156 +		factory.init();
  12.157 +	}
  12.158 +
  12.159 +	public boolean isWritable()
  12.160 +		throws SailException
  12.161 +	{
  12.162 +		return factory.isWritable();
  12.163 +	}
  12.164 +
  12.165 +	public RdbmsValueFactory getValueFactory() {
  12.166 +		return factory.getValueFactory();
  12.167 +	}
  12.168 +
  12.169 +	@Override
  12.170 +	protected SailConnection getConnectionInternal()
  12.171 +		throws SailException
  12.172 +	{
  12.173 +		return factory.createConnection();
  12.174 +	}
  12.175 +
  12.176 +	@Override
  12.177 +	protected void shutDownInternal()
  12.178 +		throws SailException
  12.179 +	{
  12.180 +		factory.shutDown();
  12.181 +		try {
  12.182 +			if (ds != null) {
  12.183 +				ds.close();
  12.184 +			}
  12.185 +		}
  12.186 +		catch (SQLException e) {
  12.187 +			throw new RdbmsException(e);
  12.188 +		}
  12.189 +	}
  12.190 +
  12.191 +	protected void setConnectionFactory(RdbmsConnectionFactory factory) {
  12.192 +		this.factory = factory;
  12.193 +	}
  12.194 +
  12.195 +	protected void setBasicDataSource(BasicDataSource ds) {
  12.196 +		this.ds = ds;
  12.197 +	}
  12.198 +
  12.199 +	private RdbmsConnectionFactory createFactory(String jdbcDriver, String url, String user, String password)
  12.200 +		throws Exception
  12.201 +	{
  12.202 +		if (jdbcDriver != null) {
  12.203 +			Class.forName(jdbcDriver);
  12.204 +		}
  12.205 +		DataSource ds = lookupDataSource(url, user, password);
  12.206 +		Connection con;
  12.207 +		if (user == null || url.startsWith("jdbc:")) {
  12.208 +			con = ds.getConnection();
  12.209 +		}
  12.210 +		else {
  12.211 +			con = ds.getConnection(user, password);
  12.212 +		}
  12.213 +		try {
  12.214 +			DatabaseMetaData metaData = con.getMetaData();
  12.215 +			RdbmsConnectionFactory factory = newFactory(metaData);
  12.216 +			factory.setSail(this);
  12.217 +			if (user == null || url.startsWith("jdbc:")) {
  12.218 +				factory.setDataSource(ds);
  12.219 +			}
  12.220 +			else {
  12.221 +				factory.setDataSource(ds, user, password);
  12.222 +			}
  12.223 +			return factory;
  12.224 +		}
  12.225 +		finally {
  12.226 +			con.close();
  12.227 +		}
  12.228 +	}
  12.229 +
  12.230 +	private DataSource lookupDataSource(String url, String user, String password)
  12.231 +		throws NamingException
  12.232 +	{
  12.233 +		if (url.startsWith("jdbc:")) {
  12.234 +			BasicDataSource ds = new BasicDataSource();
  12.235 +			ds.setUrl(url);
  12.236 +			ds.setUsername(user);
  12.237 +			ds.setPassword(password);
  12.238 +			setBasicDataSource(ds);
  12.239 +			return ds;
  12.240 +		}
  12.241 +		return (DataSource)new InitialContext().lookup(url);
  12.242 +	}
  12.243 +
  12.244 +	private RdbmsConnectionFactory newFactory(DatabaseMetaData metaData)
  12.245 +		throws SQLException
  12.246 +	{
  12.247 +		String dbn = metaData.getDatabaseProductName();
  12.248 +		String dbv = metaData.getDatabaseProductVersion();
  12.249 +		RdbmsConnectionFactory factory;
  12.250 +		Iterator<RdbmsProvider> providers;
  12.251 +		providers = ServiceRegistry.lookupProviders(RdbmsProvider.class);
  12.252 +		while (providers.hasNext()) {
  12.253 +			RdbmsProvider provider = providers.next();
  12.254 +			factory = provider.createRdbmsConnectionFactory(dbn, dbv);
  12.255 +			if (factory != null)
  12.256 +				return factory;
  12.257 +		}
  12.258 +		return new RdbmsConnectionFactory();
  12.259 +	}
  12.260 +
  12.261 +}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsTripleRepository.java	Thu May 24 13:58:55 2012 +0300
    13.3 @@ -0,0 +1,563 @@
    13.4 +/*
    13.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    13.6 + *
    13.7 + * Licensed under the Aduna BSD-style license.
    13.8 + */
    13.9 +package org.openrdf.sail.rdbms;
   13.10 +
   13.11 +import java.sql.Connection;
   13.12 +import java.sql.PreparedStatement;
   13.13 +import java.sql.ResultSet;
   13.14 +import java.sql.SQLException;
   13.15 +import java.util.ArrayList;
   13.16 +import java.util.Collection;
   13.17 +import java.util.Collections;
   13.18 +import java.util.LinkedList;
   13.19 +import java.util.List;
   13.20 +
   13.21 +import info.aduna.concurrent.locks.Lock;
   13.22 +
   13.23 +import org.openrdf.model.Resource;
   13.24 +import org.openrdf.model.URI;
   13.25 +import org.openrdf.model.Value;
   13.26 +import org.openrdf.sail.SailException;
   13.27 +import org.openrdf.sail.helpers.DefaultSailChangedEvent;
   13.28 +import org.openrdf.sail.rdbms.evaluation.QueryBuilderFactory;
   13.29 +import org.openrdf.sail.rdbms.evaluation.SqlBracketBuilder;
   13.30 +import org.openrdf.sail.rdbms.evaluation.SqlJoinBuilder;
   13.31 +import org.openrdf.sail.rdbms.evaluation.SqlQueryBuilder;
   13.32 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
   13.33 +import org.openrdf.sail.rdbms.iteration.EmptyRdbmsResourceIteration;
   13.34 +import org.openrdf.sail.rdbms.iteration.EmptyRdbmsStatementIteration;
   13.35 +import org.openrdf.sail.rdbms.iteration.RdbmsResourceIteration;
   13.36 +import org.openrdf.sail.rdbms.iteration.RdbmsStatementIteration;
   13.37 +import org.openrdf.sail.rdbms.managers.TransTableManager;
   13.38 +import org.openrdf.sail.rdbms.managers.TripleManager;
   13.39 +import org.openrdf.sail.rdbms.model.RdbmsResource;
   13.40 +import org.openrdf.sail.rdbms.model.RdbmsStatement;
   13.41 +import org.openrdf.sail.rdbms.model.RdbmsURI;
   13.42 +import org.openrdf.sail.rdbms.model.RdbmsValue;
   13.43 +import org.openrdf.sail.rdbms.schema.BNodeTable;
   13.44 +import org.openrdf.sail.rdbms.schema.IdSequence;
   13.45 +import org.openrdf.sail.rdbms.schema.LiteralTable;
   13.46 +import org.openrdf.sail.rdbms.schema.URITable;
   13.47 +import org.openrdf.sail.rdbms.schema.ValueTable;
   13.48 +
   13.49 +/**
   13.50 + * Facade to {@link TransTableManager}, {@link URITable}, {@link BNodeTable} and
   13.51 + * {@link LiteralTable} for adding, removing, and retrieving statements from the
   13.52 + * database.
   13.53 + * 
   13.54 + * @author James Leigh
   13.55 + */
   13.56 +public class RdbmsTripleRepository {
   13.57 +
   13.58 +	public static int STMT_BUFFER = 32;
   13.59 +
   13.60 +	private Connection conn;
   13.61 +
   13.62 +	private RdbmsValueFactory vf;
   13.63 +
   13.64 +	private TransTableManager statements;
   13.65 +
   13.66 +	private QueryBuilderFactory factory;
   13.67 +
   13.68 +	private BNodeTable bnodes;
   13.69 +
   13.70 +	private URITable uris;
   13.71 +
   13.72 +	private LiteralTable literals;
   13.73 +
   13.74 +	private Lock readLock;
   13.75 +
   13.76 +	private DefaultSailChangedEvent sailChangedEvent;
   13.77 +
   13.78 +	private TripleManager manager;
   13.79 +
   13.80 +	private LinkedList<RdbmsStatement> queue = new LinkedList<RdbmsStatement>();
   13.81 +
   13.82 +	private IdSequence ids;
   13.83 +
   13.84 +	public Connection getConnection() {
   13.85 +		return conn;
   13.86 +	}
   13.87 +
   13.88 +	public void setConnection(Connection conn) {
   13.89 +		this.conn = conn;
   13.90 +	}
   13.91 +
   13.92 +	public void setIdSequence(IdSequence ids) {
   13.93 +		this.ids = ids;
   13.94 +	}
   13.95 +
   13.96 +	public RdbmsValueFactory getValueFactory() {
   13.97 +		return vf;
   13.98 +	}
   13.99 +
  13.100 +	public void setValueFactory(RdbmsValueFactory vf) {
  13.101 +		this.vf = vf;
  13.102 +	}
  13.103 +
  13.104 +	public DefaultSailChangedEvent getSailChangedEvent() {
  13.105 +		return sailChangedEvent;
  13.106 +	}
  13.107 +
  13.108 +	public void setSailChangedEvent(DefaultSailChangedEvent sailChangedEvent) {
  13.109 +		this.sailChangedEvent = sailChangedEvent;
  13.110 +	}
  13.111 +
  13.112 +	public void setQueryBuilderFactory(QueryBuilderFactory factory) {
  13.113 +		this.factory = factory;
  13.114 +	}
  13.115 +
  13.116 +	public void setBNodeTable(BNodeTable bnodes) {
  13.117 +		this.bnodes = bnodes;
  13.118 +	}
  13.119 +
  13.120 +	public void setURITable(URITable uris) {
  13.121 +		this.uris = uris;
  13.122 +	}
  13.123 +
  13.124 +	public void setLiteralTable(LiteralTable literals) {
  13.125 +		this.literals = literals;
  13.126 +	}
  13.127 +
  13.128 +	public void setTransaction(TransTableManager temporary) {
  13.129 +		this.statements = temporary;
  13.130 +	}
  13.131 +
  13.132 +	public void setTripleManager(TripleManager tripleManager) {
  13.133 +		this.manager = tripleManager;
  13.134 +	}
  13.135 +
  13.136 +	public void flush()
  13.137 +		throws RdbmsException
  13.138 +	{
  13.139 +		try {
  13.140 +			synchronized (queue) {
  13.141 +				while (!queue.isEmpty()) {
  13.142 +					insert(queue.removeFirst());
  13.143 +				}
  13.144 +			}
  13.145 +			vf.flush();
  13.146 +			manager.flush();
  13.147 +		}
  13.148 +		catch (SQLException e) {
  13.149 +			throw new RdbmsException(e);
  13.150 +		}
  13.151 +		catch (InterruptedException e) {
  13.152 +			throw new RdbmsException(e);
  13.153 +		}
  13.154 +	}
  13.155 +
  13.156 +	public synchronized void begin()
  13.157 +		throws SQLException
  13.158 +	{
  13.159 +		conn.setAutoCommit(false);
  13.160 +	}
  13.161 +
  13.162 +	public synchronized void close()
  13.163 +		throws SQLException
  13.164 +	{
  13.165 +		manager.close();
  13.166 +		if (!conn.getAutoCommit()) {
  13.167 +			conn.rollback();
  13.168 +		}
  13.169 +		conn.setAutoCommit(true);
  13.170 +		conn.close();
  13.171 +		releaseLock();
  13.172 +	}
  13.173 +
  13.174 +	public synchronized void commit()
  13.175 +		throws SQLException, RdbmsException, InterruptedException
  13.176 +	{
  13.177 +		synchronized (queue) {
  13.178 +			while (!queue.isEmpty()) {
  13.179 +				insert(queue.removeFirst());
  13.180 +			}
  13.181 +		}
  13.182 +		manager.flush();
  13.183 +		conn.commit();
  13.184 +		conn.setAutoCommit(true);
  13.185 +		releaseLock();
  13.186 +		Lock writeLock = vf.tryIdWriteLock();
  13.187 +		try {
  13.188 +			vf.flush();
  13.189 +			statements.committed(writeLock != null);
  13.190 +		}
  13.191 +		finally {
  13.192 +			if (writeLock != null) {
  13.193 +				writeLock.release();
  13.194 +			}
  13.195 +		}
  13.196 +	}
  13.197 +
  13.198 +	public void rollback()
  13.199 +		throws SQLException, SailException
  13.200 +	{
  13.201 +		synchronized (queue) {
  13.202 +			queue.clear();
  13.203 +		}
  13.204 +		manager.clear();
  13.205 +		if (!conn.getAutoCommit()) {
  13.206 +			conn.rollback();
  13.207 +			conn.setAutoCommit(true);
  13.208 +		}
  13.209 +		releaseLock();
  13.210 +	}
  13.211 +
  13.212 +	@Override
  13.213 +	protected void finalize()
  13.214 +		throws Throwable
  13.215 +	{
  13.216 +		releaseLock();
  13.217 +		super.finalize();
  13.218 +	}
  13.219 +
  13.220 +	public void add(RdbmsStatement st)
  13.221 +		throws SailException, SQLException, InterruptedException
  13.222 +	{
  13.223 +		acquireLock();
  13.224 +		synchronized (queue) {
  13.225 +			queue.add(st);
  13.226 +			if (queue.size() > getMaxQueueSize()) {
  13.227 +				insert(queue.removeFirst());
  13.228 +			}
  13.229 +		}
  13.230 +	}
  13.231 +
  13.232 +	public RdbmsStatementIteration find(Resource subj, URI pred, Value obj, Resource... ctxs)
  13.233 +		throws RdbmsException
  13.234 +	{
  13.235 +		try {
  13.236 +			RdbmsResource s = vf.asRdbmsResource(subj);
  13.237 +			RdbmsURI p = vf.asRdbmsURI(pred);
  13.238 +			RdbmsValue o = vf.asRdbmsValue(obj);
  13.239 +			RdbmsResource[] c = vf.asRdbmsResource(ctxs);
  13.240 +			flush();
  13.241 +			SqlQueryBuilder query = buildSelectQuery(s, p, o, c);
  13.242 +			if (query == null)
  13.243 +				return new EmptyRdbmsStatementIteration();
  13.244 +			List<?> parameters = query.findParameters(new ArrayList<Object>());
  13.245 +			PreparedStatement stmt = conn.prepareStatement(query.toString());
  13.246 +			try {
  13.247 +				for (int i = 0, n = parameters.size(); i < n; i++) {
  13.248 +					stmt.setObject(i + 1, parameters.get(i));
  13.249 +				}
  13.250 +				return new RdbmsStatementIteration(vf, stmt, ids);
  13.251 +			}
  13.252 +			catch (SQLException e) {
  13.253 +				stmt.close();
  13.254 +				throw e;
  13.255 +			}
  13.256 +		}
  13.257 +		catch (SQLException e) {
  13.258 +			throw new RdbmsException(e);
  13.259 +		}
  13.260 +
  13.261 +	}
  13.262 +
  13.263 +	public RdbmsResourceIteration findContexts()
  13.264 +		throws SQLException, RdbmsException
  13.265 +	{
  13.266 +		flush();
  13.267 +		String qry = buildContextQuery();
  13.268 +		if (qry == null)
  13.269 +			return new EmptyRdbmsResourceIteration();
  13.270 +		PreparedStatement stmt = conn.prepareStatement(qry);
  13.271 +		try {
  13.272 +			return new RdbmsResourceIteration(vf, stmt);
  13.273 +		}
  13.274 +		catch (SQLException e) {
  13.275 +			stmt.close();
  13.276 +			throw e;
  13.277 +		}
  13.278 +	}
  13.279 +
  13.280 +	public boolean isClosed()
  13.281 +		throws SQLException
  13.282 +	{
  13.283 +		return conn.isClosed();
  13.284 +	}
  13.285 +
  13.286 +	public int remove(Resource subj, URI pred, Value obj, Resource... ctxs)
  13.287 +		throws RdbmsException
  13.288 +	{
  13.289 +		RdbmsResource s = vf.asRdbmsResource(subj);
  13.290 +		RdbmsURI p = vf.asRdbmsURI(pred);
  13.291 +		RdbmsValue o = vf.asRdbmsValue(obj);
  13.292 +		RdbmsResource[] c = vf.asRdbmsResource(ctxs);
  13.293 +		flush();
  13.294 +		try {
  13.295 +			Collection<Number> predicates;
  13.296 +			if (p == null) {
  13.297 +				predicates = statements.getPredicateIds();
  13.298 +			}
  13.299 +			else {
  13.300 +				predicates = Collections.singleton(vf.getInternalId(p));
  13.301 +			}
  13.302 +			int total = 0;
  13.303 +			for (Number id : predicates) {
  13.304 +				String tableName = statements.findTableName(id);
  13.305 +				if (!statements.isPredColumnPresent(id)) {
  13.306 +					p = null;
  13.307 +				}
  13.308 +				String query = buildDeleteQuery(tableName, s, p, o, c);
  13.309 +				PreparedStatement stmt = conn.prepareStatement(query);
  13.310 +				try {
  13.311 +					setSelectQuery(stmt, s, p, o, c);
  13.312 +					int count = stmt.executeUpdate();
  13.313 +					statements.removed(id, count);
  13.314 +					total += count;
  13.315 +				}
  13.316 +				finally {
  13.317 +					stmt.close();
  13.318 +				}
  13.319 +			}
  13.320 +			if (total > 0) {
  13.321 +				sailChangedEvent.setStatementsRemoved(true);
  13.322 +			}
  13.323 +			return total;
  13.324 +		}
  13.325 +		catch (SQLException e) {
  13.326 +			throw new RdbmsException(e);
  13.327 +		}
  13.328 +	}
  13.329 +
  13.330 +	public long size(RdbmsResource... ctxs)
  13.331 +		throws SQLException, SailException
  13.332 +	{
  13.333 +		flush();
  13.334 +		String qry = buildCountQuery(ctxs);
  13.335 +		if (qry == null)
  13.336 +			return 0;
  13.337 +		PreparedStatement stmt = conn.prepareStatement(qry);
  13.338 +		try {
  13.339 +			setCountQuery(stmt, ctxs);
  13.340 +			ResultSet rs = stmt.executeQuery();
  13.341 +			try {
  13.342 +				if (rs.next())
  13.343 +					return rs.getLong(1);
  13.344 +				throw new RdbmsException("Could not determine size");
  13.345 +			}
  13.346 +			finally {
  13.347 +				rs.close();
  13.348 +			}
  13.349 +		}
  13.350 +		finally {
  13.351 +			stmt.close();
  13.352 +		}
  13.353 +	}
  13.354 +
  13.355 +	protected int getMaxQueueSize() {
  13.356 +		return STMT_BUFFER;
  13.357 +	}
  13.358 +
  13.359 +	private synchronized void acquireLock()
  13.360 +		throws InterruptedException
  13.361 +	{
  13.362 +		if (readLock == null) {
  13.363 +			readLock = vf.getIdReadLock();
  13.364 +		}
  13.365 +	}
  13.366 +
  13.367 +	private synchronized void releaseLock() {
  13.368 +		if (readLock != null) {
  13.369 +			readLock.release();
  13.370 +			readLock = null;
  13.371 +		}
  13.372 +	}
  13.373 +
  13.374 +	private String buildContextQuery()
  13.375 +		throws SQLException
  13.376 +	{
  13.377 +		if (statements.isEmpty())
  13.378 +			return null;
  13.379 +		String tableName = statements.getCombinedTableName();
  13.380 +		SqlQueryBuilder query = factory.createSqlQueryBuilder();
  13.381 +		query.select().column("t", "ctx");
  13.382 +		query.select().append("CASE WHEN MIN(u.value) IS NOT NULL THEN MIN(u.value) ELSE MIN(b.value) END");
  13.383 +		SqlJoinBuilder join = query.from(tableName, "t");
  13.384 +		join.leftjoin(bnodes.getName(), "b").on("id", "t.ctx");
  13.385 +		join.leftjoin(uris.getShortTableName(), "u").on("id", "t.ctx");
  13.386 +		SqlBracketBuilder open = query.filter().and().open();
  13.387 +		open.column("u", "value").isNotNull();
  13.388 +		open.or();
  13.389 +		open.column("b", "value").isNotNull();
  13.390 +		open.close();
  13.391 +		query.groupBy("t.ctx");
  13.392 +		return query.toString();
  13.393 +	}
  13.394 +
  13.395 +	private String buildCountQuery(RdbmsResource... ctxs)
  13.396 +		throws SQLException
  13.397 +	{
  13.398 +		String tableName = statements.getCombinedTableName();
  13.399 +		StringBuilder sb = new StringBuilder();
  13.400 +		sb.append("SELECT COUNT(*) FROM ");
  13.401 +		sb.append(tableName).append(" t");
  13.402 +		if (ctxs != null && ctxs.length > 0) {
  13.403 +			sb.append("\nWHERE ");
  13.404 +			for (int i = 0; i < ctxs.length; i++) {
  13.405 +				sb.append("t.ctx = ?");
  13.406 +				if (i < ctxs.length - 1) {
  13.407 +					sb.append(" OR ");
  13.408 +				}
  13.409 +			}
  13.410 +		}
  13.411 +		return sb.toString();
  13.412 +	}
  13.413 +
  13.414 +	private String buildDeleteQuery(String tableName, RdbmsResource subj, RdbmsURI pred, RdbmsValue obj,
  13.415 +			RdbmsResource... ctxs)
  13.416 +		throws RdbmsException, SQLException
  13.417 +	{
  13.418 +		StringBuilder sb = new StringBuilder();
  13.419 +		sb.append("DELETE FROM ").append(tableName);
  13.420 +		return buildWhere(sb, subj, pred, obj, ctxs);
  13.421 +	}
  13.422 +
  13.423 +	private SqlQueryBuilder buildSelectQuery(RdbmsResource subj, RdbmsURI pred, RdbmsValue obj,
  13.424 +			RdbmsResource... ctxs)
  13.425 +		throws RdbmsException, SQLException
  13.426 +	{
  13.427 +		String tableName = statements.getTableName(vf.getInternalId(pred));
  13.428 +		SqlQueryBuilder query = factory.createSqlQueryBuilder();
  13.429 +		query.select().column("t", "ctx");
  13.430 +		query.select().append(
  13.431 +				"CASE WHEN cu.value IS NOT NULL THEN cu.value WHEN clu.value IS NOT NULL THEN clu.value ELSE cb.value END");
  13.432 +		query.select().column("t", "subj");
  13.433 +		query.select().append(
  13.434 +				"CASE WHEN su.value IS NOT NULL THEN su.value WHEN slu.value IS NOT NULL THEN slu.value ELSE sb.value END");
  13.435 +		query.select().column("pu", "id");
  13.436 +		query.select().column("pu", "value");
  13.437 +		query.select().column("t", "obj");
  13.438 +		query.select().append(
  13.439 +				"CASE WHEN ou.value IS NOT NULL THEN ou.value" + " WHEN olu.value IS NOT NULL THEN olu.value"
  13.440 +						+ " WHEN ob.value IS NOT NULL THEN ob.value"
  13.441 +						+ " WHEN ol.value IS NOT NULL THEN ol.value ELSE oll.value END");
  13.442 +		query.select().column("od", "value");
  13.443 +		query.select().column("og", "value");
  13.444 +		SqlJoinBuilder join;
  13.445 +		if (pred != null) {
  13.446 +			join = query.from(uris.getShortTableName(), "pu");
  13.447 +			// TODO what about long predicate URIs?
  13.448 +			join = join.join(tableName, "t");
  13.449 +		}
  13.450 +		else {
  13.451 +			join = query.from(tableName, "t");
  13.452 +		}
  13.453 +		if (pred == null) {
  13.454 +			join.join(uris.getShortTableName(), "pu").on("id", "t.pred");
  13.455 +		}
  13.456 +		join.leftjoin(uris.getShortTableName(), "cu").on("id", "t.ctx");
  13.457 +		join.leftjoin(uris.getLongTableName(), "clu").on("id", "t.ctx");
  13.458 +		join.leftjoin(bnodes.getName(), "cb").on("id", "t.ctx");
  13.459 +		join.leftjoin(uris.getShortTableName(), "su").on("id", "t.subj");
  13.460 +		join.leftjoin(uris.getLongTableName(), "slu").on("id", "t.subj");
  13.461 +		join.leftjoin(bnodes.getName(), "sb").on("id", "t.subj");
  13.462 +		join.leftjoin(uris.getShortTableName(), "ou").on("id", "t.obj");
  13.463 +		join.leftjoin(uris.getLongTableName(), "olu").on("id", "t.obj");
  13.464 +		join.leftjoin(bnodes.getName(), "ob").on("id", "t.obj");
  13.465 +		join.leftjoin(literals.getLabelTable().getName(), "ol").on("id", "t.obj");
  13.466 +		join.leftjoin(literals.getLongLabelTable().getName(), "oll").on("id", "t.obj");
  13.467 +		join.leftjoin(literals.getLanguageTable().getName(), "og").on("id", "t.obj");
  13.468 +		join.leftjoin(literals.getDatatypeTable().getName(), "od").on("id", "t.obj");
  13.469 +		if (ctxs != null && ctxs.length > 0) {
  13.470 +			Number[] ids = new Number[ctxs.length];
  13.471 +			for (int i = 0; i < ids.length; i++) {
  13.472 +				ids[i] = vf.getInternalId(ctxs[i]);
  13.473 +			}
  13.474 +			query.filter().and().columnIn("t", "ctx", ids);
  13.475 +		}
  13.476 +		if (subj != null) {
  13.477 +			Number id = vf.getInternalId(subj);
  13.478 +			query.filter().and().columnEquals("t", "subj", id);
  13.479 +		}
  13.480 +		if (pred != null) {
  13.481 +			Number id = vf.getInternalId(pred);
  13.482 +			query.filter().and().columnEquals("pu", "id", id);
  13.483 +			if (statements.isPredColumnPresent(id)) {
  13.484 +				query.filter().and().columnEquals("t", "pred", id);
  13.485 +			}
  13.486 +		}
  13.487 +		if (obj != null) {
  13.488 +			Number id = vf.getInternalId(obj);
  13.489 +			query.filter().and().columnEquals("t", "obj", id);
  13.490 +		}
  13.491 +		return query;
  13.492 +	}
  13.493 +
  13.494 +	private String buildWhere(StringBuilder sb, RdbmsResource subj, RdbmsURI pred, RdbmsValue obj,
  13.495 +			RdbmsResource... ctxs)
  13.496 +	{
  13.497 +		sb.append("\nWHERE 1=1");
  13.498 +		if (ctxs != null && ctxs.length > 0) {
  13.499 +			sb.append(" AND (");
  13.500 +			for (int i = 0; i < ctxs.length; i++) {
  13.501 +				sb.append("ctx = ?");
  13.502 +				if (i < ctxs.length - 1) {
  13.503 +					sb.append(" OR ");
  13.504 +				}
  13.505 +			}
  13.506 +			sb.append(")");
  13.507 +		}
  13.508 +		if (subj != null) {
  13.509 +			sb.append(" AND subj = ?");
  13.510 +		}
  13.511 +		if (pred != null) {
  13.512 +			sb.append(" AND pred = ?");
  13.513 +		}
  13.514 +		if (obj != null) {
  13.515 +			sb.append(" AND obj = ?");
  13.516 +		}
  13.517 +		return sb.toString();
  13.518 +	}
  13.519 +
  13.520 +	private void insert(RdbmsStatement st)
  13.521 +		throws RdbmsException, SQLException, InterruptedException
  13.522 +	{
  13.523 +		Number ctx = vf.getInternalId(st.getContext());
  13.524 +		Number subj = vf.getInternalId(st.getSubject());
  13.525 +		Number pred = vf.getPredicateId(st.getPredicate());
  13.526 +		Number obj = vf.getInternalId(st.getObject());
  13.527 +		manager.insert(ctx, subj, pred, obj);
  13.528 +	}
  13.529 +
  13.530 +	private void setCountQuery(PreparedStatement stmt, RdbmsResource... ctxs)
  13.531 +		throws SQLException, RdbmsException
  13.532 +	{
  13.533 +		if (ctxs != null && ctxs.length > 0) {
  13.534 +			for (int i = 0; i < ctxs.length; i++) {
  13.535 +				stmt.setObject(i + 1, vf.getInternalId(ctxs[i]));
  13.536 +			}
  13.537 +		}
  13.538 +	}
  13.539 +
  13.540 +	private void setSelectQuery(PreparedStatement stmt, RdbmsResource subj, RdbmsURI pred, RdbmsValue obj,
  13.541 +			RdbmsResource... ctxs)
  13.542 +		throws SQLException, RdbmsException
  13.543 +	{
  13.544 +		int p = 0;
  13.545 +		if (ctxs != null && ctxs.length > 0) {
  13.546 +			for (int i = 0; i < ctxs.length; i++) {
  13.547 +				if (ctxs[i] == null) {
  13.548 +					stmt.setLong(++p, ValueTable.NIL_ID);
  13.549 +				}
  13.550 +				else {
  13.551 +					stmt.setObject(++p, vf.getInternalId(ctxs[i]));
  13.552 +				}
  13.553 +			}
  13.554 +		}
  13.555 +		if (subj != null) {
  13.556 +			stmt.setObject(++p, vf.getInternalId(subj));
  13.557 +		}
  13.558 +		if (pred != null) {
  13.559 +			stmt.setObject(++p, vf.getInternalId(pred));
  13.560 +		}
  13.561 +		if (obj != null) {
  13.562 +			stmt.setObject(++p, vf.getInternalId(obj));
  13.563 +		}
  13.564 +	}
  13.565 +
  13.566 +}

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/RdbmsValueFactory.java	Thu May 24 13:58:55 2012 +0300
    14.3 @@ -0,0 +1,308 @@
    14.4 +/*
    14.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    14.6 + *
    14.7 + * Licensed under the Aduna BSD-style license.
    14.8 + */
    14.9 +package org.openrdf.sail.rdbms;
   14.10 +
   14.11 +import java.sql.SQLException;
   14.12 +
   14.13 +import info.aduna.concurrent.locks.Lock;
   14.14 +import info.aduna.concurrent.locks.WritePrefReadWriteLockManager;
   14.15 +
   14.16 +import org.openrdf.model.BNode;
   14.17 +import org.openrdf.model.Literal;
   14.18 +import org.openrdf.model.Resource;
   14.19 +import org.openrdf.model.Statement;
   14.20 +import org.openrdf.model.URI;
   14.21 +import org.openrdf.model.Value;
   14.22 +import org.openrdf.model.ValueFactory;
   14.23 +import org.openrdf.model.impl.ValueFactoryBase;
   14.24 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
   14.25 +import org.openrdf.sail.rdbms.exceptions.RdbmsRuntimeException;
   14.26 +import org.openrdf.sail.rdbms.managers.BNodeManager;
   14.27 +import org.openrdf.sail.rdbms.managers.LiteralManager;
   14.28 +import org.openrdf.sail.rdbms.managers.PredicateManager;
   14.29 +import org.openrdf.sail.rdbms.managers.UriManager;
   14.30 +import org.openrdf.sail.rdbms.model.RdbmsBNode;
   14.31 +import org.openrdf.sail.rdbms.model.RdbmsLiteral;
   14.32 +import org.openrdf.sail.rdbms.model.RdbmsResource;
   14.33 +import org.openrdf.sail.rdbms.model.RdbmsStatement;
   14.34 +import org.openrdf.sail.rdbms.model.RdbmsURI;
   14.35 +import org.openrdf.sail.rdbms.model.RdbmsValue;
   14.36 +import org.openrdf.sail.rdbms.schema.IdSequence;
   14.37 +import org.openrdf.sail.rdbms.schema.LiteralTable;
   14.38 +import org.openrdf.sail.rdbms.schema.ValueTable;
   14.39 +
   14.40 +/**
   14.41 + * Provides basic value creation both for traditional values as well as values
   14.42 + * with an internal id. {@link RdbmsValue}s behaviour similar to the default
   14.43 + * {@link Value} implementation with the addition that they also include an
   14.44 + * internal id and a version associated with that id. The internal ids should
   14.45 + * not be accessed directly, but rather either through this class or the
   14.46 + * corresponding manager class.
   14.47 + * 
   14.48 + * @author James Leigh
   14.49 + * 
   14.50 + */
   14.51 +public class RdbmsValueFactory extends ValueFactoryBase {
   14.52 +
   14.53 +	@Deprecated
   14.54 +	public static final String NIL_LABEL = "nil";
   14.55 +
   14.56 +	private ValueFactory vf;
   14.57 +
   14.58 +	private BNodeManager bnodes;
   14.59 +
   14.60 +	private UriManager uris;
   14.61 +
   14.62 +	private LiteralManager literals;
   14.63 +
   14.64 +	private PredicateManager predicates;
   14.65 +
   14.66 +	private WritePrefReadWriteLockManager lock = new WritePrefReadWriteLockManager();
   14.67 +
   14.68 +	private IdSequence ids;
   14.69 +
   14.70 +	public void setIdSequence(IdSequence ids) {
   14.71 +		this.ids = ids;
   14.72 +	}
   14.73 +
   14.74 +	public void setBNodeManager(BNodeManager bnodes) {
   14.75 +		this.bnodes = bnodes;
   14.76 +	}
   14.77 +
   14.78 +	public void setURIManager(UriManager uris) {
   14.79 +		this.uris = uris;
   14.80 +	}
   14.81 +
   14.82 +	public void setLiteralManager(LiteralManager literals) {
   14.83 +		this.literals = literals;
   14.84 +	}
   14.85 +
   14.86 +	public void setPredicateManager(PredicateManager predicates) {
   14.87 +		this.predicates = predicates;
   14.88 +	}
   14.89 +
   14.90 +	public void setDelegate(ValueFactory vf) {
   14.91 +		this.vf = vf;
   14.92 +	}
   14.93 +
   14.94 +	public void flush()
   14.95 +		throws RdbmsException
   14.96 +	{
   14.97 +		try {
   14.98 +			bnodes.flush();
   14.99 +			uris.flush();
  14.100 +			literals.flush();
  14.101 +		}
  14.102 +		catch (SQLException e) {
  14.103 +			throw new RdbmsException(e);
  14.104 +		}
  14.105 +		catch (InterruptedException e) {
  14.106 +			throw new RdbmsException(e);
  14.107 +		}
  14.108 +	}
  14.109 +
  14.110 +	public RdbmsBNode createBNode(String nodeID) {
  14.111 +		RdbmsBNode resource = bnodes.findInCache(nodeID);
  14.112 +		if (resource == null) {
  14.113 +			try {
  14.114 +				BNode impl = vf.createBNode(nodeID);
  14.115 +				resource = new RdbmsBNode(impl);
  14.116 +				bnodes.cache(resource);
  14.117 +			}
  14.118 +			catch (InterruptedException e) {
  14.119 +				throw new RdbmsRuntimeException(e);
  14.120 +			}
  14.121 +		}
  14.122 +		return resource;
  14.123 +	}
  14.124 +
  14.125 +	public RdbmsLiteral createLiteral(String label) {
  14.126 +		return asRdbmsLiteral(vf.createLiteral(label));
  14.127 +	}
  14.128 +
  14.129 +	public RdbmsLiteral createLiteral(String label, String language) {
  14.130 +		if (LiteralTable.ONLY_INSERT_LABEL)
  14.131 +			return createLiteral(label);
  14.132 +		return asRdbmsLiteral(vf.createLiteral(label, language));
  14.133 +	}
  14.134 +
  14.135 +	public RdbmsLiteral createLiteral(String label, URI datatype) {
  14.136 +		if (LiteralTable.ONLY_INSERT_LABEL)
  14.137 +			return createLiteral(label);
  14.138 +		return asRdbmsLiteral(vf.createLiteral(label, datatype));
  14.139 +	}
  14.140 +
  14.141 +	public RdbmsStatement createStatement(Resource subject, URI predicate, Value object) {
  14.142 +		return createStatement(subject, predicate, object, null);
  14.143 +	}
  14.144 +
  14.145 +	public RdbmsStatement createStatement(Resource subject, URI predicate, Value object, Resource context) {
  14.146 +		RdbmsResource subj = asRdbmsResource(subject);
  14.147 +		RdbmsURI pred = asRdbmsURI(predicate);
  14.148 +		RdbmsValue obj = asRdbmsValue(object);
  14.149 +		RdbmsResource ctx = asRdbmsResource(context);
  14.150 +		return new RdbmsStatement(subj, pred, obj, ctx);
  14.151 +	}
  14.152 +
  14.153 +	public RdbmsURI createURI(String uri) {
  14.154 +		RdbmsURI resource = uris.findInCache(uri);
  14.155 +		if (resource == null) {
  14.156 +			try {
  14.157 +				URI impl = vf.createURI(uri);
  14.158 +				resource = new RdbmsURI(impl);
  14.159 +				uris.cache(resource);
  14.160 +			}
  14.161 +			catch (InterruptedException e) {
  14.162 +				throw new RdbmsRuntimeException(e);
  14.163 +			}
  14.164 +		}
  14.165 +		return resource;
  14.166 +	}
  14.167 +
  14.168 +	public RdbmsURI createURI(String namespace, String localName) {
  14.169 +		return createURI(namespace + localName);
  14.170 +	}
  14.171 +
  14.172 +	public RdbmsResource getRdbmsResource(Number num, String stringValue) {
  14.173 +		assert stringValue != null : "Null stringValue for ID: " + num;
  14.174 +		Number id = ids.idOf(num);
  14.175 +		if (ids.isURI(id))
  14.176 +			return new RdbmsURI(id, uris.getIdVersion(), vf.createURI(stringValue));
  14.177 +		return new RdbmsBNode(id, bnodes.getIdVersion(), vf.createBNode(stringValue));
  14.178 +	}
  14.179 +
  14.180 +	public RdbmsLiteral getRdbmsLiteral(Number num, String label, String language, String datatype) {
  14.181 +		Number id = ids.idOf(num);
  14.182 +		if (datatype == null && language == null)
  14.183 +			return new RdbmsLiteral(id, literals.getIdVersion(), vf.createLiteral(label));
  14.184 +		if (datatype == null)
  14.185 +			return new RdbmsLiteral(id, literals.getIdVersion(), vf.createLiteral(label, language));
  14.186 +		return new RdbmsLiteral(id, literals.getIdVersion(), vf.createLiteral(label, vf.createURI(datatype)));
  14.187 +	}
  14.188 +
  14.189 +	public RdbmsResource asRdbmsResource(Resource node) {
  14.190 +		if (node == null)
  14.191 +			return null;
  14.192 +		if (node instanceof URI)
  14.193 +			return asRdbmsURI((URI)node);
  14.194 +		if (node instanceof RdbmsBNode) {
  14.195 +			try {
  14.196 +				bnodes.cache((RdbmsBNode)node);
  14.197 +				return (RdbmsBNode)node;
  14.198 +			}
  14.199 +			catch (InterruptedException e) {
  14.200 +				throw new RdbmsRuntimeException(e);
  14.201 +			}
  14.202 +		}
  14.203 +		return createBNode(((BNode)node).getID());
  14.204 +	}
  14.205 +
  14.206 +	public RdbmsURI asRdbmsURI(URI uri) {
  14.207 +		if (uri == null)
  14.208 +			return null;
  14.209 +		if (uri instanceof RdbmsURI) {
  14.210 +			try {
  14.211 +				uris.cache((RdbmsURI)uri);
  14.212 +				return (RdbmsURI)uri;
  14.213 +			}
  14.214 +			catch (InterruptedException e) {
  14.215 +				throw new RdbmsRuntimeException(e);
  14.216 +			}
  14.217 +		}
  14.218 +		return createURI(uri.stringValue());
  14.219 +	}
  14.220 +
  14.221 +	public RdbmsValue asRdbmsValue(Value value) {
  14.222 +		if (value == null)
  14.223 +			return null;
  14.224 +		if (value instanceof Literal)
  14.225 +			return asRdbmsLiteral((Literal)value);
  14.226 +		return asRdbmsResource((Resource)value);
  14.227 +	}
  14.228 +
  14.229 +	public RdbmsLiteral asRdbmsLiteral(Literal literal) {
  14.230 +		try {
  14.231 +			if (literal instanceof RdbmsLiteral) {
  14.232 +				literals.cache((RdbmsLiteral)literal);
  14.233 +				return (RdbmsLiteral)literal;
  14.234 +			}
  14.235 +			RdbmsLiteral lit = literals.findInCache(literal);
  14.236 +			if (lit == null) {
  14.237 +				lit = new RdbmsLiteral(literal);
  14.238 +				literals.cache(lit);
  14.239 +			}
  14.240 +			return lit;
  14.241 +		}
  14.242 +		catch (InterruptedException e) {
  14.243 +			throw new RdbmsRuntimeException(e);
  14.244 +		}
  14.245 +	}
  14.246 +
  14.247 +	public RdbmsResource[] asRdbmsResource(Resource... contexts) {
  14.248 +		RdbmsResource[] ctxs = new RdbmsResource[contexts.length];
  14.249 +		for (int i = 0; i < ctxs.length; i++) {
  14.250 +			ctxs[i] = asRdbmsResource(contexts[i]);
  14.251 +		}
  14.252 +		return ctxs;
  14.253 +	}
  14.254 +
  14.255 +	public RdbmsStatement asRdbmsStatement(Statement stmt) {
  14.256 +		if (stmt instanceof RdbmsStatement)
  14.257 +			return (RdbmsStatement)stmt;
  14.258 +		Resource s = stmt.getSubject();
  14.259 +		URI p = stmt.getPredicate();
  14.260 +		Value o = stmt.getObject();
  14.261 +		Resource c = stmt.getContext();
  14.262 +		return createStatement(s, p, o, c);
  14.263 +	}
  14.264 +
  14.265 +	public Number getInternalId(Value r)
  14.266 +		throws RdbmsException
  14.267 +	{
  14.268 +		try {
  14.269 +			if (r == null)
  14.270 +				return ValueTable.NIL_ID;
  14.271 +			RdbmsValue value = asRdbmsValue(r);
  14.272 +			if (value instanceof RdbmsURI)
  14.273 +				return uris.getInternalId((RdbmsURI)value);
  14.274 +			if (value instanceof RdbmsBNode)
  14.275 +				return bnodes.getInternalId((RdbmsBNode)value);
  14.276 +			return literals.getInternalId((RdbmsLiteral)value);
  14.277 +		}
  14.278 +		catch (SQLException e) {
  14.279 +			throw new RdbmsException(e);
  14.280 +		}
  14.281 +		catch (InterruptedException e) {
  14.282 +			throw new RdbmsRuntimeException(e);
  14.283 +		}
  14.284 +	}
  14.285 +
  14.286 +	public Number getPredicateId(RdbmsURI predicate)
  14.287 +		throws RdbmsException
  14.288 +	{
  14.289 +		try {
  14.290 +			return predicates.getIdOfPredicate(predicate);
  14.291 +		}
  14.292 +		catch (SQLException e) {
  14.293 +			throw new RdbmsException(e);
  14.294 +		}
  14.295 +		catch (InterruptedException e) {
  14.296 +			throw new RdbmsRuntimeException(e);
  14.297 +		}
  14.298 +	}
  14.299 +
  14.300 +	public Lock getIdReadLock() throws InterruptedException {
  14.301 +		return lock.getReadLock();
  14.302 +	}
  14.303 +
  14.304 +	public Lock tryIdWriteLock() {
  14.305 +		return lock.tryWriteLock();
  14.306 +	}
  14.307 +
  14.308 +	public Lock getIdWriteLock() throws InterruptedException {
  14.309 +		return lock.getWriteLock();
  14.310 +	}
  14.311 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/BNodeColumn.java	Thu May 24 13:58:55 2012 +0300
    15.3 @@ -0,0 +1,34 @@
    15.4 +/*
    15.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    15.6 + *
    15.7 + * Licensed under the Aduna BSD-style license.
    15.8 + */
    15.9 +package org.openrdf.sail.rdbms.algebra;
   15.10 +
   15.11 +import org.openrdf.query.algebra.Var;
   15.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   15.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   15.14 +
   15.15 +/**
   15.16 + * Represents the BNode value of a variable.
   15.17 + * 
   15.18 + * @author James Leigh
   15.19 + * 
   15.20 + */
   15.21 +public class BNodeColumn extends ValueColumnBase {
   15.22 +
   15.23 +	public BNodeColumn(ColumnVar var) {
   15.24 +		super(var);
   15.25 +	}
   15.26 +
   15.27 +	public BNodeColumn(Var var) {
   15.28 +		super(var);
   15.29 +	}
   15.30 +
   15.31 +	@Override
   15.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   15.33 +		throws X
   15.34 +	{
   15.35 +		visitor.meet(this);
   15.36 +	}
   15.37 +}

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/ColumnVar.java	Thu May 24 13:58:55 2012 +0300
    16.3 @@ -0,0 +1,236 @@
    16.4 +/*
    16.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    16.6 + *
    16.7 + * Licensed under the Aduna BSD-style license.
    16.8 + */
    16.9 +package org.openrdf.sail.rdbms.algebra;
   16.10 +
   16.11 +import org.openrdf.model.Resource;
   16.12 +import org.openrdf.model.URI;
   16.13 +import org.openrdf.model.Value;
   16.14 +import org.openrdf.query.algebra.Var;
   16.15 +import org.openrdf.sail.rdbms.model.RdbmsResource;
   16.16 +import org.openrdf.sail.rdbms.model.RdbmsURI;
   16.17 +import org.openrdf.sail.rdbms.schema.ValueTypes;
   16.18 +
   16.19 +/**
   16.20 + * Represents a variable in an SQL expression.
   16.21 + * 
   16.22 + * @author James Leigh
   16.23 + * 
   16.24 + */
   16.25 +public class ColumnVar implements Cloneable {
   16.26 +
   16.27 +	private int index;
   16.28 +
   16.29 +	private boolean anonymous;
   16.30 +
   16.31 +	private boolean hidden;
   16.32 +
   16.33 +	private boolean implied;
   16.34 +
   16.35 +	private String name;
   16.36 +
   16.37 +	private Value value;
   16.38 +
   16.39 +	private String alias;
   16.40 +
   16.41 +	private String column;
   16.42 +
   16.43 +	private boolean nullable;
   16.44 +
   16.45 +	private ValueTypes types;
   16.46 +
   16.47 +	private ColumnVar() {
   16.48 +	}
   16.49 +
   16.50 +	public static ColumnVar createSubj(String alias, Var v, Resource resource) {
   16.51 +		ColumnVar var = new ColumnVar();
   16.52 +		var.alias = alias;
   16.53 +		var.column = "subj";
   16.54 +		var.name = v.getName();
   16.55 +		var.anonymous = v.isAnonymous();
   16.56 +		var.value = resource;
   16.57 +		var.types = ValueTypes.RESOURCE;
   16.58 +		if (resource instanceof RdbmsURI) {
   16.59 +			var.types = ValueTypes.URI;
   16.60 +		}
   16.61 +		return var;
   16.62 +	}
   16.63 +
   16.64 +	public static ColumnVar createPred(String alias, Var v, URI uri, boolean implied) {
   16.65 +		ColumnVar var = createSubj(alias, v, uri);
   16.66 +		var.column = "pred";
   16.67 +		var.implied = uri != null && implied;
   16.68 +		var.types = ValueTypes.URI;
   16.69 +		return var;
   16.70 +	}
   16.71 +
   16.72 +	public static ColumnVar createObj(String alias, Var v, Value value) {
   16.73 +		ColumnVar var = new ColumnVar();
   16.74 +		var.alias = alias;
   16.75 +		var.column = "obj";
   16.76 +		var.name = v.getName();
   16.77 +		var.anonymous = v.isAnonymous();
   16.78 +		var.value = value;
   16.79 +		var.types = ValueTypes.UNKNOWN;
   16.80 +		if (value instanceof RdbmsURI) {
   16.81 +			var.types = ValueTypes.URI;
   16.82 +		}
   16.83 +		else if (value instanceof RdbmsResource) {
   16.84 +			var.types = ValueTypes.RESOURCE;
   16.85 +		}
   16.86 +		return var;
   16.87 +	}
   16.88 +
   16.89 +	public static ColumnVar createCtx(String alias, Var v, Resource resource) {
   16.90 +		ColumnVar var = new ColumnVar();
   16.91 +		var.alias = alias;
   16.92 +		var.column = "ctx";
   16.93 +		if (v == null) {
   16.94 +			var.name = "__ctx" + Integer.toHexString(System.identityHashCode(var));
   16.95 +			var.anonymous = true;
   16.96 +			var.hidden = true;
   16.97 +		}
   16.98 +		else {
   16.99 +			var.name = v.getName();
  16.100 +			var.anonymous = v.isAnonymous();
  16.101 +		}
  16.102 +		var.value = resource;
  16.103 +		var.types = ValueTypes.RESOURCE;
  16.104 +		if (resource instanceof RdbmsURI) {
  16.105 +			var.types = ValueTypes.URI;
  16.106 +		}
  16.107 +		return var;
  16.108 +	}
  16.109 +
  16.110 +	public ValueTypes getTypes() {
  16.111 +		return types;
  16.112 +	}
  16.113 +
  16.114 +	public void setTypes(ValueTypes types) {
  16.115 +		this.types = types;
  16.116 +	}
  16.117 +
  16.118 +	public boolean isAnonymous() {
  16.119 +		return anonymous;
  16.120 +	}
  16.121 +
  16.122 +	public boolean isHidden() {
  16.123 +		return hidden;
  16.124 +	}
  16.125 +
  16.126 +	public boolean isHiddenOrConstant() {
  16.127 +		return hidden || value != null;
  16.128 +	}
  16.129 +
  16.130 +	public boolean isImplied() {
  16.131 +		return implied;
  16.132 +	}
  16.133 +
  16.134 +	public boolean isResource() {
  16.135 +		return !types.isLiterals();
  16.136 +	}
  16.137 +
  16.138 +	public boolean isURI() {
  16.139 +		return !types.isLiterals() && !types.isBNodes();
  16.140 +	}
  16.141 +
  16.142 +	public boolean isNullable() {
  16.143 +		return nullable;
  16.144 +	}
  16.145 +
  16.146 +	public int getIndex() {
  16.147 +		return index;
  16.148 +	}
  16.149 +
  16.150 +	public void setIndex(int index) {
  16.151 +		this.index = index;
  16.152 +	}
  16.153 +
  16.154 +	public String getName() {
  16.155 +		return name;
  16.156 +	}
  16.157 +
  16.158 +	public Value getValue() {
  16.159 +		return value;
  16.160 +	}
  16.161 +
  16.162 +	public void setValue(Value value) {
  16.163 +		this.value = value;
  16.164 +		if (value == null) {
  16.165 +			implied = false;
  16.166 +		}
  16.167 +	}
  16.168 +
  16.169 +	public String getColumn() {
  16.170 +		return column;
  16.171 +	}
  16.172 +
  16.173 +	public boolean isPredicate() {
  16.174 +		return "pred".equals(column);
  16.175 +	}
  16.176 +
  16.177 +	public String getAlias() {
  16.178 +		return alias;
  16.179 +	}
  16.180 +
  16.181 +	public ColumnVar as(String name) {
  16.182 +		try {
  16.183 +			ColumnVar clone = (ColumnVar)super.clone();
  16.184 +			clone.name = name;
  16.185 +			return clone;
  16.186 +		}
  16.187 +		catch (CloneNotSupportedException e) {
  16.188 +			throw new AssertionError(e);
  16.189 +		}
  16.190 +	}
  16.191 +
  16.192 +	public ColumnVar as(String alias, String column) {
  16.193 +		try {
  16.194 +			ColumnVar clone = (ColumnVar)super.clone();
  16.195 +			clone.alias = alias;
  16.196 +			clone.column = column;
  16.197 +			clone.nullable = true;
  16.198 +			return clone;
  16.199 +		}
  16.200 +		catch (CloneNotSupportedException e) {
  16.201 +			throw new AssertionError(e);
  16.202 +		}
  16.203 +	}
  16.204 +
  16.205 +	@Override
  16.206 +	public boolean equals(Object other) {
  16.207 +		if (other instanceof ColumnVar) {
  16.208 +			return name.equals(((ColumnVar)other).name);
  16.209 +		}
  16.210 +
  16.211 +		return false;
  16.212 +	}
  16.213 +
  16.214 +	@Override
  16.215 +	public int hashCode() {
  16.216 +		return name.hashCode();
  16.217 +	}
  16.218 +
  16.219 +	@Override
  16.220 +	public String toString() {
  16.221 +		StringBuilder sb = new StringBuilder(128);
  16.222 +
  16.223 +		sb.append(alias).append(".").append(column);
  16.224 +
  16.225 +		sb.append(" (name=").append(name);
  16.226 +
  16.227 +		if (value != null) {
  16.228 +			sb.append(", value=").append(value.toString());
  16.229 +		}
  16.230 +
  16.231 +		sb.append(")");
  16.232 +		if (index > 0) {
  16.233 +			sb.append("#").append(index);
  16.234 +		}
  16.235 +
  16.236 +		return sb.toString();
  16.237 +	}
  16.238 +
  16.239 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/DatatypeColumn.java	Thu May 24 13:58:55 2012 +0300
    17.3 @@ -0,0 +1,35 @@
    17.4 +/*
    17.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    17.6 + *
    17.7 + * Licensed under the Aduna BSD-style license.
    17.8 + */
    17.9 +package org.openrdf.sail.rdbms.algebra;
   17.10 +
   17.11 +import org.openrdf.query.algebra.Var;
   17.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   17.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   17.14 +
   17.15 +/**
   17.16 + * Represents a variable's datatype value in an SQL expression.
   17.17 + * 
   17.18 + * @author James Leigh
   17.19 + * 
   17.20 + */
   17.21 +public class DatatypeColumn extends ValueColumnBase {
   17.22 +
   17.23 +	public DatatypeColumn(Var var) {
   17.24 +		super(var);
   17.25 +	}
   17.26 +
   17.27 +	public DatatypeColumn(ColumnVar var) {
   17.28 +		super(var);
   17.29 +	}
   17.30 +
   17.31 +	@Override
   17.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   17.33 +		throws X
   17.34 +	{
   17.35 +		visitor.meet(this);
   17.36 +	}
   17.37 +
   17.38 +}

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/DateTimeColumn.java	Thu May 24 13:58:55 2012 +0300
    18.3 @@ -0,0 +1,31 @@
    18.4 +/*
    18.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    18.6 + *
    18.7 + * Licensed under the Aduna BSD-style license.
    18.8 + */
    18.9 +package org.openrdf.sail.rdbms.algebra;
   18.10 +
   18.11 +import org.openrdf.query.algebra.Var;
   18.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   18.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   18.14 +
   18.15 +/**
   18.16 + * Represents a variable's time value in an SQL expression.
   18.17 + * 
   18.18 + * @author James Leigh
   18.19 + * 
   18.20 + */
   18.21 +public class DateTimeColumn extends ValueColumnBase {
   18.22 +
   18.23 +	public DateTimeColumn(Var var) {
   18.24 +		super(var);
   18.25 +	}
   18.26 +
   18.27 +	@Override
   18.28 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   18.29 +		throws X
   18.30 +	{
   18.31 +		visitor.meet(this);
   18.32 +	}
   18.33 +
   18.34 +}

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/DoubleValue.java	Thu May 24 13:58:55 2012 +0300
    19.3 @@ -0,0 +1,29 @@
    19.4 +/*
    19.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    19.6 + *
    19.7 + * Licensed under the Aduna BSD-style license.
    19.8 + */
    19.9 +package org.openrdf.sail.rdbms.algebra;
   19.10 +
   19.11 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   19.12 +import org.openrdf.sail.rdbms.algebra.base.SqlConstant;
   19.13 +
   19.14 +/**
   19.15 + * A static number in an SQL expression.
   19.16 + * 
   19.17 + * @author James Leigh
   19.18 + * 
   19.19 + */
   19.20 +public class DoubleValue extends SqlConstant<Double> {
   19.21 +
   19.22 +	public DoubleValue(Double value) {
   19.23 +		super(value);
   19.24 +	}
   19.25 +
   19.26 +	@Override
   19.27 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   19.28 +		throws X
   19.29 +	{
   19.30 +		visitor.meet(this);
   19.31 +	}
   19.32 +}

    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/FalseValue.java	Thu May 24 13:58:55 2012 +0300
    20.3 @@ -0,0 +1,29 @@
    20.4 +/*
    20.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    20.6 + *
    20.7 + * Licensed under the Aduna BSD-style license.
    20.8 + */
    20.9 +package org.openrdf.sail.rdbms.algebra;
   20.10 +
   20.11 +import org.openrdf.sail.rdbms.algebra.base.BooleanValue;
   20.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   20.13 +
   20.14 +/**
   20.15 + * Represents the value false in an SQL expression.
   20.16 + * 
   20.17 + * @author James Leigh
   20.18 + * 
   20.19 + */
   20.20 +public class FalseValue extends BooleanValue {
   20.21 +
   20.22 +	public FalseValue() {
   20.23 +		super(false);
   20.24 +	}
   20.25 +
   20.26 +	@Override
   20.27 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   20.28 +		throws X
   20.29 +	{
   20.30 +		visitor.meet(this);
   20.31 +	}
   20.32 +}

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/HashColumn.java	Thu May 24 13:58:55 2012 +0300
    21.3 @@ -0,0 +1,34 @@
    21.4 +/*
    21.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    21.6 + *
    21.7 + * Licensed under the Aduna BSD-style license.
    21.8 + */
    21.9 +package org.openrdf.sail.rdbms.algebra;
   21.10 +
   21.11 +import org.openrdf.query.algebra.Var;
   21.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   21.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   21.14 +
   21.15 +/**
   21.16 + * Represents the Hash value of a variable.
   21.17 + * 
   21.18 + * @author James Leigh
   21.19 + * 
   21.20 + */
   21.21 +public class HashColumn extends ValueColumnBase {
   21.22 +
   21.23 +	public HashColumn(ColumnVar var) {
   21.24 +		super(var);
   21.25 +	}
   21.26 +
   21.27 +	public HashColumn(Var var) {
   21.28 +		super(var);
   21.29 +	}
   21.30 +
   21.31 +	@Override
   21.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   21.33 +		throws X
   21.34 +	{
   21.35 +		visitor.meet(this);
   21.36 +	}
   21.37 +}

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/IdColumn.java	Thu May 24 13:58:55 2012 +0300
    22.3 @@ -0,0 +1,99 @@
    22.4 +/*
    22.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    22.6 + *
    22.7 + * Licensed under the Aduna BSD-style license.
    22.8 + */
    22.9 +package org.openrdf.sail.rdbms.algebra;
   22.10 +
   22.11 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelNodeBase;
   22.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   22.13 +import org.openrdf.sail.rdbms.algebra.base.SqlExpr;
   22.14 +
   22.15 +/**
   22.16 + * A particular column in an SQL expression.
   22.17 + * 
   22.18 + * @author James Leigh
   22.19 + * 
   22.20 + */
   22.21 +public class IdColumn extends RdbmsQueryModelNodeBase implements SqlExpr {
   22.22 +
   22.23 +	private String alias;
   22.24 +
   22.25 +	private String column;
   22.26 +
   22.27 +	public IdColumn(String alias) {
   22.28 +		super();
   22.29 +		this.alias = alias;
   22.30 +		this.column = "id";
   22.31 +	}
   22.32 +
   22.33 +	public IdColumn(ColumnVar var) {
   22.34 +		super();
   22.35 +		this.alias = var.getAlias();
   22.36 +		this.column = var.getColumn();
   22.37 +	}
   22.38 +
   22.39 +	public IdColumn(String alias, String column) {
   22.40 +		super();
   22.41 +		this.alias = alias;
   22.42 +		this.column = column;
   22.43 +	}
   22.44 +
   22.45 +	public String getAlias() {
   22.46 +		return alias;
   22.47 +	}
   22.48 +
   22.49 +	public String getColumn() {
   22.50 +		return column;
   22.51 +	}
   22.52 +
   22.53 +	@Override
   22.54 +	public String getSignature() {
   22.55 +		return super.getSignature() + " " + alias + "." + column;
   22.56 +	}
   22.57 +
   22.58 +	@Override
   22.59 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   22.60 +		throws X
   22.61 +	{
   22.62 +		visitor.meet(this);
   22.63 +	}
   22.64 +
   22.65 +	@Override
   22.66 +	public IdColumn clone() {
   22.67 +		return (IdColumn)super.clone();
   22.68 +	}
   22.69 +
   22.70 +	@Override
   22.71 +	public int hashCode() {
   22.72 +		final int prime = 31;
   22.73 +		int result = 1;
   22.74 +		result = prime * result + ((alias == null) ? 0 : alias.hashCode());
   22.75 +		result = prime * result + ((column == null) ? 0 : column.hashCode());
   22.76 +		return result;
   22.77 +	}
   22.78 +
   22.79 +	@Override
   22.80 +	public boolean equals(Object obj) {
   22.81 +		if (this == obj)
   22.82 +			return true;
   22.83 +		if (obj == null)
   22.84 +			return false;
   22.85 +		if (getClass() != obj.getClass())
   22.86 +			return false;
   22.87 +		final IdColumn other = (IdColumn)obj;
   22.88 +		if (alias == null) {
   22.89 +			if (other.alias != null)
   22.90 +				return false;
   22.91 +		}
   22.92 +		else if (!alias.equals(other.alias))
   22.93 +			return false;
   22.94 +		if (column == null) {
   22.95 +			if (other.column != null)
   22.96 +				return false;
   22.97 +		}
   22.98 +		else if (!column.equals(other.column))
   22.99 +			return false;
  22.100 +		return true;
  22.101 +	}
  22.102 +}

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/JoinItem.java	Thu May 24 13:58:55 2012 +0300
    23.3 @@ -0,0 +1,93 @@
    23.4 +/*
    23.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    23.6 + *
    23.7 + * Licensed under the Aduna BSD-style license.
    23.8 + */
    23.9 +package org.openrdf.sail.rdbms.algebra;
   23.10 +
   23.11 +import java.util.ArrayList;
   23.12 +import java.util.List;
   23.13 +
   23.14 +import org.openrdf.sail.rdbms.algebra.base.FromItem;
   23.15 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   23.16 +
   23.17 +/**
   23.18 + * An SQL join.
   23.19 + * 
   23.20 + * @author James Leigh
   23.21 + * 
   23.22 + */
   23.23 +public class JoinItem extends FromItem {
   23.24 +
   23.25 +	private String tableName;
   23.26 +
   23.27 +	private Number predId;
   23.28 +
   23.29 +	private List<ColumnVar> vars = new ArrayList<ColumnVar>();
   23.30 +
   23.31 +	public JoinItem(String alias, String tableName, Number predId) {
   23.32 +		super(alias);
   23.33 +		this.tableName = tableName;
   23.34 +		this.predId = predId;
   23.35 +	}
   23.36 +
   23.37 +	public JoinItem(String alias, String tableName) {
   23.38 +		super(alias);
   23.39 +		this.tableName = tableName;
   23.40 +		this.predId = 0;
   23.41 +	}
   23.42 +
   23.43 +	public String getTableName() {
   23.44 +		return tableName;
   23.45 +	}
   23.46 +
   23.47 +	public Number getPredId() {
   23.48 +		return predId;
   23.49 +	}
   23.50 +
   23.51 +	public void addVar(ColumnVar var) {
   23.52 +		this.vars.add(var);
   23.53 +	}
   23.54 +
   23.55 +	@Override
   23.56 +	public ColumnVar getVarForChildren(String name) {
   23.57 +		for (ColumnVar var : vars) {
   23.58 +			if (var.getName().equals(name))
   23.59 +				return var;
   23.60 +		}
   23.61 +		return super.getVarForChildren(name);
   23.62 +	}
   23.63 +
   23.64 +	@Override
   23.65 +	public List<ColumnVar> appendVars(List<ColumnVar> vars) {
   23.66 +		vars.addAll(this.vars);
   23.67 +		return super.appendVars(vars);
   23.68 +	}
   23.69 +
   23.70 +	@Override
   23.71 +	public String getSignature() {
   23.72 +		StringBuilder sb = new StringBuilder();
   23.73 +		if (isLeft()) {
   23.74 +			sb.append("LEFT ");
   23.75 +		}
   23.76 +		sb.append(super.getSignature());
   23.77 +		sb.append(" ").append(tableName);
   23.78 +		sb.append(" ").append(getAlias());
   23.79 +		return sb.toString();
   23.80 +	}
   23.81 +
   23.82 +	@Override
   23.83 +	public JoinItem clone() {
   23.84 +		JoinItem clone = (JoinItem)super.clone();
   23.85 +		clone.vars = new ArrayList<ColumnVar>(vars);
   23.86 +		return clone;
   23.87 +	}
   23.88 +
   23.89 +	@Override
   23.90 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   23.91 +		throws X
   23.92 +	{
   23.93 +		visitor.meet(this);
   23.94 +	}
   23.95 +
   23.96 +}

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/LabelColumn.java	Thu May 24 13:58:55 2012 +0300
    24.3 @@ -0,0 +1,35 @@
    24.4 +/*
    24.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    24.6 + *
    24.7 + * Licensed under the Aduna BSD-style license.
    24.8 + */
    24.9 +package org.openrdf.sail.rdbms.algebra;
   24.10 +
   24.11 +import org.openrdf.query.algebra.Var;
   24.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   24.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   24.14 +
   24.15 +/**
   24.16 + * Represents a variable's label value in an SQL expression.
   24.17 + * 
   24.18 + * @author James Leigh
   24.19 + * 
   24.20 + */
   24.21 +public class LabelColumn extends ValueColumnBase {
   24.22 +
   24.23 +	public LabelColumn(Var var) {
   24.24 +		super(var);
   24.25 +	}
   24.26 +
   24.27 +	public LabelColumn(ColumnVar var) {
   24.28 +		super(var);
   24.29 +	}
   24.30 +
   24.31 +	@Override
   24.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   24.33 +		throws X
   24.34 +	{
   24.35 +		visitor.meet(this);
   24.36 +	}
   24.37 +
   24.38 +}

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/LanguageColumn.java	Thu May 24 13:58:55 2012 +0300
    25.3 @@ -0,0 +1,35 @@
    25.4 +/*
    25.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    25.6 + *
    25.7 + * Licensed under the Aduna BSD-style license.
    25.8 + */
    25.9 +package org.openrdf.sail.rdbms.algebra;
   25.10 +
   25.11 +import org.openrdf.query.algebra.Var;
   25.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   25.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   25.14 +
   25.15 +/**
   25.16 + * Represents a variables language value in an SQL expression.
   25.17 + * 
   25.18 + * @author James Leigh
   25.19 + * 
   25.20 + */
   25.21 +public class LanguageColumn extends ValueColumnBase {
   25.22 +
   25.23 +	public LanguageColumn(Var var) {
   25.24 +		super(var);
   25.25 +	}
   25.26 +
   25.27 +	public LanguageColumn(ColumnVar var) {
   25.28 +		super(var);
   25.29 +	}
   25.30 +
   25.31 +	@Override
   25.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   25.33 +		throws X
   25.34 +	{
   25.35 +		visitor.meet(this);
   25.36 +	}
   25.37 +
   25.38 +}

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/LongLabelColumn.java	Thu May 24 13:58:55 2012 +0300
    26.3 @@ -0,0 +1,35 @@
    26.4 +/*
    26.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    26.6 + *
    26.7 + * Licensed under the Aduna BSD-style license.
    26.8 + */
    26.9 +package org.openrdf.sail.rdbms.algebra;
   26.10 +
   26.11 +import org.openrdf.query.algebra.Var;
   26.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   26.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   26.14 +
   26.15 +/**
   26.16 + * Represents a variable's long label value in an SQL expression.
   26.17 + * 
   26.18 + * @author James Leigh
   26.19 + * 
   26.20 + */
   26.21 +public class LongLabelColumn extends ValueColumnBase {
   26.22 +
   26.23 +	public LongLabelColumn(Var var) {
   26.24 +		super(var);
   26.25 +	}
   26.26 +
   26.27 +	public LongLabelColumn(ColumnVar var) {
   26.28 +		super(var);
   26.29 +	}
   26.30 +
   26.31 +	@Override
   26.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   26.33 +		throws X
   26.34 +	{
   26.35 +		visitor.meet(this);
   26.36 +	}
   26.37 +
   26.38 +}

    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/LongURIColumn.java	Thu May 24 13:58:55 2012 +0300
    27.3 @@ -0,0 +1,35 @@
    27.4 +/*
    27.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    27.6 + *
    27.7 + * Licensed under the Aduna BSD-style license.
    27.8 + */
    27.9 +package org.openrdf.sail.rdbms.algebra;
   27.10 +
   27.11 +import org.openrdf.query.algebra.Var;
   27.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   27.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   27.14 +
   27.15 +/**
   27.16 + * Represents a variable's Long URI value in an SQL expression.
   27.17 + * 
   27.18 + * @author James Leigh
   27.19 + * 
   27.20 + */
   27.21 +public class LongURIColumn extends ValueColumnBase {
   27.22 +
   27.23 +	public LongURIColumn(Var var) {
   27.24 +		super(var);
   27.25 +	}
   27.26 +
   27.27 +	public LongURIColumn(ColumnVar var) {
   27.28 +		super(var);
   27.29 +	}
   27.30 +
   27.31 +	@Override
   27.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   27.33 +		throws X
   27.34 +	{
   27.35 +		visitor.meet(this);
   27.36 +	}
   27.37 +
   27.38 +}

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/NumberValue.java	Thu May 24 13:58:55 2012 +0300
    28.3 @@ -0,0 +1,29 @@
    28.4 +/*
    28.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    28.6 + *
    28.7 + * Licensed under the Aduna BSD-style license.
    28.8 + */
    28.9 +package org.openrdf.sail.rdbms.algebra;
   28.10 +
   28.11 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   28.12 +import org.openrdf.sail.rdbms.algebra.base.SqlConstant;
   28.13 +
   28.14 +/**
   28.15 + * A static long value in an SQL expression.
   28.16 + * 
   28.17 + * @author James Leigh
   28.18 + * 
   28.19 + */
   28.20 +public class NumberValue extends SqlConstant<Number> {
   28.21 +
   28.22 +	public NumberValue(Number value) {
   28.23 +		super(value);
   28.24 +	}
   28.25 +
   28.26 +	@Override
   28.27 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   28.28 +		throws X
   28.29 +	{
   28.30 +		visitor.meet(this);
   28.31 +	}
   28.32 +}

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/NumericColumn.java	Thu May 24 13:58:55 2012 +0300
    29.3 @@ -0,0 +1,31 @@
    29.4 +/*
    29.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    29.6 + *
    29.7 + * Licensed under the Aduna BSD-style license.
    29.8 + */
    29.9 +package org.openrdf.sail.rdbms.algebra;
   29.10 +
   29.11 +import org.openrdf.query.algebra.Var;
   29.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   29.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   29.14 +
   29.15 +/**
   29.16 + * Represents a variable's numeric value in an SQL expression.
   29.17 + * 
   29.18 + * @author James Leigh
   29.19 + * 
   29.20 + */
   29.21 +public class NumericColumn extends ValueColumnBase {
   29.22 +
   29.23 +	public NumericColumn(Var var) {
   29.24 +		super(var);
   29.25 +	}
   29.26 +
   29.27 +	@Override
   29.28 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   29.29 +		throws X
   29.30 +	{
   29.31 +		visitor.meet(this);
   29.32 +	}
   29.33 +
   29.34 +}

    30.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/RefIdColumn.java	Thu May 24 13:58:55 2012 +0300
    30.3 @@ -0,0 +1,39 @@
    30.4 +/*
    30.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    30.6 + *
    30.7 + * Licensed under the Aduna BSD-style license.
    30.8 + */
    30.9 +package org.openrdf.sail.rdbms.algebra;
   30.10 +
   30.11 +import org.openrdf.query.algebra.Var;
   30.12 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   30.13 +import org.openrdf.sail.rdbms.algebra.base.ValueColumnBase;
   30.14 +
   30.15 +/**
   30.16 + * Represents a variable's internal id value in an SQL expression.
   30.17 + * 
   30.18 + * @author James Leigh
   30.19 + * 
   30.20 + */
   30.21 +public class RefIdColumn extends ValueColumnBase {
   30.22 +
   30.23 +	public RefIdColumn(ColumnVar var) {
   30.24 +		super(var);
   30.25 +	}
   30.26 +
   30.27 +	public RefIdColumn(Var var) {
   30.28 +		super(var);
   30.29 +	}
   30.30 +
   30.31 +	@Override
   30.32 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   30.33 +		throws X
   30.34 +	{
   30.35 +		visitor.meet(this);
   30.36 +	}
   30.37 +
   30.38 +	@Override
   30.39 +	public RefIdColumn clone() {
   30.40 +		return (RefIdColumn)super.clone();
   30.41 +	}
   30.42 +}

    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/rdbms/src/main/java/org/openrdf/sail/rdbms/algebra/SelectProjection.java	Thu May 24 13:58:55 2012 +0300
    31.3 @@ -0,0 +1,176 @@
    31.4 +/*
    31.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    31.6 + *
    31.7 + * Licensed under the Aduna BSD-style license.
    31.8 + */
    31.9 +package org.openrdf.sail.rdbms.algebra;
   31.10 +
   31.11 +import org.openrdf.query.algebra.QueryModelNode;
   31.12 +import org.openrdf.query.algebra.QueryModelVisitor;
   31.13 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelNodeBase;
   31.14 +import org.openrdf.sail.rdbms.algebra.base.RdbmsQueryModelVisitorBase;
   31.15 +import org.openrdf.sail.rdbms.algebra.base.SqlExpr;
   31.16 +
   31.17 +/**
   31.18 + * A collection of SQL expressions that form an RDF value binding.
   31.19 + * 
   31.20 + * @author James Leigh
   31.21 + * 
   31.22 + */
   31.23 +public class SelectProjection extends RdbmsQueryModelNodeBase {
   31.24 +
   31.25 +	private ColumnVar var;
   31.26 +
   31.27 +	private RefIdColumn id;
   31.28 +
   31.29 +	private SqlExpr stringValue;
   31.30 +
   31.31 +	private SqlExpr datatype;
   31.32 +
   31.33 +	private SqlExpr language;
   31.34 +
   31.35 +	public ColumnVar getVar() {
   31.36 +		return var;
   31.37 +	}
   31.38 +
   31.39 +	public void setVar(ColumnVar var) {
   31.40 +		this.var = var;
   31.41 +	}
   31.42 +
   31.43 +	public RefIdColumn getId() {
   31.44 +		return id;
   31.45 +	}
   31.46 +
   31.47 +	public void setId(RefIdColumn id) {
   31.48 +		this.id = id;
   31.49 +		id.setParentNode(this);
   31.50 +	}
   31.51 +
   31.52 +	public SqlExpr getStringValue() {
   31.53 +		return stringValue;
   31.54 +	}
   31.55 +
   31.56 +	public void setStringValue(SqlExpr stringValue) {
   31.57 +		this.stringValue = stringValue;
   31.58 +		stringValue.setParentNode(this);
   31.59 +	}
   31.60 +
   31.61 +	public SqlExpr getDatatype() {
   31.62 +		return datatype;
   31.63 +	}
   31.64 +
   31.65 +	public void setDatatype(SqlExpr datatype) {
   31.66 +		this.datatype = datatype;
   31.67 +		datatype.setParentNode(this);
   31.68 +	}
   31.69 +
   31.70 +	public SqlExpr getLanguage() {
   31.71 +		return language;
   31.72 +	}
   31.73 +
   31.74 +	public void setLanguage(SqlExpr language) {
   31.75 +		this.language = language;
   31.76 +		language.setParentNode(this);
   31.77 +	}
   31.78 +
   31.79 +	@Override
   31.80 +	public <X extends Exception> void visit(RdbmsQueryModelVisitorBase<X> visitor)
   31.81 +		throws X
   31.82 +	{
   31.83 +		visitor.meet(this);
   31.84 +	}
   31.85 +
   31.86 +	@Override
   31.87 +	public <X extends Exception> void visitChildren(QueryModelVisitor<X> visitor)
   31.88 +		throws X
   31.89 +	{
   31.90 +		id.visit(visitor);
   31.91 +		stringValue.visit(visitor);
   31.92 +		datatype.visit(visitor);
   31.93 +		language.visit(visitor);
   31.94 +	}
   31.95 +
   31.96 +	@Override
   31.97 +	public void replaceChildNode(QueryModelNode current, QueryModelNode replacement) {
   31.98 +		if (id == current) {
   31.99 +			setId((RefIdColumn)replacement);
  31.100 +		}
  31.101 +		else if (stringValue == current) {
  31.102 +			setStringValue((SqlExpr)replacement);
  31.103 +		}
  31.104 +		else if (datatype == current) {
  31.105 +			setDatatype((SqlExpr)replacement);
  31.106 +		}
  31.107 +		else if (language == current) {
  31.108 +			setLanguage((SqlExpr)replacement);
  31.109 +		}
  31.110 +		else {
  31.111 +			super.replaceChildNode(current, replacement);
  31.112 +		}
  31.113 +	}
  31.114 +
  31.115 +	@Override
  31.116 +	public SelectProjection clone() {
  31.117 +		SelectProjection clone = (SelectProjection)super.clone();
  31.118 +		clone.setId(getId().clone());
  31.119 +		clone.setStringValue(getStringValue().clone());
  31.120 +		clone.setDatatype(getDatatype().clone());
  31.121 +		clone.setLanguage(getLanguage().clone());
  31.122 +		return clone;
  31.123 +	}
  31.124 +
  31.125 +	@Override
  31.126 +	public int hashCode() {
  31.127 +		final int prime = 31;
  31.128 +		int result = 1;
  31.129 +		result = prime * result + ((datatype == null) ? 0 : datatype.hashCode());
  31.130 +		result = prime * result + ((id == null) ? 0 : id.hashCode());
  31.131 +		result = prime * result + ((language == null) ? 0 : language.hashCode());
  31.132 +		result = prime * result + ((stringValue == null) ? 0 : stringValue.hashCode());
  31.133 +		result = prime * result + ((var == null) ? 0 : var.hashCode());
  31.134 +		return result;
  31.135 +	}
  31.136 +
  31.137 +	@Override
  31.138 +	public boolean equals(Object obj) {
  31.139 +		if (this == obj)
  31.140 +			return true;
  31.141 +		if (obj == null)
  31.142 +			return false;
  31.143 +		if (getClass() != obj.getClass())
  31.144 +			return false;
  31.145 +		final SelectProjection other = (SelectProjection)obj;
  31.146 +		if (datatype == null) {
  31.147 +			if (other.datatype != null)
  31.148 +				return false;
  31.149 +		}
  31.150 +		else if (!datatype.equals(other.datatype))
  31.151 +			return false;
  31.152 +		if (id == null) {
  31.153 +			if (other.id != null)
  31.154 +				return false;
  31.155 +		}
  31.156 +		else if (!id.equals(other.id))
  31.157 +			return false;
  31.158 +		if (language == null) {
  31.159 +			if (other.language != null)
  31.160 +				return false;
  31.161 +		}
  31.162 +		else if (!language.equals(other.language))
  31.163 +			return false;
  31.164 +		if (stringValue == null) {
  31.165 +			if (other.stringValue != null)
  31.166 +				return false;
  31.167 +		}
  31.168 +		else if (!stringValue.equals(other.stringValue))
  31.169 +			return false;
  31.170 +		if (var == null) {
  31.171 +			if (other.var != null)
  31.172 +				return false;
  31.173 +		}
  31.174 +		else if (!var.equals(other.var))
  31.175 +			return false;
  31.176 +		return true;
  31.177 +	}
  31.178 +
  31.179 +}