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/06/02 10:56:26 UTC
[03/38] lucene-solr:jira/solr-8668: SOLR-10770: Fix precommit
SOLR-10770: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4608e7d0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4608e7d0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4608e7d0
Branch: refs/heads/jira/solr-8668
Commit: 4608e7d03690755a05f53693519db6b06c6e9d7c
Parents: 5207629
Author: Joel Bernstein <jb...@apache.org>
Authored: Tue May 30 14:51:46 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Tue May 30 14:51:46 2017 -0400
----------------------------------------------------------------------
.../apache/solr/client/solrj/io/stream/TimeSeriesStream.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4608e7d0/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
index f38da85..fe2a106 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
@@ -17,7 +17,6 @@
package org.apache.solr.client.solrj.io.stream;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
@@ -57,8 +56,8 @@ public class TimeSeriesStream extends TupleStream implements Expressible {
private String end;
private String gap;
private String field;
+ private String format;
private DateTimeFormatter formatter;
- private SimpleDateFormat ISOFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
private Metric[] metrics;
private List<Tuple> tuples = new ArrayList();
@@ -197,7 +196,8 @@ public class TimeSeriesStream extends TupleStream implements Expressible {
this.params = params;
this.end = end;
if(format != null) {
- formatter = DateTimeFormatter.ofPattern(format);
+ this.format = format;
+ formatter = DateTimeFormatter.ofPattern(format, Locale.ROOT);
}
}
@@ -225,6 +225,8 @@ public class TimeSeriesStream extends TupleStream implements Expressible {
expression.addParameter(new StreamExpressionNamedParameter("end", end));
expression.addParameter(new StreamExpressionNamedParameter("gap", gap));
expression.addParameter(new StreamExpressionNamedParameter("field", gap));
+ expression.addParameter(new StreamExpressionNamedParameter("format", format));
+
// zkHost
expression.addParameter(new StreamExpressionNamedParameter("zkHost", zkHost));