Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4660] branches/QUADS_QUERY_BRANCH/bigdata
|
From: <tho...@us...> - 2011-06-09 17:03:59
|
Revision: 4660
http://bigdata.svn.sourceforge.net/bigdata/?rev=4660&view=rev
Author: thompsonbry
Date: 2011-06-09 17:03:53 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
Improved logging in DirectBufferPool.
Removed many uses of System.err in the sail unit tests.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/DirectBufferPool.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBOps.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNestedOptionals.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServer.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestXMLBuilder.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/DirectBufferPool.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/DirectBufferPool.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/io/DirectBufferPool.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -167,9 +167,11 @@
* another finalized.
*/
final ByteBuffer buf;
+ final int nacquired;
synchronized(this) {
buf = this.buf;
this.buf = null;
+ nacquired = DirectBufferPool.this.acquired;
}
if (buf == null)
return;
@@ -192,7 +194,10 @@
* using the same ByteBuffer, each of which believes that they
* "own" the reference).
*/
- log.error("Buffer release on finalize: AllocationStack",
+ leaked.increment();
+ final long nleaked = leaked.get();
+ log.error("Buffer release on finalize (nacquired=" + nacquired
+ + ",nleaked=" + nleaked + "): AllocationStack",
allocationStack);
} else {
log.error("Buffer release on finalize.");
@@ -231,6 +236,12 @@
* is released.
*/
private int acquired = 0;
+
+ /**
+ * The #of buffers leaked out of {@link BufferState#finalize()} when
+ * {@link #DEBUG} is <code>true</code>.
+ */
+ private final CAT leaked = new CAT();
/**
* The maximum #of {@link ByteBuffer}s that will be allocated.
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBOps.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBOps.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBOps.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -29,7 +29,7 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.Properties;
-import org.apache.log4j.Level;
+
import org.apache.log4j.Logger;
import org.openrdf.model.Literal;
import org.openrdf.model.URI;
@@ -44,10 +44,7 @@
import org.openrdf.query.TupleQuery;
import org.openrdf.query.TupleQueryResult;
import org.openrdf.query.impl.BindingImpl;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.repository.sail.SailRepositoryConnection;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.memory.MemoryStore;
+
import com.bigdata.rdf.axioms.NoAxioms;
import com.bigdata.rdf.lexicon.LexiconRelation;
import com.bigdata.rdf.store.BD;
@@ -552,7 +549,8 @@
TupleQueryResult result = tupleQuery.evaluate();
while (result.hasNext()) {
- System.err.println(result.next());
+ final BindingSet tmp = result.next();
+ if(log.isInfoEnabled())log.info(tmp.toString());
}
// Collection<BindingSet> solution = new LinkedList<BindingSet>();
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEmbeddedFederationWithQuads.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -308,7 +308,8 @@
}
- System.err.println("Removing: "+f);
+ if(log.isInfoEnabled())
+ log.info("Removing: "+f);
if (!f.delete())
throw new RuntimeException("Could not remove: " + f);
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -126,7 +126,7 @@
final TupleQuery tupleQuery = cxn.prepareTupleQuery(
QueryLanguage.SPARQL, query);
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled())log.info(sw.toString());
}
@@ -222,7 +222,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled())log.info(sw.toString());
}
@@ -326,7 +326,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
@@ -426,7 +426,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
@@ -521,7 +521,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
@@ -618,7 +618,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
@@ -701,10 +701,10 @@
cxn.commit();
- System.err.println("<mike> = " + sail.getDatabase().getIV(mike));
- System.err.println("<jane> = " + sail.getDatabase().getIV(jane));
- System.err.println("\"Mike\" = " + sail.getDatabase().getIV(new LiteralImpl("Mike")));
- System.err.println("\"Jane\" = " + sail.getDatabase().getIV(new LiteralImpl("Jane")));
+ if(log.isInfoEnabled()) log.info("<mike> = " + sail.getDatabase().getIV(mike));
+ if(log.isInfoEnabled()) log.info("<jane> = " + sail.getDatabase().getIV(jane));
+ if(log.isInfoEnabled()) log.info("\"Mike\" = " + sail.getDatabase().getIV(new LiteralImpl("Mike")));
+ if(log.isInfoEnabled()) log.info("\"Jane\" = " + sail.getDatabase().getIV(new LiteralImpl("Jane")));
final double minRelevance = 0d;
final String query =
@@ -728,7 +728,7 @@
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
@@ -1050,7 +1050,7 @@
final TupleQuery tupleQuery = cxn.prepareTupleQuery(
QueryLanguage.SPARQL, query);
tupleQuery.evaluate(handler);
- System.err.println(sw.toString());
+ if(log.isInfoEnabled()) log.info(sw.toString());
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNestedOptionals.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNestedOptionals.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNestedOptionals.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -629,10 +629,10 @@
final SOpTreeBuilder stb = new SOpTreeBuilder();
final SOpTree tree = stb.collectSOps(tupleExpr);
- if (INFO) {
- System.err.println(query);
+ if (log.isInfoEnabled()) {
+ log.info(query);
for (SOp bop : tree) {
- System.err.println(bop);
+ log.info(bop);
}
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -34,6 +34,7 @@
import junit.framework.TestSuite;
import net.jini.config.ConfigurationException;
+import org.apache.log4j.Logger;
import org.openrdf.query.Dataset;
import org.openrdf.query.parser.sparql.ManifestTest;
import org.openrdf.query.parser.sparql.SPARQLQueryTest;
@@ -67,6 +68,8 @@
*/
public class BigdataEmbeddedFederationSparqlTest extends BigdataSparqlTest {
+ private static final Logger log = Logger.getLogger(BigdataEmbeddedFederationSparqlTest.class);
+
public BigdataEmbeddedFederationSparqlTest(String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataSet, boolean laxCardinality) {
@@ -273,7 +276,8 @@
}
- System.err.println("Removing: "+f);
+ if(log.isInfoEnabled())
+ log.info("Removing: "+f);
if (!f.delete())
throw new RuntimeException("Could not remove: " + f);
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServer.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServer.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServer.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -671,7 +671,8 @@
final String txt = getStreamContents(conn.getInputStream());
- System.out.println(txt);
+ if (log.isInfoEnabled())
+ log.info(txt);
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestXMLBuilder.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestXMLBuilder.java 2011-06-09 16:50:47 UTC (rev 4659)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestXMLBuilder.java 2011-06-09 17:03:53 UTC (rev 4660)
@@ -78,7 +78,8 @@
assertTrue(close == null);
- System.out.println(xml.toString());
+ if(log.isInfoEnabled())
+ log.info(xml.toString());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
