Skip to content

Commit b7c57bd

Browse files
author
justin caratzas
committed
switch solr configs to solr 4
almost all tests passing, but spatial not working
1 parent 9791c55 commit b7c57bd

File tree

5 files changed

+1637
-432
lines changed

5 files changed

+1637
-432
lines changed

‎haystack/templates/search_configuration/solr.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19-
<schema name="default" version="1.4">
19+
<schema name="default" version="1.5">
2020
<types>
2121
<fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
2222
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
@@ -30,6 +30,10 @@
3030
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" sortMissingLast="true" positionIncrementGap="0"/>
3131
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" sortMissingLast="true" positionIncrementGap="0"/>
3232
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" sortMissingLast="true" positionIncrementGap="0"/>
33+
<fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
34+
<fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
35+
<fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
36+
<fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
3337

3438
<fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
3539
<fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -133,6 +137,7 @@
133137
<field name="{{ ID }}" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
134138
<field name="{{ DJANGO_CT }}" type="string" indexed="true" stored="true" multiValued="false"/>
135139
<field name="{{ DJANGO_ID }}" type="string" indexed="true" stored="true" multiValued="false"/>
140+
<field name="_version_" type="long" indexed="true" stored ="true"/>
136141

137142
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
138143
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>

‎tests/solr_test_schema.xml renamed to ‎tests/solr_schema.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
3030
<fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
3131
<fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
32+
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" sortMissingLast="true" positionIncrementGap="0"/>
3233
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0" omitNorms="true"/>
3334

3435
<fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
@@ -43,7 +44,7 @@
4344
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
4445
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
4546
<filter class="solr.LowerCaseFilterFactory"/>
46-
<filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
47+
<filter class="solr.SnowballPorterFilterFactory" language="English"/>
4748
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
4849
</analyzer>
4950
<analyzer type="query">
@@ -52,7 +53,7 @@
5253
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
5354
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
5455
<filter class="solr.LowerCaseFilterFactory"/>
55-
<filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
56+
<filter class="solr.SnowballPorterFilterFactory" language="English"/>
5657
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
5758
</analyzer>
5859
</fieldType>
@@ -92,6 +93,7 @@
9293

9394
<fields>
9495
<!-- general -->
96+
<field name="_version_" type="long" indexed="true" stored ="true"/>
9597
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
9698
<field name="type" type="string" indexed="true" stored="true" multiValued="false" />
9799
<field name="name" type="string" indexed="true" stored="true" multiValued="false" />
@@ -114,7 +116,7 @@
114116
<dynamicField name="*_f" type="sfloat" indexed="true" stored="true"/>
115117
<dynamicField name="*_d" type="sdouble" indexed="true" stored="true"/>
116118
<dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
117-
<dynamicField name="*_location" type="double" indexed="true" stored="false" multiValued="true"/>
119+
<dynamicField name="*_location" type="location" indexed="true" stored="false"/>
118120

119121
<field name="django_ct" type="string" indexed="true" stored="true" multiValued="false" />
120122
<field name="django_id" type="string" indexed="true" stored="true" multiValued="false" />
@@ -137,4 +139,3 @@
137139
<!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
138140
<solrQueryParser defaultOperator="OR"/>
139141
</schema>
140-

‎tests/solr_tests/tests/solr_backend.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,12 @@ def test_non_silent(self):
235235
def test_update(self):
236236
self.sb.update(self.smmi, self.sample_objs)
237237

238+
results = self.raw_solr.search('*:*')
239+
for result in results:
240+
del result['_version_']
238241
# Check what Solr thinks is there.
239-
self.assertEqual(self.raw_solr.search('*:*').hits, 3)
240-
self.assertEqual(self.raw_solr.search('*:*').docs, [
242+
self.assertEqual(results.hits, 3)
243+
self.assertEqual(results.docs, [
241244
{
242245
'django_id': '1',
243246
'django_ct': 'core.mockmodel',
@@ -272,8 +275,11 @@ def test_remove(self):
272275
self.assertEqual(self.raw_solr.search('*:*').hits, 3)
273276

274277
self.sb.remove(self.sample_objs[0])
275-
self.assertEqual(self.raw_solr.search('*:*').hits, 2)
276-
self.assertEqual(self.raw_solr.search('*:*').docs, [
278+
results = self.raw_solr.search('*:*')
279+
for result in results:
280+
del result['_version_']
281+
self.assertEqual(results.hits, 2)
282+
self.assertEqual(results.docs, [
277283
{
278284
'django_id': '2',
279285
'django_ct': 'core.mockmodel',

0 commit comments

Comments
 (0)