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/13 02:16:01 UTC
[1/8] lucene-solr:jira/SOLR-10834: SOLR-10834: first step: bulk
change test schemas using numeric uniqueKey fields to use string instead
Repository: lucene-solr
Updated Branches:
refs/heads/jira/SOLR-10834 [created] 15983ceec
SOLR-10834: first step: bulk change test schemas using numeric uniqueKey fields to use string instead
many, many tests fail with this change
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1625df3d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1625df3d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1625df3d
Branch: refs/heads/jira/SOLR-10834
Commit: 1625df3d21b8fa27815d7a7b89a55fc338eeb23b
Parents: f434e34
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Jun 9 17:49:15 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Jun 9 17:49:15 2017 -0700
----------------------------------------------------------------------
.../solr/collection1/conf/schema-icucollate-dv.xml | 4 ++--
.../solr/collection1/conf/schema-icucollate.xml | 4 ++--
.../solr/collection1/conf/schema-icucollateoptions.xml | 4 ++--
.../src/test-files/solr/analysisconfs/analysis-err-schema.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-binaryfield.xml | 2 +-
.../solr/collection1/conf/schema-blockjoinfacetcomponent.xml | 2 +-
solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-charfilters.xml | 4 ++--
.../src/test-files/solr/collection1/conf/schema-collate-dv.xml | 4 ++--
.../src/test-files/solr/collection1/conf/schema-collate.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-copyfield-test.xml | 2 +-
.../test-files/solr/collection1/conf/schema-custom-field.xml | 2 +-
.../test-files/solr/collection1/conf/schema-customfield.xml | 3 ++-
solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml | 4 ++--
solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml | 4 ++--
.../solr/collection1/conf/schema-distributed-missing-sort.xml | 2 +-
.../src/test-files/solr/collection1/conf/schema-docValues.xml | 2 +-
.../solr/collection1/conf/schema-field-sort-values.xml | 2 +-
solr/core/src/test-files/solr/collection1/conf/schema-hash.xml | 2 +-
solr/core/src/test-files/solr/collection1/conf/schema-ib.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-lmdirichlet.xml | 4 ++--
.../solr/collection1/conf/schema-lmjelinekmercer.xml | 4 ++--
.../solr/collection1/conf/schema-not-required-unique-key.xml | 2 +-
.../test-files/solr/collection1/conf/schema-phrasesuggest.xml | 4 ++--
.../solr/collection1/conf/schema-postingshighlight.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-replication1.xml | 2 +-
.../test-files/solr/collection1/conf/schema-replication2.xml | 2 +-
.../solr/collection1/conf/schema-required-fields.xml | 2 +-
.../src/test-files/solr/collection1/conf/schema-reversed.xml | 2 +-
.../solr/collection1/conf/schema-sim-default-override.xml | 4 ++--
solr/core/src/test-files/solr/collection1/conf/schema-sim.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-simpleqpplugin.xml | 4 ++--
.../core/src/test-files/solr/collection1/conf/schema-sorts.xml | 2 +-
solr/core/src/test-files/solr/collection1/conf/schema-sql.xml | 2 +-
.../src/test-files/solr/collection1/conf/schema-sweetspot.xml | 4 ++--
.../solr/collection1/conf/schema-synonym-tokenizer.xml | 6 +++---
.../core/src/test-files/solr/collection1/conf/schema-tfidf.xml | 4 ++--
.../test-files/solr/collection1/conf/schema-tokenizer-test.xml | 5 +++--
solr/core/src/test-files/solr/collection1/conf/schema-trie.xml | 2 +-
.../solr/collection1/conf/schema-unifiedhighlight.xml | 4 ++--
solr/core/src/test-files/solr/collection1/conf/schema.xml | 2 +-
solr/core/src/test-files/solr/collection1/conf/schema11.xml | 2 +-
.../src/test-files/solr/configsets/configset-2/conf/schema.xml | 2 +-
solr/core/src/test-files/solr/crazy-path-to-schema.xml | 4 ++--
.../solrj/solr/collection1/conf/schema-replication1.xml | 2 +-
.../src/test-files/solrj/solr/collection1/conf/schema-sql.xml | 2 +-
.../src/test-files/solrj/solr/collection1/conf/schema.xml | 2 +-
solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml | 4 ++--
48 files changed, 76 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
index 1e2029d..63f7330 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
<field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
index 1d121f2..9698013 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
<field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
index cc8e340..59b8d25 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -47,7 +47,7 @@
locale="en" strength="tertiary" caseFirst="upper"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ignore_punctuation" type="sort_ignore_punctuation_t" indexed="true" stored="false"
multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
index 168df6b..eedf4b7 100644
--- a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
+++ b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
@@ -22,7 +22,7 @@
<schema name="test" version="1.6">
<fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -32,7 +32,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="true"/>
<field name="_version_" type="long"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
index eb33896..26a428d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
@@ -67,7 +67,7 @@
<fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="data" type="binary" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
index e262b73..e8c985f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
@@ -22,7 +22,7 @@
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
index 13924b7..7c31f15 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for BM25SimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
index 11e2aa7..1adb7aa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
@@ -16,7 +16,7 @@
-->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="4" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- charfilter only at query-time -->
<fieldType name="text" class="solr.TextField">
<analyzer type="index">
@@ -38,7 +38,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="content" type="text" indexed="true" stored="true"/>
<field name="content2" type="text2" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
index af74654..0a2953d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for CollationField -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
<field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
index d5c4d69..bfe65b1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for CollationField -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
<field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
index c16bf55..96adf2d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
@@ -333,7 +333,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index 58c40d5..af6dc9c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
@@ -26,7 +26,7 @@
</analyzer>
</fieldType>
<fieldType class="org.apache.solr.schema.SortableBinaryField" name="sortable_binary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
index 4d0cbfd..83948b7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
@@ -32,6 +32,7 @@
attribute and any other attributes determine the real type and
behavior of the fieldType.
-->
+ <fieldType name="string" class="solr.StrField"/>
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
@@ -65,7 +66,7 @@
<fieldType name="customtrieintfield" class="org.apache.solr.schema.TrieIntPrefixActsAsRangeQueryFieldType"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="intfield" type="int" indexed="true" stored="true"/>
<field name="swap_foo_bar_in_prefix_query" type="customfield" indexed="true" stored="true" multiValued="true"/>
<field name="int_prefix_as_range" type="customtrieintfield" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
index c3dc509..184f142 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for DFISimilarityFactory -->
<schema name="dfi" version="1.5">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -39,7 +39,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
index 4b27707..3083510 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for DFRSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -54,7 +54,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
<field name="text_paramc" type="text_paramc" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
index 822d2be..3c1f589 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
@@ -45,7 +45,7 @@
<fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="string_mf" class="solr.StrField" sortMissingFirst="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string_ml" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="signatureField" type="string_ml" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
index 9e4286d..b7e24c7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
@@ -53,7 +53,7 @@
<fieldType name="uuid" class="solr.UUIDField"/>
- <field name="id" type="int" required="true"/>
+ <field name="id" type="string" required="true"/>
<field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1"/>
<field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
index 0cd22b0..94485f6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
@@ -26,7 +26,7 @@
</analyzer>
</fieldType>
<fieldType class="org.apache.solr.schema.WrappedIntField" name="wrapped_int"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="payload" type="wrapped_int" indexed="false"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
index 07ef7b1..5389614 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
@@ -436,7 +436,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
index e477e25..7e66bb5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for IBSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -42,7 +42,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
index a51685e..3c25098 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for LMDirichletSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -35,7 +35,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
index 7c0fcd3..a90fd65 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for LMJelinekMercerSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -35,7 +35,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
index e2bbef3..d38952f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
@@ -31,7 +31,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" multiValued="false" indexed="true" stored="true" required="false"/>
+ <field name="id" type="string" multiValued="false" indexed="true" stored="true" required="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
index 0bc78d6..7059cd3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for phrase suggestions -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -48,7 +48,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="stext" type="text" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
index 18aa51a..e68ba0f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for PostingsHighlighter -->
<schema name="postingshighlight" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets! -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_offsets" indexed="true" stored="true"/>
<field name="text2" type="text" indexed="true" stored="true"/>
<field name="text3" type="text_offsets" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
index b647fa2..eeb51bd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
@@ -30,7 +30,7 @@
<fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
index 8c8c49d..ade7bf5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
@@ -30,7 +30,7 @@
<fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
<!--adding new field newname in replication test.-->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
index f394bbb..551ac1d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
@@ -316,7 +316,7 @@
</fieldType>
- <field name="id" type="int" multiValued="false" indexed="true"
+ <field name="id" type="string" multiValued="false" indexed="true"
stored="true"/> <!-- the uniqueKey is required by default -->
<field name="name" type="nametext" indexed="true" stored="true" required="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
index 63887cb..3bb52eb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
@@ -66,7 +66,7 @@
</fieldType>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="one" type="srev" indexed="true" stored="false"/>
<field name="two" type="rev" indexed="true" stored="false"/>
<field name="three" type="text" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
index 100caaf..2764324 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
@@ -50,7 +50,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="sim1text" type="sim-explicit" indexed="true" stored="true"/>
<field name="sim2text" type="sim-used-as-default-override" indexed="true" stored="true"/>
<field name="sim3text" type="sim-none-get-default" indexed="true" stored="true"/>
@@ -60,7 +60,7 @@
<dynamicField name="*_sim2" type="sim-used-as-default-override" indexed="true" stored="true"/>
<dynamicField name="*_sim3" type="sim-none-get-default" indexed="true" stored="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
index 68c4d6d..b941571 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
@@ -19,7 +19,7 @@
<!-- Per-field similarity example for testing -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- some per-field similarity examples -->
<!-- specify a Similarity classname directly -->
<fieldType name="sim1" class="solr.TextField">
@@ -46,7 +46,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="sim1text" type="sim1" indexed="true" stored="true"/>
<field name="sim2text" type="sim2" indexed="true" stored="true"/>
<field name="sim3text" type="sim3" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
index 1183fd0..0ed7e10 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
@@ -20,7 +20,7 @@
<!-- Test schema file for SimpleQParserPlugin. -->
<schema name="simpleqp" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets -->
<fieldType name="text" class="solr.TextField">
@@ -50,7 +50,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text0" type="text" indexed="true" stored="true"/>
<field name="text1" type="text" indexed="true" stored="true"/>
<field name="text-keyword0" type="text-keyword" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
index 8497318..1ff68c1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
@@ -25,7 +25,7 @@ NOTE: Tests expect every field in this schema to be sortable.
<schema name="sortable" version="1.6">
<uniqueKey>id</uniqueKey>
- <field name="id" type="int"/>
+ <field name="id" type="str"/>
<field name="_version_" type="long"/>
<field name="str" type="str"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/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 efa110c..e73c9c9 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
@@ -436,7 +436,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<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/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
index ba021a2..080faab 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for SweetSpotSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField"
@@ -59,7 +59,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text"/>
<field name="text_baseline" type="text_baseline"/>
<field name="text_hyperbolic" type="text_hyperbolic"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
index 09792f9..8ab64af 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for SynonymGraphFilterFactory argument "tokenizerFactory" -->
<schema name="synonym-test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="text_synonyms" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
@@ -33,8 +33,8 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_synonyms" indexed="true" stored="false"/>
<uniqueKey>id</uniqueKey>
-</schema>
\ No newline at end of file
+</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
index 0bec86f..df05e82 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
@@ -38,7 +38,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
index af28016..174787e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
@@ -32,7 +32,8 @@ more concise example.
attribute and any other attributes determine the real type and
behavior of the fieldType.
-->
-
+ <fieldType name="string" class="solr.StrField" />
+
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
@@ -127,7 +128,7 @@ more concise example.
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="letter" type="letterfieldType" indexed="true" stored="true"/>
<field name="lowerCase" type="lowerCasefieldType" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
index 8cab0c8..775ec9d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
@@ -273,7 +273,7 @@
-->
<!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="tfloat" indexed="true" stored="true" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
index 3e093f3..0c9a083 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for UnifiedHighlighter -->
<schema name="unifiedhighlight" version="1.6" >
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets! -->
<fieldType name="text" class="solr.TextField">
@@ -36,7 +36,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_offsets" indexed="true" stored="true"/>
<field name="text2" type="text" indexed="true" stored="true"/>
<field name="text3" type="text_offsets" indexed="true" stored="true" large="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index 05145f9..446e1e3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -497,7 +497,7 @@
</fieldType>
<fieldType name="severityType" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/collection1/conf/schema11.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema11.xml b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
index caa24cc..efdad8c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema11.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
@@ -320,7 +320,7 @@ valued. -->
-->
<!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="float" indexed="true" stored="true" required="true" />
+ <field name="id" type="string" indexed="true" stored="true" required="true" />
<field name="text" type="text" indexed="true" stored="false" />
<!-- Test a point field for distances -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
index 981e522..cb4b0e7 100644
--- a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
@@ -18,7 +18,7 @@
<schema name="minimal" version="1.1">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/core/src/test-files/solr/crazy-path-to-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
index ef9ce3a..dd20b6b 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
@@ -23,7 +23,7 @@
<schema name="test" version="1.0">
<types>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" precisionStep="0"/>
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -37,7 +37,7 @@
<fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
</fields>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
index b647fa2..eeb51bd 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
@@ -30,7 +30,7 @@
<fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml
index da9ad08..f3187ec 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml
@@ -436,7 +436,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<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/1625df3d/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
index cd1422b..1886681 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
@@ -411,7 +411,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1625df3d/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
index 6901cd8..6954fc6 100644
--- a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
@@ -28,7 +28,7 @@ that just finds leaf <fieldType> and <field> nodes and there's no reason to brea
-->
<schema name="test" version="1.0">
<types> <!-- Intentionally left in. see comment above -->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -42,7 +42,7 @@ that just finds leaf <fieldType> and <field> nodes and there's no reason to brea
<fields> <!-- Intentionally left in. see comment above -->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
</fields>
[3/8] lucene-solr:jira/SOLR-10834: some scripted conversion of
xpaths: int|float -> str when dealing with @name=id
Posted by ho...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index cf43a68..43d07c5 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -166,31 +166,31 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(adoc("id", "4"));
assertU(commit());
assertQ(req("q", "*:*", "sort", "floatdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "intdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "doubledv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "longdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "datedv desc", "rows", "1", "fl", "id,datedv"),
- "//int[@name='id'][.='2']",
+ "//str[@name='id'][.='2']",
"//result/doc[1]/date[@name='datedv'][.='1997-12-31T23:59:59.999Z']"
);
assertQ(req("q", "*:*", "sort", "stringdv desc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='4']");
+ "//str[@name='id'][.='4']");
assertQ(req("q", "*:*", "sort", "floatdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='4']");
+ "//str[@name='id'][.='4']");
assertQ(req("q", "*:*", "sort", "intdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "doubledv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "longdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='3']");
+ "//str[@name='id'][.='3']");
assertQ(req("q", "*:*", "sort", "datedv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
assertQ(req("q", "*:*", "sort", "stringdv asc", "rows", "1", "fl", "id"),
- "//int[@name='id'][.='2']");
+ "//str[@name='id'][.='2']");
assertQ(req("q", "*:*", "sort", "booldv asc", "rows", "10", "fl", "booldv,stringdv"),
"//result/doc[1]/bool[@name='booldv'][.='false']",
"//result/doc[2]/bool[@name='booldv'][.='true']",
@@ -212,13 +212,13 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(adoc("id", "7", "doubledv", "1.7976931348623157E308"));
assertU(commit());
assertQ(req("fl", "id", "q", "*:*", "sort", "doubledv asc"),
- "//result/doc[1]/int[@name='id'][.='6']",
- "//result/doc[2]/int[@name='id'][.='5']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']",
- "//result/doc[5]/int[@name='id'][.='1']",
- "//result/doc[6]/int[@name='id'][.='2']",
- "//result/doc[7]/int[@name='id'][.='7']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='1']",
+ "//result/doc[6]/str[@name='id'][.='2']",
+ "//result/doc[7]/str[@name='id'][.='7']"
);
}
@@ -368,154 +368,154 @@ public class DocValuesTest extends SolrTestCaseJ4 {
// string: termquery
assertQ(req("q", "stringdv:car", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// string: range query
assertQ(req("q", "stringdv:[b TO d]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// string: prefix query
assertQ(req("q", "stringdv:c*", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// string: wildcard query
assertQ(req("q", "stringdv:c?r", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// string: regexp query
assertQ(req("q", "stringdv:/c[a-b]r/", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// float: termquery
assertQ(req("q", "floatdv:3", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// float: rangequery
assertQ(req("q", "floatdv:[2 TO 3]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// (neg) float: termquery
assertQ(req("q", "floatdv:\"-5\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) float: rangequery
assertQ(req("q", "floatdv:[-6 TO -4]", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) float: rangequery
assertQ(req("q", "floatdv:[-6 TO 2.1]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]"
);
// int: termquery
assertQ(req("q", "intdv:1", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=3]"
);
// int: rangequery
assertQ(req("q", "intdv:[3 TO 4]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]"
);
// (neg) int: termquery
assertQ(req("q", "intdv:\"-1\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
// (neg) int: rangequery
assertQ(req("q", "intdv:[-1 TO 1]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// long: termquery
assertQ(req("q", "longdv:1", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=3]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=3]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// long: rangequery
assertQ(req("q", "longdv:[1 TO 2]", "sort", "id asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// double: termquery
assertQ(req("q", "doubledv:3.1", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
// double: rangequery
assertQ(req("q", "doubledv:[2 TO 3.3]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
// (neg) double: termquery
assertQ(req("q", "doubledv:\"-4.3\"", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) double: rangequery
assertQ(req("q", "doubledv:[-6 TO -4]", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) double: rangequery
assertQ(req("q", "doubledv:[-6 TO 2.0]", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
// boolean basic queries:
assertQ(req("q", "booldv:false", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
assertQ(req("q", "booldv:true", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -617,7 +617,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
if((minInclusive && minSortable<=valSortable || !minInclusive && minSortable<valSortable) &&
(maxInclusive && maxSortable>=valSortable || !maxInclusive && maxSortable>valSortable)) {
counter++;
- tests.add("//result/doc["+counter+"]/int[@name='id'][.="+(k+1)+"]");
+ tests.add("//result/doc["+counter+"]/str[@name='id'][.="+(k+1)+"]");
tests.add("//result/doc["+counter+"]/float[@name='score'][.=1.0]");
}
}
@@ -656,86 +656,86 @@ public class DocValuesTest extends SolrTestCaseJ4 {
// Negative Zero to Positive
assertQ(req("q", fieldName[i]+":[-0.0 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
// Negative to Positive Zero
assertQ(req("q", fieldName[i]+":[-6 TO 0]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=5]"
);
// Negative to Positive
assertQ(req("q", fieldName[i]+":[-6 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
// Positive to Positive
assertQ(req("q", fieldName[i]+":[2 TO 3]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]"
);
// Positive to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[2 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=4]",
- "//result/doc[4]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=4]",
+ "//result/doc[4]/str[@name='id'][.=7]"
);
// NEGATIVE_INF to Negative
assertQ(req("q", fieldName[i]+":[* TO -1]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=6]"
);
// NEGATIVE_INF to Positive
assertQ(req("q", fieldName[i]+":[* TO 2]", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=5]",
- "//result/doc[4]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=5]",
+ "//result/doc[4]/str[@name='id'][.=6]"
);
// NEGATIVE_INF to Positive (non-inclusive)
assertQ(req("q", fieldName[i]+":[* TO 2}", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=5]",
- "//result/doc[3]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=5]",
+ "//result/doc[3]/str[@name='id'][.=6]"
);
// Negative to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[-6 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='6']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]",
- "//result/doc[4]/int[@name='id'][.=4]",
- "//result/doc[5]/int[@name='id'][.=5]",
- "//result/doc[6]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]",
+ "//result/doc[4]/str[@name='id'][.=4]",
+ "//result/doc[5]/str[@name='id'][.=5]",
+ "//result/doc[6]/str[@name='id'][.=7]"
);
// NEGATIVE_INF to POSITIVE_INF
assertQ(req("q", fieldName[i]+":[* TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='7']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]",
- "//result/doc[4]/int[@name='id'][.=4]",
- "//result/doc[5]/int[@name='id'][.=5]",
- "//result/doc[6]/int[@name='id'][.=6]",
- "//result/doc[7]/int[@name='id'][.=7]",
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]",
+ "//result/doc[4]/str[@name='id'][.=4]",
+ "//result/doc[5]/str[@name='id'][.=5]",
+ "//result/doc[6]/str[@name='id'][.=6]",
+ "//result/doc[7]/str[@name='id'][.=7]",
"//result/doc[1]/float[@name='score'][.=1.0]",
"//result/doc[2]/float[@name='score'][.=1.0]",
"//result/doc[3]/float[@name='score'][.=1.0]",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
index 1a429b2..3237b65 100644
--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
@@ -57,14 +57,14 @@ public class IndexSchemaRuntimeFieldTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
// Check to see if our copy field made it out safely
query.setQuery( "dynamic_runtime:aaa" );
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
clearIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/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 44716bb..7790859 100644
--- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
@@ -58,7 +58,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
args = new HashMap<>();
@@ -67,7 +67,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic source", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
args = new HashMap<>();
@@ -76,7 +76,7 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic destination", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
);
clearIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
index 6351b82..7a26d4d 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
@@ -98,8 +98,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -112,8 +112,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -124,8 +124,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -137,8 +137,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -161,9 +161,9 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -175,8 +175,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_zh_full:Testing", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -188,8 +188,8 @@ public class TestCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
index 1de339a..676dd65 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
@@ -97,8 +97,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -111,8 +111,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -123,8 +123,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -136,8 +136,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -160,9 +160,9 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -174,8 +174,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_zh_full:Testing", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -187,8 +187,8 @@ public class TestCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java b/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
index feb9236..eb8c196 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestHalfAndHalfDocValues.java
@@ -123,9 +123,9 @@ public class TestHalfAndHalfDocValues extends SolrTestCaseJ4 {
// Assert sort order is correct
assertQ(req("q", "string_add_dv_later:*", "sort", "string_add_dv_later asc"),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
index 19081b9..0fcc9fe 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java
@@ -34,8 +34,8 @@ public class TestOmitPositions extends SolrTestCaseJ4 {
assertQ("term query: ",
req("fl", "id", "q", "nopositionstext:test"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
index 720f9b5..66034c9 100644
--- a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
+++ b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java
@@ -142,7 +142,7 @@ public class SpatialFilterTest extends SolrTestCaseJ4 {
if (docIds != null && docIds.length > 0) {
int i = 1;
for (int docId : docIds) {
- tests[i++] = "//result/doc/int[@name='id'][.='" + docId + "']";
+ tests[i++] = "//result/doc/str[@name='id'][.='" + docId + "']";
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index ef0404c..562c865 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -73,8 +73,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_i asc, test_l desc, id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='7.0']"
- ,"//result/doc[2]/float[@name='id'][.='3.0']"
+ ,"//result/doc[1]/str[@name='id'][.='7.0']"
+ ,"//result/doc[2]/str[@name='id'][.='3.0']"
);
// group heads are selected using a complex sort, simpler sort used for final groups
@@ -84,8 +84,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='3.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='3.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// diff up the sort directions, only first clause matters with our data
@@ -95,8 +95,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='8.0']"
- ,"//result/doc[2]/float[@name='id'][.='4.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8.0']"
+ ,"//result/doc[2]/str[@name='id'][.='4.0']"
);
// tie broken by index order
@@ -106,8 +106,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='6.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='6.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
);
// score, then tiebreakers; note top level sort by score ASCENDING (just for weirdness)
@@ -117,8 +117,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='2.0']"
- ,"//result/doc[2]/float[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='2.0']"
+ ,"//result/doc[2]/str[@name='id'][.='5.0']"
);
// score, then tiebreakers; note no score in top level sort/fl to check needsScores logic
@@ -128,8 +128,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='5.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
);
// term_s desc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -139,8 +139,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='1.0']"
- ,"//result/doc[2]/float[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1.0']"
+ ,"//result/doc[2]/str[@name='id'][.='5.0']"
);
// term_s asc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -150,8 +150,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='1.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// collapse on int field
@@ -161,8 +161,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/float[@name='id'][.='4.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='4.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
);
// collapse on term_s (very sparse) with nullPolicy=collapse
@@ -172,9 +172,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc, id asc");
assertQ(req(params)
, "*[count(//doc)=3]"
- ,"//result/doc[1]/float[@name='id'][.='5.0']"
- ,"//result/doc[2]/float[@name='id'][.='2.0']"
- ,"//result/doc[3]/float[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5.0']"
+ ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[3]/str[@name='id'][.='7.0']"
);
// sort local param + elevation
@@ -187,8 +187,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
//
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -199,8 +199,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "7.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='7.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='7.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
}
@@ -250,13 +250,13 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i min=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='6.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i max=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='2.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']");
}
@@ -378,8 +378,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']"
);
@@ -391,10 +391,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(test_i)");
params.add("sort","");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']"
);
// Test value source collapse criteria
@@ -403,9 +403,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse min=field(test_i)"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
// Test value source collapse criteria with cscore function
@@ -415,9 +415,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
// Test value source collapse criteria with cscore function but no top level score sort
@@ -429,9 +429,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fl", "id");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']"
);
// Test value source collapse criteria with compound cscore function
@@ -441,9 +441,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']"
);
//Test collapse by score with elevation
@@ -456,10 +456,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']");
//Test SOLR-5773 with score collapse criteria
// try both default & sort localparams as alternate ways to ask for max score
@@ -473,9 +473,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']");
}
//Test SOLR-5773 with max field collapse criteria
@@ -490,9 +490,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']");
}
//Test SOLR-5773 with min field collapse criteria
@@ -507,9 +507,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']");
}
//Test SOLR-5773 elevating documents with null group
@@ -522,10 +522,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "3,4");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']");
// Non trivial sort local param for picking group head
@@ -535,9 +535,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']"
);
//
params = new ModifiableSolrParams();
@@ -546,9 +546,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='3.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='3.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']"
);
@@ -562,8 +562,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -571,8 +571,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -580,8 +580,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc,id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -591,8 +591,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(id)");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
}
@@ -602,8 +602,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_i"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']"
);
try {
@@ -613,8 +613,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']");
//Test collapse by max long field
@@ -623,8 +623,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']");
} catch (Exception e) {
if(!numeric) {
throw e;
@@ -638,8 +638,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_f"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']");
//Test collapse by min float field
params = new ModifiableSolrParams();
@@ -647,8 +647,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
//Test collapse by min float field sort by score
params = new ModifiableSolrParams();
@@ -662,8 +662,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("facet.field", "{!ex=test}term_s");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']");
// Test collapse using selector field in no docs
// tie selector in all of these cases
@@ -718,9 +718,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
assertQ(req(collapse, "q", "*:*", "sort", "test_i desc"),
"*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='4.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']");
}
@@ -730,10 +730,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=expand"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='3.0']",
- "//result/doc[4]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='3.0']",
+ "//result/doc[4]/str[@name='id'][.='1.0']");
//Test nullPolicy collapse
params = new ModifiableSolrParams();
@@ -741,9 +741,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=collapse"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='1.0']");
params = new ModifiableSolrParams();
@@ -778,9 +778,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='7.0']");
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='7.0']");
}
@@ -861,14 +861,14 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=expand "+selector+"}");
assertQ(req(params)
, "*[count(//doc)=8]"
- ,"//result/doc[1]/float[@name='id'][.='8.0']"
- ,"//result/doc[2]/float[@name='id'][.='7.0']"
- ,"//result/doc[3]/float[@name='id'][.='6.0']"
- ,"//result/doc[4]/float[@name='id'][.='5.0']"
- ,"//result/doc[5]/float[@name='id'][.='4.0']"
- ,"//result/doc[6]/float[@name='id'][.='3.0']"
- ,"//result/doc[7]/float[@name='id'][.='2.0']"
- ,"//result/doc[8]/float[@name='id'][.='1.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8.0']"
+ ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[3]/str[@name='id'][.='6.0']"
+ ,"//result/doc[4]/str[@name='id'][.='5.0']"
+ ,"//result/doc[5]/str[@name='id'][.='4.0']"
+ ,"//result/doc[6]/str[@name='id'][.='3.0']"
+ ,"//result/doc[7]/str[@name='id'][.='2.0']"
+ ,"//result/doc[8]/str[@name='id'][.='1.0']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
index fb982b8..5ceb224 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
@@ -346,4 +346,4 @@ public class TestFoldingMultitermQuery extends SolrTestCaseJ4 {
public void testCJKWidth() {
assertQ(req("q", "content_width:ăƒ´ă‚£*"), "//result[@numFound='1']");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
index 05ec982..ee107dd 100644
--- a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
@@ -74,11 +74,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s maxDocFreq=10}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
//Test without maxDocFreq param. Should default to Integer.MAX_VALUE and match all terms.
@@ -86,11 +86,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
params = new ModifiableSolrParams();
@@ -104,11 +104,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=10}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='7.0']"
);
//Test with int field
@@ -116,8 +116,8 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=2}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='7.0']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index 46b7b60..a4fa1b8 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -91,7 +91,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -109,7 +109,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
@@ -128,7 +128,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set3.add(s);
}
@@ -158,7 +158,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -176,7 +176,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
@@ -203,7 +203,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set1.add(s);
}
@@ -221,7 +221,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
while(it.hasNext()) {
String s = it.next();
- String results = h.validateXPath(response, "*[count(//int[@name='id'][.='"+s+"'])=1]");
+ String results = h.validateXPath(response, "*[count(//str[@name='id'][.='"+s+"'])=1]");
if(results == null) {
set2.add(s);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index 93cc294..f79d498 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -93,12 +93,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='4.0']",
- "//result/doc[3]/float[@name='id'][.='2.0']",
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']",
- "//result/doc[6]/float[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='4.0']",
+ "//result/doc[3]/str[@name='id'][.='2.0']",
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']",
+ "//result/doc[6]/str[@name='id'][.='5.0']"
);
params = new ModifiableSolrParams();
@@ -113,12 +113,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
//Test with sort by score.
@@ -134,12 +134,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score desc");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -157,12 +157,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -179,12 +179,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='1.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']",
- "//result/doc[3]/float[@name='id'][.='6.0']",
- "//result/doc[4]/float[@name='id'][.='5.0']",
- "//result/doc[5]/float[@name='id'][.='4.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']",
+ "//result/doc[3]/str[@name='id'][.='6.0']",
+ "//result/doc[4]/str[@name='id'][.='5.0']",
+ "//result/doc[5]/str[@name='id'][.='4.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -201,12 +201,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='5.0']",
- "//result/doc[4]/float[@name='id'][.='4.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='5.0']",
+ "//result/doc[4]/str[@name='id'][.='4.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -223,12 +223,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='5.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='5.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -245,12 +245,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/float[@name='id'][.='6.0']",
- "//result/doc[5]/float[@name='id'][.='5.0']",
- "//result/doc[6]/float[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6.0']",
+ "//result/doc[5]/str[@name='id'][.='5.0']",
+ "//result/doc[6]/str[@name='id'][.='3.0']"
);
@@ -268,12 +268,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='6.0']",
- "//result/doc[4]/float[@name='id'][.='5.0']",
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='2.0']" //Not in reRankeDocs
+ "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='6.0']",
+ "//result/doc[4]/str[@name='id'][.='5.0']",
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='2.0']" //Not in reRankeDocs
);
//Test Elevation with start beyond the rerank docs
@@ -289,8 +289,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='3.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']" //Was not in reRankDocs
+ "//result/doc[1]/str[@name='id'][.='3.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']" //Was not in reRankDocs
);
//Test Elevation with zero results
@@ -320,12 +320,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
params = new ModifiableSolrParams();
@@ -338,12 +338,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
params = new ModifiableSolrParams();
@@ -356,12 +356,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='5.0']",
- "//result/doc[2]/float[@name='id'][.='6.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5.0']",
+ "//result/doc[2]/str[@name='id'][.='6.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
//Test reRankWeight of 0, reranking will have no effect.
@@ -375,11 +375,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='3.0']",
- "//result/doc[5]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='3.0']",
+ "//result/doc[5]/str[@name='id'][.='2.0']"
);
MetricsMap metrics = (MetricsMap)h.getCore().getCoreMetricManager().getRegistry().getMetrics().get("CACHE.searcher.queryResultCache");
@@ -399,11 +399,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']"
);
@@ -424,11 +424,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']",
- "//result/doc[5]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']",
+ "//result/doc[5]/str[@name='id'][.='1.0']"
);
stats = metrics.getValue();
@@ -450,12 +450,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/float[@name='id'][.='6.0']",
- "//result/doc[2]/float[@name='id'][.='5.0']",
- "//result/doc[3]/float[@name='id'][.='4.0']",
- "//result/doc[4]/float[@name='id'][.='2.0']", // reranked out of orig order
- "//result/doc[5]/float[@name='id'][.='3.0']",
- "//result/doc[6]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6.0']",
+ "//result/doc[2]/str[@name='id'][.='5.0']",
+ "//result/doc[3]/str[@name='id'][.='4.0']",
+ "//result/doc[4]/str[@name='id'][.='2.0']", // reranked out of orig order
+ "//result/doc[5]/str[@name='id'][.='3.0']",
+ "//result/doc[6]/str[@name='id'][.='1.0']"
);
@@ -469,8 +469,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='2.0']",
- "//result/doc[2]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2.0']",
+ "//result/doc[2]/str[@name='id'][.='1.0']"
);
@@ -485,7 +485,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "1");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/float[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='1.0']"
);
@@ -556,8 +556,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/float[@name='id'][.='8.0']",
- "//result/doc[2]/float[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='8.0']",
+ "//result/doc[2]/str[@name='id'][.='2.0']"
);
//Test Elevation
@@ -573,9 +573,9 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/float[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/float[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/float[@name='id'][.='8.0']"); //Boosted during rerank.
+ "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='8.0']"); //Boosted during rerank.
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestReload.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReload.java b/solr/core/src/test/org/apache/solr/search/TestReload.java
index f721d41..872abec 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReload.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReload.java
@@ -98,4 +98,4 @@ public class TestReload extends TestRTGBase {
// test framework should ensure that all searchers opened have been closed.
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
index a4b506b..4c63309 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -246,4 +246,4 @@ public class TestSearchPerf extends AbstractSolrTestCase {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 1a2e572..ee0da09 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -1038,4 +1038,4 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
, "/response/numFound==1"
);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
index b8dbf2a..d1be4fe 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
@@ -142,4 +142,4 @@ public class DebugAgg extends AggValueSource {
return new FacetLongMerger();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
index 58a1b53..ada1208 100644
--- a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
+++ b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
@@ -49,51 +49,51 @@ public class SortByFunctionTest extends AbstractSolrTestCase {
assertQ(req("fl", "*,score", "q", "*:*"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("fl", "*,score", "q", "*:*", "sort", "score desc"),
"//*[@numFound='4']",
"//float[@name='score']='1.0'",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("fl", "id,score", "q", "f_t:ipod", "sort", "score desc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
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']",
- "//result/doc[2]/int[@name='id'][.='3']",
- "//result/doc[3]/int[@name='id'][.='2']",
- "//result/doc[4]/int[@name='id'][.='1']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='1']"
);
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']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
//the function is equal, w_td1 separates
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']",
- "//result/doc[3]/int[@name='id'][.='4']",
- "//result/doc[4]/int[@name='id'][.='3']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']"
);
}
@@ -108,24 +108,24 @@ public class SortByFunctionTest extends AbstractSolrTestCase {
assertQ(req("q", "links_mfacet:B", "fl", "id", "sort", "id asc"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.='3']",
- "//result/doc[2]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']"
);
assertQ(req("q", "*:*", "fl", "id", "sort", "joindf(id_s1, links_mfacet) desc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='1']",
- "//result/doc[2]/int[@name='id'][.='2']",
- "//result/doc[3]/int[@name='id'][.='3']",
- "//result/doc[4]/int[@name='id'][.='4']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']"
);
assertQ(req("q", "*:*", "fl", "id", "sort", "joindf(id_s1, links_mfacet) asc"),
"//*[@numFound='4']",
- "//result/doc[1]/int[@name='id'][.='4']",
- "//result/doc[2]/int[@name='id'][.='3']",
- "//result/doc[3]/int[@name='id'][.='2']",
- "//result/doc[4]/int[@name='id'][.='1']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='1']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index f725994..4a8f75d 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -372,8 +372,8 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
"sort", func + " " + dir)
,"//*[@numFound='2']"
// no assumptions about order for now, see bug: SOLR-8005
- ,"//float[@name='id']='1.0'"
- ,"//float[@name='id']='2.0'"
+ ,"//str[@name='id']='1.0'"
+ ,"//str[@name='id']='2.0'"
);
}
}
@@ -430,7 +430,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc[1]/float[@name='id']='0.0'"
+ ,"//result/doc[1]/str[@name='id']='0.0'"
);
}
/** helper for testSimpleSort */
@@ -438,7 +438,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc["+numDocs+"]/float[@name='id']='0.0'"
+ ,"//result/doc["+numDocs+"]/str[@name='id']='0.0'"
);
}
[2/8] lucene-solr:jira/SOLR-10834: some scripted conversion of
xpaths: int|float -> str when dealing with @name=id
Posted by ho...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
index 026c594..c773aa8 100644
--- a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
@@ -80,69 +80,69 @@ public class SimpleMLTQParserTest extends SolrTestCaseJ4 {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt}17");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='13']",
- "//result/doc[2]/int[@name='id'][.='14']",
- "//result/doc[3]/int[@name='id'][.='15']",
- "//result/doc[4]/int[@name='id'][.='16']",
- "//result/doc[5]/int[@name='id'][.='18']",
- "//result/doc[6]/int[@name='id'][.='19']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='21']",
- "//result/doc[9]/int[@name='id'][.='22']",
- "//result/doc[10]/int[@name='id'][.='23']"
+ "//result/doc[1]/str[@name='id'][.='13']",
+ "//result/doc[2]/str[@name='id'][.='14']",
+ "//result/doc[3]/str[@name='id'][.='15']",
+ "//result/doc[4]/str[@name='id'][.='16']",
+ "//result/doc[5]/str[@name='id'][.='18']",
+ "//result/doc[6]/str[@name='id'][.='19']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='21']",
+ "//result/doc[9]/str[@name='id'][.='22']",
+ "//result/doc[10]/str[@name='id'][.='23']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt boost=true}17");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='13']",
- "//result/doc[2]/int[@name='id'][.='14']",
- "//result/doc[3]/int[@name='id'][.='15']",
- "//result/doc[4]/int[@name='id'][.='16']",
- "//result/doc[5]/int[@name='id'][.='18']",
- "//result/doc[6]/int[@name='id'][.='19']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='21']",
- "//result/doc[9]/int[@name='id'][.='22']",
- "//result/doc[10]/int[@name='id'][.='23']"
+ "//result/doc[1]/str[@name='id'][.='13']",
+ "//result/doc[2]/str[@name='id'][.='14']",
+ "//result/doc[3]/str[@name='id'][.='15']",
+ "//result/doc[4]/str[@name='id'][.='16']",
+ "//result/doc[5]/str[@name='id'][.='18']",
+ "//result/doc[6]/str[@name='id'][.='19']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='21']",
+ "//result/doc[9]/str[@name='id'][.='22']",
+ "//result/doc[10]/str[@name='id'][.='23']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt,lowerfilt1^1000 boost=false mintf=0 mindf=0}30");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='31']",
- "//result/doc[2]/int[@name='id'][.='13']",
- "//result/doc[3]/int[@name='id'][.='14']",
- "//result/doc[4]/int[@name='id'][.='18']",
- "//result/doc[5]/int[@name='id'][.='20']",
- "//result/doc[6]/int[@name='id'][.='22']",
- "//result/doc[7]/int[@name='id'][.='23']",
- "//result/doc[8]/int[@name='id'][.='32']",
- "//result/doc[9]/int[@name='id'][.='15']",
- "//result/doc[10]/int[@name='id'][.='16']"
+ "//result/doc[1]/str[@name='id'][.='31']",
+ "//result/doc[2]/str[@name='id'][.='13']",
+ "//result/doc[3]/str[@name='id'][.='14']",
+ "//result/doc[4]/str[@name='id'][.='18']",
+ "//result/doc[5]/str[@name='id'][.='20']",
+ "//result/doc[6]/str[@name='id'][.='22']",
+ "//result/doc[7]/str[@name='id'][.='23']",
+ "//result/doc[8]/str[@name='id'][.='32']",
+ "//result/doc[9]/str[@name='id'][.='15']",
+ "//result/doc[10]/str[@name='id'][.='16']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt,lowerfilt1^1000 boost=true mintf=0 mindf=0}30");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='29']",
- "//result/doc[2]/int[@name='id'][.='31']",
- "//result/doc[3]/int[@name='id'][.='32']",
- "//result/doc[4]/int[@name='id'][.='13']",
- "//result/doc[5]/int[@name='id'][.='14']",
- "//result/doc[6]/int[@name='id'][.='18']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='22']",
- "//result/doc[9]/int[@name='id'][.='23']",
- "//result/doc[10]/int[@name='id'][.='15']"
+ "//result/doc[1]/str[@name='id'][.='29']",
+ "//result/doc[2]/str[@name='id'][.='31']",
+ "//result/doc[3]/str[@name='id'][.='32']",
+ "//result/doc[4]/str[@name='id'][.='13']",
+ "//result/doc[5]/str[@name='id'][.='14']",
+ "//result/doc[6]/str[@name='id'][.='18']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='22']",
+ "//result/doc[9]/str[@name='id'][.='23']",
+ "//result/doc[10]/str[@name='id'][.='15']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt mindf=0 mintf=1}26");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='29']",
- "//result/doc[2]/int[@name='id'][.='27']",
- "//result/doc[3]/int[@name='id'][.='28']"
+ "//result/doc[1]/str[@name='id'][.='29']",
+ "//result/doc[2]/str[@name='id'][.='27']",
+ "//result/doc[3]/str[@name='id'][.='28']"
);
params = new ModifiableSolrParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
index 1cbe849..17091ab 100644
--- a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
@@ -61,4 +61,4 @@ public class MockAuthorizationPlugin implements AuthorizationPlugin {
public void close() throws IOException {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
index 7f2fe73..d886f17 100644
--- a/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
@@ -172,4 +172,4 @@ public class NoCacheHeaderTest extends CacheHeaderTestBase {
head = response.getFirstHeader("Expires");
assertNull("We got an Expires header in response", head);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
index ed8e812..321e9ad 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
@@ -114,4 +114,4 @@ public class TestAnalyzeInfixSuggestions extends SolrTestCaseJ4 {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
index a091235..f304f8e 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
@@ -54,4 +54,4 @@ public class TestFreeTextSuggestions extends SolrTestCaseJ4 {
);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index bfcf015..46282fa 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -1162,7 +1162,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='666']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1177,7 +1177,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG after atomic update"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1191,7 +1191,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": post commit RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1214,7 +1214,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG#7"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='708']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1228,7 +1228,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG#7 after atomic update"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='153']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1243,7 +1243,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG#8"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='666']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1257,7 +1257,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG after atomic update"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1272,7 +1272,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": doc7 post commit RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='153']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1284,7 +1284,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": doc8 post commit RTG"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index aa536a7..df2e7aa 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -503,4 +503,4 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
writer.addDocument(doc);
return writer.numDocs() - 1;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
index b9121c3..3514fb8 100644
--- a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
@@ -89,4 +89,4 @@ public class PrimUtilsTest extends LuceneTestCase {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java b/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
index 0ca65ed..4272ad7 100644
--- a/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
+++ b/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
@@ -186,4 +186,4 @@ public class UtilsToolTest extends SolrTestCaseJ4 {
CommandLine cli = parseCmdLine(args, tool.getOptions());
return tool.runTool(cli);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
index c21e5ca..0107af1 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
@@ -165,4 +165,4 @@ public class BitVectorTest extends LuceneTestCase {
assertEquals(vector.getRegister(i), 17/*arbitrary*/);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
index 7e98771..02f9a46 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
@@ -231,4 +231,4 @@ public class ExplicitHLLTest extends LuceneTestCase {
private static HLL newHLL(final int explicitThreshold) {
return new HLL(11/*log2m, unused*/, 5/*regwidth, unused*/, explicitThreshold, 256/*sparseThreshold, arbitrary, unused*/, HLLType.EXPLICIT);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
index 95cc6eb..aef4838 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
@@ -337,4 +337,4 @@ public class FullHLLTest extends LuceneTestCase {
assertFalse(iterA.hasNext());
assertFalse(iterB.hasNext());
}
-}
\ No newline at end of file
+}
[5/8] lucene-solr:jira/SOLR-10834: fix manual mistake made in schema
changes
Posted by ho...@apache.org.
fix manual mistake made in schema changes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ec032602
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ec032602
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ec032602
Branch: refs/heads/jira/SOLR-10834
Commit: ec03260265f8a3bbdfd7f9b015de16a4950a05eb
Parents: 5d43005
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 09:11:39 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 09:11:39 2017 -0700
----------------------------------------------------------------------
solr/core/src/test-files/solr/crazy-path-to-schema.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ec032602/solr/core/src/test-files/solr/crazy-path-to-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
index dd20b6b..5b443ea 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
@@ -23,7 +23,7 @@
<schema name="test" version="1.0">
<types>
- <fieldType name="string" class="solr.StrField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
[8/8] lucene-solr:jira/SOLR-10834: remove useless sort ordering /
assumption
Posted by ho...@apache.org.
remove useless sort ordering / assumption
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/15983cee
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/15983cee
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/15983cee
Branch: refs/heads/jira/SOLR-10834
Commit: 15983ceec4702dc8c7562250d59cd8231c67d46a
Parents: e18e2e7
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 17:59:56 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 17:59:56 2017 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/schema/TestICUCollationField.java | 6 +++---
.../org/apache/solr/schema/TestICUCollationFieldDocValues.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15983cee/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index 3e28000..f164080 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -183,10 +183,10 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
*/
public void testCustomCollation() {
assertQ("Collated TQ: ",
- req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
+ req("fl", "id", "q", "sort_custom:toene"),
"//*[@numFound='2']",
- "//result/doc[1]/str[@name='id'][.=4]",
- "//result/doc[2]/str[@name='id'][.=10]"
+ "//result/doc/str[@name='id'][.=4]",
+ "//result/doc/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15983cee/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
index 8abe4b2..57b403a 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
@@ -171,10 +171,10 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
*/
public void testCustomCollation() {
assertQ("Collated TQ: ",
- req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
+ req("fl", "id", "q", "sort_custom:toene"),
"//*[@numFound='2']",
- "//result/doc[1]/str[@name='id'][.=4]",
- "//result/doc[2]/str[@name='id'][.=10]"
+ "//result/doc/str[@name='id'][.=4]",
+ "//result/doc/str[@name='id'][.=10]"
);
}
}
[6/8] lucene-solr:jira/SOLR-10834: more scripted conversions of xpath
(and json 'path') expressions realted to numeric ids -- including converting
any '\d+.0' float ids to just the integer part (as a quoted string)
Posted by ho...@apache.org.
more scripted conversions of xpath (and json 'path') expressions realted to numeric ids -- including converting any '\d+.0' float ids to just the integer part (as a quoted string)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/134e210b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/134e210b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/134e210b
Branch: refs/heads/jira/SOLR-10834
Commit: 134e210bdf601600a9d90dd0720a35cb122896b0
Parents: ec03260
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 09:25:50 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 09:25:50 2017 -0700
----------------------------------------------------------------------
.../PathHierarchyTokenizerFactoryTest.java | 32 +--
.../component/QueryElevationComponentTest.java | 84 +++----
.../handler/component/TestExpandComponent.java | 100 ++++-----
.../transform/TestChildDocTransformer.java | 60 ++---
.../solr/search/TestCollapseQParserPlugin.java | 218 +++++++++----------
.../TestComplexPhraseLeadingWildcard.java | 2 +-
.../search/TestGraphTermsQParserPlugin.java | 34 +--
.../org/apache/solr/search/TestQueryTypes.java | 16 +-
.../solr/search/TestReRankQParserPlugin.java | 206 +++++++++---------
.../function/TestMinMaxOnMultiValuedField.java | 8 +-
.../update/processor/AtomicUpdatesTest.java | 18 +-
11 files changed, 389 insertions(+), 389 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
index d079166..ded7f18 100644
--- a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
@@ -54,21 +54,21 @@ public class PathHierarchyTokenizerFactoryTest extends SolrTestCaseJ4 {
assertQ(req("{!field f=cat_path}Books/NonFic")
,"//*[@numFound='4']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
assertQ(req("{!field f=cat_path}Books/NonFic/Law")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_path}Books/NonFic/Science")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
}
@@ -76,21 +76,21 @@ public class PathHierarchyTokenizerFactoryTest extends SolrTestCaseJ4 {
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Science")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Law")
,"//*[@numFound='3']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Science/Physics")
,"//*[@numFound='3']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
index 99238e4..829c585 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
@@ -96,9 +96,9 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='3']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
- , "//result/doc[2]/str[@name='id'][.='9.0']"
- , "//result/doc[3]/str[@name='id'][.='8.0']",
+ , "//result/doc[1]/str[@name='id'][.='7']"
+ , "//result/doc[2]/str[@name='id'][.='9']"
+ , "//result/doc[3]/str[@name='id'][.='8']",
"//result/doc[1]/bool[@name='[elevated]'][.='true']",
"//result/doc[2]/bool[@name='[elevated]'][.='false']",
"//result/doc[3]/bool[@name='[elevated]'][.='false']"
@@ -144,19 +144,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -171,19 +171,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -199,19 +199,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -228,19 +228,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -258,19 +258,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='22']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='2']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='77']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='7']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='true']"
);
@@ -289,19 +289,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='22']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='2']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='66']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='6']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -750,19 +750,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND}AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND v='AAAA'}", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
index f0f0649..9c976d8 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
@@ -119,12 +119,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand", "true");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
//Basic test case page 2
@@ -139,9 +139,9 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("start", "1");
assertQ(req(params), "*[count(/response/result/doc)=1]",
"*[count(/response/lst[@name='expanded']/result)=1]",
- "/response/result/doc[1]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
//Test expand.sort
@@ -154,12 +154,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc, sub(1,1) asc");//the "sub()" just testing function queries
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5']"
);
//Test with nullPolicy, ExpandComponent should ignore docs with null values in the collapse fields.
@@ -173,13 +173,13 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=3]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='3.0']",
- "/response/result/doc[2]/str[@name='id'][.='2.0']",
- "/response/result/doc[3]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='3']",
+ "/response/result/doc[2]/str[@name='id'][.='2']",
+ "/response/result/doc[3]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5']"
);
@@ -195,12 +195,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
@@ -217,12 +217,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
//Test overide expand.fq and expand.q
@@ -239,12 +239,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
//Test expand.rows
@@ -261,10 +261,10 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
"*[count(/response/lst[@name='expanded']/result)=2]",
"*[count(/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc)=1]",
"*[count(/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc)=1]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']"
);
@@ -307,12 +307,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("fl", "id");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
index c10c3e0..2e68d78 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
@@ -145,23 +145,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testSubQueryJSON() throws Exception {
String[] test1 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==2",
- "/response/docs/[0]/children/docs/[1]/id==3",
- "/response/docs/[0]/children/docs/[2]/id==4",
- "/response/docs/[0]/children/docs/[3]/id==5",
- "/response/docs/[0]/children/docs/[4]/id==6",
- "/response/docs/[0]/children/docs/[5]/id==7"
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
+ "/response/docs/[0]/children/docs/[1]/id=='3'",
+ "/response/docs/[0]/children/docs/[2]/id=='4'",
+ "/response/docs/[0]/children/docs/[3]/id=='5'",
+ "/response/docs/[0]/children/docs/[4]/id=='6'",
+ "/response/docs/[0]/children/docs/[5]/id=='7'"
};
String[] test2 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==2",
- "/response/docs/[0]/children/docs/[1]/id==4",
- "/response/docs/[0]/children/docs/[2]/id==6"
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
+ "/response/docs/[0]/children/docs/[1]/id=='4'",
+ "/response/docs/[0]/children/docs/[2]/id=='6'"
};
String[] test3 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==3",
- "/response/docs/[0]/children/docs/[1]/id==5"
+ "/response/docs/[0]/children/docs/[0]/id=='3'",
+ "/response/docs/[0]/children/docs/[1]/id=='5'"
};
@@ -186,23 +186,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testChildDoctransformerJSON() throws Exception {
String[] test1 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
- "/response/docs/[0]/_childDocuments_/[1]/id==3",
- "/response/docs/[0]/_childDocuments_/[2]/id==4",
- "/response/docs/[0]/_childDocuments_/[3]/id==5",
- "/response/docs/[0]/_childDocuments_/[4]/id==6",
- "/response/docs/[0]/_childDocuments_/[5]/id==7"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='3'",
+ "/response/docs/[0]/_childDocuments_/[2]/id=='4'",
+ "/response/docs/[0]/_childDocuments_/[3]/id=='5'",
+ "/response/docs/[0]/_childDocuments_/[4]/id=='6'",
+ "/response/docs/[0]/_childDocuments_/[5]/id=='7'"
};
String[] test2 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
- "/response/docs/[0]/_childDocuments_/[1]/id==4",
- "/response/docs/[0]/_childDocuments_/[2]/id==6"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='4'",
+ "/response/docs/[0]/_childDocuments_/[2]/id=='6'"
};
String[] test3 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==3",
- "/response/docs/[0]/_childDocuments_/[1]/id==5"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='3'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='5'"
};
@@ -285,12 +285,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testParentFilterJSON() throws Exception {
String[] tests = new String[] {
- "/response/docs/[0]/id==1",
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
+ "/response/docs/[0]/id=='1'",
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
"/response/docs/[0]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
"/response/docs/[0]/_childDocuments_/[0]/title/[0]/=='" + titleVals[0] + "'",
- "/response/docs/[1]/id==4",
- "/response/docs/[1]/_childDocuments_/[0]/id==5",
+ "/response/docs/[1]/id=='4'",
+ "/response/docs/[1]/_childDocuments_/[0]/id=='5'",
"/response/docs/[1]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
"/response/docs/[1]/_childDocuments_/[0]/title/[0]/=='" + titleVals[1] + "'"
};
@@ -313,12 +313,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testSubQueryParentFilterJSON() throws Exception {
String[] tests = new String[] {
- "/response/docs/[0]/id==1",
- "/response/docs/[0]/children/docs/[0]/id==2",
+ "/response/docs/[0]/id=='1'",
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
"/response/docs/[0]/children/docs/[0]/cat/[0]/=='childDocument'",
"/response/docs/[0]/children/docs/[0]/title/[0]/=='" + titleVals[0] + "'",
- "/response/docs/[1]/id==4",
- "/response/docs/[1]/children/docs/[0]/id==5",
+ "/response/docs/[1]/id=='4'",
+ "/response/docs/[1]/children/docs/[0]/id=='5'",
"/response/docs/[1]/children/docs/[0]/cat/[0]/=='childDocument'",
"/response/docs/[1]/children/docs/[0]/title/[0]/=='" + titleVals[1] + "'"
};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index 562c865..9b98dba 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -73,8 +73,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_i asc, test_l desc, id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='7.0']"
- ,"//result/doc[2]/str[@name='id'][.='3.0']"
+ ,"//result/doc[1]/str[@name='id'][.='7']"
+ ,"//result/doc[2]/str[@name='id'][.='3']"
);
// group heads are selected using a complex sort, simpler sort used for final groups
@@ -84,8 +84,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='3.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='3']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// diff up the sort directions, only first clause matters with our data
@@ -95,8 +95,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='8.0']"
- ,"//result/doc[2]/str[@name='id'][.='4.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8']"
+ ,"//result/doc[2]/str[@name='id'][.='4']"
);
// tie broken by index order
@@ -106,8 +106,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='6.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='6']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
);
// score, then tiebreakers; note top level sort by score ASCENDING (just for weirdness)
@@ -117,8 +117,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='2.0']"
- ,"//result/doc[2]/str[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='2']"
+ ,"//result/doc[2]/str[@name='id'][.='5']"
);
// score, then tiebreakers; note no score in top level sort/fl to check needsScores logic
@@ -128,8 +128,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='5.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
);
// term_s desc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -139,8 +139,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='1.0']"
- ,"//result/doc[2]/str[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1']"
+ ,"//result/doc[2]/str[@name='id'][.='5']"
);
// term_s asc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -150,8 +150,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='1.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// collapse on int field
@@ -161,8 +161,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='4.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='4']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// collapse on term_s (very sparse) with nullPolicy=collapse
@@ -172,9 +172,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc, id asc");
assertQ(req(params)
, "*[count(//doc)=3]"
- ,"//result/doc[1]/str[@name='id'][.='5.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
- ,"//result/doc[3]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
+ ,"//result/doc[3]/str[@name='id'][.='7']"
);
// sort local param + elevation
@@ -187,8 +187,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='5']");
//
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -199,8 +199,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "7.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='7.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='7']",
+ "//result/doc[2]/str[@name='id'][.='1']");
}
@@ -250,13 +250,13 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i min=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='6']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i max=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='2.0']");
+ "//result/doc[1]/str[@name='id'][.='2']");
}
@@ -378,8 +378,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']"
);
@@ -391,10 +391,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(test_i)");
params.add("sort","");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']"
);
// Test value source collapse criteria
@@ -403,9 +403,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse min=field(test_i)"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
// Test value source collapse criteria with cscore function
@@ -415,9 +415,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
// Test value source collapse criteria with cscore function but no top level score sort
@@ -429,9 +429,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fl", "id");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']"
);
// Test value source collapse criteria with compound cscore function
@@ -441,9 +441,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
//Test collapse by score with elevation
@@ -456,10 +456,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='6']");
//Test SOLR-5773 with score collapse criteria
// try both default & sort localparams as alternate ways to ask for max score
@@ -473,9 +473,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']");
}
//Test SOLR-5773 with max field collapse criteria
@@ -490,9 +490,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']");
}
//Test SOLR-5773 with min field collapse criteria
@@ -507,9 +507,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']");
}
//Test SOLR-5773 elevating documents with null group
@@ -522,10 +522,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "3,4");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']");
// Non trivial sort local param for picking group head
@@ -535,9 +535,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']"
);
//
params = new ModifiableSolrParams();
@@ -546,9 +546,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='3.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']"
);
@@ -562,8 +562,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -571,8 +571,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -580,8 +580,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc,id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -591,8 +591,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(id)");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
}
@@ -602,8 +602,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_i"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='2']"
);
try {
@@ -613,8 +613,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']");
//Test collapse by max long field
@@ -623,8 +623,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']");
} catch (Exception e) {
if(!numeric) {
throw e;
@@ -638,8 +638,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_f"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']");
//Test collapse by min float field
params = new ModifiableSolrParams();
@@ -647,8 +647,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
//Test collapse by min float field sort by score
params = new ModifiableSolrParams();
@@ -662,8 +662,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("facet.field", "{!ex=test}term_s");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
// Test collapse using selector field in no docs
// tie selector in all of these cases
@@ -718,9 +718,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
assertQ(req(collapse, "q", "*:*", "sort", "test_i desc"),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']");
}
@@ -730,10 +730,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=expand"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']",
- "//result/doc[4]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='1']");
//Test nullPolicy collapse
params = new ModifiableSolrParams();
@@ -741,9 +741,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=collapse"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
@@ -778,9 +778,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='7.0']");
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='7']");
}
@@ -861,14 +861,14 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=expand "+selector+"}");
assertQ(req(params)
, "*[count(//doc)=8]"
- ,"//result/doc[1]/str[@name='id'][.='8.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
- ,"//result/doc[3]/str[@name='id'][.='6.0']"
- ,"//result/doc[4]/str[@name='id'][.='5.0']"
- ,"//result/doc[5]/str[@name='id'][.='4.0']"
- ,"//result/doc[6]/str[@name='id'][.='3.0']"
- ,"//result/doc[7]/str[@name='id'][.='2.0']"
- ,"//result/doc[8]/str[@name='id'][.='1.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
+ ,"//result/doc[3]/str[@name='id'][.='6']"
+ ,"//result/doc[4]/str[@name='id'][.='5']"
+ ,"//result/doc[5]/str[@name='id'][.='4']"
+ ,"//result/doc[6]/str[@name='id'][.='3']"
+ ,"//result/doc[7]/str[@name='id'][.='2']"
+ ,"//result/doc[8]/str[@name='id'][.='1']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
index 6c48cc3..ffccaca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
+++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
@@ -106,7 +106,7 @@ public class TestComplexPhraseLeadingWildcard extends SolrTestCaseJ4 {
xpathes[0]= "//result[@numFound=" +ids.length+ "]";
int i=1;
for(String id : ids) {
- xpathes[i++] = "//doc/int[@name='id' and text()='"+id+"']";
+ xpathes[i++] = "//doc/str[@name='id' and text()='"+id+"']";
}
return xpathes;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
index ee107dd..1cb927d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
@@ -74,11 +74,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s maxDocFreq=10}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
//Test without maxDocFreq param. Should default to Integer.MAX_VALUE and match all terms.
@@ -86,11 +86,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
params = new ModifiableSolrParams();
@@ -104,11 +104,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=10}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
//Test with int field
@@ -116,8 +116,8 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=2}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='7']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
index 3f57ee5..b4ae881 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
@@ -74,7 +74,7 @@ public class TestQueryTypes extends AbstractSolrTestCase {
// normal lucene fielded query
assertQ(req( "q",f+":\""+v+'"')
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='999.0']"
+ ,"//*[@name='id'][.='999']"
,"//*[@name='" + f + "'][.='" + v + "']"
);
@@ -352,40 +352,40 @@ public class TestQueryTypes extends AbstractSolrTestCase {
req("df", "v_t",
"q", "{!switch case.x=Dude case.z=Yonik} x ")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='1.0']");
+ ,"//*[@name='id'][.='1']");
assertQ("test empty matching switch query",
req("df", "v_t",
"q", "{!switch case.x=Dude case=Yonik} ")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='2.0']");
+ ,"//*[@name='id'][.='2']");
assertQ("test empty matching switch query",
req("df", "v_t",
"q", "{!switch case.x=Dude case=Yonik v=''}")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='2.0']");
+ ,"//*[@name='id'][.='2']");
assertQ("test empty matching switch query",
req("df", "v_t",
"q", "{!switch case.x=Dude case=Yonik v=$qq}")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='2.0']");
+ ,"//*[@name='id'][.='2']");
assertQ("test matching switch query w/deref",
req("q", "{!switch case.x=$d case.z=Yonik} x ",
"df", "v_t",
"d", "Dude")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='1.0']");
+ ,"//*[@name='id'][.='1']");
assertQ("test default switch query",
req("q", "{!switch default=$d case.x=$d case.z=Yonik}asdf",
"df", "v_t",
"d", "Dude")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='1.0']");
+ ,"//*[@name='id'][.='1']");
assertQ("test empty default switch query",
req("q", "{!switch default=$d case.x=$d case.z=Yonik v=$qq}",
"df", "v_t",
"d", "Dude")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='1.0']");
+ ,"//*[@name='id'][.='1']");
try {
ignoreException("No\\ default\\, and no switch case");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index f79d498..9b038ca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -93,12 +93,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']",
- "//result/doc[6]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='1']",
+ "//result/doc[6]/str[@name='id'][.='5']"
);
params = new ModifiableSolrParams();
@@ -113,12 +113,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
//Test with sort by score.
@@ -134,12 +134,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score desc");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -157,12 +157,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -179,12 +179,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='6.0']",
- "//result/doc[4]/str[@name='id'][.='5.0']",
- "//result/doc[5]/str[@name='id'][.='4.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='6']",
+ "//result/doc[4]/str[@name='id'][.='5']",
+ "//result/doc[5]/str[@name='id'][.='4']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -201,12 +201,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -223,12 +223,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='5.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='5']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -245,12 +245,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='5.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='5']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -268,12 +268,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='6.0']",
- "//result/doc[4]/str[@name='id'][.='5.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='2.0']" //Not in reRankeDocs
+ "//result/doc[1]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='6']",
+ "//result/doc[4]/str[@name='id'][.='5']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='2']" //Not in reRankeDocs
);
//Test Elevation with start beyond the rerank docs
@@ -289,8 +289,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']" //Was not in reRankDocs
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='2']" //Was not in reRankDocs
);
//Test Elevation with zero results
@@ -320,12 +320,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
params = new ModifiableSolrParams();
@@ -338,12 +338,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
params = new ModifiableSolrParams();
@@ -356,12 +356,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
//Test reRankWeight of 0, reranking will have no effect.
@@ -375,11 +375,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']"
);
MetricsMap metrics = (MetricsMap)h.getCore().getCoreMetricManager().getRegistry().getMetrics().get("CACHE.searcher.queryResultCache");
@@ -399,11 +399,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']",
+ "//result/doc[5]/str[@name='id'][.='1']"
);
@@ -424,11 +424,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']",
+ "//result/doc[5]/str[@name='id'][.='1']"
);
stats = metrics.getValue();
@@ -450,12 +450,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']", // reranked out of orig order
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']", // reranked out of orig order
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -469,8 +469,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='1']"
);
@@ -485,7 +485,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "1");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='1']"
);
@@ -556,8 +556,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='8.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='8']",
+ "//result/doc[2]/str[@name='id'][.='2']"
);
//Test Elevation
@@ -573,9 +573,9 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='8.0']"); //Boosted during rerank.
+ "//result/doc[1]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='8']"); //Boosted during rerank.
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index 4a8f75d..7ec690f 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -372,8 +372,8 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
"sort", func + " " + dir)
,"//*[@numFound='2']"
// no assumptions about order for now, see bug: SOLR-8005
- ,"//str[@name='id']='1.0'"
- ,"//str[@name='id']='2.0'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
);
}
}
@@ -430,7 +430,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc[1]/str[@name='id']='0.0'"
+ ,"//result/doc[1]/str[@name='id']='0'"
);
}
/** helper for testSimpleSort */
@@ -438,7 +438,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc["+numDocs+"]/str[@name='id']='0.0'"
+ ,"//result/doc["+numDocs+"]/str[@name='id']='0'"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index 46282fa..19780df 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -1043,19 +1043,19 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:2"),
- "/response/docs/[0]/id==2",
+ "/response/docs/[0]/id=='2'",
"/response/docs/[0]/title/[0]=='newtitle2'",
"/response/docs/[0]/single_i_dvo==101");
assertJQ(req("q", "id:3"),
1e-4,
- "/response/docs/[0]/id==3",
+ "/response/docs/[0]/id=='3'",
"/response/docs/[0]/title/[0]=='newtitle3'",
"/response/docs/[0]/single_d_dvo==4.14");
assertJQ(req("q", "id:4"),
1e-4,
- "/response/docs/[0]/id==4",
+ "/response/docs/[0]/id=='4'",
"/response/docs/[0]/single_s_dvo=='abc'",
"/response/docs/[0]/single_i_dvo==2");
@@ -1064,7 +1064,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:3"),
1e-4,
- "/response/docs/[0]/id==3",
+ "/response/docs/[0]/id=='3'",
"/response/docs/[0]/title/[0]=='newertitle3'",
"/response/docs/[0]/single_d_dvo==4.14");
}
@@ -1079,7 +1079,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
// test that non stored multivalued docvalues was carried forward for a non docvalues update
assertJQ(req("q", "id:1"),
- "/response/docs/[0]/id==1",
+ "/response/docs/[0]/id=='1'",
"/response/docs/[0]/title/[0]=='newtitle1'",
"/response/docs/[0]/multi_ii_dvo/[0]==100",
"/response/docs/[0]/multi_ii_dvo/[1]==" + Integer.MAX_VALUE);
@@ -1103,18 +1103,18 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:101"),
- "/response/docs/[0]/id==101",
+ "/response/docs/[0]/id=='101'",
"/response/docs/[0]/title/[0]=='newtitle2'",
"/response/docs/[0]/single_i_dvn==102");
assertJQ(req("q", "id:102"),
1e-4,
- "/response/docs/[0]/id==102",
+ "/response/docs/[0]/id=='102'",
"/response/docs/[0]/title/[0]=='newtitle3'",
"/response/docs/[0]/single_d_dvn==5.14");
assertJQ(req("q", "id:103"),
- "/response/docs/[0]/id==103",
+ "/response/docs/[0]/id=='103'",
"/response/docs/[0]/single_s_dvn=='abc'",
"/response/docs/[0]/single_i_dvn==3");
@@ -1123,7 +1123,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
"single_i_dvn", ImmutableMap.of("set", 5))));
assertU(commit());
assertJQ(req("q", "id:103"),
- "/response/docs/[0]/id==103",
+ "/response/docs/[0]/id=='103'",
"/response/docs/[0]/single_s_dvn=='abcupdate'",
"/response/docs/[0]/single_i_dvn==5");
}
[7/8] lucene-solr:jira/SOLR-10834: a bunch of straight forward manual
cleanup for tests that assumed id would be an int
Posted by ho...@apache.org.
a bunch of straight forward manual cleanup for tests that assumed id would be an int
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e18e2e77
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e18e2e77
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e18e2e77
Branch: refs/heads/jira/SOLR-10834
Commit: e18e2e771fb4678cb911a62bbc7c74a873466bf0
Parents: 134e210
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 17:03:56 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 17:03:56 2017 -0700
----------------------------------------------------------------------
.../collection1/conf/schema-custom-field.xml | 4 +
.../conf/schema-distributed-missing-sort.xml | 4 +
.../test-files/solr/collection1/conf/schema.xml | 1 +
.../solr/collection1/conf/schema11.xml | 4 +-
.../test/org/apache/solr/CursorPagingTest.java | 58 ++++----
.../apache/solr/TestDistributedMissingSort.java | 60 ++++----
.../org/apache/solr/TestTolerantSearch.java | 4 +-
.../solr/cloud/DistribCursorPagingTest.java | 10 +-
.../cloud/DistribJoinFromCollectionTest.java | 8 +-
.../apache/solr/cloud/HttpPartitionTest.java | 2 +-
.../cloud/SegmentTerminateEarlyTestState.java | 30 ++--
...DistributedQueryComponentCustomSortTest.java | 38 ++---
.../handler/component/StatsComponentTest.java | 20 +--
...estDistributedStatsComponentCardinality.java | 4 +-
.../apache/solr/request/SimpleFacetsTest.java | 144 +++++++++----------
.../org/apache/solr/schema/TestBinaryField.java | 6 +-
.../org/apache/solr/search/TestCustomSort.java | 20 +--
.../apache/solr/search/TestFieldSortValues.java | 10 +-
.../solr/search/stats/TestDistribIDF.java | 14 +-
19 files changed, 231 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index af6dc9c..23999e4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
@@ -34,6 +34,10 @@
stored="true" multiValued="false" docValues="true" required="true"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
+
<!-- catchall wildcard to help ensure we aren't breaking function sorting -->
<dynamicField name="*" type="string" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
index 3c1f589..13daf46 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
@@ -77,6 +77,10 @@
<dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_sS" type="string_ml" indexed="false" stored="true"/>
+
+ <!-- int varient of id, adding this here simplifies some indexing and test assertions -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index 446e1e3..7ad3f59 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -792,6 +792,7 @@
<copyField source="*_t" dest="text"/>
<copyField source="id" dest="range_facet_l"/>
+ <copyField source="id" dest="id_i1"/>
<copyField source="range_facet_f" dest="range_facet_d"/>
<copyField source="range_facet_f1" dest="range_facet_f1_dv"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test-files/solr/collection1/conf/schema11.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema11.xml b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
index efdad8c..330c5db 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema11.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
@@ -319,8 +319,10 @@ valued. -->
best performance.
-->
- <!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
<field name="id" type="string" indexed="true" stored="true" required="true" />
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<field name="text" type="text" indexed="true" stored="false" />
<!-- Test a point field for distances -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/CursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
index eb1c6bc..dfaddea 100644
--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
@@ -191,17 +191,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':8},{'id':7},{'id':6}]"
+ ,"/response/docs==[{'id':'9'},{'id':'8'},{'id':'7'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':3},{'id':2},{'id':1}]"
+ ,"/response/docs==[{'id':'5'},{'id':'3'},{'id':'2'},{'id':'1'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':0}]"
+ ,"/response/docs==[{'id':'0'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -223,13 +223,13 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==7"
,"/response/start==0"
- ,"/response/docs==[{'id':6},{'id':1},{'id':8},{'id':5}]"
+ ,"/response/docs==[{'id':'6'},{'id':'1'},{'id':'8'},{'id':'5'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':3,'c':0}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==7"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':3},{'id':0}]"
+ ,"/response/docs==[{'id':'4'},{'id':'3'},{'id':'0'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':3,'c':0}"
);
// no more, so no change to cursorMark, and no new docs
@@ -253,19 +253,19 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':0},{'id':3}]"
+ ,"/response/docs==[{'id':'7'},{'id':'0'},{'id':'3'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':1},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'1'},{'id':'6'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':2}]"
+ ,"/response/docs==[{'id':'9'},{'id':'2'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
// no more, so no change to cursorMark, and no new docs
@@ -287,17 +287,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':3},{'id':7},{'id':0}]"
+ ,"/response/docs==[{'id':'3'},{'id':'7'},{'id':'0'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':1},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'1'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':2}]"
+ ,"/response/docs==[{'id':'9'},{'id':'2'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -317,17 +317,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':0},{'id':4}]"
+ ,"/response/docs==[{'id':'7'},{'id':'0'},{'id':'4'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':6},{'id':9}]"
+ ,"/response/docs==[{'id':'1'},{'id':'6'},{'id':'9'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':3}]"
+ ,"/response/docs==[{'id':'2'},{'id':'3'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -346,12 +346,12 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':6},{'id':4},{'id':3},{'id':1},{'id':8},{'id':5}]"
+ ,"/response/docs==[{'id':'6'},{'id':'4'},{'id':'3'},{'id':'1'},{'id':'8'},{'id':'5'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':0},{'id':9},{'id':7},{'id':2}]"
+ ,"/response/docs==[{'id':'0'},{'id':'9'},{'id':'7'},{'id':'2'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -370,27 +370,27 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':9}]"
+ ,"/response/docs==[{'id':'2'},{'id':'9'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':4}]"
+ ,"/response/docs==[{'id':'7'},{'id':'4'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':3},{'id':8}]"
+ ,"/response/docs==[{'id':'3'},{'id':'8'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':6}]"
+ ,"/response/docs==[{'id':'5'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':0}]"
+ ,"/response/docs==[{'id':'1'},{'id':'0'}]"
);
// we've exactly exhausted all the results, but solr had no way of know that
// no more, so no change to cursorMark, and no new docs
@@ -410,7 +410,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==2"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':3}]"
+ ,"/response/docs==[{'id':'7'},{'id':'3'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -455,7 +455,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':3}]"
+ ,"/response/docs==[{'id':'1'},{'id':'3'}]"
);
// delete the last guy we got
assertU(delI("3"));
@@ -463,7 +463,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'6'}]"
);
// delete the next guy we expect
assertU(delI("0"));
@@ -471,7 +471,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':8}]"
+ ,"/response/docs==[{'id':'5'},{'id':'8'}]"
);
// update a doc we've already seen so it repeats
assertU(adoc("id", "5", "str", "c"));
@@ -479,7 +479,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':5}]"
+ ,"/response/docs==[{'id':'2'},{'id':'5'}]"
);
// update the next doc we expect so it's now in the past
assertU(adoc("id", "7", "str", "a"));
@@ -487,7 +487,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9}]"
+ ,"/response/docs==[{'id':'9'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -684,7 +684,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark, nextCursorMark);
}
for (Map<Object,Object> doc : docs) {
- int id = ((Long)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.get("id").toString());
assertFalse("walk already seen: " + id, ids.exists(id));
ids.put(id);
assertFalse("id set bigger then max allowed ("+maxSize+"): " + ids.size(),
@@ -773,7 +773,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark, nextCursorMark);
}
for (Map<Object,Object> doc : docs) {
- int id = ((Long)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.get("id").toString());
assertFalse("walk already seen: " + id, ids.exists(id));
ids.put(id);
assertFalse("id set bigger then max allowed ("+maxSize+"): " + ids.size(),
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
index 7a91c83..378ad0d 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
@@ -104,13 +104,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// sint1_ml desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
QueryResponse rsp = query("q","*:*", "sort", sint1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
+ assertFieldValues(rsp.getResults(), "id_i", 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
rsp = query("q","*:*", "sort", sint1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
+ assertFieldValues(rsp.getResults(), "id_i", 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
- rsp = query("q","*:*", "sort", sint1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11,
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -119,8 +119,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", sint1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10,
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
@@ -135,13 +135,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// long1_ml desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
rsp = query("q","*:*", "sort", long1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
+ assertFieldValues(rsp.getResults(), "id_i", 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
rsp = query("q","*:*", "sort", long1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
+ assertFieldValues(rsp.getResults(), "id_i", 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
- rsp = query("q","*:*", "sort", long1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11,
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -150,8 +150,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", long1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10,
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
@@ -167,13 +167,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// string1_ml desc sort pos: 12 13 10 9 1 3 8 5 6 7 2 4 11
rsp = query("q","*:*", "sort", string1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
+ assertFieldValues(rsp.getResults(), "id_i", 5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
rsp = query("q","*:*", "sort", string1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5);
+ assertFieldValues(rsp.getResults(), "id_i", 2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5);
- rsp = query("q","*:*", "sort", string1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2,
// missing field string1_ml="a_s1", ascending id sort
14, 15, 16, 17,
@@ -183,8 +183,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", string1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5,
// missing field string1_ml="a_s1", descending id sort
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
@@ -201,8 +201,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// sint1_mf asc sort pos: 7 6 4 3 11 2 8 12 5 13 1 10 9
// sint1_mf desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
- QueryResponse rsp = query("q","*:*", "sort", sint1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ QueryResponse rsp = query("q","*:*", "sort", sint1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
@@ -211,8 +211,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
- rsp = query("q","*:*", "sort", sint1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
@@ -227,8 +227,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// long1_mf asc sort pos: 7 6 4 3 11 2 8 12 5 13 1 10 9
// long1_mf desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
- rsp = query("q","*:*", "sort", long1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
@@ -237,8 +237,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
- rsp = query("q","*:*", "sort", long1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
@@ -253,8 +253,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// string1_mf asc sort pos: 2 1 4 5 13 11 6 9 8 7 12 10 3
// string1_mf desc sort pos: 12 13 10 9 1 3 8 5 6 7 2 4 11
- rsp = query("q","*:*", "sort", string1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
// missing field string1_mf="a_s1_mf", ascending id sort
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -264,8 +264,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
- rsp = query("q","*:*", "sort", string1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
// missing field string1_mf="a_s1_mf", descending id sort
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
index cb485d0..ec1f16c 100644
--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
@@ -150,7 +150,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {
}
}
assertTrue(foundError);
- assertEquals(1, response.getResults().get(0).getFieldValue("id"));
+ assertEquals("1", response.getResults().get(0).getFieldValue("id"));
assertEquals("batman", response.getResults().get(0).getFirstValue("subject"));
unIgnoreException("Dummy exception in BadResponseWriter");
}
@@ -199,7 +199,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {
}
assertTrue(foundError);
- assertEquals(1, response.getResults().get(0).getFieldValue("id"));
+ assertEquals("1", response.getResults().get(0).getFieldValue("id"));
assertEquals("batman", response.getResults().get(0).getFirstValue("subject"));
unIgnoreException("Dummy exception in BadResponseWriter");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index 0742ac7..5de766f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -556,7 +556,7 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
if (ids.size() < numInitialDocs) {
message.append("Missing doc(s): ");
for (SolrInputDocument doc : initialDocs) {
- int id = ((Integer)doc.get("id").getValue()).intValue();
+ int id = Integer.parseInt(doc.getFieldValue("id").toString());
if ( ! ids.exists(id)) {
QueryResponse rsp = cloudClient.query(params("q", "id:" + id,
"rows", "1"));
@@ -664,12 +664,12 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
* "id" of the list of documents returned matches the expected list
* @see org.apache.solr.client.solrj.SolrClient#query
*/
- private void assertDocList(QueryResponse rsp, Object... ids) {
+ private void assertDocList(QueryResponse rsp, int... ids) {
SolrDocumentList docs = extractDocList(rsp);
assertEquals("Wrong number of docs in response", ids.length, docs.size());
int i = 0;
- for (Object id : ids) {
- assertEquals(rsp.toString(), id, docs.get(i).get("id"));
+ for (int id : ids) {
+ assertEquals(rsp.toString(), ""+id, docs.get(i).get("id"));
i++;
}
}
@@ -730,7 +730,7 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
}
for (SolrDocument doc : docs) {
- int id = ((Integer)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.getFieldValue("id").toString());
if (ids.exists(id)) {
String msg = "(" + p + ") walk already seen: " + id;
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
index cfebef2..383c1ae 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
@@ -62,7 +62,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
private static String toColl = "to_2x2";
private static String fromColl = "from_1x4";
- private static Integer toDocId;
+ private static String toDocId;
@BeforeClass
public static void setupCluster() throws Exception {
@@ -140,7 +140,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
log.info("DistribJoinFromCollectionTest succeeded ... shutting down now!");
}
- private void testJoins(String toColl, String fromColl, Integer toDocId, boolean isScoresTest)
+ private void testJoins(String toColl, String fromColl, String toDocId, boolean isScoresTest)
throws SolrServerException, IOException {
// verify the join with fromIndex works
final String fromQ = "match_s:c^2";
@@ -219,12 +219,12 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
}
}
- protected static Integer indexDoc(String collection, int id, String joinField, String matchField, String getField) throws Exception {
+ protected static String indexDoc(String collection, int id, String joinField, String matchField, String getField) throws Exception {
UpdateRequest up = new UpdateRequest();
up.setCommitWithin(50);
up.setParam("collection", collection);
SolrInputDocument doc = new SolrInputDocument();
- Integer docId = new Integer(id);
+ String docId = "" + id;
doc.addField("id", docId);
doc.addField("join_s", joinField);
if (matchField != null)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 6c7de88..2f2ccb4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -598,7 +598,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
@SuppressWarnings("rawtypes")
protected void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
NamedList rsp = realTimeGetDocId(solr, docId);
- String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), new Integer(docId));
+ String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
assertTrue("Doc with id=" + docId + " not found in " + solr.getBaseURL()
+ " due to: " + match + "; rsp="+rsp, match == null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
index 9824e3d..118d5ed 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
@@ -106,8 +106,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(KEY_FIELD +" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(KEY_FIELD)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(KEY_FIELD).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (KEY_FIELD +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(ODD_FIELD, oddFieldValue, solrDocument0.getFieldValue(ODD_FIELD));
}
// check segmentTerminatedEarly flag
@@ -136,8 +138,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(KEY_FIELD +" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(KEY_FIELD)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(KEY_FIELD).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (KEY_FIELD +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(ODD_FIELD, oddFieldValue, rsp.getResults().get(0).getFieldValue(ODD_FIELD));
}
// check segmentTerminatedEarly flag
@@ -182,8 +186,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(KEY_FIELD +" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(KEY_FIELD)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(KEY_FIELD).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (KEY_FIELD +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(ODD_FIELD, oddFieldValue, rsp.getResults().get(0).getFieldValue(ODD_FIELD));
}
// check segmentTerminatedEarly flag
@@ -226,8 +232,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getGroupResponse().getValues().get(0).getMatches() > 0) {
final SolrDocument solrDocument = rsp.getGroupResponse().getValues().get(0).getValues().get(0).getResult().get(0);
- TestMiniSolrCloudCluster.assertTrue(KEY_FIELD +" of ("+solrDocument+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument.getFieldValue(KEY_FIELD)));
+ final Integer idAsInt = Integer.parseInt(solrDocument.getFieldValue(KEY_FIELD).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (KEY_FIELD +"="+idAsInt+" of ("+solrDocument+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(ODD_FIELD, oddFieldValue, solrDocument.getFieldValue(ODD_FIELD));
}
// check segmentTerminatedEarly flag
@@ -251,8 +259,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(KEY_FIELD +" of ("+solrDocument0+") is not in minTimestampDocKeys("+minTimestampDocKeys+")",
- minTimestampDocKeys.contains(solrDocument0.getFieldValue(KEY_FIELD)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(KEY_FIELD).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (KEY_FIELD +"="+idAsInt+" of ("+solrDocument0+") is not in minTimestampDocKeys("+minTimestampDocKeys+")",
+ minTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(ODD_FIELD, oddFieldValue, solrDocument0.getFieldValue(ODD_FIELD));
}
// check segmentTerminatedEarly flag
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
index 4b3e92a..7efde0c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
@@ -64,44 +64,44 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
QueryResponse rsp;
rsp = query("q", "*:*", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), id, "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "*:*", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 8, 9, 5, 3, 12, 10, 2, 4, 6, 1, 7);
+ assertFieldValues(rsp.getResults(), id, "11", "13", "8", "9", "5", "3", "12", "10", "2", "4", "6", "1", "7");
// SOLR-6744
rsp = query("q", "*:*", "fl", "key:id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), "key", 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), "key", "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "*:*", "fl", "key:id,id:text", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), "key", 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), "key", "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "text:a", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 1, 3, 5, 9);
+ assertFieldValues(rsp.getResults(), id, "1", "3", "5", "9");
rsp = query("q", "text:a", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 9, 5, 3, 1);
+ assertFieldValues(rsp.getResults(), id, "9", "5", "3", "1");
rsp = query("q", "text:b", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 4, 2, 10);
+ assertFieldValues(rsp.getResults(), id, "4", "2", "10");
rsp = query("q", "text:b", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 10, 2, 4);
+ assertFieldValues(rsp.getResults(), id, "10", "2", "4");
// SOLR-6744
rsp = query("q", "text:b", "fl", "key:id", "sort", "payload asc", "rows", "20");
assertFieldValues(rsp.getResults(), id, null, null, null);
rsp = query("q", "text:c", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 6, 8);
+ assertFieldValues(rsp.getResults(), id, "7", "6", "8");
rsp = query("q", "text:c", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 8, 6, 7);
+ assertFieldValues(rsp.getResults(), id, "8", "6", "7");
rsp = query("q", "text:d", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 12, 13, 11);
+ assertFieldValues(rsp.getResults(), id, "12", "13", "11");
rsp = query("q", "text:d", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 12);
+ assertFieldValues(rsp.getResults(), id, "11", "13", "12");
// sanity check function sorting
- rsp = query("q", "id:[1 TO 10]", "fl", "id", "rows", "20",
- "sort", "abs(sub(5,id)) asc, id desc");
- assertFieldValues(rsp.getResults(), id, 5 , 6,4 , 7,3 , 8,2 , 9,1 , 10 );
+ rsp = query("q", "id_i:[1 TO 10]", "fl", "id", "rows", "20",
+ "sort", "abs(sub(5,id_i)) asc, id desc");
+ assertFieldValues(rsp.getResults(), id, "5", "6","4", "7","3" , "8","2" , "9","1" , "10" );
// Add two more docs with same payload as in doc #4
index(id, "14", "text", "b", "payload", ByteBuffer.wrap(new byte[] { 0x25, 0x21, 0x15 }));
@@ -114,9 +114,9 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
commit();
- rsp = query("q", "*:*", "fl", "id", "sort", "payload asc, id desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 1, 6, 15,14,4, 2, 18,17,16,10, 12, 3, 5, 9, 8, 13, 11);
- rsp = query("q", "*:*", "fl", "id", "sort", "payload desc, id asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 8, 9, 5, 3, 12, 10,16,17,18, 2, 4,14,15, 6, 1, 7);
+ rsp = query("q", "*:*", "fl", "id", "sort", "payload asc, id_i desc", "rows", "20");
+ assertFieldValues(rsp.getResults(), id, "7", "1", "6", "15","14","4", "2", "18","17","16","10", "12", "3", "5", "9", "8", "13", "11");
+ rsp = query("q", "*:*", "fl", "id", "sort", "payload desc, id_i asc", "rows", "20");
+ assertFieldValues(rsp.getResults(), id, "11", "13", "8", "9", "5", "3", "12", "10","16","17","18", "2", "4","14","15", "6", "1", "7");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 1798ae5..568676c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -94,8 +94,8 @@ public class StatsComponentTest extends AbstractSolrTestCase {
// NOTE: doTestFieldStatisticsResult needs the full list of possible tags to exclude
params("stats.field", f, "stats", "true"),
params("stats.field", "{!ex=fq1,fq2}"+f, "stats", "true",
- "fq", "{!tag=fq1}-id:[0 TO 2]",
- "fq", "{!tag=fq2}-id:[2 TO 1000]"),
+ "fq", "{!tag=fq1}-id_i:[0 TO 2]",
+ "fq", "{!tag=fq2}-id_i:[2 TO 1000]"),
params("stats.field", "{!ex=fq1}"+f, "stats", "true",
"fq", "{!tag=fq1}id:1")
};
@@ -299,8 +299,8 @@ public class StatsComponentTest extends AbstractSolrTestCase {
params("stats.field", "{!ex=fq1}"+f, "stats", "true",
"fq", "{!tag=fq1}id:1"),
params("stats.field", "{!ex=fq1,fq2}"+f, "stats", "true",
- "fq", "{!tag=fq1}-id:[0 TO 2]",
- "fq", "{!tag=fq2}-id:[2 TO 1000]") }) {
+ "fq", "{!tag=fq1}-id_i:[0 TO 2]",
+ "fq", "{!tag=fq2}-id_i:[2 TO 1000]") }) {
assertQ("test statistics values",
@@ -878,19 +878,19 @@ public class StatsComponentTest extends AbstractSolrTestCase {
Map<String, String> args = new HashMap<String, String>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
- args.put(StatsParams.STATS_FIELD, "{!ex=id}id");
- args.put("fq", "{!tag=id}id:[2 TO 3]");
+ args.put(StatsParams.STATS_FIELD, "{!ex=id}id_i");
+ args.put("fq", "{!tag=id}id_i:[2 TO 3]");
SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
assertQ("test exluding filter query", req
- , "//lst[@name='id']/double[@name='min'][.='1.0']"
- , "//lst[@name='id']/double[@name='max'][.='4.0']");
+ , "//lst[@name='id_i']/double[@name='min'][.='1.0']"
+ , "//lst[@name='id_i']/double[@name='max'][.='4.0']");
args = new HashMap<String, String>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
- args.put(StatsParams.STATS_FIELD, "{!key=id2}id");
- args.put("fq", "{!tag=id}id:[2 TO 3]");
+ args.put(StatsParams.STATS_FIELD, "{!key=id2}id_i");
+ args.put("fq", "{!tag=id}id_i:[2 TO 3]");
req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
assertQ("test rename field", req
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
index c703683..dca45dc 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
@@ -244,7 +244,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
final int highId,
final int log2m,
final int regwidth) {
- ModifiableSolrParams p = params("q", "id:["+lowId+" TO "+highId+"]",
+ ModifiableSolrParams p = params("q", "id_i1:["+lowId+" TO "+highId+"]",
"rows", "0", "stats", "true");
final String prefix = "{!cardinality=true hllLog2m="+log2m+" hllRegwidth="+regwidth;
for (String f : STAT_FIELDS) {
@@ -267,7 +267,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
final int highId,
final double lowAccuracy,
final double highAccuracy) {
- ModifiableSolrParams p = params("q", "id:["+lowId+" TO "+highId+"]",
+ ModifiableSolrParams p = params("q", "id_i1:["+lowId+" TO "+highId+"]",
"rows", "0", "stats", "true");
final String[] prefixes = new String[] {
"{!cardinality=" + lowAccuracy + " key=low_",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
index fd8d6ec..8f4a24d 100644
--- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
@@ -236,7 +236,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testCachingBigTerms() throws Exception {
- assertQ( req("indent","true", "q", "id:[42 TO 47]",
+ assertQ( req("indent","true", "q", "id_i1:[42 TO 47]",
"facet", "true",
"facet.field", "foo_s" // big terms should cause foo_s:A to be cached
),
@@ -270,7 +270,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -284,7 +284,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -298,7 +298,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -320,7 +320,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -344,7 +344,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -380,14 +380,14 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void testSimpleGroupedFacets(String facetLimit) throws Exception {
assertQ(
"Return 5 docs with id range 1937 till 1940",
- req("id:[2000 TO 2004]"),
+ req("id_i1:[2000 TO 2004]"),
"*[count(//doc)=5]"
);
assertQ(
"Return two facet counts for field airport_a and duration_i1",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -410,7 +410,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return one facet count for field airport_a using facet.offset",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -427,7 +427,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return two facet counts for field airport_a with fq",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "duration_i1:5",
"group", "true",
"group.facet", "true",
@@ -445,7 +445,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return one facet count for field airport_s1 with prefix a",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -463,7 +463,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
h.query(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group.facet", "true",
"facet", "true",
"facet.field", "airport_s1",
@@ -541,26 +541,26 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
public void testSimpleFacetCounts() {
assertQ("standard request handler returns all matches",
- req("id:[42 TO 47]"),
+ req("id_i1:[42 TO 47]"),
"*[count(//doc)=6]"
);
assertQ("filter results using fq",
- req("q","id:[42 TO 46]",
- "fq", "id:[43 TO 47]"),
+ req("q","id_i1:[42 TO 46]",
+ "fq", "id_i1:[43 TO 47]"),
"*[count(//doc)=4]"
);
assertQ("don't filter results using blank fq",
- req("q","id:[42 TO 46]",
+ req("q","id_i1:[42 TO 46]",
"fq", " "),
"*[count(//doc)=5]"
);
assertQ("filter results using multiple fq params",
- req("q","id:[42 TO 46]",
+ req("q","id_i1:[42 TO 46]",
"fq", "trait_s:Obnoxious",
- "fq", "id:[43 TO 47]"),
+ "fq", "id_i1:[43 TO 47]"),
"*[count(//doc)=1]"
);
@@ -570,19 +570,19 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
for(String[] methodParam : new String[][]{ none, uifSwitch}){
assertQ("check counts for facet queries",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.query", "trait_s:Obnoxious"
- ,"facet.query", "id:[42 TO 45]"
- ,"facet.query", "id:[43 TO 47]"
+ ,"facet.query", "id_i1:[42 TO 45]"
+ ,"facet.query", "id_i1:[43 TO 47]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=6]"
,"//lst[@name='facet_counts']/lst[@name='facet_queries']"
,"//lst[@name='facet_queries']/int[@name='trait_s:Obnoxious'][.='2']"
- ,"//lst[@name='facet_queries']/int[@name='id:[42 TO 45]'][.='4']"
- ,"//lst[@name='facet_queries']/int[@name='id:[43 TO 47]'][.='5']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[42 TO 45]'][.='4']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[43 TO 47]'][.='5']"
,"//lst[@name='facet_counts']/lst[@name='facet_fields']"
,"//lst[@name='facet_fields']/lst[@name='trait_s']"
@@ -593,11 +593,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("check multi-select facets with naming",
- req(methodParam, "q", "id:[42 TO 47]"
+ req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.query", "{!ex=1}trait_s:Obnoxious"
- ,"facet.query", "{!ex=2 key=foo}id:[42 TO 45]" // tag=2 same as 1
- ,"facet.query", "{!ex=3,4 key=bar}id:[43 TO 47]" // tag=3,4 don't exist
+ ,"facet.query", "{!ex=2 key=foo}id_i1:[42 TO 45]" // tag=2 same as 1
+ ,"facet.query", "{!ex=3,4 key=bar}id_i1:[43 TO 47]" // tag=3,4 don't exist
,"facet.field", "{!ex=3,1}trait_s" // 3,1 same as 1
,"fq", "{!tag=1,2}id:47" // tagged as 1 and 2
)
@@ -629,17 +629,17 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
for(String[] methodParam : new String[][]{ none, uifSwitch}){
assertQ("check counts for applied facet queries using filtering (fq)",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
- ,"facet.query", "id:[42 TO 45]"
- ,"facet.query", "id:[43 TO 47]"
+ ,"facet.query", "id_i1:[42 TO 45]"
+ ,"facet.query", "id_i1:[43 TO 47]"
)
,"*[count(//doc)=4]"
,"//lst[@name='facet_counts']/lst[@name='facet_queries']"
- ,"//lst[@name='facet_queries']/int[@name='id:[42 TO 45]'][.='4']"
- ,"//lst[@name='facet_queries']/int[@name='id:[43 TO 47]'][.='3']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[42 TO 45]'][.='4']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[43 TO 47]'][.='3']"
,"*[count(//lst[@name='trait_s']/int)=4]"
,"//lst[@name='trait_s']/int[@name='Tool'][.='2']"
,"//lst[@name='trait_s']/int[@name='Obnoxious'][.='1']"
@@ -649,11 +649,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.zero=false&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.zeros", "false"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -666,11 +666,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.mincount=1&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.mincount", "1"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -683,11 +683,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.mincount=2&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.mincount", "2"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -698,9 +698,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check sorted paging",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -715,9 +715,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
// check that the default sort is by count
assertQ("check sorted paging",
- req(methodParam, "q", "id:[42 TO 47]"
+ req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -732,9 +732,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
//
// check that legacy facet.sort=true/false works
//
- assertQ(req(methodParam, "q", "id:[42 TO 47]"
+ assertQ(req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -747,9 +747,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
,"//int[3][@name='Obnoxious'][.='1']"
);
- assertQ(req(methodParam, "q", "id:[42 TO 47]"
+ assertQ(req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","1"
,"facet.offset","0"
@@ -764,9 +764,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
for(String method : new String[]{ "fc","uif"}){
- assertQ(req("q", "id:[42 TO 47]"
+ assertQ(req("q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "zerolen_s"
,(random().nextBoolean() ? "":"f.zerolen_s.")+"facet.method", method
)
@@ -1475,7 +1475,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
String mid = (new Double( ((double)Float.MAX_VALUE) * 2D )).toString();
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1714,7 +1714,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testNumericRangeFacetsTrieInt() {
- helpTestWholeNumberRangeFacets("id");
+ helpTestWholeNumberRangeFacets("id_i1");
}
@Test
public void testNumericRangeFacetsTrieLong() {
@@ -1723,7 +1723,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testNumericRangeFacetsTrieIntDocValues() {
- helpTestWholeNumberRangeFacets("id", FacetRangeMethod.DV);
+ helpTestWholeNumberRangeFacets("id_i1", FacetRangeMethod.DV);
}
@Test
@@ -1752,7 +1752,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
String mid = (new Long( ((long)Integer.MAX_VALUE) * 2L )).toString();
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1788,7 +1788,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
final String meta = pre + "/../";
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1810,7 +1810,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ(f + ":checking counts for upper",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -2847,7 +2847,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void doTestRangeQueryHardEndParam(String field, FacetRangeMethod method) {
assertQ("Test facet.range.hardend",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2868,7 +2868,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.hardend",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2901,7 +2901,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void doTestRangeQueryOtherParam(String field, FacetRangeMethod method) {
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2921,7 +2921,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2941,7 +2941,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2961,7 +2961,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2982,7 +2982,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
// these should have equivilent behavior (multivalued 'other' param: top level vs local)
for (SolrQueryRequest req : new SolrQueryRequest[] {
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2992,7 +2992,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
,"facet.range.gap","1"
,"facet.range.other",FacetRangeOther.BEFORE.toString()
,"facet.range.other",FacetRangeOther.AFTER.toString()),
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", "{!facet.range.other=before facet.range.other=after}" + field
@@ -3013,7 +3013,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3035,7 +3035,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3056,7 +3056,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3077,7 +3077,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3098,7 +3098,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3119,7 +3119,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[12345 TO 12345]"
+ req("q", "id_i1:[12345 TO 12345]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3138,7 +3138,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3332,7 +3332,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
public void testFacetPrefixWithFacetThreads() throws Exception {
assertQ("Test facet.prefix with facet.thread",
- req("q", "id:[101 TO 102]"
+ req("q", "id_i1:[101 TO 102]"
,"facet","true"
,"facet.field", "{!key=key1 facet.prefix=foo}myfield_s"
,"facet.field", "{!key=key2 facet.prefix=bar}myfield_s"
@@ -3352,7 +3352,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
values[0] = random().nextInt(3000);
values[1] = random().nextInt(3000);
Arrays.sort(values);
- return String.format(Locale.ROOT, "id: [%d TO %d]", values[0], values[1]);
+ return String.format(Locale.ROOT, "id_i1:[%d TO %d]", values[0], values[1]);
}
@@ -3375,7 +3375,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
private ModifiableSolrParams getRandomParamsInt() {
- String field = new String[]{"range_facet_l_dv", "range_facet_i_dv", "range_facet_l", "duration_i1", "id"}[random().nextInt(5)];
+ String field = new String[]{"range_facet_l_dv", "range_facet_i_dv", "range_facet_l", "duration_i1", "id_i1"}[random().nextInt(5)];
ModifiableSolrParams params = new ModifiableSolrParams();
Integer[] values = new Integer[2];
do {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
index 9b42749..b3376c8 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
@@ -105,7 +105,7 @@ public class TestBinaryField extends SolrJettyTestBase {
assertEquals(3, beans.size());
for (SolrDocument d : res) {
- Integer id = (Integer) d.getFieldValue("id");
+ Integer id = Integer.parseInt(d.getFieldValue("id").toString());
byte[] data = (byte[]) d.getFieldValue("data");
if (id == 1) {
assertEquals(5, data.length);
@@ -133,7 +133,7 @@ public class TestBinaryField extends SolrJettyTestBase {
}
for (Bean d : beans) {
- Integer id = d.id;
+ Integer id = Integer.parseInt(d.id);
byte[] data = d.data;
if (id == 1) {
assertEquals(5, data.length);
@@ -165,7 +165,7 @@ public class TestBinaryField extends SolrJettyTestBase {
}
public static class Bean{
@Field
- int id;
+ String id;
@Field
byte [] data;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/search/TestCustomSort.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCustomSort.java b/solr/core/src/test/org/apache/solr/search/TestCustomSort.java
index ca33ea0..74b8301 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCustomSort.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCustomSort.java
@@ -49,7 +49,7 @@ public class TestCustomSort extends SolrTestCaseJ4 {
assertU(adoc(sdoc("id", "13", "text", "d", "payload", ByteBuffer.wrap(new byte[] { (byte)0x80, 0x11, 0x33 })))); // 12
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id", "sort", "payload asc", "rows", "20")
+ assertQ(req("q", "*:*", "fl", "id_i", "sort", "payload asc", "rows", "20")
, "//result[@numFound='13']" // <result name="response" numFound="13" start="0">
, "//result/doc[int='7' and position()=1]" // <doc><int name="id">7</int></doc> 00 3c 73
, "//result/doc[int='1' and position()=2]" // <doc><int name="id">1</int></doc> 12 62 15
@@ -64,7 +64,7 @@ public class TestCustomSort extends SolrTestCaseJ4 {
, "//result/doc[int='8' and position()=11]" // <doc><int name="id">8</int></doc> 59 2d 4d
, "//result/doc[int='13' and position()=12]" // <doc><int name="id">13</int></doc> 80 11 33
, "//result/doc[int='11' and position()=13]"); // <doc><int name="id">11</int></doc> ff af 9c
- assertQ(req("q", "*:*", "fl", "id", "sort", "payload desc", "rows", "20")
+ assertQ(req("q", "*:*", "fl", "id_i", "sort", "payload desc", "rows", "20")
, "//result[@numFound='13']" // <result name="response" numFound="13" start="0">
, "//result/doc[int='11' and position()=1]" // <doc><int name="id">11</int></doc> ff af 9c
, "//result/doc[int='13' and position()=2]" // <doc><int name="id">13</int></doc> 80 11 33
@@ -79,44 +79,44 @@ public class TestCustomSort extends SolrTestCaseJ4 {
, "//result/doc[int='6' and position()=11]" // <doc><int name="id">6</int></doc> 1a 2b 3c 00 00 03
, "//result/doc[int='1' and position()=12]" // <doc><int name="id">1</int></doc> 12 62 15
, "//result/doc[int='7' and position()=13]"); // <doc><int name="id">7</int></doc> 00 3c 73
- assertQ(req("q", "text:a", "fl", "id", "sort", "payload asc", "rows", "20")
+ assertQ(req("q", "text:a", "fl", "id_i", "sort", "payload asc", "rows", "20")
, "//result[@numFound='4']" // <result name="response" numFound="4" start="0">
, "//result/doc[int='1' and position()=1]" // <doc><int name="id">1</int></doc> 12 62 15
, "//result/doc[int='3' and position()=2]" // <doc><int name="id">3</int></doc> 35 32 58
, "//result/doc[int='5' and position()=3]" // <doc><int name="id">5</int></doc> 35 35 10 00
, "//result/doc[int='9' and position()=4]"); // <doc><int name="id">9</int></doc> 39 79 7a
- assertQ(req("q", "text:a", "fl", "id", "sort", "payload desc", "rows", "20")
+ assertQ(req("q", "text:a", "fl", "id_i", "sort", "payload desc", "rows", "20")
, "//result[@numFound='4']" // <result name="response" numFound="4" start="0">
, "//result/doc[int='9' and position()=1]" // <doc><int name="id">9</int></doc> 39 79 7a
, "//result/doc[int='5' and position()=2]" // <doc><int name="id">5</int></doc> 35 35 10 00
, "//result/doc[int='3' and position()=3]" // <doc><int name="id">3</int></doc> 35 32 58
, "//result/doc[int='1' and position()=4]"); // <doc><int name="id">1</int></doc> 12 62 15
- assertQ(req("q", "text:b", "fl", "id", "sort", "payload asc", "rows", "20")
+ assertQ(req("q", "text:b", "fl", "id_i", "sort", "payload asc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='4' and position()=1]" // <doc><int name="id">4</int></doc> 25 21 15
, "//result/doc[int='2' and position()=2]" // <doc><int name="id">2</int></doc> 25 21 16
, "//result/doc[int='10' and position()=3]"); // <doc><int name="id">10</int></doc> 31 39 7c
- assertQ(req("q", "text:b", "fl", "id", "sort", "payload desc", "rows", "20")
+ assertQ(req("q", "text:b", "fl", "id_i", "sort", "payload desc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='10' and position()=1]" // <doc><int name="id">10</int></doc> 31 39 7c
, "//result/doc[int='2' and position()=2]" // <doc><int name="id">2</int></doc> 25 21 16
, "//result/doc[int='4' and position()=3]"); // <doc><int name="id">4</int></doc> 25 21 15
- assertQ(req("q", "text:c", "fl", "id", "sort", "payload asc", "rows", "20")
+ assertQ(req("q", "text:c", "fl", "id_i", "sort", "payload asc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='7' and position()=1]" // <doc><int name="id">7</int></doc> 00 3c 73
, "//result/doc[int='6' and position()=2]" // <doc><int name="id">6</int></doc> 1a 2b 3c 00 00 03
, "//result/doc[int='8' and position()=3]"); // <doc><int name="id">8</int></doc> 59 2d 4d
- assertQ(req("q", "text:c", "fl", "id", "sort", "payload desc", "rows", "20")
+ assertQ(req("q", "text:c", "fl", "id_i", "sort", "payload desc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='8' and position()=1]" // <doc><int name="id">8</int></doc> 59 2d 4d
, "//result/doc[int='6' and position()=2]" // <doc><int name="id">6</int></doc> 1a 2b 3c 00 00 03
, "//result/doc[int='7' and position()=3]"); // <doc><int name="id">7</int></doc> 00 3c 73
- assertQ(req("q", "text:d", "fl", "id", "sort", "payload asc", "rows", "20")
+ assertQ(req("q", "text:d", "fl", "id_i", "sort", "payload asc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='12' and position()=1]" // <doc><int name="id">12</int></doc> 34 dd 4d
, "//result/doc[int='13' and position()=2]" // <doc><int name="id">13</int></doc> 80 11 33
, "//result/doc[int='11' and position()=3]"); // <doc><int name="id">11</int></doc> ff af 9c
- assertQ(req("q", "text:d", "fl", "id", "sort", "payload desc", "rows", "20")
+ assertQ(req("q", "text:d", "fl", "id_i", "sort", "payload desc", "rows", "20")
, "//result[@numFound='3']" // <result name="response" numFound="3" start="0">
, "//result/doc[int='11' and position()=1]" // <doc><int name="id">11</int></doc> ff af 9c
, "//result/doc[int='13' and position()=2]" // <doc><int name="id">13</int></doc> 80 11 33
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java
index 781127b..3e07bf3 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java
@@ -41,10 +41,10 @@ public class TestFieldSortValues extends SolrTestCaseJ4 {
// payload is backed by a custom sort field which returns the payload value mod 3
assertQ(req("q", "*:*", "fl", "id", "sort", "payload asc, id asc", "fsv", "true")
- , "//result/doc[int='2' and position()=1]"
- , "//result/doc[int='3' and position()=2]"
- , "//result/doc[int='5' and position()=3]"
- , "//result/doc[int='1' and position()=4]"
- , "//result/doc[int='4' and position()=5]");
+ , "//result/doc[str='2' and position()=1]"
+ , "//result/doc[str='3' and position()=2]"
+ , "//result/doc[str='5' and position()=3]"
+ , "//result/doc[str='1' and position()=4]"
+ , "//result/doc[str='4' and position()=5]");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e18e2e77/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
index c355932..cac2dc5 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
@@ -78,14 +78,14 @@ public class TestDistribIDF extends SolrTestCaseJ4 {
createCollection("onecollection_local", "conf2", ImplicitDocRouter.NAME);
SolrInputDocument doc = new SolrInputDocument();
- doc.setField("id", 1);
+ doc.setField("id", "1");
doc.setField("cat", "football");
doc.addField(ShardParams._ROUTE_, "a");
solrCluster.getSolrClient().add("onecollection", doc);
solrCluster.getSolrClient().add("onecollection_local", doc);
doc = new SolrInputDocument();
- doc.setField("id", 2);
+ doc.setField("id", "2");
doc.setField("cat", "football");
doc.addField(ShardParams._ROUTE_, "b");
solrCluster.getSolrClient().add("onecollection", doc);
@@ -94,7 +94,7 @@ public class TestDistribIDF extends SolrTestCaseJ4 {
int nDocs = TestUtil.nextInt(random(), 10, 100);
for (int i=0; i<nDocs; i++) {
doc = new SolrInputDocument();
- doc.setField("id", 3 + i);
+ doc.setField("id", "" + (3 + i));
String cat = TestUtil.randomSimpleString(random());
if (!cat.equals("football")) { //Making sure no other document has the query term in it.
doc.setField("cat", cat);
@@ -129,8 +129,8 @@ public class TestDistribIDF extends SolrTestCaseJ4 {
query.setFields("*,score");
queryResponse = solrClient_local.query("onecollection_local", query);
assertEquals(2, queryResponse.getResults().getNumFound());
- assertEquals(2, queryResponse.getResults().get(0).get("id"));
- assertEquals(1, queryResponse.getResults().get(1).get("id"));
+ assertEquals("2", queryResponse.getResults().get(0).get("id"));
+ assertEquals("1", queryResponse.getResults().get(1).get("id"));
float score1_local = (float) queryResponse.getResults().get(0).get("score");
float score2_local = (float) queryResponse.getResults().get(1).get("score");
assertEquals("Doc1 score=" + score1_local + " Doc2 score=" + score2_local, 1,
@@ -176,8 +176,8 @@ public class TestDistribIDF extends SolrTestCaseJ4 {
query.setFields("*,score").add("collection", "collection1_local,collection2_local");
queryResponse = solrClient_local.query("collection1_local", query);
assertEquals(2, queryResponse.getResults().getNumFound());
- assertEquals(2, queryResponse.getResults().get(0).get("id"));
- assertEquals(1, queryResponse.getResults().get(1).get("id"));
+ assertEquals("2", queryResponse.getResults().get(0).get("id"));
+ assertEquals("1", queryResponse.getResults().get(1).get("id"));
float score1_local = (float) queryResponse.getResults().get(0).get("score");
float score2_local = (float) queryResponse.getResults().get(1).get("score");
assertEquals("Doc1 score=" + score1_local + " Doc2 score=" + score2_local, 1,
[4/8] lucene-solr:jira/SOLR-10834: some scripted conversion of
xpaths: int|float -> str when dealing with @name=id
Posted by ho...@apache.org.
some scripted conversion of xpaths: int|float -> str when dealing with @name=id
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d430057
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d430057
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d430057
Branch: refs/heads/jira/SOLR-10834
Commit: 5d430057ed335801a524e1e7666061075ab6d859
Parents: 1625df3
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 08:26:47 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 08:26:47 2017 -0700
----------------------------------------------------------------------
.../solr/schema/TestICUCollationField.java | 26 +--
.../schema/TestICUCollationFieldDocValues.java | 26 +--
.../schema/TestICUCollationFieldOptions.java | 26 +--
.../org/apache/solr/BasicFunctionalityTest.java | 36 +--
.../apache/solr/DisMaxRequestHandlerTest.java | 22 +-
.../src/test/org/apache/solr/SampleTest.java | 4 +-
.../apache/solr/analysis/TestCharFilters.java | 8 +-
.../test/org/apache/solr/cloud/BasicZkTest.java | 4 +-
.../FullThrottleStoppableIndexingThread.java | 2 +-
.../autoscaling/AutoScalingHandlerTest.java | 2 +-
.../test/org/apache/solr/core/HelloStream.java | 2 +-
.../test/org/apache/solr/core/MockInfoBean.java | 2 +-
.../apache/solr/core/TestJmxIntegration.java | 2 +-
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +-
.../core/snapshots/TestSolrCoreSnapshots.java | 2 +-
.../solr/handler/MoreLikeThisHandlerTest.java | 20 +-
.../handler/StandardRequestHandlerTest.java | 24 +-
.../handler/XsltUpdateRequestHandlerTest.java | 2 +-
.../solr/handler/admin/MBeansHandlerTest.java | 2 +-
.../admin/PropertiesRequestHandlerTest.java | 2 +-
.../component/QueryElevationComponentTest.java | 90 ++++----
.../handler/component/TestExpandComponent.java | 100 ++++-----
.../transform/TestChildDocTransformer.java | 60 ++---
.../org/apache/solr/rest/TestRestManager.java | 2 +-
.../solr/schema/AbstractCurrencyFieldTest.java | 82 +++----
.../org/apache/solr/schema/CopyFieldTest.java | 12 +-
.../solr/schema/CurrencyFieldXmlFileTest.java | 4 +-
.../apache/solr/schema/DateRangeFieldTest.java | 2 +-
.../org/apache/solr/schema/DocValuesTest.java | 188 ++++++++--------
.../schema/IndexSchemaRuntimeFieldTest.java | 4 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 6 +-
.../apache/solr/schema/TestCollationField.java | 30 +--
.../schema/TestCollationFieldDocValues.java | 30 +--
.../solr/schema/TestHalfAndHalfDocValues.java | 6 +-
.../apache/solr/schema/TestOmitPositions.java | 4 +-
.../apache/solr/search/SpatialFilterTest.java | 2 +-
.../solr/search/TestCollapseQParserPlugin.java | 218 +++++++++----------
.../solr/search/TestFoldingMultitermQuery.java | 2 +-
.../search/TestGraphTermsQParserPlugin.java | 34 +--
.../solr/search/TestHashQParserPlugin.java | 14 +-
.../solr/search/TestReRankQParserPlugin.java | 206 +++++++++---------
.../test/org/apache/solr/search/TestReload.java | 2 +-
.../org/apache/solr/search/TestSearchPerf.java | 2 +-
.../apache/solr/search/TestSolrQueryParser.java | 2 +-
.../org/apache/solr/search/facet/DebugAgg.java | 2 +-
.../search/function/SortByFunctionTest.java | 68 +++---
.../function/TestMinMaxOnMultiValuedField.java | 8 +-
.../solr/search/mlt/SimpleMLTQParserTest.java | 86 ++++----
.../solr/security/MockAuthorizationPlugin.java | 2 +-
.../apache/solr/servlet/NoCacheHeaderTest.java | 2 +-
.../suggest/TestAnalyzeInfixSuggestions.java | 2 +-
.../suggest/TestFreeTextSuggestions.java | 2 +-
.../update/processor/AtomicUpdatesTest.java | 18 +-
.../ClassificationUpdateProcessorTest.java | 2 +-
.../org/apache/solr/util/PrimUtilsTest.java | 2 +-
.../org/apache/solr/util/UtilsToolTest.java | 2 +-
.../org/apache/solr/util/hll/BitVectorTest.java | 2 +-
.../apache/solr/util/hll/ExplicitHLLTest.java | 2 +-
.../org/apache/solr/util/hll/FullHLLTest.java | 2 +-
59 files changed, 760 insertions(+), 760 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index 4cff7fa..3e28000 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -108,8 +108,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -122,8 +122,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -134,8 +134,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -147,8 +147,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -171,9 +171,9 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -185,8 +185,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
index bdddc98..8abe4b2 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
@@ -96,8 +96,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -110,8 +110,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -122,8 +122,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -135,8 +135,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -159,9 +159,9 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -173,8 +173,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
index 7a5dca7..0b198b7 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
@@ -52,9 +52,9 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_punctuation:foobar", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]"
);
}
@@ -66,8 +66,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_space:\"foo bar\"", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
}
@@ -79,8 +79,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated sort: ",
req("fl", "id", "q", "id:[4 TO 5]", "sort", "sort_numerics asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=5]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=5]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -92,15 +92,15 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_accents:resume", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=9]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=9]"
);
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_accents:Resume", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=7]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=7]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -112,8 +112,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated sort: ",
req("fl", "id", "q", "id:6 OR id:8", "sort", "sort_uppercase_first asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=8]",
- "//result/doc[2]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=8]",
+ "//result/doc[2]/str[@name='id'][.=6]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 02ae888..2ba9256 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -111,7 +111,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("query with ignored field",
req("bar_ignored:yo id:42")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
}
@@ -150,13 +150,13 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("backslash escaping semicolon",
req("id:42 AND val_s:aa\\;bb")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
assertQ("quote escaping semicolon",
req("id:42 AND val_s:\"aa;bb\"")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
assertQ("no escaping semicolon",
@@ -275,15 +275,15 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
);
assertQ(req("{!lucene q.op=AND df=text}grape green")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='103']"
);
assertQ(req("-_val_:\"{!lucene q.op=AND df=text}grape green\"")
,"//*[@numFound='5']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='104']"
- ,"//int[@name='id'][.='105']"
- ,"//int[@name='id'][.='106']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='104']"
+ ,"//str[@name='id'][.='105']"
+ ,"//str[@name='id'][.='106']"
);
// tests
@@ -298,26 +298,26 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='4']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='103']"
- ,"//int[@name='id'][.='106']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='103']"
+ ,"//str[@name='id'][.='106']"
);
assertU(delQ("{!term f=id}106"));
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='3']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='103']"
);
assertU(delQ("-_val_:\"{!lucene q.op=AND df=text}grape green\""));
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='103']"
);
assertU(delQ("-text:doesnotexist"));
@@ -832,7 +832,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("check math on field query: " + q,
req("q", q),
"*[count(//doc)=1]",
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
}
// range queries using date math
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
index 8d1b758..faf67b4 100644
--- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
@@ -85,9 +85,9 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
assertQ("basic cross field matching, boost on same field matching",
req("cool stuff")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='42']"
- ,"//result/doc[2]/int[@name='id'][.='666']"
- ,"//result/doc[3]/int[@name='id'][.='8675309']"
+ ,"//result/doc[1]/str[@name='id'][.='42']"
+ ,"//result/doc[2]/str[@name='id'][.='666']"
+ ,"//result/doc[3]/str[@name='id'][.='8675309']"
);
assertQ("multi qf",
@@ -112,9 +112,9 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
,"bq", "subject:hell^400"
)
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='666']"
- ,"//result/doc[2]/int[@name='id'][.='42']"
- ,"//result/doc[3]/int[@name='id'][.='8675309']"
+ ,"//result/doc[1]/str[@name='id'][.='666']"
+ ,"//result/doc[2]/str[@name='id'][.='42']"
+ ,"//result/doc[3]/str[@name='id'][.='8675309']"
);
assertQ("multi boost query",
@@ -126,16 +126,16 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
, CommonParams.DEBUG_QUERY, "true"
)
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='666']"
- ,"//result/doc[2]/int[@name='id'][.='8675309']"
- ,"//result/doc[3]/int[@name='id'][.='42']"
+ ,"//result/doc[1]/str[@name='id'][.='666']"
+ ,"//result/doc[2]/str[@name='id'][.='8675309']"
+ ,"//result/doc[3]/str[@name='id'][.='42']"
);
assertQ("minimum mm is three",
req("cool stuff traveling")
,"//*[@numFound='2']"
- ,"//result/doc[1]/int[@name='id'][. ='42']"
- ,"//result/doc[2]/int[@name='id'][. ='666']"
+ ,"//result/doc[1]/str[@name='id'][. ='42']"
+ ,"//result/doc[2]/str[@name='id'][. ='666']"
);
assertQ("at 4 mm allows one missing ",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/SampleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java
index cea23ee..244272f 100644
--- a/solr/core/src/test/org/apache/solr/SampleTest.java
+++ b/solr/core/src/test/org/apache/solr/SampleTest.java
@@ -61,7 +61,7 @@ public class SampleTest extends SolrTestCaseJ4 {
assertQ("couldn't find subject hoss",
req("subject:Hoss")
,"//result[@numFound=1]"
- ,"//int[@name='id'][.='4055']"
+ ,"//str[@name='id'][.='4055']"
);
}
@@ -94,7 +94,7 @@ public class SampleTest extends SolrTestCaseJ4 {
assertQ("couldn't find subject hoss",
req
,"//result[@numFound=1]"
- ,"//int[@name='id'][.='4055']"
+ ,"//str[@name='id'][.='4055']"
);
/* make your own LocalRequestFactory to build a request
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
index 984ad12..646bdbb 100644
--- a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
+++ b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
@@ -46,12 +46,12 @@ public class TestCharFilters extends SolrTestCaseJ4 {
assertQ("Query analysis: ",
req("fl", "id", "q", "content:ab", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
assertQ("Query analysis: ",
req("fl", "id", "q", "content:aba", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
}
@@ -65,12 +65,12 @@ public class TestCharFilters extends SolrTestCaseJ4 {
assertQ("Index analysis: ",
req("fl", "id", "q", "content2:aab", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=3]"
);
assertQ("Index analysis: ",
req("fl", "id", "q", "content2:aabaa", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
index f48f76b..7a9dbdb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
@@ -70,10 +70,10 @@ public class BasicZkTest extends AbstractZkTestCase {
assertU("does commit work?", commit());
assertQ("backslash escaping semicolon", request("id:42 AND val_s:aa\\;bb"),
- "//*[@numFound='1']", "//int[@name='id'][.='42']");
+ "//*[@numFound='1']", "//str[@name='id'][.='42']");
assertQ("quote escaping semicolon", request("id:42 AND val_s:\"aa;bb\""),
- "//*[@numFound='1']", "//int[@name='id'][.='42']");
+ "//*[@numFound='1']", "//str[@name='id'][.='42']");
assertQ("no escaping semicolon", request("id:42 AND val_s:aa"),
"//*[@numFound='0']");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java b/solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
index b9e177a..909f39a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
+++ b/solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
@@ -153,4 +153,4 @@ class FullThrottleStoppableIndexingThread extends StoppableIndexingThread {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
index 7bf4616..830bef2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
@@ -335,4 +335,4 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
return null;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/core/HelloStream.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/HelloStream.java b/solr/core/src/test/org/apache/solr/core/HelloStream.java
index d1c5ced..be285e5 100644
--- a/solr/core/src/test/org/apache/solr/core/HelloStream.java
+++ b/solr/core/src/test/org/apache/solr/core/HelloStream.java
@@ -97,4 +97,4 @@ public class HelloStream extends TupleStream implements Expressible{
.withExpressionType(Explanation.ExpressionType.STREAM_SOURCE)
.withExpression("--non-expressible--");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/core/MockInfoBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/MockInfoBean.java b/solr/core/src/test/org/apache/solr/core/MockInfoBean.java
index dfa94ae..a4334bc 100644
--- a/solr/core/src/test/org/apache/solr/core/MockInfoBean.java
+++ b/solr/core/src/test/org/apache/solr/core/MockInfoBean.java
@@ -68,4 +68,4 @@ class MockInfoBean implements SolrInfoBean, SolrMetricProducer {
});
manager.registerGauge(this, registryName, metricsMap, true, getClass().getSimpleName(), getCategory().toString(), scope);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
index db941f7..70df3c5 100644
--- a/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -197,4 +197,4 @@ public class TestJmxIntegration extends AbstractSolrTestCase {
log.info("After Reload: Size of infoRegistry: " + registrySize + " MBeans: " + newNumberOfObjects);
assertEquals("Number of registered MBeans is not the same as info registry size", registrySize, newNumberOfObjects);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
index 592200d..b65863e 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
@@ -305,4 +305,4 @@ public class TestSolrCloudSnapshots extends SolrCloudTestCase {
}
return result;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
index 7a9b0bb..d508050 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
@@ -309,4 +309,4 @@ public class TestSolrCoreSnapshots extends SolrCloudTestCase {
return Collections.emptyList();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
index 8e9c170..6da06b1 100644
--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
@@ -86,19 +86,19 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
SolrQueryRequest mltreq = new LocalSolrQueryRequest( core, params);
assertQ("morelikethis - tom cruise",mltreq
- ,"//result/doc[1]/int[@name='id'][.='46']"
- ,"//result/doc[2]/int[@name='id'][.='43']");
+ ,"//result/doc[1]/str[@name='id'][.='46']"
+ ,"//result/doc[2]/str[@name='id'][.='43']");
params.set(MoreLikeThisParams.BOOST, "true");
mltreq.close(); mltreq = new LocalSolrQueryRequest( core, params);
assertQ("morelikethis - tom cruise",mltreq
- ,"//result/doc[1]/int[@name='id'][.='46']"
- ,"//result/doc[2]/int[@name='id'][.='43']");
+ ,"//result/doc[1]/str[@name='id'][.='46']"
+ ,"//result/doc[2]/str[@name='id'][.='43']");
params.set(CommonParams.Q, "id:44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ("morelike this - harrison ford",mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
// test MoreLikeThis debug
params.set(CommonParams.DEBUG_QUERY, "true");
@@ -115,14 +115,14 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
params.set(CommonParams.Q, "{!field f=id}44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
params.set(CommonParams.Q, "id:42");
params.set(MoreLikeThisParams.QF,"name^5.0 subword^0.1");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ("morelikethis with weights",mltreq
- ,"//result/doc[1]/int[@name='id'][.='43']"
- ,"//result/doc[2]/int[@name='id'][.='46']");
+ ,"//result/doc[1]/str[@name='id'][.='43']"
+ ,"//result/doc[2]/str[@name='id'][.='46']");
// test that qparser plugins work w/ the MoreLikeThisHandler
@@ -130,14 +130,14 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
params.set(CommonParams.Q, "{!field f=id}44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
// test that debugging works (test for MoreLikeThis*Handler*)
params.set(CommonParams.QT, "/mlt");
params.set(CommonParams.DEBUG_QUERY, "true");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']"
+ ,"//result/doc[1]/str[@name='id'][.='45']"
,"//lst[@name='debug']/lst[@name='explain']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
index 82e8cde..668fefd 100644
--- a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
@@ -49,16 +49,16 @@ public class StandardRequestHandlerTest extends AbstractSolrTestCase {
assertQ(req("q", "title:test", "sort","val_s1 asc")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='12']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
);
assertQ(req("q", "title:test", "sort","val_s1 desc")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='12']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
);
// Make sure score parsing works
@@ -73,16 +73,16 @@ public class StandardRequestHandlerTest extends AbstractSolrTestCase {
// Using legacy ';' param
assertQ(req("q", "title:test; val_s1 desc", "defType","lucenePlusSort")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='12']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
);
assertQ(req("q", "title:test; val_s1 asc", "defType","lucenePlusSort")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='12']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
index 7062b43..fb7bd19 100644
--- a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
@@ -90,7 +90,7 @@ public class XsltUpdateRequestHandlerTest extends SolrTestCaseJ4 {
assertQ("test document was correctly committed", req("q","*:*")
, "//result[@numFound='1']"
- , "//int[@name='id'][.='12345']"
+ , "//str[@name='id'][.='12345']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
index c7622f6..40d7821 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
@@ -96,4 +96,4 @@ public class MBeansHandlerTest extends SolrTestCaseJ4 {
assertTrue("external entity ignored properly", true);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
index 1a959a4..34ab7eb 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
@@ -70,4 +70,4 @@ public class PropertiesRequestHandlerTest extends SolrTestCaseJ4 {
return (NamedList<NamedList<NamedList<Object>>>)
parser.processResponse(new StringReader(xml)).get("system.properties");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
index f439e87..99238e4 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
@@ -96,9 +96,9 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='3']"
- , "//result/doc[1]/float[@name='id'][.='7.0']"
- , "//result/doc[2]/float[@name='id'][.='9.0']"
- , "//result/doc[3]/float[@name='id'][.='8.0']",
+ , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[2]/str[@name='id'][.='9.0']"
+ , "//result/doc[3]/str[@name='id'][.='8.0']",
"//result/doc[1]/bool[@name='[elevated]'][.='true']",
"//result/doc[2]/bool[@name='[elevated]'][.='false']",
"//result/doc[3]/bool[@name='[elevated]'][.='false']"
@@ -144,19 +144,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='6.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='6.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='66.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='66.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='7.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='7.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='77.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='77.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -171,19 +171,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -199,19 +199,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='2.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='22.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='7.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='77.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -228,19 +228,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='2.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='22.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='6.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='66.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -258,19 +258,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='22.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='2.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='66.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='6.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='77.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='7.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='true']"
);
@@ -289,19 +289,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/float[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/float[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/float[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='22.0']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/float[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='2.0']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/float[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='66.0']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/float[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='6.0']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -331,9 +331,9 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='7']"
- ,"//result/doc[2]/int[@name='id'][.='8']"
- ,"//result/doc[3]/int[@name='id'][.='9']",
+ ,"//result/doc[1]/str[@name='id'][.='7']"
+ ,"//result/doc[2]/str[@name='id'][.='8']"
+ ,"//result/doc[3]/str[@name='id'][.='9']",
"//result/doc[1]/bool[@name='[elevated]'][.='true']",
"//result/doc[2]/bool[@name='[elevated]'][.='false']",
"//result/doc[3]/bool[@name='[elevated]'][.='false']"
@@ -750,19 +750,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7.0']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND}AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7.0']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND v='AAAA'}", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7.0']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
index 332e346..f0f0649 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
@@ -119,12 +119,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand", "true");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2.0']",
+ "/response/result/doc[2]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
);
//Basic test case page 2
@@ -139,9 +139,9 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("start", "1");
assertQ(req(params), "*[count(/response/result/doc)=1]",
"*[count(/response/lst[@name='expanded']/result)=1]",
- "/response/result/doc[1]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
);
//Test expand.sort
@@ -154,12 +154,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc, sub(1,1) asc");//the "sub()" just testing function queries
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2.0']",
+ "/response/result/doc[2]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
);
//Test with nullPolicy, ExpandComponent should ignore docs with null values in the collapse fields.
@@ -173,13 +173,13 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=3]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='3.0']",
- "/response/result/doc[2]/float[@name='id'][.='2.0']",
- "/response/result/doc[3]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='3.0']",
+ "/response/result/doc[2]/str[@name='id'][.='2.0']",
+ "/response/result/doc[3]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
);
@@ -195,12 +195,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1.0']",
+ "/response/result/doc[2]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
);
@@ -217,12 +217,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1.0']",
+ "/response/result/doc[2]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
);
//Test overide expand.fq and expand.q
@@ -239,12 +239,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1.0']",
+ "/response/result/doc[2]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
);
//Test expand.rows
@@ -261,10 +261,10 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
"*[count(/response/lst[@name='expanded']/result)=2]",
"*[count(/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc)=1]",
"*[count(/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc)=1]",
- "/response/result/doc[1]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2.0']",
+ "/response/result/doc[2]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']"
);
@@ -307,12 +307,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("fl", "id");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2.0']",
+ "/response/result/doc[2]/str[@name='id'][.='6.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
index b80fe95..c10c3e0 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
@@ -64,23 +64,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testChildDoctransformerXML() {
String test1[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='3'" ,
- "/response/result/doc[1]/doc[3]/int[@name='id']='4'" ,
- "/response/result/doc[1]/doc[4]/int[@name='id']='5'" ,
- "/response/result/doc[1]/doc[5]/int[@name='id']='6'" ,
- "/response/result/doc[1]/doc[6]/int[@name='id']='7'"};
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/doc[3]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/doc[4]/str[@name='id']='5'" ,
+ "/response/result/doc[1]/doc[5]/str[@name='id']='6'" ,
+ "/response/result/doc[1]/doc[6]/str[@name='id']='7'"};
String test2[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[1]/doc[3]/int[@name='id']='6'" };
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/doc[3]/str[@name='id']='6'" };
String test3[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='3'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='5'" };
+ "/response/result/doc[1]/doc[1]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='5'" };
@@ -100,12 +100,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
final String subqueryPath = "/result[@name='children'][@numFound='6']";
test1 = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]" + subqueryPath + "/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[2]/int[@name='id']='3'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[3]/int[@name='id']='4'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[4]/int[@name='id']='5'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[5]/int[@name='id']='6'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[6]/int[@name='id']='7'"};
+ "/response/result/doc[1]" + subqueryPath + "/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[2]/str[@name='id']='3'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[3]/str[@name='id']='4'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[4]/str[@name='id']='5'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[5]/str[@name='id']='6'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[6]/str[@name='id']='7'"};
}
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
@@ -116,9 +116,9 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String test2[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[3]/int[@name='id']='6'" };
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[3]/str[@name='id']='6'" };
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
"fl", "*,children:[subquery]",
@@ -130,8 +130,8 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String test3[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/int[@name='id']='3'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/int[@name='id']='5'" };
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/str[@name='id']='5'" };
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
@@ -346,12 +346,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String tests[] = new String[] {
"//*[@numFound='2']",
- "/response/result/doc[1]/int[@name='id']='1'" ,
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
+ "/response/result/doc[1]/str[@name='id']='1'" ,
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
"/response/result/doc[1]/doc[1]/arr[@name='cat']/str[1]='childDocument'" ,
"/response/result/doc[1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
- "/response/result/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[2]/doc[1]/int[@name='id']='5'",
+ "/response/result/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[2]/doc[1]/str[@name='id']='5'",
"/response/result/doc[2]/doc[1]/arr[@name='cat']/str[1]='childDocument'",
"/response/result/doc[2]/doc[1]/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
@@ -372,12 +372,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String tests[] = new String[] {
"//*[@numFound='2']",
- "/response/result/doc[1]/int[@name='id']='1'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/int[@name='id']='2'" ,
+ "/response/result/doc[1]/str[@name='id']='1'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/str[@name='id']='2'" ,
"/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='cat']/str[1]='childDocument'" ,
"/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
- "/response/result/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/int[@name='id']='5'",
+ "/response/result/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/str[@name='id']='5'",
"/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='cat']/str[1]='childDocument'",
"/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
index a39e774..31e7f28 100644
--- a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
+++ b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
@@ -277,4 +277,4 @@ public class TestRestManager extends SolrRestletTestBase {
String resourceId = RestManager.ManagedEndpoint.resolveResourceId(testRequest);
assertEquals(resourceId, "/schema/analysis/synonyms/de/Ă„ndern");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
index a195794..be719db 100644
--- a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
@@ -230,11 +230,11 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "" + 1, field(), "10.00,USD"));
assertU(adoc("id", "" + 2, field(), "15.00,MXN"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", field()+":10.00,USD"), "//int[@name='id']='1'");
+ assertQ(req("fl", "*,score", "q", field()+":10.00,USD"), "//str[@name='id']='1'");
assertQ(req("fl", "*,score", "q", field()+":9.99,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":10.01,USD"), "//*[@numFound='0']");
- assertQ(req("fl", "*,score", "q", field()+":15.00,MXN"), "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//int[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":15.00,MXN"), "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//str[@name='id']='2'");
assertQ(req("fl", "*,score", "q", field()+":7.49,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":7.51,USD"), "//*[@numFound='0']");
}
@@ -293,8 +293,8 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "" + 5, field(), "2.00,GBP"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" desc", "limit", "1"), "//int[@name='id']='4'");
- assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" asc", "limit", "1"), "//int[@name='id']='3'");
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" desc", "limit", "1"), "//str[@name='id']='4'");
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" asc", "limit", "1"), "//str[@name='id']='3'");
}
public void testFunctionUsage() throws Exception {
@@ -324,21 +324,21 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertQ(req("fl", "id,score,"+field(),
"q", "{!frange u=500}"+field())
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "id,score,"+field(),
"q", "{!frange l=500 u=1000}"+field())
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
// use the currency function to convert to default (USD)
@@ -356,22 +356,22 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
"f", field(),
"q", "{!frange u=5}currency($f)")
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "id,score"+field(),
"f", field(),
"q", "{!frange l=5 u=10}currency($f)")
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
// use the currency function to convert to MXN
@@ -389,22 +389,22 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
"f", field(),
"q", "{!frange u=10}currency($f,MXN)")
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "*,score,"+field(),
"f", field(),
"q", "{!frange l=10 u=20}currency($f,MXN)")
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
}
@@ -418,9 +418,9 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "3", "mock_amount", "1.00,NOK"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", "mock_amount:5.0,NOK"), "//*[@numFound='1']", "//int[@name='id']='1'");
- assertQ(req("fl", "*,score", "q", "mock_amount:1.2,USD"), "//*[@numFound='1']", "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", "mock_amount:0.2,USD"), "//*[@numFound='1']", "//int[@name='id']='3'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:5.0,NOK"), "//*[@numFound='1']", "//str[@name='id']='1'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:1.2,USD"), "//*[@numFound='1']", "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:0.2,USD"), "//*[@numFound='1']", "//str[@name='id']='3'");
assertQ(req("fl", "*,score", "q", "mock_amount:99,USD"), "//*[@numFound='0']");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
index d95f144..86a8aca 100644
--- a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
@@ -134,7 +134,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
args = new HashMap<>();
@@ -143,7 +143,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic source", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
,"//result/doc[1]/arr[@name='highlight']/str[.='this is a simple test of ']"
);
@@ -194,7 +194,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku2 copied to text", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
args = new HashMap<>();
@@ -203,7 +203,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku1 copied to dynamic dest *_s", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
,"//result/doc[1]/arr[@name='sku1']/str[.='10-1839ACX-93']"
);
@@ -242,7 +242,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku2 copied to text", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
}
@@ -257,7 +257,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
for (String q : new String[] {"5", "10-1839ACX-93", "AAM46" }) {
assertQ(req("q","catchall_t:" + q)
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']");
+ ,"//result/doc[1]/str[@name='id'][.='5']");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
index f3872d0..e8bffe7 100644
--- a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
@@ -33,8 +33,8 @@ public class CurrencyFieldXmlFileTest extends AbstractCurrencyFieldTest {
assertU(adoc("id", "" + 2, field(), "15.00,EUR"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", field()+":15.00,EUR"), "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//int[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":15.00,EUR"), "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//str[@name='id']='2'");
assertQ(req("fl", "*,score", "q", field()+":7.49,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":7.51,USD"), "//*[@numFound='0']");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
index e76f821..edd25b0 100644
--- a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
@@ -119,7 +119,7 @@ public class DateRangeFieldTest extends SolrTestCaseJ4 {
if (docIds != null && docIds.length > 0) {
int i = 1;
for (int docId : docIds) {
- tests[i++] = "//result/doc/int[@name='id'][.='" + docId + "']";
+ tests[i++] = "//result/doc/str[@name='id'][.='" + docId + "']";
}
}
return tests;