Merge branch 'develop'

Author: Anselme Goetschmann

influxdb-schema-updater

@@ -18,14 +18,11 @@ use strict;
 use warnings;
 
 use InfluxDB::HTTP;
-
 use Getopt::Long;
 use Pod::Usage qw(pod2usage);
 use IPC::Run qw(run);
 use JSON::MaybeXS;
 use File::Slurper qw(read_text);
-use List::Util qw(sum0);
-
 
 sub main {
     my $show_usage;
@@ -308,6 +305,7 @@ sub compare_cqs {
         $cq =~ s/;//g;
         $cq =~ s/"//g;
         $cq = lc $cq;
+        $cq =~ s/fill\(null\)//g; # since fill(null) doesn't change anything, influx doesn't store it
     }
     return $cq1 cmp $cq2;
 }

t/data/test06.2/cq/db1.ifql

@@ -0,0 +1,2 @@
+CREATE CONTINUOUS QUERY cq1 ON test RESAMPLE EVERY 5m FOR 10m BEGIN SELECT LAST(a) AS b, c INTO test.rp2.m FROM test.rp1.m GROUP BY time(5m) fill(null) END;
+CREATE CONTINUOUS QUERY cq2 ON test RESAMPLE EVERY 5m FOR 10m BEGIN SELECT MAX(a) AS b, c INTO test.rp2.m FROM test.rp1.m GROUP BY time(5m) END;

t/data/test06.2/db/db1.ifql

@@ -0,0 +1,2 @@
+CREATE DATABASE test WITH DURATION 260w REPLICATION 1 SHARD DURATION 12w NAME rp2;
+CREATE RETENTION POLICY rp1 ON test DURATION 100d REPLICATION 1 SHARD DURATION 2w;

t/influxdb-schema-updater.t

@@ -85,6 +85,11 @@ sub test {
     run_updater($curdir, "$schemas_dir/test06", $port);
     is run_updater($curdir, "$schemas_dir/test06", $port, '--diff'), ''         => 'CQ is updated';
 
+    # check that fill(null) is ignored
+    run_updater($curdir, "$schemas_dir/test06.2", $port, '--force');
+    is run_updater($curdir, "$schemas_dir/test06.2", $port, '--diff'), ''       => 'fill(null) in CQ is ignored';
+    run_updater($curdir, "$schemas_dir/test06", $port, '--force'); # reset
+
     # remove a continuous query
     is run_updater($curdir, "$schemas_dir/test07", $port, '--diff'), "-- DROP CONTINUOUS QUERY cq2 ON test;\n"
                                                                                 => 'CQ removal is detected';