You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/05 20:51:31 UTC
[2/2] lucene-solr:jira/SOLR-10807: SOLR-10807: some small hacks to
get past some obvious test problems
SOLR-10807: some small hacks to get past some obvious test problems
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fde06f34
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fde06f34
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fde06f34
Branch: refs/heads/jira/SOLR-10807
Commit: fde06f34b7f9d0916a134b3efaa8780892ff8e39
Parents: 48d16b9
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 5 11:45:30 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 5 11:45:30 2017 -0700
----------------------------------------------------------------------
.../apache/solr/schema/ExternalFileField.java | 19 +++++++-------
.../solr/collection1/conf/schema-sql.xml | 2 +-
.../apache/solr/schema/BadIndexSchemaTest.java | 2 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 9 ++++---
.../org/apache/solr/search/TestTrieFacet.java | 26 +++++++++++---------
.../apache/solr/cloud/MiniSolrCloudCluster.java | 4 +++
6 files changed, 37 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java b/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
index 03ec299..ab71411 100644
--- a/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
+++ b/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
@@ -69,15 +69,16 @@ public class ExternalFileField extends FieldType implements SchemaAware {
// code (see getValueSource) gives you a FileFloatSource.
String ftypeS = args.remove("valType");
- // // nocommit: dead code. removing this should be in it's own jira
- //
- // if (ftypeS != null) {
- // ftype = schema.getFieldTypes().get(ftypeS);
- // if (ftype != null && !(ftype instanceof TrieFloatField)) {
- // throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
- // "Only float (TrieFloatField) is currently supported as external field type. Got " + ftypeS);
- // }
- // }
+ // // nocommit: dead code. removing this (or replacuing with warning) should be in it's own jira
+ // // for now maintain spirit of original error check but for points fields
+ if (ftypeS != null) {
+ ftype = schema.getFieldTypes().get(ftypeS);
+ if (ftype != null && (org.apache.solr.schema.NumberType.FLOAT != ftype.getNumberType())) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+ "Only float based valType currently supported as external field type. Got " + ftypeS);
+ }
+ }
+ // nocommit
keyFieldName = args.remove("keyField");
String defValS = args.remove("defVal");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
index 5497a96..dd7779d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
@@ -437,7 +437,7 @@
<fieldType name="nocommit_id_type" class="solr.TrieIntField" indexed="true" stored="true" multiValued="false" />
- <field name="id" type="nocommit_id_type" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="nocommit_id_type" indexed="true" stored="true" multiValued="false" docValues="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="s_multi" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
index 2d5adf9..dc0c67b 100644
--- a/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
@@ -55,7 +55,7 @@ public class BadIndexSchemaTest extends AbstractBadConfigTestBase {
public void testBadExternalFileField() throws Exception {
doTest("bad-schema-external-filefield.xml",
- "Only float (TrieFloatField) is currently supported as external field type.");
+ "Only float based valType currently supported as external field type.");
}
public void testUniqueKeyRules() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
index 7abab58..521472a 100644
--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
@@ -100,14 +100,17 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
String expectedDefinition = "<fieldtype name=\"tdatedv\" class=\""+getDateClass()+"\" " +
"precisionStep=\"6\" docValues=\"true\" multiValued=\"true\"/>";
FieldType tdatedv = schema.getFieldType("foo_tdtdvs");
+ assertEquals("Expecting a field type defined as " + expectedDefinition,
+ NumberType.DATE, tdatedv.getNumberType());
assertTrue("Expecting a field type defined as " + expectedDefinition,
- tdatedv instanceof TrieDateField);
+ getDateClass().endsWith(tdatedv.getClass().getSimpleName()));
assertTrue("Expecting a field type defined as " + expectedDefinition,
tdatedv.hasProperty(FieldProperties.DOC_VALUES));
assertTrue("Expecting a field type defined as " + expectedDefinition,
tdatedv.isMultiValued());
- assertEquals("Expecting a field type defined as " + expectedDefinition,
- 6, ((TrieDateField)tdatedv).getPrecisionStep());
+ // nocommit: keep or trash?
+ // assertEquals("Expecting a field type defined as " + expectedDefinition,
+ // 6, ((TrieDateField)tdatedv).getPrecisionStep());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java
index 158965b..73aec1e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java
@@ -69,17 +69,21 @@ public class TestTrieFacet extends SolrTestCaseJ4 {
SchemaField sf = h.getCore().getLatestSchema().getField(f);
assertFalse("who changed the schema? test isn't valid: " + f, sf.multiValued());
}
-
- for (String f : P0) {
- SchemaField sf = h.getCore().getLatestSchema().getField(f);
- assertEquals("who changed the schema? test isn't valid: " + f,
- 0, assertCastFieldType(sf).getPrecisionStep());
- }
- for (String f : P8) {
- SchemaField sf = h.getCore().getLatestSchema().getField(f);
- assertEquals("who changed the schema? test isn't valid: " + f,
- 8, assertCastFieldType(sf).getPrecisionStep());
- }
+
+ // nocommit: brute force HACK to make test ignore it's own sanity checks to test Points fields for us...
+ //
+ // for (String f : P0) {
+ // SchemaField sf = h.getCore().getLatestSchema().getField(f);
+ // assertEquals("who changed the schema? test isn't valid: " + f,
+ // 0, assertCastFieldType(sf).getPrecisionStep());
+ // }
+ // for (String f : P8) {
+ // SchemaField sf = h.getCore().getLatestSchema().getField(f);
+ // assertEquals("who changed the schema? test isn't valid: " + f,
+ // 8, assertCastFieldType(sf).getPrecisionStep());
+ // }
+ //
+ // nocommit: END
// we don't need a lot of docs -- at least one failure only had ~1000
NUM_DOCS = TestUtil.nextInt(random(), 200, 1500);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fde06f34/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 0605281..f548043 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -211,6 +211,10 @@ public class MiniSolrCloudCluster {
MiniSolrCloudCluster(int numServers, Path baseDir, String solrXml, JettyConfig jettyConfig,
ZkTestServer zkTestServer, Optional<String> securityJson) throws Exception {
+ // nocommit: simplest quick & dirty HACK to work around tests that use MSCC w/o using SolrTestCaseJ4...
+ org.apache.solr.schema.PointField.TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS = true;
+
+
Objects.requireNonNull(securityJson);
this.baseDir = Objects.requireNonNull(baseDir);
this.jettyConfig = Objects.requireNonNull(jettyConfig);