[
https://issues.apache.org/jira/browse/SOLR-215?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12511454
]
Otis Gospodnetic commented on SOLR-215:
---------------------------------------
Henri:
I've finally started looking at this. The latest version of the patch doesn't
apply 100% cleanly (e.g.
src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java has been
replaced by src/java/org/apache/solr/handler/XppUpdateRequestHandler.java) and
thus 'ant compile' results in several compilation errors. You can probably see
the same locally, but just in case it make it easier for you, here is how
patching looks for me:
[EMAIL PROTECTED] trunk]$ patch -p0 < solr-215.patch
patching file src/test/org/apache/solr/update/AutoCommitTest.java
Hunk #1 FAILED at 55.
1 out of 2 hunks FAILED -- saving rejects to file
src/test/org/apache/solr/update/AutoCommitTest.java.rej
patching file src/test/org/apache/solr/analysis/TestBufferedTokenStream.java
patching file src/test/org/apache/solr/analysis/TestPatternReplaceFilter.java
patching file src/test/org/apache/solr/analysis/TestPhoneticFilter.java
patching file src/test/org/apache/solr/analysis/AnalysisTestCase.java
patching file src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
patching file
src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java
patching file src/test/org/apache/solr/analysis/TestKeepWordFilter.java
Hunk #1 FAILED at 27.
1 out of 3 hunks FAILED -- saving rejects to file
src/test/org/apache/solr/analysis/TestKeepWordFilter.java.rej
patching file src/test/org/apache/solr/analysis/BaseTokenTestCase.java
patching file src/test/org/apache/solr/servlet/SolrRequestParserTest.java
patching file src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
patching file src/test/org/apache/solr/core/TestConfig.java
patching file src/test/org/apache/solr/core/SolrCoreTest.java
patching file src/test/org/apache/solr/core/RequestHandlersTest.java
patching file src/test/org/apache/solr/core/TestBadConfig.java
patching file src/test/org/apache/solr/schema/BadIndexSchemaTest.java
patching file src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
patching file src/test/org/apache/solr/schema/RequiredFieldsTest.java
patching file src/test/org/apache/solr/schema/IndexSchemaTest.java
patching file src/test/org/apache/solr/BasicFunctionalityTest.java
patching file src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
patching file src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
Hunk #2 FAILED at 13.
1 out of 2 hunks FAILED -- saving rejects to file
src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java.rej
patching file src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
patching file src/java/org/apache/solr/schema/IndexSchema.java
Hunk #2 succeeded at 57 (offset 1 line).
Hunk #4 succeeded at 294 (offset 1 line).
Hunk #5 FAILED at 303.
Hunk #6 succeeded at 314 with fuzz 2.
Hunk #7 FAILED at 327.
Hunk #8 succeeded at 458 (offset 3 lines).
Hunk #10 succeeded at 593 (offset 3 lines).
Hunk #12 succeeded at 617 (offset 3 lines).
2 out of 13 hunks FAILED -- saving rejects to file
src/java/org/apache/solr/schema/IndexSchema.java.rej
patching file src/java/org/apache/solr/update/UpdateHandler.java
patching file src/java/org/apache/solr/update/DirectUpdateHandler2.java
Hunk #1 succeeded at 607 (offset 11 lines).
patching file src/java/org/apache/solr/update/SolrIndexConfig.java
patching file src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
patching file src/java/org/apache/solr/analysis/TokenizerFactory.java
patching file src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
patching file src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
patching file src/java/org/apache/solr/analysis/TrimFilterFactory.java
patching file src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
patching file src/java/org/apache/solr/analysis/TokenFilterFactory.java
patching file src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
Hunk #2 succeeded at 33 with fuzz 1.
patching file src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
patching file src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
patching file src/java/org/apache/solr/analysis/SynonymFilterFactory.java
Hunk #2 succeeded at 31 with fuzz 1.
patching file src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
patching file src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
patching file src/java/org/apache/solr/analysis/PhoneticFilter.java
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- saving rejects to file
src/java/org/apache/solr/analysis/PhoneticFilter.java.rej
patching file src/java/org/apache/solr/analysis/LengthFilterFactory.java
patching file src/java/org/apache/solr/analysis/StopFilterFactory.java
Hunk #2 succeeded at 32 with fuzz 1.
patching file src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
patching file src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
patching file src/java/org/apache/solr/search/SolrIndexSearcher.java
Hunk #10 FAILED at 261.
Hunk #11 succeeded at 329 (offset 1 line).
Hunk #13 succeeded at 589 (offset 1 line).
Hunk #14 succeeded at 979 (offset 1 line).
1 out of 14 hunks FAILED -- saving rejects to file
src/java/org/apache/solr/search/SolrIndexSearcher.java.rej
patching file src/java/org/apache/solr/search/CacheConfig.java
Hunk #1 succeeded at 37 with fuzz 2.
patching file src/java/org/apache/solr/search/DocSetHitCollector.java
patching file src/java/org/apache/solr/core/SolrInfoRegistry.java
patching file src/java/org/apache/solr/core/Config.java
Hunk #1 succeeded at 44 with fuzz 2.
patching file src/java/org/apache/solr/core/SolrConfig.java
Hunk #2 succeeded at 44 with fuzz 2.
patching file src/java/org/apache/solr/core/SolrCore.java
Hunk #2 FAILED at 75.
Hunk #3 succeeded at 144 (offset 2 lines).
Hunk #5 succeeded at 177 (offset 2 lines).
Hunk #6 succeeded at 185 with fuzz 2.
Hunk #7 succeeded at 349 (offset 6 lines).
Hunk #9 succeeded at 479 (offset 13 lines).
Hunk #11 succeeded at 629 (offset 13 lines).
Hunk #13 succeeded at 768 (offset 13 lines).
Hunk #15 succeeded at 876 (offset 13 lines).
Hunk #16 FAILED at 896.
Hunk #17 FAILED at 906.
3 out of 17 hunks FAILED -- saving rejects to file
src/java/org/apache/solr/core/SolrCore.java.rej
patching file src/java/org/apache/solr/core/RequestHandlers.java
Hunk #1 FAILED at 45.
Hunk #3 FAILED at 128.
Hunk #4 FAILED at 153.
Hunk #5 FAILED at 193.
Hunk #6 succeeded at 201 with fuzz 1 (offset -23 lines).
4 out of 7 hunks FAILED -- saving rejects to file
src/java/org/apache/solr/core/RequestHandlers.java.rej
patching file src/java/org/apache/solr/core/AbstractSolrEventListener.java
patching file src/java/org/apache/solr/core/QuerySenderListener.java
Hunk #1 succeeded at 31 with fuzz 1.
patching file src/java/org/apache/solr/core/RunExecutableListener.java
patching file src/java/org/apache/solr/request/XSLTResponseWriter.java
patching file src/java/org/apache/solr/request/StandardRequestHandler.java
patching file src/java/org/apache/solr/request/DisMaxRequestHandler.java
patching file src/java/org/apache/solr/tst/OldRequestHandler.java
patching file src/java/org/apache/solr/tst/TestRequestHandler.java
patching file src/java/org/apache/solr/handler/RequestHandlerBase.java
patching file src/java/org/apache/solr/handler/CSVRequestHandler.java
patching file src/java/org/apache/solr/handler/StandardRequestHandler.java
Hunk #1 succeeded at 61 (offset 1 line).
patching file
src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
patching file src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
Hunk #1 succeeded at 43 (offset 1 line).
Hunk #2 succeeded at 85 (offset -1 lines).
patching file src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
patching file src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
patching file src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
can't find file to patch at input line 2931
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
|===================================================================
|--- src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
(revision 548274)
|+++ src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
(working copy)
--------------------------
File to patch: src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java: No such file or
directory
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
Hunk #1 FAILED at 51.
Hunk #2 FAILED at 102.
2 out of 2 hunks FAILED -- saving rejects to file
src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java.rej
patching file src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java
patching file src/java/org/apache/solr/handler/DisMaxRequestHandler.java
Hunk #1 succeeded at 158 (offset 1 line).
patching file src/java/org/apache/solr/handler/DumpRequestHandler.java
patching file src/java/org/apache/solr/handler/MoreLikeThisHandler.java
Hunk #1 succeeded at 71 (offset 1 line).
patching file src/java/org/apache/solr/util/AbstractSolrTestCase.java
patching file src/java/org/apache/solr/util/TestHarness.java
Hunk #1 FAILED at 74.
1 out of 1 hunk FAILED -- saving rejects to file
src/java/org/apache/solr/util/TestHarness.java.rej
patching file src/java/org/apache/solr/util/xslt/TransformerProvider.java
patching file src/webapp/WEB-INF/web.xml
patching file src/webapp/src/org/apache/solr/servlet/SolrInit.java
patching file src/webapp/src/org/apache/solr/servlet/SolrServlet.java
patching file src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
patching file src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
patching file src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
patching file src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
patching file src/webapp/resources/admin/raw-schema.jsp
patching file src/webapp/resources/admin/_info.jsp
patching file src/webapp/resources/admin/get-file.jsp
patching file src/webapp/resources/admin/ping.jsp
patching file src/webapp/resources/admin/stats.jsp
patching file src/webapp/resources/admin/index.jsp
patching file example/solr/conf/core0.schema.xml
patching file example/solr/conf/core1.schema.xml
patching file example/solr/conf/core0.config.xml
patching file example/solr/conf/core1.config.xml
patching file
client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
patching file
client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java
patching file
client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
> Multiple Solr Cores
> -------------------
>
> Key: SOLR-215
> URL: https://issues.apache.org/jira/browse/SOLR-215
> Project: Solr
> Issue Type: Improvement
> Reporter: Henri Biestro
> Priority: Minor
> Attachments: solr-215.patch, solr-215.patch, solr-215.patch,
> solr-215.patch.zip, solr-215.patch.zip, solr-trunk-533775.patch,
> solr-trunk-538091.patch, solr-trunk-542847-1.patch, solr-trunk-542847.patch,
> solr-trunk-src.patch
>
>
> WHAT:
> As of 1.2, Solr only instantiates one SolrCore which handles one Lucene index.
> This patch is intended to allow multiple cores in Solr which also brings
> multiple indexes capability.
> WHY:
> The current Solr practical wisdom is that one schema - thus one index - is
> most likely to accomodate your indexing needs, using a filter to segregate
> documents if needed. If you really need multiple indexes, deploy multiple web
> applications.
> There are a some use cases however where having multiple indexes or multiple
> cores through Solr itself may make sense.
> Multiple cores:
> Deployment issues within some organizations where IT will resist deploying
> multiple web applications.
> Seamless schema update where you can create a new core and switch to it
> without starting/stopping servers.
> Embedding Solr in your own application (instead of 'raw' Lucene) and
> functionally need to segregate schemas & collections.
> Multiple indexes:
> Multiple language collections where each document exists in different
> languages, analysis being language dependant.
> Having document types that have nothing (or very little) in common with
> respect to their schema, their lifetime/update frequencies or even collection
> sizes.
> HOW:
> The best analogy is to consider that instead of deploying multiple
> web-application, you can have one web-application that hosts more than one
> Solr core. The patch does not change any of the core logic (nor the core
> code); each core is configured & behaves exactly as the one core in 1.2; the
> various caches are per-core & so is the info-bean-registry.
> What the patch does is replace the SolrCore singleton by a collection of
> cores; all the code modifications are driven by the removal of the different
> singletons (the config, the schema & the core).
> Each core is 'named' and a static map (keyed by name) allows to easily manage
> them.
> You declare one servlet filter mapping per core you want to expose in the
> web.xml; this allows easy to access each core through a different url.
> USAGE (example web deployment, patch installed):
> Step0
> java -Durl='http://localhost:8983/solr/core0/update' -jar post.jar solr.xml
> monitor.ml
> Will index the 2 documents in solr.xml & monitor.xml
> Step1:
> http://localhost:8983/solr/core0/admin/stats.jsp
> Will produce the statistics page from the admin servlet on core0 index; 2
> documents
> Step2:
> http://localhost:8983/solr/core1/admin/stats.jsp
> Will produce the statistics page from the admin servlet on core1 index; no
> documents
> Step3:
> java -Durl='http://localhost:8983/solr/core0/update' -jar post.jar ipod*.xml
> java -Durl='http://localhost:8983/solr/core1/update' -jar post.jar mon*.xml
> Adds the ipod*.xml to index of core0 and the mon*.xml to the index of core1;
> running queries from the admin interface, you can verify indexes have
> different content.
> USAGE (Java code):
> //create a configuration
> SolrConfig config = new SolrConfig("solrconfig.xml");
> //create a schema
> IndexSchema schema = new IndexSchema(config, "schema0.xml");
> //create a core from the 2 other.
> SolrCore core = new SolrCore("core0", "/path/to/index", config, schema);
> //Accessing a core:
> SolrCore core = SolrCore.getCore("core0");
> PATCH MODIFICATIONS DETAILS (per package):
> org.apache.solr.core:
> The heaviest modifications are in SolrCore & SolrConfig.
> SolrCore is the most obvious modification; instead of a singleton, there is a
> static map of cores keyed by names and assorted methods. To retain some
> compatibility, the 'null' named core replaces the singleton for the relevant
> methods, for instance SolrCore.getCore(). One small constraint on the core
> name is they can't contain '/' or '\' avoiding potential url & file path
> problems.
> SolrConfig (& SolrIndexConfig) are now used to persist all configuration
> options that need to be quickly accessible to the various components. Most of
> these variables were static like those found in SolrIndexSearcher. Mimicking
> the intent of these static variables, SolrConfig & SolrIndexConfig use public
> final members to expose them.
> SolrConfig inherits from Config which has been modified; Config is now more
> strictly a dom document (filled from some resource) and methods to evaluate
> xpath expressions. Config also continues to be the classloader singleton that
> allows to easily instantiate classes located in the Solr installation
> directory.
> org.apache.solr.analysis:
> TokenizerFactory & FilterFactory now get the SolrConfig passed as a parameter
> to init; one might want to read some resources to initialize the factory and
> the config dir is in the config. This is partially redundant with the
> argument map though.
> org.apache.solr.handler:
> RequestHandlerBase takes the core as a constructor parameter.
> org.apache.solr.util:
> The test harness has been modified to expose the core it instantiates.
> org.apache.solr.servlet:
> SolrDispatchFilter is now instantiating a core configured at init time; the
> web.xml must contain one filter declaration and one filter mapping per core
> you want to expose. Wherever some admin or servlet or page was referring to
> the SolrCore singleton or SolrConfig, they now check for the request
> attribute 'org.apache.solr.SolrCore' first; the filters set this attribute
> before forwarding to the other parts.
> Admin/servlet:
> Has been modified to use the core exposed through the request attribute
> 'org.apache.solr.SolrCore'.
> REPLICATION:
> The feature has not been implemented yet; the starting point is that instead
> of having just one index directory 'index/', the naming scheme for the index
> data directories is 'index*/'. Have to investigate.
> FUTURE:
> Uploading new schema/conf would be nice, allowing Solr to create cores
> dynamically; the upload mechanism itself is easy, the servlet dispatch filter
> needs to be modified.
> Having replication embedded in the Solr application itself using an http
> based version of the rsync algorithm; some of the core code of jarsync might
> be handy.
> MISC:
> The patch production process (not as easy as I thought it was with a
> Windows/Netbeans/cygwin/TortoiseSVN).
> 0/ Initial point is to have the modified code running in a local patch
> branch, all tests ok.
> 1/ Have one 'clean version' of the trunk aside the local patch branch; you'll
> need to verify that your patch can be applied to the last clean trunk version
> and that various tests still work from there. Creating the patch is key.
> 2/ If you used some IDE and forgot to set the auto-indentation corrrectly,
> you most likely need working around the space/indentation patch clutter that
> results. I could not find a way to get TortoiseSVN create a patch with the
> proper options (ignore spaces & al) and could not find a way to get
> NetbeansSVN generate one either. Thus I create the patch from the local trunk
> root through cygwin (with svn+patchutils); svn diff --diff-cmd /usr/bin/diff
> -x "-w -B -b -E -d -N -u" > ~/solr-215.patch.
> Before generating the patch, it is important to issue an 'svn add ...' for
> each file you might have added; a quick "svn status | grep '?'" allows to
> verify nothing will be missing. Not elegant, but you can even follow with:
> svn status | grep '?' | awk '{print $2}' | xargs svn add
> 3/ Apply the patch to the 'clean trunk'.
> TortoiseSVN 'apply patch' command only understands 'unified diff' thus the
> '-u' option.
> Alternatively, you can apply the patch through cygwin: patch -p0 -u <
> solr-215.patch.
> For Solaris 10 users, patch must be "gnu" patch: /usr/local/bin/patch is its
> usual location (not to be confused with /bin/patch...)
> For x86, you can find it at
> ftp://ftp.sunfreeware.com/pub/freeware/intel/10/patch-2.5.4-sol10-x86-local.gz
> ; I don't know about diff but I'm using the version located at
> ftp://ftp.sunfreeware.com/pub/freeware/intel/10/diffutils-2.8.1-sol10-intel-local.gz
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
