Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4770] branches
|
From: <tho...@us...> - 2011-06-22 15:08:31
|
Revision: 4770
http://bigdata.svn.sourceforge.net/bigdata/?rev=4770&view=rev
Author: thompsonbry
Date: 2011-06-22 15:08:24 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Removed the SPARQL and BOP plan from the table so we can focus on the performance counters there. Those are now available inline above the table for cross referencing.
Removed several conditional logger tests in the full text search package which were showing up in the profiler. These were all inside of tight loops.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java
branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/QueryLog.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -497,8 +497,8 @@
w.write("<th>elapsed</th>");
w.write("<th>serviceId</th>");
w.write("<th>cause</th>");
- w.write("<th>query</th>");
- w.write("<th>bop</th>");
+// w.write("<th>query</th>");
+// w.write("<th>bop</th>");
/*
* Columns for each pipeline operator.
*/
@@ -639,54 +639,58 @@
// the operator.
if (summary) {
+// // The query string (SPARQL).
+// w.write(TD);
+// w.write(queryStr == null ? cdata(NA) : prettyPrintSparql(queryStr));
+// w.write(TDx);
+// // The query plan (BOPs)
+// {
+// w.write(TD);
+// final String bopStr = BOpUtility.toString(q.getQuery());
+// if (maxBopLength == 0 || bopStr.length() <= maxBopLength) {
+// // The entire query plan.
+// w.write(cdata(bopStr));
+// } else {
+// // A slice of the query plan.
+// w.write("<a href=\"#\" title=\"");
+// w.write(attrib(bopStr));// the entire query as a tooltip.
+// w.write("\"\n>");
+// w.write(cdata(bopStr.substring(0/* begin */, Math.min(
+// maxBopLength, bopStr.length()))));
+// w.write("...");
+// w.write("</a>");
+// }
+// w.write(TDx);
+// }
w.write(TD);
- w.write(queryStr == null ? cdata(NA) : prettyPrintSparql(queryStr));
- w.write(TDx);
- /*
- * The entire query (recursively).
- */
- final String bopStr = BOpUtility.toString(q.getQuery());
- w.write(TD);
- if (maxBopLength != 0) {
- w.write("<a href=\"#\" title=\"");
- w.write(attrib(bopStr));// the entire query as a tooltip.
- w.write("\"\n>");
- }
- // A slice of the query inline on the page or everything if
- // maxBopLength<=0.
- w.write(cdata(bopStr.substring(0/* begin */,
- maxBopLength <= 0 ? bopStr.length() : Math.min(
- maxBopLength, bopStr.length()))));
- if (maxBopLength != 0) {
- w.write("...");
- w.write("</a>");
- }
- w.write(TDx);
- w.write(TD);
w.write("total"); // summary line.
w.write(TDx);
} else {
+// // The query string (SPARQL).
+// w.write(TD);
+// w.write("...");// elide the original query string on a detail row.
+// w.write(TDx);
+// // The query plan (BOPs)
+// {
+// w.write(TD);
+// final String bopStr = bopIndex.get(bopId).toString();
+// if (maxBopLength == 0 || bopStr.length() <= maxBopLength) {
+// // The entire query plan.
+// w.write(cdata(bopStr));
+// } else {
+// // A slice of the query plan.
+// w.write("<a href=\"#\" title=\"");
+// w.write(attrib(bopStr));// the entire query as a tooltip.
+// w.write("\"\n>");
+// // A slice of the query inline on the page.
+// w.write(cdata(bopStr.substring(0/* begin */, Math.min(
+// maxBopLength, bopStr.length()))));
+// w.write("...");
+// w.write("</a>");
+// }
+// w.write(TDx);
+// }
w.write(TD);
- w.write("...");// elide the original query string on a detail row.
- w.write(TDx);
- // Otherwise show just this bop.
- final String bopStr = bopIndex.get(bopId).toString();
- w.write(TD);
- if(maxBopLength!=0) {
- w.write("<a href=\"#\" title=\"");
- w.write(attrib(bopStr));// the entire query as a tooltip.
- w.write("\"\n>");
- }
- // A slice of the query inline on the page.
- w.write(cdata(bopStr.substring(0/* begin */,
- maxBopLength <= 0 ? bopStr.length() : Math.min(
- maxBopLength, bopStr.length()))));
- if (maxBopLength != 0) {
- w.write("...");
- w.write("</a>");
- }
- w.write(TDx);
- w.write(TD);
w.write(Integer.toString(evalOrder)); // eval order for this bop.
w.write(TDx);
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -1446,9 +1446,10 @@
final Hit hit = it.next().getValue();
- if (log.isInfoEnabled()) {
- log.info("hit terms: " + hit.getTermCount());
- }
+ // Note: log test in loop shows up in profiler.
+// if (log.isInfoEnabled()) {
+// log.info("hit terms: " + hit.getTermCount());
+// }
if (hit.getTermCount() != nterms) {
it.remove();
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -75,12 +75,12 @@
}
- if(log.isDebugEnabled()) {
-
- log.debug("docId=" + docId + ", term: " + term + ", nterms="
- + nterms + ", weight=" + weight + ", cosine=" + cosine);
-
- }
+// if(log.isDebugEnabled()) {
+//
+// log.debug("docId=" + docId + ", term: " + term + ", nterms="
+// + nterms + ", weight=" + weight + ", cosine=" + cosine);
+//
+// }
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -249,13 +249,14 @@
final DataInputBuffer dis = tuple.getValueStream();
final int termFreq = dis.readShort();
final double termWeight = dis.readDouble();
+
+// Note: log test shows up in profiler.
+// if (log.isDebugEnabled())
+// log.debug("hit: term=" + queryTerm + ", docId=" + docId
+// + ", termFreq=" + termFreq + ", termWeight="
+// + termWeight + ", product="
+// + (queryTermWeight * termWeight));
- if (log.isDebugEnabled())
- log.debug("hit: term=" + queryTerm + ", docId=" + docId
- + ", termFreq=" + termFreq + ", termWeight="
- + termWeight + ", product="
- + (queryTermWeight * termWeight));
-
/*
* Play a little magic to get the docId in the hit set without race
* conditions.
Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -378,7 +378,7 @@
* into the HTML document we are building for the client.
*/
QueryLog.getTableXHTML(queryStr, q, w,
- true/* showQueryDetails */, 0/* maxBopLength */);
+ false/* showQueryDetails */, 0/* maxBopLength */);
// // Add into the HTML document.
// statsNode.text(w.toString());
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/FullTextIndex.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -1100,10 +1100,11 @@
while (it.hasNext()) {
final Hit<V> hit = it.next().getValue();
-
- if (log.isInfoEnabled()) {
- log.info("hit terms: " + hit.getTermCount());
- }
+
+ // Note: log test in loop shows up in profiler.
+// if (log.isInfoEnabled()) {
+// log.info("hit terms: " + hit.getTermCount());
+// }
if (hit.getTermCount() != nterms) {
it.remove();
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/Hit.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -79,12 +79,12 @@
}
- if(log.isDebugEnabled()) {
-
- log.debug("docId=" + docId + ", term: " + term + ", nterms="
- + nterms + ", weight=" + weight + ", cosine=" + cosine);
-
- }
+// if(log.isDebugEnabled()) {
+//
+// log.debug("docId=" + docId + ", term: " + term + ", nterms="
+// + nterms + ", weight=" + weight + ", cosine=" + cosine);
+//
+// }
}
Modified: branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java 2011-06-22 13:17:28 UTC (rev 4769)
+++ branches/TERMS_REFACTOR_BRANCH/bigdata/src/java/com/bigdata/search/ReadIndexTask.java 2011-06-22 15:08:24 UTC (rev 4770)
@@ -208,15 +208,16 @@
*/
// final ITermMetadata md = recordBuilder.decodeValue(tuple);
- final int termFreq = rec.termFreq();
-
final double termWeight = rec.getLocalTermWeight();
- if (log.isDebugEnabled())
- log.debug("hit: term=" + queryTerm + ", docId=" + docId
- + ", termFreq=" + termFreq + ", termWeight="
- + termWeight + ", product="
- + (queryTermWeight * termWeight));
+ // Note: Log test shows up in profiler.
+// if (log.isDebugEnabled()) {
+// final int termFreq = rec.termFreq();
+// log.debug("hit: term=" + queryTerm + ", docId=" + docId
+// + ", termFreq=" + termFreq + ", termWeight="
+// + termWeight + ", product="
+// + (queryTermWeight * termWeight));
+// }
/*
* Play a little magic to get the docId in the hit set without race
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
