1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/TripleTable.java	Thu May 24 13:58:55 2012 +0300
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/TripleTable.java	Thu May 24 14:05:32 2012 +0300
     1.3 @@ -111,63 +111,7 @@
     1.4  		initialize = true;
     1.5  			}
     1.6  
     1.7 -	/**
     1.8 -	 *  TODO Steps:
     1.9 -	 *  
    1.10 -	 *  During 1st run, use the original code of reload enhanced only with the two additional int tables. Also 
    1.11 -	 *  use the altered form of close()
    1.12 -	 *  
    1.13 -	 *  2nd run: replace reload() code and keep original close()
    1.14 -	 */
    1.15  
    1.16 -	//Original
    1.17 -	//	public void reload()
    1.18 -	//	throws SQLException
    1.19 -	//	{
    1.20 -	//		table.count();
    1.21 -	//		if (table.size() > 0) {
    1.22 -	//			//XXX uncomment during 1st run!! --> Original code
    1.23 -	//			ValueType[] values = ValueType.values();
    1.24 -	//			String[] OBJ_CONTAINS = new String[values.length];
    1.25 -	//			String[] SUBJ_CONTAINS = new String[values.length];
    1.26 -	//			StringBuilder sb = new StringBuilder();
    1.27 -	//			for (int i = 0, n = values.length; i < n; i++) {
    1.28 -	//				sb.delete(0, sb.length());
    1.29 -	//				ValueType code = values[i];
    1.30 -	//				sb.append("MAX(CASE WHEN obj BETWEEN ").append(ids.minId(code));
    1.31 -	//				sb.append(" AND ").append(ids.maxId(code));
    1.32 -	//				sb.append(" THEN 1 ELSE 0 END)");
    1.33 -	//				OBJ_CONTAINS[i] = sb.toString();
    1.34 -	//				sb.delete(0, sb.length());
    1.35 -	//				sb.append("MAX(CASE WHEN subj BETWEEN ").append(ids.minId(code));
    1.36 -	//				sb.append(" AND ").append(ids.maxId(code));
    1.37 -	//				sb.append(" THEN 1 ELSE 0 END)");
    1.38 -	//				SUBJ_CONTAINS[i] = sb.toString();
    1.39 -	//			}
    1.40 -	//			int[] aggregate = table.aggregate(OBJ_CONTAINS);
    1.41 -	//			//XXX mine
    1.42 -	//			objAggregates = aggregate;
    1.43 -	//			//
    1.44 -	//			for (int i = 0; i < aggregate.length; i++) {
    1.45 -	//				if (aggregate[i] == 1) {
    1.46 -	//					objTypes.add(values[i]);
    1.47 -	//				}
    1.48 -	//			}
    1.49 -	//			aggregate = table.aggregate(SUBJ_CONTAINS);
    1.50 -	//			//XXX mine
    1.51 -	//			subjAggregates = aggregate;
    1.52 -	//			//
    1.53 -	//			for (int i = 0; i < aggregate.length; i++) {
    1.54 -	//				if (aggregate[i] == 1) {
    1.55 -	//					subjTypes.add(values[i]);
    1.56 -	//				}
    1.57 -	//			}
    1.58 -	//		}
    1.59 -	//		initialize = true;
    1.60 -	//	}
    1.61 -
    1.62 -
    1.63 -	//2nd version of reload
    1.64  	public void reload()
    1.65  			throws SQLException
    1.66  			{
    1.67 @@ -260,7 +204,7 @@
    1.68  
    1.69  					dis.close();
    1.70  					//KK}
    1.71 -				//KKelse //skip line
    1.72 +					//KKelse //skip line
    1.73  					//KK{
    1.74  					//KKwhile(dis.readChar()!='\n')
    1.75  					//KK{