You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/04/09 21:48:16 UTC
svn commit: r1586106 [4/4] - in /lucene/dev/trunk/solr: ./
contrib/clustering/src/test-files/clustering/solr/collection1/conf/
contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/
contrib/dataimporthandler/src/test-files/dih...
Modified: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml Wed Apr 9 19:48:14 2014
@@ -34,16 +34,6 @@
behavior of the fieldtype.
-->
- <!-- numeric field types that store and index the text
- value verbatim (and hence don't sort correctly or support range queries.)
- These are provided more for backward compatability, allowing one
- to create a schema that matches an existing lucene index.
- -->
- <fieldType name="pint" class="solr.IntField"/>
- <fieldType name="plong" class="solr.LongField"/>
- <fieldtype name="pfloat" class="solr.FloatField"/>
- <fieldType name="pdouble" class="solr.DoubleField"/>
-
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
@@ -54,32 +44,6 @@
<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
- -->
- <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
- <!-- bcd versions of sortable numeric type may provide smaller
- storage space and support very large numbers.
- -->
- <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
- <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
- <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
-
<!-- Field type demonstrating an Analyzer failure -->
<fieldtype name="failtype1" class="solr.TextField">
<analyzer type="index">
@@ -115,7 +79,6 @@
-->
<fieldtype name="date" class="solr.TrieDateField" precisionStep="0"/>
<fieldtype name="tdate" class="solr.TrieDateField" precisionStep="6"/>
- <fieldtype name="pdate" class="solr.DateField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
@@ -530,7 +493,6 @@
<dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
<dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_bcd" type="bcdstr" indexed="true" stored="true"/>
<!-- some trie-coded dynamic fields for faster range queries -->
<dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>
@@ -545,20 +507,6 @@
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
<dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_si" type="sint" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_sl" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_sf" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_sf1" type="sfloat" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_sd" type="sdouble" indexed="true" stored="true"/>
- <dynamicField name="*_sd1" type="sdouble" indexed="true" stored="true" multiValued="false"/>
-
- <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
- <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
-
-
<dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
<dynamicField name="t_*" type="text" indexed="true" stored="true"/>
@@ -575,7 +523,7 @@
<!-- for testing to ensure that longer patterns are matched first -->
<dynamicField name="*aa" type="string" indexed="true" stored="true"/>
- <dynamicField name="*aaa" type="pint" indexed="false" stored="true"/>
+ <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>
<!-- ignored becuase not stored or indexed -->
<dynamicField name="*_ignored" type="text" indexed="false" stored="false"/>
@@ -608,15 +556,8 @@
<copyField source="*_t" dest="text"/>
- <copyField source="id" dest="range_facet_si"/>
<copyField source="id" dest="range_facet_l"/>
- <copyField source="id" dest="range_facet_sl"/>
- <copyField source="range_facet_f" dest="range_facet_sf"/>
<copyField source="range_facet_f" dest="range_facet_d"/>
- <copyField source="range_facet_f" dest="range_facet_sd"/>
-
- <copyField source="bday" dest="bday_pdt"/>
- <copyField source="a_tdt" dest="a_pdt"/>
<!-- dynamic destination -->
<copyField source="*_dynamic" dest="dynamic_*"/>
Modified: lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml (original)
+++ lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml Wed Apr 9 19:48:14 2014
@@ -23,7 +23,7 @@
<schema name="test" version="1.0">
<types>
- <fieldtype name="sint" class="solr.SortableIntField" />
+ <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -37,7 +37,7 @@
<fields>
- <field name="id" type="sint" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
</fields>
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Wed Apr 9 19:48:14 2014
@@ -626,7 +626,7 @@ abstract public class SolrExampleTests e
server.commit();
assertNumFound( "*:*", 0 ); // make sure it got in
- String f = "val_pi";
+ String f = "val_i";
int i=0; // 0 1 2 3 4 5 6 7 8 9
int[] nums = new int[] { 23, 26, 38, 46, 55, 63, 77, 84, 92, 94 };
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Wed Apr 9 19:48:14 2014
@@ -100,21 +100,11 @@ public abstract class AbstractFullDistri
protected boolean printLayoutOnTearDown = false;
String t1 = "a_t";
- String i1 = "a_si";
- String nint = "n_i";
- String tint = "n_ti";
- String nfloat = "n_f";
- String tfloat = "n_tf";
- String ndouble = "n_d";
- String tdouble = "n_td";
- String nlong = "n_l";
+ String i1 = "a_i1";
String tlong = "other_tl1";
- String ndate = "n_dt";
- String tdate = "n_tdt";
-
+
String oddField = "oddField_s";
String missingField = "ignore_exception__missing_but_valid_field_t";
- String invalidField = "ignore_exception__invalid_field_not_in_schema";
protected int sliceCount;
protected CloudSolrServer controlClientCloud; // cloud version of the control client
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/StopableIndexingThread.java Wed Apr 9 19:48:14 2014
@@ -30,7 +30,7 @@ import org.apache.solr.common.SolrInputD
public class StopableIndexingThread extends AbstractFullDistribZkTestBase.StopableThread {
private static String t1 = "a_t";
- private static String i1 = "a_si";
+ private static String i1 = "a_i";
private volatile boolean stop = false;
protected final String id;
protected final List<String> deletes = new ArrayList<>();