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 2017/05/30 11:56:19 UTC
[1/4] lucene-solr:jira/solr-8668: LUCENE-7856: Remove unnecessary
dependencies of spatial-extras.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8668 36faceaf5 -> 5b0b17396
LUCENE-7856: Remove unnecessary dependencies of spatial-extras.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/366cd7ca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/366cd7ca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/366cd7ca
Branch: refs/heads/jira/solr-8668
Commit: 366cd7cab7f015335f9d6969705270e01754d397
Parents: 759fa42
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue May 30 11:49:53 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue May 30 11:49:53 2017 +0200
----------------------------------------------------------------------
lucene/spatial-extras/build.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/366cd7ca/lucene/spatial-extras/build.xml
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/build.xml b/lucene/spatial-extras/build.xml
index 2e425fd..e9cc29c 100644
--- a/lucene/spatial-extras/build.xml
+++ b/lucene/spatial-extras/build.xml
@@ -31,9 +31,7 @@
<path id="classpath">
<path refid="base.classpath"/>
<path refid="spatialjar"/>
- <pathelement path="${backward-codecs.jar}" />
<pathelement path="${queries.jar}" />
- <pathelement path="${misc.jar}" />
<pathelement path="${spatial3d.jar}" />
</path>
[2/4] lucene-solr:jira/solr-8668: SOLR-8668: fix != vs. == muddle
(assertWarnOrFail)
Posted by cp...@apache.org.
SOLR-8668: fix != vs. == muddle (assertWarnOrFail)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0cb5f640
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0cb5f640
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0cb5f640
Branch: refs/heads/jira/solr-8668
Commit: 0cb5f6404bc21ea6d637dd7ca9070f79b22f66a5
Parents: 36facea
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 12:54:34 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 12:54:34 2017 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0cb5f640/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index cdca5b0..a6bceb5 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -148,13 +148,13 @@ public class SolrIndexConfig implements MapSerializable {
mergePolicyFactoryInfo = getPluginInfo(prefix + "/mergePolicyFactory", solrConfig, def.mergePolicyFactoryInfo);
assertWarnOrFail("Beginning with Solr 7.0, <mergePolicy> is no longer supported, use <mergePolicyFactory> instead.",
- getPluginInfo(prefix + "/mergePolicy", solrConfig, null) != null,
+ getPluginInfo(prefix + "/mergePolicy", solrConfig, null) == null,
true);
assertWarnOrFail("Beginning with Solr 7.0, <maxMergeDocs> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.",
- solrConfig.getInt(prefix+"/maxMergeDocs") != 0,
+ solrConfig.getInt(prefix+"/maxMergeDocs", 0) == 0,
true);
assertWarnOrFail("Beginning with Solr 7.0, <mergeFactor> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.",
- solrConfig.getInt(prefix+"/mergeFactor") != 0,
+ solrConfig.getInt(prefix+"/mergeFactor", 0) == 0,
true);
String val = solrConfig.get(prefix + "/termIndexInterval", null);
[3/4] lucene-solr:jira/solr-8668: SOLR-8668: remove unreachable test
code
Posted by cp...@apache.org.
SOLR-8668: remove unreachable test code
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e36aee40
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e36aee40
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e36aee40
Branch: refs/heads/jira/solr-8668
Commit: e36aee407f0c1ea340a6f035cd5002b9c761a908
Parents: 0cb5f64
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 12:55:15 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 12:55:15 2017 +0100
----------------------------------------------------------------------
.../test/org/apache/solr/update/SolrIndexConfigTest.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e36aee40/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
index db97db7..ec5719c 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
@@ -173,14 +173,7 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 {
}
++mSizeExpected; assertTrue(m.get("mergeScheduler") instanceof MapSerializable);
- if (solrConfigFileName.equals(solrConfigFileNameTieredMergePolicyFactory) ||
- solrConfigFileName.equals(solrConfigFileNameWarmerRandomMergePolicyFactory)) {
- assertNull(m.get("mergePolicy"));
- ++mSizeExpected; assertTrue(m.get("mergePolicyFactory") instanceof MapSerializable);
- } else {
- ++mSizeExpected; assertTrue(m.get("mergePolicy") instanceof MapSerializable);
- assertNull(m.get("mergePolicyFactory"));
- }
+ ++mSizeExpected; assertTrue(m.get("mergePolicyFactory") instanceof MapSerializable);
if (solrConfigFileName.equals(solrConfigFileNameWarmerRandomMergePolicyFactory)) {
++mSizeExpected; assertTrue(m.get("mergedSegmentWarmer") instanceof MapSerializable);
} else {
[4/4] lucene-solr:jira/solr-8668: Merge branch 'master' into
jira/solr-8668
Posted by cp...@apache.org.
Merge branch 'master' into jira/solr-8668
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5b0b1739
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5b0b1739
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5b0b1739
Branch: refs/heads/jira/solr-8668
Commit: 5b0b17396dceb4b42c818766ba662f7600d0c631
Parents: e36aee4 366cd7c
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 30 12:55:47 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue May 30 12:55:47 2017 +0100
----------------------------------------------------------------------
lucene/spatial-extras/build.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------