diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 92719356d..3c01929df 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -63,7 +63,7 @@ public class PerformanceMemory_p { private static final long MB = 1024 * KB; private static Map defaultSettings = null; - private static long[] slt,chk; + private static int[] slt,chk; private static String[] ost; private static long req, usd, bst, god; diff --git a/source/de/anomic/data/blogBoard.java b/source/de/anomic/data/blogBoard.java index f3db22035..f2168d6a7 100644 --- a/source/de/anomic/data/blogBoard.java +++ b/source/de/anomic/data/blogBoard.java @@ -86,11 +86,11 @@ public class blogBoard { return datbase.size(); } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return datbase.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return datbase.cacheNodeFillStatus(); } diff --git a/source/de/anomic/data/messageBoard.java b/source/de/anomic/data/messageBoard.java index 1fda6e64f..81bf0feb8 100644 --- a/source/de/anomic/data/messageBoard.java +++ b/source/de/anomic/data/messageBoard.java @@ -86,11 +86,11 @@ public class messageBoard { return database.size(); } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return database.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return database.cacheNodeFillStatus(); } diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java index 535f77ffb..e2c8caa6c 100644 --- a/source/de/anomic/data/userDB.java +++ b/source/de/anomic/data/userDB.java @@ -91,11 +91,11 @@ public final class userDB { } } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return userTable.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return userTable.cacheNodeFillStatus(); } diff --git a/source/de/anomic/data/wikiBoard.java b/source/de/anomic/data/wikiBoard.java index a93429b2f..cae4ce3b4 100644 --- a/source/de/anomic/data/wikiBoard.java +++ b/source/de/anomic/data/wikiBoard.java @@ -100,20 +100,20 @@ public class wikiBoard { return datbase.size(); } - public long[] dbCacheNodeChunkSize() { - long[] db = datbase.cacheNodeChunkSize(); - long[] bk = bkpbase.cacheNodeChunkSize(); - long[] i = new long[3]; + public int[] dbCacheNodeChunkSize() { + int[] db = datbase.cacheNodeChunkSize(); + int[] bk = bkpbase.cacheNodeChunkSize(); + int[] i = new int[3]; i[kelondroRecords.CP_LOW] = (db[kelondroRecords.CP_LOW] + bk[kelondroRecords.CP_LOW]) / 2; i[kelondroRecords.CP_MEDIUM] = (db[kelondroRecords.CP_MEDIUM] + bk[kelondroRecords.CP_MEDIUM]) / 2; i[kelondroRecords.CP_HIGH] = (db[kelondroRecords.CP_HIGH] + bk[kelondroRecords.CP_HIGH]) / 2; return i; } - public long[] dbCacheNodeFillStatus() { - long[] a = datbase.cacheNodeFillStatus(); - long[] b = bkpbase.cacheNodeFillStatus(); - return new long[]{a[0] + b[0], a[1] + b[1], a[2] + b[2], a[3] + b[3]}; + public int[] dbCacheNodeFillStatus() { + int[] a = datbase.cacheNodeFillStatus(); + int[] b = bkpbase.cacheNodeFillStatus(); + return new int[]{a[0] + b[0], a[1] + b[1], a[2] + b[2], a[3] + b[3]}; } public String[] dbCacheObjectStatus() { diff --git a/source/de/anomic/kelondro/kelondroMap.java b/source/de/anomic/kelondro/kelondroMap.java index a3e8cb05b..38b508daf 100644 --- a/source/de/anomic/kelondro/kelondroMap.java +++ b/source/de/anomic/kelondro/kelondroMap.java @@ -133,11 +133,11 @@ public class kelondroMap { return dyn.columnSize(0); } - public long[] cacheNodeChunkSize() { + public int[] cacheNodeChunkSize() { return dyn.cacheNodeChunkSize(); } - public long[] cacheNodeFillStatus() { + public int[] cacheNodeFillStatus() { return dyn.cacheNodeFillStatus(); } diff --git a/source/de/anomic/kelondro/kelondroRecords.java b/source/de/anomic/kelondro/kelondroRecords.java index 015702324..2adec2b78 100644 --- a/source/de/anomic/kelondro/kelondroRecords.java +++ b/source/de/anomic/kelondro/kelondroRecords.java @@ -456,21 +456,21 @@ public class kelondroRecords { return this.headchunksize + element_in_cache + ((cacheControl) ? cache_control_entry : 0); } - public long[] cacheNodeChunkSize() { + public int[] cacheNodeChunkSize() { // returns three integers: // #0: chunk size of CP_LOW - priority entries // #1: chunk size of CP_MEDIUM - priority entries // #2: chunk size of CP_HIGH - priority entries - long[] i = new long[3]; + int[] i = new int[3]; i[CP_LOW] = cacheNodeChunkSize(false); i[CP_MEDIUM] = cacheNodeChunkSize(false); i[CP_HIGH] = cacheNodeChunkSize(this.cacheScore != null); return i; } - public long[] cacheNodeFillStatus() { - if (XcacheHeaders == null) return new long[]{0,0,0,0}; - return new long[]{XcacheSize - (XcacheHeaders[CP_HIGH].size() + XcacheHeaders[CP_MEDIUM].size() + XcacheHeaders[CP_LOW].size()), XcacheHeaders[CP_HIGH].size(), XcacheHeaders[CP_MEDIUM].size(), XcacheHeaders[CP_LOW].size()}; + public int[] cacheNodeFillStatus() { + if (XcacheHeaders == null) return new int[]{0,0,0,0}; + return new int[]{XcacheSize - (XcacheHeaders[CP_HIGH].size() + XcacheHeaders[CP_MEDIUM].size() + XcacheHeaders[CP_LOW].size()), XcacheHeaders[CP_HIGH].size(), XcacheHeaders[CP_MEDIUM].size(), XcacheHeaders[CP_LOW].size()}; } protected Node newNode() throws IOException { diff --git a/source/de/anomic/plasma/plasmaCrawlProfile.java b/source/de/anomic/plasma/plasmaCrawlProfile.java index 79a5b233a..4b226375f 100644 --- a/source/de/anomic/plasma/plasmaCrawlProfile.java +++ b/source/de/anomic/plasma/plasmaCrawlProfile.java @@ -77,11 +77,11 @@ public class plasmaCrawlProfile { domsCache = new HashMap(); } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return profileTable.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return profileTable.cacheNodeFillStatus(); } diff --git a/source/de/anomic/plasma/plasmaCrawlRobotsTxt.java b/source/de/anomic/plasma/plasmaCrawlRobotsTxt.java index a072f13c4..7d5c4bd90 100644 --- a/source/de/anomic/plasma/plasmaCrawlRobotsTxt.java +++ b/source/de/anomic/plasma/plasmaCrawlRobotsTxt.java @@ -85,11 +85,11 @@ public class plasmaCrawlRobotsTxt { } } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return robotsTable.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return robotsTable.cacheNodeFillStatus(); } diff --git a/source/de/anomic/plasma/plasmaHTCache.java b/source/de/anomic/plasma/plasmaHTCache.java index 3103f23f2..4ad24dabb 100644 --- a/source/de/anomic/plasma/plasmaHTCache.java +++ b/source/de/anomic/plasma/plasmaHTCache.java @@ -201,11 +201,11 @@ public final class plasmaHTCache { return this.responseHeaderDB.size(); } - public long[] dbCacheChunkSize() { + public int[] dbCacheChunkSize() { return this.responseHeaderDB.cacheNodeChunkSize(); } - public long[] dbCacheFillStatus() { + public int[] dbCacheFillStatus() { return this.responseHeaderDB.cacheNodeFillStatus(); } diff --git a/source/de/anomic/plasma/plasmaWordIndex.java b/source/de/anomic/plasma/plasmaWordIndex.java index 58d2f2222..46d3af383 100644 --- a/source/de/anomic/plasma/plasmaWordIndex.java +++ b/source/de/anomic/plasma/plasmaWordIndex.java @@ -125,11 +125,11 @@ public final class plasmaWordIndex { return assortmentCluster.sizes(); } - public long[] assortmentsCacheChunkSizeAvg() { + public int[] assortmentsCacheChunkSizeAvg() { return assortmentCluster.cacheChunkSizeAvg(); } - public long[] assortmentsCacheFillStatusCml() { + public int[] assortmentsCacheFillStatusCml() { return assortmentCluster.cacheFillStatusCml(); } diff --git a/source/de/anomic/plasma/plasmaWordIndexAssortment.java b/source/de/anomic/plasma/plasmaWordIndexAssortment.java index bf4cf1d7c..9dd8eb7d0 100644 --- a/source/de/anomic/plasma/plasmaWordIndexAssortment.java +++ b/source/de/anomic/plasma/plasmaWordIndexAssortment.java @@ -261,11 +261,11 @@ public final class plasmaWordIndexAssortment { return assortments.size(); } - public long[] cacheNodeChunkSize() { + public int[] cacheNodeChunkSize() { return assortments.cacheNodeChunkSize(); } - public long[] cacheNodeFillStatus() { + public int[] cacheNodeFillStatus() { return assortments.cacheNodeFillStatus(); } diff --git a/source/de/anomic/plasma/plasmaWordIndexAssortmentCluster.java b/source/de/anomic/plasma/plasmaWordIndexAssortmentCluster.java index fd04dbe4e..73c98be6c 100644 --- a/source/de/anomic/plasma/plasmaWordIndexAssortmentCluster.java +++ b/source/de/anomic/plasma/plasmaWordIndexAssortmentCluster.java @@ -263,9 +263,9 @@ public final class plasmaWordIndexAssortmentCluster { return sizes; } - public long[] cacheChunkSizeAvg() { + public int[] cacheChunkSizeAvg() { int[] i = new int[]{0, 0, 0}; - long[] a = new long[3]; + int[] a = new int[3]; for (int j = 0; j < clusterCount; j++) { a = assortments[j].cacheNodeChunkSize(); i[kelondroRecords.CP_LOW] += a[kelondroRecords.CP_LOW]; @@ -278,8 +278,8 @@ public final class plasmaWordIndexAssortmentCluster { return a; } - public long[] cacheFillStatusCml() { - long[] a, cml = new long[]{0, 0, 0, 0}; + public int[] cacheFillStatusCml() { + int[] a, cml = new int[]{0, 0, 0, 0}; for (int i = 0; i < clusterCount; i++) { a = assortments[i].cacheNodeFillStatus(); for (int j = 0; j < 4; j++) cml[j] += a[j]; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 6484296ad..86fe75786 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -96,11 +96,11 @@ public class yacyNewsDB { news = createDB(path, bufferkb); } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return news.cacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return news.cacheNodeFillStatus(); } diff --git a/source/de/anomic/yacy/yacyNewsPool.java b/source/de/anomic/yacy/yacyNewsPool.java index 52c96dd0a..bab1d2fa9 100644 --- a/source/de/anomic/yacy/yacyNewsPool.java +++ b/source/de/anomic/yacy/yacyNewsPool.java @@ -106,11 +106,11 @@ public class yacyNewsPool { return newsDB.size(); } - public long[] dbCacheNodeChunkSize() { + public int[] dbCacheNodeChunkSize() { return newsDB.dbCacheNodeChunkSize(); } - public long[] dbCacheNodeFillStatus() { + public int[] dbCacheNodeFillStatus() { return newsDB.dbCacheNodeFillStatus(); } diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index dd6588740..90731c04a 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -170,22 +170,22 @@ public final class yacySeedDB { } catch (IOException e) {} } - public long[] dbCacheNodeChunkSize() { - long[] ac = seedActiveDB.cacheNodeChunkSize(); - long[] pa = seedPassiveDB.cacheNodeChunkSize(); - long[] po = seedPotentialDB.cacheNodeChunkSize(); - long[] i = new long[3]; + public int[] dbCacheNodeChunkSize() { + int[] ac = seedActiveDB.cacheNodeChunkSize(); + int[] pa = seedPassiveDB.cacheNodeChunkSize(); + int[] po = seedPotentialDB.cacheNodeChunkSize(); + int[] i = new int[3]; i[kelondroRecords.CP_LOW] = (ac[kelondroRecords.CP_LOW] + pa[kelondroRecords.CP_LOW] + po[kelondroRecords.CP_LOW]) / 3; i[kelondroRecords.CP_MEDIUM] = (ac[kelondroRecords.CP_MEDIUM] + pa[kelondroRecords.CP_MEDIUM] + po[kelondroRecords.CP_MEDIUM]) / 3; i[kelondroRecords.CP_HIGH] = (ac[kelondroRecords.CP_HIGH] + pa[kelondroRecords.CP_HIGH] + po[kelondroRecords.CP_HIGH]) / 3; return i; } - public long[] dbCacheNodeFillStatus() { - long[] ac = seedActiveDB.cacheNodeFillStatus(); - long[] pa = seedPassiveDB.cacheNodeFillStatus(); - long[] po = seedPotentialDB.cacheNodeFillStatus(); - return new long[]{ac[0] + pa[0] + po[0], ac[1] + pa[1] + po[1], ac[2] + pa[2] + po[2], ac[3] + pa[3] + po[3]}; + public int[] dbCacheNodeFillStatus() { + int[] ac = seedActiveDB.cacheNodeFillStatus(); + int[] pa = seedPassiveDB.cacheNodeFillStatus(); + int[] po = seedPotentialDB.cacheNodeFillStatus(); + return new int[]{ac[0] + pa[0] + po[0], ac[1] + pa[1] + po[1], ac[2] + pa[2] + po[2], ac[3] + pa[3] + po[3]}; } public String[] dbCacheObjectStatus() {