Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4838] branches
|
From: <tho...@us...> - 2011-07-05 13:57:28
|
Revision: 4838
http://bigdata.svn.sourceforge.net/bigdata/?rev=4838&view=rev
Author: thompsonbry
Date: 2011-07-05 13:57:21 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Bug fix for [1] (Duplicate BOp exception).
Fixed some System.out and System.err messages in the unit tests.
[1] https://sourceforge.net/apps/trac/bigdata/ticket/345
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java
branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java
branches/TERMS_REFACTOR_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java
branches/TERMS_REFACTOR_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/TestBOpUtility.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2011-07-05 13:31:31 UTC (rev 4837)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2011-07-05 13:57:21 UTC (rev 4838)
@@ -39,6 +39,7 @@
import org.apache.log4j.Logger;
import com.bigdata.bop.BOp.Annotations;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.engine.BOpStats;
import com.bigdata.btree.AbstractNode;
import com.bigdata.relation.accesspath.IAsynchronousIterator;
@@ -422,7 +423,8 @@
throw new DuplicateBOpIdException("duplicate id=" + id
+ " for " + conflict + " and " + t);
}
- if (!distinct.add(t) && !(t instanceof IValueExpression<?>)) {
+ if (!distinct.add(t) && !(t instanceof IValueExpression<?>)
+ && !(t instanceof Constraint)) {
/*
* BOp appears more than once. This is only allowed for
* constants and variables to reduce the likelihood of operator
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2011-07-05 13:31:31 UTC (rev 4837)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/bop/BOpUtility.java 2011-07-05 13:57:21 UTC (rev 4838)
@@ -39,6 +39,7 @@
import org.apache.log4j.Logger;
import com.bigdata.bop.BOp.Annotations;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.engine.BOpStats;
import com.bigdata.btree.AbstractNode;
import com.bigdata.relation.accesspath.IAsynchronousIterator;
@@ -422,7 +423,8 @@
throw new DuplicateBOpIdException("duplicate id=" + id
+ " for " + conflict + " and " + t);
}
- if (!distinct.add(t) && !(t instanceof IValueExpression<?>)) {
+ if (!distinct.add(t) && !(t instanceof IValueExpression<?>)
+ && !(t instanceof Constraint)) {
/*
* BOp appears more than once. This is only allowed for
* constants and variables to reduce the likelihood of operator
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java 2011-07-05 13:31:31 UTC (rev 4837)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java 2011-07-05 13:57:21 UTC (rev 4838)
@@ -151,7 +151,8 @@
final Iterator<BOp> itr = BOpUtility.preOrderIterator(root);
while (itr.hasNext()) {
final BOp t = itr.next();
- System.out.println(i + " : " + t);
+ if (log.isInfoEnabled())
+ log.info(i + " : " + t);
assertTrue("index=" + i + ", expected=" + expected[i] + ", actual="
+ t, expected[i].equals(t));
i++;
@@ -184,7 +185,8 @@
final Iterator<BOp> itr = BOpUtility.postOrderIterator(root);
while (itr.hasNext()) {
final BOp t = itr.next();
- System.out.println(i + " : " + t);
+ if (log.isInfoEnabled())
+ log.info(i + " : " + t);
assertTrue("index=" + i + ", expected=" + expected[i] + ", actual="
+ t, expected[i].equals(t));
i++;
@@ -254,7 +256,8 @@
final Iterator<BOp> itr = BOpUtility.annotationOpIterator(op);
while (itr.hasNext()) {
final BOp t = itr.next();
- System.out.println(i + " : " + t);
+ if(log.isInfoEnabled())
+ log.info(i + " : " + t);
assertTrue("index=" + i + ", expected=" + expected[i]
+ ", actual=" + t, expected[i].equals(t));
i++;
@@ -368,7 +371,8 @@
.preOrderIteratorWithAnnotations(root);
while (itr.hasNext()) {
final BOp t = itr.next();
- System.out.println(i + " : " + t);
+ if(log.isInfoEnabled())
+ log.info(i + " : " + t);
assertTrue("index=" + i + ", expected=" + expected[i] + ", actual="
+ t, expected[i].equals(t));
i++;
@@ -418,7 +422,8 @@
.getSpannedVariables(root);
while (itr.hasNext()) {
final BOp t = itr.next();
- System.out.println(i + " : " + t);
+ if(log.isInfoEnabled())
+ log.info(i + " : " + t);
assertTrue("index=" + i + ", expected=" + expected[i] + ", actual="
+ t, expected[i].equals(t));
i++;
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/TestBOpUtility.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/TestBOpUtility.java 2011-07-05 13:31:31 UTC (rev 4837)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/TestBOpUtility.java 2011-07-05 13:57:21 UTC (rev 4838)
@@ -37,6 +37,7 @@
import org.openrdf.model.ValueFactory;
import org.openrdf.model.vocabulary.RDF;
import org.openrdf.model.vocabulary.RDFS;
+import org.openrdf.query.BindingSet;
import org.openrdf.query.QueryLanguage;
import org.openrdf.query.TupleQuery;
import org.openrdf.query.TupleQueryResult;
@@ -53,8 +54,8 @@
import com.bigdata.bop.IValueExpression;
import com.bigdata.bop.Var;
import com.bigdata.rdf.internal.IV;
+import com.bigdata.rdf.internal.constraints.IVValueExpression;
import com.bigdata.rdf.internal.constraints.OrBOp;
-import com.bigdata.rdf.internal.constraints.IVValueExpression;
import com.bigdata.rdf.store.BD;
/**
@@ -117,18 +118,19 @@
final IValueExpression<?> a = Var.var("a");
- System.err.println("depth, millis");
+ if(log.isInfoEnabled())
+ log.info("depth, millis");
final int ntrials = 2000;
for (int count = 1; count < ntrials; count++) {
final BOp bop = generateBOp(count, a);
final long begin = System.currentTimeMillis();
- System.err.print(count);
+ if(log.isInfoEnabled())
+ log.info(count);
eatData(BOpUtility.preOrderIterator(bop));
final long elapsed = System.currentTimeMillis() - begin;
- System.err.print(", ");
- System.err.print(elapsed);
- System.err.print("\n");
- }
+ if (log.isInfoEnabled())
+ log.info(", " + elapsed);
+ }
// System.err.println("preOrderIteratorWithAnnotations");
// eatData(BOpUtility.preOrderIteratorWithAnnotations(bop));
@@ -196,7 +198,9 @@
final TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
- System.err.println(result.next());
+ final BindingSet tmp = result.next();
+ if(log.isInfoEnabled())
+ log.info(tmp.toString());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
