Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3559] branches/QUADS_QUERY_BRANCH/bigdata
|
From: <tho...@us...> - 2010-09-15 20:04:12
|
Revision: 3559
http://bigdata.svn.sourceforge.net/bigdata/?rev=3559&view=rev
Author: thompsonbry
Date: 2010-09-15 20:04:06 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Cleaning up System.err usage.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/bop/fed/jini/TestJiniFederatedQueryEngine.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java 2010-09-15 19:52:00 UTC (rev 3558)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java 2010-09-15 20:04:06 UTC (rev 3559)
@@ -538,8 +538,8 @@
*/
protected void lifeCycleSetUpOperator(final int bopId) {
- System.err.println("lifeCycleSetUpOperator: queryId=" + queryId
- + ", bopId=" + bopId);
+ if (log.isTraceEnabled())
+ log.trace("queryId=" + queryId + ", bopId=" + bopId);
}
@@ -556,8 +556,8 @@
*/
protected void lifeCycleTearDownOperator(final int bopId) {
- System.err.println("lifeCycleTearDownOperator: queryId=" + queryId
- + ", bopId=" + bopId);
+ if (log.isTraceEnabled())
+ log.trace("queryId=" + queryId + ", bopId=" + bopId);
}
@@ -567,7 +567,8 @@
*/
protected void lifeCycleSetUpQuery() {
- System.err.println("lifeCycleSetUpQuery: queryId=" + queryId);
+ if (log.isTraceEnabled())
+ log.trace("queryId=" + queryId);
}
@@ -577,7 +578,8 @@
*/
protected void lifeCycleTearDownQuery() {
- System.err.println("lifeCycleTearDownQuery: queryId=" + queryId);
+ if (log.isTraceEnabled())
+ log.trace("queryId=" + queryId);
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java 2010-09-15 19:52:00 UTC (rev 3558)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java 2010-09-15 20:04:06 UTC (rev 3559)
@@ -224,14 +224,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(1, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the query solution stats.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println(stats.toString());
+ if (log.isInfoEnabled())
+ log.info(stats.toString());
// query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -314,14 +316,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(2, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -330,24 +334,12 @@
assertEquals(1L, stats.chunksOut.get());
}
-// // validate the stats for the access path.
-// {
-// final BOpStats stats = statsMap.get(predId);
-// assertNotNull(stats);
-// System.err.println("pred : "+stats.toString());
-//
-// // verify query solution stats details.
-// assertEquals(1L, stats.chunksIn.get());
-// assertEquals(1L, stats.unitsIn.get());
-// assertEquals(1L, stats.unitsOut.get());
-// assertEquals(1L, stats.chunksOut.get());
-// }
-
// validate the stats for the join operator.
{
final BOpStats stats = statsMap.get(joinId);
assertNotNull(stats);
- System.err.println("join : "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join : "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -525,14 +517,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(3, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -541,24 +535,12 @@
assertEquals(1L, stats.chunksOut.get());
}
- // // validate the stats for the access path.
- // {
- // final BOpStats stats = statsMap.get(predId);
- // assertNotNull(stats);
- // System.err.println("pred : "+stats.toString());
- //
- // // verify query solution stats details.
- // assertEquals(1L, stats.chunksIn.get());
- // assertEquals(1L, stats.unitsIn.get());
- // assertEquals(1L, stats.unitsOut.get());
- // assertEquals(1L, stats.chunksOut.get());
- // }
-
// validate the stats for the 1st join operator.
{
final BOpStats stats = statsMap.get(joinId1);
assertNotNull(stats);
- System.err.println("join1: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join1: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -571,7 +553,8 @@
{
final BOpStats stats = statsMap.get(joinId2);
assertNotNull(stats);
- System.err.println("join2: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join2: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java 2010-09-15 19:52:00 UTC (rev 3558)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java 2010-09-15 20:04:06 UTC (rev 3559)
@@ -368,14 +368,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(1, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the query solution stats.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println(stats.toString());
+ if (log.isInfoEnabled())
+ log.info(stats.toString());
// query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -475,14 +477,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(2, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -491,24 +495,12 @@
assertEquals(1L, stats.chunksOut.get());
}
-// // validate the stats for the access path.
-// {
-// final BOpStats stats = statsMap.get(predId);
-// assertNotNull(stats);
-// System.err.println("pred : "+stats.toString());
-//
-// // verify query solution stats details.
-// assertEquals(1L, stats.chunksIn.get());
-// assertEquals(1L, stats.unitsIn.get());
-// assertEquals(1L, stats.unitsOut.get());
-// assertEquals(1L, stats.chunksOut.get());
-// }
-
// validate the stats for the join operator.
{
final BOpStats stats = statsMap.get(joinId);
assertNotNull(stats);
- System.err.println("join : "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join : "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -698,14 +690,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(3, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -714,24 +708,12 @@
assertEquals(1L, stats.chunksOut.get());
}
- // // validate the stats for the access path.
- // {
- // final BOpStats stats = statsMap.get(predId);
- // assertNotNull(stats);
- // System.err.println("pred : "+stats.toString());
- //
- // // verify query solution stats details.
- // assertEquals(1L, stats.chunksIn.get());
- // assertEquals(1L, stats.unitsIn.get());
- // assertEquals(1L, stats.unitsOut.get());
- // assertEquals(1L, stats.chunksOut.get());
- // }
-
// validate the stats for the 1st join operator.
{
final BOpStats stats = statsMap.get(joinId1);
assertNotNull(stats);
- System.err.println("join1: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join1: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -744,7 +726,8 @@
{
final BOpStats stats = statsMap.get(joinId2);
assertNotNull(stats);
- System.err.println("join2: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join2: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get()); // @todo depends on where the shards are.
@@ -757,7 +740,8 @@
{
final BOpStats stats = statsMap.get(sliceId);
assertNotNull(stats);
- System.err.println("slice: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("slice: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get()); // @todo?
Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/bop/fed/jini/TestJiniFederatedQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/bop/fed/jini/TestJiniFederatedQueryEngine.java 2010-09-15 19:52:00 UTC (rev 3558)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/bop/fed/jini/TestJiniFederatedQueryEngine.java 2010-09-15 20:04:06 UTC (rev 3559)
@@ -407,14 +407,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(1, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the query solution stats.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println(stats.toString());
+ if (log.isInfoEnabled())
+ log.info(stats.toString());
// query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -514,14 +516,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(2, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -530,24 +534,12 @@
assertEquals(1L, stats.chunksOut.get());
}
-// // validate the stats for the access path.
-// {
-// final BOpStats stats = statsMap.get(predId);
-// assertNotNull(stats);
-// System.err.println("pred : "+stats.toString());
-//
-// // verify query solution stats details.
-// assertEquals(1L, stats.chunksIn.get());
-// assertEquals(1L, stats.unitsIn.get());
-// assertEquals(1L, stats.unitsOut.get());
-// assertEquals(1L, stats.chunksOut.get());
-// }
-
// validate the stats for the join operator.
{
final BOpStats stats = statsMap.get(joinId);
assertNotNull(stats);
- System.err.println("join : "+stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join : "+stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -737,14 +729,16 @@
// validate the stats map.
assertNotNull(statsMap);
assertEquals(3, statsMap.size());
- System.err.println(statsMap.toString());
+ if (log.isInfoEnabled())
+ log.info(statsMap.toString());
}
// validate the stats for the start operator.
{
final BOpStats stats = statsMap.get(startId);
assertNotNull(stats);
- System.err.println("start: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("start: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -753,24 +747,12 @@
assertEquals(1L, stats.chunksOut.get());
}
- // // validate the stats for the access path.
- // {
- // final BOpStats stats = statsMap.get(predId);
- // assertNotNull(stats);
- // System.err.println("pred : "+stats.toString());
- //
- // // verify query solution stats details.
- // assertEquals(1L, stats.chunksIn.get());
- // assertEquals(1L, stats.unitsIn.get());
- // assertEquals(1L, stats.unitsOut.get());
- // assertEquals(1L, stats.chunksOut.get());
- // }
-
// validate the stats for the 1st join operator.
{
final BOpStats stats = statsMap.get(joinId1);
assertNotNull(stats);
- System.err.println("join1: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join1: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get());
@@ -783,7 +765,8 @@
{
final BOpStats stats = statsMap.get(joinId2);
assertNotNull(stats);
- System.err.println("join2: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("join2: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get()); // @todo depends on where the shards are.
@@ -796,7 +779,8 @@
{
final BOpStats stats = statsMap.get(sliceId);
assertNotNull(stats);
- System.err.println("slice: " + stats.toString());
+ if (log.isInfoEnabled())
+ log.info("slice: " + stats.toString());
// verify query solution stats details.
assertEquals(1L, stats.chunksIn.get()); // @todo?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
