Merge remote-tracking branch 'origin/master'

ChronixDB · Apr 11, 2016 · a92893e · a92893e
2 parents fd11b97 + 56bc74e
commit a92893e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/chronix-spark-ts-rdd/src/main/java/de/qaware/chronix/spark/api/java/ChronixRDD.java b/chronix-spark-ts-rdd/src/main/java/de/qaware/chronix/spark/api/java/ChronixRDD.java
@@ -124,6 +124,7 @@ public double call(MetricTimeSeries value) throws Exception {
     //TODO:
     // - delta()
     // - filter()
+    // Transformations to other types: DataFrame
     // - easy additional functions based on DoubleRDD (esp. stats & approx)
     // - see TimeSeriesRDD
     // - see Kassiopeia TimeSeries POJO

diff --git a/...-spark-ts-rdd/src/test/groovy/de/qaware/chronix/spark/api/java/ConfigurationParams.groovy b/...-spark-ts-rdd/src/test/groovy/de/qaware/chronix/spark/api/java/ConfigurationParams.groovy
@@ -22,4 +22,4 @@ class ConfigurationParams {
     public static final String ZK_HOST = "192.168.1.100:2181";
     public static final String SPARK_MASTER = "local[4]";
     public static final String APP_NAME = "Spark Chronix Testsuite";
-}
+}
diff --git a/chronix-spark-ts-rdd/src/test/groovy/de/qaware/chronix/spark/api/java/TestChronixRDD.groovy b/chronix-spark-ts-rdd/src/test/groovy/de/qaware/chronix/spark/api/java/TestChronixRDD.groovy
@@ -56,9 +56,11 @@ class TestChronixRDD extends Specification {
         when:
         long start = System.currentTimeMillis();
         double mean = rdd.mean();
+        long count = rdd.countObservations()
         long stop = System.currentTimeMillis();
         println "Mean: " + mean
         println "   - execution time: " + (stop - start)
+        println "   - relevant observations: " + count
         then:
         mean > 0.0f
         cleanup: