diff --git a/source/de/anomic/plasma/plasmaSearchEvent.java b/source/de/anomic/plasma/plasmaSearchEvent.java index 54f00179f..cf4f92f5f 100644 --- a/source/de/anomic/plasma/plasmaSearchEvent.java +++ b/source/de/anomic/plasma/plasmaSearchEvent.java @@ -219,27 +219,27 @@ public final class plasmaSearchEvent extends Thread implements Runnable { plasmaWordIndexEntryContainer searchResult = new plasmaWordIndexEntryContainer(null); long preorderTime = profileLocal.getTargetTime(plasmaSearchTimingProfile.PROCESS_PRESORT); - long postorderTime = profileLocal.getTargetTime(plasmaSearchTimingProfile.PROCESS_POSTSORT); profileLocal.startTimer(); long pst = System.currentTimeMillis(); - searchResult.add(rcLocal, preorderTime / 3); - searchResult.add(rcGlobal, preorderTime / 3); + searchResult.add(rcLocal, preorderTime); + searchResult.add(rcGlobal, preorderTime); preorderTime = preorderTime - (System.currentTimeMillis() - pst); - if (preorderTime < 0) preorderTime = 100; + if (preorderTime < 0) preorderTime = 200; plasmaSearchPreOrder preorder = new plasmaSearchPreOrder(query, ranking); preorder.addContainer(searchResult, preorderTime); profileLocal.setYieldTime(plasmaSearchTimingProfile.PROCESS_PRESORT); profileLocal.setYieldCount(plasmaSearchTimingProfile.PROCESS_PRESORT, rcLocal.size()); + // start url-fetch + long postorderTime = profileLocal.getTargetTime(plasmaSearchTimingProfile.PROCESS_POSTSORT); + long postorderLimitTime = (postorderTime < 0) ? Long.MAX_VALUE : (System.currentTimeMillis() + postorderTime); profileLocal.startTimer(); plasmaSearchResult acc = new plasmaSearchResult(query, ranking); - if (searchResult == null) return acc; // strange case where searchResult is not proper: acc is then empty - if (searchResult.size() == 0) return acc; // case that we have nothing to do - - // start url-fetch + //if (searchResult == null) return acc; // strange case where searchResult is not proper: acc is then empty + //if (searchResult.size() == 0) return acc; // case that we have nothing to do + plasmaWordIndexEntry entry; - long postorderLimitTime = (postorderTime < 0) ? Long.MAX_VALUE : (System.currentTimeMillis() + postorderTime); plasmaCrawlLURL.Entry page; int minEntries = profileLocal.getTargetCount(plasmaSearchTimingProfile.PROCESS_POSTSORT); try { diff --git a/source/de/anomic/plasma/plasmaSearchTimingProfile.java b/source/de/anomic/plasma/plasmaSearchTimingProfile.java index 7ca17e236..f89bd38fd 100644 --- a/source/de/anomic/plasma/plasmaSearchTimingProfile.java +++ b/source/de/anomic/plasma/plasmaSearchTimingProfile.java @@ -86,6 +86,8 @@ public class plasmaSearchTimingProfile implements Cloneable { public static final char PROCESS_FILTER = 'f'; public static final char PROCESS_SNIPPETFETCH = 's'; + private static final long minimumTargetTime = 100; + public static char[] sequence = new char[]{ PROCESS_COLLECTION, PROCESS_JOIN, @@ -197,11 +199,11 @@ public class plasmaSearchTimingProfile implements Cloneable { element = new Character(sequence[i]); t = (Long) targetTime.get(element); if (t != null) sum += t.longValue(); - if (type == sequence[i]) return (sum < 0) ? 0 : sum; + if (type == sequence[i]) return (sum < 0) ? minimumTargetTime : sum; t = (Long) yieldTime.get(element); if (t != null) sum -= t.longValue(); } - return 0; + return minimumTargetTime; } public int getTargetCount(char type) { diff --git a/yacy.init b/yacy.init index b2d1af16e..abe3e96d1 100644 --- a/yacy.init +++ b/yacy.init @@ -657,34 +657,34 @@ storagePeerHash = # time-percent is the percent of total search time # count-percent is the percent of total wanted urls in result # we distinguish local and remote search times -searchProcessLocalTime_c = 25 +searchProcessLocalTime_c = 10 searchProcessLocalCount_c = 10000000 searchProcessLocalTime_j = 10 searchProcessLocalCount_j = 1000000 searchProcessLocalTime_r = 10 searchProcessLocalCount_r =100000 -searchProcessLocalTime_u = 30 +searchProcessLocalTime_u = 50 searchProcessLocalCount_u = 10000 searchProcessLocalTime_o = 10 searchProcessLocalCount_o = 100 searchProcessLocalTime_f = 5 searchProcessLocalCount_f = 100 -searchProcessLocalTime_s = 10 +searchProcessLocalTime_s = 5 searchProcessLocalCount_s = 30 -searchProcessRemoteTime_c = 25 +searchProcessRemoteTime_c = 10 searchProcessRemoteCount_c = 1000000 searchProcessRemoteTime_j = 10 searchProcessRemoteCount_j = 1000000 searchProcessRemoteTime_r = 10 searchProcessRemoteCount_r = 1000 -searchProcessRemoteTime_u = 30 +searchProcessRemoteTime_u = 50 searchProcessRemoteCount_u = 1000 searchProcessRemoteTime_o = 10 searchProcessRemoteCount_o = 1000 searchProcessRemoteTime_f = 5 searchProcessRemoteCount_f = 100 -searchProcessRemoteTime_s = 10 +searchProcessRemoteTime_s = 5 searchProcessRemoteCount_s = 10 # path to ranking directory containing ranking reference files