You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cm...@apache.org on 2013/08/11 14:19:39 UTC
svn commit: r1512909 [34/38] - in /lucene/dev/branches/lucene4956: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/suggest/ dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/core/src/test/ dev-too...
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java Sun Aug 11 12:19:13 2013
@@ -40,6 +40,7 @@ public class PrimitiveFieldTypeTest exte
public void setUp() throws Exception {
super.setUp();
// set some system properties for use by tests
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
@@ -58,11 +59,9 @@ public class PrimitiveFieldTypeTest exte
TrieIntField ti;
SortableIntField si;
LongField l;
- ShortField sf;
FloatField f;
DoubleField d;
BoolField b;
- ByteField bf;
// ***********************
@@ -94,10 +93,6 @@ public class PrimitiveFieldTypeTest exte
l.init(schema, initMap);
assertFalse(l.hasProperty(FieldType.OMIT_NORMS));
- sf = new ShortField();
- sf.init(schema, initMap);
- assertFalse(sf.hasProperty(FieldType.OMIT_NORMS));
-
f = new FloatField();
f.init(schema, initMap);
assertFalse(f.hasProperty(FieldType.OMIT_NORMS));
@@ -114,10 +109,6 @@ public class PrimitiveFieldTypeTest exte
b.init(schema, initMap);
assertFalse(b.hasProperty(FieldType.OMIT_NORMS));
- bf = new ByteField();
- bf.init(schema, initMap);
- assertFalse(bf.hasProperty(FieldType.OMIT_NORMS));
-
// Non-primitive fields
t = new TextField();
t.init(schema, initMap);
@@ -156,10 +147,6 @@ public class PrimitiveFieldTypeTest exte
l.init(schema, initMap);
assertTrue(l.hasProperty(FieldType.OMIT_NORMS));
- sf = new ShortField();
- sf.init(schema, initMap);
- assertTrue(sf.hasProperty(FieldType.OMIT_NORMS));
-
f = new FloatField();
f.init(schema, initMap);
assertTrue(f.hasProperty(FieldType.OMIT_NORMS));
@@ -176,10 +163,6 @@ public class PrimitiveFieldTypeTest exte
b.init(schema, initMap);
assertTrue(b.hasProperty(FieldType.OMIT_NORMS));
- bf = new ByteField();
- bf.init(schema, initMap);
- assertTrue(bf.hasProperty(FieldType.OMIT_NORMS));
-
// Non-primitive fields
t = new TextField();
t.init(schema, initMap);
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Sun Aug 11 12:19:13 2013
@@ -22,71 +22,47 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
+import org.apache.commons.io.FileUtils;
+
+import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.beans.Field;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.*;
import org.apache.solr.core.SolrResourceLoader;
-import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-
-public class TestBinaryField extends LuceneTestCase {
- HttpSolrServer server;
- JettySolrRunner jetty;
-
- int port = 0;
- static final String context = "/example";
-
- @Rule
- public TestRule solrTestRules =
- RuleChain.outerRule(new SystemPropertiesRestoreRule());
+import org.apache.solr.SolrJettyTestBase;
+import org.junit.BeforeClass;
- @Override
- public void setUp() throws Exception {
- super.setUp();
+public class TestBinaryField extends SolrJettyTestBase {
- File home = new File(TEMP_DIR,
- "solrtest-TestBinaryField-" + System.currentTimeMillis());
-
- File homeDir = new File(home, "example");
- File dataDir = new File(homeDir + "/collection1", "data");
- File confDir = new File(homeDir + "/collection1", "conf");
+ @BeforeClass
+ public static void beforeTest() throws Exception {
+ File homeDir = new File(TEMP_DIR,
+ "solrtest-TestBinaryField-" + System.currentTimeMillis());
+ File collDir = new File(homeDir, "collection1");
+ File dataDir = new File(collDir, "data");
+ File confDir = new File(collDir, "conf");
homeDir.mkdirs();
+ collDir.mkdirs();
dataDir.mkdirs();
confDir.mkdirs();
- SolrResourceLoader loader = new SolrResourceLoader("solr/collection1");
- File f = new File(confDir, "solrconfig.xml");
- String fname = "solr/collection1/conf/solrconfig-slave1.xml";
- FileOutputStream out = new FileOutputStream(f);
- IOUtils.copy(loader.openResource(fname), out);
- out.close();
- f = new File(confDir, "schema.xml");
- fname = "solr/collection1/conf/schema-binaryfield.xml";
- out = new FileOutputStream(f);
- IOUtils.copy(loader.openResource(fname), out);
- out.close();
- System.setProperty("solr.data.dir", dataDir.getAbsolutePath());
- System.setProperty("solr.test.sys.prop1", "propone");
- System.setProperty("solr.test.sys.prop2", "proptwo");
- System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
-
- jetty = new JettySolrRunner(homeDir.getAbsolutePath(), context, 0);
- jetty.start();
- port = jetty.getLocalPort();
+ String src_dir = TEST_HOME() + "/collection1/conf";
+ FileUtils.copyFile(new File(src_dir, "schema-binaryfield.xml"),
+ new File(confDir, "schema.xml"));
+ FileUtils.copyFile(new File(src_dir, "solrconfig-basic.xml"),
+ new File(confDir, "solrconfig.xml"));
+ FileUtils.copyFile(new File(src_dir, "solrconfig.snippet.randomindexconfig.xml"),
+ new File(confDir, "solrconfig.snippet.randomindexconfig.xml"));
- String url = "http://127.0.0.1:" + jetty.getLocalPort() + context;
- server = new HttpSolrServer(url);
+ createJetty(homeDir.getAbsolutePath(), null, null);
}
+
public void testSimple() throws Exception {
+ SolrServer server = getSolrServer();
byte[] buf = new byte[10];
for (int i = 0; i < 10; i++) {
buf[i] = (byte) i;
@@ -179,11 +155,4 @@ public class TestBinaryField extends Luc
byte [] data;
}
-
- @Override
- public void tearDown() throws Exception {
- jetty.stop();
- System.clearProperty("tests.shardhandler.randomSeed");
- super.tearDown();
- }
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestCollationField.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestCollationField.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestCollationField.java Sun Aug 11 12:19:13 2013
@@ -74,6 +74,7 @@ public class TestCollationField extends
// copy over configuration files
FileUtils.copyFile(getFile("solr/collection1/conf/solrconfig-basic.xml"), new File(confDir, "solrconfig.xml"));
+ FileUtils.copyFile(getFile("solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml"), new File(confDir, "solrconfig.snippet.randomindexconfig.xml"));
FileUtils.copyFile(getFile("solr/collection1/conf/schema-collate.xml"), new File(confDir, "schema.xml"));
// generate custom collation rules (DIN 5007-2), saving to customrules.dat
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Sun Aug 11 12:19:13 2013
@@ -16,13 +16,6 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.SolrException;
@@ -36,6 +29,13 @@ import org.apache.solr.response.SolrQuer
import org.junit.After;
import org.junit.Before;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
public class TestManagedSchema extends AbstractBadConfigTestBase {
private static File tmpSolrHome;
@@ -55,7 +55,9 @@ public class TestManagedSchema extends A
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-mutable-managed-schema.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-basic.xml"), tmpConfDir);
+ FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig.snippet.randomindexconfig.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "schema-one-field-no-dynamic-field.xml"), tmpConfDir);
+ FileUtils.copyFileToDirectory(new File(testHomeConfDir, "schema-one-field-no-dynamic-field-unique-key.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "schema-minimal.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "schema_codec.xml"), tmpConfDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "schema-bm25.xml"), tmpConfDir);
@@ -120,7 +122,6 @@ public class TestManagedSchema extends A
private void assertSchemaResource(String collection, String expectedSchemaResource) throws Exception {
final CoreContainer cores = h.getCoreContainer();
- cores.setPersistent(false);
final CoreAdminHandler admin = new CoreAdminHandler(cores);
SolrQueryRequest request = req(CoreAdminParams.ACTION, CoreAdminParams.CoreAdminAction.STATUS.toString());
SolrQueryResponse response = new SolrQueryResponse();
@@ -385,4 +386,39 @@ public class TestManagedSchema extends A
assertQ(req(fieldName + ":thing"), "//*[@numFound='1']");
}
+ public void testPersistUniqueKey() throws Exception {
+ assertSchemaResource(collection, "managed-schema");
+ deleteCore();
+ File managedSchemaFile = new File(tmpConfDir, "managed-schema");
+ assertTrue(managedSchemaFile.delete()); // Delete managed-schema so it won't block parsing a new schema
+ initCore("solrconfig-mutable-managed-schema.xml", "schema-one-field-no-dynamic-field-unique-key.xml", tmpSolrHome.getPath());
+
+ assertTrue(managedSchemaFile.exists());
+ String managedSchemaContents = FileUtils.readFileToString(managedSchemaFile, "UTF-8");
+ assertFalse(managedSchemaContents.contains("\"new_field\""));
+
+ Map<String,Object> options = new HashMap<String,Object>();
+ options.put("stored", "false");
+ IndexSchema oldSchema = h.getCore().getLatestSchema();
+ assertEquals("str", oldSchema.getUniqueKeyField().getName());
+ String fieldName = "new_field";
+ String fieldType = "string";
+ SchemaField newField = oldSchema.newField(fieldName, fieldType, options);
+ IndexSchema newSchema = oldSchema.addField(newField);
+ assertEquals("str", newSchema.getUniqueKeyField().getName());
+ h.getCore().setLatestSchema(newSchema);
+ log.info("####close harness");
+ h.close();
+ log.info("####close harness end");
+ initCore();
+
+ assertTrue(managedSchemaFile.exists());
+ FileInputStream stream = new FileInputStream(managedSchemaFile);
+ managedSchemaContents = IOUtils.toString(stream, "UTF-8");
+ stream.close(); // Explicitly close so that Windows can delete this file
+ assertTrue(managedSchemaContents.contains("<field name=\"new_field\" type=\"string\" stored=\"false\"/>"));
+ IndexSchema newNewSchema = h.getCore().getLatestSchema();
+ assertNotNull(newNewSchema.getUniqueKeyField());
+ assertEquals("str", newNewSchema.getUniqueKeyField().getName());
+ }
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java Sun Aug 11 12:19:13 2013
@@ -47,6 +47,7 @@ public class ReturnFieldsTest extends So
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
String v = "how now brown cow";
assertU(adoc("id","1", "text",v, "text_np", v, "#foo_s", v));
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Sun Aug 11 12:19:13 2013
@@ -41,6 +41,7 @@ public class TestExtendedDismaxParser ex
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
index();
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFiltering.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFiltering.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFiltering.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFiltering.java Sun Aug 11 12:19:13 2013
@@ -31,6 +31,7 @@ public class TestFiltering extends SolrT
@BeforeClass
public static void beforeTests() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml","schema12.xml");
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java Sun Aug 11 12:19:13 2013
@@ -46,8 +46,6 @@ public class TestFoldingMultitermQuery e
"float_f", num,
"long_f", num,
"double_f", num,
- "byte_f", num,
- "short_f", num,
"bool_f", boolVal,
"date_f", "200" + Integer.toString(i % 10) + "-01-01T00:00:00Z",
"content", docs[i],
@@ -269,7 +267,7 @@ public class TestFoldingMultitermQuery e
@Test
public void testNonTextTypes() {
- String[] intTypes = {"int_f", "float_f", "long_f", "double_f", "byte_f", "short_f"};
+ String[] intTypes = {"int_f", "float_f", "long_f", "double_f"};
for (String str : intTypes) {
assertQ(req("q", str + ":" + "0"),
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Sun Aug 11 12:19:13 2013
@@ -16,6 +16,7 @@
*/
package org.apache.solr.search;
+import org.apache.lucene.index.LogDocMergePolicy;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.ReaderUtil;
@@ -34,6 +35,11 @@ public class TestIndexSearcher extends S
@BeforeClass
public static void beforeClass() throws Exception {
+
+ // we need a consistent segmentation because reopen test validation
+ // dependso n merges not happening when it doesn't expect
+ System.setProperty("solr.tests.mergePolicy", LogDocMergePolicy.class.getName());
+
initCore("solrconfig.xml","schema.xml");
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java Sun Aug 11 12:19:13 2013
@@ -26,6 +26,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
Query q;
@@ -41,6 +42,9 @@ public class TestMaxScoreQueryParser ext
q = parse("foo");
assertTrue(q instanceof TermQuery);
+ q = parse("foo^3.0");
+ assertTrue(q instanceof TermQuery);
+
q = parse("price:[0 TO 10]");
assertTrue(q instanceof NumericRangeQuery);
}
@@ -92,6 +96,38 @@ public class TestMaxScoreQueryParser ext
assertEquals(0.5, ((DisjunctionMaxQuery) clauses[0].getQuery()).getTieBreakerMultiplier(), 1e-15);
}
+ @Test
+ public void testBoost() {
+ // Simple term query
+ q = parse("foo^3.0");
+ assertEquals(3.0, q.getBoost(), 1e-15);
+
+ // Some DMQ and one plain required
+ q = parse("foo^5.0 bar^6.0 +baz^7");
+ clauses = clauses(q);
+ assertEquals(2, clauses.length);
+ assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
+ DisjunctionMaxQuery dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
+ float fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().get(0).getQuery().getBoost();
+ assertEquals(5.0, fooClause, 1e-15);
+ float barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().get(0).getQuery().getBoost();
+ assertEquals(6.0, barClause, 1e-15);
+ assertEquals(7.0, clauses[1].getQuery().getBoost(), 1e-15);
+ assertEquals(1.0, q.getBoost(), 1e-15);
+
+ // Grouped with parens on top level
+ q = parse("(foo^2.0 bar)^3.0");
+ clauses = clauses(q);
+ assertEquals(1, clauses.length);
+ assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
+ dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
+ fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().get(0).getQuery().getBoost();
+ assertEquals(2.0, fooClause, 1e-15);
+ barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().get(0).getQuery().getBoost();
+ assertEquals(1.0, barClause, 1e-15);
+ assertEquals(3.0, q.getBoost(), 1e-15);
+ }
+
//
// Helper methods
//
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java Sun Aug 11 12:19:13 2013
@@ -49,6 +49,7 @@ public class TestPseudoReturnFields exte
@BeforeClass
public static void beforeTests() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml","schema12.xml");
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Sun Aug 11 12:19:13 2013
@@ -132,7 +132,7 @@ public class TestRTGBase extends SolrTes
if (terms == null) return -1;
BytesRef termBytes = t.bytes();
final TermsEnum termsEnum = terms.iterator(null);
- if (!termsEnum.seekExact(termBytes, false)) {
+ if (!termsEnum.seekExact(termBytes)) {
return -1;
}
DocsEnum docs = termsEnum.docs(MultiFields.getLiveDocs(r), null, DocsEnum.FLAG_NONE);
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestRecovery.java Sun Aug 11 12:19:13 2013
@@ -17,6 +17,9 @@
package org.apache.solr.search;
+import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
+
+import org.apache.solr.common.SolrException;
import org.noggit.ObjectBuilder;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.request.SolrQueryRequest;
@@ -41,8 +44,16 @@ import java.util.concurrent.Future;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
-import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.update.DirectUpdateHandler2;
+import org.apache.solr.update.UpdateHandler;
+import org.apache.solr.update.UpdateLog;
+import org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.noggit.ObjectBuilder;
public class TestRecovery extends SolrTestCaseJ4 {
@@ -487,7 +498,40 @@ public class TestRecovery extends SolrTe
}
+
+ // we need to make sure that the log is informed of a core reload
@Test
+ public void testReload() throws Exception {
+ long version = addAndGetVersion(sdoc("id","reload1") , null);
+
+ h.reload();
+
+ version = addAndGetVersion(sdoc("id","reload1", "_version_", Long.toString(version)), null);
+
+ assertU(commit());
+
+ // if we try the optimistic concurrency again, the tlog lookup maps should be clear
+ // and we should go to the index to check the version. This indirectly tests that
+ // the update log was informed of the reload. See SOLR-4858
+
+ version = addAndGetVersion(sdoc("id","reload1", "_version_", Long.toString(version)), null);
+
+ // a deleteByQuery currently forces open a new realtime reader via the update log.
+ // This also tests that the update log was informed of the new udpate handler.
+
+ deleteByQueryAndGetVersion("foo_t:hownowbrowncow", null);
+
+ version = addAndGetVersion(sdoc("id","reload1", "_version_", Long.toString(version)), null);
+
+ // if the update log was not informed of the new update handler, then the old core will
+ // incorrectly be used for some of the operations above and opened searchers
+ // will never be closed. This used to cause the test framework to fail because of unclosed directory checks.
+ // SolrCore.openNewSearcher was modified to throw an error if the core is closed, resulting in
+ // a faster fail.
+ }
+
+
+ @Test
public void testBufferingFlags() throws Exception {
DirectUpdateHandler2.commitOnClose = false;
@@ -710,16 +754,17 @@ public class TestRecovery extends SolrTe
clearIndex();
assertU(commit());
- File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
+ UpdateLog ulog = h.getCore().getUpdateHandler().getUpdateLog();
+ File logDir = new File(h.getCore().getUpdateHandler().getUpdateLog().getLogDir());
h.close();
- String[] files = UpdateLog.getLogList(logDir);
+ String[] files = ulog.getLogList(logDir);
for (String file : files) {
new File(logDir, file).delete();
}
- assertEquals(0, UpdateLog.getLogList(logDir).length);
+ assertEquals(0, ulog.getLogList(logDir).length);
createCore();
@@ -737,7 +782,7 @@ public class TestRecovery extends SolrTe
assertU(commit());
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
- assertEquals(2, UpdateLog.getLogList(logDir).length);
+ assertEquals(2, ulog.getLogList(logDir).length);
addDocs(105, start, versions); start+=105;
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
@@ -745,7 +790,7 @@ public class TestRecovery extends SolrTe
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
// previous two logs should be gone now
- assertEquals(1, UpdateLog.getLogList(logDir).length);
+ assertEquals(1, ulog.getLogList(logDir).length);
addDocs(1, start, versions); start+=1;
h.close();
@@ -765,14 +810,14 @@ public class TestRecovery extends SolrTe
assertJQ(req("qt","/get", "getVersions",""+maxReq), "/versions==" + versions.subList(0,Math.min(maxReq,start)));
// previous logs should be gone now
- assertEquals(1, UpdateLog.getLogList(logDir).length);
+ assertEquals(1, ulog.getLogList(logDir).length);
//
// test that a corrupt tlog file doesn't stop us from coming up, or seeing versions before that tlog file.
//
addDocs(1, start, new LinkedList<Long>()); // don't add this to the versions list because we are going to lose it...
h.close();
- files = UpdateLog.getLogList(logDir);
+ files = ulog.getLogList(logDir);
Arrays.sort(files);
RandomAccessFile raf = new RandomAccessFile(new File(logDir, files[files.length-1]), "rw");
raf.writeChars("This is a trashed log file that really shouldn't work at all, but we'll see...");
@@ -820,7 +865,8 @@ public class TestRecovery extends SolrTe
}
};
- File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
+ UpdateLog ulog = h.getCore().getUpdateHandler().getUpdateLog();
+ File logDir = new File(h.getCore().getUpdateHandler().getUpdateLog().getLogDir());
clearIndex();
assertU(commit());
@@ -830,7 +876,7 @@ public class TestRecovery extends SolrTe
assertU(adoc("id","F3"));
h.close();
- String[] files = UpdateLog.getLogList(logDir);
+ String[] files = ulog.getLogList(logDir);
Arrays.sort(files);
RandomAccessFile raf = new RandomAccessFile(new File(logDir, files[files.length-1]), "rw");
raf.seek(raf.length()); // seek to end
@@ -874,7 +920,8 @@ public class TestRecovery extends SolrTe
try {
DirectUpdateHandler2.commitOnClose = false;
- File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
+ UpdateLog ulog = h.getCore().getUpdateHandler().getUpdateLog();
+ File logDir = new File(h.getCore().getUpdateHandler().getUpdateLog().getLogDir());
clearIndex();
assertU(commit());
@@ -886,7 +933,7 @@ public class TestRecovery extends SolrTe
h.close();
- String[] files = UpdateLog.getLogList(logDir);
+ String[] files = ulog.getLogList(logDir);
Arrays.sort(files);
RandomAccessFile raf = new RandomAccessFile(new File(logDir, files[files.length-1]), "rw");
long len = raf.length();
@@ -957,7 +1004,8 @@ public class TestRecovery extends SolrTe
}
};
- File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
+ UpdateLog ulog = h.getCore().getUpdateHandler().getUpdateLog();
+ File logDir = new File(h.getCore().getUpdateHandler().getUpdateLog().getLogDir());
clearIndex();
assertU(commit());
@@ -967,7 +1015,7 @@ public class TestRecovery extends SolrTe
assertU(adoc("id","CCCCCC"));
h.close();
- String[] files = UpdateLog.getLogList(logDir);
+ String[] files = ulog.getLogList(logDir);
Arrays.sort(files);
String fname = files[files.length-1];
RandomAccessFile raf = new RandomAccessFile(new File(logDir, fname), "rw");
@@ -1037,17 +1085,18 @@ public class TestRecovery extends SolrTe
// stops the core, removes the transaction logs, restarts the core.
void deleteLogs() throws Exception {
- File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
+ UpdateLog ulog = h.getCore().getUpdateHandler().getUpdateLog();
+ File logDir = new File(h.getCore().getUpdateHandler().getUpdateLog().getLogDir());
h.close();
try {
- String[] files = UpdateLog.getLogList(logDir);
+ String[] files = ulog.getLogList(logDir);
for (String file : files) {
new File(logDir, file).delete();
}
- assertEquals(0, UpdateLog.getLogList(logDir).length);
+ assertEquals(0, ulog.getLogList(logDir).length);
} finally {
// make sure we create the core again, even if the assert fails so it won't mess
// up the next test.
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java Sun Aug 11 12:19:13 2013
@@ -73,12 +73,14 @@ public class TestSolr4Spatial extends So
"fl", "id," + fieldName, "q", "*:*", "rows", "1000",
"fq", "{!field f="+fieldName+"}Intersectssss"), 400);
+ ignoreException("NonexistentShape");
try {
assertU(adoc("id", "-1", fieldName, "NonexistentShape"));
fail();
} catch (SolrException e) {
assertEquals(400, e.code());
}
+ unIgnoreException("NonexistentShape");
}
private void setupDocs() {
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java Sun Aug 11 12:19:13 2013
@@ -25,6 +25,7 @@ import org.junit.Test;
public class TestSolrQueryParser extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
createIndex();
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java Sun Aug 11 12:19:13 2013
@@ -78,8 +78,6 @@ public class TestValueSourceCache extend
"val1_i1",
"val1_l1",
"val1_b1",
- "val1_by1",
- "val1_sh1"
};
for (String template : templates) {
for (String nums : numbers) {
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java Sun Aug 11 12:19:13 2013
@@ -30,6 +30,7 @@ import org.junit.Test;
public class DistanceFunctionTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
}
@@ -75,7 +76,7 @@ public class DistanceFunctionTest extend
@Test
public void testLatLon() throws Exception {
- assertU(adoc("id", "100", "store", "1,2"));
+ assertU(adoc("id", "100", "store", "1,2"));//copied to store_rpt
assertU(commit());
assertJQ(req("defType","func",
@@ -125,6 +126,16 @@ public class DistanceFunctionTest extend
, 1e-5
,"/response/docs/[0]/score==314.40338"
);
+
+ // if pt missing, use sfield (RPT)
+ assertJQ(req("defType","func",
+ "q","geodist(3,4)",
+ "sfield","store_rpt",
+ "fq","id:100",
+ "fl","id,score")
+ , 1e-5
+ ,"/response/docs/[0]/score==314.40338"
+ );
// read both pt and sfield
assertJQ(req("defType","func",
@@ -136,6 +147,16 @@ public class DistanceFunctionTest extend
,"/response/docs/[0]/score==314.40338"
);
+ // read both pt and sfield (RPT)
+ assertJQ(req("defType","func",
+ "q","geodist()","pt","3,4",
+ "sfield","store_rpt",
+ "fq","id:100",
+ "fl","id,score")
+ , 1e-5
+ ,"/response/docs/[0]/score==314.40338"
+ );
+
// param substitution
assertJQ(req("defType","func",
"q","geodist($a,$b)",
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Sun Aug 11 12:19:13 2013
@@ -44,6 +44,10 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.servlet.SolrRequestParsers.MultipartRequestParser;
+import org.apache.solr.servlet.SolrRequestParsers.FormDataRequestParser;
+import org.apache.solr.servlet.SolrRequestParsers.RawRequestParser;
+import org.apache.solr.servlet.SolrRequestParsers.StandardRequestParser;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -239,6 +243,38 @@ public class SolrRequestParserTest exten
}
@Test
+ public void testStandardParseParamsAndFillStreamsISO88591() throws Exception
+ {
+ final String getParams = "qt=%FC&dup=foo&ie=iso-8859-1&dup=%FC", postParams = "qt2=%FC&q=hello&d%75p=bar";
+ final byte[] postBytes = postParams.getBytes("US-ASCII");
+ final String contentType = "application/x-www-form-urlencoded; charset=iso-8859-1";
+
+ // Set up the expected behavior
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ expect(request.getMethod()).andReturn("POST").anyTimes();
+ expect(request.getContentType()).andReturn( contentType ).anyTimes();
+ expect(request.getQueryString()).andReturn(getParams).anyTimes();
+ expect(request.getContentLength()).andReturn(postBytes.length).anyTimes();
+ expect(request.getInputStream()).andReturn(new ServletInputStream() {
+ private final ByteArrayInputStream in = new ByteArrayInputStream(postBytes);
+ @Override public int read() { return in.read(); }
+ });
+ replay(request);
+
+ MultipartRequestParser multipart = new MultipartRequestParser( 2048 );
+ RawRequestParser raw = new RawRequestParser();
+ FormDataRequestParser formdata = new FormDataRequestParser( 2048 );
+ StandardRequestParser standard = new StandardRequestParser( multipart, raw, formdata );
+
+ SolrParams p = standard.parseParamsAndFillStreams(request, new ArrayList<ContentStream>());
+
+ assertEquals( "contentType: "+contentType, "hello", p.get("q") );
+ assertEquals( "contentType: "+contentType, "\u00FC", p.get("qt") );
+ assertEquals( "contentType: "+contentType, "\u00FC", p.get("qt2") );
+ assertArrayEquals( "contentType: "+contentType, new String[]{"foo","\u00FC","bar"}, p.getParams("dup") );
+ }
+
+ @Test
public void testStandardFormdataUploadLimit() throws Exception
{
final int limitKBytes = 128;
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java Sun Aug 11 12:19:13 2013
@@ -29,7 +29,6 @@ import org.apache.lucene.util.Version;
import java.util.Collection;
import java.util.HashSet;
-import java.io.StringReader;
import java.io.IOException;
@@ -44,7 +43,7 @@ class SimpleQueryConverter extends Spell
try {
Collection<Token> result = new HashSet<Token>();
WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_40);
- TokenStream ts = analyzer.tokenStream("", new StringReader(origQuery));
+ TokenStream ts = analyzer.tokenStream("", origQuery);
// TODO: support custom attributes
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class);
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java Sun Aug 11 12:19:13 2013
@@ -36,6 +36,7 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
@Slow
@@ -433,7 +434,9 @@ public class SpellCheckCollatorTest exte
);
}
}
+
@Test
+ @Ignore("SOLR-5122: estimates don't seem to make any sense")
public void testEstimatedHitCounts() throws Exception {
assertQ(
req(
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java Sun Aug 11 12:19:13 2013
@@ -44,6 +44,7 @@ public class WordBreakSolrSpellCheckerTe
assertNull(h.validateUpdate(adoc("id", "4", "lowerfilt", "printable in pointable paint able")));
assertNull(h.validateUpdate(adoc("id", "5", "lowerfilt", "printable in puntable paint able ")));
assertNull(h.validateUpdate(adoc("id", "6", "lowerfilt", "paint able in pintable plantable")));
+ assertNull(h.validateUpdate(adoc("id", "7", "lowerfilt", "zxcvqwtp fg hj")));
assertNull(h.validateUpdate(commit()));
//docfreq=7: in
//docfreq=5: able
@@ -277,6 +278,21 @@ public class WordBreakSolrSpellCheckerTe
SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true",
SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1"),
"//lst[@name='collation'][1 ]/str[@name='collationQuery']='lowerfilt:((+printable +in +puntable +plantable))'"
- );
+ );
+ assertQ(req(
+ "q", "zxcv AND qwtp AND fghj",
+ "qt", "spellCheckWithWordbreak",
+ "defType", "edismax",
+ "qf", "lowerfilt",
+ "indent", "true",
+ SpellCheckComponent.SPELLCHECK_BUILD, "true",
+ SpellCheckComponent.COMPONENT_NAME, "true",
+ SpellCheckComponent.SPELLCHECK_ACCURACY, ".75",
+ SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true",
+ SpellCheckComponent.SPELLCHECK_COLLATE, "true",
+ SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true",
+ SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "10"),
+ "//lst[@name='collation'][1 ]/str[@name='collationQuery']='zxcvqwtp AND (fg AND hj)'"
+ );
}
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Sun Aug 11 12:19:13 2013
@@ -35,6 +35,7 @@ public class DirectUpdateHandlerOptimize
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Sun Aug 11 12:19:13 2013
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4;
@@ -45,6 +46,8 @@ public class DirectUpdateHandlerTest ext
public static void beforeClass() throws Exception {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
+ System.setProperty("solr.tests.mergePolicy", TieredMergePolicy.class.getName());
initCore("solrconfig.xml", "schema12.xml");
}
@@ -270,13 +273,14 @@ public class DirectUpdateHandlerTest ext
assertU(commit());
assertU(adoc("id","3"));
- assertU(adoc("id","2"));
+ assertU(adoc("id","2")); // dup, triggers delete
assertU(adoc("id","4"));
assertU(commit());
SolrQueryRequest sr = req("q","foo");
DirectoryReader r = sr.getSearcher().getIndexReader();
- assertTrue(r.maxDoc() > r.numDocs()); // should have deletions
+ assertTrue("maxDoc !> numDocs ... expected some deletions",
+ r.maxDoc() > r.numDocs());
sr.close();
assertU(commit("expungeDeletes","true"));
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java Sun Aug 11 12:19:13 2013
@@ -357,9 +357,7 @@ public class DocumentBuilderTest extends
*/
private static byte expectedNorm(final DefaultSimilarity sim,
final int length, final float boost) {
-
- return sim.encodeNormValue(boost / ((float) Math.sqrt(length)));
-
+ return (byte) sim.encodeNormValue(boost / ((float) Math.sqrt(length)));
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java Sun Aug 11 12:19:13 2013
@@ -19,8 +19,12 @@ package org.apache.solr.update;
import java.io.File;
+import org.apache.solr.core.TestMergePolicyConfig;
+
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.SimpleMergedSegmentWarmer;
+import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.schema.IndexSchema;
@@ -29,6 +33,8 @@ import org.junit.Test;
/**
* Testcase for {@link SolrIndexConfig}
+ *
+ * @see TestMergePolicyConfig
*/
public class SolrIndexConfigTest extends SolrTestCaseJ4 {
@@ -52,10 +58,22 @@ public class SolrIndexConfigTest extends
SolrIndexConfig solrIndexConfig = new SolrIndexConfig(solrConfig, null,
null);
assertNotNull(solrIndexConfig);
- assertEquals("org.apache.lucene.index.TieredMergePolicy",
- solrIndexConfig.defaultMergePolicyClassName);
IndexSchema indexSchema = IndexSchemaFactory.buildIndexSchema("schema.xml", solrConfig);
- solrIndexConfig.toIndexWriterConfig(indexSchema);
+
+ IndexWriterConfig iwc = solrIndexConfig.toIndexWriterConfig(indexSchema);
+
+ assertNotNull("null mp", iwc.getMergePolicy());
+ assertTrue("mp is not TMP", iwc.getMergePolicy() instanceof TieredMergePolicy);
+ TieredMergePolicy mp = (TieredMergePolicy) iwc.getMergePolicy();
+ assertEquals("mp.maxMergeAtOnceExplicit", 19, mp.getMaxMergeAtOnceExplicit());
+ assertEquals("mp.segmentsPerTier",9,(int)mp.getSegmentsPerTier());
+
+ assertNotNull("null ms", iwc.getMergeScheduler());
+ assertTrue("ms is not CMS", iwc.getMergeScheduler() instanceof ConcurrentMergeScheduler);
+ ConcurrentMergeScheduler ms = (ConcurrentMergeScheduler) iwc.getMergeScheduler();
+ assertEquals("ms.maxMergeCount", 987, ms.getMaxMergeCount());
+ assertEquals("ms.maxThreadCount", 42, ms.getMaxThreadCount());
+
}
public void testMergedSegmentWarmerIndexConfigCreation() throws Exception {
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java Sun Aug 11 12:19:13 2013
@@ -45,6 +45,7 @@ public class SolrIndexSplitterTest exten
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
}
@@ -132,15 +133,21 @@ public class SolrIndexSplitterTest exten
SolrCore core1 = null, core2 = null;
try {
- CoreDescriptor dcore1 = new CoreDescriptor(h.getCoreContainer(), "split1", h.getCore().getCoreDescriptor().getInstanceDir());
- dcore1.setDataDir(indexDir1.getAbsolutePath());
- dcore1.setSchemaName("schema12.xml");
+ String instanceDir = h.getCore().getCoreDescriptor().getInstanceDir();
+
+ CoreDescriptor dcore1 = buildCoreDescriptor(h.getCoreContainer(), "split1", instanceDir)
+ .withDataDir(indexDir1.getAbsolutePath()).withSchema("schema12.xml").build();
+ if (h.getCoreContainer().getZkController() != null) {
+ h.getCoreContainer().preRegisterInZk(dcore1);
+ }
core1 = h.getCoreContainer().create(dcore1);
h.getCoreContainer().register(core1, false);
- CoreDescriptor dcore2 = new CoreDescriptor(h.getCoreContainer(), "split2", h.getCore().getCoreDescriptor().getInstanceDir());
- dcore2.setDataDir(indexDir2.getAbsolutePath());
- dcore2.setSchemaName("schema12.xml");
+ CoreDescriptor dcore2 = buildCoreDescriptor(h.getCoreContainer(), "split2", instanceDir)
+ .withDataDir(indexDir2.getAbsolutePath()).withSchema("schema12.xml").build();
+ if (h.getCoreContainer().getZkController() != null) {
+ h.getCoreContainer().preRegisterInZk(dcore2);
+ }
core2 = h.getCoreContainer().create(dcore2);
h.getCoreContainer().register(core2, false);
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java Sun Aug 11 12:19:13 2013
@@ -24,6 +24,7 @@ public class TestAtomicUpdateErrorCases
public void testUpdateNoTLog() throws Exception {
try {
+ System.setProperty("enable.update.log", "false");
initCore("solrconfig.xml","schema15.xml");
UpdateHandler uh = h.getCore().getUpdateHandler();
@@ -56,6 +57,7 @@ public class TestAtomicUpdateErrorCases
}
} finally {
+ System.clearProperty("enable.update.log");
deleteCore();
}
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java Sun Aug 11 12:19:13 2013
@@ -552,6 +552,8 @@ public class FieldMutatingUpdateProcesso
IndexSchema schema = h.getCore().getLatestSchema();
assertNull("test expects 'foo_giberish' to not be a valid field, looks like schema was changed out from under us",
schema.getFieldTypeNoEx("foo_giberish"));
+ assertNull("test expects 'bar_giberish' to not be a valid field, looks like schema was changed out from under us",
+ schema.getFieldTypeNoEx("bar_giberish"));
assertNotNull("test expects 't_raw' to be a valid field, looks like schema was changed out from under us",
schema.getFieldTypeNoEx("t_raw"));
assertNotNull("test expects 'foo_s' to be a valid field, looks like schema was changed out from under us",
@@ -561,11 +563,13 @@ public class FieldMutatingUpdateProcesso
d = processAdd("ignore-not-in-schema",
doc(f("id", "1111"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
f("foo_giberish", "123456789", "", 42, "abcd"),
f("t_raw", "123456789", "", 42, "abcd"),
f("foo_s", "hoss")));
assertNotNull(d);
+ assertFalse(d.containsKey("bar_giberish"));
assertFalse(d.containsKey("foo_giberish"));
assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
d.getFieldValues("t_raw"));
@@ -574,15 +578,98 @@ public class FieldMutatingUpdateProcesso
d = processAdd("ignore-some",
doc(f("id", "1111"),
f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
f("t_raw", "123456789", "", 42, "abcd"),
f("foo_s", "hoss")));
assertNotNull(d);
assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
d.getFieldValues("foo_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("bar_giberish"));
assertFalse(d.containsKey("t_raw"));
assertEquals("hoss", d.getFieldValue("foo_s"));
-
+
+ d = processAdd("ignore-not-in-schema-explicit-selector",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertFalse(d.containsKey("foo_giberish"));
+ assertFalse(d.containsKey("bar_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("t_raw"));
+ assertEquals("hoss", d.getFieldValue("foo_s"));
+
+ d = processAdd("ignore-not-in-schema-and-foo-name-prefix",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertFalse(d.containsKey("foo_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("bar_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("t_raw"));
+ assertEquals("hoss", d.getFieldValue("foo_s"));
+
+ d = processAdd("ignore-foo-name-prefix-except-not-schema",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("foo_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("bar_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("t_raw"));
+ assertFalse(d.containsKey("foo_s"));
+
+ d = processAdd("ignore-in-schema",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertTrue(d.containsKey("foo_giberish"));
+ assertTrue(d.containsKey("bar_giberish"));
+ assertFalse(d.containsKey("id"));
+ assertFalse(d.containsKey("t_raw"));
+ assertFalse(d.containsKey("foo_s"));
+
+ d = processAdd("ignore-not-in-schema-explicit-str-selector",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertFalse(d.containsKey("foo_giberish"));
+ assertFalse(d.containsKey("bar_giberish"));
+ assertEquals(Arrays.asList("123456789", "", 42, "abcd"),
+ d.getFieldValues("t_raw"));
+ assertEquals("hoss", d.getFieldValue("foo_s"));
+
+ d = processAdd("ignore-in-schema-str-selector",
+ doc(f("id", "1111"),
+ f("foo_giberish", "123456789", "", 42, "abcd"),
+ f("bar_giberish", "123456789", "", 42, "abcd"),
+ f("t_raw", "123456789", "", 42, "abcd"),
+ f("foo_s", "hoss")));
+ assertNotNull(d);
+ assertTrue(d.containsKey("foo_giberish"));
+ assertTrue(d.containsKey("bar_giberish"));
+ assertFalse(d.containsKey("id"));
+ assertFalse(d.containsKey("t_raw"));
+ assertFalse(d.containsKey("foo_s"));
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java Sun Aug 11 12:19:13 2013
@@ -38,6 +38,7 @@ public class RegexBoostProcessorTest ext
@BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
SolrCore core = h.getCore();
_parser = new SolrRequestParsers( null );
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Sun Aug 11 12:19:13 2013
@@ -52,6 +52,7 @@ public class SignatureUpdateProcessorFac
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
}
Modified: lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/lucene4956/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java Sun Aug 11 12:19:13 2013
@@ -43,6 +43,7 @@ public class UniqFieldsUpdateProcessorFa
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_
initCore("solrconfig.xml", "schema12.xml");
}
Modified: lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/db/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -24,7 +24,7 @@
that you fully re-index after changing this setting as it can affect both how text is indexed
and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<jmx />
Modified: lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -24,7 +24,7 @@
that you fully re-index after changing this setting as it can affect both how text is indexed
and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<!--
NOTE: In order to reduce Jar duplication, dataimporthandler-extras
Modified: lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -24,7 +24,7 @@
that you fully re-index after changing this setting as it can affect both how text is indexed
and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<jmx />
Modified: lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -24,7 +24,7 @@
that you fully re-index after changing this setting as it can affect both how text is indexed
and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<jmx />
Modified: lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -24,7 +24,7 @@
that you fully re-index after changing this setting as it can affect both how text is indexed
and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<!--
NOTE: In order to reduce Jar duplication, dataimporthandler-extras
Modified: lucene/dev/branches/lucene4956/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/multicore/core0/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/multicore/core0/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/branches/lucene4956/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/multicore/core1/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/multicore/core1/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/branches/lucene4956/solr/example/resources/log4j.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/resources/log4j.properties?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/resources/log4j.properties (original)
+++ lucene/dev/branches/lucene4956/solr/example/resources/log4j.properties Sun Aug 11 12:19:13 2013
@@ -1,4 +1,5 @@
# Logging level
+solr.log=logs/
log4j.rootLogger=INFO, file, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
@@ -12,8 +13,12 @@ log4j.appender.file.MaxFileSize=4MB
log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format
-log4j.appender.file.File=logs/solr.log
+log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
-log4j.logger.org.apache.zookeeper=WARN
\ No newline at end of file
+log4j.logger.org.apache.zookeeper=WARN
+log4j.logger.org.apache.hadoop=WARN
+
+# set to INFO to enable infostream log messages
+log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
Modified: lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/schema.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/schema.xml Sun Aug 11 12:19:13 2013
@@ -1047,8 +1047,9 @@
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_no.txt" format="snowball" />
<filter class="solr.SnowballPorterFilterFactory" language="Norwegian"/>
- <!-- less aggressive: <filter class="solr.NorwegianLightStemFilterFactory"/> -->
- <!-- singular/plural: <filter class="solr.NorwegianMinimalStemFilterFactory"/> -->
+ <!-- less aggressive: <filter class="solr.NorwegianLightStemFilterFactory" variant="nb"/> -->
+ <!-- singular/plural: <filter class="solr.NorwegianMinimalStemFilterFactory" variant="nb"/> -->
+ <!-- The "light" and "minimal" stemmers support variants: nb=Bokmål, nn=Nynorsk, no=Both -->
</analyzer>
</fieldType>
Modified: lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/solrconfig.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/solrconfig.xml Sun Aug 11 12:19:13 2013
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>LUCENE_50</luceneMatchVersion>
+ <luceneMatchVersion>5.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
@@ -66,6 +66,9 @@
files in that directory which completely match the regex
(anchored on both ends) will be included.
+ If a 'dir' option (with or without a regex) is used and nothing
+ is found that matches, a warning will be logged.
+
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
@@ -81,11 +84,6 @@
<lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
<lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
- <!-- If a 'dir' option (with or without a regex) is used and nothing
- is found that matches, a warning will be logged.
- -->
- <lib dir="/non/existent/dir/yields/warning" />
-
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
if it can't be loaded.
@@ -186,7 +184,8 @@
maxBufferedDocs sets a limit on the number of documents buffered
before flushing.
If both ramBufferSizeMB and maxBufferedDocs is set, then
- Lucene will flush based on whichever limit is hit first. -->
+ Lucene will flush based on whichever limit is hit first.
+ The default is 100 MB. -->
<!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
<!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
@@ -258,11 +257,6 @@
<!--
<unlockOnStartup>false</unlockOnStartup>
-->
-
- <!-- Expert: Controls how often Lucene loads terms into memory
- Default is 128 and is likely good for most everyone.
- -->
- <!-- <termIndexInterval>128</termIndexInterval> -->
<!-- If true, IndexReaders will be reopened (often more efficient)
instead of closed and then opened. Default: true
@@ -306,10 +300,11 @@
To aid in advanced debugging, Lucene provides an "InfoStream"
of detailed information when indexing.
- Setting The value to true will instruct the underlying Lucene
- IndexWriter to write its debugging info the specified file
+ Setting the value to true will instruct the underlying Lucene
+ IndexWriter to write its info stream to solr's log. By default,
+ this is enabled here, and controlled through log4j.properties.
-->
- <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
+ <infoStream>true</infoStream>
</indexConfig>
@@ -366,7 +361,7 @@
have some sort of hard autoCommit to limit the log size.
-->
<autoCommit>
- <maxTime>15000</maxTime>
+ <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
<openSearcher>false</openSearcher>
</autoCommit>
@@ -375,11 +370,10 @@
but does not ensure that data is synced to disk. This is
faster and more near-realtime friendly than a hard commit.
-->
- <!--
- <autoSoftCommit>
- <maxTime>1000</maxTime>
- </autoSoftCommit>
- -->
+
+ <autoSoftCommit>
+ <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+ </autoSoftCommit>
<!-- Update Related Event Listeners
@@ -442,15 +436,6 @@
<str name="someArg">Some Value</str>
</indexReaderFactory >
-->
- <!-- By explicitly declaring the Factory, the termIndexDivisor can
- be specified.
- -->
- <!--
- <indexReaderFactory name="IndexReaderFactory"
- class="solr.StandardIndexReaderFactory">
- <int name="setTermIndexDivisor">12</int>
- </indexReaderFactory >
- -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Query section - these settings control query time things like caches
@@ -1386,15 +1371,9 @@
<!-- Clustering Component
http://wiki.apache.org/solr/ClusteringComponent
-
- You'll need to set the solr.clustering.enabled system property
- when running solr to run with clustering enabled:
-
- java -Dsolr.clustering.enabled=true -jar start.jar
-
-->
<searchComponent name="clustering"
- enable="${solr.clustering.enabled:false}"
+ enable="${solr.clustering.enabled:true}"
class="solr.clustering.ClusteringComponent" >
<!-- Declare an engine -->
<lst name="engine">
@@ -1460,7 +1439,7 @@
-->
<requestHandler name="/clustering"
startup="lazy"
- enable="${solr.clustering.enabled:false}"
+ enable="${solr.clustering.enabled:true}"
class="solr.SearchHandler">
<lst name="defaults">
<bool name="clustering">true</bool>
Modified: lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/velocity/cluster.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/velocity/cluster.vm?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/velocity/cluster.vm (original)
+++ lucene/dev/branches/lucene4956/solr/example/solr/collection1/conf/velocity/cluster.vm Sun Aug 11 12:19:13 2013
@@ -9,7 +9,7 @@
## Div tag has placeholder text by default
<div id="clusters">
- Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see results
+ Loading...
</div>
## Replace the div content *if* Carrot^2 is available
Modified: lucene/dev/branches/lucene4956/solr/example/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/example/solr/solr.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/example/solr/solr.xml (original)
+++ lucene/dev/branches/lucene4956/solr/example/solr/solr.xml Sun Aug 11 12:19:13 2013
@@ -33,6 +33,7 @@
<int name="hostPort">${jetty.port:8983}</int>
<str name="hostContext">${hostContext:solr}</str>
<int name="zkClientTimeout">${zkClientTimeout:15000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
</solrcloud>
<shardHandlerFactory name="shardHandlerFactory"
Modified: lucene/dev/branches/lucene4956/solr/licenses/morfologik-fsa-LICENSE-BSD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/licenses/morfologik-fsa-LICENSE-BSD.txt?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/licenses/morfologik-fsa-LICENSE-BSD.txt (original)
+++ lucene/dev/branches/lucene4956/solr/licenses/morfologik-fsa-LICENSE-BSD.txt Sun Aug 11 12:19:13 2013
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2012 Dawid Weiss, Marcin MiÅkowski
+Copyright (c) 2007-2013 Dawid Weiss, Marcin MiÅkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -26,4 +26,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIA
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Modified: lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-LICENSE-BSD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-LICENSE-BSD.txt?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-LICENSE-BSD.txt (original)
+++ lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-LICENSE-BSD.txt Sun Aug 11 12:19:13 2013
@@ -1,62 +1,26 @@
BSD-licensed dictionary of Polish (Morfologik)
-Copyright (c) 2012, Marcin MiÅkowski
+Morfologik Polish dictionary.
+Version: 2.0 PoliMorf
+Copyright (c) 2013, Marcin MiÅkowski
All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS âAS ISâ AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---
-
-BSD-licensed dictionary of Polish (SGJP)
-http://sgjp.pl/morfeusz/
-
-Copyright © 2011 Zygmunt Saloni, WÅodzimierz GruszczyÅski,
- Marcin WoliÅski, Robert WoÅosz
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS âAS ISâ AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-NOTICE.txt?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-NOTICE.txt (original)
+++ lucene/dev/branches/lucene4956/solr/licenses/morfologik-polish-NOTICE.txt Sun Aug 11 12:19:13 2013
@@ -1,6 +1,3 @@
-This product includes data from BSD-licensed dictionary of Polish (Morfologik)
-(http://morfologik.blogspot.com/)
-
-This product includes data from BSD-licensed dictionary of Polish (SGJP)
-(http://sgjp.pl/morfeusz/)
+This product includes data from BSD-licensed dictionary of Polish (Morfologik, PoliMorf)
+(http://morfologik.blogspot.com/)
\ No newline at end of file
Modified: lucene/dev/branches/lucene4956/solr/licenses/morfologik-stemming-LICENSE-BSD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/solr/licenses/morfologik-stemming-LICENSE-BSD.txt?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/solr/licenses/morfologik-stemming-LICENSE-BSD.txt (original)
+++ lucene/dev/branches/lucene4956/solr/licenses/morfologik-stemming-LICENSE-BSD.txt Sun Aug 11 12:19:13 2013
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2012 Dawid Weiss, Marcin MiÅkowski
+Copyright (c) 2007-2013 Dawid Weiss, Marcin MiÅkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -26,4 +26,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIA
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file