Author: orbiter
Date: 2008-02-03 22:47:27 +0100 (Sun, 03 Feb 2008)
New Revision: 4439
Modified:
trunk/htroot/AccessTracker_p.html
trunk/htroot/AccessTracker_p.java
trunk/htroot/WatchCrawler_p.html
trunk/source/de/anomic/plasma/plasmaWordIndex.java
trunk/yacy.init
Log:
fix for NPE in access tracker
fix for NPE in word index
Modified: trunk/htroot/AccessTracker_p.html
===================================================================
--- trunk/htroot/AccessTracker_p.html 2008-02-03 20:11:50 UTC (rev 4438)
+++ trunk/htroot/AccessTracker_p.html 2008-02-03 21:47:27 UTC (rev 4439)
@@ -61,7 +61,6 @@
<td>Offset</td>
<td>Expected Results</td>
<td>Returned Results</td>
- <td>Expected Time (ms)</td>
<td>Used Time (ms)</td>
<td>URL fetch (ms)</td>
<td>Snippet comp (ms)</td>
@@ -74,7 +73,6 @@
<td>#[offset]#</td>
<td>#[querycount]#</td>
<td>#[resultcount]#</td>
- <td>#[querytime]#</td>
<td>#[resulttime]#</td>
<td>#[urltime]#</td>
<td>#[snippettime]#</td>
@@ -87,7 +85,6 @@
<td></td>
<td>Ø #[querycount_avg]#</td>
<td>Ø #[resultcount_avg]#</td>
- <td>Ø #[querytime_avg]#</td>
<td>Ø #[resulttime_avg]#</td>
<td>Ø #[urltime_avg]#</td>
<td>Ø #[snippettime_avg]#</td>
@@ -131,7 +128,6 @@
<td>Date</td>
<td>Expected Results</td>
<td>Returned Results</td>
- <td>Expected Time (ms)</td>
<td>Used Time (ms)</td>
<td>URL fetch (ms)</td>
<td>Snippet comp (ms)</td>
@@ -144,7 +140,6 @@
<td>#[date]#</td>
<td>#[querycount]#</td>
<td>#[resultcount]#</td>
- <td>#[querytime]#</td>
<td>#[resulttime]#</td>
<td>#[urltime]#</td>
<td>#[snippettime]#</td>
@@ -157,7 +152,6 @@
<td></td>
<td>Ø #[querycount_avg]#</td>
<td>Ø #[resultcount_avg]#</td>
- <td>Ø #[querytime_avg]#</td>
<td>Ø #[resulttime_avg]#</td>
<td>Ø #[urltime_avg]#</td>
<td>Ø #[snippettime_avg]#</td>
Modified: trunk/htroot/AccessTracker_p.java
===================================================================
--- trunk/htroot/AccessTracker_p.java 2008-02-03 20:11:50 UTC (rev 4438)
+++ trunk/htroot/AccessTracker_p.java 2008-02-03 21:47:27 UTC (rev 4439)
@@ -133,7 +133,6 @@
HashMap<String, Object> searchProfile;
int m = Math.min(maxCount, array.size());
long qcountSum = 0;
- long qtimeSum = 0;
long rcountSum = 0;
long utimeSum = 0;
long stimeSum = 0;
@@ -159,13 +158,11 @@
prop.put("page_list_" + entCount + "_queryhashes",
plasmaSearchQuery.anonymizedQueryHashes((Set<String>)
searchProfile.get("queryhashes")));
}
prop.putNum("page_list_" + entCount + "_querycount",
((Integer) searchProfile.get("querycount")).longValue());
- prop.putNum("page_list_" + entCount + "_querytime", ((Long)
searchProfile.get("querytime")).longValue());
prop.putNum("page_list_" + entCount + "_resultcount",
((Integer) searchProfile.get("resultcount")).longValue());
prop.putNum("page_list_" + entCount + "_urltime", ((Long)
searchProfile.get("resulturltime")).longValue());
prop.putNum("page_list_" + entCount + "_snippettime", ((Long)
searchProfile.get("resultsnippettime")).longValue());
prop.putNum("page_list_" + entCount + "_resulttime", ((Long)
searchProfile.get("resulttime")).longValue());
qcountSum += ((Integer)
searchProfile.get("querycount")).intValue();
- qtimeSum += ((Long)
searchProfile.get("querytime")).longValue();
rcountSum += ((Integer)
searchProfile.get("resultcount")).intValue();
utimeSum += ((Long)
searchProfile.get("resulturltime")).longValue();
stimeSum += ((Long)
searchProfile.get("resultsnippettime")).longValue();
@@ -177,7 +174,6 @@
// Put -1 instead of NaN as result for empty search list
if (m == 0) m = -1;
prop.putNum("page_querycount_avg", (double)qcountSum/m);
- prop.putNum("page_querytime_avg", (double)qtimeSum/m);
prop.putNum("page_resultcount_avg", (double)rcountSum/m);
prop.putNum("page_urltime_avg", (double)utimeSum/m);
prop.putNum("page_snippettime_avg", (double)stimeSum/m);
Modified: trunk/htroot/WatchCrawler_p.html
===================================================================
--- trunk/htroot/WatchCrawler_p.html 2008-02-03 20:11:50 UTC (rev 4438)
+++ trunk/htroot/WatchCrawler_p.html 2008-02-03 21:47:27 UTC (rev 4439)
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
-#(forwardToCrawlStart)#::<meta http-equiv="REFRESH"
content="0;/CrawlStartSimple_p.html">#(/forwardToCrawlStart)#
+#(forwardToCrawlStart)#::<meta http-equiv="REFRESH" content="0;
url=/CrawlStartSimple_p.html">#(/forwardToCrawlStart)#
<head>
<title>YaCy '#[clientname]#': Crawler Queues</title>
#%env/templates/metas.template%#
Modified: trunk/source/de/anomic/plasma/plasmaWordIndex.java
===================================================================
--- trunk/source/de/anomic/plasma/plasmaWordIndex.java 2008-02-03 20:11:50 UTC
(rev 4438)
+++ trunk/source/de/anomic/plasma/plasmaWordIndex.java 2008-02-03 21:47:27 UTC
(rev 4439)
@@ -363,6 +363,8 @@
}
}
+ if (container == null) return null;
+
// check doubles
int beforeDouble = container.size();
ArrayList<kelondroRowSet> d = container.removeDoubles();
Modified: trunk/yacy.init
===================================================================
--- trunk/yacy.init 2008-02-03 20:11:50 UTC (rev 4438)
+++ trunk/yacy.init 2008-02-03 21:47:27 UTC (rev 4439)
@@ -658,10 +658,10 @@
# ram cache during indexing. When YaCy is shut down, this cache must be
# flushed to disc; this may last some minutes.
wordCacheMaxCount = 20000
-wordCacheInitCount = 30000
+wordCacheInitCount = 20000
wordFlushSize = 500
-wordCacheMaxCount__pro = 60000
-wordCacheInitCount__pro = 80000
+wordCacheMaxCount__pro = 20000
+wordCacheInitCount__pro = 20000
wordFlushSize__pro = 500
# Specifies if yacy can be used as transparent http proxy.
_______________________________________________
YaCy-svn mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/yacy-svn
