You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/10/31 17:58:35 UTC
[1/2] lucene-solr:jira/solr-8542-v2: SOLR-8542: test-files cleanup
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8542-v2 7a3338a79 -> e17a3430f
SOLR-8542: test-files cleanup
* remove unused conf files
* rename schema-ltr.xml to schema.xml (since there is nothing ltr-specific in the schema)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/363233df
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/363233df
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/363233df
Branch: refs/heads/jira/solr-8542-v2
Commit: 363233dfd2a4ccd0fe3b9b9313c11ac58e2cecc5
Parents: 7a3338a
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Oct 31 16:26:44 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Oct 31 17:11:07 2016 +0000
----------------------------------------------------------------------
.../solr/collection1/conf/indexSynonyms.txt | 18 ----
.../solr/collection1/conf/protwords.txt | 20 -----
.../solr/collection1/conf/schema-ltr.xml | 88 --------------------
.../test-files/solr/collection1/conf/schema.xml | 88 ++++++++++++++++++++
.../solr/collection1/conf/stemdict.txt | 19 -----
.../solr/collection1/conf/wdfftypes.txt | 11 ---
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 2 +-
.../apache/solr/ltr/TestLTRQParserPlugin.java | 2 +-
.../org/apache/solr/ltr/TestLTRWithFacet.java | 2 +-
.../org/apache/solr/ltr/TestLTRWithSort.java | 2 +-
.../solr/ltr/TestParallelWeightCreation.java | 2 +-
.../org/apache/solr/ltr/TestRerankBase.java | 4 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../ltr/feature/TestEdisMaxSolrFeature.java | 2 +-
.../solr/ltr/feature/TestExternalFeatures.java | 2 +-
.../ltr/feature/TestExternalValueFeatures.java | 2 +-
...stFeatureExtractionFromMultipleSegments.java | 2 +-
.../ltr/feature/TestFieldLengthFeature.java | 2 +-
.../solr/ltr/feature/TestFieldValueFeature.java | 2 +-
.../solr/ltr/feature/TestFilterSolrFeature.java | 2 +-
.../ltr/feature/TestNoMatchSolrFeature.java | 2 +-
.../ltr/feature/TestOriginalScoreFeature.java | 2 +-
.../solr/ltr/feature/TestRankingFeature.java | 2 +-
.../ltr/feature/TestUserTermScoreWithQ.java | 2 +-
.../ltr/feature/TestUserTermScorerQuery.java | 2 +-
.../ltr/feature/TestUserTermScorereQDF.java | 2 +-
.../solr/ltr/feature/TestValueFeature.java | 2 +-
.../model/TestMultipleAdditiveTreesModel.java | 2 +-
28 files changed, 111 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/indexSynonyms.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/indexSynonyms.txt b/solr/contrib/ltr/src/test-files/solr/collection1/conf/indexSynonyms.txt
deleted file mode 100644
index af55e6e..0000000
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/indexSynonyms.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# the asf licenses this file to you under the apache license, version 2.0
-# (the "license"); you may not use this file except in compliance with
-# the license. you may obtain a copy of the license at
-#
-# http://www.apache.org/licenses/license-2.0
-#
-# unless required by applicable law or agreed to in writing, software
-# distributed under the license is distributed on an "as is" basis,
-# without warranties or conditions of any kind, either express or implied.
-# see the license for the specific language governing permissions and
-# limitations under the license.
-
-#-----------------------------------------------------------------------
-
-# some synonym groups specific to this example
-gb,gib,gigabyte,gigabytes
-mb,mib,megabyte,megabytes
-television, televisions, tv, tvs
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/protwords.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/protwords.txt b/solr/contrib/ltr/src/test-files/solr/collection1/conf/protwords.txt
deleted file mode 100644
index 02cb4ac..0000000
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/protwords.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# Use a protected word file to protect against the stemmer reducing two
-# unrelated words to the same base word.
-
-# Some non-words that normally won't be encountered,
-# just to test that they won't be stemmed.
-
-offical
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema-ltr.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema-ltr.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema-ltr.xml
deleted file mode 100644
index 15cf140..0000000
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema-ltr.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<schema name="example" version="1.5">
- <fields>
- <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
- <field name="title" type="text_general" indexed="true" stored="true"/>
- <field name="description" type="text_general" indexed="true" stored="true"/>
- <field name="keywords" type="text_general" indexed="true" stored="true" multiValued="true"/>
- <field name="popularity" type="int" indexed="true" stored="true" />
- <field name="normHits" type="float" indexed="true" stored="true" />
- <field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/>
- <field name="_version_" type="long" indexed="true" stored="true"/>
-
- <dynamicField name="*_s" type="string" indexed="true" stored="true" />
- <dynamicField name="*_t" type="text_general" indexed="true" stored="true"/>
- </fields>
-
- <uniqueKey>id</uniqueKey>
-
- <copyField source="title" dest="text"/>
- <copyField source="description" dest="text"/>
-
- <types>
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
- <fieldtype name="binary" class="solr.BinaryField"/>
-
- <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
- <analyzer>
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- </analyzer>
- </fieldType>
-
- <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
- <analyzer type="index">
- <tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <fieldType name="text_lc" class="solr.TextField" positionIncrementGap="100">
- <analyzer>
- <tokenizer class="solr.KeywordTokenizerFactory"/>
- <filter class="solr.LowerCaseFilterFactory" />
- </analyzer>
- </fieldType>
- </types>
-
- <!-- Similarity is the scoring routine for each document vs. a query.
- A custom Similarity or SimilarityFactory may be specified here, but
- the default is fine for most applications.
- For more info: http://wiki.apache.org/solr/SchemaXml#Similarity
- -->
- <!--
- <similarity class="com.example.solr.CustomSimilarityFactory">
- <str name="paramkey">param value</str>
- </similarity>
- -->
-
-</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
new file mode 100644
index 0000000..15cf140
--- /dev/null
+++ b/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<schema name="example" version="1.5">
+ <fields>
+ <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
+ <field name="title" type="text_general" indexed="true" stored="true"/>
+ <field name="description" type="text_general" indexed="true" stored="true"/>
+ <field name="keywords" type="text_general" indexed="true" stored="true" multiValued="true"/>
+ <field name="popularity" type="int" indexed="true" stored="true" />
+ <field name="normHits" type="float" indexed="true" stored="true" />
+ <field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/>
+ <field name="_version_" type="long" indexed="true" stored="true"/>
+
+ <dynamicField name="*_s" type="string" indexed="true" stored="true" />
+ <dynamicField name="*_t" type="text_general" indexed="true" stored="true"/>
+ </fields>
+
+ <uniqueKey>id</uniqueKey>
+
+ <copyField source="title" dest="text"/>
+ <copyField source="description" dest="text"/>
+
+ <types>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldtype name="binary" class="solr.BinaryField"/>
+
+ <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
+ <analyzer>
+ <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+ <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <fieldType name="text_lc" class="solr.TextField" positionIncrementGap="100">
+ <analyzer>
+ <tokenizer class="solr.KeywordTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory" />
+ </analyzer>
+ </fieldType>
+ </types>
+
+ <!-- Similarity is the scoring routine for each document vs. a query.
+ A custom Similarity or SimilarityFactory may be specified here, but
+ the default is fine for most applications.
+ For more info: http://wiki.apache.org/solr/SchemaXml#Similarity
+ -->
+ <!--
+ <similarity class="com.example.solr.CustomSimilarityFactory">
+ <str name="paramkey">param value</str>
+ </similarity>
+ -->
+
+</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/stemdict.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/stemdict.txt b/solr/contrib/ltr/src/test-files/solr/collection1/conf/stemdict.txt
deleted file mode 100644
index 78f05c2..0000000
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/stemdict.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# test that we can override the stemming algorithm with our own mappings
-# these must be tab-separated
-salty salt
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test-files/solr/collection1/conf/wdfftypes.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/wdfftypes.txt b/solr/contrib/ltr/src/test-files/solr/collection1/conf/wdfftypes.txt
deleted file mode 100644
index 52e60f8..0000000
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/wdfftypes.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# A customized type mapping for WordDelimiterFilterFactory
-# the allowable types are: LOWER, UPPER, ALPHA, DIGIT, ALPHANUM, SUBWORD_DELIM
-#
-# the default for any character without a mapping is always computed from
-# Unicode character properties
-
-# Map the $, % characters to DIGIT
-# This might be useful for financial data.
-$ => DIGIT
-% => DIGIT
-& => ALPHA
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
index 0eb661e..2e01a64 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
@@ -39,7 +39,7 @@ public class TestLTROnSolrCloud extends TestRerankBase {
private MiniSolrCloudCluster solrCluster;
String solrconfig = "solrconfig-ltr.xml";
- String schema = "schema-ltr.xml";
+ String schema = "schema.xml";
SortedMap<ServletHolder,String> extraServlets = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
index 4108ae4..f28ab0d 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRQParserPlugin.java
@@ -26,7 +26,7 @@ public class TestLTRQParserPlugin extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
// store = getModelStore();
bulkIndex();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
index 687aed4..ab519ec 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithFacet.java
@@ -28,7 +28,7 @@ public class TestLTRWithFacet extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "a1", "description", "E", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
index 53ef8b8..1fbe1d5 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRWithSort.java
@@ -28,7 +28,7 @@ public class TestLTRWithSort extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "a1", "description", "E", "popularity",
"1"));
assertU(adoc("id", "2", "title", "a1 b1", "description",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
index 2e478a6..f4c21fd 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestParallelWeightCreation.java
@@ -23,7 +23,7 @@ public class TestParallelWeightCreation extends TestRerankBase{
@Test
public void testLTRScoringQueryParallelWeightCreationResultOrder() throws Exception {
- setuptest("solrconfig-ltr_Th10_10.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr_Th10_10.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1 w3", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 939ee3f..4914d28 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -76,12 +76,12 @@ public class TestRerankBase extends RestTestBase {
protected static File mstorefile = null;
public static void setuptest() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
bulkIndex();
}
public static void setupPersistenttest() throws Exception {
- setupPersistentTest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setupPersistentTest("solrconfig-ltr.xml", "schema.xml");
bulkIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
index 9459725..db9fbe1 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java
@@ -104,7 +104,7 @@ public class TestSelectiveWeightCreation extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1 w3", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
index 16e2fe3..cd63b5c 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestEdisMaxSolrFeature.java
@@ -27,7 +27,7 @@ public class TestEdisMaxSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
index d3d4c57..8c00758 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalFeatures.java
@@ -26,7 +26,7 @@ public class TestExternalFeatures extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
index c4d6bcf..bc073cb 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestExternalValueFeatures.java
@@ -26,7 +26,7 @@ public class TestExternalValueFeatures extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
index a834589..7658f62 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
@@ -41,7 +41,7 @@ public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
// solrconfig-multiseg.xml contains the merge policy to restrict merging
- setuptest("solrconfig-multiseg.xml", "schema-ltr.xml");
+ setuptest("solrconfig-multiseg.xml", "schema.xml");
// index 400 documents
for(int i = 0; i<400;i=i+20) {
assertU(adoc("id", new Integer(i).toString(), "popularity", "201", "description", "apple is a company " + randomString(i%6+3), "normHits", "0.1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
index 7a3a0b6..4a0d449 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldLengthFeature.java
@@ -27,7 +27,7 @@ public class TestFieldLengthFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1"));
assertU(adoc("id", "2", "title", "w2 2asd asdd didid", "description",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
index d85b5a5..af150c0 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java
@@ -29,7 +29,7 @@ public class TestFieldValueFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
index 97bd8c6..14baefa 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFilterSolrFeature.java
@@ -27,7 +27,7 @@ import org.junit.Test;
public class TestFilterSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
index 87b5ef5..5712687 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
@@ -32,7 +32,7 @@ public class TestNoMatchSolrFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
index 191ffc2..e525891 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
@@ -31,7 +31,7 @@ public class TestOriginalScoreFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1"));
assertU(adoc("id", "2", "title", "w2"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
index 1e5e551..437e10d 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestRankingFeature.java
@@ -28,7 +28,7 @@ public class TestRankingFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
index b4655f0..754409a 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScoreWithQ.java
@@ -27,7 +27,7 @@ public class TestUserTermScoreWithQ extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
index 71f94db..c79207c 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorerQuery.java
@@ -27,7 +27,7 @@ public class TestUserTermScorerQuery extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
index 4bd7152..f47a883 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestUserTermScorereQDF.java
@@ -27,7 +27,7 @@ public class TestUserTermScorereQDF extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity",
"1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
index 14838b3..084da4a 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestValueFeature.java
@@ -27,7 +27,7 @@ public class TestValueFeature extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1"));
assertU(adoc("id", "2", "title", "w2"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/363233df/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
index 7b4ab1f..3748331 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestMultipleAdditiveTreesModel.java
@@ -30,7 +30,7 @@ public class TestMultipleAdditiveTreesModel extends TestRerankBase {
@BeforeClass
public static void before() throws Exception {
- setuptest("solrconfig-ltr.xml", "schema-ltr.xml");
+ setuptest("solrconfig-ltr.xml", "schema.xml");
assertU(adoc("id", "1", "title", "w1", "description", "w1", "popularity","1"));
assertU(adoc("id", "2", "title", "w2", "description", "w2", "popularity","2"));
[2/2] lucene-solr:jira/solr-8542-v2: SOLR-8542: overview.html
proof-read/tweak
Posted by cp...@apache.org.
SOLR-8542: overview.html proof-read/tweak
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e17a3430
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e17a3430
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e17a3430
Branch: refs/heads/jira/solr-8542-v2
Commit: e17a3430f05cd2072f32bbd42faf93f5150e8533
Parents: 363233d
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Oct 31 17:55:23 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Oct 31 17:55:23 2016 +0000
----------------------------------------------------------------------
solr/contrib/ltr/src/java/overview.html | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e17a3430/solr/contrib/ltr/src/java/overview.html
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/overview.html b/solr/contrib/ltr/src/java/overview.html
index 7b8198c..47179f0 100644
--- a/solr/contrib/ltr/src/java/overview.html
+++ b/solr/contrib/ltr/src/java/overview.html
@@ -29,7 +29,7 @@ functions like TF-IDF or BM25.
</p>
<p>
This module allows to plug a reranking component directly into Solr, enabling users
-lto easily build their own learning to rank systems and access the rich
+to easily build their own learning to rank systems and access the rich
matching features readily available in Solr. It also provides tools to perform
feature engineering and feature extraction.
</p>
@@ -37,7 +37,7 @@ feature engineering and feature extraction.
<p>
A Learning to Rank model is plugged into the ranking through the {@link org.apache.solr.search.LTRQParserPlugin},
a {@link org.apache.solr.search.QParserPlugin}. The plugin will
-read from the request the model (instance of {@link org.apache.solr.ltr.LTRScoringQuery})
+read from the request the model (instance of {@link org.apache.solr.ltr.LTRScoringModel})
used to perform the request plus other
parameters. The plugin will generate a {@link org.apache.solr.search.LTRQParserPlugin.LTRQuery LTRQuery}:
a particular {@link org.apache.solr.search.RankQuery}
@@ -63,7 +63,7 @@ into the framework by extending {@link org.apache.solr.ltr.model.LTRScoringMode
The {@link org.apache.solr.ltr.LTRScoringQuery} will take care of computing the values of
all the features (see {@link org.apache.solr.ltr.feature.Feature}) and then will delegate the final score
generation to the {@link org.apache.solr.ltr.model.LTRScoringModel}, by calling the method
-{@link org.apache.solr.ltr.model.LTRScoringModel#score(float[] modelFeatureValuesNormalized) score(float[] modelFeatureValuesNormalized)}.
+{@link org.apache.solr.ltr.model.LTRScoringModel#score(float[] modelFeatureValuesNormalized)}.
</p>
<p>
A {@link org.apache.solr.ltr.feature.Feature} will produce a particular value for each document, so
@@ -72,17 +72,17 @@ it is modeled as a {@link org.apache.lucene.search.Query}. The package
of features. One benefit of extending the Query object is that we can reuse
Query as a feature, see for example {@link org.apache.solr.ltr.feature.SolrFeature}.
Features for a document can also be returned in the response by
-using {@link org.apache.solr.response.transform.DocTransformer DocTransformer}
+using the FeatureTransformer (a {@link org.apache.solr.response.transform.DocTransformer DocTransformer})
provided by {@link org.apache.solr.response.transform.LTRFeatureLoggerTransformerFactory}.
</p>
<p>
-{@link org.apache.solr.ltr.store} contains all the logic to store all the features and the models
-added by a user. Models are registered into a unique {@link org.apache.solr.ltr.store.ModelStore ModelStore},
+{@link org.apache.solr.ltr.store} contains all the logic to store all the features and the models.
+Models are registered into a unique {@link org.apache.solr.ltr.store.ModelStore ModelStore},
and each model specifies a particular {@link org.apache.solr.ltr.store.FeatureStore FeatureStore} that
will contain a particular subset of features.
<p>
</p>
-A user can manage features and models through a REST API, provided by the
+Features and models can be managed through a REST API, provided by the
{@link org.apache.solr.rest.ManagedResource Managed Resources}
{@link org.apache.solr.ltr.store.rest.ManagedFeatureStore ManagedFeatureStore}
and {@link org.apache.solr.ltr.store.rest.ManagedModelStore ManagedModelStore}.