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 2019/06/28 17:59:07 UTC
[lucene-solr] branch master updated (d54555c -> a49ddba)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from d54555c SOLR-13577: spin until slave got a replication failure while master is down.
new 993c051 SOLR-13279: Clarify ScheduledTrigger's "every parameter missing" error response.
new 5d2569e SOLR-13280: Strengthen ScheduledTrigger's preferredOperation parameter validation.
new a49ddba SOLR-13576: Factor out a TopGroupsShardResponseProcessor.fillResultIds method. (Christine Poerschke, Diego Ceccarelli)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/CHANGES.txt | 6 ++++++
.../java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java | 9 +++++++--
.../responseprocessor/TopGroupsShardResponseProcessor.java | 7 +++++++
3 files changed, 20 insertions(+), 2 deletions(-)
[lucene-solr] 03/03: SOLR-13576: Factor out a
TopGroupsShardResponseProcessor.fillResultIds method. (Christine Poerschke,
Diego Ceccarelli)
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a49ddbaf116e82b3af5b15b3ddb6f64954aa2951
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Jun 28 18:38:41 2019 +0100
SOLR-13576: Factor out a TopGroupsShardResponseProcessor.fillResultIds method. (Christine Poerschke, Diego Ceccarelli)
---
solr/CHANGES.txt | 2 ++
.../responseprocessor/TopGroupsShardResponseProcessor.java | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 73bfdb4..26aa716 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -219,6 +219,8 @@ Other Changes
* SOLR-13279: Clarify ScheduledTrigger's "every parameter missing" error response. (Christine Poerschke)
+* SOLR-13576: Factor out a TopGroupsShardResponseProcessor.fillResultIds method. (Christine Poerschke, Diego Ceccarelli)
+
================== 8.1.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index 2db6b22..3ccecd1 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -188,7 +188,14 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
}
rb.mergedQueryCommandResults.put(query, new QueryCommandResult(mergedTopDocs, mergedMatches, maxScore));
}
+ fillResultIds(rb);
+ }
+ /**
+ * Fill the {@link ResponseBuilder}'s <code>resultIds</code> field.
+ * @param rb the response builder
+ */
+ static void fillResultIds(ResponseBuilder rb) {
Map<Object, ShardDoc> resultIds = new HashMap<>();
int i = 0;
for (TopGroups<BytesRef> topGroups : rb.mergedTopGroups.values()) {
[lucene-solr] 01/03: SOLR-13279: Clarify ScheduledTrigger's "every
parameter missing" error response.
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 993c051a0edb6d634396fd814f0e2bb80d65ce29
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Jun 28 18:32:25 2019 +0100
SOLR-13279: Clarify ScheduledTrigger's "every parameter missing" error response.
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5485927..ab99176 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -215,6 +215,8 @@ Other Changes
* SOLR-12988: SSLTestConfig has been changed to throw AssumptionViolatedException when tests/seeds
request SSL but the JVM appears to be an OpenJDK version known to have SSL bugs (hossman, Cao Manh Dat)
+* SOLR-13279: Clarify ScheduledTrigger's "every parameter missing" error response. (Christine Poerschke)
+
================== 8.1.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
index e5afd9f..c1fe040 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
@@ -65,8 +65,8 @@ public class ScheduledTrigger extends TriggerBase {
public ScheduledTrigger(String name) {
super(TriggerEventType.SCHEDULED, name);
- TriggerUtils.requiredProperties(requiredProperties, validProperties, "startTime");
- TriggerUtils.validProperties(validProperties, "timeZone", "every", "graceDuration", AutoScalingParams.PREFERRED_OP);
+ TriggerUtils.requiredProperties(requiredProperties, validProperties, "startTime", "every");
+ TriggerUtils.validProperties(validProperties, "timeZone", "graceDuration", AutoScalingParams.PREFERRED_OP);
}
@Override
[lucene-solr] 02/03: SOLR-13280: Strengthen ScheduledTrigger's
preferredOperation parameter validation.
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 5d2569eab1c911e10dc166486dc66568717f6ff8
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Jun 28 18:35:34 2019 +0100
SOLR-13280: Strengthen ScheduledTrigger's preferredOperation parameter validation.
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ab99176..73bfdb4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -193,6 +193,8 @@ Bug Fixes
* SOLR-13574: Fix many test and test-framework classes to not fail on After/AfterClass cleanup if
assumptions fail in Before/BeforeClass setup (hossman)
+* SOLR-13280: Strengthen ScheduledTrigger's preferredOperation parameter validation. (Christine Poerschke)
+
Other Changes
----------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
index c1fe040..98a367c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
@@ -34,6 +34,7 @@ import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventType;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.AutoScalingParams;
+import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.util.DateMathParser;
@@ -80,6 +81,10 @@ public class ScheduledTrigger extends TriggerBase {
this.graceDurationStr = (String) properties.getOrDefault("graceDuration", DEFAULT_GRACE_DURATION);
preferredOp = (String) properties.get(PREFERRED_OP);
+ if (preferredOp != null &&
+ CollectionParams.CollectionAction.get(preferredOp) == null) {
+ throw new TriggerValidationException(getName(), PREFERRED_OP, "unrecognized value of: '" + preferredOp + "'");
+ }
// attempt parsing to validate date math strings
// explicitly set NOW because it may be different for simulated time