Changeset 6092 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

Timestamp:

03/10/15 14:16:28 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-27: more results, bug fixes

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (3 diffs)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -107 +107 @@
         private static final org.slf4j.Logger log = LoggerFactory.getLogger(Aggregator.class);
 
-        public static final String DE_TOK_MODEL = "tokenizer/de-tuebadz-8.0-token.bin";
+        final int SEARCHES_SIZE_GC_THRESHOLD = 1000;
+        final int SEARCHES_AGE_GC_THRESHOLD = 60;
 
         private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
@@ -261 +262 @@
         // this function should be thread-safe
         public Search startSearch(SRUVersion version, List<Corpus> corpora,
-                        String searchString, String searchLang, int maxRecords) throws Exception {
+                        String searchString, String searchLang,
+                        int firstRecord, int maxRecords) throws Exception {
                 if (corpora.isEmpty()) {
                         // No corpora
@@ -270 +272 @@
                 } else {
                         Search sr = new Search(sruSearchClient, version, searchStatsAtom.get(),
-                                        corpora, searchString, searchLang, 1, maxRecords);
-                        if ((activeSearches.size() % 100) == 0) {
+                                        corpora, searchString, searchLang, maxRecords);
+                        if (activeSearches.size() > SEARCHES_SIZE_GC_THRESHOLD) {
                                 List<Long> toBeRemoved = new ArrayList<Long>();
                                 long t0 = System.currentTimeMillis();
                                 for (Map.Entry<Long, Search> e : activeSearches.entrySet()) {
-                                        if (t0 - e.getValue().getCreatedAt() > 1800 * 1000) {
+                                        long dtmin = (t0 - e.getValue().getCreatedAt()) / 1000 / 60;
+                                        if (dtmin > SEARCHES_AGE_GC_THRESHOLD) {
+                                                log.info("removing search " + e.getKey() + ": " + dtmin + " minutes old");
                                                 toBeRemoved.add(e.getKey());
                                         }