Updated the examples to versions: Server 0.1.3, Kassiopeia: 0.1.7

Author: Florian Lautenschlager

.gitignore

@@ -73,7 +73,4 @@ build/
 gradle-app.setting
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-###Ingore the data folder
-data
+!gradle-wrapper.jar

chronix-timeseries-exploration/build.gradle

@@ -29,9 +29,9 @@ dependencies {
     compile 'commons-logging:commons-logging:1.2'
 
     compile 'de.qaware.chronix:chronix-api:0.1'
-    compile 'de.qaware.chronix:chronix-server-client:0.1.2'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.1.4'
-    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.1.4'
+    compile 'de.qaware.chronix:chronix-server-client:0.1.3'
+    compile 'de.qaware.chronix:chronix-kassiopeia-simple:0.1.7'
+    compile 'de.qaware.chronix:chronix-kassiopeia-simple-converter:0.1.7'
 }
 
 

chronix-timeseries-exploration/src/main/java/de/qaware/chronix/examples/exploration/ui/MainController.java

@@ -21,8 +21,6 @@
 import de.qaware.chronix.examples.exploration.ui.log.TextAreaLogger;
 import de.qaware.chronix.solr.client.ChronixSolrStorage;
 import de.qaware.chronix.timeseries.MetricTimeSeries;
-import de.qaware.chronix.timeseries.dt.DoubleList;
-import de.qaware.chronix.timeseries.dt.LongList;
 import de.qaware.chronix.timeseries.dt.Point;
 import javafx.application.Platform;
 import javafx.concurrent.Task;
@@ -47,6 +45,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.function.BinaryOperator;
@@ -127,30 +126,14 @@ public Void call() {
                     if (timeSeries == null || timeSeries2 == null) {
                         return new MetricTimeSeries.Builder("empty").build();
                     }
-                    MetricTimeSeries.Builder reduced = new MetricTimeSeries.Builder(timeSeries.getMetric())
-                            .attributes(timeSeries.attributes())
-                            .points(concat(timeSeries.getTimestamps(), timeSeries2.getTimestamps()),
-                                    concat(timeSeries.getValues(), timeSeries2.getValues()));
-
-                    return reduced.build();
+                    timeSeries.addAll(timeSeries2.getTimestampsAsArray(), timeSeries2.getValuesAsArray());
+                    return timeSeries;
                 };
 
-
                 chronix = new ChronixClient<>(new KassiopeiaSimpleConverter(), new ChronixSolrStorage<>(200, groupBy, reduce));
 
-
                 return null;
             }
-
-            private LongList concat(LongList first, LongList second) {
-                first.addAll(second);
-                return first;
-            }
-
-            private DoubleList concat(DoubleList first, DoubleList second) {
-                first.addAll(second);
-                return first;
-            }
         };
 
         new Thread(task).start();
@@ -180,7 +163,6 @@ protected Void call() throws Exception {
                 List<MetricTimeSeries> result = chronix.stream(solr, query).collect(Collectors.toList());
                 long queryEnd = System.currentTimeMillis();
                 LOGGER.info("Query took: {} ms for {} points", (queryEnd - queryStart), size(result));
-
                 queryStart = System.currentTimeMillis();
                 result.forEach(ts -> {
                     XYChart.Series<DateAxis, NumberAxis> series = new XYChart.Series<>();
@@ -206,25 +188,26 @@ private int size(List<MetricTimeSeries> result) {
     }
 
     private void convertTsToSeries(MetricTimeSeries ts, XYChart.Series<DateAxis, NumberAxis> series) {
-        Point former = null;
-
-        List<Point> points = ts.points().collect(Collectors.toList());
-        //reduce the amount shown in the chart
+        ts.sort();
+        List<Point> points;
+        if (ts.size() > 200_000) {
+            points = ts.points().filter(point -> point.getIndex() % 1000 == 0).collect(Collectors.toList());
+        } else {
+            points = ts.points().collect(Collectors.toList());
+        }
+        //reduce the amount shown in the chart we add every 100ths point
         for (int i = 0; i < points.size(); i++) {
             Point point = points.get(i);
-            if (former != null && former.getValue() != point.getValue()) {
-                series.getData().add(new XYChart.Data(Instant.ofEpochMilli(point.getTimestamp()), point.getValue()));
 
-            }
-            //Little hack.  The line chart does not show points
+            series.getData().add(new XYChart.Data(Instant.ofEpochMilli(point.getTimestamp()), point.getValue()));
+
+            //If the chart only has one point than we add the same value, but 1 week in the future
             if (i == points.size() - 1) {
-                series.getData().add(new XYChart.Data(Instant.ofEpochMilli(point.getTimestamp()), point.getValue()));
                 if (series.getData().size() == 1) {
-                    series.getData().add(new XYChart.Data(Instant.ofEpochMilli(point.getTimestamp() + 1), point.getValue()));
+                    Instant futureTimestamp = Instant.ofEpochMilli(point.getTimestamp()).plus(1, ChronoUnit.DAYS);
+                    series.getData().add(new XYChart.Data(futureTimestamp, point.getValue()));
                 }
-
             }
-            former = point;
         }
     }
 

settings.gradle

@@ -3,4 +3,5 @@ rootProject.name = 'chronix.examples'
 //A simple ui for time series exploration using the Chronix Server and Chronix Kassiopeia
 include 'chronix-timeseries-exploration'
 include 'chronix-server-integration'
+include 'chronix-csv-import'