| #[objectCachePath]# |
- #[objectHitChunkSize]# |
#[objectHitCacheCount]# |
+ #[objectHitChunkSize]# |
#[objectHitCacheMem]# |
#[objectHitCacheReadHit]# |
#[objectHitCacheReadMiss]# |
@@ -201,8 +203,8 @@
#[objectHitCacheWriteDouble]# |
#[objectHitCacheDeletes]# |
#[objectHitCacheFlushes]# |
- #[objectMissChunkSize]# |
#[objectMissCacheCount]# |
+ #[objectMissChunkSize]# |
#[objectMissCacheMem]# |
#[objectMissCacheReadHit]# |
#[objectMissCacheReadMiss]# |
diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java
index dc4b381b8..5fca8c12d 100644
--- a/htroot/PerformanceMemory_p.java
+++ b/htroot/PerformanceMemory_p.java
@@ -141,20 +141,19 @@ public class PerformanceMemory_p {
totalmem = 0;
while (i.hasNext()) {
filename = (String) i.next();
- prop.put("EcoList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p));
map = kelondroEcoTable.memoryStats(filename);
+ prop.put("EcoList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p));
+ prop.putNum("EcoList_" + c + "_tableSize", (String) map.get("tableSize"));
- mem = Long.parseLong((String) map.get("tableIndexMem"));
+ mem = Long.parseLong((String) map.get("tableKeyMem"));
totalmem += mem;
- prop.put("EcoList_" + c + "_tableIndexMem", serverMemory.bytesToString(mem));
- prop.put("EcoList_" + c + "_tableIndexChunkSize", map.get("tableIndexChunkSize"));
- prop.putNum("EcoList_" + c + "_tableIndexCount", (String)map.get("tableIndexCount"));
+ prop.put("EcoList_" + c + "_tableKeyMem", serverMemory.bytesToString(mem));
+ prop.put("EcoList_" + c + "_tableKeyChunkSize", map.get("tableKeyChunkSize"));
- mem = Long.parseLong((String) map.get("tableTailMem"));
+ mem = Long.parseLong((String) map.get("tableValueMem"));
totalmem += mem;
- prop.put("EcoList_" + c + "_tableTailMem", serverMemory.bytesToString(mem));
- prop.put("EcoList_" + c + "_tableTailChunkSize", map.get("tableTailChunkSize"));
- prop.putNum("EcoList_" + c + "_tableTailCount", (String)map.get("tableTailCount"));
+ prop.put("EcoList_" + c + "_tableValueMem", serverMemory.bytesToString(mem));
+ prop.put("EcoList_" + c + "_tableValueChunkSize", map.get("tableValueChunkSize"));
c++;
}
diff --git a/htroot/PerformanceMemory_p.xml b/htroot/PerformanceMemory_p.xml
index 5b098588d..ef069847e 100644
--- a/htroot/PerformanceMemory_p.xml
+++ b/htroot/PerformanceMemory_p.xml
@@ -27,12 +27,11 @@
#{EcoList}#
#[tableIndexPath]#
- #[tableIndexChunkSize]#
- #[tableIndexCount]#
- #[tableIndexMem]#
- #[tableTailChunkSize]#
- #[tableTailCount]#
- #[tableTailMem]#
+ #[tableCount]#
+ #[tableKeyChunkSize]#
+ #[tableKeyMem]#
+ #[tableValueChunkSize]#
+ #[tableValueMem]#
#{/EcoList}#
#[EcoIndexTotalMem]#
diff --git a/source/de/anomic/kelondro/kelondroEcoTable.java b/source/de/anomic/kelondro/kelondroEcoTable.java
index 5d972c04f..83ce389b8 100644
--- a/source/de/anomic/kelondro/kelondroEcoTable.java
+++ b/source/de/anomic/kelondro/kelondroEcoTable.java
@@ -155,13 +155,13 @@ public class kelondroEcoTable implements kelondroIndex {
private final Map memoryStats() {
// returns statistical data about this object
+ assert ((table == null) || (table.size() == index.size()));
HashMap map = new HashMap();
- map.put("tableIndexChunkSize", Integer.toString(index.row().objectsize));
- map.put("tableIndexCount", Integer.toString(index.size()));
- map.put("tableIndexMem", Integer.toString((int) (index.row().objectsize * index.size() * kelondroRowCollection.growfactor)));
- map.put("tableTailChunkSize", (table == null) ? "0" : Integer.toString(table.row().objectsize));
- map.put("tableTailCount", (table == null) ? "0" : Integer.toString(table.size()));
- map.put("tableTailMem", (table == null) ? "0" : Integer.toString((int) (table.row().objectsize * table.size() * kelondroRowCollection.growfactor)));
+ map.put("tableSize", Integer.toString(index.size()));
+ map.put("tableKeyChunkSize", Integer.toString(index.row().objectsize));
+ map.put("tableKeyMem", Integer.toString((int) (index.row().objectsize * index.size() * kelondroRowCollection.growfactor)));
+ map.put("tableValueChunkSize", (table == null) ? "0" : Integer.toString(table.row().objectsize));
+ map.put("tableValueMem", (table == null) ? "0" : Integer.toString((int) (table.row().objectsize * table.size() * kelondroRowCollection.growfactor)));
return map;
}
diff --git a/source/de/anomic/plasma/crawler/plasmaCrawlQueues.java b/source/de/anomic/plasma/crawler/plasmaCrawlQueues.java
index 6db4a9fbc..057b093be 100644
--- a/source/de/anomic/plasma/crawler/plasmaCrawlQueues.java
+++ b/source/de/anomic/plasma/crawler/plasmaCrawlQueues.java
@@ -75,8 +75,8 @@ public class plasmaCrawlQueues {
log.logConfig("Starting Crawling Management");
noticeURL = new plasmaCrawlNURL(plasmaPath);
//errorURL = new plasmaCrawlZURL(); // fresh error DB each startup; can be hold in RAM and reduces IO;
- errorURL = new plasmaCrawlZURL(plasmaPath, "urlError2.db", true);
- delegatedURL = new plasmaCrawlZURL(plasmaPath, "urlDelegated2.db", false);
+ errorURL = new plasmaCrawlZURL(plasmaPath, "urlError2.db", false);
+ delegatedURL = new plasmaCrawlZURL(plasmaPath, "urlDelegated2.db", true);
}
diff --git a/source/de/anomic/plasma/plasmaCrawlLURL.java b/source/de/anomic/plasma/plasmaCrawlLURL.java
index 61abbac59..59d754615 100644
--- a/source/de/anomic/plasma/plasmaCrawlLURL.java
+++ b/source/de/anomic/plasma/plasmaCrawlLURL.java
@@ -58,6 +58,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException;
+import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -191,7 +192,7 @@ public final class plasmaCrawlLURL {
return; // this did not need to be stored, but is updated
}
- urlIndexFile.put(entry.toRowEntry(), entry.loaddate());
+ urlIndexFile.put(entry.toRowEntry(), new Date() /*entry.loaddate()*/);
}
public synchronized indexURLEntry newEntry(String propStr) {