Permalink
Browse files

solr build with lucid codecs (reverse-merged from commit 770b2ff)

  • Loading branch information...
1 parent 35927e4 commit 6b7e524d43dc12ef49b5176ee931dd40002d4143 @markrmiller markrmiller committed Mar 20, 2012
@@ -632,10 +632,6 @@ public Object call() throws Exception {
// openHandles.put(this, new RuntimeException("unclosed core - name:" + getName() + " refs: " + refCount.get()));
}
- static {
- Codec.setDefault(Codec.forName(com.lucid.upgrade.index.VersionUtil.CODEC_VERSION_CURRENT)); // sidecars
- }
-
private Codec initCodec(SolrConfig solrConfig, final IndexSchema schema) {
final PluginInfo info = solrConfig.getPluginInfo(CodecFactory.class.getName());
final CodecFactory factory;
@@ -648,7 +644,7 @@ private Codec initCodec(SolrConfig solrConfig, final IndexSchema schema) {
if (defaultCodecFactory != null) {
factory = (CodecFactory) schema.getResourceLoader().newInstance(defaultCodecFactory);
} else {
- factory = new com.lucid.index.codecs.LucidCodecFactory();
+ factory = new DefaultCodecFactory();
}
}
return factory.create(schema);
@@ -20,7 +20,4 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
- <mainIndex>
- <codecFactory class="org.apache.solr.core.DefaultCodecFactory"/>
- </mainIndex>
</config>
@@ -29,7 +29,7 @@
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig_codec.xml", "schema_codec.xml");
+ initCore("solrconfig-basic.xml", "schema_codec.xml");
}
public void testPostingsFormats() {
Binary file not shown.
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- All (relative) paths are relative to the installation path
-
- persistent: Save changes made via the API to this file
- sharedLib: path to a lib directory that will be shared across all cores
--->
-<solr persistent="true">
- <property name="version" value="1.3"/>
- <property name="lang" value="english, french"/>
-
- <!--
- adminPath: RequestHandler path to manage cores.
- If 'null' (or absent), cores will not be manageable via REST
- -->
- <cores adminPath="/admin/cores" defaultCoreName="core0" host="127.0.0.1" hostPort="${hostPort:8983}" hostContext="solr" zkClientTimeout="8000">
- <core name="collection1" instanceDir="." />
- <core name="core0" instanceDir="${theInstanceDir:./}" collection="${collection:acollection}">
- <property name="version" value="3.5"/>
- <property name="l10n" value="EN"/>
- <property name="ctlField" value="core0"/>
- <property name="comment" value="This is a sample with a sys prop ${sysprop:default}"/>
- </core>
- <core name="core1" instanceDir="./">
- <property name="version" value="2.4"/>
- <property name="l10n" value="FR"/>
- <property name="ctlField" value="core1"/>
- <property name="comment" value="Ceci est un exemple"/>
- </core>
- </cores>
-</solr>

0 comments on commit 6b7e524

Please sign in to comment.