From c124037f19a101cfee4d59a5cda6c102e43b91c6 Mon Sep 17 00:00:00 2001
From: orbiter <mc@yacy.net>
Date: Mon, 22 Jul 2013 17:28:20 +0200
Subject: [PATCH] removed forced non-soft commits to prevent index
 fragmentation

---
 source/net/yacy/search/Switchboard.java       |  1 -
 source/net/yacy/search/index/Segment.java     | 19 +------------------
 .../schema/CollectionConfiguration.java       |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index f33179b06..87f6b906b 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -2887,7 +2887,6 @@ public final class Switchboard extends serverSwitch {
             try {Thread.sleep(100);} catch (final InterruptedException e) {}
             ConcurrentLog.fine("Switchboard", "STACKURL: waiting for deletion, t=" + t);
             if (t == 20) this.index.fulltext().commit(true);
-            if (t == 50) this.index.fulltext().commit(false);
         }
         
         // special handling of ftp protocol
diff --git a/source/net/yacy/search/index/Segment.java b/source/net/yacy/search/index/Segment.java
index 387bc5ee8..19a2b2c8a 100644
--- a/source/net/yacy/search/index/Segment.java
+++ b/source/net/yacy/search/index/Segment.java
@@ -590,23 +590,6 @@ public class Segment {
             final boolean storeToRWI
             ) {
         final long startTime = System.currentTimeMillis();
-
-        // DO A SOFT/HARD COMMIT IF NEEDED
-        if (MemoryControl.shortStatus()) {
-            // do a 'hard' commit to flush index caches
-            this.fulltext.commit(false);
-        } else {
-            /*
-            if (
-                (this.fulltext.getDefaultConfiguration().contains(CollectionSchema.exact_signature_l) && this.fulltext.getDefaultConfiguration().contains(CollectionSchema.exact_signature_unique_b)) ||
-                (this.fulltext.getDefaultConfiguration().contains(CollectionSchema.fuzzy_signature_l) && this.fulltext.getDefaultConfiguration().contains(CollectionSchema.fuzzy_signature_unique_b)) ||
-                this.fulltext.getDefaultConfiguration().contains(CollectionSchema.title_unique_b) ||
-                this.fulltext.getDefaultConfiguration().contains(CollectionSchema.description_unique_b)
-               ) {
-                this.fulltext.getDefaultConnector().commit(true); // make sure that we have latest information for the postprocessing steps
-            }
-            */
-        }
         
         // CREATE INDEX
 
@@ -696,7 +679,7 @@ public class Segment {
                 } catch (final IOException e ) {
                     error = "failed to send " + urlNormalform + " to solr: " + e.getMessage();
                     ConcurrentLog.warn("SOLR", error);
-                    if (i == 10) this.fulltext.commit(false);
+                    if (i == 10) this.fulltext.commit(true);
                     try {Thread.sleep(1000);} catch (final InterruptedException e1) {}
                     continue tryloop;
                 }
diff --git a/source/net/yacy/search/schema/CollectionConfiguration.java b/source/net/yacy/search/schema/CollectionConfiguration.java
index 8dd5039c5..6549201a4 100644
--- a/source/net/yacy/search/schema/CollectionConfiguration.java
+++ b/source/net/yacy/search/schema/CollectionConfiguration.java
@@ -64,7 +64,6 @@ import net.yacy.cora.storage.HandleSet;
 import net.yacy.cora.util.CommonPattern;
 import net.yacy.cora.util.ConcurrentLog;
 import net.yacy.cora.util.SpaceExceededException;
-import net.yacy.crawler.data.CrawlProfile;
 import net.yacy.crawler.retrieval.Response;
 import net.yacy.document.Condenser;
 import net.yacy.document.Document;