diff --git a/htroot/IndexControl_p.java b/htroot/IndexControl_p.java
index 076986017..270a1d17f 100644
--- a/htroot/IndexControl_p.java
+++ b/htroot/IndexControl_p.java
@@ -165,7 +165,7 @@ public class IndexControl_p {
switchboard.urlPool.loadedURL.remove(urlx[i]);
}
}
- switchboard.wordIndex.deleteIndex(keyhash);
+ switchboard.wordIndex.deleteContainer(keyhash);
post.remove("keyhashdeleteall");
if (keystring.length() > 0 &&
indexEntryAttribute.word2hash(keystring).equals(keyhash)) {
diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index 70f0282af..338c4f38c 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -92,8 +92,8 @@
Empty
(avail.)
Slots |
Used: High, Medium, Low Prio |
Node-Cache
Hit:Miss
Uniq:Doub
Del:Flush
|
-
Size
Max |
-
Size
Current |
+
Max
Size |
+
Hit-Size
Miss-Size |
Hit-Cache
Hit:Miss
Uniq:Doub
Del:Flush
|
Miss-Cache
Hit:Miss
Uniq:Doub
Del:Flush
|
Used Now |
diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java
index f13a10424..d4e40123c 100644
--- a/htroot/PerformanceMemory_p.java
+++ b/htroot/PerformanceMemory_p.java
@@ -302,13 +302,13 @@ public class PerformanceMemory_p {
prop.put("sluniqdoub" + db, slt[6] + ":" + slt[7]);
prop.put("slflush" + db, slt[8] + ":" + slt[9]);
prop.put("ochunkmax" + db, ost[0]);
- prop.put("ochunkcur" + db, ost[1]);
- prop.put("ohittmiss" + db, ost[5] + ":" + ost[6]);
- prop.put("ouniqdoub" + db, ost[7] + ":" + ost[8]);
- prop.put("oflush" + db, ost[9] + ":" + ost[10]);
- prop.put("nhittmiss" + db, ost[11] + ":" + ost[12]);
- prop.put("nuniqdoub" + db, ost[13] + ":" + ost[14]);
- prop.put("nflush" + db, ost[15] + ":" + ost[16]);
+ prop.put("ochunkcur" + db, ost[1] + "
" + ost[2]);
+ prop.put("ohittmiss" + db, ost[6] + ":" + ost[7]);
+ prop.put("ouniqdoub" + db, ost[8] + ":" + ost[9]);
+ prop.put("oflush" + db, ost[10] + ":" + ost[11]);
+ prop.put("nhittmiss" + db, ost[12] + ":" + ost[13]);
+ prop.put("nuniqdoub" + db, ost[14] + ":" + ost[15]);
+ prop.put("nflush" + db, ost[16] + ":" + ost[17]);
prop.put("used" + db, usd / KB);
prop.put("good" + db, god / KB);
prop.put("best" + db, bst / KB);
diff --git a/source/de/anomic/index/indexEntry.java b/source/de/anomic/index/indexEntry.java
index 4d3876720..50785b5ca 100644
--- a/source/de/anomic/index/indexEntry.java
+++ b/source/de/anomic/index/indexEntry.java
@@ -33,6 +33,7 @@ public interface indexEntry {
public byte[] toEncodedByteArrayForm();
public String toPropertyForm();
+ public String getUrlHash();
public void combineDistance(indexEntry oe);
public void min(indexEntry other);
public void max(indexEntry other);
diff --git a/source/de/anomic/plasma/plasmaWordIndexInterface.java b/source/de/anomic/index/indexRI.java
similarity index 86%
rename from source/de/anomic/plasma/plasmaWordIndexInterface.java
rename to source/de/anomic/index/indexRI.java
index 7471a6d31..05442dc82 100644
--- a/source/de/anomic/plasma/plasmaWordIndexInterface.java
+++ b/source/de/anomic/index/indexRI.java
@@ -1,4 +1,4 @@
-// plasmaWordIndexInterface.java
+// indexRI.java
// -----------------------------
// part of YACY
// (C) by Michael Peter Christen; mc@anomic.de
@@ -40,22 +40,25 @@
// Contributions and changes to the program code must be marked as such.
-package de.anomic.plasma;
+package de.anomic.index;
import java.util.Iterator;
-public interface plasmaWordIndexInterface {
+import de.anomic.plasma.plasmaWordIndexEntryContainer;
+import de.anomic.plasma.plasmaWordIndexEntryInstance;
+
+public interface indexRI {
public int size();
public Iterator wordHashes(String startWordHash, boolean rot);
public long getUpdateTime(String wordHash);
- public plasmaWordIndexEntryContainer getContainer(String wordHash, boolean deleteIfEmpty);
+ public plasmaWordIndexEntryContainer getContainer(String wordHash, boolean deleteIfEmpty, long maxtime);
public plasmaWordIndexEntryContainer deleteContainer(String wordHash);
- public int removeEntries(String wordHash, String[] urlHashes, boolean deleteComplete);
- public boolean addEntry(String wordHash, plasmaWordIndexEntryInstance entry, long updateTime, boolean dhtCase);
+ public int removeEntries(String wordHash, String[] referenceHashes, boolean deleteComplete);
+ public boolean addEntry(String wordHash, indexEntry entry, long updateTime, boolean dhtCase);
public int addEntries(plasmaWordIndexEntryContainer newEntries, long creationTime, boolean dhtCase);
public void close(int waitingSeconds);
diff --git a/source/de/anomic/kelondro/kelondroCell.java b/source/de/anomic/kelondro/kelondroColumn.java
similarity index 93%
rename from source/de/anomic/kelondro/kelondroCell.java
rename to source/de/anomic/kelondro/kelondroColumn.java
index 26ad36956..0af06d6e9 100644
--- a/source/de/anomic/kelondro/kelondroCell.java
+++ b/source/de/anomic/kelondro/kelondroColumn.java
@@ -1,4 +1,4 @@
-// kelondroCell.java
+// kelondroColumn.java
// (C) 2006 by Michael Peter Christen; mc@anomic.de, Frankfurt a. M., Germany
// first published 24.05.2006 on http://www.anomic.de
//
@@ -28,7 +28,7 @@
package de.anomic.kelondro;
-public class kelondroCell {
+public class kelondroColumn {
public static int celltype_undefined = 0;
public static int celltype_boolean = 1;
@@ -40,7 +40,7 @@ public class kelondroCell {
private int celltype, dbwidth;
private String nickname, description;
- public kelondroCell(int celltype, int dbwidth, String nickname, String description) {
+ public kelondroColumn(int celltype, int dbwidth, String nickname, String description) {
this.celltype = celltype;
this.dbwidth = dbwidth;
this.nickname = nickname;
diff --git a/source/de/anomic/kelondro/kelondroObjectCache.java b/source/de/anomic/kelondro/kelondroObjectCache.java
index 2547c3649..5ac8a232b 100644
--- a/source/de/anomic/kelondro/kelondroObjectCache.java
+++ b/source/de/anomic/kelondro/kelondroObjectCache.java
@@ -123,14 +123,19 @@ public class kelondroObjectCache {
return System.currentTimeMillis() - longEmit(ages.getMinScore());
}
- public int size() {
+ public int hitsize() {
return cache.size();
}
+ public int misssize() {
+ return hasnot.size();
+ }
+
public String[] status() {
return new String[]{
Integer.toString(maxSize()),
- Integer.toString(size()),
+ Integer.toString(hitsize()),
+ Integer.toString(misssize()),
Long.toString(this.maxAge),
Long.toString(minAge()),
Long.toString(maxAge()),
@@ -153,10 +158,10 @@ public class kelondroObjectCache {
return new String[]{
Integer.toString(Integer.parseInt(a[0]) + Integer.parseInt(b[0])),
Integer.toString(Integer.parseInt(a[1]) + Integer.parseInt(b[1])),
- Long.toString(Math.max(Long.parseLong(a[2]), Long.parseLong(b[2]))),
- Long.toString(Math.min(Long.parseLong(a[3]), Long.parseLong(b[3]))),
- Long.toString(Math.max(Long.parseLong(a[4]), Long.parseLong(b[4]))),
- Integer.toString(Integer.parseInt(a[5]) + Integer.parseInt(b[5])),
+ Integer.toString(Integer.parseInt(a[2]) + Integer.parseInt(b[2])),
+ Long.toString(Math.max(Long.parseLong(a[3]), Long.parseLong(b[3]))),
+ Long.toString(Math.min(Long.parseLong(a[4]), Long.parseLong(b[4]))),
+ Long.toString(Math.max(Long.parseLong(a[5]), Long.parseLong(b[5]))),
Integer.toString(Integer.parseInt(a[6]) + Integer.parseInt(b[6])),
Integer.toString(Integer.parseInt(a[7]) + Integer.parseInt(b[7])),
Integer.toString(Integer.parseInt(a[8]) + Integer.parseInt(b[8])),
@@ -167,7 +172,8 @@ public class kelondroObjectCache {
Integer.toString(Integer.parseInt(a[13]) + Integer.parseInt(b[13])),
Integer.toString(Integer.parseInt(a[14]) + Integer.parseInt(b[14])),
Integer.toString(Integer.parseInt(a[15]) + Integer.parseInt(b[15])),
- Integer.toString(Integer.parseInt(a[16]) + Integer.parseInt(b[16]))
+ Integer.toString(Integer.parseInt(a[16]) + Integer.parseInt(b[16])),
+ Integer.toString(Integer.parseInt(a[17]) + Integer.parseInt(b[17]))
};
}
diff --git a/source/de/anomic/kelondro/kelondroRecords.java b/source/de/anomic/kelondro/kelondroRecords.java
index 106f8392e..f8d50d07a 100644
--- a/source/de/anomic/kelondro/kelondroRecords.java
+++ b/source/de/anomic/kelondro/kelondroRecords.java
@@ -1021,15 +1021,15 @@ public class kelondroRecords {
for (int j = 0; j < chunk.length; j++) System.out.print(chunk[j] + ",");
}
- public synchronized kelondroRow row() {
+ public final kelondroRow row() {
return this.ROW;
}
- public synchronized int columns() {
+ public final int columns() {
return this.ROW.columns();
}
- public synchronized int columnSize(int column) {
+ public final int columnSize(int column) {
if ((column < 0) || (column >= this.ROW.columns())) return -1;
return ROW.width(column);
}
diff --git a/source/de/anomic/kelondro/kelondroRow.java b/source/de/anomic/kelondro/kelondroRow.java
index 029c641b2..418d54a85 100644
--- a/source/de/anomic/kelondro/kelondroRow.java
+++ b/source/de/anomic/kelondro/kelondroRow.java
@@ -29,15 +29,15 @@ package de.anomic.kelondro;
public class kelondroRow {
- private kelondroCell[] row;
+ private kelondroColumn[] row;
- public kelondroRow(kelondroCell[] row) {
+ public kelondroRow(kelondroColumn[] row) {
this.row = row;
}
public kelondroRow(int[] row) {
- this.row = new kelondroCell[row.length];
- for (int i = 0; i < row.length; i++) this.row[i] = new kelondroCell(kelondroCell.celltype_undefined, row[i], "", "");
+ this.row = new kelondroColumn[row.length];
+ for (int i = 0; i < row.length; i++) this.row[i] = new kelondroColumn(kelondroColumn.celltype_undefined, row[i], "", "");
}
public int columns() {
diff --git a/source/de/anomic/plasma/dbImport/plasmaDbImporter.java b/source/de/anomic/plasma/dbImport/plasmaDbImporter.java
index 6a4b05ad1..4b9d837cf 100644
--- a/source/de/anomic/plasma/dbImport/plasmaDbImporter.java
+++ b/source/de/anomic/plasma/dbImport/plasmaDbImporter.java
@@ -184,7 +184,7 @@ public class plasmaDbImporter extends AbstractImporter implements dbImporter {
if (newContainer.size() > 0) { this.homeWordIndex.addEntries(newContainer, System.currentTimeMillis(), false); }
// delete complete index entity file
- this.importWordIndex.deleteIndex(this.wordHash);
+ this.importWordIndex.deleteContainer(this.wordHash);
// print out some statistical information
if (this.entryCounter % 500 == 0) {
diff --git a/source/de/anomic/plasma/plasmaDHTChunk.java b/source/de/anomic/plasma/plasmaDHTChunk.java
index 6b34dcce5..d1c4a3045 100644
--- a/source/de/anomic/plasma/plasmaDHTChunk.java
+++ b/source/de/anomic/plasma/plasmaDHTChunk.java
@@ -233,7 +233,7 @@ public class plasmaDHTChunk {
tmpContainers.add(indexContainer);
} catch (kelondroException e) {
log.logSevere("plasmaWordIndexDistribution/2: deleted DB for word " + nexthash, e);
- wordIndex.deleteIndex(nexthash);
+ wordIndex.deleteContainer(nexthash);
}
}
// create result
diff --git a/source/de/anomic/plasma/plasmaWordIndex.java b/source/de/anomic/plasma/plasmaWordIndex.java
index e4cfb51d8..0e9bf7d60 100644
--- a/source/de/anomic/plasma/plasmaWordIndex.java
+++ b/source/de/anomic/plasma/plasmaWordIndex.java
@@ -58,7 +58,10 @@ import java.util.TreeSet;
import java.net.URL;
import de.anomic.htmlFilter.htmlFilterContentScraper;
+import de.anomic.index.indexEntry;
import de.anomic.index.indexEntryAttribute;
+import de.anomic.index.indexRI;
+import de.anomic.index.indexAbstractRI;
import de.anomic.kelondro.kelondroBase64Order;
import de.anomic.kelondro.kelondroException;
import de.anomic.kelondro.kelondroMergeIterator;
@@ -66,7 +69,7 @@ import de.anomic.kelondro.kelondroNaturalOrder;
import de.anomic.kelondro.kelondroOrder;
import de.anomic.server.logging.serverLog;
-public final class plasmaWordIndex {
+public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
private static final String indexAssortmentClusterPath = "ACLUSTER";
private static final int assortmentCount = 64;
@@ -155,7 +158,7 @@ public final class plasmaWordIndex {
}
}
- public boolean addEntry(String wordHash, plasmaWordIndexEntryInstance entry, long updateTime, boolean dhtCase) {
+ public boolean addEntry(String wordHash, indexEntry entry, long updateTime, boolean dhtCase) {
if (ramCache.addEntry(wordHash, entry, updateTime, dhtCase)) {
if (!dhtCase) flushControl();
return true;
@@ -284,7 +287,7 @@ public final class plasmaWordIndex {
// e.g. indexTransfer might keep this container for minutes while
// several new pages could be added to the index, possibly with the same words that have
// been selected for transfer
- container.add(ramCache.getContainer(wordHash, true), (maxTime < 0) ? -1 : maxTime / 2);
+ container.add(ramCache.getContainer(wordHash, true, (maxTime < 0) ? -1 : maxTime / 2), (maxTime < 0) ? -1 : maxTime / 2);
// get from assortments
container.add(assortmentCluster.getFromAll(wordHash, (maxTime < 0) ? -1 : maxTime / 2), (maxTime < 0) ? -1 : maxTime / 2);
@@ -352,10 +355,11 @@ public final class plasmaWordIndex {
backend.close(10);
}
- public synchronized void deleteIndex(String wordHash) {
- ramCache.deleteContainer(wordHash);
- assortmentCluster.removeFromAll(wordHash, -1);
- backend.deleteIndex(wordHash);
+ public synchronized plasmaWordIndexEntryContainer deleteContainer(String wordHash) {
+ plasmaWordIndexEntryContainer c = ramCache.deleteContainer(wordHash);
+ c.add(assortmentCluster.removeFromAll(wordHash, -1), -1);
+ c.add(backend.deleteContainer(wordHash), -1);
+ return c;
}
public int removeEntries(String wordHash, String[] urlHashes, boolean deleteComplete) {
@@ -410,6 +414,14 @@ public final class plasmaWordIndex {
return hashes;
}
+ public Iterator wordHashes(String startHash, boolean rot) {
+ try {
+ return wordHashes(startHash, RL_WORDFILES, rot);
+ } catch (IOException e) {
+ return new HashSet().iterator();
+ }
+ }
+
public Iterator wordHashes(String startHash, int resourceLevel, boolean rot) throws IOException {
if (rot) return new rotatingWordIterator(startHash, resourceLevel);
else return wordHashes(startHash, resourceLevel);
diff --git a/source/de/anomic/plasma/plasmaWordIndexCache.java b/source/de/anomic/plasma/plasmaWordIndexCache.java
index 39d2811cb..f0d9de837 100644
--- a/source/de/anomic/plasma/plasmaWordIndexCache.java
+++ b/source/de/anomic/plasma/plasmaWordIndexCache.java
@@ -49,6 +49,10 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+
+import de.anomic.index.indexEntry;
+import de.anomic.index.indexRI;
+import de.anomic.index.indexAbstractRI;
import de.anomic.kelondro.kelondroArray;
import de.anomic.kelondro.kelondroException;
import de.anomic.kelondro.kelondroMScoreCluster;
@@ -56,7 +60,7 @@ import de.anomic.kelondro.kelondroRecords;
import de.anomic.server.logging.serverLog;
import de.anomic.yacy.yacySeedDB;
-public final class plasmaWordIndexCache implements plasmaWordIndexInterface {
+public final class plasmaWordIndexCache extends indexAbstractRI implements indexRI {
// environment constants
private static final String indexArrayFileName = "indexDump1.array";
@@ -356,21 +360,10 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface {
return (((long) intTime) * (long) 1000) + startTime;
}
- public plasmaWordIndexEntryContainer getContainer(String wordHash, boolean deleteIfEmpty) {
+ public plasmaWordIndexEntryContainer getContainer(String wordHash, boolean deleteIfEmpty, long maxtime_dummy) {
return (plasmaWordIndexEntryContainer) wCache.get(wordHash);
}
- public long getUpdateTime(String wordHash) {
- plasmaWordIndexEntryContainer entries = (plasmaWordIndexEntryContainer) wCache.get(wordHash);
- if (entries == null) return 0;
- return entries.updated();
- /*
- Long time = new Long(longTime(hashDate.getScore(wordHash)));
- if (time == null) return 0;
- return time.longValue();
- */
- }
-
public plasmaWordIndexEntryContainer deleteContainer(String wordHash) {
// returns the index that had been deleted
synchronized (wCache) {
@@ -450,7 +443,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface {
return added;
}
- public boolean addEntry(String wordHash, plasmaWordIndexEntryInstance newEntry, long updateTime, boolean dhtCase) {
+ public boolean addEntry(String wordHash, indexEntry newEntry, long updateTime, boolean dhtCase) {
if (dhtCase) synchronized (kCache) {
// put container into kCache
plasmaWordIndexEntryContainer container = new plasmaWordIndexEntryContainer(wordHash);
@@ -462,7 +455,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface {
} else synchronized (wCache) {
plasmaWordIndexEntryContainer container = (plasmaWordIndexEntryContainer) wCache.get(wordHash);
if (container == null) container = new plasmaWordIndexEntryContainer(wordHash);
- plasmaWordIndexEntryInstance[] entries = new plasmaWordIndexEntryInstance[] { newEntry };
+ indexEntry[] entries = new indexEntry[] { newEntry };
if (container.add(entries, updateTime) > 0) {
wCache.put(wordHash, container);
hashScore.incScore(wordHash);
diff --git a/source/de/anomic/plasma/plasmaWordIndexClassicDB.java b/source/de/anomic/plasma/plasmaWordIndexClassicDB.java
index 20ff95c65..9f67debf1 100644
--- a/source/de/anomic/plasma/plasmaWordIndexClassicDB.java
+++ b/source/de/anomic/plasma/plasmaWordIndexClassicDB.java
@@ -49,11 +49,13 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.TreeSet;
+import de.anomic.index.indexRI;
+import de.anomic.index.indexAbstractRI;
import de.anomic.kelondro.kelondroNaturalOrder;
import de.anomic.server.logging.serverLog;
import de.anomic.yacy.yacySeedDB;
-public class plasmaWordIndexClassicDB {
+public class plasmaWordIndexClassicDB extends indexAbstractRI implements indexRI {
// class variables
private final File databaseRoot;
@@ -70,6 +72,10 @@ public class plasmaWordIndexClassicDB {
return size;
}
+ public Iterator wordHashes(String startHash, boolean rot) {
+ return wordHashes(startHash, rot);
+ }
+
public Iterator wordHashes(String startHash, boolean up, boolean rot) {
if (rot) throw new UnsupportedOperationException("no rot allowed");
return new iterateFiles(startHash, up);
@@ -208,8 +214,9 @@ public class plasmaWordIndexClassicDB {
if (f.exists()) return f.lastModified(); else return -1;
}
- public void deleteIndex(String wordHash) {
+ public plasmaWordIndexEntryContainer deleteContainer(String wordHash) {
plasmaWordIndexEntity.removePlasmaIndex(databaseRoot, wordHash);
+ return new plasmaWordIndexEntryContainer(wordHash);
}
public int removeEntries(String wordHash, String[] urlHashes, boolean deleteComplete) {
@@ -223,7 +230,7 @@ public class plasmaWordIndexClassicDB {
int size = pi.size();
pi.close(); pi = null;
// check if we can remove the index completely
- if ((deleteComplete) && (size == 0)) deleteIndex(wordHash);
+ if ((deleteComplete) && (size == 0)) deleteContainer(wordHash);
return count;
} catch (IOException e) {
log.logSevere("plasmaWordIndexClassic.removeEntries: " + e.getMessage());
diff --git a/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java b/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java
index 9e73fbf59..40a60a17f 100644
--- a/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java
+++ b/source/de/anomic/plasma/plasmaWordIndexEntryContainer.java
@@ -57,6 +57,7 @@ import java.util.Iterator;
import java.util.Set;
import java.util.TreeMap;
+import de.anomic.index.indexEntry;
import de.anomic.kelondro.kelondroBase64Order;
import de.anomic.kelondro.kelondroNaturalOrder;
import de.anomic.kelondro.kelondroOrder;
@@ -100,16 +101,16 @@ public final class plasmaWordIndexEntryContainer {
return wordHash;
}
- public int add(plasmaWordIndexEntryInstance entry) {
+ public int add(indexEntry entry) {
return add(entry, System.currentTimeMillis());
}
- public int add(plasmaWordIndexEntryInstance entry, long updateTime) {
+ public int add(indexEntry entry, long updateTime) {
this.updateTime = java.lang.Math.max(this.updateTime, updateTime);
return (addi(entry)) ? 1 : 0;
}
- public int add(plasmaWordIndexEntryInstance[] entries, long updateTime) {
+ public int add(indexEntry[] entries, long updateTime) {
int c = 0;
for (int i = 0; i < entries.length; i++) if (addi(entries[i])) c++;
this.updateTime = java.lang.Math.max(this.updateTime, updateTime);
@@ -131,7 +132,7 @@ public final class plasmaWordIndexEntryContainer {
return x;
}
- private boolean addi(plasmaWordIndexEntryInstance entry) {
+ private boolean addi(indexEntry entry) {
// returns true if the new entry was added, false if it already existed
plasmaWordIndexEntryInstance oldEntry = (plasmaWordIndexEntryInstance) container.put(entry.getUrlHash(), entry);
if ((oldEntry != null) && (entry.isOlder(oldEntry))) { // A more recent Entry is already in this container
diff --git a/source/yacy.java b/source/yacy.java
index f3ea0d5cd..03caa6ea4 100644
--- a/source/yacy.java
+++ b/source/yacy.java
@@ -892,7 +892,7 @@ public final class yacy {
homeWordIndex.addEntries(newContainer, System.currentTimeMillis(), true);
// delete complete index entity file
- importWordIndex.deleteIndex(wordHash);
+ importWordIndex.deleteContainer(wordHash);
// print out some statistical information
if (wordCounter%500 == 0) {