Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4641: Schema should throw exceptoin on illegal field parameters 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1462502 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2013-03-29 15:46:58 +00:00
parent a6e3ba52c0
commit abea806409
24 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -118,6 +118,8 @@ Bug Fixes
* SOLR-4650: copyField doesn't work with source globs that don't match any
explicit or dynamic fields. This regression was introduced in Solr 4.2.
(Daniel Collins, Steve Rowe)
* SOLR-4641: Schema now throws exception on illegal field parameters. (Robert Muir)
Optimizations
----------------------

3
solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
View File

@ -265,9 +265,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

3
solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
View File

@ -246,9 +246,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

4
solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
View File

@ -354,8 +354,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

5
solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
View File

@ -470,10 +470,7 @@
field type: mandatory - the name of a previously defined type from
the <types> section indexed: true if this field should be indexed
(searchable or sortable) stored: true if this field should be
retrievable compressed: [false] if this field should be stored
using gzip compression (this will only apply if the field type is
compressable; among the standard field types, only TextField and
StrField are) multiValued: true if this field may contain multiple
retrievable multiValued: true if this field may contain multiple
values per document omitNorms: (expert) set to true to omit the
norms associated with this field (this disables length
normalization and index-time boosting for the field, and saves

5
solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
View File

@ -466,10 +466,7 @@
field type: mandatory - the name of a previously defined type from
the <types> section indexed: true if this field should be indexed
(searchable or sortable) stored: true if this field should be
retrievable compressed: [false] if this field should be stored
using gzip compression (this will only apply if the field type is
compressable; among the standard field types, only TextField and
StrField are) multiValued: true if this field may contain multiple
retrievable multiValued: true if this field may contain multiple
values per document omitNorms: (expert) set to true to omit the
norms associated with this field (this disables length
normalization and index-time boosting for the field, and saves

14
solr/core/src/java/org/apache/solr/schema/FieldProperties.java
View File

@ -64,7 +64,7 @@ public abstract class FieldProperties {
static final Map<String,Integer> propertyMap = new HashMap<String,Integer>();
static {
for (String prop : propertyNames) {
propertyMap.put(prop, propertyNameToInt(prop));
propertyMap.put(prop, propertyNameToInt(prop, true));
}
}
@ -74,13 +74,17 @@ public abstract class FieldProperties {
return propertyNames[ Integer.numberOfTrailingZeros(property) ];
}
static int propertyNameToInt(String name) {
static int propertyNameToInt(String name, boolean failOnError) {
for (int i=0; i<propertyNames.length; i++) {
if (propertyNames[i].equals(name)) {
return 1 << i;
}
}
return 0;
if (failOnError && !"default".equals(name)) {
throw new IllegalArgumentException("Invalid field property: " + name);
} else {
return 0;
}
}
@ -105,13 +109,13 @@ public abstract class FieldProperties {
return (bitfield & props) == 0;
}
static int parseProperties(Map<String,String> properties, boolean which) {
static int parseProperties(Map<String,String> properties, boolean which, boolean failOnError) {
int props = 0;
for (Map.Entry<String, String> entry : properties.entrySet()) {
String val = entry.getValue();
if(val == null) continue;
if (Boolean.parseBoolean(val) == which) {
props |= propertyNameToInt(entry.getKey());
props |= propertyNameToInt(entry.getKey(), failOnError);
}
}
return props;

4
solr/core/src/java/org/apache/solr/schema/FieldType.java
View File

@ -153,8 +153,8 @@ public abstract class FieldType extends FieldProperties {
this.args = Collections.unmodifiableMap(args);
Map<String,String> initArgs = new HashMap<String,String>(args);
trueProperties = FieldProperties.parseProperties(initArgs,true);
falseProperties = FieldProperties.parseProperties(initArgs,false);
trueProperties = FieldProperties.parseProperties(initArgs,true,false);
falseProperties = FieldProperties.parseProperties(initArgs,false,false);
properties &= ~falseProperties;
properties |= trueProperties;

4
solr/core/src/java/org/apache/solr/schema/SchemaField.java
View File

@ -221,8 +221,8 @@ public final class SchemaField extends FieldProperties {
}
static int calcProps(String name, FieldType ft, Map<String, String> props) {
int trueProps = parseProperties(props,true);
int falseProps = parseProperties(props,false);
int trueProps = parseProperties(props,true,true);
int falseProps = parseProperties(props,false,true);
int p = ft.properties;

29
solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<schema name="bad-schema-bogus-field-parameters" version="1.5">
<types>
<fieldType name="binary" class="solr.BinaryField" />
</types>
<fields>
<field name="id" type="binary" someBogusParam="true"/>
</fields>
</schema>

4
solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
View File

@ -346,8 +346,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

4
solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
View File

@ -337,8 +337,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

4
solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
View File

@ -469,8 +469,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

3
solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
View File

@ -258,9 +258,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

12
solr/core/src/test-files/solr/collection1/conf/schema.xml
View File

@ -506,22 +506,22 @@
<!-- indexed=false should not prevent omit___=true -->
<field name="pint_i_norm" type="pint" omitNorms="true"
indexed="false" />
<field name="pint_i_tf" type="pint" omitOmitTermFreqAndPositions="true"
<field name="pint_i_tf" type="pint" omitTermFreqAndPositions="true"
indexed="false" />
<field name="pint_i_pos" type="pint" omitPositions="true"
indexed="false" />
<field name="pint_i_all" type="pint"
indexed="false"
omitNorms="true"
omitOmitTermFreqAndPositions="true"
omitTermFreqAndPositions="true"
omitPositions="true" />
<!-- omitOmitTermFreqAndPositions=false and omitPositions=true are ok -->
<!-- omitTermFreqAndPositions=false and omitPositions=true are ok -->
<field name="pint_tf_pos" type="pint" indexed="true"
omitOmitTermFreqAndPositions="false" omitPositions="true" />
omitTermFreqAndPositions="false" omitPositions="true" />
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

3
solr/core/src/test-files/solr/collection1/conf/schema11.xml
View File

@ -296,9 +296,6 @@ valued. -->
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

4
solr/core/src/test-files/solr/collection1/conf/schema12.xml
View File

@ -472,8 +472,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

4
solr/core/src/test-files/solr/collection1/conf/schema15.xml
View File

@ -470,8 +470,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

4
solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
View File

@ -487,8 +487,8 @@
termPositions="true" termOffsets="true"/>
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true" compressed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true" compressed="false"/>
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
<!-- fields to test individual tokenizers and tokenfilters -->
<field name="teststop" type="teststop" indexed="true" stored="true"/>

6
solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
View File

@ -23,7 +23,7 @@ public class BadIndexSchemaTest extends AbstractBadConfigTestBase {
private void doTest(final String schema, final String errString)
throws Exception {
assertConfigs("solrconfig.xml", schema, errString);
assertConfigs("solrconfig-basic.xml", schema, errString);
}
public void testSevereErrorsForInvalidFieldOptions() throws Exception {
@ -110,5 +110,9 @@ public class BadIndexSchemaTest extends AbstractBadConfigTestBase {
doTest("bad-schema-sweetspot-partial-norms.xml",
"Overriding default lengthNorm");
}
public void testBogusParameters() throws Exception {
doTest("bad-schema-bogus-field-parameters.xml", "Invalid field property");
}
}

3
solr/example/example-DIH/solr/db/conf/schema.xml
View File

@ -246,9 +246,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

3
solr/example/example-DIH/solr/mail/conf/schema.xml
View File

@ -324,9 +324,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

3
solr/example/example-DIH/solr/rss/conf/schema.xml
View File

@ -273,9 +273,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time

3
solr/example/example-DIH/solr/solr/conf/schema.xml
View File

@ -246,9 +246,6 @@
type: mandatory - the name of a previously defined type from the <types> section
indexed: true if this field should be indexed (searchable or sortable)
stored: true if this field should be retrievable
compressed: [false] if this field should be stored using gzip compression
(this will only apply if the field type is compressable; among
the standard field types, only TextField and StrField are)
multiValued: true if this field may contain multiple values per document
omitNorms: (expert) set to true to omit the norms associated with
this field (this disables length normalization and index-time