|
From: Bryan T. <tho...@us...> - 2007-04-12 23:59:26
|
Update of /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2483/src/java/com/bigdata/rdf/inf Modified Files: AbstractRuleRdf.java InferenceEngine.java Rule.java AbstractRuleRdfs511.java RuleRdf01.java AbstractRuleRdfs2379.java AbstractRuleRdfs68101213.java Log Message: Added a Sesame 1.x SAIL implementation. This is NOT intended for production use. It is just being done to gain a high-level query language integration for the triple store. Index: InferenceEngine.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/InferenceEngine.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** InferenceEngine.java 17 Feb 2007 23:15:26 -0000 1.10 --- InferenceEngine.java 12 Apr 2007 23:59:21 -0000 1.11 *************** *** 355,358 **** --- 355,365 ---- } + /** + * Copies the entailments from the temporary store into the main store. + * + * @param entailments + * + * @return The #of entailments inserted into the main store. + */ private int transferBTrees( TempTripleStore entailments ) { *************** *** 403,407 **** final int n = ndx.rangeCount(fromKey, toKey); ! // bufferQueue for storing the extracted s:p:o data. SPO[] ids = new SPO[n]; --- 410,414 ---- final int n = ndx.rangeCount(fromKey, toKey); ! // buffer for storing the extracted s:p:o data. SPO[] ids = new SPO[n]; *************** *** 439,442 **** --- 446,452 ---- * @exception IllegalArgumentException * if query is a fact (no variables). + * + * FIXME Magic sets has NOT been implemented -- this method does NOT + * function. */ public TripleStore query(Triple query, Rule[] rules) throws IOException { Index: AbstractRuleRdfs511.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractRuleRdfs511.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractRuleRdfs511.java 17 Feb 2007 03:07:59 -0000 1.4 --- AbstractRuleRdfs511.java 12 Apr 2007 23:59:21 -0000 1.5 *************** *** 115,119 **** } } ! dumpBuffer( stmts3.toArray( new SPO[stmts3.size()] ), entailments ); stats.computeTime = System.currentTimeMillis() - computeStart; --- 115,119 ---- } } ! if(debug)dumpBuffer( stmts3.toArray( new SPO[stmts3.size()] ), entailments ); stats.computeTime = System.currentTimeMillis() - computeStart; Index: AbstractRuleRdfs2379.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractRuleRdfs2379.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AbstractRuleRdfs2379.java 17 Feb 2007 03:07:59 -0000 1.3 --- AbstractRuleRdfs2379.java 12 Apr 2007 23:59:21 -0000 1.4 *************** *** 87,91 **** } } ! dumpBuffer( stmts3.toArray( new SPO[stmts3.size()] ), entailments ); stats.computeTime = System.currentTimeMillis() - computeStart; --- 87,91 ---- } } ! if(debug) dumpBuffer( stmts3.toArray( new SPO[stmts3.size()] ), entailments ); stats.computeTime = System.currentTimeMillis() - computeStart; Index: RuleRdf01.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/RuleRdf01.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RuleRdf01.java 17 Feb 2007 03:07:59 -0000 1.4 --- RuleRdf01.java 12 Apr 2007 23:59:21 -0000 1.5 *************** *** 99,103 **** } ! dumpBuffer( entailments.toArray( new SPO[entailments.size()] ), btree ); stats.computeTime = System.currentTimeMillis() - computeStart; --- 99,103 ---- } ! if(debug)dumpBuffer( entailments.toArray( new SPO[entailments.size()] ), btree ); stats.computeTime = System.currentTimeMillis() - computeStart; Index: Rule.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/Rule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Rule.java 17 Feb 2007 03:07:59 -0000 1.3 --- Rule.java 12 Apr 2007 23:59:21 -0000 1.4 *************** *** 69,72 **** --- 69,74 ---- abstract public class Rule { + static protected final boolean debug = false; + /** * The inference engine. Index: AbstractRuleRdf.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractRuleRdf.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractRuleRdf.java 17 Feb 2007 03:07:59 -0000 1.4 --- AbstractRuleRdf.java 12 Apr 2007 23:59:21 -0000 1.5 *************** *** 53,62 **** import com.bigdata.rdf.TempTripleStore; - public abstract class AbstractRuleRdf extends Rule { protected final int BUFFER_SIZE = 10*1024*1024; - public AbstractRuleRdf(InferenceEngine store, Triple head, Pred[] body) { --- 53,60 ---- Index: AbstractRuleRdfs68101213.java =================================================================== RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractRuleRdfs68101213.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractRuleRdfs68101213.java 17 Feb 2007 03:07:59 -0000 1.4 --- AbstractRuleRdfs68101213.java 12 Apr 2007 23:59:21 -0000 1.5 *************** *** 102,106 **** } ! dumpBuffer( entailments.toArray( new SPO[entailments.size()] ), btree ); stats.computeTime = System.currentTimeMillis() - computeStart; --- 102,106 ---- } ! if(debug)dumpBuffer( entailments.toArray( new SPO[entailments.size()] ), btree ); stats.computeTime = System.currentTimeMillis() - computeStart; |