Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15376: Accept "Long" values for CollectionAdminRequest.CreateTimeRoutedAlias.setMaxFutureMs to support durations greater than ~25 days. (#202)

Nahian-Al Hasanc214e07ecefa
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7011aeb773f..c16fff9f8dc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -173,6 +173,9 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15785: Custom node request handlers/endpoints that weren't in packages can now be located in JARs in solr-home/lib,
not just WEB-INF/lib. (Nazerke Seidan, David Smiley)
+* SOLR-15376: Accept "Long" values for CollectionAdminRequest.CreateTimeRoutedAlias.setMaxFutureMs
+ to support durations greater than ~ 25 days. (Nahian-Al Hasan, Gus Heck, Christine Poerschke)
+
Build
---------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index 51416013638..7ce4f249f67 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -20,6 +20,9 @@ package org.apache.solr.update.processor;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
@@ -27,6 +30,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -713,6 +717,45 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
TimeRoutedAlias.parseInstantFromCollectionName(alias, alias + TRA + "2017-10-02"));
}
+ @Test
+ public void testMaxFutureMs() throws Exception {
+ final Long maxFutureMs = 100L * 24L * 60L * 60L * 1000L; // 100 DAYS
+
+ ZonedDateTime a = ZonedDateTime.now(ZoneId.from(ZoneOffset.UTC));
+ ZonedDateTime b = a.plusMonths(2);
+ ZonedDateTime c = a.plusYears(1);
+ DateTimeFormatter SOLR_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT).withZone(ZoneId.from(ZoneOffset.UTC));
+
+
+ final String YYYY_MM_DD_a = SOLR_DATE_TIME_FORMATTER.format(a);
+ final String YYYY_MM_DD_b = SOLR_DATE_TIME_FORMATTER.format(b);
+ final String YYYY_MM_DD_c = SOLR_DATE_TIME_FORMATTER.format(c);
+
+ final int numShards = 1 + random().nextInt(4);
+ final int numReplicas = 1 + random().nextInt(3);
+ CollectionAdminRequest.createTimeRoutedAlias(alias, YYYY_MM_DD_a, "+180DAY", getTimeField(),
+ CollectionAdminRequest.createCollection("_unused_", "_default", numShards, numReplicas))
+ .setMaxFutureMs(maxFutureMs)
+ .process(solrClient);
+
+ final ModifiableSolrParams params = params();
+
+ final String dayB = DateTimeFormatter.ISO_INSTANT.format(DateMathParser.parseMath(new Date(), YYYY_MM_DD_b).toInstant());
+ assertUpdateResponse(add(alias, Arrays.asList(
+ sdoc("id", "2", "timestamp_dt", dayB)),
+ params));
+
+ final String dayC = DateTimeFormatter.ISO_INSTANT.format(DateMathParser.parseMath(new Date(), YYYY_MM_DD_c).toInstant());
+ try {
+ assertUpdateResponse(add(alias, Arrays.asList(
+ sdoc("id", "3", "timestamp_dt", dayC)),
+ params));
+ fail("expected update with " + dayC + " timestamp to fail");
+ } catch (Exception ex) {
+ assertTrue(ex.getMessage(), ex.getMessage().contains("The document's time routed key of " + dayC + " is too far in the future given router.maxFutureMs="+maxFutureMs));
+ }
+ }
+
@AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13943")
@Test
public void testDateMathInStart() throws Exception {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 9edfcb98c73..981934a8624 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -1804,7 +1804,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
private final String interval;
//Optional:
private TimeZone tz;
- private Integer maxFutureMs;
+ private Long maxFutureMs;
private String preemptiveCreateMath;
private String autoDeleteAge;
@@ -1825,8 +1825,19 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
return this;
}
- /** Sets how long into the future (millis) that we will allow a document to pass. */
+ /**
+ * Sets how long into the future (millis) that we will allow a document to pass.
+ *
+ * @deprecated Please use {@link #setMaxFutureMs(Long)} instead.
+ * */
+ @Deprecated
public CreateTimeRoutedAlias setMaxFutureMs(Integer maxFutureMs) {
+ this.maxFutureMs = Long.valueOf(maxFutureMs);
+ return this;
+ }
+
+ /** Sets how long into the future (millis) that we will allow a document to pass. */
+ public CreateTimeRoutedAlias setMaxFutureMs(Long maxFutureMs) {
this.maxFutureMs = maxFutureMs;
return this;
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateAliasPayload.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateAliasPayload.java
index b84b49c0bfc..f083ad754ec 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateAliasPayload.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateAliasPayload.java
@@ -57,7 +57,7 @@ public class CreateAliasPayload implements ReflectMapWriter {
public String interval;
@JsonProperty
- public Integer maxFutureMs;
+ public Long maxFutureMs;
@JsonProperty
public String preemptiveCreateMath;