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 2011/02/17 01:38:05 UTC
svn commit: r1071459 - in /lucene/dev/trunk/solr: ./
src/java/org/apache/solr/schema/ src/test-files/solr/conf/
src/test/org/apache/solr/search/ src/test/org/apache/solr/search/function/
src/test/org/apache/solr/search/function/distance/
Author: hossman
Date: Thu Feb 17 00:38:04 2011
New Revision: 1071459
URL: http://svn.apache.org/viewvc?rev=1071459&view=rev
Log:
SOLR-2348: Fix field types to explicitly generate an error if you attempt to get a ValueSource for a multiValued field.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/trunk/solr/src/test-files/solr/conf/schema.xml
lucene/dev/trunk/solr/src/test/org/apache/solr/search/QueryParsingTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestQueryTypes.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Feb 17 00:38:04 2011
@@ -53,12 +53,13 @@ Upgrading from Solr 3.1-dev
legacy behavior should set a default value for the 'mm' param in
their solrconfig.xml file.
-* In previous releases, sorting on fields that are "multiValued"
- (either by explicit declaration in schema.xml or by implict behavior
- because the "version" attribute on the schema was less then 1.2) did
- not generally work, but it would sometimes silently act as if it
- succeeded and order the docs arbitrarily. Solr will now fail on any
- attempt to sort on a multivalued field
+* In previous releases, sorting or evaluating function queries on
+ fields that were "multiValued" (either by explicit declaration in
+ schema.xml or by implict behavior because the "version" attribute on
+ the schema was less then 1.2) did not generally work, but it would
+ sometimes silently act as if it succeeded and order the docs
+ arbitrarily. Solr will now fail on any attempt to sort, or apply a
+ function to, multi-valued fields
@@ -182,6 +183,9 @@ Bug Fixes
* SOLR-2339: Fix sorting to explicitly generate an error if you
attempt to sort on a multiValued field. (hossman)
+* SOLR-2348: Fix field types to explicitly generate an error if you
+ attempt to get a ValueSource for a multiValued field. (hossman)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java Thu Feb 17 00:38:04 2011
@@ -85,6 +85,7 @@ public abstract class AbstractSubTypeFie
//Just set these, delegate everything else to the field type
props.put("indexed", "true");
props.put("stored", "false");
+ props.put("multiValued", "false");
int p = SchemaField.calcProps(name, type, props);
SchemaField proto = SchemaField.create(name,
type, p, null);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java Thu Feb 17 00:38:04 2011
@@ -49,6 +49,7 @@ public class BoolField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new OrdFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java Thu Feb 17 00:38:04 2011
@@ -47,6 +47,7 @@ public class ByteField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new ByteFieldSource( new ByteValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java Thu Feb 17 00:38:04 2011
@@ -220,10 +220,6 @@ public class DateField extends FieldType
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
- return new OrdFieldSource(field.name);
- }
-
@Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeDate(name, toExternal(f));
@@ -408,6 +404,7 @@ public class DateField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new DateFieldSource(field.getName(), field.getType());
}
@@ -499,4 +496,4 @@ class DateFieldSource extends FieldCache
public int hashCode() {
return hcode + super.hashCode();
};
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java Thu Feb 17 00:38:04 2011
@@ -47,7 +47,7 @@ public class DoubleField extends FieldTy
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- // fieldCache doesn't support double
+ field.checkFieldCacheSource(qparser);
return new DoubleFieldSource( new DoubleValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java Thu Feb 17 00:38:04 2011
@@ -496,6 +496,7 @@ public abstract class FieldType extends
* Lucene FieldCache.)
*/
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new StrFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java Thu Feb 17 00:38:04 2011
@@ -45,6 +45,7 @@ public class FloatField extends FieldTyp
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new FloatFieldSource( new FloatValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java Thu Feb 17 00:38:04 2011
@@ -97,6 +97,7 @@ public class GeoHashField extends FieldT
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new StrFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java Thu Feb 17 00:38:04 2011
@@ -45,6 +45,7 @@ public class IntField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new IntFieldSource(new IntValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java Thu Feb 17 00:38:04 2011
@@ -47,6 +47,7 @@ public class LongField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new LongFieldSource( new LongValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SchemaField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SchemaField.java Thu Feb 17 00:38:04 2011
@@ -22,6 +22,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
+import org.apache.solr.search.QParser;
import org.apache.solr.response.TextResponseWriter;
@@ -133,8 +134,8 @@ public final class SchemaField extends F
/**
* Sanity checks that the properties of this field type are plausible
- * for a field that may be used in sorting, throwing an appropraite
- * exception (including hte field name) if it is not. FieldType subclasses
+ * for a field that may be used in sorting, throwing an appropriate
+ * exception (including the field name) if it is not. FieldType subclasses
* can choose to call this method in their getSortField implementation
* @see FieldType#getSortField
*/
@@ -152,6 +153,27 @@ public final class SchemaField extends F
}
+ /**
+ * Sanity checks that the properties of this field type are plausible
+ * for a field that may be used to get a FieldCacheSource, throwing
+ * an appropriate exception (including the field name) if it is not.
+ * FieldType subclasses can choose to call this method in their
+ * getValueSource implementation
+ * @see FieldType#getValueSource
+ */
+ public void checkFieldCacheSource(QParser parser) throws SolrException {
+ if (! indexed() ) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "can not use FieldCache on unindexed field: "
+ + getName());
+ }
+ if ( multiValued() ) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "can not use FieldCache on multivalued field: "
+ + getName());
+ }
+
+ }
static SchemaField create(String name, FieldType ft, Map<String,String> props) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java Thu Feb 17 00:38:04 2011
@@ -50,7 +50,7 @@ public class ShortField extends FieldTyp
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
-
+ field.checkFieldCacheSource(qparser);
return new ShortFieldSource(new ShortValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java Thu Feb 17 00:38:04 2011
@@ -53,6 +53,7 @@ public class SortableDoubleField extends
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new SortableDoubleFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java Thu Feb 17 00:38:04 2011
@@ -53,6 +53,7 @@ public class SortableFloatField extends
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new SortableFloatFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java Thu Feb 17 00:38:04 2011
@@ -53,6 +53,7 @@ public class SortableIntField extends Fi
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new SortableIntFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java Thu Feb 17 00:38:04 2011
@@ -53,6 +53,7 @@ public class SortableLongField extends F
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
return new SortableLongFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrField.java Thu Feb 17 00:38:04 2011
@@ -48,6 +48,7 @@ public class StrField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new StrFieldSource(field.getName());
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java Thu Feb 17 00:38:04 2011
@@ -83,12 +83,8 @@ public class TrieDateField extends DateF
}
@Override
- public ValueSource getValueSource(SchemaField field) {
- return new TrieDateFieldSource( new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ));
- }
-
- @Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new TrieDateFieldSource( new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ));
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java Thu Feb 17 00:38:04 2011
@@ -179,6 +179,7 @@ public class TrieField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
int flags = CachedArrayCreator.CACHE_VALUES_AND_BITS;
switch (type) {
case INTEGER:
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/schema.xml?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/schema.xml Thu Feb 17 00:38:04 2011
@@ -385,7 +385,7 @@
<fieldType name="x" class="solr.PointType" dimension="1" subFieldType="double"/>
<fieldType name="tenD" class="solr.PointType" dimension="10" subFieldType="double"/>
<!-- Use the sub field suffix -->
- <fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
+ <fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="_d1"/>
<fieldtype name="geohash" class="solr.GeoHashField"/>
@@ -533,6 +533,7 @@
<dynamicField name="*_tf1" type="tfloat" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_td1" type="tdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tds" type="tdouble" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
<dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/QueryParsingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/QueryParsingTest.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/QueryParsingTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/QueryParsingTest.java Thu Feb 17 00:38:04 2011
@@ -102,10 +102,10 @@ public class QueryParsingTest extends So
assertEquals(flds[0].getField(), "pow(float(weight),const(2.0))");
//test functions (more deep)
- sort = QueryParsing.parseSort("sum(product(r_f,sum(d_f,t_f,1)),a_f) asc", req);
+ sort = QueryParsing.parseSort("sum(product(r_f1,sum(d_f1,t_f1,1)),a_f1) asc", req);
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.CUSTOM);
- assertEquals(flds[0].getField(), "sum(product(float(r_f),sum(float(d_f),float(t_f),const(1.0))),float(a_f))");
+ assertEquals(flds[0].getField(), "sum(product(float(r_f1),sum(float(d_f1),float(t_f1),const(1.0))),float(a_f1))");
sort = QueryParsing.parseSort("pow(weight, 2) desc", req);
flds = sort.getSort();
@@ -135,11 +135,11 @@ public class QueryParsingTest extends So
assertEquals(flds[0].getField(), "weight");
//Test literals in functions
- sort = QueryParsing.parseSort("strdist(foo_s, \"junk\", jw) desc", req);
+ sort = QueryParsing.parseSort("strdist(foo_s1, \"junk\", jw) desc", req);
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.CUSTOM);
//the value sources get wrapped, so the out field is different than the input
- assertEquals(flds[0].getField(), "strdist(str(foo_s),literal(junk), dist=org.apache.lucene.search.spell.JaroWinklerDistance)");
+ assertEquals(flds[0].getField(), "strdist(str(foo_s1),literal(junk), dist=org.apache.lucene.search.spell.JaroWinklerDistance)");
sort = QueryParsing.parseSort("", req);
assertNull(sort);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java Thu Feb 17 00:38:04 2011
@@ -59,18 +59,18 @@ public class TestIndexSearcher extends S
public void testReopen() throws Exception {
- assertU(adoc("id","1", "v_t","Hello Dude", "v_s","string1"));
- assertU(adoc("id","2", "v_t","Hello Yonik", "v_s","string2"));
+ assertU(adoc("id","1", "v_t","Hello Dude", "v_s1","string1"));
+ assertU(adoc("id","2", "v_t","Hello Yonik", "v_s1","string2"));
assertU(commit());
SolrQueryRequest sr1 = req("q","foo");
ReaderContext rCtx1 = sr1.getSearcher().getTopReaderContext();
- String sval1 = getStringVal(sr1, "v_s",0);
+ String sval1 = getStringVal(sr1, "v_s1",0);
assertEquals("string1", sval1);
- assertU(adoc("id","3", "v_s","{!literal}"));
- assertU(adoc("id","4", "v_s","other stuff"));
+ assertU(adoc("id","3", "v_s1","{!literal}"));
+ assertU(adoc("id","4", "v_s1","other stuff"));
assertU(commit());
SolrQueryRequest sr2 = req("q","foo");
@@ -81,7 +81,7 @@ public class TestIndexSearcher extends S
assertEquals(ReaderUtil.leaves(rCtx1)[0].reader, ReaderUtil.leaves(rCtx2)[0].reader);
assertU(adoc("id","5", "v_f","3.14159"));
- assertU(adoc("id","6", "v_f","8983", "v_s","string6"));
+ assertU(adoc("id","6", "v_f","8983", "v_s1","string6"));
assertU(commit());
SolrQueryRequest sr3 = req("q","foo");
@@ -129,4 +129,4 @@ public class TestIndexSearcher extends S
sr5.close();
sr6.close();
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestQueryTypes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestQueryTypes.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestQueryTypes.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestQueryTypes.java Thu Feb 17 00:38:04 2011
@@ -87,7 +87,6 @@ public class TestQueryTypes extends Abst
,"//*[@name='id'][.='999.0']"
,"//*[@name='" + f + "'][.='" + v + "']"
);
- // System.out.println("#########################################" + f + "=" + v);
// field qparser
assertQ(req( "q", "{!field f="+f+"}"+v)
@@ -98,20 +97,34 @@ public class TestQueryTypes extends Abst
assertQ(req( "q", f + ":[\"" + v + "\" TO \"" + v + "\"]" )
,"//result[@numFound='1']"
);
+ }
+ // frange and function query only work on single valued field types
+ Object[] fc_vals = new Object[] {
+ "id",999.0
+ ,"v_s","wow dude"
+ ,"v_ti",-1
+ ,"v_tl",-1234567891234567890L
+ ,"v_tf",-2.0f
+ ,"v_td",-2.0
+ ,"v_tdt","2000-05-10T01:01:01Z"
+ };
+
+ for (int i=0; i<fc_vals.length; i+=2) {
+ String f = fc_vals[i].toString();
+ String v = fc_vals[i+1].toString();
+
// frange qparser
assertQ(req( "q", "{!frange v="+f+" l='"+v+"' u='"+v+"'}" )
,"//result[@numFound='1']"
);
-
+
// function query... just make sure it doesn't throw an exception
- assertQ(req( "q", "+id:999 _val_:\"" + f + "\"")
- ,"//result[@numFound='1']"
- );
-
+ assertQ(req( "q", "+id:999 _val_:\"" + f + "\"")
+ ,"//result[@numFound='1']"
+ );
}
-
// Some basic tests to ensure that parsing local params is working
assertQ("test prefix query",
req("q","{!prefix f=v_t}hel")
@@ -318,4 +331,4 @@ public class TestQueryTypes extends Abst
);
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java Thu Feb 17 00:38:04 2011
@@ -35,10 +35,10 @@ public class SortByFunctionTest extends
}
public void test() throws Exception {
- assertU(adoc("id", "1", "x_td", "0", "y_td", "2", "w_td1", "25", "z_td", "5", "f_t", "ipod"));
- assertU(adoc("id", "2", "x_td", "2", "y_td", "2", "w_td1", "15", "z_td", "5", "f_t", "ipod ipod ipod ipod ipod"));
- assertU(adoc("id", "3", "x_td", "3", "y_td", "2", "w_td1", "55", "z_td", "5", "f_t", "ipod ipod ipod ipod ipod ipod ipod ipod ipod"));
- assertU(adoc("id", "4", "x_td", "4", "y_td", "2", "w_td1", "45", "z_td", "5", "f_t", "ipod ipod ipod ipod ipod ipod ipod"));
+ assertU(adoc("id", "1", "x_td1", "0", "y_td1", "2", "w_td1", "25", "z_td1", "5", "f_t", "ipod"));
+ assertU(adoc("id", "2", "x_td1", "2", "y_td1", "2", "w_td1", "15", "z_td1", "5", "f_t", "ipod ipod ipod ipod ipod"));
+ assertU(adoc("id", "3", "x_td1", "3", "y_td1", "2", "w_td1", "55", "z_td1", "5", "f_t", "ipod ipod ipod ipod ipod ipod ipod ipod ipod"));
+ assertU(adoc("id", "4", "x_td1", "4", "y_td1", "2", "w_td1", "45", "z_td1", "5", "f_t", "ipod ipod ipod ipod ipod ipod ipod"));
assertU(commit());
assertQ(req("fl", "*,score", "q", "*:*"),
@@ -66,7 +66,7 @@ public class SortByFunctionTest extends
);
- assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td, y_td) desc"),
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td1, y_td1) desc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
"//result/doc[1]/int[@name='id'][.='4']",
@@ -74,7 +74,7 @@ public class SortByFunctionTest extends
"//result/doc[3]/int[@name='id'][.='2']",
"//result/doc[4]/int[@name='id'][.='1']"
);
- assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td, y_td) asc"),
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", "sum(x_td1, y_td1) asc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
"//result/doc[1]/int[@name='id'][.='1']",
@@ -83,7 +83,7 @@ public class SortByFunctionTest extends
"//result/doc[4]/int[@name='id'][.='4']"
);
//the function is equal, w_td1 separates
- assertQ(req("q", "*:*", "fl", "id", "sort", "sum(z_td, y_td) asc, w_td1 asc"),
+ assertQ(req("q", "*:*", "fl", "id", "sort", "sum(z_td1, y_td1) asc, w_td1 asc"),
"//*[@numFound='4']",
"//result/doc[1]/int[@name='id'][.='2']",
"//result/doc[2]/int[@name='id'][.='1']",
@@ -124,7 +124,3 @@ public class SortByFunctionTest extends
);
}
}
-
-/*
-<lst name="responseHeader"><int name="status">0</int><int name="QTime">93</int></lst><result name="response" numFound="4" start="0" maxScore="1.0"><doc><float name="score">1.0</float><int name="id">4</int><int name="intDefault">42</int><arr name="multiDefault"><str>muLti-Default</str></arr><date name="timestamp">2009-12-12T12:59:46.412Z</date><arr name="x_td"><double>4.0</double></arr><arr name="y_td"><double>2.0</double></arr></doc><doc><float name="score">1.0</float><int name="id">3</int><int name="intDefault">42</int><arr name="multiDefault"><str>muLti-Default</str></arr><date name="timestamp">2009-12-12T12:59:46.409Z</date><arr name="x_td"><double>3.0</double></arr><arr name="y_td"><double>2.0</double></arr></doc><doc><float name="score">1.0</float><int name="id">2</int><int name="intDefault">42</int><arr name="multiDefault"><str>muLti-Default</str></arr><date name="timestamp">2009-12-12T12:59:46.406Z</date><arr name="x_td"><double>2.0</double></arr><arr name="y_td"><dou
ble>2.0</double></arr></doc><doc><float name="score">1.0</float><int name="id">1</int><int name="intDefault">42</int><arr name="multiDefault"><str>muLti-Default</str></arr><date name="timestamp">2009-12-12T12:59:46.361Z</date><arr name="x_td"><double>0.0</double></arr><arr name="y_td"><double>2.0</double></arr></doc></result>
-*/
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java?rev=1071459&r1=1071458&r2=1071459&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java Thu Feb 17 00:38:04 2011
@@ -36,12 +36,12 @@ public class DistanceFunctionTest extend
@Test
public void testHaversine() throws Exception {
clearIndex();
- assertU(adoc("id", "1", "x_td", "0", "y_td", "0", "gh_s", GeoHashUtils.encode(32.7693246, -79.9289094)));
- assertU(adoc("id", "2", "x_td", "0", "y_td", String.valueOf(Math.PI / 2), "gh_s", GeoHashUtils.encode(32.7693246, -78.9289094)));
- assertU(adoc("id", "3", "x_td", String.valueOf(Math.PI / 2), "y_td", String.valueOf(Math.PI / 2), "gh_s", GeoHashUtils.encode(32.7693246, -80.9289094)));
- assertU(adoc("id", "4", "x_td", String.valueOf(Math.PI / 4), "y_td", String.valueOf(Math.PI / 4), "gh_s", GeoHashUtils.encode(32.7693246, -81.9289094)));
+ assertU(adoc("id", "1", "x_td", "0", "y_td", "0", "gh_s1", GeoHashUtils.encode(32.7693246, -79.9289094)));
+ assertU(adoc("id", "2", "x_td", "0", "y_td", String.valueOf(Math.PI / 2), "gh_s1", GeoHashUtils.encode(32.7693246, -78.9289094)));
+ assertU(adoc("id", "3", "x_td", String.valueOf(Math.PI / 2), "y_td", String.valueOf(Math.PI / 2), "gh_s1", GeoHashUtils.encode(32.7693246, -80.9289094)));
+ assertU(adoc("id", "4", "x_td", String.valueOf(Math.PI / 4), "y_td", String.valueOf(Math.PI / 4), "gh_s1", GeoHashUtils.encode(32.7693246, -81.9289094)));
assertU(adoc("id", "5", "x_td", "45.0", "y_td", "45.0",
- "gh_s", GeoHashUtils.encode(32.7693246, -81.9289094)));
+ "gh_s1", GeoHashUtils.encode(32.7693246, -81.9289094)));
assertU(adoc("id", "6", "point_hash", "32.5, -79.0", "point", "32.5, -79.0"));
assertU(adoc("id", "7", "point_hash", "32.6, -78.0", "point", "32.6, -78.0"));
assertU(commit());
@@ -56,7 +56,7 @@ public class DistanceFunctionTest extend
//Geo Hash Haversine
//Can verify here: http://www.movable-type.co.uk/scripts/latlong.html, but they use a slightly different radius for the earth, so just be close
- assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s, \"" + GeoHashUtils.encode(32, -79) +
+ assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s1, \"" + GeoHashUtils.encode(32, -79) +
"\",)", "fq", "id:1"), "//float[@name='score']='122.171875'");
assertQ(req("fl", "id,point_hash,score", "q", "{!func}recip(ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", point_hash, \"" + GeoHashUtils.encode(32, -79) + "\"), 1, 1, 0)"),
@@ -66,7 +66,7 @@ public class DistanceFunctionTest extend
);
- assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s, geohash(32, -79))", "fq", "id:1"), "//float[@name='score']='122.171875'");
+ assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s1, geohash(32, -79))", "fq", "id:1"), "//float[@name='score']='122.171875'");
}