You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/08/16 19:16:33 UTC
lucene-solr:master: SOLR-12591: Avoid JDK 9 bug with certain
timezones like AKDT;
test with EDT. Also standardized on single 'z' in the test patterns, which is
equivalent to triple.
Repository: lucene-solr
Updated Branches:
refs/heads/master 711a72ed8 -> a661ebc6d
SOLR-12591: Avoid JDK 9 bug with certain timezones like AKDT; test with EDT.
Also standardized on single 'z' in the test patterns, which is equivalent to triple.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a661ebc6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a661ebc6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a661ebc6
Branch: refs/heads/master
Commit: a661ebc6dfc0aa00161bde402edb7171d390f076
Parents: 711a72e
Author: David Smiley <ds...@apache.org>
Authored: Thu Aug 16 15:16:26 2018 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Thu Aug 16 15:16:26 2018 -0400
----------------------------------------------------------------------
.../solrconfig-parsing-update-processor-chains.xml | 4 ++--
.../processor/ParsingFieldUpdateProcessorsTest.java | 15 ++++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a661ebc6/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
index 6914ba2..f9e44b0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
@@ -117,8 +117,8 @@
<str>yyyy-MM-dd['T'[HH:mm:ss['.'SSS][z</str>
<str>yyyy-MM-dd HH:mm:ss</str>
<str>EEE MMM d HH:mm:ss [z ]yyyy</str>
- <str>EEEE, dd-MMM-yy HH:mm:ss zzz</str>
- <str>EEE, dd MMM yyyy HH:mm:ss zzz</str>
+ <str>EEEE, dd-MMM-yy HH:mm:ss z</str>
+ <str>EEE, dd MMM yyyy HH:mm:ss z</str>
</arr>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a661ebc6/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java
index 334b14a..a51ea39 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java
@@ -947,7 +947,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {
// this test has had problems when the JDK timezone is Americas/Metlakatla
public void testAKSTZone() throws IOException {
- final String inputString = "Thu Nov 13 04:35:51 AKST 2008";
+ final String inputString = "Thu Nov 13 04:35:51 AKST 2008"; // "Ansi C" + timezone
final long expectTs = 1226583351000L;
assertEquals(expectTs,
@@ -955,6 +955,16 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {
.withZone(ZoneId.of("UTC")).parse(inputString, Instant::from).toEpochMilli());
assertParsedDate(inputString, Date.from(Instant.ofEpochMilli(expectTs)), "parse-date-patterns-from-extract-contrib");
+
+ // We might also test AKDT, but a bug in Java 9 (not in 8) causes this to fail
+ //assertParsedDate("Fri Oct 7 05:14:15 AKDT 2005", Date.from(inst20051007131415()), "parse-date-patterns-from-extract-contrib"); // with timezone (not ANSI C) in DST
+ // see https://bugs.openjdk.java.net/browse/JDK-8189784
+ }
+
+ public void testEDTZone() throws IOException {
+ //EDT is GMT-4
+ assertParsedDate("Fri Oct 7 09:14:15 EDT 2005", // Ansi C + timezone
+ Date.from(inst20051007131415()), "parse-date-patterns-from-extract-contrib");
}
public void testNoTime() throws IOException {
@@ -974,8 +984,7 @@ public class ParsingFieldUpdateProcessorsTest extends UpdateProcessorTestBase {
public void testAnsiC() throws IOException {
assertParsedDate(
"Fri Oct 7 13:14:15 2005", Date.from(inst20051007131415()), "parse-date-patterns-from-extract-contrib");
-
- assertParsedDate("Fri Oct 7 05:14:15 AKDT 2005", Date.from(inst20051007131415()), "parse-date-patterns-from-extract-contrib"); // with timezone (not ANSI C) in DST
+ // also see testEDTZone
}
public void testLenient() throws IOException {