diff --git a/build.properties b/build.properties index 82d145759..de4bd3002 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.6 javacTarget=1.6 # Release Configuration -releaseVersion=1.04 +releaseVersion=1.041 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz releaseFileParentDir=yacy diff --git a/defaults/yacy.init b/defaults/yacy.init index f163a17e3..bd707f1db 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -1048,14 +1048,14 @@ federated.service.solr.indexing.schemefile = solr.keys.default.list # the lazy attribute causes that fields containing "" or 0 are not added and not written federated.service.solr.indexing.lazy = true -# temporary definition of backend services to use. The standard is urldb+rwi, but in the future it should be rwi+solr -# to get a handle for a migration, these values are defined as temporary, if the migration starts the values are renamed +# temporary definition of backend services to use. +# After the migration a rwi+solr combination is used, the solr contains the content of the previously used metadata-db. +# To get a handle for a migration, these values are defined as temporary, if the migration starts the values are renamed # and defined with different default values. # The citation service is used for ranking; this is a reverse linking index. It should be on before and after the migration. # It can be switched off if only a remote solr index is used. -core.service.urldb.tmp = true +core.service.fulltext = true core.service.rwi.tmp = true -core.service.solr.tmp = false core.service.citation.tmp = true # RDF triplestore settings diff --git a/htroot/IndexFederated_p.html b/htroot/IndexFederated_p.html index 204030859..c0e3741b6 100644 --- a/htroot/IndexFederated_p.html +++ b/htroot/IndexFederated_p.html @@ -26,9 +26,8 @@ This is an experimental switchboard to test an index migration from embedded metadata to embedded solr. The 'classic' configuration is rwi + metadata switched on. The future configuration is rwi + solr switched on. The rwi index is necessary for index transmission and shall be switched off in future portalmode configurations.
+
url metadata and embedded solr fulltext search index, interface at: /solr/select?q=*:*&start=0&rows=10
embedded 'classic' rwi index
-
embedded 'classic' metadata index
-
embedded solr search index, interface at: /solr/select?q=*:*&start=0&rows=10
embedded citation reference index (link structure, used for ranking)
diff --git a/htroot/IndexFederated_p.java b/htroot/IndexFederated_p.java index 8760d257f..8f5a434ab 100644 --- a/htroot/IndexFederated_p.java +++ b/htroot/IndexFederated_p.java @@ -72,18 +72,21 @@ public class IndexFederated_p { sb.index.connectCitation(wordCacheMaxCount, fileSizeMax); } catch (IOException e) { Log.logException(e); } // switch on + boolean post_core_fulltext = post.getBoolean(SwitchboardConstants.CORE_SERVICE_FULLTEXT); + final boolean previous_core_fulltext = sb.index.connectedLocalSolr() && env.getConfigBool(SwitchboardConstants.CORE_SERVICE_FULLTEXT, false); + env.setConfig(SwitchboardConstants.CORE_SERVICE_FULLTEXT, post_core_fulltext); + final int commitWithinMs = post.getInt("solr.indexing.commitWithinMs", env.getConfigInt(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_COMMITWITHINMS, 180000)); - boolean post_core_solr = post.getBoolean(SwitchboardConstants.CORE_SERVICE_SOLR); - final boolean previous_core_solr = sb.index.connectedLocalSolr() && env.getConfigBool(SwitchboardConstants.CORE_SERVICE_SOLR, false); - env.setConfig(SwitchboardConstants.CORE_SERVICE_SOLR, post_core_solr); - if (previous_core_solr && !post_core_solr) sb.index.disconnectLocalSolr(); // switch off - if (!previous_core_solr && post_core_solr) try { sb.index.connectLocalSolr(commitWithinMs); } catch (IOException e) { Log.logException(e); } // switch on - - boolean post_core_urldb = post.getBoolean(SwitchboardConstants.CORE_SERVICE_URLDB); - final boolean previous_core_urldb = sb.index.connectedUrlDb() && env.getConfigBool(SwitchboardConstants.CORE_SERVICE_URLDB, false); - env.setConfig(SwitchboardConstants.CORE_SERVICE_URLDB, post_core_urldb); - if (previous_core_urldb && !post_core_urldb) sb.index.disconnectUrlDb(); // switch off - if (!previous_core_urldb && post_core_urldb) sb.index.connectUrlDb(sb.useTailCache, sb.exceed134217727); + if (previous_core_fulltext && !post_core_fulltext) { + // switch off + sb.index.disconnectLocalSolr(); + sb.index.disconnectUrlDb(); + } + if (!previous_core_fulltext && post_core_fulltext) { + // switch on + sb.index.connectUrlDb(sb.useTailCache, sb.exceed134217727); + try { sb.index.connectLocalSolr(commitWithinMs); } catch (IOException e) { Log.logException(e); } + } // solr final boolean solrRemoteWasOn = sb.index.connectedRemoteSolr() && env.getConfigBool(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_ENABLED, true); @@ -203,9 +206,8 @@ public class IndexFederated_p { // allowed values are: classic, solr, off // federated.service.yacy.indexing.engine = classic - prop.put(SwitchboardConstants.CORE_SERVICE_URLDB + ".checked", env.getConfigBool(SwitchboardConstants.CORE_SERVICE_URLDB, false) ? 1 : 0); + prop.put(SwitchboardConstants.CORE_SERVICE_FULLTEXT + ".checked", env.getConfigBool(SwitchboardConstants.CORE_SERVICE_FULLTEXT, false) ? 1 : 0); prop.put(SwitchboardConstants.CORE_SERVICE_RWI + ".checked", env.getConfigBool(SwitchboardConstants.CORE_SERVICE_RWI, false) ? 1 : 0); - prop.put(SwitchboardConstants.CORE_SERVICE_SOLR + ".checked", env.getConfigBool(SwitchboardConstants.CORE_SERVICE_SOLR, false) ? 1 : 0); prop.put(SwitchboardConstants.CORE_SERVICE_CITATION + ".checked", env.getConfigBool(SwitchboardConstants.CORE_SERVICE_CITATION, false) ? 1 : 0); prop.put("solr.indexing.solrremote.checked", env.getConfigBool(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_ENABLED, false) ? 1 : 0); prop.put("solr.indexing.url", env.getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_URL, "http://127.0.0.1:8983/solr").replace(",", "\n")); diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java index 23bdad557..615926453 100644 --- a/source/net/yacy/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -395,9 +395,10 @@ public final class Switchboard extends serverSwitch final int connectWithinMs = this.getConfigInt(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_COMMITWITHINMS, 180000); if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_RWI, true)) this.index.connectRWI(wordCacheMaxCount, fileSizeMax); if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_CITATION, true)) this.index.connectCitation(wordCacheMaxCount, fileSizeMax); - if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_URLDB, true)) this.index.connectUrlDb(this.useTailCache, this.exceed134217727); - if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_SOLR, true)) this.index.connectLocalSolr(connectWithinMs); - + if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_FULLTEXT, true)) { + this.index.connectUrlDb(this.useTailCache, this.exceed134217727); + this.index.connectLocalSolr(connectWithinMs); + } // set up the solr interface final String solrurls = getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_URL, "http://127.0.0.1:8983/solr"); @@ -1184,8 +1185,10 @@ public final class Switchboard extends serverSwitch final int connectWithinMs = this.getConfigInt(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_COMMITWITHINMS, 180000); if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_RWI, true)) this.index.connectRWI(wordCacheMaxCount, fileSizeMax); if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_CITATION, true)) this.index.connectCitation(wordCacheMaxCount, fileSizeMax); - if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_SOLR, true)) this.index.connectLocalSolr(connectWithinMs); - if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_URLDB, true)) this.index.connectUrlDb(this.useTailCache, this.exceed134217727); + if (this.getConfigBool(SwitchboardConstants.CORE_SERVICE_FULLTEXT, true)) { + this.index.connectLocalSolr(connectWithinMs); + this.index.connectUrlDb(this.useTailCache, this.exceed134217727); + } // set up the solr interface final String solrurls = getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_URL, "http://127.0.0.1:8983/solr"); diff --git a/source/net/yacy/search/SwitchboardConstants.java b/source/net/yacy/search/SwitchboardConstants.java index e6dbc2e90..164f765ee 100644 --- a/source/net/yacy/search/SwitchboardConstants.java +++ b/source/net/yacy/search/SwitchboardConstants.java @@ -297,9 +297,10 @@ public final class SwitchboardConstants { public static final String FEDERATED_SERVICE_SOLR_INDEXING_SCHEMEFILE = "federated.service.solr.indexing.schemefile"; public static final String FEDERATED_SERVICE_SOLR_INDEXING_LAZY = "federated.service.solr.indexing.lazy"; - public static final String CORE_SERVICE_URLDB = "core.service.urldb.tmp"; + //public static final String CORE_SERVICE_URLDB = "core.service.urldb.tmp"; + //public static final String CORE_SERVICE_SOLR = "core.service.solr.tmp"; + public static final String CORE_SERVICE_FULLTEXT = "core.service.fulltext"; public static final String CORE_SERVICE_RWI = "core.service.rwi.tmp"; - public static final String CORE_SERVICE_SOLR = "core.service.solr.tmp"; public static final String CORE_SERVICE_CITATION = "core.service.citation.tmp"; /**