From 2dd3eee58ec8747ebe896cb28c336fa639210d06 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Tue, 6 Oct 2015 15:38:16 -0600 Subject: [PATCH] Use graphite parser for templating, godep update to head --- Godeps/Godeps.json | 35 +- .../github.com/influxdb/influxdb/.gitignore | 72 + .../github.com/influxdb/influxdb/CHANGELOG.md | 1708 ++ .../influxdb/influxdb/CONTRIBUTING.md | 247 + .../github.com/influxdb/influxdb/DOCKER.md | 44 + .../github.com/influxdb/influxdb/Dockerfile | 24 + .../influxdb/Dockerfile_test_ubuntu32 | 12 + .../src/github.com/influxdb/influxdb/LICENSE | 20 + .../influxdb/LICENSE_OF_DEPENDENCIES.md | 19 + .../github.com/influxdb/influxdb/QUERIES.md | 180 + .../github.com/influxdb/influxdb/README.md | 72 + .../github.com/influxdb/influxdb/balancer.go | 78 + .../influxdb/influxdb/balancer_test.go | 115 + .../influxdb/influxdb/build-docker.sh | 9 + .../influxdb/influxdb/circle-test.sh | 95 + .../github.com/influxdb/influxdb/circle.yml | 16 + .../influxdb/influxdb/client/README.md | 11 +- .../influxdb/influxdb/client/influxdb.go | 30 +- .../influxdb/influxdb/client/influxdb_test.go | 37 +- .../influxdb/influxdb/cluster/client_pool.go | 57 + .../influxdb/influxdb/cluster/config.go | 35 + .../influxdb/influxdb/cluster/config_test.go | 27 + .../influxdb/cluster/internal/data.pb.go | 154 + .../influxdb/cluster/internal/data.proto | 25 + .../influxdb/cluster/points_writer.go | 353 + .../influxdb/cluster/points_writer_test.go | 464 + .../influxdb/influxdb/cluster/rpc.go | 205 + .../influxdb/influxdb/cluster/rpc_test.go | 110 + .../influxdb/influxdb/cluster/service.go | 371 + .../influxdb/influxdb/cluster/service_test.go | 105 + .../influxdb/influxdb/cluster/shard_mapper.go | 259 + .../influxdb/cluster/shard_mapper_test.go | 110 + .../influxdb/influxdb/cluster/shard_writer.go | 165 + .../influxdb/cluster/shard_writer_test.go | 186 + .../influxdb/influxdb/cmd/influx/main.go | 779 + .../influxdb/influxdb/cmd/influx/main_test.go | 219 + .../cmd/influx_stress/examples/100B_FLAT.toml | 30 + .../cmd/influx_stress/examples/100B_STD.toml | 30 + .../cmd/influx_stress/examples/100M_FLAT.toml | 47 + .../cmd/influx_stress/examples/100M_STD.toml | 32 + .../cmd/influx_stress/examples/5M_STD.toml | 33 + .../examples/long_form_date.toml | 34 + .../influx_stress/examples/moderate_burn.toml | 30 + .../cmd/influx_stress/examples/template.toml | 114 + .../cmd/influx_stress/influx_stress.go | 121 + .../influxdb/cmd/influxd/backup/backup.go | 170 + .../cmd/influxd/backup/backup_test.go | 125 + .../influxdb/cmd/influxd/help/help.go | 46 + .../influxdb/influxdb/cmd/influxd/main.go | 205 + .../influxdb/cmd/influxd/restore/restore.go | 250 + .../cmd/influxd/restore/restore_test.go | 155 + .../influxdb/cmd/influxd/run/command.go | 240 + .../influxdb/cmd/influxd/run/config.go | 225 + .../cmd/influxd/run/config_command.go | 83 + .../influxdb/cmd/influxd/run/config_test.go | 142 + .../influxdb/cmd/influxd/run/server.go | 589 + .../cmd/influxd/run/server_helpers_test.go | 356 + .../influxdb/cmd/influxd/run/server_test.go | 4782 +++++ .../influxdb/cmd/influxd/run/server_test.md | 150 + .../influxdb/influxdb/cmd/inspect/main.go | 136 + .../github.com/influxdb/influxdb/errors.go | 82 + .../influxdb/influxdb/etc/burn-in/.rvmrc | 1 + .../influxdb/influxdb/etc/burn-in/Gemfile | 4 + .../influxdb/etc/burn-in/Gemfile.lock | 14 + .../influxdb/influxdb/etc/burn-in/burn-in.rb | 79 + .../influxdb/influxdb/etc/burn-in/log.rb | 23 + .../influxdb/etc/burn-in/random_gaussian.rb | 31 + .../influxdb/etc/burn-in/random_points.rb | 29 + .../influxdb/influxdb/etc/config.sample.toml | 283 + .../influxdb/influxdb/importer/README.md | 193 + .../influxdb/influxdb/importer/v8/importer.go | 236 + .../influxdb/influxdb/influxql/INFLUXQL.md | 40 +- .../influxdb/influxdb/influxql/ast.go | 420 +- .../influxdb/influxdb/influxql/ast_test.go | 2 +- .../influxdb/influxdb/influxql/functions.go | 1114 -- .../influxdb/influxql/functions_test.go | 534 - .../influxdb/influxdb/influxql/parser.go | 152 +- .../influxdb/influxdb/influxql/parser_test.go | 340 +- .../influxdb/influxdb/influxql/result.go | 67 +- .../influxdb/influxdb/influxql/scanner.go | 2 + .../influxdb/influxql/scanner_test.go | 4 + .../influxdb/influxdb/influxql/token.go | 10 + .../github.com/influxdb/influxdb/influxvar.go | 45 + .../github.com/influxdb/influxdb/meta/data.go | 180 +- .../influxdb/influxdb/meta/data_test.go | 107 +- .../influxdb/influxdb/meta/errors.go | 76 +- .../influxdb/meta/internal/meta.pb.go | 225 +- .../influxdb/meta/internal/meta.proto | 10 +- .../influxdb/influxdb/meta/rpc_test.go | 2 +- .../influxdb/meta/statement_executor.go | 108 +- .../influxdb/meta/statement_executor_test.go | 150 +- .../influxdb/influxdb/meta/store.go | 76 +- .../influxdb/influxdb/meta/store_test.go | 103 +- .../influxdb/{tsdb => models}/points.go | 190 +- .../influxdb/{tsdb => models}/points_test.go | 518 +- .../influxdb/influxdb/models/rows.go | 59 + .../influxdb/influxdb/monitor/README.md | 73 + .../influxdb/influxdb/monitor/build_info.go | 20 + .../influxdb/influxdb/monitor/config.go | 35 + .../influxdb/influxdb/monitor/config_test.go | 30 + .../influxdb/influxdb/monitor/go_runtime.go | 19 + .../influxdb/influxdb/monitor/network.go | 21 + .../influxdb/influxdb/monitor/service.go | 434 + .../influxdb/influxdb/monitor/service_test.go | 72 + .../influxdb/monitor/statement_executor.go | 81 + .../influxdb/influxdb/monitor/system.go | 26 + .../github.com/influxdb/influxdb/nightly.sh | 51 + .../github.com/influxdb/influxdb/package.sh | 611 + .../influxdb/influxdb/pkg/READEME.md | 5 + .../influxdb/influxdb/pkg/escape/bytes.go | 45 + .../influxdb/influxdb/pkg/escape/strings.go | 34 + .../influxdb/influxdb/pkg/slices/strings.go | 37 + .../influxdb/scripts/influxdb.service | 19 + .../influxdb/influxdb/scripts/init.sh | 218 + .../influxdb/influxdb/scripts/logrotate | 8 + .../influxdb/services/admin/config.go | 21 + .../influxdb/services/admin/config_test.go | 32 + .../influxdb/services/admin/service.go | 111 + .../influxdb/services/admin/service_test.go | 33 + .../services/collectd/collectd_test.conf | 209 + .../influxdb/services/collectd/config.go | 48 + .../influxdb/services/collectd/config_test.go | 32 + .../influxdb/services/collectd/service.go | 308 + .../services/collectd/service_test.go | 501 + .../services/collectd/test_client/README.md | 3 + .../services/collectd/test_client/client.go | 71 + .../services/continuous_querier/config.go | 65 + .../continuous_querier/config_test.go | 36 + .../continuous_querier/continuous_queries.md | 236 + .../services/continuous_querier/service.go | 508 + .../continuous_querier/service_test.go | 549 + .../services/copier/internal/internal.pb.go | 56 + .../services/copier/internal/internal.proto | 9 + .../influxdb/services/copier/service.go | 261 + .../influxdb/services/copier/service_test.go | 185 + .../influxdb/services/graphite/README.md | 131 + .../influxdb/services/graphite/config.go | 221 + .../influxdb/services/graphite/config_test.go | 167 + .../influxdb/services/graphite/parser.go | 364 + .../influxdb/services/graphite/parser_test.go | 637 + .../influxdb/services/graphite/service.go | 374 + .../services/graphite/service_test.go | 183 + .../influxdb/influxdb/services/hh/config.go | 52 + .../influxdb/services/hh/config_test.go | 50 + .../influxdb/influxdb/services/hh/doc.go | 5 + .../influxdb/influxdb/services/hh/limiter.go | 61 + .../influxdb/services/hh/limiter_test.go | 47 + .../influxdb/services/hh/processor.go | 257 + .../influxdb/services/hh/processor_test.go | 80 + .../influxdb/influxdb/services/hh/queue.go | 666 + .../influxdb/services/hh/queue_test.go | 327 + .../influxdb/influxdb/services/hh/service.go | 172 + .../influxdb/services/httpd/config.go | 22 + .../influxdb/services/httpd/config_test.go | 52 + .../influxdb/services/httpd/handler.go | 912 + .../influxdb/services/httpd/handler_test.go | 451 + .../services/httpd/response_logger.go | 153 + .../influxdb/services/httpd/service.go | 137 + .../influxdb/services/opentsdb/README.md | 10 + .../influxdb/services/opentsdb/config.go | 57 + .../influxdb/services/opentsdb/config_test.go | 38 + .../influxdb/services/opentsdb/handler.go | 181 + .../influxdb/services/opentsdb/service.go | 367 + .../services/opentsdb/service_test.go | 167 + .../influxdb/services/precreator/README.md | 13 + .../influxdb/services/precreator/config.go | 32 + .../services/precreator/config_test.go | 31 + .../influxdb/services/precreator/service.go | 100 + .../services/precreator/service_test.go | 59 + .../influxdb/services/retention/config.go | 16 + .../services/retention/config_test.go | 27 + .../influxdb/services/retention/service.go | 129 + .../influxdb/services/snapshotter/service.go | 145 + .../services/snapshotter/service_test.go | 1 + .../influxdb/influxdb/services/udp/config.go | 45 + .../influxdb/services/udp/config_test.go | 42 + .../influxdb/influxdb/services/udp/service.go | 189 + .../influxdb/influxdb/shared/admin/README.md | 15 + .../influxdb/shared/admin/css/admin.css | 87 + .../influxdb/shared/admin/css/bootstrap.css | 6584 +++++++ .../admin/css/dropdowns-enhancement.css | 294 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../shared/admin/img/influxdb-light400.png | Bin 0 -> 19775 bytes .../influxdb/influxdb/shared/admin/index.html | 198 + .../influxdb/shared/admin/js/admin.js | 464 + .../admin/js/vendor/bootstrap-3.3.5.min.js | 7 + .../admin/js/vendor/jquery-2.1.4.min.js | 4 + .../admin/js/vendor/react-0.13.3.min.js | 16 + .../influxdb/influxdb/statik/statik.go | 10 + .../influxdb/influxdb/stress/config.go | 278 + .../influxdb/influxdb/stress/query.go | 136 + .../influxdb/influxdb/stress/runner.go | 359 + .../influxdb/influxdb/stress/runner_test.go | 246 + .../influxdb/influxdb/stress/test.toml | 43 + .../github.com/influxdb/influxdb/tcp/mux.go | 154 + .../influxdb/influxdb/tcp/mux_test.go | 137 + .../influxdb/influxdb/test-32bit-docker.sh | 4 + .../influxdb/influxdb/tests/README.md | 4 + .../influxdb/tests/create_future_writes.sh | 22 + .../tests/create_write_multiple_query.sh | 14 + .../tests/create_write_single_query.sh | 19 + ..._with_multiple_measurements_values_tags.sh | 23 + ...e_write_single_with_multiple_tags_query.sh | 11 + .../influxdb/tests/distinct-data-scenarios.sh | 35 + .../influxdb/tests/read_write_gzip.sh | 15 + .../influxdb/influxdb/tests/siege/.gitignore | 1 + .../influxdb/influxdb/tests/siege/README.md | 66 + .../influxdb/influxdb/tests/siege/urlgen | 107 + .../influxdb/influxdb/tests/tmux/3_shards | 28 + .../influxdb/influxdb/tests/tmux/README.md | 31 + .../influxdb/influxdb/tests/tmux/sample.json | 16000 ++++++++++++++++ .../influxdb/influxdb/tests/tmux/seed.sh | 13 + .../influxdb/tests/tmux/server_8086.toml | 7 + .../influxdb/tests/tmux/server_8087.toml | 7 + .../influxdb/tests/tmux/server_8088.toml | 7 + .../influxdb/influxdb/tests/urlgen/urlgen.go | 58 + .../influxdb/influxdb/tsdb/batcher.go | 25 +- .../influxdb/influxdb/tsdb/batcher_test.go | 42 +- .../influxdb/influxdb/tsdb/config.go | 66 +- .../influxdb/influxdb/tsdb/cursor.go | 319 +- .../influxdb/influxdb/tsdb/cursor_test.go | 248 +- .../influxdb/influxdb/tsdb/engine.go | 48 +- .../influxdb/influxdb/tsdb/engine/b1/b1.go | 180 +- .../influxdb/tsdb/engine/b1/b1_test.go | 88 +- .../influxdb/influxdb/tsdb/engine/bz1/bz1.go | 212 +- .../influxdb/tsdb/engine/bz1/bz1_test.go | 423 +- .../influxdb/influxdb/tsdb/engine/engine.go | 1 + .../influxdb/tsdb/engine/tsm1/bool.go | 135 + .../influxdb/tsdb/engine/tsm1/bool_test.go | 73 + .../influxdb/tsdb/engine/tsm1/cursor.go | 481 + .../influxdb/tsdb/engine/tsm1/encoding.go | 554 + .../tsdb/engine/tsm1/encoding_test.go | 158 + .../influxdb/tsdb/engine/tsm1/float.go | 210 + .../influxdb/tsdb/engine/tsm1/float_test.go | 165 + .../influxdb/influxdb/tsdb/engine/tsm1/int.go | 180 + .../influxdb/tsdb/engine/tsm1/int_test.go | 249 + .../influxdb/tsdb/engine/tsm1/string.go | 94 + .../influxdb/tsdb/engine/tsm1/string_test.go | 85 + .../influxdb/tsdb/engine/tsm1/timestamp.go | 309 + .../tsdb/engine/tsm1/timestamp_test.go | 388 + .../influxdb/tsdb/engine/tsm1/tsm1.go | 1974 ++ .../influxdb/tsdb/engine/tsm1/tsm1_test.go | 1379 ++ .../influxdb/influxdb/tsdb/engine/tsm1/tx.go | 69 + .../influxdb/influxdb/tsdb/engine/tsm1/wal.go | 792 + .../influxdb/tsdb/engine/tsm1/wal_test.go | 178 + .../influxdb/tsdb/engine/tsm1/write_lock.go | 96 + .../tsdb/engine/tsm1/write_lock_test.go | 131 + .../influxdb/influxdb/tsdb/engine/wal/wal.go | 808 +- .../influxdb/tsdb/engine/wal/wal_test.go | 690 +- .../influxdb/influxdb/tsdb/executor.go | 368 +- .../influxdb/influxdb/tsdb/executor_test.go | 390 +- .../influxdb/influxdb/tsdb/functions.go | 1713 ++ .../influxdb/influxdb/tsdb/functions_test.go | 862 + .../influxdb/tsdb/internal/meta.pb.go | 21 +- .../influxdb/influxdb/tsdb/mapper.go | 1217 +- .../influxdb/influxdb/tsdb/mapper_test.go | 125 +- .../github.com/influxdb/influxdb/tsdb/meta.go | 283 +- .../influxdb/influxdb/tsdb/monitor.go | 83 - .../influxdb/influxdb/tsdb/query_executor.go | 312 +- .../influxdb/tsdb/query_executor_test.go | 73 +- .../influxdb/influxdb/tsdb/shard.go | 129 +- .../influxdb/influxdb/tsdb/shard_test.go | 37 +- .../influxdb/tsdb/show_measurements.go | 237 + .../influxdb/influxdb/tsdb/show_tag_keys.go | 315 + .../influxdb/influxdb/tsdb/snapshot_writer.go | 5 +- .../influxdb/influxdb/tsdb/store.go | 135 +- .../influxdb/influxdb/tsdb/store_test.go | 9 +- .../github.com/influxdb/influxdb/uuid/uuid.go | 93 + .../src/gopkg.in/fatih/pool.v2/.gitignore | 22 + .../src/gopkg.in/fatih/pool.v2/.travis.yml | 2 + .../src/gopkg.in/fatih/pool.v2/LICENSE | 20 + .../src/gopkg.in/fatih/pool.v2/README.md | 59 + .../src/gopkg.in/fatih/pool.v2/channel.go | 131 + .../gopkg.in/fatih/pool.v2/channel_test.go | 274 + .../src/gopkg.in/fatih/pool.v2/conn.go | 34 + .../src/gopkg.in/fatih/pool.v2/conn_test.go | 10 + .../src/gopkg.in/fatih/pool.v2/pool.go | 28 + plugins/kafka_consumer/kafka_consumer.go | 6 +- plugins/statsd/statsd.go | 103 +- plugins/statsd/statsd_test.go | 44 +- 284 files changed, 70969 insertions(+), 5178 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32 create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/balancer.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/balancer_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/inspect/main.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go delete mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go delete mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go rename Godeps/_workspace/src/github.com/influxdb/influxdb/{tsdb => models}/points.go (93%) rename Godeps/_workspace/src/github.com/influxdb/influxdb/{tsdb => models}/points_test.go (70%) create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.proto create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/doc.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/processor.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/processor_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/response_logger.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/handler.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/service.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/admin.css create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/bootstrap.css create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/dropdowns-enhancement.css create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.eot create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.svg create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.ttf create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff2 create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/img/influxdb-light400.png create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/index.html create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/admin.js create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/bootstrap-3.3.5.min.js create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/jquery-2.1.4.min.js create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/react-0.13.3.min.js create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/statik/statik.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/stress/config.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/stress/query.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/stress/test.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/test-32bit-docker.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_future_writes.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_multiple_query.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_query.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_measurements_values_tags.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_tags_query.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/distinct-data-scenarios.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/read_write_gzip.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/.gitignore create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/urlgen create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/3_shards create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/README.md create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/sample.json create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/seed.sh create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8086.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8087.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8088.toml create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tests/urlgen/urlgen.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tx.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock_test.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions_test.go delete mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/monitor.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_measurements.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_tag_keys.go create mode 100644 Godeps/_workspace/src/github.com/influxdb/influxdb/uuid/uuid.go create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.gitignore create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.travis.yml create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/LICENSE create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/README.md create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel.go create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel_test.go create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn.go create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn_test.go create mode 100644 Godeps/_workspace/src/gopkg.in/fatih/pool.v2/pool.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 55a7f80e9..bcfa686ed 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -101,34 +101,9 @@ "Rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee" }, { - "ImportPath": "github.com/influxdb/influxdb/client", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" - }, - { - "ImportPath": "github.com/influxdb/influxdb/influxql", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" - }, - { - "ImportPath": "github.com/influxdb/influxdb/meta", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" - }, - { - "ImportPath": "github.com/influxdb/influxdb/snapshot", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" - }, - { - "ImportPath": "github.com/influxdb/influxdb/toml", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" - }, - { - "ImportPath": "github.com/influxdb/influxdb/tsdb", - "Comment": "v0.9.3", - "Rev": "5d42b212fca8facfe9db0c83822f09b88be643ec" + "ImportPath": "github.com/influxdb/influxdb", + "Comment": "v0.9.4-rc1-457-g883d32c", + "Rev": "883d32cfd06e8cf14e6d9fc75dbe7b7b92345623" }, { "ImportPath": "github.com/lib/pq", @@ -268,6 +243,10 @@ "Comment": "v1.x.x", "Rev": "8aca6ba2cc6e873299617d730fac0d7f6593113a" }, + { + "ImportPath": "gopkg.in/fatih/pool.v2", + "Rev": "cba550ebf9bce999a02e963296d4bc7a486cb715" + }, { "ImportPath": "gopkg.in/mgo.v2", "Comment": "r2015.06.03-3-g3569c88", diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore b/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore new file mode 100644 index 000000000..18c155029 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore @@ -0,0 +1,72 @@ +*~ +src/ + +config.json +/bin/ + +TAGS + +# vim temp files +*.swp + +*.test +/query/a.out* +.DS_Store + +# ignore generated files. +cmd/influxd/version.go + +# executables + +influx_stress +**/influx_stress +!**/influx_stress/ + +influxd +**/influxd +!**/influxd/ + +influx +**/influx +!**/influx/ + +influxdb +**/influxdb +!**/influxdb/ + +/benchmark-tool +/main +/benchmark-storage +godef +gosym +gocode +inspect-raft + +# dependencies +out_rpm/ +packages/ + +# autconf +autom4te.cache/ +config.log +config.status +Makefile + +# log file +influxdb.log +benchmark.log + +# config file +config.toml + +# test data files +integration/migration_data/ + +# goide project files +.idea + +# goconvey config files +*.goconvey + +// Ingnore SourceGraph directory +.srclib-store/ diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md new file mode 100644 index 000000000..8003ead0d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md @@ -0,0 +1,1708 @@ +## v0.9.5 [unreleased] + +### Features +- [#4141](https://github.com/influxdb/influxdb/pull/4141): Control whether each query should be logged +- [#4065](https://github.com/influxdb/influxdb/pull/4065): Added precision support in cmd client. Thanks @sbouchex +- [#4140](https://github.com/influxdb/influxdb/pull/4140): Make storage engine configurable +- [#4161](https://github.com/influxdb/influxdb/pull/4161): Implement bottom selector function +- [#4204](https://github.com/influxdb/influxdb/pull/4204): Allow module-level selection for SHOW STATS +- [#4208](https://github.com/influxdb/influxdb/pull/4208): Allow module-level selection for SHOW DIAGNOSTICS +- [#4196](https://github.com/influxdb/influxdb/pull/4196): Export tsdb.Iterator +- [#4198](https://github.com/influxdb/influxdb/pull/4198): Add basic cluster-service stats +- [#4262](https://github.com/influxdb/influxdb/pull/4262): Allow configuration of UDP retention policy +- [#4265](https://github.com/influxdb/influxdb/pull/4265): Add statistics for Hinted-Handoff +- [#4284](https://github.com/influxdb/influxdb/pull/4284): Add exponential backoff for hinted-handoff failures +- [#4310](https://github.com/influxdb/influxdb/pull/4310): Support dropping non-Raft nodes. Work mostly by @corylanou + +### Bugfixes +- [#4166](https://github.com/influxdb/influxdb/pull/4166): Fix parser error on invalid SHOW +- [#3457](https://github.com/influxdb/influxdb/issues/3457): [0.9.3] cannot select field names with prefix + "." that match the measurement name +- [#4225](https://github.com/influxdb/influxdb/pull/4225): Always display diags in name-sorted order +- [#4111](https://github.com/influxdb/influxdb/pull/4111): Update pre-commit hook for go vet composites +- [#4136](https://github.com/influxdb/influxdb/pull/4136): Return an error-on-write if target retention policy does not exist. Thanks for the report @ymettier +- [#4228](https://github.com/influxdb/influxdb/pull/4228): Add build timestamp to version information. +- [#4124](https://github.com/influxdb/influxdb/issues/4124): Missing defer/recover/panic idiom in HTTPD service +- [#4238](https://github.com/influxdb/influxdb/pull/4238): Fully disable hinted-handoff service if so requested. +- [#4165](https://github.com/influxdb/influxdb/pull/4165): Tag all Go runtime stats when writing to internal database. +- [#4118](https://github.com/influxdb/influxdb/issues/4118): Return consistent, correct result for SHOW MEASUREMENTS with multiple AND conditions +- [#4191](https://github.com/influxdb/influxdb/pull/4191): Correctly marshal remote mapper responses. Fixes [#4170](https://github.com/influxdb/influxdb/issues/4170) +- [#4222](https://github.com/influxdb/influxdb/pull/4222): Graphite TCP connections should not block shutdown +- [#4180](https://github.com/influxdb/influxdb/pull/4180): Cursor & SelectMapper Refactor +- [#1577](https://github.com/influxdb/influxdb/issues/1577): selectors (e.g. min, max, first, last) should have equivalents to return the actual point +- [#4264](https://github.com/influxdb/influxdb/issues/4264): Refactor map functions to use list of values +- [#4278](https://github.com/influxdb/influxdb/pull/4278): Fix error marshalling across the cluster +- [#4149](https://github.com/influxdb/influxdb/pull/4149): Fix derivative unnecessarily requires aggregate function. Thanks @peekeri! +- [#4237](https://github.com/influxdb/influxdb/issues/4237): DERIVATIVE() edge conditions +- [#4263](https://github.com/influxdb/influxdb/issues/4263): derivative does not work when data is missing +- [#4293](https://github.com/influxdb/influxdb/pull/4293): Ensure shell is invoked when touching PID file. Thanks @christopherjdickson +- [#4296](https://github.com/influxdb/influxdb/pull/4296): Reject line protocol ending with '-'. Fixes [#4272](https://github.com/influxdb/influxdb/issues/4272) +- [#4333](https://github.com/influxdb/influxdb/pull/4333): Retry monitor storage creation and only on Leader. +- [#4276](https://github.com/influxdb/influxdb/issues/4276): Walk DropSeriesStatement & check for empty sources + +## v0.9.4 [2015-09-14] + +### Release Notes +With this release InfluxDB is moving to Go 1.5. + +### Features +- [#4050](https://github.com/influxdb/influxdb/pull/4050): Add stats to collectd +- [#3771](https://github.com/influxdb/influxdb/pull/3771): Close idle Graphite TCP connections +- [#3755](https://github.com/influxdb/influxdb/issues/3755): Add option to build script. Thanks @fg2it +- [#3863](https://github.com/influxdb/influxdb/pull/3863): Move to Go 1.5 +- [#3892](https://github.com/influxdb/influxdb/pull/3892): Support IF NOT EXISTS for CREATE DATABASE +- [#3916](https://github.com/influxdb/influxdb/pull/3916): New statistics and diagnostics support. Graphite first to be instrumented. +- [#3901](https://github.com/influxdb/influxdb/pull/3901): Add consistency level option to influx cli Thanks @takayuki +- [#4048](https://github.com/influxdb/influxdb/pull/4048): Add statistics to Continuous Query service +- [#4049](https://github.com/influxdb/influxdb/pull/4049): Add stats to the UDP input +- [#3876](https://github.com/influxdb/influxdb/pull/3876): Allow the following syntax in CQs: INTO "1hPolicy".:MEASUREMENT +- [#3975](https://github.com/influxdb/influxdb/pull/3975): Add shard copy service +- [#3986](https://github.com/influxdb/influxdb/pull/3986): Support sorting by time desc +- [#3930](https://github.com/influxdb/influxdb/pull/3930): Wire up TOP aggregate function - fixes [#1821](https://github.com/influxdb/influxdb/issues/1821) +- [#4045](https://github.com/influxdb/influxdb/pull/4045): Instrument cluster-level points writer +- [#3996](https://github.com/influxdb/influxdb/pull/3996): Add statistics to httpd package +- [#4003](https://github.com/influxdb/influxdb/pull/4033): Add logrotate configuration. +- [#4043](https://github.com/influxdb/influxdb/pull/4043): Add stats and batching to openTSDB input +- [#4042](https://github.com/influxdb/influxdb/pull/4042): Add pending batches control to batcher +- [#4006](https://github.com/influxdb/influxdb/pull/4006): Add basic statistics for shards +- [#4072](https://github.com/influxdb/influxdb/pull/4072): Add statistics for the WAL. + +### Bugfixes +- [#4042](https://github.com/influxdb/influxdb/pull/4042): Set UDP input batching defaults as needed. +- [#3785](https://github.com/influxdb/influxdb/issues/3785): Invalid time stamp in graphite metric causes panic +- [#3804](https://github.com/influxdb/influxdb/pull/3804): init.d script fixes, fixes issue 3803. +- [#3823](https://github.com/influxdb/influxdb/pull/3823): Deterministic ordering for first() and last() +- [#3869](https://github.com/influxdb/influxdb/issues/3869): Seemingly deadlocked when ingesting metrics via graphite plugin +- [#3856](https://github.com/influxdb/influxdb/pull/3856): Minor changes to retention enforcement. +- [#3884](https://github.com/influxdb/influxdb/pull/3884): Fix two panics in WAL that can happen at server startup +- [#3868](https://github.com/influxdb/influxdb/pull/3868): Add shell option to start the daemon on CentOS. Thanks @SwannCroiset. +- [#3886](https://github.com/influxdb/influxdb/pull/3886): Prevent write timeouts due to lock contention in WAL +- [#3574](https://github.com/influxdb/influxdb/issues/3574): Querying data node causes panic +- [#3913](https://github.com/influxdb/influxdb/issues/3913): Convert meta shard owners to objects +- [#4026](https://github.com/influxdb/influxdb/pull/4026): Support multiple Graphite inputs. Fixes issue [#3636](https://github.com/influxdb/influxdb/issues/3636) +- [#3927](https://github.com/influxdb/influxdb/issues/3927): Add WAL lock to prevent timing lock contention +- [#3928](https://github.com/influxdb/influxdb/issues/3928): Write fails for multiple points when tag starts with quote +- [#3901](https://github.com/influxdb/influxdb/pull/3901): Unblock relaxed write consistency level Thanks @takayuki! +- [#3950](https://github.com/influxdb/influxdb/pull/3950): Limit bz1 quickcheck tests to 10 iterations on CI +- [#3977](https://github.com/influxdb/influxdb/pull/3977): Silence wal logging during testing +- [#3931](https://github.com/influxdb/influxdb/pull/3931): Don't precreate shard groups entirely in the past +- [#3960](https://github.com/influxdb/influxdb/issues/3960): possible "catch up" bug with nodes down in a cluster +- [#3980](https://github.com/influxdb/influxdb/pull/3980): 'service stop' waits until service actually stops. Fixes issue #3548. +- [#4016](https://github.com/influxdb/influxdb/pull/4016): Shutdown Graphite UDP on SIGTERM. +- [#4034](https://github.com/influxdb/influxdb/pull/4034): Rollback bolt tx on mapper open error +- [#3848](https://github.com/influxdb/influxdb/issues/3848): restart influxdb causing panic +- [#3881](https://github.com/influxdb/influxdb/issues/3881): panic: runtime error: invalid memory address or nil pointer dereference +- [#3926](https://github.com/influxdb/influxdb/issues/3926): First or last value of `GROUP BY time(x)` is often null. Fixed by [#4038](https://github.com/influxdb/influxdb/pull/4038) +- [#4053](https://github.com/influxdb/influxdb/pull/4053): Prohibit dropping default retention policy. +- [#4060](https://github.com/influxdb/influxdb/pull/4060): Don't log EOF error in openTSDB input. +- [#3978](https://github.com/influxdb/influxdb/issues/3978): [0.9.3] (regression) cannot use GROUP BY * with more than a single field in SELECT clause +- [#4058](https://github.com/influxdb/influxdb/pull/4058): Disable bz1 recompression +- [#3902](https://github.com/influxdb/influxdb/issues/3902): [0.9.3] DB should not crash when using invalid expression "GROUP BY time" +- [#3718](https://github.com/influxdb/influxdb/issues/3718): Derivative query with group by time but no aggregate function should fail parse + +## v0.9.3 [2015-08-26] + +### Release Notes + +There are breaking changes in this release. + - To store data points as integers you must now append `i` to the number if using the line protocol. + - If you have a UDP input configured, you should check the UDP section of [the new sample configuration file](https://github.com/influxdb/influxdb/blob/master/etc/config.sample.toml) to learn how to modify existing configuration files, as 0.9.3 now expects multiple UDP inputs. + - Configuration files must now have an entry for `wal-dir` in the `[data]` section. Check [new sample configuration file](https://github.com/influxdb/influxdb/blob/master/etc/config.sample.toml) for more details. + - The implicit `GROUP BY *` that was added to every `SELECT *` has been removed. Instead any tags in the data are now part of the columns in the returned query. + +Please see the *Features* section below for full details. + +### Features +- [#3376](https://github.com/influxdb/influxdb/pull/3376): Support for remote shard query mapping +- [#3372](https://github.com/influxdb/influxdb/pull/3372): Support joining nodes to existing cluster +- [#3426](https://github.com/influxdb/influxdb/pull/3426): Additional logging for continuous queries. Thanks @jhorwit2 +- [#3478](https://github.com/influxdb/influxdb/pull/3478): Support incremental cluster joins +- [#3519](https://github.com/influxdb/influxdb/pull/3519): **--BREAKING CHANGE--** Update line protocol to require trailing i for field values that are integers +- [#3529](https://github.com/influxdb/influxdb/pull/3529): Add TLS support for OpenTSDB plugin. Thanks @nathanielc +- [#3421](https://github.com/influxdb/influxdb/issues/3421): Should update metastore and cluster if IP or hostname changes +- [#3502](https://github.com/influxdb/influxdb/pull/3502): Importer for 0.8.9 data via the CLI +- [#3564](https://github.com/influxdb/influxdb/pull/3564): Fix alias, maintain column sort order +- [#3585](https://github.com/influxdb/influxdb/pull/3585): Additional test coverage for non-existent fields +- [#3246](https://github.com/influxdb/influxdb/issues/3246): Allow overriding of configuration parameters using environment variables +- [#3599](https://github.com/influxdb/influxdb/pull/3599): **--BREAKING CHANGE--** Support multiple UDP inputs. Thanks @tpitale +- [#3636](https://github.com/influxdb/influxdb/pull/3639): Cap auto-created retention policy replica count at 3 +- [#3641](https://github.com/influxdb/influxdb/pull/3641): Logging enhancements and single-node rename +- [#3635](https://github.com/influxdb/influxdb/pull/3635): Add build branch to version output. +- [#3115](https://github.com/influxdb/influxdb/pull/3115): Various init.d script improvements. Thanks @KoeSystems. +- [#3628](https://github.com/influxdb/influxdb/pull/3628): Wildcard expansion of tags and fields for raw queries +- [#3721](https://github.com/influxdb/influxdb/pull/3721): interpret number literals compared against time as nanoseconds from epoch +- [#3514](https://github.com/influxdb/influxdb/issues/3514): Implement WAL outside BoltDB with compaction +- [#3544](https://github.com/influxdb/influxdb/pull/3544): Implement compression on top of BoltDB +- [#3795](https://github.com/influxdb/influxdb/pull/3795): Throttle import +- [#3584](https://github.com/influxdb/influxdb/pull/3584): Import/export documenation + +### Bugfixes +- [#3405](https://github.com/influxdb/influxdb/pull/3405): Prevent database panic when fields are missing. Thanks @jhorwit2 +- [#3411](https://github.com/influxdb/influxdb/issues/3411): 500 timeout on write +- [#3420](https://github.com/influxdb/influxdb/pull/3420): Catch opentsdb malformed tags. Thanks @nathanielc. +- [#3404](https://github.com/influxdb/influxdb/pull/3404): Added support for escaped single quotes in query string. Thanks @jhorwit2 +- [#3414](https://github.com/influxdb/influxdb/issues/3414): Shard mappers perform query re-writing +- [#3525](https://github.com/influxdb/influxdb/pull/3525): check if fields are valid during parse time. +- [#3511](https://github.com/influxdb/influxdb/issues/3511): Sending a large number of tag causes panic +- [#3288](https://github.com/influxdb/influxdb/issues/3288): Run go fuzz on the line-protocol input +- [#3545](https://github.com/influxdb/influxdb/issues/3545): Fix parsing string fields with newlines +- [#3579](https://github.com/influxdb/influxdb/issues/3579): Revert breaking change to `client.NewClient` function +- [#3580](https://github.com/influxdb/influxdb/issues/3580): Do not allow wildcards with fields in select statements +- [#3530](https://github.com/influxdb/influxdb/pull/3530): Aliasing a column no longer works +- [#3436](https://github.com/influxdb/influxdb/issues/3436): Fix panic in hinted handoff queue processor +- [#3401](https://github.com/influxdb/influxdb/issues/3401): Derivative on non-numeric fields panics db +- [#3583](https://github.com/influxdb/influxdb/issues/3583): Inserting value in scientific notation with a trailing i causes panic +- [#3611](https://github.com/influxdb/influxdb/pull/3611): Fix query arithmetic with integers +- [#3326](https://github.com/influxdb/influxdb/issues/3326): simple regex query fails with cryptic error +- [#3618](https://github.com/influxdb/influxdb/pull/3618): Fix collectd stats panic on i386. Thanks @richterger +- [#3625](https://github.com/influxdb/influxdb/pull/3625): Don't panic when aggregate and raw queries are in a single statement +- [#3629](https://github.com/influxdb/influxdb/pull/3629): Use sensible batching defaults for Graphite. +- [#3638](https://github.com/influxdb/influxdb/pull/3638): Cluster config fixes and removal of meta.peers config field +- [#3640](https://github.com/influxdb/influxdb/pull/3640): Shutdown Graphite service when signal received. +- [#3632](https://github.com/influxdb/influxdb/issues/3632): Make single-node host renames more seamless +- [#3656](https://github.com/influxdb/influxdb/issues/3656): Silence snapshotter logger for testing +- [#3651](https://github.com/influxdb/influxdb/pull/3651): Fully remove series when dropped. +- [#3517](https://github.com/influxdb/influxdb/pull/3517): Batch CQ writes to avoid timeouts. Thanks @dim. +- [#3522](https://github.com/influxdb/influxdb/pull/3522): Consume CQ results on request timeouts. Thanks @dim. +- [#3646](https://github.com/influxdb/influxdb/pull/3646): Fix nil FieldCodec panic. +- [#3672](https://github.com/influxdb/influxdb/pull/3672): Reduce in-memory index by 20%-30% +- [#3673](https://github.com/influxdb/influxdb/pull/3673): Improve query performance by removing unnecessary tagset sorting. +- [#3676](https://github.com/influxdb/influxdb/pull/3676): Improve query performance by memomizing mapper output keys. +- [#3686](https://github.com/influxdb/influxdb/pull/3686): Ensure 'p' parameter is not logged, even on OPTIONS requests. +- [#3687](https://github.com/influxdb/influxdb/issues/3687): Fix panic: runtime error: makeslice: len out of range in hinted handoff +- [#3697](https://github.com/influxdb/influxdb/issues/3697): Correctly merge non-chunked results for same series. Fix issue #3242. +- [#3708](https://github.com/influxdb/influxdb/issues/3708): Fix double escaping measurement name during cluster replication +- [#3704](https://github.com/influxdb/influxdb/issues/3704): cluster replication issue for measurement name containing backslash +- [#3681](https://github.com/influxdb/influxdb/issues/3681): Quoted measurement names fail +- [#3681](https://github.com/influxdb/influxdb/issues/3682): Fix inserting string value with backslashes +- [#3735](https://github.com/influxdb/influxdb/issues/3735): Append to small bz1 blocks +- [#3736](https://github.com/influxdb/influxdb/pull/3736): Update shard group duration with retention policy changes. Thanks for the report @papylhomme +- [#3539](https://github.com/influxdb/influxdb/issues/3539): parser incorrectly accepts NaN as numerical value, but not always +- [#3790](https://github.com/influxdb/influxdb/pull/3790): Fix line protocol parsing equals in measurements and NaN values +- [#3778](https://github.com/influxdb/influxdb/pull/3778): Don't panic if SELECT on time. +- [#3824](https://github.com/influxdb/influxdb/issues/3824): tsdb.Point.MarshalBinary needs to support all number types +- [#3828](https://github.com/influxdb/influxdb/pull/3828): Support all number types when decoding a point +- [#3853](https://github.com/influxdb/influxdb/pull/3853): Use 4KB default block size for bz1 +- [#3607](https://github.com/influxdb/influxdb/issues/3607): Fix unable to query influxdb due to deadlock in metastore. Thanks @ccutrer! + +## v0.9.2 [2015-07-24] + +### Features +- [#3177](https://github.com/influxdb/influxdb/pull/3177): Client supports making HTTPS requests. Thanks @jipperinbham +- [#3299](https://github.com/influxdb/influxdb/pull/3299): Refactor query engine for distributed query support. +- [#3334](https://github.com/influxdb/influxdb/pull/3334): Clean shutdown of influxd. Thanks @mcastilho + +### Bugfixes + +- [#3180](https://github.com/influxdb/influxdb/pull/3180): Log GOMAXPROCS, version, and commit on startup. +- [#3218](https://github.com/influxdb/influxdb/pull/3218): Allow write timeouts to be configurable. +- [#3184](https://github.com/influxdb/influxdb/pull/3184): Support basic auth in admin interface. Thanks @jipperinbham! +- [#3236](https://github.com/influxdb/influxdb/pull/3236): Fix display issues in admin interface. +- [#3232](https://github.com/influxdb/influxdb/pull/3232): Set logging prefix for metastore. +- [#3230](https://github.com/influxdb/influxdb/issues/3230): panic: unable to parse bool value +- [#3245](https://github.com/influxdb/influxdb/issues/3245): Error using graphite plugin with multiple filters +- [#3223](https://github.com/influxdb/influxdb/issues/323): default graphite template cannot have extra tags +- [#3255](https://github.com/influxdb/influxdb/pull/3255): Flush WAL on start-up as soon as possible. +- [#3289](https://github.com/influxdb/influxdb/issues/3289): InfluxDB crashes on floats without decimal +- [#3298](https://github.com/influxdb/influxdb/pull/3298): Corrected WAL & flush parameters in default config. Thanks @jhorwit2 +- [#3152](https://github.com/influxdb/influxdb/issues/3159): High CPU Usage with unsorted writes +- [#3307](https://github.com/influxdb/influxdb/pull/3307): Fix regression parsing boolean values True/False +- [#3304](https://github.com/influxdb/influxdb/pull/3304): Fixed httpd logger to log user from query params. Thanks @jhorwit2 +- [#3332](https://github.com/influxdb/influxdb/pull/3332): Add SLIMIT and SOFFSET to string version of AST. +- [#3335](https://github.com/influxdb/influxdb/pull/3335): Don't drop all data on DROP DATABASE. Thanks to @PierreF for the report +- [#2761](https://github.com/influxdb/influxdb/issues/2761): Make SHOW RETENTION POLICIES consistent with other queries. +- [#3356](https://github.com/influxdb/influxdb/pull/3356): Disregard semicolons after database name in use command. Thanks @timraymond. +- [#3351](https://github.com/influxdb/influxdb/pull/3351): Handle malformed regex comparisons during parsing. Thanks @rnubel +- [#3244](https://github.com/influxdb/influxdb/pull/3244): Wire up admin privilege grant and revoke. +- [#3259](https://github.com/influxdb/influxdb/issues/3259): Respect privileges for queries. +- [#3256](https://github.com/influxdb/influxdb/pull/3256): Remove unnecessary timeout in WaitForLeader(). Thanks @cannium. +- [#3380](https://github.com/influxdb/influxdb/issue/3380): Parser fix, only allow ORDER BY ASC and ORDER BY time ASC. +- [#3319](https://github.com/influxdb/influxdb/issues/3319): restarting process irrevocably BREAKS measurements with spaces +- [#3453](https://github.com/influxdb/influxdb/issues/3453): Remove outdated `dump` command from CLI. +- [#3463](https://github.com/influxdb/influxdb/issues/3463): Fix aggregate queries and time precision on where clauses. + +## v0.9.1 [2015-07-02] + +### Features + +- [2650](https://github.com/influxdb/influxdb/pull/2650): Add SHOW GRANTS FOR USER statement. Thanks @n1tr0g. +- [3125](https://github.com/influxdb/influxdb/pull/3125): Graphite Input Protocol Parsing +- [2746](https://github.com/influxdb/influxdb/pull/2746): New Admin UI/interface +- [3036](https://github.com/influxdb/influxdb/pull/3036): Write Ahead Log (WAL) +- [3014](https://github.com/influxdb/influxdb/issues/3014): Implement Raft snapshots + +### Bugfixes + +- [3013](https://github.com/influxdb/influxdb/issues/3013): Panic error with inserting values with commas +- [#2956](https://github.com/influxdb/influxdb/issues/2956): Type mismatch in derivative +- [#2908](https://github.com/influxdb/influxdb/issues/2908): Field mismatch error messages need to be updated +- [#2931](https://github.com/influxdb/influxdb/pull/2931): Services and reporting should wait until cluster has leader. +- [#2943](https://github.com/influxdb/influxdb/issues/2943): Ensure default retention policies are fully replicated +- [#2948](https://github.com/influxdb/influxdb/issues/2948): Field mismatch error message to include measurement name +- [#2919](https://github.com/influxdb/influxdb/issues/2919): Unable to insert negative floats +- [#2935](https://github.com/influxdb/influxdb/issues/2935): Hook CPU and memory profiling back up. +- [#2960](https://github.com/influxdb/influxdb/issues/2960): Cluster Write Errors. +- [#2928](https://github.com/influxdb/influxdb/pull/2928): Start work to set InfluxDB version in HTTP response headers. Thanks @neonstalwart. +- [#2969](https://github.com/influxdb/influxdb/pull/2969): Actually set HTTP version in responses. +- [#2993](https://github.com/influxdb/influxdb/pull/2993): Don't log each UDP batch. +- [#2994](https://github.com/influxdb/influxdb/pull/2994): Don't panic during wilcard expansion if no default database specified. +- [#3002](https://github.com/influxdb/influxdb/pull/3002): Remove measurement from shard's index on DROP MEASUREMENT. +- [#3021](https://github.com/influxdb/influxdb/pull/3021): Correct set HTTP write trace logging. Thanks @vladlopes. +- [#3027](https://github.com/influxdb/influxdb/pull/3027): Enforce minimum retention policy duration of 1 hour. +- [#3030](https://github.com/influxdb/influxdb/pull/3030): Fix excessive logging of shard creation. +- [#3038](https://github.com/influxdb/influxdb/pull/3038): Don't check deleted shards for precreation. Thanks @vladlopes. +- [#3033](https://github.com/influxdb/influxdb/pull/3033): Add support for marshaling `uint64` in client. +- [#3090](https://github.com/influxdb/influxdb/pull/3090): Remove database from TSDB index on DROP DATABASE. +- [#2944](https://github.com/influxdb/influxdb/issues/2944): Don't require "WHERE time" when creating continuous queries. +- [#3075](https://github.com/influxdb/influxdb/pull/3075): GROUP BY correctly when different tags have same value. +- [#3078](https://github.com/influxdb/influxdb/pull/3078): Fix CLI panic on malformed INSERT. +- [#2102](https://github.com/influxdb/influxdb/issues/2102): Re-work Graphite input and metric processing +- [#2996](https://github.com/influxdb/influxdb/issues/2996): Graphite Input Parsing +- [#3136](https://github.com/influxdb/influxdb/pull/3136): Fix various issues with init.d script. Thanks @ miguelcnf. +- [#2996](https://github.com/influxdb/influxdb/issues/2996): Graphite Input Parsing +- [#3127](https://github.com/influxdb/influxdb/issues/3127): Trying to insert a number larger than the largest signed 64-bit number kills influxd +- [#3131](https://github.com/influxdb/influxdb/pull/3131): Copy batch tags to each point before marshalling +- [#3155](https://github.com/influxdb/influxdb/pull/3155): Instantiate UDP batcher before listening for UDP traffic, otherwise a panic may result. +- [#2678](https://github.com/influxdb/influxdb/issues/2678): Server allows tags with an empty string for the key and/or value +- [#3061](https://github.com/influxdb/influxdb/issues/3061): syntactically incorrect line protocol insert panics the database +- [#2608](https://github.com/influxdb/influxdb/issues/2608): drop measurement while writing points to that measurement has race condition that can panic +- [#3183](https://github.com/influxdb/influxdb/issues/3183): using line protocol measurement names cannot contain commas +- [#3193](https://github.com/influxdb/influxdb/pull/3193): Fix panic for SHOW STATS and in collectd +- [#3102](https://github.com/influxdb/influxdb/issues/3102): Add authentication cache +- [#3209](https://github.com/influxdb/influxdb/pull/3209): Dump Run() errors to stderr +- [#3217](https://github.com/influxdb/influxdb/pull/3217): Allow WAL partition flush delay to be configurable. + +## v0.9.0 [2015-06-11] + +### Bugfixes + +- [#2869](https://github.com/influxdb/influxdb/issues/2869): Adding field to existing measurement causes panic +- [#2849](https://github.com/influxdb/influxdb/issues/2849): RC32: Frequent write errors +- [#2700](https://github.com/influxdb/influxdb/issues/2700): Incorrect error message in database EncodeFields +- [#2897](https://github.com/influxdb/influxdb/pull/2897): Ensure target Graphite database exists +- [#2898](https://github.com/influxdb/influxdb/pull/2898): Ensure target openTSDB database exists +- [#2895](https://github.com/influxdb/influxdb/pull/2895): Use Graphite input defaults where necessary +- [#2900](https://github.com/influxdb/influxdb/pull/2900): Use openTSDB input defaults where necessary +- [#2886](https://github.com/influxdb/influxdb/issues/2886): Refactor backup & restore +- [#2804](https://github.com/influxdb/influxdb/pull/2804): BREAKING: change time literals to be single quoted in InfluxQL. Thanks @nvcook42! +- [#2906](https://github.com/influxdb/influxdb/pull/2906): Restrict replication factor to the cluster size +- [#2905](https://github.com/influxdb/influxdb/pull/2905): Restrict clusters to 3 peers +- [#2904](https://github.com/influxdb/influxdb/pull/2904): Re-enable server reporting. +- [#2917](https://github.com/influxdb/influxdb/pull/2917): Fix int64 field values. +- [#2920](https://github.com/influxdb/influxdb/issues/2920): Ensure collectd database exists + +## v0.9.0-rc33 [2015-06-09] + +### Bugfixes + +- [#2816](https://github.com/influxdb/influxdb/pull/2816): Enable UDP service. Thanks @renan- +- [#2824](https://github.com/influxdb/influxdb/pull/2824): Add missing call to WaitGroup.Done in execConn. Thanks @liyichao +- [#2823](https://github.com/influxdb/influxdb/pull/2823): Convert OpenTSDB to a service. +- [#2838](https://github.com/influxdb/influxdb/pull/2838): Set auto-created retention policy period to infinite. +- [#2829](https://github.com/influxdb/influxdb/pull/2829): Re-enable Graphite support as a new Service-style component. +- [#2814](https://github.com/influxdb/influxdb/issues/2814): Convert collectd to a service. +- [#2852](https://github.com/influxdb/influxdb/pull/2852): Don't panic when altering retention policies. Thanks for the report @huhongbo +- [#2857](https://github.com/influxdb/influxdb/issues/2857): Fix parsing commas in string field values. +- [#2833](https://github.com/influxdb/influxdb/pull/2833): Make the default config valid. +- [#2859](https://github.com/influxdb/influxdb/pull/2859): Fix panic on aggregate functions. +- [#2878](https://github.com/influxdb/influxdb/pull/2878): Re-enable shard precreation. +- [2865](https://github.com/influxdb/influxdb/pull/2865) -- Return an empty set of results if database does not exist in shard metadata. + +### Features +- [2858](https://github.com/influxdb/influxdb/pull/2858): Support setting openTSDB write consistency. + +## v0.9.0-rc32 [2015-06-07] + +### Release Notes + +This released introduced an updated write path and clustering design. The data format has also changed, so you'll need to wipe out your data to upgrade from RC31. There should be no other data changes before v0.9.0 is released. + +### Features +- [#1997](https://github.com/influxdb/influxdb/pull/1997): Update SELECT * to return tag values. +- [#2599](https://github.com/influxdb/influxdb/issues/2599): Add "epoch" URL param and return JSON time values as epoch instead of date strings. +- [#2682](https://github.com/influxdb/influxdb/issues/2682): Adding pr checklist to CONTRIBUTING.md +- [#2683](https://github.com/influxdb/influxdb/issues/2683): Add batching support to Graphite inputs. +- [#2687](https://github.com/influxdb/influxdb/issues/2687): Add batching support to Collectd inputs. +- [#2696](https://github.com/influxdb/influxdb/pull/2696): Add line protocol. This is now the preferred way to write data. +- [#2751](https://github.com/influxdb/influxdb/pull/2751): Add UDP input. UDP only supports the line protocol now. +- [#2684](https://github.com/influxdb/influxdb/pull/2684): Include client timeout configuration. Thanks @vladlopes! + +### Bugfixes +- [#2776](https://github.com/influxdb/influxdb/issues/2776): Re-implement retention policy enforcement. +- [#2635](https://github.com/influxdb/influxdb/issues/2635): Fix querying against boolean field in WHERE clause. +- [#2644](https://github.com/influxdb/influxdb/issues/2644): Make SHOW queries work with FROM //. +- [#2501](https://github.com/influxdb/influxdb/issues/2501): Name the FlagSet for the shell and add a version flag. Thanks @neonstalwart +- [#2647](https://github.com/influxdb/influxdb/issues/2647): Fixes typos in sample config file - thanks @claws! + +## v0.9.0-rc31 [2015-05-21] + +### Features +- [#1822](https://github.com/influxdb/influxdb/issues/1822): Wire up DERIVATIVE aggregate +- [#1477](https://github.com/influxdb/influxdb/issues/1477): Wire up non_negative_derivative function +- [#2557](https://github.com/influxdb/influxdb/issues/2557): Fix false positive error with `GROUP BY time` +- [#1891](https://github.com/influxdb/influxdb/issues/1891): Wire up COUNT DISTINCT aggregate +- [#1989](https://github.com/influxdb/influxdb/issues/1989): Implement `SELECT tagName FROM m` + +### Bugfixes +- [#2545](https://github.com/influxdb/influxdb/pull/2545): Use "value" as the field name for graphite input. Thanks @cannium. +- [#2558](https://github.com/influxdb/influxdb/pull/2558): Fix client response check - thanks @vladlopes! +- [#2566](https://github.com/influxdb/influxdb/pull/2566): Wait until each data write has been commited by the Raft cluster. +- [#2602](https://github.com/influxdb/influxdb/pull/2602): CLI execute command exits without cleaning up liner package. +- [#2610](https://github.com/influxdb/influxdb/pull/2610): Fix shard group creation +- [#2596](https://github.com/influxdb/influxdb/pull/2596): RC30: `panic: runtime error: index out of range` when insert data points. +- [#2592](https://github.com/influxdb/influxdb/pull/2592): Should return an error if user attempts to group by a field. +- [#2499](https://github.com/influxdb/influxdb/pull/2499): Issuing a select query with tag as a values causes panic. +- [#2612](https://github.com/influxdb/influxdb/pull/2612): Query planner should validate distinct is passed a field. +- [#2531](https://github.com/influxdb/influxdb/issues/2531): Fix select with 3 or more terms in where clause. +- [#2564](https://github.com/influxdb/influxdb/issues/2564): Change "name" to "measurement" in JSON for writes. + +## PRs +- [#2569](https://github.com/influxdb/influxdb/pull/2569): Add derivative functions +- [#2598](https://github.com/influxdb/influxdb/pull/2598): Implement tag support in SELECT statements +- [#2624](https://github.com/influxdb/influxdb/pull/2624): Remove references to SeriesID in `DROP SERIES` handlers. + +## v0.9.0-rc30 [2015-05-12] + +### Release Notes + +This release has a breaking API change for writes -- the field previously called `timestamp` has been renamed to `time`. + +### Features +- [#2254](https://github.com/influxdb/influxdb/pull/2254): Add Support for OpenTSDB HTTP interface. Thanks @tcolgate +- [#2525](https://github.com/influxdb/influxdb/pull/2525): Serve broker diagnostics over HTTP +- [#2186](https://github.com/influxdb/influxdb/pull/2186): The default status code for queries is now `200 OK` +- [#2298](https://github.com/influxdb/influxdb/pull/2298): Successful writes now return a status code of `204 No Content` - thanks @neonstalwart! +- [#2549](https://github.com/influxdb/influxdb/pull/2549): Raft election timeout to 5 seconds, so system is more forgiving of CPU loads. +- [#2568](https://github.com/influxdb/influxdb/pull/2568): Wire up SELECT DISTINCT. + +### Bugfixes +- [#2535](https://github.com/influxdb/influxdb/pull/2535): Return exit status 0 if influxd already running. Thanks @haim0n. +- [#2521](https://github.com/influxdb/influxdb/pull/2521): Don't truncate topic data until fully replicated. +- [#2509](https://github.com/influxdb/influxdb/pull/2509): Parse config file correctly during restore. Thanks @neonstalwart +- [#2536](https://github.com/influxdb/influxdb/issues/2532): Set leader ID on restart of single-node cluster. +- [#2448](https://github.com/influxdb/influxdb/pull/2448): Fix inconsistent data type - thanks @cannium! +- [#2108](https://github.com/influxdb/influxdb/issues/2108): Change `timestamp` to `time` - thanks @neonstalwart! +- [#2539](https://github.com/influxdb/influxdb/issues/2539): Add additional vote request logging. +- [#2541](https://github.com/influxdb/influxdb/issues/2541): Update messaging client connection index with every message. +- [#2542](https://github.com/influxdb/influxdb/issues/2542): Throw parser error for invalid aggregate without where time. +- [#2548](https://github.com/influxdb/influxdb/issues/2548): Return an error when numeric aggregate applied to non-numeric data. +- [#2487](https://github.com/influxdb/influxdb/issues/2487): Aggregate query with exact timestamp causes panic. Thanks @neonstalwart! +- [#2552](https://github.com/influxdb/influxdb/issues/2552): Run CQ that is actually passed into go-routine. +- [#2553](https://github.com/influxdb/influxdb/issues/2553): Fix race condition during CQ execution. +- [#2557](https://github.com/influxdb/influxdb/issues/2557): RC30 WHERE time filter Regression. + +## v0.9.0-rc29 [2015-05-05] + +### Features +- [#2410](https://github.com/influxdb/influxdb/pull/2410): If needed, brokers respond with data nodes for peer shard replication. +- [#2469](https://github.com/influxdb/influxdb/pull/2469): Reduce default max topic size from 1GB to 50MB. +- [#1824](https://github.com/influxdb/influxdb/pull/1824): Wire up MEDIAN aggregate. Thanks @neonstalwart! + +### Bugfixes +- [#2446](https://github.com/influxdb/influxdb/pull/2446): Correctly count number of queries executed. Thanks @neonstalwart +- [#2452](https://github.com/influxdb/influxdb/issues/2452): Fix panic with shard stats on multiple clusters +- [#2453](https://github.com/influxdb/influxdb/pull/2453): Do not require snapshot on Log.WriteEntriesTo(). +- [#2460](https://github.com/influxdb/influxdb/issues/2460): Collectd input should use "value" for fields values. Fixes 2412. Thanks @josh-padnick +- [#2465](https://github.com/influxdb/influxdb/pull/2465): HTTP response logging paniced with chunked requests. Thanks @Jackkoz +- [#2475](https://github.com/influxdb/influxdb/pull/2475): RLock server when checking if shards groups are required during write. +- [#2471](https://github.com/influxdb/influxdb/issues/2471): Function calls normalized to be lower case. Fixes percentile not working when called uppercase. Thanks @neonstalwart +- [#2281](https://github.com/influxdb/influxdb/issues/2281): Fix Bad Escape error when parsing regex + +## v0.9.0-rc28 [2015-04-27] + +### Features +- [#2410](https://github.com/influxdb/influxdb/pull/2410) Allow configuration of Raft timers +- [#2354](https://github.com/influxdb/influxdb/pull/2354) Wire up STDDEV. Thanks @neonstalwart! + +### Bugfixes +- [#2374](https://github.com/influxdb/influxdb/issues/2374): Two different panics during SELECT percentile +- [#2404](https://github.com/influxdb/influxdb/pull/2404): Mean and percentile function fixes +- [#2408](https://github.com/influxdb/influxdb/pull/2408): Fix snapshot 500 error +- [#1896](https://github.com/influxdb/influxdb/issues/1896): Excessive heartbeater logging of "connection refused" on cluster node stop +- [#2418](https://github.com/influxdb/influxdb/pull/2418): Fix raft node getting stuck in candidate state +- [#2415](https://github.com/influxdb/influxdb/pull/2415): Raft leader ID now set on election after failover. Thanks @xiaost +- [#2426](https://github.com/influxdb/influxdb/pull/2426): Fix race condition around listener address in openTSDB server. +- [#2426](https://github.com/influxdb/influxdb/pull/2426): Fix race condition around listener address in Graphite server. +- [#2429](https://github.com/influxdb/influxdb/pull/2429): Ensure no field value is null. +- [#2431](https://github.com/influxdb/influxdb/pull/2431): Always append shard path in diags. Thanks @marcosnils +- [#2441](https://github.com/influxdb/influxdb/pull/2441): Correctly release server RLock during "drop series". +- [#2445](https://github.com/influxdb/influxdb/pull/2445): Read locks and data race fixes + +## v0.9.0-rc27 [04-23-2015] + +### Features +- [#2398](https://github.com/influxdb/influxdb/pull/2398) Track more stats and report errors for shards. + +### Bugfixes +- [#2370](https://github.com/influxdb/influxdb/pull/2370): Fix data race in openTSDB endpoint. +- [#2371](https://github.com/influxdb/influxdb/pull/2371): Don't set client to nil when closing broker Fixes #2352 +- [#2372](https://github.com/influxdb/influxdb/pull/2372): Fix data race in graphite endpoint. +- [#2373](https://github.com/influxdb/influxdb/pull/2373): Actually allow HTTP logging to be controlled. +- [#2376](https://github.com/influxdb/influxdb/pull/2376): Encode all types of integers. Thanks @jtakkala. +- [#2376](https://github.com/influxdb/influxdb/pull/2376): Add shard path to existing diags value. Fix issue #2369. +- [#2386](https://github.com/influxdb/influxdb/pull/2386): Fix shard datanodes stats getting appended too many times +- [#2393](https://github.com/influxdb/influxdb/pull/2393): Fix default hostname for connecting to cluster. +- [#2390](https://github.com/influxdb/influxdb/pull/2390): Handle large sums when calculating means - thanks @neonstalwart! +- [#2391](https://github.com/influxdb/influxdb/pull/2391): Unable to write points through Go client when authentication enabled +- [#2400](https://github.com/influxdb/influxdb/pull/2400): Always send auth headers for client requests if present + +## v0.9.0-rc26 [04-21-2015] + +### Features +- [#2301](https://github.com/influxdb/influxdb/pull/2301): Distributed query load balancing and failover +- [#2336](https://github.com/influxdb/influxdb/pull/2336): Handle distributed queries when shards != data nodes +- [#2353](https://github.com/influxdb/influxdb/pull/2353): Distributed Query/Clustering Fixes + +### Bugfixes +- [#2297](https://github.com/influxdb/influxdb/pull/2297): create /var/run during startup. Thanks @neonstalwart. +- [#2312](https://github.com/influxdb/influxdb/pull/2312): Re-use httpclient for continuous queries +- [#2318](https://github.com/influxdb/influxdb/pull/2318): Remove pointless use of 'done' channel for collectd. +- [#2242](https://github.com/influxdb/influxdb/pull/2242): Distributed Query should balance requests +- [#2243](https://github.com/influxdb/influxdb/pull/2243): Use Limit Reader instead of fixed 1MB/1GB slice for DQ +- [#2190](https://github.com/influxdb/influxdb/pull/2190): Implement failover to other data nodes for distributed queries +- [#2324](https://github.com/influxdb/influxdb/issues/2324): Race in Broker.Close()/Broker.RunContinousQueryProcessing() +- [#2325](https://github.com/influxdb/influxdb/pull/2325): Cluster open fixes +- [#2326](https://github.com/influxdb/influxdb/pull/2326): Fix parse error in CREATE CONTINUOUS QUERY +- [#2300](https://github.com/influxdb/influxdb/pull/2300): Refactor integration tests. Properly close Graphite/OpenTSDB listeners. +- [#2338](https://github.com/influxdb/influxdb/pull/2338): Fix panic if tag key isn't double quoted when it should have been +- [#2340](https://github.com/influxdb/influxdb/pull/2340): Fix SHOW DIAGNOSTICS panic if any shard was non-local. +- [#2351](https://github.com/influxdb/influxdb/pull/2351): Fix data race by rlocking shard during diagnostics. +- [#2348](https://github.com/influxdb/influxdb/pull/2348): Data node fail to join cluster in 0.9.0rc25 +- [#2343](https://github.com/influxdb/influxdb/pull/2343): Node falls behind Metastore updates +- [#2334](https://github.com/influxdb/influxdb/pull/2334): Test Partial replication is very problematic +- [#2272](https://github.com/influxdb/influxdb/pull/2272): clustering: influxdb 0.9.0-rc23 panics when doing a GET with merge_metrics in a +- [#2350](https://github.com/influxdb/influxdb/pull/2350): Issue fix for :influxd -hostname localhost. +- [#2367](https://github.com/influxdb/influxdb/pull/2367): PR for issue #2350 - Always use localhost, not host name. + +## v0.9.0-rc25 [2015-04-15] + +### Bugfixes +- [#2282](https://github.com/influxdb/influxdb/pull/2282): Use "value" as field name for OpenTSDB input. +- [#2283](https://github.com/influxdb/influxdb/pull/2283): Fix bug when restarting an entire existing cluster. +- [#2293](https://github.com/influxdb/influxdb/pull/2293): Open cluster listener before starting broker. +- [#2287](https://github.com/influxdb/influxdb/pull/2287): Fix data race during SHOW RETENTION POLICIES. +- [#2288](https://github.com/influxdb/influxdb/pull/2288): Fix expression parsing bug. +- [#2294](https://github.com/influxdb/influxdb/pull/2294): Fix async response flushing (invalid chunked response error). + +## Features +- [#2276](https://github.com/influxdb/influxdb/pull/2276): Broker topic truncation. +- [#2292](https://github.com/influxdb/influxdb/pull/2292): Wire up drop CQ statement - thanks @neonstalwart! +- [#2290](https://github.com/influxdb/influxdb/pull/2290): Allow hostname argument to override default config - thanks @neonstalwart! +- [#2295](https://github.com/influxdb/influxdb/pull/2295): Use nil as default return value for MapCount - thanks @neonstalwart! +- [#2246](https://github.com/influxdb/influxdb/pull/2246): Allow HTTP logging to be controlled. + +## v0.9.0-rc24 [2015-04-13] + +### Bugfixes +- [#2255](https://github.com/influxdb/influxdb/pull/2255): Fix panic when changing default retention policy. +- [#2257](https://github.com/influxdb/influxdb/pull/2257): Add "snapshotting" pseudo state & log entry cache. +- [#2261](https://github.com/influxdb/influxdb/pull/2261): Support int64 value types. +- [#2191](https://github.com/influxdb/influxdb/pull/2191): Case-insensitive check for "fill" +- [#2274](https://github.com/influxdb/influxdb/pull/2274): Snapshot and HTTP API endpoints +- [#2265](https://github.com/influxdb/influxdb/pull/2265): Fix auth for CLI. + +## v0.9.0-rc23 [2015-04-11] + +### Features +- [#2202](https://github.com/influxdb/influxdb/pull/2202): Initial implementation of Distributed Queries +- [#2202](https://github.com/influxdb/influxdb/pull/2202): 64-bit Series IDs. INCOMPATIBLE WITH PREVIOUS DATASTORES. + +### Bugfixes +- [#2225](https://github.com/influxdb/influxdb/pull/2225): Make keywords completely case insensitive +- [#2228](https://github.com/influxdb/influxdb/pull/2228): Accept keyword default unquoted in ALTER RETENTION POLICY statement +- [#2236](https://github.com/influxdb/influxdb/pull/2236): Immediate term changes, fix stale write issue, net/http/pprof +- [#2213](https://github.com/influxdb/influxdb/pull/2213): Seed random number generator for election timeout. Thanks @cannium. + +## v0.9.0-rc22 [2015-04-09] + +### Features +- [#2214](https://github.com/influxdb/influxdb/pull/2214): Added the option to influx CLI to execute single command and exit. Thanks @n1tr0g + +### Bugfixes +- [#2223](https://github.com/influxdb/influxdb/pull/2223): Always notify term change on RequestVote + +## v0.9.0-rc21 [2015-04-09] + +### Features +- [#870](https://github.com/influxdb/influxdb/pull/870): Add support for OpenTSDB telnet input protocol. Thanks @tcolgate +- [#2180](https://github.com/influxdb/influxdb/pull/2180): Allow http write handler to decode gzipped body +- [#2175](https://github.com/influxdb/influxdb/pull/2175): Separate broker and data nodes +- [#2158](https://github.com/influxdb/influxdb/pull/2158): Allow user password to be changed. Thanks @n1tr0g +- [#2201](https://github.com/influxdb/influxdb/pull/2201): Bring back config join URLs +- [#2121](https://github.com/influxdb/influxdb/pull/2121): Parser refactor + +### Bugfixes +- [#2181](https://github.com/influxdb/influxdb/pull/2181): Fix panic on "SHOW DIAGNOSTICS". +- [#2170](https://github.com/influxdb/influxdb/pull/2170): Make sure queries on missing tags return 200 status. +- [#2197](https://github.com/influxdb/influxdb/pull/2197): Lock server during Open(). +- [#2200](https://github.com/influxdb/influxdb/pull/2200): Re-enable Continuous Queries. +- [#2203](https://github.com/influxdb/influxdb/pull/2203): Fix race condition on continuous queries. +- [#2217](https://github.com/influxdb/influxdb/pull/2217): Only revert to follower if new term is greater. +- [#2219](https://github.com/influxdb/influxdb/pull/2219): Persist term change to disk when candidate. Thanks @cannium + +## v0.9.0-rc20 [2015-04-04] + +### Features +- [#2128](https://github.com/influxdb/influxdb/pull/2128): Data node discovery from brokers +- [#2142](https://github.com/influxdb/influxdb/pull/2142): Support chunked queries +- [#2154](https://github.com/influxdb/influxdb/pull/2154): Node redirection +- [#2168](https://github.com/influxdb/influxdb/pull/2168): Return raft term from vote, add term logging + +### Bugfixes +- [#2147](https://github.com/influxdb/influxdb/pull/2147): Set Go Max procs in a better location +- [#2137](https://github.com/influxdb/influxdb/pull/2137): Refactor `results` to `response`. Breaking Go Client change. +- [#2151](https://github.com/influxdb/influxdb/pull/2151): Ignore replay commands on the metastore. +- [#2152](https://github.com/influxdb/influxdb/issues/2152): Influxd process with stats enabled crashing with 'Unsuported protocol scheme for ""' +- [#2156](https://github.com/influxdb/influxdb/pull/2156): Propagate error when resolving UDP address in Graphite UDP server. +- [#2163](https://github.com/influxdb/influxdb/pull/2163): Fix up paths for default data and run storage. +- [#2164](https://github.com/influxdb/influxdb/pull/2164): Append STDOUT/STDERR in initscript. +- [#2165](https://github.com/influxdb/influxdb/pull/2165): Better name for config section for stats and diags. +- [#2165](https://github.com/influxdb/influxdb/pull/2165): Monitoring database and retention policy are not configurable. +- [#2167](https://github.com/influxdb/influxdb/pull/2167): Add broker log recovery. +- [#2166](https://github.com/influxdb/influxdb/pull/2166): Don't panic if presented with a field of unknown type. +- [#2149](https://github.com/influxdb/influxdb/pull/2149): Fix unit tests for win32 when directory doesn't exist. +- [#2150](https://github.com/influxdb/influxdb/pull/2150): Fix unit tests for win32 when a connection is refused. + +## v0.9.0-rc19 [2015-04-01] + +### Features +- [#2143](https://github.com/influxdb/influxdb/pull/2143): Add raft term logging. + +### Bugfixes +- [#2145](https://github.com/influxdb/influxdb/pull/2145): Encode toml durations correctly which fixes default configuration generation `influxd config`. + +## v0.9.0-rc18 [2015-03-31] + +### Bugfixes +- [#2100](https://github.com/influxdb/influxdb/pull/2100): Use channel to synchronize collectd shutdown. +- [#2100](https://github.com/influxdb/influxdb/pull/2100): Synchronize access to shard index. +- [#2131](https://github.com/influxdb/influxdb/pull/2131): Optimize marshalTags(). +- [#2130](https://github.com/influxdb/influxdb/pull/2130): Make fewer calls to marshalTags(). +- [#2105](https://github.com/influxdb/influxdb/pull/2105): Support != for tag values. Fix issue #2097, thanks to @smonkewitz for bug report. +- [#2105](https://github.com/influxdb/influxdb/pull/2105): Support !~ tags values. +- [#2138](https://github.com/influxdb/influxdb/pull/2136): Use map for marshaledTags cache. + +## v0.9.0-rc17 [2015-03-29] + +### Features +- [#2076](https://github.com/influxdb/influxdb/pull/2076): Separate stdout and stderr output in init.d script +- [#2091](https://github.com/influxdb/influxdb/pull/2091): Support disabling snapshot endpoint. +- [#2081](https://github.com/influxdb/influxdb/pull/2081): Support writing diagnostic data into the internal database. +- [#2095](https://github.com/influxdb/influxdb/pull/2095): Improved InfluxDB client docs. Thanks @derailed + +### Bugfixes +- [#2093](https://github.com/influxdb/influxdb/pull/2093): Point precision not marshalled correctly. Thanks @derailed +- [#2084](https://github.com/influxdb/influxdb/pull/2084): Allowing leading underscores in identifiers. +- [#2080](https://github.com/influxdb/influxdb/pull/2080): Graphite logs in seconds, not milliseconds. +- [#2101](https://github.com/influxdb/influxdb/pull/2101): SHOW DATABASES should name returned series "databases". +- [#2104](https://github.com/influxdb/influxdb/pull/2104): Include NEQ when calculating field filters. +- [#2112](https://github.com/influxdb/influxdb/pull/2112): Set GOMAXPROCS on startup. This may have been causing extra leader elections, which would cause a number of other bugs or instability. +- [#2111](https://github.com/influxdb/influxdb/pull/2111) and [#2025](https://github.com/influxdb/influxdb/issues/2025): Raft stability fixes. Non-contiguous log error and others. +- [#2114](https://github.com/influxdb/influxdb/pull/2114): Correctly start influxd on platforms without start-stop-daemon. + +## v0.9.0-rc16 [2015-03-24] + +### Features +- [#2058](https://github.com/influxdb/influxdb/pull/2058): Track number of queries executed in stats. +- [#2059](https://github.com/influxdb/influxdb/pull/2059): Retention policies sorted by name on return to client. +- [#2061](https://github.com/influxdb/influxdb/pull/2061): Implement SHOW DIAGNOSTICS. +- [#2064](https://github.com/influxdb/influxdb/pull/2064): Allow init.d script to return influxd version. +- [#2053](https://github.com/influxdb/influxdb/pull/2053): Implment backup and restore. +- [#1631](https://github.com/influxdb/influxdb/pull/1631): Wire up DROP CONTINUOUS QUERY. + +### Bugfixes +- [#2037](https://github.com/influxdb/influxdb/pull/2037): Don't check 'configExists' at Run() level. +- [#2039](https://github.com/influxdb/influxdb/pull/2039): Don't panic if getting current user fails. +- [#2034](https://github.com/influxdb/influxdb/pull/2034): GROUP BY should require an aggregate. +- [#2040](https://github.com/influxdb/influxdb/pull/2040): Add missing top-level help for config command. +- [#2057](https://github.com/influxdb/influxdb/pull/2057): Move racy "in order" test to integration test suite. +- [#2060](https://github.com/influxdb/influxdb/pull/2060): Reload server shard map on restart. +- [#2068](https://github.com/influxdb/influxdb/pull/2068): Fix misspelled JSON field. +- [#2067](https://github.com/influxdb/influxdb/pull/2067): Fixed issue where some queries didn't properly pull back data (introduced in RC15). Fixing intervals for GROUP BY. + +## v0.9.0-rc15 [2015-03-19] + +### Features +- [#2000](https://github.com/influxdb/influxdb/pull/2000): Log broker path when broker fails to start. Thanks @gst. +- [#2007](https://github.com/influxdb/influxdb/pull/2007): Track shard-level stats. + +### Bugfixes +- [#2001](https://github.com/influxdb/influxdb/pull/2001): Ensure measurement not found returns status code 200. +- [#1985](https://github.com/influxdb/influxdb/pull/1985): Set content-type JSON header before actually writing header. Thanks @dstrek. +- [#2003](https://github.com/influxdb/influxdb/pull/2003): Set timestamp when writing monitoring stats. +- [#2004](https://github.com/influxdb/influxdb/pull/2004): Limit group by to MaxGroupByPoints (currently 100,000). +- [#2016](https://github.com/influxdb/influxdb/pull/2016): Fixing bucket alignment for group by. Thanks @jnutzmann +- [#2021](https://github.com/influxdb/influxdb/pull/2021): Remove unnecessary formatting from log message. Thanks @simonkern + + +## v0.9.0-rc14 [2015-03-18] + +### Bugfixes +- [#1999](https://github.com/influxdb/influxdb/pull/1999): Return status code 200 for measurement not found errors on show series. + +## v0.9.0-rc13 [2015-03-17] + +### Features +- [#1974](https://github.com/influxdb/influxdb/pull/1974): Add time taken for request to the http server logs. + +### Bugfixes +- [#1971](https://github.com/influxdb/influxdb/pull/1971): Fix leader id initialization. +- [#1975](https://github.com/influxdb/influxdb/pull/1975): Require `q` parameter for query endpoint. +- [#1969](https://github.com/influxdb/influxdb/pull/1969): Print loaded config. +- [#1987](https://github.com/influxdb/influxdb/pull/1987): Fix config print startup statement for when no config is provided. +- [#1990](https://github.com/influxdb/influxdb/pull/1990): Drop measurement was taking too long due to transactions. + +## v0.9.0-rc12 [2015-03-15] + +### Bugfixes +- [#1942](https://github.com/influxdb/influxdb/pull/1942): Sort wildcard names. +- [#1957](https://github.com/influxdb/influxdb/pull/1957): Graphite numbers are always float64. +- [#1955](https://github.com/influxdb/influxdb/pull/1955): Prohibit creation of databases with no name. Thanks @dullgiulio +- [#1952](https://github.com/influxdb/influxdb/pull/1952): Handle delete statement with an error. Thanks again to @dullgiulio + +### Features +- [#1935](https://github.com/influxdb/influxdb/pull/1935): Implement stateless broker for Raft. +- [#1936](https://github.com/influxdb/influxdb/pull/1936): Implement "SHOW STATS" and self-monitoring + +### Features +- [#1909](https://github.com/influxdb/influxdb/pull/1909): Implement a dump command. + +## v0.9.0-rc11 [2015-03-13] + +### Bugfixes +- [#1917](https://github.com/influxdb/influxdb/pull/1902): Creating Infinite Retention Policy Failed. +- [#1758](https://github.com/influxdb/influxdb/pull/1758): Add Graphite Integration Test. +- [#1929](https://github.com/influxdb/influxdb/pull/1929): Default Retention Policy incorrectly auto created. +- [#1930](https://github.com/influxdb/influxdb/pull/1930): Auto create database for graphite if not specified. +- [#1908](https://github.com/influxdb/influxdb/pull/1908): Cosmetic CLI output fixes. +- [#1931](https://github.com/influxdb/influxdb/pull/1931): Add default column to SHOW RETENTION POLICIES. +- [#1937](https://github.com/influxdb/influxdb/pull/1937): OFFSET should be allowed to be 0. + +### Features +- [#1902](https://github.com/influxdb/influxdb/pull/1902): Enforce retention policies to have a minimum duration. +- [#1906](https://github.com/influxdb/influxdb/pull/1906): Add show servers to query language. +- [#1925](https://github.com/influxdb/influxdb/pull/1925): Add `fill(none)`, `fill(previous)`, and `fill()` to queries. + +## v0.9.0-rc10 [2015-03-09] + +### Bugfixes +- [#1867](https://github.com/influxdb/influxdb/pull/1867): Fix race accessing topic replicas map +- [#1864](https://github.com/influxdb/influxdb/pull/1864): fix race in startStateLoop +- [#1753](https://github.com/influxdb/influxdb/pull/1874): Do Not Panic on Missing Dirs +- [#1877](https://github.com/influxdb/influxdb/pull/1877): Broker clients track broker leader +- [#1862](https://github.com/influxdb/influxdb/pull/1862): Fix memory leak in `httpd.serveWait`. Thanks @mountkin +- [#1883](https://github.com/influxdb/influxdb/pull/1883): RLock server during retention policy enforcement. Thanks @grisha +- [#1868](https://github.com/influxdb/influxdb/pull/1868): Use `BatchPoints` for `client.Write` method. Thanks @vladlopes, @georgmu, @d2g, @evanphx, @akolosov. +- [#1881](https://github.com/influxdb/influxdb/pull/1881): Update documentation for `client` package. Misc library tweaks. +- Fix queries with multiple where clauses on tags, times and fields. Fix queries that have where clauses on fields not in the select + +### Features +- [#1875](https://github.com/influxdb/influxdb/pull/1875): Support trace logging of Raft. +- [#1895](https://github.com/influxdb/influxdb/pull/1895): Auto-create a retention policy when a database is created. +- [#1897](https://github.com/influxdb/influxdb/pull/1897): Pre-create shard groups. +- [#1900](https://github.com/influxdb/influxdb/pull/1900): Change `LIMIT` to `SLIMIT` and implement `LIMIT` and `OFFSET` + +## v0.9.0-rc9 [2015-03-06] + +### Bugfixes +- [#1872](https://github.com/influxdb/influxdb/pull/1872): Fix "stale term" errors with raft + +## v0.9.0-rc8 [2015-03-05] + +### Bugfixes +- [#1836](https://github.com/influxdb/influxdb/pull/1836): Store each parsed shell command in history file. +- [#1789](https://github.com/influxdb/influxdb/pull/1789): add --config-files option to fpm command. Thanks @kylezh +- [#1859](https://github.com/influxdb/influxdb/pull/1859): Queries with a `GROUP BY *` clause were returning a 500 if done against a measurement that didn't exist + +### Features +- [#1755](https://github.com/influxdb/influxdb/pull/1848): Support JSON data ingest over UDP +- [#1857](https://github.com/influxdb/influxdb/pull/1857): Support retention policies with infinite duration +- [#1858](https://github.com/influxdb/influxdb/pull/1858): Enable detailed tracing of write path + +## v0.9.0-rc7 [2015-03-02] + +### Features +- [#1813](https://github.com/influxdb/influxdb/pull/1813): Queries for missing measurements or fields now return a 200 with an error message in the series JSON. +- [#1826](https://github.com/influxdb/influxdb/pull/1826), [#1827](https://github.com/influxdb/influxdb/pull/1827): Fixed queries with `WHERE` clauses against fields. + +### Bugfixes + +- [#1744](https://github.com/influxdb/influxdb/pull/1744): Allow retention policies to be modified without specifying replication factor. Thanks @kylezh +- [#1809](https://github.com/influxdb/influxdb/pull/1809): Packaging post-install script unconditionally removes init.d symlink. Thanks @sineos + +## v0.9.0-rc6 [2015-02-27] + +### Bugfixes + +- [#1780](https://github.com/influxdb/influxdb/pull/1780): Malformed identifiers get through the parser +- [#1775](https://github.com/influxdb/influxdb/pull/1775): Panic "index out of range" on some queries +- [#1744](https://github.com/influxdb/influxdb/pull/1744): Select shard groups which completely encompass time range. Thanks @kylezh. + +## v0.9.0-rc5 [2015-02-27] + +### Bugfixes + +- [#1752](https://github.com/influxdb/influxdb/pull/1752): remove debug log output from collectd. +- [#1720](https://github.com/influxdb/influxdb/pull/1720): Parse Series IDs as unsigned 32-bits. +- [#1767](https://github.com/influxdb/influxdb/pull/1767): Drop Series was failing across shards. Issue #1761. +- [#1773](https://github.com/influxdb/influxdb/pull/1773): Fix bug when merging series together that have unequal number of points in a group by interval +- [#1771](https://github.com/influxdb/influxdb/pull/1771): Make `SHOW SERIES` return IDs and support `LIMIT` and `OFFSET` + +### Features + +- [#1698](https://github.com/influxdb/influxdb/pull/1698): Wire up DROP MEASUREMENT + +## v0.9.0-rc4 [2015-02-24] + +### Bugfixes + +- Fix authentication issue with continuous queries +- Print version in the log on startup + +## v0.9.0-rc3 [2015-02-23] + +### Features + +- [#1659](https://github.com/influxdb/influxdb/pull/1659): WHERE against regexes: `WHERE =~ '.*asdf' +- [#1580](https://github.com/influxdb/influxdb/pull/1580): Add support for fields with bool, int, or string data types +- [#1687](https://github.com/influxdb/influxdb/pull/1687): Change `Rows` to `Series` in results output. BREAKING API CHANGE +- [#1629](https://github.com/influxdb/influxdb/pull/1629): Add support for `DROP SERIES` queries +- [#1632](https://github.com/influxdb/influxdb/pull/1632): Add support for `GROUP BY *` to return all series within a measurement +- [#1689](https://github.com/influxdb/influxdb/pull/1689): Change `SHOW TAG VALUES WITH KEY="foo"` to use the key name in the result. BREAKING API CHANGE +- [#1699](https://github.com/influxdb/influxdb/pull/1699): Add CPU and memory profiling options to daemon +- [#1672](https://github.com/influxdb/influxdb/pull/1672): Add index tracking to metastore. Makes downed node recovery actually work +- [#1591](https://github.com/influxdb/influxdb/pull/1591): Add `spread` aggregate function +- [#1576](https://github.com/influxdb/influxdb/pull/1576): Add `first` and `last` aggregate functions +- [#1573](https://github.com/influxdb/influxdb/pull/1573): Add `stddev` aggregate function +- [#1565](https://github.com/influxdb/influxdb/pull/1565): Add the admin interface back into the server and update for new API +- [#1562](https://github.com/influxdb/influxdb/pull/1562): Enforce retention policies +- [#1700](https://github.com/influxdb/influxdb/pull/1700): Change `Values` to `Fields` on writes. BREAKING API CHANGE +- [#1706](https://github.com/influxdb/influxdb/pull/1706): Add support for `LIMIT` and `OFFSET`, which work on the number of series returned in a query. To limit the number of data points use a `WHERE time` clause + +### Bugfixes + +- [#1636](https://github.com/influxdb/influxdb/issues/1636): Don't store number of fields in raw data. THIS IS A BREAKING DATA CHANGE. YOU MUST START WITH A FRESH DATABASE +- [#1701](https://github.com/influxdb/influxdb/pull/1701), [#1667](https://github.com/influxdb/influxdb/pull/1667), [#1663](https://github.com/influxdb/influxdb/pull/1663), [#1615](https://github.com/influxdb/influxdb/pull/1615): Raft fixes +- [#1644](https://github.com/influxdb/influxdb/pull/1644): Add batching support for significantly improved write performance +- [#1704](https://github.com/influxdb/influxdb/pull/1704): Fix queries that pull back raw data (i.e. ones without aggregate functions) +- [#1718](https://github.com/influxdb/influxdb/pull/1718): Return an error on write if any of the points are don't have at least one field +- [#1806](https://github.com/influxdb/influxdb/pull/1806): Fix regex parsing. Change regex syntax to use / delimiters. + + +## v0.9.0-rc1,2 [no public release] + +### Features + +- Support for tags added +- New queries for showing measurement names, tag keys, and tag values +- Renamed shard spaces to retention policies +- Deprecated matching against regex in favor of explicit writing and querying on retention policies +- Pure Go InfluxQL parser +- Switch to BoltDB as underlying datastore +- BoltDB backed metastore to store schema information +- Updated HTTP API to only have two endpoints `/query` and `/write` +- Added all administrative functions to the query language +- Change cluster architecture to have brokers and data nodes +- Switch to streaming Raft implementation +- In memory inverted index of the tag data +- Pure Go implementation! + +## v0.8.6 [2014-11-15] + +### Features + +- [Issue #973](https://github.com/influxdb/influxdb/issues/973). Support + joining using a regex or list of time series +- [Issue #1068](https://github.com/influxdb/influxdb/issues/1068). Print + the processor chain when the query is started + +### Bugfixes + +- [Issue #584](https://github.com/influxdb/influxdb/issues/584). Don't + panic if the process died while initializing +- [Issue #663](https://github.com/influxdb/influxdb/issues/663). Make + sure all sub servies are closed when are stopping InfluxDB +- [Issue #671](https://github.com/influxdb/influxdb/issues/671). Fix + the Makefile package target for Mac OSX +- [Issue #800](https://github.com/influxdb/influxdb/issues/800). Use + su instead of sudo in the init script. This fixes the startup problem + on RHEL 6. +- [Issue #925](https://github.com/influxdb/influxdb/issues/925). Don't + generate invalid query strings for single point queries +- [Issue #943](https://github.com/influxdb/influxdb/issues/943). Don't + take two snapshots at the same time +- [Issue #947](https://github.com/influxdb/influxdb/issues/947). Exit + nicely if the daemon doesn't have permission to write to the log. +- [Issue #959](https://github.com/influxdb/influxdb/issues/959). Stop using + closed connections in the protobuf client. +- [Issue #978](https://github.com/influxdb/influxdb/issues/978). Check + for valgrind and mercurial in the configure script +- [Issue #996](https://github.com/influxdb/influxdb/issues/996). Fill should + fill the time range even if no points exists in the given time range +- [Issue #1008](https://github.com/influxdb/influxdb/issues/1008). Return + an appropriate exit status code depending on whether the process exits + due to an error or exits gracefully. +- [Issue #1024](https://github.com/influxdb/influxdb/issues/1024). Hitting + open files limit causes influxdb to create shards in loop. +- [Issue #1069](https://github.com/influxdb/influxdb/issues/1069). Fix + deprecated interface endpoint in Admin UI. +- [Issue #1076](https://github.com/influxdb/influxdb/issues/1076). Fix + the timestamps of data points written by the collectd plugin. (Thanks, + @renchap for reporting this bug) +- [Issue #1078](https://github.com/influxdb/influxdb/issues/1078). Make sure + we don't resurrect shard directories for shards that have already expired +- [Issue #1085](https://github.com/influxdb/influxdb/issues/1085). Set + the connection string of the local raft node +- [Issue #1092](https://github.com/influxdb/influxdb/issues/1093). Set + the connection string of the local node in the raft snapshot. +- [Issue #1100](https://github.com/influxdb/influxdb/issues/1100). Removing + a non-existent shard space causes the cluster to panic. +- [Issue #1113](https://github.com/influxdb/influxdb/issues/1113). A nil + engine.ProcessorChain causes a panic. + +## v0.8.5 [2014-10-27] + +### Features + +- [Issue #1055](https://github.com/influxdb/influxdb/issues/1055). Allow + graphite and collectd input plugins to have separate binding address + +### Bugfixes + +- [Issue #1058](https://github.com/influxdb/influxdb/issues/1058). Use + the query language instead of the continuous query endpoints that + were removed in 0.8.4 +- [Issue #1022](https://github.com/influxdb/influxdb/issues/1022). Return + an +Inf or NaN instead of panicing when we encounter a divide by zero +- [Issue #821](https://github.com/influxdb/influxdb/issues/821). Don't + scan through points when we hit the limit +- [Issue #1051](https://github.com/influxdb/influxdb/issues/1051). Fix + timestamps when the collectd is used and low resolution timestamps + is set. + +## v0.8.4 [2014-10-24] + +### Bugfixes + +- Remove the continuous query api endpoints since the query language + has all the features needed to list and delete continuous queries. +- [Issue #778](https://github.com/influxdb/influxdb/issues/778). Selecting + from a non-existent series should give a better error message indicating + that the series doesn't exist +- [Issue #988](https://github.com/influxdb/influxdb/issues/988). Check + the arguments of `top()` and `bottom()` +- [Issue #1021](https://github.com/influxdb/influxdb/issues/1021). Make + redirecting to standard output and standard error optional instead of + going to `/dev/null`. This can now be configured by setting `$STDOUT` + in `/etc/default/influxdb` +- [Issue #985](https://github.com/influxdb/influxdb/issues/985). Make + sure we drop a shard only when there's no one using it. Otherwise, the + shard can be closed when another goroutine is writing to it which will + cause random errors and possibly corruption of the database. + +### Features + +- [Issue #1047](https://github.com/influxdb/influxdb/issues/1047). Allow + merge() to take a list of series (as opposed to a regex in #72) + +## v0.8.4-rc.1 [2014-10-21] + +### Bugfixes + +- [Issue #1040](https://github.com/influxdb/influxdb/issues/1040). Revert + to older raft snapshot if the latest one is corrupted +- [Issue #1004](https://github.com/influxdb/influxdb/issues/1004). Querying + for data outside of existing shards returns an empty response instead of + throwing a `Couldn't lookup columns` error +- [Issue #1020](https://github.com/influxdb/influxdb/issues/1020). Change + init script exit codes to conform to the lsb standards. (Thanks, @spuder) +- [Issue #1011](https://github.com/influxdb/influxdb/issues/1011). Fix + the tarball for homebrew so that rocksdb is included and the directory + structure is clean +- [Issue #1007](https://github.com/influxdb/influxdb/issues/1007). Fix + the content type when an error occurs and the client requests + compression. +- [Issue #916](https://github.com/influxdb/influxdb/issues/916). Set + the ulimit in the init script with a way to override the limit +- [Issue #742](https://github.com/influxdb/influxdb/issues/742). Fix + rocksdb for Mac OSX +- [Issue #387](https://github.com/influxdb/influxdb/issues/387). Aggregations + with group by time(1w), time(1m) and time(1y) (for week, month and + year respectively) will cause the start time and end time of the bucket + to fall on the logical boundaries of the week, month or year. +- [Issue #334](https://github.com/influxdb/influxdb/issues/334). Derivative + for queries with group by time() and fill(), will take the difference + between the first value in the bucket and the first value of the next + bucket. +- [Issue #972](https://github.com/influxdb/influxdb/issues/972). Don't + assign duplicate server ids + +### Features + +- [Issue #722](https://github.com/influxdb/influxdb/issues/722). Add + an install target to the Makefile +- [Issue #1032](https://github.com/influxdb/influxdb/issues/1032). Include + the admin ui static assets in the binary +- [Issue #1019](https://github.com/influxdb/influxdb/issues/1019). Upgrade + to rocksdb 3.5.1 +- [Issue #992](https://github.com/influxdb/influxdb/issues/992). Add + an input plugin for collectd. (Thanks, @kimor79) +- [Issue #72](https://github.com/influxdb/influxdb/issues/72). Support merge + for multiple series using regex syntax + +## v0.8.3 [2014-09-24] + +### Bugfixes + +- [Issue #885](https://github.com/influxdb/influxdb/issues/885). Multiple + queries separated by semicolons work as expected. Queries are process + sequentially +- [Issue #652](https://github.com/influxdb/influxdb/issues/652). Return an + error if an invalid column is used in the where clause +- [Issue #794](https://github.com/influxdb/influxdb/issues/794). Fix case + insensitive regex matching +- [Issue #853](https://github.com/influxdb/influxdb/issues/853). Move + cluster config from raft to API. +- [Issue #714](https://github.com/influxdb/influxdb/issues/714). Don't + panic on invalid boolean operators. +- [Issue #843](https://github.com/influxdb/influxdb/issues/843). Prevent blank database names +- [Issue #780](https://github.com/influxdb/influxdb/issues/780). Fix + fill() for all aggregators +- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose + table names in double quotes in the result of GetQueryString() +- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose + table names in double quotes in the result of GetQueryString() +- [Issue #967](https://github.com/influxdb/influxdb/issues/967). Return an + error if the storage engine can't be created +- [Issue #954](https://github.com/influxdb/influxdb/issues/954). Don't automatically + create shards which was causing too many shards to be created when used with + grafana +- [Issue #939](https://github.com/influxdb/influxdb/issues/939). Aggregation should + ignore null values and invalid values, e.g. strings with mean(). +- [Issue #964](https://github.com/influxdb/influxdb/issues/964). Parse + big int in queries properly. + +## v0.8.2 [2014-09-05] + +### Bugfixes + +- [Issue #886](https://github.com/influxdb/influxdb/issues/886). Update shard space to not set defaults + +- [Issue #867](https://github.com/influxdb/influxdb/issues/867). Add option to return shard space mappings in list series + +### Bugfixes + +- [Issue #652](https://github.com/influxdb/influxdb/issues/652). Return + a meaningful error if an invalid column is used in where clause + after joining multiple series + +## v0.8.2 [2014-09-08] + +### Features + +- Added API endpoint to update shard space definitions + +### Bugfixes + +- [Issue #886](https://github.com/influxdb/influxdb/issues/886). Shard space regexes reset after restart of InfluxDB + +## v0.8.1 [2014-09-03] + +- [Issue #896](https://github.com/influxdb/influxdb/issues/896). Allow logging to syslog. Thanks @malthe + +### Bugfixes + +- [Issue #868](https://github.com/influxdb/influxdb/issues/868). Don't panic when upgrading a snapshot from 0.7.x +- [Issue #887](https://github.com/influxdb/influxdb/issues/887). The first continuous query shouldn't trigger backfill if it had backfill disabled +- [Issue #674](https://github.com/influxdb/influxdb/issues/674). Graceful exit when config file is invalid. (Thanks, @DavidBord) +- [Issue #857](https://github.com/influxdb/influxdb/issues/857). More informative list servers api. (Thanks, @oliveagle) + +## v0.8.0 [2014-08-22] + +### Features + +- [Issue #850](https://github.com/influxdb/influxdb/issues/850). Makes the server listing more informative + +### Bugfixes + +- [Issue #779](https://github.com/influxdb/influxdb/issues/779). Deleting expired shards isn't thread safe. +- [Issue #860](https://github.com/influxdb/influxdb/issues/860). Load database config should validate shard spaces. +- [Issue #862](https://github.com/influxdb/influxdb/issues/862). Data migrator should have option to set delay time. + +## v0.8.0-rc.5 [2014-08-15] + +### Features + +- [Issue #376](https://github.com/influxdb/influxdb/issues/376). List series should support regex filtering +- [Issue #745](https://github.com/influxdb/influxdb/issues/745). Add continuous queries to the database config +- [Issue #746](https://github.com/influxdb/influxdb/issues/746). Add data migration tool for 0.8.0 + +### Bugfixes + +- [Issue #426](https://github.com/influxdb/influxdb/issues/426). Fill should fill the entire time range that is requested +- [Issue #740](https://github.com/influxdb/influxdb/issues/740). Don't emit non existent fields when joining series with different fields +- [Issue #744](https://github.com/influxdb/influxdb/issues/744). Admin site should have all assets locally +- [Issue #767](https://github.com/influxdb/influxdb/issues/768). Remove shards whenever they expire +- [Issue #781](https://github.com/influxdb/influxdb/issues/781). Don't emit non existent fields when joining series with different fields +- [Issue #791](https://github.com/influxdb/influxdb/issues/791). Move database config loader to be an API endpoint +- [Issue #809](https://github.com/influxdb/influxdb/issues/809). Migration path from 0.7 -> 0.8 +- [Issue #811](https://github.com/influxdb/influxdb/issues/811). Gogoprotobuf removed `ErrWrongType`, which is depended on by Raft +- [Issue #820](https://github.com/influxdb/influxdb/issues/820). Query non-local shard with time range to avoid getting back points not in time range +- [Issue #827](https://github.com/influxdb/influxdb/issues/827). Don't leak file descriptors in the WAL +- [Issue #830](https://github.com/influxdb/influxdb/issues/830). List series should return series in lexicographic sorted order +- [Issue #831](https://github.com/influxdb/influxdb/issues/831). Move create shard space to be db specific + +## v0.8.0-rc.4 [2014-07-29] + +### Bugfixes + +- [Issue #774](https://github.com/influxdb/influxdb/issues/774). Don't try to parse "inf" shard retention policy +- [Issue #769](https://github.com/influxdb/influxdb/issues/769). Use retention duration when determining expired shards. (Thanks, @shugo) +- [Issue #736](https://github.com/influxdb/influxdb/issues/736). Only db admins should be able to drop a series +- [Issue #713](https://github.com/influxdb/influxdb/issues/713). Null should be a valid fill value +- [Issue #644](https://github.com/influxdb/influxdb/issues/644). Graphite api should write data in batches to the coordinator +- [Issue #740](https://github.com/influxdb/influxdb/issues/740). Panic when distinct fields are selected from an inner join +- [Issue #781](https://github.com/influxdb/influxdb/issues/781). Panic when distinct fields are added after an inner join + +## v0.8.0-rc.3 [2014-07-21] + +### Bugfixes + +- [Issue #752](https://github.com/influxdb/influxdb/issues/752). `./configure` should use goroot to find gofmt +- [Issue #758](https://github.com/influxdb/influxdb/issues/758). Clarify the reason behind graphite input plugin not starting. (Thanks, @otoolep) +- [Issue #759](https://github.com/influxdb/influxdb/issues/759). Don't revert the regex in the shard space. (Thanks, @shugo) +- [Issue #760](https://github.com/influxdb/influxdb/issues/760). Removing a server should remove it from the shard server ids. (Thanks, @shugo) +- [Issue #772](https://github.com/influxdb/influxdb/issues/772). Add sentinel values to all db. This caused the last key in the db to not be fetched properly. + + +## v0.8.0-rc.2 [2014-07-15] + +- This release is to fix a build error in rc1 which caused rocksdb to not be available +- Bump up the `max-open-files` option to 1000 on all storage engines +- Lower the `write-buffer-size` to 1000 + +## v0.8.0-rc.1 [2014-07-15] + +### Features + +- [Issue #643](https://github.com/influxdb/influxdb/issues/643). Support pretty print json. (Thanks, @otoolep) +- [Issue #641](https://github.com/influxdb/influxdb/issues/641). Support multiple storage engines +- [Issue #665](https://github.com/influxdb/influxdb/issues/665). Make build tmp directory configurable in the make file. (Thanks, @dgnorton) +- [Issue #667](https://github.com/influxdb/influxdb/issues/667). Enable compression on all GET requests and when writing data +- [Issue #648](https://github.com/influxdb/influxdb/issues/648). Return permissions when listing db users. (Thanks, @nicolai86) +- [Issue #682](https://github.com/influxdb/influxdb/issues/682). Allow continuous queries to run without backfill (Thanks, @dhammika) +- [Issue #689](https://github.com/influxdb/influxdb/issues/689). **REQUIRES DATA MIGRATION** Move metadata into raft +- [Issue #255](https://github.com/influxdb/influxdb/issues/255). Support millisecond precision using `ms` suffix +- [Issue #95](https://github.com/influxdb/influxdb/issues/95). Drop database should not be synchronous +- [Issue #571](https://github.com/influxdb/influxdb/issues/571). Add support for arbitrary number of shard spaces and retention policies +- Default storage engine changed to RocksDB + +### Bugfixes + +- [Issue #651](https://github.com/influxdb/influxdb/issues/651). Change permissions of symlink which fix some installation issues. (Thanks, @Dieterbe) +- [Issue #670](https://github.com/influxdb/influxdb/issues/670). Don't warn on missing influxdb user on fresh installs +- [Issue #676](https://github.com/influxdb/influxdb/issues/676). Allow storing high precision integer values without losing any information +- [Issue #695](https://github.com/influxdb/influxdb/issues/695). Prevent having duplicate field names in the write payload. (Thanks, @seunglee150) +- [Issue #731](https://github.com/influxdb/influxdb/issues/731). Don't enable the udp plugin if the `enabled` option is set to false +- [Issue #733](https://github.com/influxdb/influxdb/issues/733). Print an `INFO` message when the input plugin is disabled +- [Issue #707](https://github.com/influxdb/influxdb/issues/707). Graphite input plugin should work payload delimited by any whitespace character +- [Issue #734](https://github.com/influxdb/influxdb/issues/734). Don't buffer non replicated writes +- [Issue #465](https://github.com/influxdb/influxdb/issues/465). Recreating a currently deleting db or series doesn't bring back the old data anymore +- [Issue #358](https://github.com/influxdb/influxdb/issues/358). **BREAKING** List series should return as a single series +- [Issue #499](https://github.com/influxdb/influxdb/issues/499). **BREAKING** Querying non-existent database or series will return an error +- [Issue #570](https://github.com/influxdb/influxdb/issues/570). InfluxDB crashes during delete/drop of database +- [Issue #592](https://github.com/influxdb/influxdb/issues/592). Drop series is inefficient + +## v0.7.3 [2014-06-13] + +### Bugfixes + +- [Issue #637](https://github.com/influxdb/influxdb/issues/637). Truncate log files if the last request wasn't written properly +- [Issue #646](https://github.com/influxdb/influxdb/issues/646). CRITICAL: Duplicate shard ids for new shards if old shards are deleted. + +## v0.7.2 [2014-05-30] + +### Features + +- [Issue #521](https://github.com/influxdb/influxdb/issues/521). MODE works on all datatypes (Thanks, @richthegeek) + +### Bugfixes + +- [Issue #418](https://github.com/influxdb/influxdb/pull/418). Requests or responses larger than MAX_REQUEST_SIZE break things. +- [Issue #606](https://github.com/influxdb/influxdb/issues/606). InfluxDB will fail to start with invalid permission if log.txt didn't exist +- [Issue #602](https://github.com/influxdb/influxdb/issues/602). Merge will fail to work across shards + +### Features + +## v0.7.1 [2014-05-29] + +### Bugfixes + +- [Issue #579](https://github.com/influxdb/influxdb/issues/579). Reject writes to nonexistent databases +- [Issue #597](https://github.com/influxdb/influxdb/issues/597). Force compaction after deleting data + +### Features + +- [Issue #476](https://github.com/influxdb/influxdb/issues/476). Support ARM architecture +- [Issue #578](https://github.com/influxdb/influxdb/issues/578). Support aliasing for expressions in parenthesis +- [Issue #544](https://github.com/influxdb/influxdb/pull/544). Support forcing node removal from a cluster +- [Issue #591](https://github.com/influxdb/influxdb/pull/591). Support multiple udp input plugins (Thanks, @tpitale) +- [Issue #600](https://github.com/influxdb/influxdb/pull/600). Report version, os, arch, and raftName once per day. + +## v0.7.0 [2014-05-23] + +### Bugfixes + +- [Issue #557](https://github.com/influxdb/influxdb/issues/557). Group by time(1y) doesn't work while time(365d) works +- [Issue #547](https://github.com/influxdb/influxdb/issues/547). Add difference function (Thanks, @mboelstra) +- [Issue #550](https://github.com/influxdb/influxdb/issues/550). Fix tests on 32-bit ARM +- [Issue #524](https://github.com/influxdb/influxdb/issues/524). Arithmetic operators and where conditions don't play nice together +- [Issue #561](https://github.com/influxdb/influxdb/issues/561). Fix missing query in parsing errors +- [Issue #563](https://github.com/influxdb/influxdb/issues/563). Add sample config for graphite over udp +- [Issue #537](https://github.com/influxdb/influxdb/issues/537). Incorrect query syntax causes internal error +- [Issue #565](https://github.com/influxdb/influxdb/issues/565). Empty series names shouldn't cause a panic +- [Issue #575](https://github.com/influxdb/influxdb/issues/575). Single point select doesn't interpret timestamps correctly +- [Issue #576](https://github.com/influxdb/influxdb/issues/576). We shouldn't set timestamps and sequence numbers when listing cq +- [Issue #560](https://github.com/influxdb/influxdb/issues/560). Use /dev/urandom instead of /dev/random +- [Issue #502](https://github.com/influxdb/influxdb/issues/502). Fix a + race condition in assigning id to db+series+field (Thanks @ohurvitz + for reporting this bug and providing a script to repro) + +### Features + +- [Issue #567](https://github.com/influxdb/influxdb/issues/567). Allow selecting from multiple series names by separating them with commas (Thanks, @peekeri) + +### Deprecated + +- [Issue #460](https://github.com/influxdb/influxdb/issues/460). Don't start automatically after installing +- [Issue #529](https://github.com/influxdb/influxdb/issues/529). Don't run influxdb as root +- [Issue #443](https://github.com/influxdb/influxdb/issues/443). Use `name` instead of `username` when returning cluster admins + +## v0.6.5 [2014-05-19] + +### Features + +- [Issue #551](https://github.com/influxdb/influxdb/issues/551). Add TOP and BOTTOM aggregate functions (Thanks, @chobie) + +### Bugfixes + +- [Issue #555](https://github.com/influxdb/influxdb/issues/555). Fix a regression introduced in the raft snapshot format + +## v0.6.4 [2014-05-16] + +### Features + +- Make the write batch size configurable (also applies to deletes) +- Optimize writing to multiple series +- [Issue #546](https://github.com/influxdb/influxdb/issues/546). Add UDP support for Graphite API (Thanks, @peekeri) + +### Bugfixes + +- Fix a bug in shard logic that caused short term shards to be clobbered with long term shards +- [Issue #489](https://github.com/influxdb/influxdb/issues/489). Remove replication factor from CreateDatabase command + +## v0.6.3 [2014-05-13] + +### Features + +- [Issue #505](https://github.com/influxdb/influxdb/issues/505). Return a version header with http the response (Thanks, @majst01) +- [Issue #520](https://github.com/influxdb/influxdb/issues/520). Print the version to the log file + +### Bugfixes + +- [Issue #516](https://github.com/influxdb/influxdb/issues/516). Close WAL log/index files when they aren't being used +- [Issue #532](https://github.com/influxdb/influxdb/issues/532). Don't log graphite connection EOF as an error +- [Issue #535](https://github.com/influxdb/influxdb/issues/535). WAL Replay hangs if response isn't received +- [Issue #538](https://github.com/influxdb/influxdb/issues/538). Don't panic if the same series existed twice in the request with different columns +- [Issue #536](https://github.com/influxdb/influxdb/issues/536). Joining the cluster after shards are creating shouldn't cause new nodes to panic +- [Issue #539](https://github.com/influxdb/influxdb/issues/539). count(distinct()) with fill shouldn't panic on empty groups +- [Issue #534](https://github.com/influxdb/influxdb/issues/534). Create a new series when interpolating + +## v0.6.2 [2014-05-09] + +### Bugfixes + +- [Issue #511](https://github.com/influxdb/influxdb/issues/511). Don't automatically create the database when a db user is created +- [Issue #512](https://github.com/influxdb/influxdb/issues/512). Group by should respect null values +- [Issue #518](https://github.com/influxdb/influxdb/issues/518). Filter Infinities and NaNs from the returned json +- [Issue #522](https://github.com/influxdb/influxdb/issues/522). Committing requests while replaying caused the WAL to skip some log files +- [Issue #369](https://github.com/influxdb/influxdb/issues/369). Fix some edge cases with WAL recovery + +## v0.6.1 [2014-05-06] + +### Bugfixes + +- [Issue #500](https://github.com/influxdb/influxdb/issues/500). Support `y` suffix in time durations +- [Issue #501](https://github.com/influxdb/influxdb/issues/501). Writes with invalid payload should be rejected +- [Issue #507](https://github.com/influxdb/influxdb/issues/507). New cluster admin passwords don't propagate properly to other nodes in a cluster +- [Issue #508](https://github.com/influxdb/influxdb/issues/508). Don't replay WAL entries for servers with no shards +- [Issue #464](https://github.com/influxdb/influxdb/issues/464). Admin UI shouldn't draw graphs for string columns +- [Issue #480](https://github.com/influxdb/influxdb/issues/480). Large values on the y-axis get cut off + +## v0.6.0 [2014-05-02] + +### Feature + +- [Issue #477](https://github.com/influxdb/influxdb/issues/477). Add a udp json interface (Thanks, Julien Ammous) +- [Issue #491](https://github.com/influxdb/influxdb/issues/491). Make initial root password settable through env variable (Thanks, Edward Muller) + +### Bugfixes + +- [Issue #469](https://github.com/influxdb/influxdb/issues/469). Drop continuous queries when a database is dropped +- [Issue #431](https://github.com/influxdb/influxdb/issues/431). Don't log to standard output if a log file is specified in the config file +- [Issue #483](https://github.com/influxdb/influxdb/issues/483). Return 409 if a database already exist (Thanks, Edward Muller) +- [Issue #486](https://github.com/influxdb/influxdb/issues/486). Columns used in the target of continuous query shouldn't be inserted in the time series +- [Issue #490](https://github.com/influxdb/influxdb/issues/490). Database user password's cannot be changed (Thanks, Edward Muller) +- [Issue #495](https://github.com/influxdb/influxdb/issues/495). Enforce write permissions properly + +## v0.5.12 [2014-04-29] + +### Bugfixes + +- [Issue #419](https://github.com/influxdb/influxdb/issues/419),[Issue #478](https://github.com/influxdb/influxdb/issues/478). Allow hostname, raft and protobuf ports to be changed, without requiring manual intervention from the user + +## v0.5.11 [2014-04-25] + +### Features + +- [Issue #471](https://github.com/influxdb/influxdb/issues/471). Read and write permissions should be settable through the http api + +### Bugfixes + +- [Issue #323](https://github.com/influxdb/influxdb/issues/323). Continuous queries should guard against data loops +- [Issue #473](https://github.com/influxdb/influxdb/issues/473). Engine memory optimization + +## v0.5.10 [2014-04-22] + +### Features + +- [Issue #463](https://github.com/influxdb/influxdb/issues/463). Allow series names to use any character (escape by wrapping in double quotes) +- [Issue #447](https://github.com/influxdb/influxdb/issues/447). Allow @ in usernames +- [Issue #466](https://github.com/influxdb/influxdb/issues/466). Allow column names to use any character (escape by wrapping in double quotes) + +### Bugfixes + +- [Issue #458](https://github.com/influxdb/influxdb/issues/458). Continuous queries with group by time() and a column should insert sequence numbers of 1 +- [Issue #457](https://github.com/influxdb/influxdb/issues/457). Deleting series that start with capital letters should work + +## v0.5.9 [2014-04-18] + +### Bugfixes + +- [Issue #446](https://github.com/influxdb/influxdb/issues/446). Check for (de)serialization errors +- [Issue #456](https://github.com/influxdb/influxdb/issues/456). Continuous queries failed if one of the group by columns had null value +- [Issue #455](https://github.com/influxdb/influxdb/issues/455). Comparison operators should ignore null values + +## v0.5.8 [2014-04-17] + +- Renamed config.toml.sample to config.sample.toml + +### Bugfixes + +- [Issue #244](https://github.com/influxdb/influxdb/issues/244). Reconstruct the query from the ast +- [Issue #449](https://github.com/influxdb/influxdb/issues/449). Heartbeat timeouts can cause reading from connection to lock up +- [Issue #451](https://github.com/influxdb/influxdb/issues/451). Reduce the aggregation state that is kept in memory so that + aggregation queries over large periods of time don't take insance amount of memory + +## v0.5.7 [2014-04-15] + +### Features + +- Queries are now logged as INFO in the log file before they run + +### Bugfixes + +- [Issue #328](https://github.com/influxdb/influxdb/issues/328). Join queries with math expressions don't work +- [Issue #440](https://github.com/influxdb/influxdb/issues/440). Heartbeat timeouts in logs +- [Issue #442](https://github.com/influxdb/influxdb/issues/442). shouldQuerySequentially didn't work as expected + causing count(*) queries on large time series to use + lots of memory +- [Issue #437](https://github.com/influxdb/influxdb/issues/437). Queries with negative constants don't parse properly +- [Issue #432](https://github.com/influxdb/influxdb/issues/432). Deleted data using a delete query is resurrected after a server restart +- [Issue #439](https://github.com/influxdb/influxdb/issues/439). Report the right location of the error in the query +- Fix some bugs with the WAL recovery on startup + +## v0.5.6 [2014-04-08] + +### Features + +- [Issue #310](https://github.com/influxdb/influxdb/issues/310). Request should support multiple timeseries +- [Issue #416](https://github.com/influxdb/influxdb/issues/416). Improve the time it takes to drop database + +### Bugfixes + +- [Issue #413](https://github.com/influxdb/influxdb/issues/413). Don't assume that group by interval is greater than a second +- [Issue #415](https://github.com/influxdb/influxdb/issues/415). Include the database when sending an auth error back to the user +- [Issue #421](https://github.com/influxdb/influxdb/issues/421). Make read timeout a config option +- [Issue #392](https://github.com/influxdb/influxdb/issues/392). Different columns in different shards returns invalid results when a query spans those shards + +### Bugfixes + +## v0.5.5 [2014-04-04] + +- Upgrade leveldb 1.10 -> 1.15 + + This should be a backward compatible change, but is here for documentation only + +### Feature + +- Add a command line option to repair corrupted leveldb databases on startup +- [Issue #401](https://github.com/influxdb/influxdb/issues/401). No limit on the number of columns in the group by clause + +### Bugfixes + +- [Issue #398](https://github.com/influxdb/influxdb/issues/398). Support now() and NOW() in the query lang +- [Issue #403](https://github.com/influxdb/influxdb/issues/403). Filtering should work with join queries +- [Issue #404](https://github.com/influxdb/influxdb/issues/404). Filtering with invalid condition shouldn't crash the server +- [Issue #405](https://github.com/influxdb/influxdb/issues/405). Percentile shouldn't crash for small number of values +- [Issue #408](https://github.com/influxdb/influxdb/issues/408). Make InfluxDB recover from internal bugs and panics +- [Issue #390](https://github.com/influxdb/influxdb/issues/390). Multiple response.WriteHeader when querying as admin +- [Issue #407](https://github.com/influxdb/influxdb/issues/407). Start processing continuous queries only after the WAL is initialized +- Close leveldb databases properly if we couldn't create a new Shard. See leveldb\_shard\_datastore\_test:131 + +## v0.5.4 [2014-04-02] + +### Bugfixes + +- [Issue #386](https://github.com/influxdb/influxdb/issues/386). Drop series should work with series containing dots +- [Issue #389](https://github.com/influxdb/influxdb/issues/389). Filtering shouldn't stop prematurely +- [Issue #341](https://github.com/influxdb/influxdb/issues/341). Make the number of shards that are queried in parallel configurable +- [Issue #394](https://github.com/influxdb/influxdb/issues/394). Support count(distinct) and count(DISTINCT) +- [Issue #362](https://github.com/influxdb/influxdb/issues/362). Limit should be enforced after aggregation + +## v0.5.3 [2014-03-31] + +### Bugfixes + +- [Issue #378](https://github.com/influxdb/influxdb/issues/378). Indexing should return if there are no requests added since the last index +- [Issue #370](https://github.com/influxdb/influxdb/issues/370). Filtering and limit should be enforced on the shards +- [Issue #379](https://github.com/influxdb/influxdb/issues/379). Boolean columns should be usable in where clauses +- [Issue #381](https://github.com/influxdb/influxdb/issues/381). Should be able to do deletes as a cluster admin + +## v0.5.2 [2014-03-28] + +### Bugfixes + +- [Issue #342](https://github.com/influxdb/influxdb/issues/342). Data resurrected after a server restart +- [Issue #367](https://github.com/influxdb/influxdb/issues/367). Influxdb won't start if the api port is commented out +- [Issue #355](https://github.com/influxdb/influxdb/issues/355). Return an error on wrong time strings +- [Issue #331](https://github.com/influxdb/influxdb/issues/331). Allow negative time values in the where clause +- [Issue #371](https://github.com/influxdb/influxdb/issues/371). Seris index isn't deleted when the series is dropped +- [Issue #360](https://github.com/influxdb/influxdb/issues/360). Store and recover continuous queries + +## v0.5.1 [2014-03-24] + +### Bugfixes + +- Revert the version of goraft due to a bug found in the latest version + +## v0.5.0 [2014-03-24] + +### Features + +- [Issue #293](https://github.com/influxdb/influxdb/pull/293). Implement a Graphite listener + +### Bugfixes + +- [Issue #340](https://github.com/influxdb/influxdb/issues/340). Writing many requests while replaying seems to cause commits out of order + +## v0.5.0-rc.6 [2014-03-20] + +### Bugfixes + +- Increase raft election timeout to avoid unecessary relections +- Sort points before writing them to avoid an explosion in the request + number when the points are written randomly +- [Issue #335](https://github.com/influxdb/influxdb/issues/335). Fixes regexp for interpolating more than one column value in continuous queries +- [Issue #318](https://github.com/influxdb/influxdb/pull/318). Support EXPLAIN queries +- [Issue #333](https://github.com/influxdb/influxdb/pull/333). Fail + when the password is too short or too long instead of passing it to + the crypto library + +## v0.5.0-rc.5 [2014-03-11] + +### Bugfixes + +- [Issue #312](https://github.com/influxdb/influxdb/issues/312). WAL should wait for server id to be set before recovering +- [Issue #301](https://github.com/influxdb/influxdb/issues/301). Use ref counting to guard against race conditions in the shard cache +- [Issue #319](https://github.com/influxdb/influxdb/issues/319). Propagate engine creation error correctly to the user +- [Issue #316](https://github.com/influxdb/influxdb/issues/316). Make + sure we don't starve goroutines if we get an access denied error + from one of the shards +- [Issue #306](https://github.com/influxdb/influxdb/issues/306). Deleting/Dropping database takes a lot of memory +- [Issue #302](https://github.com/influxdb/influxdb/issues/302). Should be able to set negative timestamps on points +- [Issue #327](https://github.com/influxdb/influxdb/issues/327). Make delete queries not use WAL. This addresses #315, #317 and #314 +- [Issue #321](https://github.com/influxdb/influxdb/issues/321). Make sure we split points on shards properly + +## v0.5.0-rc.4 [2014-03-07] + +### Bugfixes + +- [Issue #298](https://github.com/influxdb/influxdb/issues/298). Fix limit when querying multiple shards +- [Issue #305](https://github.com/influxdb/influxdb/issues/305). Shard ids not unique after restart +- [Issue #309](https://github.com/influxdb/influxdb/issues/309). Don't relog the requests on the remote server +- Fix few bugs in the WAL and refactor the way it works (this requires purging the WAL from previous rc) + +## v0.5.0-rc.3 [2014-03-03] + +### Bugfixes +- [Issue #69](https://github.com/influxdb/influxdb/issues/69). Support column aliases +- [Issue #287](https://github.com/influxdb/influxdb/issues/287). Make the lru cache size configurable +- [Issue #38](https://github.com/influxdb/influxdb/issues/38). Fix a memory leak discussed in this story +- [Issue #286](https://github.com/influxdb/influxdb/issues/286). Make the number of open shards configurable +- Make LevelDB use the max open files configuration option. + +## v0.5.0-rc.2 [2014-02-27] + +### Bugfixes + +- [Issue #274](https://github.com/influxdb/influxdb/issues/274). Crash after restart +- [Issue #277](https://github.com/influxdb/influxdb/issues/277). Ensure duplicate shards won't be created +- [Issue #279](https://github.com/influxdb/influxdb/issues/279). Limits not working on regex queries +- [Issue #281](https://github.com/influxdb/influxdb/issues/281). `./influxdb -v` should print the sha when building from source +- [Issue #283](https://github.com/influxdb/influxdb/issues/283). Dropping shard and restart in cluster causes panic. +- [Issue #288](https://github.com/influxdb/influxdb/issues/288). Sequence numbers should be unique per server id + +## v0.5.0-rc.1 [2014-02-25] + +### Bugfixes + +- Ensure large deletes don't take too much memory +- [Issue #240](https://github.com/influxdb/influxdb/pull/240). Unable to query against columns with `.` in the name. +- [Issue #250](https://github.com/influxdb/influxdb/pull/250). different result between normal and continuous query with "group by" clause +- [Issue #216](https://github.com/influxdb/influxdb/pull/216). Results with no points should exclude columns and points + +### Features + +- [Issue #243](https://github.com/influxdb/influxdb/issues/243). Should have endpoint to GET a user's attributes. +- [Issue #269](https://github.com/influxdb/influxdb/pull/269), [Issue #65](https://github.com/influxdb/influxdb/issues/65) New clustering architecture (see docs), with the side effect that queries can be distributed between multiple shards +- [Issue #164](https://github.com/influxdb/influxdb/pull/269),[Issue #103](https://github.com/influxdb/influxdb/pull/269),[Issue #166](https://github.com/influxdb/influxdb/pull/269),[Issue #165](https://github.com/influxdb/influxdb/pull/269),[Issue #132](https://github.com/influxdb/influxdb/pull/269) Make request log a log file instead of leveldb with recovery on startup + +### Deprecated + +- [Issue #189](https://github.com/influxdb/influxdb/issues/189). `/cluster_admins` and `/db/:db/users` return usernames in a `name` key instead of `username` key. +- [Issue #216](https://github.com/influxdb/influxdb/pull/216). Results with no points should exclude columns and points + +## v0.4.4 [2014-02-05] + +### Features + +- Make the leveldb max open files configurable in the toml file + +## v0.4.3 [2014-01-31] + +### Bugfixes + +- [Issue #225](https://github.com/influxdb/influxdb/issues/225). Remove a hard limit on the points returned by the datastore +- [Issue #223](https://github.com/influxdb/influxdb/issues/223). Null values caused count(distinct()) to panic +- [Issue #224](https://github.com/influxdb/influxdb/issues/224). Null values broke replication due to protobuf limitation + +## v0.4.1 [2014-01-30] + +### Features + +- [Issue #193](https://github.com/influxdb/influxdb/issues/193). Allow logging to stdout. Thanks @schmurfy +- [Issue #190](https://github.com/influxdb/influxdb/pull/190). Add support for SSL. +- [Issue #194](https://github.com/influxdb/influxdb/pull/194). Should be able to disable Admin interface. + +### Bugfixes + +- [Issue #33](https://github.com/influxdb/influxdb/issues/33). Don't call WriteHeader more than once per request +- [Issue #195](https://github.com/influxdb/influxdb/issues/195). Allow the bind address to be configurable, Thanks @schmurfy. +- [Issue #199](https://github.com/influxdb/influxdb/issues/199). Make the test timeout configurable +- [Issue #200](https://github.com/influxdb/influxdb/issues/200). Selecting `time` or `sequence_number` silently fail +- [Issue #215](https://github.com/influxdb/influxdb/pull/215). Server fails to start up after Raft log compaction and restart. + +## v0.4.0 [2014-01-17] + +## Features + +- [Issue #86](https://github.com/influxdb/influxdb/issues/86). Support arithmetic expressions in select clause +- [Issue #92](https://github.com/influxdb/influxdb/issues/92). Change '==' to '=' and '!=' to '<>' +- [Issue #88](https://github.com/influxdb/influxdb/issues/88). Support datetime strings +- [Issue #64](https://github.com/influxdb/influxdb/issues/64). Shard writes and queries across cluster with replay for briefly downed nodes (< 24 hrs) +- [Issue #78](https://github.com/influxdb/influxdb/issues/78). Sequence numbers persist across restarts so they're not reused +- [Issue #102](https://github.com/influxdb/influxdb/issues/102). Support expressions in where condition +- [Issue #101](https://github.com/influxdb/influxdb/issues/101). Support expressions in aggregates +- [Issue #62](https://github.com/influxdb/influxdb/issues/62). Support updating and deleting column values +- [Issue #96](https://github.com/influxdb/influxdb/issues/96). Replicate deletes in a cluster +- [Issue #94](https://github.com/influxdb/influxdb/issues/94). delete queries +- [Issue #116](https://github.com/influxdb/influxdb/issues/116). Use proper logging +- [Issue #40](https://github.com/influxdb/influxdb/issues/40). Use TOML instead of JSON in the config file +- [Issue #99](https://github.com/influxdb/influxdb/issues/99). Support list series in the query language +- [Issue #149](https://github.com/influxdb/influxdb/issues/149). Cluster admins should be able to perform reads and writes. +- [Issue #108](https://github.com/influxdb/influxdb/issues/108). Querying one point using `time =` +- [Issue #114](https://github.com/influxdb/influxdb/issues/114). Servers should periodically check that they're consistent. +- [Issue #93](https://github.com/influxdb/influxdb/issues/93). Should be able to drop a time series +- [Issue #177](https://github.com/influxdb/influxdb/issues/177). Support drop series in the query language. +- [Issue #184](https://github.com/influxdb/influxdb/issues/184). Implement Raft log compaction. +- [Issue #153](https://github.com/influxdb/influxdb/issues/153). Implement continuous queries + +### Bugfixes + +- [Issue #90](https://github.com/influxdb/influxdb/issues/90). Group by multiple columns panic +- [Issue #89](https://github.com/influxdb/influxdb/issues/89). 'Group by' combined with 'where' not working +- [Issue #106](https://github.com/influxdb/influxdb/issues/106). Don't panic if we only see one point and can't calculate derivative +- [Issue #105](https://github.com/influxdb/influxdb/issues/105). Panic when using a where clause that reference columns with null values +- [Issue #61](https://github.com/influxdb/influxdb/issues/61). Remove default limits from queries +- [Issue #118](https://github.com/influxdb/influxdb/issues/118). Make column names starting with '_' legal +- [Issue #121](https://github.com/influxdb/influxdb/issues/121). Don't fall back to the cluster admin auth if the db user auth fails +- [Issue #127](https://github.com/influxdb/influxdb/issues/127). Return error on delete queries with where condition that don't have time +- [Issue #117](https://github.com/influxdb/influxdb/issues/117). Fill empty groups with default values +- [Issue #150](https://github.com/influxdb/influxdb/pull/150). Fix parser for when multiple divisions look like a regex. +- [Issue #158](https://github.com/influxdb/influxdb/issues/158). Logged deletes should be stored with the time range if missing. +- [Issue #136](https://github.com/influxdb/influxdb/issues/136). Make sure writes are replicated in order to avoid triggering replays +- [Issue #145](https://github.com/influxdb/influxdb/issues/145). Server fails to join cluster if all starting at same time. +- [Issue #176](https://github.com/influxdb/influxdb/issues/176). Drop database should take effect on all nodes +- [Issue #180](https://github.com/influxdb/influxdb/issues/180). Column names not returned when running multi-node cluster and writing more than one point. +- [Issue #182](https://github.com/influxdb/influxdb/issues/182). Queries with invalid limit clause crash the server + +### Deprecated + +- deprecate '==' and '!=' in favor of '=' and '<>', respectively +- deprecate `/dbs` (for listing databases) in favor of a more consistent `/db` endpoint +- deprecate `username` field for a more consistent `name` field in `/db/:db/users` and `/cluster_admins` +- deprecate endpoints `/db/:db/admins/:user` in favor of using `/db/:db/users/:user` which should + be used to update user flags, password, etc. +- Querying for column names that don't exist no longer throws an error. + +## v0.3.2 + +## Features + +- [Issue #82](https://github.com/influxdb/influxdb/issues/82). Add endpoint for listing available admin interfaces. +- [Issue #80](https://github.com/influxdb/influxdb/issues/80). Support durations when specifying start and end time +- [Issue #81](https://github.com/influxdb/influxdb/issues/81). Add support for IN + +## Bugfixes + +- [Issue #75](https://github.com/influxdb/influxdb/issues/75). Don't allow time series names that start with underscore +- [Issue #85](https://github.com/influxdb/influxdb/issues/85). Non-existing columns exist after they have been queried before + +## v0.3.0 + +## Features + +- [Issue #51](https://github.com/influxdb/influxdb/issues/51). Implement first and last aggregates +- [Issue #35](https://github.com/influxdb/influxdb/issues/35). Support table aliases in Join Queries +- [Issue #71](https://github.com/influxdb/influxdb/issues/71). Add WillReturnSingleSeries to the Query +- [Issue #61](https://github.com/influxdb/influxdb/issues/61). Limit should default to 10k +- [Issue #59](https://github.com/influxdb/influxdb/issues/59). Add histogram aggregate function + +## Bugfixes + +- Fix join and merges when the query is a descending order query +- [Issue #57](https://github.com/influxdb/influxdb/issues/57). Don't panic when type of time != float +- [Issue #63](https://github.com/influxdb/influxdb/issues/63). Aggregate queries should not have a sequence_number column + +## v0.2.0 + +### Features + +- [Issue #37](https://github.com/influxdb/influxdb/issues/37). Support the negation of the regex matcher !~ +- [Issue #47](https://github.com/influxdb/influxdb/issues/47). Spill out query and database detail at the time of bug report + +### Bugfixes + +- [Issue #36](https://github.com/influxdb/influxdb/issues/36). The regex operator should be =~ not ~= +- [Issue #39](https://github.com/influxdb/influxdb/issues/39). Return proper content types from the http api +- [Issue #42](https://github.com/influxdb/influxdb/issues/42). Make the api consistent with the docs +- [Issue #41](https://github.com/influxdb/influxdb/issues/41). Table/Points not deleted when database is dropped +- [Issue #45](https://github.com/influxdb/influxdb/issues/45). Aggregation shouldn't mess up the order of the points +- [Issue #44](https://github.com/influxdb/influxdb/issues/44). Fix crashes on RHEL 5.9 +- [Issue #34](https://github.com/influxdb/influxdb/issues/34). Ascending order always return null for columns that have a null value +- [Issue #55](https://github.com/influxdb/influxdb/issues/55). Limit should limit the points that match the Where clause +- [Issue #53](https://github.com/influxdb/influxdb/issues/53). Writing null values via HTTP API fails + +### Deprecated + +- Preparing to deprecate `/dbs` (for listing databases) in favor of a more consistent `/db` endpoint +- Preparing to deprecate `username` field for a more consistent `name` field in the `/db/:db/users` +- Preparing to deprecate endpoints `/db/:db/admins/:user` in favor of using `/db/:db/users/:user` which should + be used to update user flags, password, etc. + +## v0.1.0 + +### Features + +- [Issue #29](https://github.com/influxdb/influxdb/issues/29). Semicolon is now optional in queries +- [Issue #31](https://github.com/influxdb/influxdb/issues/31). Support Basic Auth as well as query params for authentication. + +### Bugfixes + +- Don't allow creating users with empty username +- [Issue #22](https://github.com/influxdb/influxdb/issues/22). Don't set goroot if it was set +- [Issue #25](https://github.com/influxdb/influxdb/issues/25). Fix queries that use the median aggregator +- [Issue #26](https://github.com/influxdb/influxdb/issues/26). Default log and db directories should be in /opt/influxdb/shared/data +- [Issue #27](https://github.com/influxdb/influxdb/issues/27). Group by should not blow up if the one of the columns in group by has null values +- [Issue #30](https://github.com/influxdb/influxdb/issues/30). Column indexes/names getting off somehow +- [Issue #32](https://github.com/influxdb/influxdb/issues/32). Fix many typos in the codebase. Thanks @pborreli + +## v0.0.9 + +#### Features + +- Add stddev(...) support +- Better docs, thanks @auxesis and @d-snp. + +#### Bugfixes + +- Set PYTHONPATH and CC appropriately on mac os x. +- [Issue #18](https://github.com/influxdb/influxdb/issues/18). Fix 386 debian and redhat packages +- [Issue #23](https://github.com/influxdb/influxdb/issues/23). Fix the init scripts on redhat + +## v0.0.8 + +#### Features + +- Add a way to reset the root password from the command line. +- Add distinct(..) and derivative(...) support +- Print test coverage if running go1.2 + +#### Bugfixes + +- Fix the default admin site path in the .deb and .rpm packages. +- Fix the configuration filename in the .tar.gz package. + +## v0.0.7 + +#### Features + +- include the admin site in the repo to make it easier for newcomers. + +## v0.0.6 + +#### Features + +- Add count(distinct(..)) support + +#### Bugfixes + +- Reuse levigo read/write options. + +## v0.0.5 + +#### Features + +- Cache passwords in memory to speed up password verification +- Add MERGE and INNER JOIN support + +#### Bugfixes + +- All columns should be returned if `select *` was used +- Read/Write benchmarks + +## v0.0.2 + +#### Features + +- Add an admin UI +- Deb and RPM packages + +#### Bugfixes + +- Fix some nil pointer dereferences +- Cleanup the aggregators implementation + +## v0.0.1 [2013-10-22] + + * Initial Release diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md new file mode 100644 index 000000000..83c59e8e8 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md @@ -0,0 +1,247 @@ +Contributing to InfluxDB +======================== + +Bug reports +--------------- +Before you file an issue, please search existing issues in case it has already been filed, or perhaps even fixed. If you file an issue, please include the following. +* Full details of your operating system (or distribution) e.g. 64-bit Ubuntu 14.04. +* The version of InfluxDB you are running +* Whether you installed it using a pre-built package, or built it from source. +* A small test case, if applicable, that demonstrates the issues. + +Remember the golden rule of bug reports: **The easier you make it for us to reproduce the problem, the faster it will get fixed.** +If you have never written a bug report before, or if you want to brush up on your bug reporting skills, we recommend reading [Simon Tatham's essay "How to Report Bugs Effectively."](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) + +Test cases should be in the form of `curl` commands. For example: +``` +# create database +curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE mydb" + +# create retention policy +curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY myrp ON mydb DURATION 365d REPLICATION 1 DEFAULT" + +# write data +curl -X POST http://localhost:8086/write --data-urlencode "db=mydb" --data-binary "cpu,region=useast,host=server_1,service=redis value=61" + +# Delete a Measurement +curl -G http://localhost:8086/query --data-urlencode 'db=mydb' --data-urlencode 'q=DROP MEASUREMENT cpu' + +# Query the Measurement +# Bug: expected it to return no data, but data comes back. +curl -G http://localhost:8086/query --data-urlencode 'db=mydb' --data-urlencode 'q=SELECT * from cpu' +``` +**If you don't include a clear test case like this, your issue may not be investigated, and may even be closed**. If writing the data is too difficult, please zip up your data directory and include a link to it in your bug report. + +Please note that issues are *not the place to file general questions* such as "how do I use collectd with InfluxDB?" Questions of this nature should be sent to the [Google Group](https://groups.google.com/forum/#!forum/influxdb), not filed as issues. Issues like this will be closed. + +Feature requests +--------------- +We really like to receive feature requests, as it helps us prioritize our work. Please be clear about your requirements, as incomplete feature requests may simply be closed if we don't understand what you would like to see added to InfluxDB. + +Contributing to the source code +--------------- + +InfluxDB follows standard Go project structure. This means that all +your go development are done in `$GOPATH/src`. GOPATH can be any +directory under which InfluxDB and all its dependencies will be +cloned. For more details on recommended go project's structure, see +[How to Write Go Code](http://golang.org/doc/code.html) and +[Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/), or you can just follow +the steps below. + +Submitting a pull request +------------ +To submit a pull request you should fork the InfluxDB repository, and make your change on a feature branch of your fork. Then generate a pull request from your branch against *master* of the InfluxDB repository. Include in your pull request details of your change -- the why *and* the how -- as well as the testing your performed. Also, be sure to run the test suite with your change in place. Changes that cause tests to fail cannot be merged. + +There will usually be some back and forth as we finalize the change, but once that completes it may be merged. + +To assist in review for the PR, please add the following to your pull request comment: + +```md +- [ ] CHANGELOG.md updated +- [ ] Rebased/mergable +- [ ] Tests pass +- [ ] Sign [CLA](http://influxdb.com/community/cla.html) (if not already signed) +``` + +Use of third-party packages +------------ +A third-party package is defined as one that is not part of the standard Go distribution. Generally speaking we prefer to minimize our use of third-party packages, and avoid them unless absolutely necessarly. We'll often write a little bit of code rather than pull in a third-party package. Of course, we do use some third-party packages -- most importantly we use [BoltDB](https://github.com/boltdb/bolt) as the storage engine. So to maximise the chance your change will be accepted by us, use only the standard libaries, or the third-party packages we have decided to use. + +For rationale, check out the post [The Case Against Third Party Libraries](http://blog.gopheracademy.com/advent-2014/case-against-3pl/). + +Signing the CLA +--------------- + +If you are going to be contributing back to InfluxDB please take a +second to sign our CLA, which can be found +[on our website](http://influxdb.com/community/cla.html). + +Installing Go +------------- +InfluxDB requires Go 1.5 or greater. + +At InfluxDB we find gvm, a Go version manager, useful for installing Go. For instructions +on how to install it see [the gvm page on github](https://github.com/moovweb/gvm). + +After installing gvm you can install and set the default go version by +running the following: + + gvm install go1.5 + gvm use go1.5 --default + +Revision Control Systems +------------- +Go has the ability to import remote packages via revision control systems with the `go get` command. To ensure that you can retrieve any remote package, be sure to install the following rcs software to your system. +Currently the project only depends on `git` and `mercurial`. + +* [Install Git](http://git-scm.com/book/en/Getting-Started-Installing-Git) +* [Install Mercurial](http://mercurial.selenic.com/wiki/Download) + +Getting the source +------ +Setup the project structure and fetch the repo like so: + + mkdir $HOME/gocodez + export GOPATH=$HOME/gocodez + go get github.com/influxdb/influxdb + +You can add the line `export GOPATH=$HOME/gocodez` to your bash/zsh file to be set for every shell instead of having to manually run it everytime. + +Cloning a fork +------------- +If you wish to work with fork of InfluxDB, your own fork for example, you must still follow the directory structure above. But instead of cloning the main repo, instead clone your fork. Follow the steps below to work with a fork: + + export GOPATH=$HOME/gocodez + mkdir -p $GOPATH/src/github.com/influxdb + cd $GOPATH/src/github.com/influxdb + git clone git@github.com:/influxdb + +Retaining the directory structure `$GOPATH/src/github.com/influxdb` is necessary so that Go imports work correctly. + +Pre-commit checks +------------- + +We have a pre commit hook to make sure code is formatted properly +and vetted before you commit any changes. We strongly recommend using the pre +commit hook to guard against accidentally committing unformatted +code. To use the pre-commit hook, run the following: + + cd $GOPATH/src/github.com/influxdb/influxdb + cp .hooks/pre-commit .git/hooks/ + +In case the commit is rejected because it's not formatted you can run +the following to format the code: + +``` +go fmt ./... +go vet ./... +``` + +To install go vet, run the following command: +``` +go get golang.org/x/tools/cmd/vet +``` + +NOTE: If you have not installed mercurial, the above command will fail. See [Revision Control Systems](#revision-control-systems) above. + +For more information on `go vet`, [read the GoDoc](https://godoc.org/golang.org/x/tools/cmd/vet). + +Build and Test +----- + +Make sure you have Go installed and the project structure as shown above. To then build the project, execute the following commands: + +```bash +cd $GOPATH/src/github.com/influxdb +go get -u -f -t ./... +go build ./... +``` + +To then install the binaries, run the following command. They can be found in `$GOPATH/bin`. Please note that the InfluxDB binary is named `influxd`, not `influxdb`. + +```bash +go install ./... +``` + +To set the version and commit flags during the build pass the following to the build command: + +```bash +-ldflags="-X main.version=$VERSION -X main.branch=$BRANCH -X main.commit=$COMMIT -X main.buildTime=$TIME" +``` + +where `$VERSION` is the version, `$BRANCH` is the branch, `$COMMIT` is the git commit hash, and `$TIME` is the build timestamp. + +If you want to build packages, see `package.sh` help: +```bash +package.sh -h +``` + +To run the tests, execute the following command: + +```bash +cd $GOPATH/src/github.com/influxdb/influxdb +go test -v ./... + +# run tests that match some pattern +go test -run=TestDatabase . -v + +# run tests and show coverage +go test -coverprofile /tmp/cover . && go tool cover -html /tmp/cover +``` + +To install go cover, run the following command: +``` +go get golang.org/x/tools/cmd/cover +``` + +Generated Google Protobuf code +----------------- +Most changes to the source do not require that the generated protocol buffer code be changed. But if you need to modify the protocol buffer code, you'll first need to install the protocol buffers toolchain. + +First install the [protocol buffer compiler](https://developers.google.com/protocol-buffers/ +) 2.6.1 or later for your OS: + +Then install the go plugins: + +```bash +go get github.com/gogo/protobuf/proto +go get github.com/gogo/protobuf/protoc-gen-gogo +go get github.com/gogo/protobuf/gogoproto +``` + +Finally run, `go generate` after updating any `*.proto` file: + +```bash +go generate ./... +``` +**Trouleshooting** + +If generating the protobuf code is failing for you, check each of the following: + * Ensure the protobuf library can be found. Make sure that `LD_LIBRRARY_PATH` includes the directory in which the library `libprotoc.so` has been installed. + * Ensure the command `protoc-gen-gogo`, found in `GOPATH/bin`, is on your path. This can be done by adding `GOPATH/bin` to `PATH`. + +Profiling +----- +When troubleshooting problems with CPU or memory the Go toolchain can be helpful. You can start InfluxDB with CPU or memory profiling turned on. For example: + +```sh +# start influx with profiling +./influxd -cpuprofile influxd.prof +# run queries, writes, whatever you're testing +# open up pprof +go tool pprof influxd influxd.prof +# once inside run "web", opens up browser with the CPU graph +# can also run "web " to zoom in. Or "list " to see specific lines +``` + +Continuous Integration testing +----- +InfluxDB uses CirceCI for continuous integration testing. To see how the code is built and tested, check out [this file](https://github.com/influxdb/influxdb/blob/master/circle-test.sh). It closely follows the build and test process outlined above. You can see the exact version of Go InfluxDB uses for testing by consulting that file. + +Useful links +------------ +- [Useful techniques in Go](http://arslan.io/ten-useful-techniques-in-go) +- [Go in production](http://peter.bourgon.org/go-in-production/) +- [Principles of designing Go APIs with channels](https://inconshreveable.com/07-08-2014/principles-of-designing-go-apis-with-channels/) +- [Common mistakes in Golang](http://soryy.com/blog/2014/common-mistakes-with-go-lang/). Especially this section `Loops, Closures, and Local Variables` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md new file mode 100644 index 000000000..e78187d9b --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md @@ -0,0 +1,44 @@ +# Docker Setup +======================== + +This document describes how to build and run a minimal InfluxDB container under Docker. Currently, it has only been tested for local development and assumes that you have a working docker environment. + +## Building Image + +To build a docker image for InfluxDB from your current checkout, run the following: + +``` +$ ./build-docker.sh +``` + +This script uses the `golang:1.5` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image. + +To build the image using a different version of go: + +``` +$ GO_VER=1.4.2 ./build-docker.sh +``` + +Available version can be found [here](https://hub.docker.com/_/golang/). + +## Single Node Container + +This will start an interactive, single-node, that publishes the containers port `8086` and `8088` to the hosts ports `8086` and `8088` respectively. This is identical to starting `influxd` manually. + +``` +$ docker run -it -p 8086:8086 -p 8088:8088 influxdb +``` + +## Multi-Node Cluster + +This will create a simple 3-node cluster. The data is stored within the container and will be lost when the container is removed. This is only useful for test clusters. + +The `HOST_IP` env variable should be your host IP if running under linux or the virtualbox VM IP if running under OSX. On OSX, this would be something like: `$(docker-machine ip dev)` or `$(boot2docker ip)` depending on which docker tool you are using. + +``` +$ export HOST_IP= +$ docker run -it -p 8086:8086 -p 8088:8088 influxdb -hostname $HOST_IP:8088 +$ docker run -it -p 8186:8086 -p 8188:8088 influxdb -hostname $HOST_IP:8188 -join $HOST_IP:8088 +$ docker run -it -p 8286:8086 -p 8288:8088 influxdb -hostname $HOST_IP:8288 -join $HOST_IP:8088 +``` + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile new file mode 100644 index 000000000..d30cd300d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile @@ -0,0 +1,24 @@ +FROM busybox:ubuntu-14.04 + +MAINTAINER Jason Wilder "" + +# admin, http, udp, cluster, graphite, opentsdb, collectd +EXPOSE 8083 8086 8086/udp 8088 2003 4242 25826 + +WORKDIR /app + +# copy binary into image +COPY influxd /app/ + +# Add influxd to the PATH +ENV PATH=/app:$PATH + +# Generate a default config +RUN influxd config > /etc/influxdb.toml + +# Use /data for all disk storage +RUN sed -i 's/dir = "\/.*influxdb/dir = "\/data/' /etc/influxdb.toml + +VOLUME ["/data"] + +ENTRYPOINT ["influxd", "--config", "/etc/influxdb.toml"] diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32 b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32 new file mode 100644 index 000000000..caaf81dc9 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32 @@ -0,0 +1,12 @@ +FROM 32bit/ubuntu:14.04 + +RUN apt-get update && apt-get install -y python-software-properties software-properties-common git +RUN add-apt-repository ppa:evarlast/golang1.5 +RUN apt-get update && apt-get install -y -o Dpkg::Options::="--force-overwrite" golang-go + +ENV GOPATH=/root/go +RUN mkdir -p /root/go/src/github.com/influxdb/influxdb +RUN mkdir -p /tmp/artifacts + +VOLUME /root/go/src/github.com/influxdb/influxdb +VOLUME /tmp/artifacts diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE new file mode 100644 index 000000000..d50222706 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013-2015 Errplane Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md new file mode 100644 index 000000000..abba2b241 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md @@ -0,0 +1,19 @@ +# List +- github.com/gogo/protobuf/proto [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE) +- gopkg.in/fatih/pool.v2 [MIT LICENSE](https://github.com/fatih/pool/blob/v2.0.0/LICENSE) +- github.com/BurntSushi/toml [WTFPL LICENSE](https://github.com/BurntSushi/toml/blob/master/COPYING) +- github.com/peterh/liner [MIT LICENSE](https://github.com/peterh/liner/blob/master/COPYING) +- github.com/davecgh/go-spew/spew [ISC LICENSE](https://github.com/davecgh/go-spew/blob/master/LICENSE) +- github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE) +- github.com/rakyll/statik/fs [APACHE LICENSE](https://github.com/rakyll/statik/blob/master/LICENSE) +- github.com/kimor79/gollectd [BSD LICENSE](https://github.com/kimor79/gollectd/blob/master/LICENSE) +- github.com/bmizerany/pat [MIT LICENSE](https://github.com/bmizerany/pat#license) +- react 0.13.3 [BSD LICENSE](https://github.com/facebook/react/blob/master/LICENSE) +- bootstrap 3.3.5 [MIT LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE) +- jquery 2.1.4 [MIT LICENSE](https://github.com/jquery/jquery/blob/master/LICENSE.txt) +- glyphicons [LICENSE](http://glyphicons.com/license/) +- github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE) +- github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE) +- collectd.org [ISC LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE) +- golang.org/x/crypto/bcrypt [BSD LICENSE](https://go.googlesource.com/crypto/+/master/LICENSE) + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md new file mode 100644 index 000000000..8491aa7ec --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md @@ -0,0 +1,180 @@ +The top level name is called a measurement. These names can contain any characters. Then there are field names, field values, tag keys and tag values, which can also contain any characters. However, if the measurement, field, or tag contains any character other than [A-Z,a-z,0-9,_], or if it starts with a digit, it must be double-quoted. Therefore anywhere a measurement name, field name, field value, tag name, or tag value appears it should be wrapped in double quotes. + +# Databases & retention policies + +```sql +-- create a database +CREATE DATABASE + +-- create a retention policy +CREATE RETENTION POLICY ON DURATION REPLICATION [DEFAULT] + +-- alter retention policy +ALTER RETENTION POLICY ON (DURATION | REPLICATION | DEFAULT)+ + +-- drop a database +DROP DATABASE + +-- drop a retention policy +DROP RETENTION POLICY ON +``` +where `` is either `INF` for infinite retention, or an integer followed by the desired unit of time: u,ms,s,m,h,d,w for microseconds, milliseconds, seconds, minutes, hours, days, or weeks, respectively. `` must be an integer. + +If present, `DEFAULT` sets the retention policy as the default retention policy for writes and reads. + +# Users and permissions + +```sql +-- create user +CREATE USER WITH PASSWORD '' + +-- grant privilege on a database +GRANT ON TO + +-- grant cluster admin privileges +GRANT ALL [PRIVILEGES] TO + +-- revoke privilege +REVOKE ON FROM + +-- revoke all privileges for a DB +REVOKE ALL [PRIVILEGES] ON FROM + +-- revoke all privileges including cluster admin +REVOKE ALL [PRIVILEGES] FROM + +-- combine db creation with privilege assignment (user must already exist) +CREATE DATABASE GRANT TO +CREATE DATABASE REVOKE FROM + +-- delete a user +DROP USER + + +``` +where ` := READ | WRITE | All `. + +Authentication must be enabled in the influxdb.conf file for user permissions to be in effect. + +By default, newly created users have no privileges to any databases. + +Cluster administration privileges automatically grant full read and write permissions to all databases, regardless of subsequent database-specific privilege revocation statements. + +# Select + +```sql +SELECT mean(value) from cpu WHERE host = 'serverA' AND time > now() - 4h GROUP BY time(5m) + +SELECT mean(value) from cpu WHERE time > now() - 4h GROUP BY time(5m), region +``` + +## Group By + +# Delete + +# Series + +## Destroy + +```sql +DROP MEASUREMENT +DROP MEASUREMENT cpu WHERE region = 'uswest' +``` + +## Show + +Show series queries are for pulling out individual series from measurement names and tag data. They're useful for discovery. + +```sql +-- show all databases +SHOW DATABASES + +-- show measurement names +SHOW MEASUREMENTS +SHOW MEASUREMENTS LIMIT 15 +SHOW MEASUREMENTS LIMIT 10 OFFSET 40 +SHOW MEASUREMENTS WHERE service = 'redis' +-- LIMIT and OFFSET can be applied to any of the SHOW type queries + +-- show all series across all measurements/tagsets +SHOW SERIES + +-- get a show of all series for any measurements where tag key region = tak value 'uswest' +SHOW SERIES WHERE region = 'uswest' + +SHOW SERIES FROM cpu_load WHERE region = 'uswest' LIMIT 10 + +-- returns the 100 - 109 rows in the result. In the case of SHOW SERIES, which returns +-- series split into measurements. Each series counts as a row. So you could see only a +-- single measurement returned, but 10 series within it. +SHOW SERIES FROM cpu_load WHERE region = 'uswest' LIMIT 10 OFFSET 100 + +-- show all retention policies on a database +SHOW RETENTION POLICIES ON mydb + +-- get a show of all tag keys across all measurements +SHOW TAG KEYS + +-- show all the tag keys for a given measurement +SHOW TAG KEYS FROM cpu +SHOW TAG KEYS FROM temperature, wind_speed + +-- show all the tag values. note that a single WHERE TAG KEY = '...' clause is required +SHOW TAG VALUES WITH TAG KEY = 'region' +SHOW TAG VALUES FROM cpu WHERE region = 'uswest' WITH TAG KEY = 'host' + +-- and you can do stuff against fields +SHOW FIELD KEYS FROM cpu + +-- but you can't do this +SHOW FIELD VALUES +-- we don't index field values, so this query should be invalid. + +-- show all users +SHOW USERS +``` + +Note that `FROM` and `WHERE` are optional clauses in most of the show series queries. + +And the show series output looks like this: + +```json +[ + { + "name": "cpu", + "columns": ["id", "region", "host"], + "values": [ + 1, "uswest", "servera", + 2, "uswest", "serverb" + ] + }, + { + "name": "reponse_time", + "columns": ["id", "application", "host"], + "values": [ + 3, "myRailsApp", "servera" + ] + } +] +``` + +# Continuous Queries + +Continous queries are going to be inspired by MySQL `TRIGGER` syntax: + +http://dev.mysql.com/doc/refman/5.0/en/trigger-syntax.html + +Instead of having automatically-assigned ids, named continuous queries allows for some level of duplication prevention, +particularly in the case where creation is scripted. + +## Create + + CREATE CONTINUOUS QUERY AS SELECT ... FROM ... + +## Destroy + + DROP CONTINUOUS QUERY + +## List + + SHOW CONTINUOUS QUERIES diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md new file mode 100644 index 000000000..94b8547ab --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md @@ -0,0 +1,72 @@ +# InfluxDB [![Circle CI](https://circleci.com/gh/influxdb/influxdb/tree/master.svg?style=svg)](https://circleci.com/gh/influxdb/influxdb/tree/master) + +## An Open-Source, Distributed, Time Series Database + +> InfluxDB v0.9.0 is now out. Going forward, the 0.9.x series of releases will not make breaking API changes or breaking changes to the underlying data storage. However, 0.9.0 clustering should be considered an alpha release. + +InfluxDB is an open source **distributed time series database** with +**no external dependencies**. It's useful for recording metrics, +events, and performing analytics. + +## Features + +* Built-in [HTTP API](http://influxdb.com/docs/v0.9/concepts/reading_and_writing_data.html) so you don't have to write any server side code to get up and running. +* Data can be tagged, allowing very flexible querying. +* SQL-like query language. +* Clustering is supported out of the box, so that you can scale horizontally to handle your data. +* Simple to install and manage, and fast to get data in and out. +* It aims to answer queries in real-time. That means every data point is + indexed as it comes in and is immediately available in queries that + should return in < 100ms. + +## Getting Started +*The following directions apply only to the 0.9.0 release or building from the source on master.* + +### Building + +You don't need to build the project to use it - you can use any of our +[pre-built packages](http://influxdb.com/download/index.html) to install InfluxDB. That's +the recommended way to get it running. However, if you want to contribute to the core of InfluxDB, you'll need to build. +For those adventurous enough, you can +[follow along on our docs](http://github.com/influxdb/influxdb/blob/master/CONTRIBUTING.md). + +### Starting InfluxDB +* `service influxdb start` if you have installed InfluxDB using an official Debian or RPM package. +* `systemctl start influxdb` if you have installed InfluxDB using an official Debian or RPM package, and are running a distro with `systemd`. For example, Ubuntu 15 or later. +* `$GOPATH/bin/influxd` if you have built InfluxDB from source. + +### Creating your first database + +``` +curl -G 'http://localhost:8086/query' --data-urlencode "q=CREATE DATABASE mydb" +``` + +### Insert some data +``` +curl -XPOST 'http://localhost:8086/write?db=mydb' \ +-d 'cpu,host=server01,region=uswest load=42 1434055562000000000' + +curl -XPOST 'http://localhost:8086/write?db=mydb' \ +-d 'cpu,host=server02,region=uswest load=78 1434055562000000000' + +curl -XPOST 'http://localhost:8086/write?db=mydb' \ +-d 'cpu,host=server03,region=useast load=15.4 1434055562000000000' +``` + +### Query for the data +```JSON +curl -G http://localhost:8086/query?pretty=true --data-urlencode "db=mydb" \ +--data-urlencode "q=SELECT * FROM cpu WHERE host='server01' AND time < now() - 1d" +``` + +### Analyze the data +```JSON +curl -G http://localhost:8086/query?pretty=true --data-urlencode "db=mydb" \ +--data-urlencode "q=SELECT mean(load) FROM cpu WHERE region='uswest'" +``` + +## Helpful Links + +* Understand the [design goals and motivations of the project](http://influxdb.com/docs/v0.9/introduction/overview.html). +* Follow the [getting started guide](http://influxdb.com/docs/v0.9/introduction/getting_started.html) to find out how to install InfluxDB, start writing more data, and issue more queries - in just a few minutes. +* See the [HTTP API documentation to start writing a library for your favorite language](http://influxdb.com/docs/v0.9/concepts/reading_and_writing_data.html). diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer.go new file mode 100644 index 000000000..25abbf6f1 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer.go @@ -0,0 +1,78 @@ +package influxdb + +import ( + "math/rand" + + "github.com/influxdb/influxdb/meta" +) + +// Balancer represents a load-balancing algorithm for a set of nodes +type Balancer interface { + // Next returns the next Node according to the balancing method + // or nil if there are no nodes available + Next() *meta.NodeInfo +} + +type nodeBalancer struct { + nodes []meta.NodeInfo // data nodes to balance between + p int // current node index +} + +// NewNodeBalancer create a shuffled, round-robin balancer so that +// multiple instances will return nodes in randomized order and each +// each returned node will be repeated in a cycle +func NewNodeBalancer(nodes []meta.NodeInfo) Balancer { + // make a copy of the node slice so we can randomize it + // without affecting the original instance as well as ensure + // that each Balancer returns nodes in a different order + b := &nodeBalancer{} + + b.nodes = make([]meta.NodeInfo, len(nodes)) + copy(b.nodes, nodes) + + b.shuffle() + return b +} + +// shuffle randomizes the ordering the balancers available nodes +func (b *nodeBalancer) shuffle() { + for i := range b.nodes { + j := rand.Intn(i + 1) + b.nodes[i], b.nodes[j] = b.nodes[j], b.nodes[i] + } +} + +// online returns a slice of the nodes that are online +func (b *nodeBalancer) online() []meta.NodeInfo { + return b.nodes + // now := time.Now().UTC() + // up := []meta.NodeInfo{} + // for _, n := range b.nodes { + // if n.OfflineUntil.After(now) { + // continue + // } + // up = append(up, n) + // } + // return up +} + +// Next returns the next available nodes +func (b *nodeBalancer) Next() *meta.NodeInfo { + // only use online nodes + up := b.online() + + // no nodes online + if len(up) == 0 { + return nil + } + + // rollover back to the beginning + if b.p >= len(up) { + b.p = 0 + } + + d := &up[b.p] + b.p += 1 + + return d +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer_test.go new file mode 100644 index 000000000..ca1942c33 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/balancer_test.go @@ -0,0 +1,115 @@ +package influxdb_test + +import ( + "fmt" + "testing" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/meta" +) + +func NewNodes() []meta.NodeInfo { + var nodes []meta.NodeInfo + for i := 1; i <= 2; i++ { + nodes = append(nodes, meta.NodeInfo{ + ID: uint64(i), + Host: fmt.Sprintf("localhost:999%d", i), + }) + } + return nodes +} + +func TestBalancerEmptyNodes(t *testing.T) { + b := influxdb.NewNodeBalancer([]meta.NodeInfo{}) + got := b.Next() + if got != nil { + t.Errorf("expected nil, got %v", got) + } +} + +func TestBalancerUp(t *testing.T) { + nodes := NewNodes() + b := influxdb.NewNodeBalancer(nodes) + + // First node in randomized round-robin order + first := b.Next() + if first == nil { + t.Errorf("expected datanode, got %v", first) + } + + // Second node in randomized round-robin order + second := b.Next() + if second == nil { + t.Errorf("expected datanode, got %v", second) + } + + // Should never get the same node in order twice + if first.ID == second.ID { + t.Errorf("expected first != second. got %v = %v", first.ID, second.ID) + } +} + +/* +func TestBalancerDown(t *testing.T) { + nodes := NewNodes() + b := influxdb.NewNodeBalancer(nodes) + + nodes[0].Down() + + // First node in randomized round-robin order + first := b.Next() + if first == nil { + t.Errorf("expected datanode, got %v", first) + } + + // Second node should rollover to the first up node + second := b.Next() + if second == nil { + t.Errorf("expected datanode, got %v", second) + } + + // Health node should be returned each time + if first.ID != 2 && first.ID != second.ID { + t.Errorf("expected first != second. got %v = %v", first.ID, second.ID) + } +} +*/ + +/* +func TestBalancerBackUp(t *testing.T) { + nodes := newDataNodes() + b := influxdb.NewNodeBalancer(nodes) + + nodes[0].Down() + + for i := 0; i < 3; i++ { + got := b.Next() + if got == nil { + t.Errorf("expected datanode, got %v", got) + } + + if exp := uint64(2); got.ID != exp { + t.Errorf("wrong node id: exp %v, got %v", exp, got.ID) + } + } + + nodes[0].Up() + + // First node in randomized round-robin order + first := b.Next() + if first == nil { + t.Errorf("expected datanode, got %v", first) + } + + // Second node should rollover to the first up node + second := b.Next() + if second == nil { + t.Errorf("expected datanode, got %v", second) + } + + // Should get both nodes returned + if first.ID == second.ID { + t.Errorf("expected first != second. got %v = %v", first.ID, second.ID) + } +} +*/ diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh new file mode 100644 index 000000000..0dea62d2a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e -x + +GO_VER=${GO_VER:-1.5} + +docker run -it -v "${GOPATH}":/gopath -v "$(pwd)":/app -e "GOPATH=/gopath" -w /app golang:$GO_VER sh -c 'CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o influxd ./cmd/influxd' + +docker build -t influxdb . diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh new file mode 100644 index 000000000..2023eaac3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh @@ -0,0 +1,95 @@ +#!/bin/bash +# +# This is the InfluxDB CircleCI test script. Using this script allows total control +# the environment in which the build and test is run, and matches the official +# build process for InfluxDB. + +BUILD_DIR=$HOME/influxdb-build +GO_VERSION=go1.5.1 +PARALLELISM="-parallel 256" +TIMEOUT="-timeout 480s" + +# Executes the given statement, and exits if the command returns a non-zero code. +function exit_if_fail { + command=$@ + echo "Executing '$command'" + $command + rc=$? + if [ $rc -ne 0 ]; then + echo "'$command' returned $rc." + exit $rc + fi +} + +# Check that go fmt has been run. +function check_go_fmt { + fmtcount=`git ls-files | grep '.go$' | xargs gofmt -l 2>&1 | wc -l` + if [ $fmtcount -gt 0 ]; then + echo "run 'go fmt ./...' to format your source code." + exit 1 + fi +} + +# Check that go vet passes. +function check_go_vet { + # Due to the way composites work, vet will fail for some of our tests so we ignore it + vetcount=`go tool vet --composites=false ./ 2>&1 | wc -l` + if [ $vetcount -gt 0 ]; then + echo "run 'go tool vet --composites=false ./' to see the errors it flags and correct your source code." + exit 1 + fi +} + +source $HOME/.gvm/scripts/gvm +exit_if_fail gvm use $GO_VERSION + +# Set up the build directory, and then GOPATH. +exit_if_fail mkdir $BUILD_DIR +export GOPATH=$BUILD_DIR +exit_if_fail mkdir -p $GOPATH/src/github.com/influxdb + +# Dump some test config to the log. +echo "Test configuration" +echo "========================================" +echo "\$HOME: $HOME" +echo "\$GOPATH: $GOPATH" +echo "\$CIRCLE_BRANCH: $CIRCLE_BRANCH" + +# Move the checked-out source to a better location. +exit_if_fail mv $HOME/influxdb $GOPATH/src/github.com/influxdb +exit_if_fail cd $GOPATH/src/github.com/influxdb/influxdb +exit_if_fail git branch --set-upstream-to=origin/$CIRCLE_BRANCH $CIRCLE_BRANCH + +# Install the code. +exit_if_fail cd $GOPATH/src/github.com/influxdb/influxdb +exit_if_fail go get -t -d -v ./... +exit_if_fail git checkout $CIRCLE_BRANCH # 'go get' switches to master. Who knew? Switch back. +check_go_fmt +check_go_vet +exit_if_fail go build -v ./... + +# Run the tests. +case $CIRCLE_NODE_INDEX in + 0) + go test $PARALLELISM $TIMEOUT -v ./... 2>&1 | tee $CIRCLE_ARTIFACTS/test_logs.txt + rc=${PIPESTATUS[0]} + ;; + 1) + # 32bit tests. + if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi + docker build -f Dockerfile_test_ubuntu32 -t ubuntu-32-influxdb-test . + mkdir -p ~/docker; docker save ubuntu-32-influxdb-test > ~/docker/image.tar + exit_if_fail docker build -f Dockerfile_test_ubuntu32 -t ubuntu-32-influxdb-test . + docker run -v $(pwd):/root/go/src/github.com/influxdb/influxdb -e "CI=${CI}" \ + -v ${CIRCLE_ARTIFACTS}:/tmp/artifacts \ + -t ubuntu-32-influxdb-test bash \ + -c "cd /root/go/src/github.com/influxdb/influxdb && go get -t -d -v ./... && go build -v ./... && go test ${PARALLELISM} ${TIMEOUT} -v ./... 2>&1 | tee /tmp/artifacts/test_logs_i386.txt && exit \${PIPESTATUS[0]}" + rc=$? + ;; + 2) + GORACE="halt_on_error=1" go test $PARALLELISM $TIMEOUT -v -race ./... 2>&1 | tee $CIRCLE_ARTIFACTS/test_logs_race.txt + rc=${PIPESTATUS[0]} + ;; +esac + +exit $rc diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml new file mode 100644 index 000000000..0b91fe684 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml @@ -0,0 +1,16 @@ +machine: + services: + - docker + pre: + - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) + - source $HOME/.gvm/scripts/gvm; gvm install go1.5.1 --binary + +dependencies: + override: + - mkdir -p ~/docker + cache_directories: + - "~/docker" +test: + override: + - bash circle-test.sh: + parallel: true diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md index 883941e90..27e7afdbb 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md @@ -45,7 +45,12 @@ the configuration below. package main import "github.com/influxdb/influxdb/client" -import "net/url" +import ( + "net/url" + "fmt" + "log" + "os" +) const ( MyHost = "localhost" @@ -190,8 +195,8 @@ for i, row := range res[0].Series[0].Values { if err != nil { log.Fatal(err) } - val, err := row[1].(json.Number).Int64() - log.Printf("[%2d] %s: %03d\n", i, t.Format(time.Stamp), val) + val := row[1].(string) + log.Printf("[%2d] %s: %s\n", i, t.Format(time.Stamp), val) } ``` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go index c4f34d84c..031db0bc5 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go @@ -13,8 +13,7 @@ import ( "strings" "time" - "github.com/influxdb/influxdb/influxql" - "github.com/influxdb/influxdb/tsdb" + "github.com/influxdb/influxdb/models" ) const ( @@ -79,6 +78,7 @@ type Config struct { Password string UserAgent string Timeout time.Duration + Precision string } // NewConfig will create a config to be used in connecting to the client @@ -95,6 +95,7 @@ type Client struct { password string httpClient *http.Client userAgent string + precision string } const ( @@ -112,6 +113,7 @@ func NewClient(c Config) (*Client, error) { password: c.Password, httpClient: &http.Client{Timeout: c.Timeout}, userAgent: c.UserAgent, + precision: c.Precision, } if client.userAgent == "" { client.userAgent = "InfluxDBClient" @@ -125,6 +127,11 @@ func (c *Client) SetAuth(u, p string) { c.password = p } +// SetPrecision will update the precision +func (c *Client) SetPrecision(precision string) { + c.precision = precision +} + // Query sends a command to the server and returns the Response func (c *Client) Query(q Query) (*Response, error) { u := c.url @@ -133,6 +140,9 @@ func (c *Client) Query(q Query) (*Response, error) { values := u.Query() values.Set("q", q.Command) values.Set("db", q.Database) + if c.precision != "" { + values.Set("epoch", c.precision) + } u.RawQuery = values.Encode() req, err := http.NewRequest("GET", u.String(), nil) @@ -314,7 +324,7 @@ func (c *Client) Ping() (time.Duration, string, error) { // Result represents a resultset returned from a single statement. type Result struct { - Series []influxql.Row + Series []models.Row Err error } @@ -322,8 +332,8 @@ type Result struct { func (r *Result) MarshalJSON() ([]byte, error) { // Define a struct that outputs "error" as a string. var o struct { - Series []influxql.Row `json:"series,omitempty"` - Err string `json:"error,omitempty"` + Series []models.Row `json:"series,omitempty"` + Err string `json:"error,omitempty"` } // Copy fields to output struct. @@ -338,8 +348,8 @@ func (r *Result) MarshalJSON() ([]byte, error) { // UnmarshalJSON decodes the data into the Result struct func (r *Result) UnmarshalJSON(b []byte) error { var o struct { - Series []influxql.Row `json:"series,omitempty"` - Err string `json:"error,omitempty"` + Series []models.Row `json:"series,omitempty"` + Err string `json:"error,omitempty"` } dec := json.NewDecoder(bytes.NewBuffer(b)) @@ -449,7 +459,11 @@ func (p *Point) MarshalJSON() ([]byte, error) { } func (p *Point) MarshalString() string { - return tsdb.NewPoint(p.Measurement, p.Tags, p.Fields, p.Time).String() + pt := models.NewPoint(p.Measurement, p.Tags, p.Fields, p.Time) + if p.Precision == "" || p.Precision == "ns" || p.Precision == "n" { + return pt.String() + } + return pt.PrecisionString(p.Precision) } // UnmarshalJSON decodes the data into the Point struct diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go index 0a6df042e..34cedc446 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go @@ -498,13 +498,12 @@ func TestBatchPoints_Normal(t *testing.T) { } func TestClient_Timeout(t *testing.T) { + done := make(chan bool) ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - time.Sleep(1 * time.Second) - var data client.Response - w.WriteHeader(http.StatusOK) - _ = json.NewEncoder(w).Encode(data) + <-done })) defer ts.Close() + defer func() { done <- true }() u, _ := url.Parse(ts.URL) config := client.Config{URL: *u, Timeout: 500 * time.Millisecond} @@ -517,13 +516,33 @@ func TestClient_Timeout(t *testing.T) { _, err = c.Query(query) if err == nil { t.Fatalf("unexpected success. expected timeout error") - } else if !strings.Contains(err.Error(), "use of closed network connection") { - t.Fatalf("unexpected error. expected 'use of closed network connection' error, got %v", err) + } else if !strings.Contains(err.Error(), "request canceled") && + !strings.Contains(err.Error(), "use of closed network connection") { + t.Fatalf("unexpected error. expected 'request canceled' error, got %v", err) + } +} + +func TestClient_NoTimeout(t *testing.T) { + if testing.Short() { + t.Skip("skipping in short mode") + } + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + time.Sleep(1 * time.Second) + var data client.Response + w.WriteHeader(http.StatusOK) + _ = json.NewEncoder(w).Encode(data) + })) + defer ts.Close() + + u, _ := url.Parse(ts.URL) + config := client.Config{URL: *u} + c, err := client.NewClient(config) + if err != nil { + t.Fatalf("unexpected error. expected %v, actual %v", nil, err) } - confignotimeout := client.Config{URL: *u} - cnotimeout, err := client.NewClient(confignotimeout) - _, err = cnotimeout.Query(query) + query := client.Query{} + _, err = c.Query(query) if err != nil { t.Fatalf("unexpected error. expected %v, actual %v", nil, err) } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go new file mode 100644 index 000000000..fed7e18e0 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go @@ -0,0 +1,57 @@ +package cluster + +import ( + "net" + "sync" + + "gopkg.in/fatih/pool.v2" +) + +type clientPool struct { + mu sync.RWMutex + pool map[uint64]pool.Pool +} + +func newClientPool() *clientPool { + return &clientPool{ + pool: make(map[uint64]pool.Pool), + } +} + +func (c *clientPool) setPool(nodeID uint64, p pool.Pool) { + c.mu.Lock() + c.pool[nodeID] = p + c.mu.Unlock() +} + +func (c *clientPool) getPool(nodeID uint64) (pool.Pool, bool) { + c.mu.RLock() + p, ok := c.pool[nodeID] + c.mu.RUnlock() + return p, ok +} + +func (c *clientPool) size() int { + c.mu.RLock() + var size int + for _, p := range c.pool { + size += p.Len() + } + c.mu.RUnlock() + return size +} + +func (c *clientPool) conn(nodeID uint64) (net.Conn, error) { + c.mu.RLock() + conn, err := c.pool[nodeID].Get() + c.mu.RUnlock() + return conn, err +} + +func (c *clientPool) close() { + c.mu.Lock() + for _, p := range c.pool { + p.Close() + } + c.mu.Unlock() +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go new file mode 100644 index 000000000..3a67b32d0 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go @@ -0,0 +1,35 @@ +package cluster + +import ( + "time" + + "github.com/influxdb/influxdb/toml" +) + +const ( + // DefaultWriteTimeout is the default timeout for a complete write to succeed. + DefaultWriteTimeout = 5 * time.Second + + // DefaultShardWriterTimeout is the default timeout set on shard writers. + DefaultShardWriterTimeout = 5 * time.Second + + // DefaultShardMapperTimeout is the default timeout set on shard mappers. + DefaultShardMapperTimeout = 5 * time.Second +) + +// Config represents the configuration for the clustering service. +type Config struct { + ForceRemoteShardMapping bool `toml:"force-remote-mapping"` + WriteTimeout toml.Duration `toml:"write-timeout"` + ShardWriterTimeout toml.Duration `toml:"shard-writer-timeout"` + ShardMapperTimeout toml.Duration `toml:"shard-mapper-timeout"` +} + +// NewConfig returns an instance of Config with defaults. +func NewConfig() Config { + return Config{ + WriteTimeout: toml.Duration(DefaultWriteTimeout), + ShardWriterTimeout: toml.Duration(DefaultShardWriterTimeout), + ShardMapperTimeout: toml.Duration(DefaultShardMapperTimeout), + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go new file mode 100644 index 000000000..db5e5ddc1 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go @@ -0,0 +1,27 @@ +package cluster_test + +import ( + "testing" + "time" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/cluster" +) + +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c cluster.Config + if _, err := toml.Decode(` +shard-writer-timeout = "10s" +write-timeout = "20s" +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if time.Duration(c.ShardWriterTimeout) != 10*time.Second { + t.Fatalf("unexpected shard-writer timeout: %s", c.ShardWriterTimeout) + } else if time.Duration(c.WriteTimeout) != 20*time.Second { + t.Fatalf("unexpected write timeout s: %s", c.WriteTimeout) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go new file mode 100644 index 000000000..f95463903 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go @@ -0,0 +1,154 @@ +// Code generated by protoc-gen-gogo. +// source: internal/data.proto +// DO NOT EDIT! + +/* +Package internal is a generated protocol buffer package. + +It is generated from these files: + internal/data.proto + +It has these top-level messages: + WriteShardRequest + WriteShardResponse + MapShardRequest + MapShardResponse +*/ +package internal + +import proto "github.com/gogo/protobuf/proto" +import fmt "fmt" +import math "math" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +type WriteShardRequest struct { + ShardID *uint64 `protobuf:"varint,1,req,name=ShardID" json:"ShardID,omitempty"` + Points [][]byte `protobuf:"bytes,2,rep,name=Points" json:"Points,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *WriteShardRequest) Reset() { *m = WriteShardRequest{} } +func (m *WriteShardRequest) String() string { return proto.CompactTextString(m) } +func (*WriteShardRequest) ProtoMessage() {} + +func (m *WriteShardRequest) GetShardID() uint64 { + if m != nil && m.ShardID != nil { + return *m.ShardID + } + return 0 +} + +func (m *WriteShardRequest) GetPoints() [][]byte { + if m != nil { + return m.Points + } + return nil +} + +type WriteShardResponse struct { + Code *int32 `protobuf:"varint,1,req,name=Code" json:"Code,omitempty"` + Message *string `protobuf:"bytes,2,opt,name=Message" json:"Message,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *WriteShardResponse) Reset() { *m = WriteShardResponse{} } +func (m *WriteShardResponse) String() string { return proto.CompactTextString(m) } +func (*WriteShardResponse) ProtoMessage() {} + +func (m *WriteShardResponse) GetCode() int32 { + if m != nil && m.Code != nil { + return *m.Code + } + return 0 +} + +func (m *WriteShardResponse) GetMessage() string { + if m != nil && m.Message != nil { + return *m.Message + } + return "" +} + +type MapShardRequest struct { + ShardID *uint64 `protobuf:"varint,1,req,name=ShardID" json:"ShardID,omitempty"` + Query *string `protobuf:"bytes,2,req,name=Query" json:"Query,omitempty"` + ChunkSize *int32 `protobuf:"varint,3,req,name=ChunkSize" json:"ChunkSize,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *MapShardRequest) Reset() { *m = MapShardRequest{} } +func (m *MapShardRequest) String() string { return proto.CompactTextString(m) } +func (*MapShardRequest) ProtoMessage() {} + +func (m *MapShardRequest) GetShardID() uint64 { + if m != nil && m.ShardID != nil { + return *m.ShardID + } + return 0 +} + +func (m *MapShardRequest) GetQuery() string { + if m != nil && m.Query != nil { + return *m.Query + } + return "" +} + +func (m *MapShardRequest) GetChunkSize() int32 { + if m != nil && m.ChunkSize != nil { + return *m.ChunkSize + } + return 0 +} + +type MapShardResponse struct { + Code *int32 `protobuf:"varint,1,req,name=Code" json:"Code,omitempty"` + Message *string `protobuf:"bytes,2,opt,name=Message" json:"Message,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=Data" json:"Data,omitempty"` + TagSets []string `protobuf:"bytes,4,rep,name=TagSets" json:"TagSets,omitempty"` + Fields []string `protobuf:"bytes,5,rep,name=Fields" json:"Fields,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *MapShardResponse) Reset() { *m = MapShardResponse{} } +func (m *MapShardResponse) String() string { return proto.CompactTextString(m) } +func (*MapShardResponse) ProtoMessage() {} + +func (m *MapShardResponse) GetCode() int32 { + if m != nil && m.Code != nil { + return *m.Code + } + return 0 +} + +func (m *MapShardResponse) GetMessage() string { + if m != nil && m.Message != nil { + return *m.Message + } + return "" +} + +func (m *MapShardResponse) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + +func (m *MapShardResponse) GetTagSets() []string { + if m != nil { + return m.TagSets + } + return nil +} + +func (m *MapShardResponse) GetFields() []string { + if m != nil { + return m.Fields + } + return nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto new file mode 100644 index 000000000..fed14bad9 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto @@ -0,0 +1,25 @@ +package internal; + +message WriteShardRequest { + required uint64 ShardID = 1; + repeated bytes Points = 2; +} + +message WriteShardResponse { + required int32 Code = 1; + optional string Message = 2; +} + +message MapShardRequest { + required uint64 ShardID = 1; + required string Query = 2; + required int32 ChunkSize = 3; +} + +message MapShardResponse { + required int32 Code = 1; + optional string Message = 2; + optional bytes Data = 3; + repeated string TagSets = 4; + repeated string Fields = 5; +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go new file mode 100644 index 000000000..4becfd8c3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go @@ -0,0 +1,353 @@ +package cluster + +import ( + "errors" + "expvar" + "fmt" + "log" + "os" + "strings" + "sync" + "time" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "github.com/influxdb/influxdb/tsdb" +) + +// ConsistencyLevel represent a required replication criteria before a write can +// be returned as successful +type ConsistencyLevel int + +// The statistics generated by the "write" mdoule +const ( + statWriteReq = "req" + statPointWriteReq = "point_req" + statPointWriteReqLocal = "point_req_local" + statPointWriteReqRemote = "point_req_remote" + statWriteOK = "write_ok" + statWritePartial = "write_partial" + statWriteTimeout = "write_timeout" + statWriteErr = "write_error" + statWritePointReqHH = "point_req_hh" +) + +const ( + // ConsistencyLevelAny allows for hinted hand off, potentially no write happened yet + ConsistencyLevelAny ConsistencyLevel = iota + + // ConsistencyLevelOne requires at least one data node acknowledged a write + ConsistencyLevelOne + + // ConsistencyLevelQuorum requires a quorum of data nodes to acknowledge a write + ConsistencyLevelQuorum + + // ConsistencyLevelAll requires all data nodes to acknowledge a write + ConsistencyLevelAll +) + +var ( + // ErrTimeout is returned when a write times out. + ErrTimeout = errors.New("timeout") + + // ErrPartialWrite is returned when a write partially succeeds but does + // not meet the requested consistency level. + ErrPartialWrite = errors.New("partial write") + + // ErrWriteFailed is returned when no writes succeeded. + ErrWriteFailed = errors.New("write failed") + + // ErrInvalidConsistencyLevel is returned when parsing the string version + // of a consistency level. + ErrInvalidConsistencyLevel = errors.New("invalid consistency level") +) + +// ParseConsistencyLevel converts a consistency level string to the corresponding ConsistencyLevel const +func ParseConsistencyLevel(level string) (ConsistencyLevel, error) { + switch strings.ToLower(level) { + case "any": + return ConsistencyLevelAny, nil + case "one": + return ConsistencyLevelOne, nil + case "quorum": + return ConsistencyLevelQuorum, nil + case "all": + return ConsistencyLevelAll, nil + default: + return 0, ErrInvalidConsistencyLevel + } +} + +// PointsWriter handles writes across multiple local and remote data nodes. +type PointsWriter struct { + mu sync.RWMutex + closing chan struct{} + WriteTimeout time.Duration + Logger *log.Logger + + MetaStore interface { + NodeID() uint64 + Database(name string) (di *meta.DatabaseInfo, err error) + RetentionPolicy(database, policy string) (*meta.RetentionPolicyInfo, error) + CreateShardGroupIfNotExists(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) + ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo) + } + + TSDBStore interface { + CreateShard(database, retentionPolicy string, shardID uint64) error + WriteToShard(shardID uint64, points []models.Point) error + } + + ShardWriter interface { + WriteShard(shardID, ownerID uint64, points []models.Point) error + } + + HintedHandoff interface { + WriteShard(shardID, ownerID uint64, points []models.Point) error + } + + statMap *expvar.Map +} + +// NewPointsWriter returns a new instance of PointsWriter for a node. +func NewPointsWriter() *PointsWriter { + return &PointsWriter{ + closing: make(chan struct{}), + WriteTimeout: DefaultWriteTimeout, + Logger: log.New(os.Stderr, "[write] ", log.LstdFlags), + statMap: influxdb.NewStatistics("write", "write", nil), + } +} + +// ShardMapping contains a mapping of a shards to a points. +type ShardMapping struct { + Points map[uint64][]models.Point // The points associated with a shard ID + Shards map[uint64]*meta.ShardInfo // The shards that have been mapped, keyed by shard ID +} + +// NewShardMapping creates an empty ShardMapping +func NewShardMapping() *ShardMapping { + return &ShardMapping{ + Points: map[uint64][]models.Point{}, + Shards: map[uint64]*meta.ShardInfo{}, + } +} + +// MapPoint maps a point to shard +func (s *ShardMapping) MapPoint(shardInfo *meta.ShardInfo, p models.Point) { + points, ok := s.Points[shardInfo.ID] + if !ok { + s.Points[shardInfo.ID] = []models.Point{p} + } else { + s.Points[shardInfo.ID] = append(points, p) + } + s.Shards[shardInfo.ID] = shardInfo +} + +// Open opens the communication channel with the point writer +func (w *PointsWriter) Open() error { + w.mu.Lock() + defer w.mu.Unlock() + if w.closing == nil { + w.closing = make(chan struct{}) + } + return nil +} + +// Close closes the communication channel with the point writer +func (w *PointsWriter) Close() error { + w.mu.Lock() + defer w.mu.Unlock() + if w.closing != nil { + close(w.closing) + w.closing = nil + } + return nil +} + +// MapShards maps the points contained in wp to a ShardMapping. If a point +// maps to a shard group or shard that does not currently exist, it will be +// created before returning the mapping. +func (w *PointsWriter) MapShards(wp *WritePointsRequest) (*ShardMapping, error) { + + // holds the start time ranges for required shard groups + timeRanges := map[time.Time]*meta.ShardGroupInfo{} + + rp, err := w.MetaStore.RetentionPolicy(wp.Database, wp.RetentionPolicy) + if err != nil { + return nil, err + } + if rp == nil { + return nil, influxdb.ErrRetentionPolicyNotFound(wp.RetentionPolicy) + } + + for _, p := range wp.Points { + timeRanges[p.Time().Truncate(rp.ShardGroupDuration)] = nil + } + + // holds all the shard groups and shards that are required for writes + for t := range timeRanges { + sg, err := w.MetaStore.CreateShardGroupIfNotExists(wp.Database, wp.RetentionPolicy, t) + if err != nil { + return nil, err + } + timeRanges[t] = sg + } + + mapping := NewShardMapping() + for _, p := range wp.Points { + sg := timeRanges[p.Time().Truncate(rp.ShardGroupDuration)] + sh := sg.ShardFor(p.HashID()) + mapping.MapPoint(&sh, p) + } + return mapping, nil +} + +// WritePoints writes across multiple local and remote data nodes according the consistency level. +func (w *PointsWriter) WritePoints(p *WritePointsRequest) error { + w.statMap.Add(statWriteReq, 1) + w.statMap.Add(statPointWriteReq, int64(len(p.Points))) + + if p.RetentionPolicy == "" { + db, err := w.MetaStore.Database(p.Database) + if err != nil { + return err + } else if db == nil { + return influxdb.ErrDatabaseNotFound(p.Database) + } + p.RetentionPolicy = db.DefaultRetentionPolicy + } + + shardMappings, err := w.MapShards(p) + if err != nil { + return err + } + + // Write each shard in it's own goroutine and return as soon + // as one fails. + ch := make(chan error, len(shardMappings.Points)) + for shardID, points := range shardMappings.Points { + go func(shard *meta.ShardInfo, database, retentionPolicy string, points []models.Point) { + ch <- w.writeToShard(shard, p.Database, p.RetentionPolicy, p.ConsistencyLevel, points) + }(shardMappings.Shards[shardID], p.Database, p.RetentionPolicy, points) + } + + for range shardMappings.Points { + select { + case <-w.closing: + return ErrWriteFailed + case err := <-ch: + if err != nil { + return err + } + } + } + return nil +} + +// writeToShards writes points to a shard and ensures a write consistency level has been met. If the write +// partially succeeds, ErrPartialWrite is returned. +func (w *PointsWriter) writeToShard(shard *meta.ShardInfo, database, retentionPolicy string, + consistency ConsistencyLevel, points []models.Point) error { + // The required number of writes to achieve the requested consistency level + required := len(shard.Owners) + switch consistency { + case ConsistencyLevelAny, ConsistencyLevelOne: + required = 1 + case ConsistencyLevelQuorum: + required = required/2 + 1 + } + + // response channel for each shard writer go routine + type AsyncWriteResult struct { + Owner meta.ShardOwner + Err error + } + ch := make(chan *AsyncWriteResult, len(shard.Owners)) + + for _, owner := range shard.Owners { + go func(shardID uint64, owner meta.ShardOwner, points []models.Point) { + if w.MetaStore.NodeID() == owner.NodeID { + w.statMap.Add(statPointWriteReqLocal, int64(len(points))) + + err := w.TSDBStore.WriteToShard(shardID, points) + // If we've written to shard that should exist on the current node, but the store has + // not actually created this shard, tell it to create it and retry the write + if err == tsdb.ErrShardNotFound { + err = w.TSDBStore.CreateShard(database, retentionPolicy, shardID) + if err != nil { + ch <- &AsyncWriteResult{owner, err} + return + } + err = w.TSDBStore.WriteToShard(shardID, points) + } + ch <- &AsyncWriteResult{owner, err} + return + } + + w.statMap.Add(statPointWriteReqRemote, int64(len(points))) + err := w.ShardWriter.WriteShard(shardID, owner.NodeID, points) + if err != nil && tsdb.IsRetryable(err) { + // The remote write failed so queue it via hinted handoff + w.statMap.Add(statWritePointReqHH, int64(len(points))) + hherr := w.HintedHandoff.WriteShard(shardID, owner.NodeID, points) + + // If the write consistency level is ANY, then a successful hinted handoff can + // be considered a successful write so send nil to the response channel + // otherwise, let the original error propogate to the response channel + if hherr == nil && consistency == ConsistencyLevelAny { + ch <- &AsyncWriteResult{owner, nil} + return + } + } + ch <- &AsyncWriteResult{owner, err} + + }(shard.ID, owner, points) + } + + var wrote int + timeout := time.After(w.WriteTimeout) + var writeError error + for range shard.Owners { + select { + case <-w.closing: + return ErrWriteFailed + case <-timeout: + w.statMap.Add(statWriteTimeout, 1) + // return timeout error to caller + return ErrTimeout + case result := <-ch: + // If the write returned an error, continue to the next response + if result.Err != nil { + w.statMap.Add(statWriteErr, 1) + w.Logger.Printf("write failed for shard %d on node %d: %v", shard.ID, result.Owner.NodeID, result.Err) + + // Keep track of the first error we see to return back to the client + if writeError == nil { + writeError = result.Err + } + continue + } + + wrote++ + + // We wrote the required consistency level + if wrote >= required { + w.statMap.Add(statWriteOK, 1) + return nil + } + } + } + + if wrote > 0 { + w.statMap.Add(statWritePartial, 1) + return ErrPartialWrite + } + + if writeError != nil { + return fmt.Errorf("write failed: %v", writeError) + } + + return ErrWriteFailed +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go new file mode 100644 index 000000000..f4415c4d3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go @@ -0,0 +1,464 @@ +package cluster_test + +import ( + "fmt" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" +) + +// Ensures the points writer maps a single point to a single shard. +func TestPointsWriter_MapShards_One(t *testing.T) { + ms := MetaStore{} + rp := NewRetentionPolicy("myp", time.Hour, 3) + + ms.NodeIDFn = func() uint64 { return 1 } + ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) { + return rp, nil + } + + ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) { + return &rp.ShardGroups[0], nil + } + + c := cluster.PointsWriter{MetaStore: ms} + pr := &cluster.WritePointsRequest{ + Database: "mydb", + RetentionPolicy: "myrp", + ConsistencyLevel: cluster.ConsistencyLevelOne, + } + pr.AddPoint("cpu", 1.0, time.Now(), nil) + + var ( + shardMappings *cluster.ShardMapping + err error + ) + if shardMappings, err = c.MapShards(pr); err != nil { + t.Fatalf("unexpected an error: %v", err) + } + + if exp := 1; len(shardMappings.Points) != exp { + t.Errorf("MapShards() len mismatch. got %v, exp %v", len(shardMappings.Points), exp) + } +} + +// Ensures the points writer maps a multiple points across shard group boundaries. +func TestPointsWriter_MapShards_Multiple(t *testing.T) { + ms := MetaStore{} + rp := NewRetentionPolicy("myp", time.Hour, 3) + AttachShardGroupInfo(rp, []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }) + AttachShardGroupInfo(rp, []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }) + + ms.NodeIDFn = func() uint64 { return 1 } + ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) { + return rp, nil + } + + ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) { + for i, sg := range rp.ShardGroups { + if timestamp.Equal(sg.StartTime) || timestamp.After(sg.StartTime) && timestamp.Before(sg.EndTime) { + return &rp.ShardGroups[i], nil + } + } + panic("should not get here") + } + + c := cluster.PointsWriter{MetaStore: ms} + pr := &cluster.WritePointsRequest{ + Database: "mydb", + RetentionPolicy: "myrp", + ConsistencyLevel: cluster.ConsistencyLevelOne, + } + + // Three points that range over the shardGroup duration (1h) and should map to two + // distinct shards + pr.AddPoint("cpu", 1.0, time.Unix(0, 0), nil) + pr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil) + pr.AddPoint("cpu", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil) + + var ( + shardMappings *cluster.ShardMapping + err error + ) + if shardMappings, err = c.MapShards(pr); err != nil { + t.Fatalf("unexpected an error: %v", err) + } + + if exp := 2; len(shardMappings.Points) != exp { + t.Errorf("MapShards() len mismatch. got %v, exp %v", len(shardMappings.Points), exp) + } + + for _, points := range shardMappings.Points { + // First shard shoud have 1 point w/ first point added + if len(points) == 1 && points[0].Time() != pr.Points[0].Time() { + t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[0].Time(), pr.Points[0].Time()) + } + + // Second shard shoud have the last two points added + if len(points) == 2 && points[0].Time() != pr.Points[1].Time() { + t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[0].Time(), pr.Points[1].Time()) + } + + if len(points) == 2 && points[1].Time() != pr.Points[2].Time() { + t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[1].Time(), pr.Points[2].Time()) + } + } +} + +func TestPointsWriter_WritePoints(t *testing.T) { + tests := []struct { + name string + database string + retentionPolicy string + consistency cluster.ConsistencyLevel + + // the responses returned by each shard write call. node ID 1 = pos 0 + err []error + expErr error + }{ + // Consistency one + { + name: "write one success", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelOne, + err: []error{nil, nil, nil}, + expErr: nil, + }, + { + name: "write one error", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelOne, + err: []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")}, + expErr: fmt.Errorf("write failed: a failure"), + }, + + // Consistency any + { + name: "write any success", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelAny, + err: []error{fmt.Errorf("a failure"), nil, fmt.Errorf("a failure")}, + expErr: nil, + }, + // Consistency all + { + name: "write all success", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelAll, + err: []error{nil, nil, nil}, + expErr: nil, + }, + { + name: "write all, 2/3, partial write", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelAll, + err: []error{nil, fmt.Errorf("a failure"), nil}, + expErr: cluster.ErrPartialWrite, + }, + { + name: "write all, 1/3 (failure)", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelAll, + err: []error{nil, fmt.Errorf("a failure"), fmt.Errorf("a failure")}, + expErr: cluster.ErrPartialWrite, + }, + + // Consistency quorum + { + name: "write quorum, 1/3 failure", + consistency: cluster.ConsistencyLevelQuorum, + database: "mydb", + retentionPolicy: "myrp", + err: []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), nil}, + expErr: cluster.ErrPartialWrite, + }, + { + name: "write quorum, 2/3 success", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelQuorum, + err: []error{nil, nil, fmt.Errorf("a failure")}, + expErr: nil, + }, + { + name: "write quorum, 3/3 success", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelQuorum, + err: []error{nil, nil, nil}, + expErr: nil, + }, + + // Error write error + { + name: "no writes succeed", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelOne, + err: []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")}, + expErr: fmt.Errorf("write failed: a failure"), + }, + + // Hinted handoff w/ ANY + { + name: "hinted handoff write succeed", + database: "mydb", + retentionPolicy: "myrp", + consistency: cluster.ConsistencyLevelAny, + err: []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")}, + expErr: nil, + }, + + // Write to non-existant database + { + name: "write to non-existant database", + database: "doesnt_exist", + retentionPolicy: "", + consistency: cluster.ConsistencyLevelAny, + err: []error{nil, nil, nil}, + expErr: fmt.Errorf("database not found: doesnt_exist"), + }, + } + + for _, test := range tests { + + pr := &cluster.WritePointsRequest{ + Database: test.database, + RetentionPolicy: test.retentionPolicy, + ConsistencyLevel: test.consistency, + } + + // Three points that range over the shardGroup duration (1h) and should map to two + // distinct shards + pr.AddPoint("cpu", 1.0, time.Unix(0, 0), nil) + pr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil) + pr.AddPoint("cpu", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil) + + // copy to prevent data race + theTest := test + sm := cluster.NewShardMapping() + sm.MapPoint( + &meta.ShardInfo{ID: uint64(1), Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }}, + pr.Points[0]) + sm.MapPoint( + &meta.ShardInfo{ID: uint64(2), Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }}, + pr.Points[1]) + sm.MapPoint( + &meta.ShardInfo{ID: uint64(2), Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }}, + pr.Points[2]) + + // Local cluster.Node ShardWriter + // lock on the write increment since these functions get called in parallel + var mu sync.Mutex + sw := &fakeShardWriter{ + ShardWriteFn: func(shardID, nodeID uint64, points []models.Point) error { + mu.Lock() + defer mu.Unlock() + return theTest.err[int(nodeID)-1] + }, + } + + store := &fakeStore{ + WriteFn: func(shardID uint64, points []models.Point) error { + mu.Lock() + defer mu.Unlock() + return theTest.err[0] + }, + } + + hh := &fakeShardWriter{ + ShardWriteFn: func(shardID, nodeID uint64, points []models.Point) error { + return nil + }, + } + + ms := NewMetaStore() + ms.DatabaseFn = func(database string) (*meta.DatabaseInfo, error) { + return nil, nil + } + ms.NodeIDFn = func() uint64 { return 1 } + c := cluster.NewPointsWriter() + c.MetaStore = ms + c.ShardWriter = sw + c.TSDBStore = store + c.HintedHandoff = hh + + err := c.WritePoints(pr) + if err == nil && test.expErr != nil { + t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr) + } + + if err != nil && test.expErr == nil { + t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr) + } + if err != nil && test.expErr != nil && err.Error() != test.expErr.Error() { + t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr) + } + } +} + +var shardID uint64 + +type fakeShardWriter struct { + ShardWriteFn func(shardID, nodeID uint64, points []models.Point) error +} + +func (f *fakeShardWriter) WriteShard(shardID, nodeID uint64, points []models.Point) error { + return f.ShardWriteFn(shardID, nodeID, points) +} + +type fakeStore struct { + WriteFn func(shardID uint64, points []models.Point) error + CreateShardfn func(database, retentionPolicy string, shardID uint64) error +} + +func (f *fakeStore) WriteToShard(shardID uint64, points []models.Point) error { + return f.WriteFn(shardID, points) +} + +func (f *fakeStore) CreateShard(database, retentionPolicy string, shardID uint64) error { + return f.CreateShardfn(database, retentionPolicy, shardID) +} + +func NewMetaStore() *MetaStore { + ms := &MetaStore{} + rp := NewRetentionPolicy("myp", time.Hour, 3) + AttachShardGroupInfo(rp, []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }) + AttachShardGroupInfo(rp, []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }) + + ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) { + return rp, nil + } + + ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) { + for i, sg := range rp.ShardGroups { + if timestamp.Equal(sg.StartTime) || timestamp.After(sg.StartTime) && timestamp.Before(sg.EndTime) { + return &rp.ShardGroups[i], nil + } + } + panic("should not get here") + } + return ms +} + +type MetaStore struct { + NodeIDFn func() uint64 + RetentionPolicyFn func(database, name string) (*meta.RetentionPolicyInfo, error) + CreateShardGroupIfNotExistsFn func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) + DatabaseFn func(database string) (*meta.DatabaseInfo, error) + ShardOwnerFn func(shardID uint64) (string, string, *meta.ShardGroupInfo) +} + +func (m MetaStore) NodeID() uint64 { return m.NodeIDFn() } + +func (m MetaStore) RetentionPolicy(database, name string) (*meta.RetentionPolicyInfo, error) { + return m.RetentionPolicyFn(database, name) +} + +func (m MetaStore) CreateShardGroupIfNotExists(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) { + return m.CreateShardGroupIfNotExistsFn(database, policy, timestamp) +} + +func (m MetaStore) Database(database string) (*meta.DatabaseInfo, error) { + return m.DatabaseFn(database) +} + +func (m MetaStore) ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo) { + return m.ShardOwnerFn(shardID) +} + +func NewRetentionPolicy(name string, duration time.Duration, nodeCount int) *meta.RetentionPolicyInfo { + shards := []meta.ShardInfo{} + owners := []meta.ShardOwner{} + for i := 1; i <= nodeCount; i++ { + owners = append(owners, meta.ShardOwner{NodeID: uint64(i)}) + } + + // each node is fully replicated with each other + shards = append(shards, meta.ShardInfo{ + ID: nextShardID(), + Owners: owners, + }) + + rp := &meta.RetentionPolicyInfo{ + Name: "myrp", + ReplicaN: nodeCount, + Duration: duration, + ShardGroupDuration: duration, + ShardGroups: []meta.ShardGroupInfo{ + meta.ShardGroupInfo{ + ID: nextShardID(), + StartTime: time.Unix(0, 0), + EndTime: time.Unix(0, 0).Add(duration).Add(-1), + Shards: shards, + }, + }, + } + return rp +} + +func AttachShardGroupInfo(rp *meta.RetentionPolicyInfo, owners []meta.ShardOwner) { + var startTime, endTime time.Time + if len(rp.ShardGroups) == 0 { + startTime = time.Unix(0, 0) + } else { + startTime = rp.ShardGroups[len(rp.ShardGroups)-1].StartTime.Add(rp.ShardGroupDuration) + } + endTime = startTime.Add(rp.ShardGroupDuration).Add(-1) + + sh := meta.ShardGroupInfo{ + ID: uint64(len(rp.ShardGroups) + 1), + StartTime: startTime, + EndTime: endTime, + Shards: []meta.ShardInfo{ + meta.ShardInfo{ + ID: nextShardID(), + Owners: owners, + }, + }, + } + rp.ShardGroups = append(rp.ShardGroups, sh) +} + +func nextShardID() uint64 { + return atomic.AddUint64(&shardID, 1) +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go new file mode 100644 index 000000000..dbdb7f19e --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go @@ -0,0 +1,205 @@ +package cluster + +import ( + "fmt" + "time" + + "github.com/gogo/protobuf/proto" + "github.com/influxdb/influxdb/cluster/internal" + "github.com/influxdb/influxdb/models" +) + +//go:generate protoc --gogo_out=. internal/data.proto + +// MapShardRequest represents the request to map a remote shard for a query. +type MapShardRequest struct { + pb internal.MapShardRequest +} + +// ShardID of the map request +func (m *MapShardRequest) ShardID() uint64 { return m.pb.GetShardID() } + +// Query returns the Shard map request's query +func (m *MapShardRequest) Query() string { return m.pb.GetQuery() } + +// ChunkSize returns Shard map request's chunk size +func (m *MapShardRequest) ChunkSize() int32 { return m.pb.GetChunkSize() } + +// SetShardID sets the map request's shard id +func (m *MapShardRequest) SetShardID(id uint64) { m.pb.ShardID = &id } + +// SetQuery sets the Shard map request's Query +func (m *MapShardRequest) SetQuery(query string) { m.pb.Query = &query } + +// SetChunkSize sets the Shard map request's chunk size +func (m *MapShardRequest) SetChunkSize(chunkSize int32) { m.pb.ChunkSize = &chunkSize } + +// MarshalBinary encodes the object to a binary format. +func (m *MapShardRequest) MarshalBinary() ([]byte, error) { + return proto.Marshal(&m.pb) +} + +// UnmarshalBinary populates MapShardRequest from a binary format. +func (m *MapShardRequest) UnmarshalBinary(buf []byte) error { + if err := proto.Unmarshal(buf, &m.pb); err != nil { + return err + } + return nil +} + +// MapShardResponse represents the response returned from a remote MapShardRequest call +type MapShardResponse struct { + pb internal.MapShardResponse +} + +// NewMapShardResponse returns the response returned from a remote MapShardRequest call +func NewMapShardResponse(code int, message string) *MapShardResponse { + m := &MapShardResponse{} + m.SetCode(code) + m.SetMessage(message) + return m +} + +// Code returns the Shard map response's code +func (r *MapShardResponse) Code() int { return int(r.pb.GetCode()) } + +// Message returns the the Shard map response's Message +func (r *MapShardResponse) Message() string { return r.pb.GetMessage() } + +// TagSets returns Shard map response's tag sets +func (r *MapShardResponse) TagSets() []string { return r.pb.GetTagSets() } + +// Fields returns the Shard map response's Fields +func (r *MapShardResponse) Fields() []string { return r.pb.GetFields() } + +// Data returns the Shard map response's Data +func (r *MapShardResponse) Data() []byte { return r.pb.GetData() } + +// SetCode sets the Shard map response's code +func (r *MapShardResponse) SetCode(code int) { r.pb.Code = proto.Int32(int32(code)) } + +// SetMessage sets Shard map response's message +func (r *MapShardResponse) SetMessage(message string) { r.pb.Message = &message } + +// SetTagSets sets Shard map response's tagsets +func (r *MapShardResponse) SetTagSets(tagsets []string) { r.pb.TagSets = tagsets } + +// SetFields sets the Shard map response's Fields +func (r *MapShardResponse) SetFields(fields []string) { r.pb.Fields = fields } + +// SetData sets the Shard map response's Data +func (r *MapShardResponse) SetData(data []byte) { r.pb.Data = data } + +// MarshalBinary encodes the object to a binary format. +func (r *MapShardResponse) MarshalBinary() ([]byte, error) { + return proto.Marshal(&r.pb) +} + +// UnmarshalBinary populates WritePointRequest from a binary format. +func (r *MapShardResponse) UnmarshalBinary(buf []byte) error { + if err := proto.Unmarshal(buf, &r.pb); err != nil { + return err + } + return nil +} + +// WritePointsRequest represents a request to write point data to the cluster +type WritePointsRequest struct { + Database string + RetentionPolicy string + ConsistencyLevel ConsistencyLevel + Points []models.Point +} + +// AddPoint adds a point to the WritePointRequest with field name 'value' +func (w *WritePointsRequest) AddPoint(name string, value interface{}, timestamp time.Time, tags map[string]string) { + w.Points = append(w.Points, models.NewPoint( + name, tags, map[string]interface{}{"value": value}, timestamp, + )) +} + +// WriteShardRequest represents the a request to write a slice of points to a shard +type WriteShardRequest struct { + pb internal.WriteShardRequest +} + +// WriteShardResponse represents the response returned from a remote WriteShardRequest call +type WriteShardResponse struct { + pb internal.WriteShardResponse +} + +// SetShardID sets the ShardID +func (w *WriteShardRequest) SetShardID(id uint64) { w.pb.ShardID = &id } + +// ShardID gets the ShardID +func (w *WriteShardRequest) ShardID() uint64 { return w.pb.GetShardID() } + +// Points returns the time series Points +func (w *WriteShardRequest) Points() []models.Point { return w.unmarshalPoints() } + +// AddPoint adds a new time series point +func (w *WriteShardRequest) AddPoint(name string, value interface{}, timestamp time.Time, tags map[string]string) { + w.AddPoints([]models.Point{models.NewPoint( + name, tags, map[string]interface{}{"value": value}, timestamp, + )}) +} + +// AddPoints adds a new time series point +func (w *WriteShardRequest) AddPoints(points []models.Point) { + for _, p := range points { + w.pb.Points = append(w.pb.Points, []byte(p.String())) + } +} + +// MarshalBinary encodes the object to a binary format. +func (w *WriteShardRequest) MarshalBinary() ([]byte, error) { + return proto.Marshal(&w.pb) +} + +// UnmarshalBinary populates WritePointRequest from a binary format. +func (w *WriteShardRequest) UnmarshalBinary(buf []byte) error { + if err := proto.Unmarshal(buf, &w.pb); err != nil { + return err + } + return nil +} + +func (w *WriteShardRequest) unmarshalPoints() []models.Point { + points := make([]models.Point, len(w.pb.GetPoints())) + for i, p := range w.pb.GetPoints() { + pt, err := models.ParsePoints(p) + if err != nil { + // A error here means that one node parsed the point correctly but sent an + // unparseable version to another node. We could log and drop the point and allow + // anti-entropy to resolve the discrepancy but this shouldn't ever happen. + panic(fmt.Sprintf("failed to parse point: `%v`: %v", string(p), err)) + } + points[i] = pt[0] + } + return points +} + +// SetCode sets the Code +func (w *WriteShardResponse) SetCode(code int) { w.pb.Code = proto.Int32(int32(code)) } + +// SetMessage sets the Message +func (w *WriteShardResponse) SetMessage(message string) { w.pb.Message = &message } + +// Code returns the Code +func (w *WriteShardResponse) Code() int { return int(w.pb.GetCode()) } + +// Message returns the Message +func (w *WriteShardResponse) Message() string { return w.pb.GetMessage() } + +// MarshalBinary encodes the object to a binary format. +func (w *WriteShardResponse) MarshalBinary() ([]byte, error) { + return proto.Marshal(&w.pb) +} + +// UnmarshalBinary populates WritePointRequest from a binary format. +func (w *WriteShardResponse) UnmarshalBinary(buf []byte) error { + if err := proto.Unmarshal(buf, &w.pb); err != nil { + return err + } + return nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go new file mode 100644 index 000000000..4e42cd5d6 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go @@ -0,0 +1,110 @@ +package cluster + +import ( + "testing" + "time" +) + +func TestWriteShardRequestBinary(t *testing.T) { + sr := &WriteShardRequest{} + + sr.SetShardID(uint64(1)) + if exp := uint64(1); sr.ShardID() != exp { + t.Fatalf("ShardID mismatch: got %v, exp %v", sr.ShardID(), exp) + } + + sr.AddPoint("cpu", 1.0, time.Unix(0, 0), map[string]string{"host": "serverA"}) + sr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil) + sr.AddPoint("cpu_load", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil) + + b, err := sr.MarshalBinary() + if err != nil { + t.Fatalf("WritePointsRequest.MarshalBinary() failed: %v", err) + } + if len(b) == 0 { + t.Fatalf("WritePointsRequest.MarshalBinary() returned 0 bytes") + } + + got := &WriteShardRequest{} + if err := got.UnmarshalBinary(b); err != nil { + t.Fatalf("WritePointsRequest.UnmarshalMarshalBinary() failed: %v", err) + } + + if got.ShardID() != sr.ShardID() { + t.Errorf("ShardID mismatch: got %v, exp %v", got.ShardID(), sr.ShardID()) + } + + if len(got.Points()) != len(sr.Points()) { + t.Errorf("Points count mismatch: got %v, exp %v", len(got.Points()), len(sr.Points())) + } + + srPoints := sr.Points() + gotPoints := got.Points() + for i, p := range srPoints { + g := gotPoints[i] + + if g.Name() != p.Name() { + t.Errorf("Point %d name mismatch: got %v, exp %v", i, g.Name(), p.Name()) + } + + if !g.Time().Equal(p.Time()) { + t.Errorf("Point %d time mismatch: got %v, exp %v", i, g.Time(), p.Time()) + } + + if g.HashID() != p.HashID() { + t.Errorf("Point #%d HashID() mismatch: got %v, exp %v", i, g.HashID(), p.HashID()) + } + + for k, v := range p.Tags() { + if g.Tags()[k] != v { + t.Errorf("Point #%d tag mismatch: got %v, exp %v", i, k, v) + } + } + + if len(p.Fields()) != len(g.Fields()) { + t.Errorf("Point %d field count mismatch: got %v, exp %v", i, len(g.Fields()), len(p.Fields())) + } + + for j, f := range p.Fields() { + if g.Fields()[j] != f { + t.Errorf("Point %d field mismatch: got %v, exp %v", i, g.Fields()[j], f) + } + } + } +} + +func TestWriteShardResponseBinary(t *testing.T) { + sr := &WriteShardResponse{} + sr.SetCode(10) + sr.SetMessage("foo") + b, err := sr.MarshalBinary() + + if exp := 10; sr.Code() != exp { + t.Fatalf("Code mismatch: got %v, exp %v", sr.Code(), exp) + } + + if exp := "foo"; sr.Message() != exp { + t.Fatalf("Message mismatch: got %v, exp %v", sr.Message(), exp) + } + + if err != nil { + t.Fatalf("WritePointsResponse.MarshalBinary() failed: %v", err) + } + if len(b) == 0 { + t.Fatalf("WritePointsResponse.MarshalBinary() returned 0 bytes") + } + + got := &WriteShardResponse{} + if err := got.UnmarshalBinary(b); err != nil { + t.Fatalf("WritePointsResponse.UnmarshalMarshalBinary() failed: %v", err) + } + + if got.Code() != sr.Code() { + t.Errorf("Code mismatch: got %v, exp %v", got.Code(), sr.Code()) + } + + if got.Message() != sr.Message() { + t.Errorf("Message mismatch: got %v, exp %v", got.Message(), sr.Message()) + } + +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go new file mode 100644 index 000000000..772bd2535 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go @@ -0,0 +1,371 @@ +package cluster + +import ( + "encoding/binary" + "encoding/json" + "expvar" + "fmt" + "io" + "log" + "net" + "os" + "strings" + "sync" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "github.com/influxdb/influxdb/tsdb" +) + +// MaxMessageSize defines how large a message can be before we reject it +const MaxMessageSize = 1024 * 1024 * 1024 // 1GB + +// MuxHeader is the header byte used in the TCP mux. +const MuxHeader = 2 + +// Statistics maintained by the cluster package +const ( + writeShardReq = "write_shard_req" + writeShardPointsReq = "write_shard_points_req" + writeShardFail = "write_shard_fail" + mapShardReq = "map_shard_req" + mapShardResp = "map_shard_resp" +) + +// Service processes data received over raw TCP connections. +type Service struct { + mu sync.RWMutex + + wg sync.WaitGroup + closing chan struct{} + + Listener net.Listener + + MetaStore interface { + ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo) + } + + TSDBStore interface { + CreateShard(database, policy string, shardID uint64) error + WriteToShard(shardID uint64, points []models.Point) error + CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) + } + + Logger *log.Logger + statMap *expvar.Map +} + +// NewService returns a new instance of Service. +func NewService(c Config) *Service { + return &Service{ + closing: make(chan struct{}), + Logger: log.New(os.Stderr, "[tcp] ", log.LstdFlags), + statMap: influxdb.NewStatistics("cluster", "cluster", nil), + } +} + +// Open opens the network listener and begins serving requests. +func (s *Service) Open() error { + + s.Logger.Println("Starting cluster service") + // Begin serving conections. + s.wg.Add(1) + go s.serve() + + return nil +} + +// SetLogger sets the internal logger to the logger passed in. +func (s *Service) SetLogger(l *log.Logger) { + s.Logger = l +} + +// serve accepts connections from the listener and handles them. +func (s *Service) serve() { + defer s.wg.Done() + + for { + // Check if the service is shutting down. + select { + case <-s.closing: + return + default: + } + + // Accept the next connection. + conn, err := s.Listener.Accept() + if err != nil { + if strings.Contains(err.Error(), "connection closed") { + s.Logger.Printf("cluster service accept error: %s", err) + return + } + s.Logger.Printf("accept error: %s", err) + continue + } + + // Delegate connection handling to a separate goroutine. + s.wg.Add(1) + go func() { + defer s.wg.Done() + s.handleConn(conn) + }() + } +} + +// Close shuts down the listener and waits for all connections to finish. +func (s *Service) Close() error { + if s.Listener != nil { + s.Listener.Close() + } + + // Shut down all handlers. + close(s.closing) + s.wg.Wait() + + return nil +} + +// handleConn services an individual TCP connection. +func (s *Service) handleConn(conn net.Conn) { + // Ensure connection is closed when service is closed. + closing := make(chan struct{}) + defer close(closing) + go func() { + select { + case <-closing: + case <-s.closing: + } + conn.Close() + }() + + s.Logger.Printf("accept remote connection from %v\n", conn.RemoteAddr()) + defer func() { + s.Logger.Printf("close remote connection from %v\n", conn.RemoteAddr()) + }() + for { + // Read type-length-value. + typ, buf, err := ReadTLV(conn) + if err != nil { + if strings.HasSuffix(err.Error(), "EOF") { + return + } + s.Logger.Printf("unable to read type-length-value %s", err) + return + } + + // Delegate message processing by type. + switch typ { + case writeShardRequestMessage: + s.statMap.Add(writeShardReq, 1) + err := s.processWriteShardRequest(buf) + if err != nil { + s.Logger.Printf("process write shard error: %s", err) + } + s.writeShardResponse(conn, err) + case mapShardRequestMessage: + s.statMap.Add(mapShardReq, 1) + err := s.processMapShardRequest(conn, buf) + if err != nil { + s.Logger.Printf("process map shard error: %s", err) + if err := writeMapShardResponseMessage(conn, NewMapShardResponse(1, err.Error())); err != nil { + s.Logger.Printf("process map shard error writing response: %s", err.Error()) + } + } + default: + s.Logger.Printf("cluster service message type not found: %d", typ) + } + } +} + +func (s *Service) processWriteShardRequest(buf []byte) error { + // Build request + var req WriteShardRequest + if err := req.UnmarshalBinary(buf); err != nil { + return err + } + + points := req.Points() + s.statMap.Add(writeShardPointsReq, int64(len(points))) + err := s.TSDBStore.WriteToShard(req.ShardID(), req.Points()) + + // We may have received a write for a shard that we don't have locally because the + // sending node may have just created the shard (via the metastore) and the write + // arrived before the local store could create the shard. In this case, we need + // to check the metastore to determine what database and retention policy this + // shard should reside within. + if err == tsdb.ErrShardNotFound { + + // Query the metastore for the owner of this shard + database, retentionPolicy, sgi := s.MetaStore.ShardOwner(req.ShardID()) + if sgi == nil { + // If we can't find it, then we need to drop this request + // as it is no longer valid. This could happen if writes were queued via + // hinted handoff and delivered after a shard group was deleted. + s.Logger.Printf("drop write request: shard=%d. shard group does not exist or was deleted", req.ShardID()) + return nil + } + + err = s.TSDBStore.CreateShard(database, retentionPolicy, req.ShardID()) + if err != nil { + return err + } + return s.TSDBStore.WriteToShard(req.ShardID(), req.Points()) + } + + if err != nil { + s.statMap.Add(writeShardFail, 1) + return fmt.Errorf("write shard %d: %s", req.ShardID(), err) + } + + return nil +} + +func (s *Service) writeShardResponse(w io.Writer, e error) { + // Build response. + var resp WriteShardResponse + if e != nil { + resp.SetCode(1) + resp.SetMessage(e.Error()) + } else { + resp.SetCode(0) + } + + // Marshal response to binary. + buf, err := resp.MarshalBinary() + if err != nil { + s.Logger.Printf("error marshalling shard response: %s", err) + return + } + + // Write to connection. + if err := WriteTLV(w, writeShardResponseMessage, buf); err != nil { + s.Logger.Printf("write shard response error: %s", err) + } +} + +func (s *Service) processMapShardRequest(w io.Writer, buf []byte) error { + // Decode request + var req MapShardRequest + if err := req.UnmarshalBinary(buf); err != nil { + return err + } + + // Parse the statement. + q, err := influxql.ParseQuery(req.Query()) + if err != nil { + return fmt.Errorf("processing map shard: %s", err) + } else if len(q.Statements) != 1 { + return fmt.Errorf("processing map shard: expected 1 statement but got %d", len(q.Statements)) + } + + m, err := s.TSDBStore.CreateMapper(req.ShardID(), q.Statements[0], int(req.ChunkSize())) + if err != nil { + return fmt.Errorf("create mapper: %s", err) + } + if m == nil { + return writeMapShardResponseMessage(w, NewMapShardResponse(0, "")) + } + + if err := m.Open(); err != nil { + return fmt.Errorf("mapper open: %s", err) + } + defer m.Close() + + var metaSent bool + for { + var resp MapShardResponse + + if !metaSent { + resp.SetTagSets(m.TagSets()) + resp.SetFields(m.Fields()) + metaSent = true + } + + chunk, err := m.NextChunk() + if err != nil { + return fmt.Errorf("next chunk: %s", err) + } + + // NOTE: Even if the chunk is nil, we still need to send one + // empty response to let the other side know we're out of data. + + if chunk != nil { + b, err := json.Marshal(chunk) + if err != nil { + return fmt.Errorf("encoding: %s", err) + } + resp.SetData(b) + } + + // Write to connection. + resp.SetCode(0) + if err := writeMapShardResponseMessage(w, &resp); err != nil { + return err + } + s.statMap.Add(mapShardResp, 1) + + if chunk == nil { + // All mapper data sent. + return nil + } + } +} + +func writeMapShardResponseMessage(w io.Writer, msg *MapShardResponse) error { + buf, err := msg.MarshalBinary() + if err != nil { + return err + } + return WriteTLV(w, mapShardResponseMessage, buf) +} + +// ReadTLV reads a type-length-value record from r. +func ReadTLV(r io.Reader) (byte, []byte, error) { + var typ [1]byte + if _, err := io.ReadFull(r, typ[:]); err != nil { + return 0, nil, fmt.Errorf("read message type: %s", err) + } + + // Read the size of the message. + var sz int64 + if err := binary.Read(r, binary.BigEndian, &sz); err != nil { + return 0, nil, fmt.Errorf("read message size: %s", err) + } + + if sz == 0 { + return 0, nil, fmt.Errorf("invalid message size: %d", sz) + } + + if sz >= MaxMessageSize { + return 0, nil, fmt.Errorf("max message size of %d exceeded: %d", MaxMessageSize, sz) + } + + // Read the value. + buf := make([]byte, sz) + if _, err := io.ReadFull(r, buf); err != nil { + return 0, nil, fmt.Errorf("read message value: %s", err) + } + + return typ[0], buf, nil +} + +// WriteTLV writes a type-length-value record to w. +func WriteTLV(w io.Writer, typ byte, buf []byte) error { + if _, err := w.Write([]byte{typ}); err != nil { + return fmt.Errorf("write message type: %s", err) + } + + // Write the size of the message. + if err := binary.Write(w, binary.BigEndian, int64(len(buf))); err != nil { + return fmt.Errorf("write message size: %s", err) + } + + // Write the value. + if _, err := w.Write(buf); err != nil { + return fmt.Errorf("write message value: %s", err) + } + + return nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go new file mode 100644 index 000000000..8158c47a6 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go @@ -0,0 +1,105 @@ +package cluster_test + +import ( + "fmt" + "net" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "github.com/influxdb/influxdb/tcp" + "github.com/influxdb/influxdb/tsdb" +) + +type metaStore struct { + host string +} + +func (m *metaStore) Node(nodeID uint64) (*meta.NodeInfo, error) { + return &meta.NodeInfo{ + ID: nodeID, + Host: m.host, + }, nil +} + +type testService struct { + nodeID uint64 + ln net.Listener + muxln net.Listener + writeShardFunc func(shardID uint64, points []models.Point) error + createShardFunc func(database, policy string, shardID uint64) error + createMapperFunc func(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) +} + +func newTestWriteService(f func(shardID uint64, points []models.Point) error) testService { + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + panic(err) + } + + mux := tcp.NewMux() + muxln := mux.Listen(cluster.MuxHeader) + go mux.Serve(ln) + + return testService{ + writeShardFunc: f, + ln: ln, + muxln: muxln, + } +} + +func (ts *testService) Close() { + if ts.ln != nil { + ts.ln.Close() + } +} + +type serviceResponses []serviceResponse +type serviceResponse struct { + shardID uint64 + ownerID uint64 + points []models.Point +} + +func (t testService) WriteToShard(shardID uint64, points []models.Point) error { + return t.writeShardFunc(shardID, points) +} + +func (t testService) CreateShard(database, policy string, shardID uint64) error { + return t.createShardFunc(database, policy, shardID) +} + +func (t testService) CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) { + return t.createMapperFunc(shardID, stmt, chunkSize) +} + +func writeShardSuccess(shardID uint64, points []models.Point) error { + responses <- &serviceResponse{ + shardID: shardID, + points: points, + } + return nil +} + +func writeShardFail(shardID uint64, points []models.Point) error { + return fmt.Errorf("failed to write") +} + +var responses = make(chan *serviceResponse, 1024) + +func (testService) ResponseN(n int) ([]*serviceResponse, error) { + var a []*serviceResponse + for { + select { + case r := <-responses: + a = append(a, r) + if len(a) == n { + return a, nil + } + case <-time.After(time.Second): + return a, fmt.Errorf("unexpected response count: expected: %d, actual: %d", n, len(a)) + } + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go new file mode 100644 index 000000000..b8645f4a7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go @@ -0,0 +1,259 @@ +package cluster + +import ( + "encoding/json" + "fmt" + "math/rand" + "net" + "time" + + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/tsdb" +) + +// ShardMapper is responsible for providing mappers for requested shards. It is +// responsible for creating those mappers from the local store, or reaching +// out to another node on the cluster. +type ShardMapper struct { + ForceRemoteMapping bool // All shards treated as remote. Useful for testing. + + MetaStore interface { + NodeID() uint64 + Node(id uint64) (ni *meta.NodeInfo, err error) + } + + TSDBStore interface { + CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) + } + + timeout time.Duration + pool *clientPool +} + +// NewShardMapper returns a mapper of local and remote shards. +func NewShardMapper(timeout time.Duration) *ShardMapper { + return &ShardMapper{ + pool: newClientPool(), + timeout: timeout, + } +} + +// CreateMapper returns a Mapper for the given shard ID. +func (s *ShardMapper) CreateMapper(sh meta.ShardInfo, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) { + // Create a remote mapper if the local node doesn't own the shard. + if !sh.OwnedBy(s.MetaStore.NodeID()) || s.ForceRemoteMapping { + // Pick a node in a pseudo-random manner. + conn, err := s.dial(sh.Owners[rand.Intn(len(sh.Owners))].NodeID) + if err != nil { + return nil, err + } + conn.SetDeadline(time.Now().Add(s.timeout)) + + return NewRemoteMapper(conn, sh.ID, stmt, chunkSize), nil + } + + // If it is local then return the mapper from the store. + m, err := s.TSDBStore.CreateMapper(sh.ID, stmt, chunkSize) + if err != nil { + return nil, err + } + + return m, nil +} + +func (s *ShardMapper) dial(nodeID uint64) (net.Conn, error) { + ni, err := s.MetaStore.Node(nodeID) + if err != nil { + return nil, err + } + conn, err := net.Dial("tcp", ni.Host) + if err != nil { + return nil, err + } + + // Write the cluster multiplexing header byte + conn.Write([]byte{MuxHeader}) + + return conn, nil +} + +// RemoteMapper implements the tsdb.Mapper interface. It connects to a remote node, +// sends a query, and interprets the stream of data that comes back. +type RemoteMapper struct { + shardID uint64 + stmt influxql.Statement + chunkSize int + + tagsets []string + fields []string + + conn net.Conn + bufferedResponse *MapShardResponse + + unmarshallers []tsdb.UnmarshalFunc // Mapping-specific unmarshal functions. +} + +// NewRemoteMapper returns a new remote mapper using the given connection. +func NewRemoteMapper(c net.Conn, shardID uint64, stmt influxql.Statement, chunkSize int) *RemoteMapper { + return &RemoteMapper{ + conn: c, + shardID: shardID, + stmt: stmt, + chunkSize: chunkSize, + } +} + +// Open connects to the remote node and starts receiving data. +func (r *RemoteMapper) Open() (err error) { + defer func() { + if err != nil { + r.conn.Close() + } + }() + + // Build Map request. + var request MapShardRequest + request.SetShardID(r.shardID) + request.SetQuery(r.stmt.String()) + request.SetChunkSize(int32(r.chunkSize)) + + // Marshal into protocol buffers. + buf, err := request.MarshalBinary() + if err != nil { + return err + } + + // Write request. + if err := WriteTLV(r.conn, mapShardRequestMessage, buf); err != nil { + return err + } + + // Read the response. + _, buf, err = ReadTLV(r.conn) + if err != nil { + return err + } + + // Unmarshal response. + r.bufferedResponse = &MapShardResponse{} + if err := r.bufferedResponse.UnmarshalBinary(buf); err != nil { + return err + } + + if r.bufferedResponse.Code() != 0 { + return fmt.Errorf("error code %d: %s", r.bufferedResponse.Code(), r.bufferedResponse.Message()) + } + + // Decode the first response to get the TagSets. + r.tagsets = r.bufferedResponse.TagSets() + r.fields = r.bufferedResponse.Fields() + + // Set up each mapping function for this statement. + if stmt, ok := r.stmt.(*influxql.SelectStatement); ok { + for _, c := range stmt.FunctionCalls() { + fn, err := tsdb.InitializeUnmarshaller(c) + if err != nil { + return err + } + r.unmarshallers = append(r.unmarshallers, fn) + } + } + + return nil +} + +// TagSets returns the TagSets +func (r *RemoteMapper) TagSets() []string { + return r.tagsets +} + +// Fields returns RemoteMapper's Fields +func (r *RemoteMapper) Fields() []string { + return r.fields +} + +// NextChunk returns the next chunk read from the remote node to the client. +func (r *RemoteMapper) NextChunk() (chunk interface{}, err error) { + var response *MapShardResponse + if r.bufferedResponse != nil { + response = r.bufferedResponse + r.bufferedResponse = nil + } else { + response = &MapShardResponse{} + + // Read the response. + _, buf, err := ReadTLV(r.conn) + if err != nil { + return nil, err + } + + // Unmarshal response. + if err := response.UnmarshalBinary(buf); err != nil { + return nil, err + } + + if response.Code() != 0 { + return nil, fmt.Errorf("error code %d: %s", response.Code(), response.Message()) + } + } + + if response.Data() == nil { + return nil, nil + } + + moj := &tsdb.MapperOutputJSON{} + if err := json.Unmarshal(response.Data(), moj); err != nil { + return nil, err + } + mvj := []*tsdb.MapperValueJSON{} + if err := json.Unmarshal(moj.Values, &mvj); err != nil { + return nil, err + } + + // Prep the non-JSON version of Mapper output. + mo := &tsdb.MapperOutput{ + Name: moj.Name, + Tags: moj.Tags, + Fields: moj.Fields, + } + + if len(mvj) == 1 && len(mvj[0].AggData) > 0 { + // The MapperValue is carrying aggregate data, so run it through the + // custom unmarshallers for the map functions through which the data + // was mapped. + aggValues := []interface{}{} + for i, b := range mvj[0].AggData { + v, err := r.unmarshallers[i](b) + if err != nil { + return nil, err + } + aggValues = append(aggValues, v) + } + mo.Values = []*tsdb.MapperValue{&tsdb.MapperValue{ + Value: aggValues, + Tags: mvj[0].Tags, + }} + } else { + // Must be raw data instead. + for _, v := range mvj { + var rawValue interface{} + if err := json.Unmarshal(v.RawData, &rawValue); err != nil { + return nil, err + } + + mo.Values = append(mo.Values, &tsdb.MapperValue{ + Time: v.Time, + Value: rawValue, + Tags: v.Tags, + }) + } + } + + return mo, nil +} + +// Close the Mapper +func (r *RemoteMapper) Close() { + r.conn.Close() +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go new file mode 100644 index 000000000..3a80f596e --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go @@ -0,0 +1,110 @@ +package cluster + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "net" + "testing" + + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/tsdb" +) + +// remoteShardResponder implements the remoteShardConn interface. +type remoteShardResponder struct { + net.Conn + t *testing.T + rxBytes []byte + + buffer *bytes.Buffer +} + +func newRemoteShardResponder(outputs []*tsdb.MapperOutput, tagsets []string) *remoteShardResponder { + r := &remoteShardResponder{} + a := make([]byte, 0, 1024) + r.buffer = bytes.NewBuffer(a) + + // Pump the outputs in the buffer for later reading. + for _, o := range outputs { + resp := &MapShardResponse{} + resp.SetCode(0) + if o != nil { + d, _ := json.Marshal(o) + resp.SetData(d) + resp.SetTagSets(tagsets) + } + + g, _ := resp.MarshalBinary() + WriteTLV(r.buffer, mapShardResponseMessage, g) + } + + return r +} + +func (r remoteShardResponder) Close() error { return nil } +func (r remoteShardResponder) Read(p []byte) (n int, err error) { + return io.ReadFull(r.buffer, p) +} + +func (r remoteShardResponder) Write(p []byte) (n int, err error) { + if r.rxBytes == nil { + r.rxBytes = make([]byte, 0) + } + r.rxBytes = append(r.rxBytes, p...) + return len(p), nil +} + +// Ensure a RemoteMapper can process valid responses from a remote shard. +func TestShardWriter_RemoteMapper_Success(t *testing.T) { + expTagSets := []string{"tagsetA"} + expOutput := &tsdb.MapperOutput{ + Name: "cpu", + Tags: map[string]string{"host": "serverA"}, + } + + c := newRemoteShardResponder([]*tsdb.MapperOutput{expOutput, nil}, expTagSets) + + r := NewRemoteMapper(c, 1234, mustParseStmt("SELECT * FROM CPU"), 10) + if err := r.Open(); err != nil { + t.Fatalf("failed to open remote mapper: %s", err.Error()) + } + + if r.TagSets()[0] != expTagSets[0] { + t.Fatalf("incorrect tagsets received, exp %v, got %v", expTagSets, r.TagSets()) + } + + // Get first chunk from mapper. + chunk, err := r.NextChunk() + if err != nil { + t.Fatalf("failed to get next chunk from mapper: %s", err.Error()) + } + output, ok := chunk.(*tsdb.MapperOutput) + if !ok { + t.Fatal("chunk is not of expected type") + } + if output.Name != "cpu" { + t.Fatalf("received output incorrect, exp: %v, got %v", expOutput, output) + } + + // Next chunk should be nil, indicating no more data. + chunk, err = r.NextChunk() + if err != nil { + t.Fatalf("failed to get next chunk from mapper: %s", err.Error()) + } + if chunk != nil { + t.Fatal("received more chunks when none expected") + } +} + +// mustParseStmt parses a single statement or panics. +func mustParseStmt(stmt string) influxql.Statement { + q, err := influxql.ParseQuery(stmt) + if err != nil { + panic(err) + } else if len(q.Statements) != 1 { + panic(fmt.Sprintf("expected 1 statement but got %d", len(q.Statements))) + } + return q.Statements[0] +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go new file mode 100644 index 000000000..f6da1023c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go @@ -0,0 +1,165 @@ +package cluster + +import ( + "fmt" + "net" + "time" + + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "gopkg.in/fatih/pool.v2" +) + +const ( + writeShardRequestMessage byte = iota + 1 + writeShardResponseMessage + mapShardRequestMessage + mapShardResponseMessage +) + +// ShardWriter writes a set of points to a shard. +type ShardWriter struct { + pool *clientPool + timeout time.Duration + + MetaStore interface { + Node(id uint64) (ni *meta.NodeInfo, err error) + } +} + +// NewShardWriter returns a new instance of ShardWriter. +func NewShardWriter(timeout time.Duration) *ShardWriter { + return &ShardWriter{ + pool: newClientPool(), + timeout: timeout, + } +} + +// WriteShard writes time series points to a shard +func (w *ShardWriter) WriteShard(shardID, ownerID uint64, points []models.Point) error { + c, err := w.dial(ownerID) + if err != nil { + return err + } + + conn, ok := c.(*pool.PoolConn) + if !ok { + panic("wrong connection type") + } + defer func(conn net.Conn) { + conn.Close() // return to pool + }(conn) + + // Build write request. + var request WriteShardRequest + request.SetShardID(shardID) + request.AddPoints(points) + + // Marshal into protocol buffers. + buf, err := request.MarshalBinary() + if err != nil { + return err + } + + // Write request. + conn.SetWriteDeadline(time.Now().Add(w.timeout)) + if err := WriteTLV(conn, writeShardRequestMessage, buf); err != nil { + conn.MarkUnusable() + return err + } + + // Read the response. + conn.SetReadDeadline(time.Now().Add(w.timeout)) + _, buf, err = ReadTLV(conn) + if err != nil { + conn.MarkUnusable() + return err + } + + // Unmarshal response. + var response WriteShardResponse + if err := response.UnmarshalBinary(buf); err != nil { + return err + } + + if response.Code() != 0 { + return fmt.Errorf("error code %d: %s", response.Code(), response.Message()) + } + + return nil +} + +func (w *ShardWriter) dial(nodeID uint64) (net.Conn, error) { + // If we don't have a connection pool for that addr yet, create one + _, ok := w.pool.getPool(nodeID) + if !ok { + factory := &connFactory{nodeID: nodeID, clientPool: w.pool, timeout: w.timeout} + factory.metaStore = w.MetaStore + + p, err := pool.NewChannelPool(1, 3, factory.dial) + if err != nil { + return nil, err + } + w.pool.setPool(nodeID, p) + } + return w.pool.conn(nodeID) +} + +// Close closes ShardWriter's pool +func (w *ShardWriter) Close() error { + if w.pool == nil { + return fmt.Errorf("client already closed") + } + w.pool.close() + w.pool = nil + return nil +} + +const ( + maxConnections = 500 + maxRetries = 3 +) + +var errMaxConnectionsExceeded = fmt.Errorf("can not exceed max connections of %d", maxConnections) + +type connFactory struct { + nodeID uint64 + timeout time.Duration + + clientPool interface { + size() int + } + + metaStore interface { + Node(id uint64) (ni *meta.NodeInfo, err error) + } +} + +func (c *connFactory) dial() (net.Conn, error) { + if c.clientPool.size() > maxConnections { + return nil, errMaxConnectionsExceeded + } + + ni, err := c.metaStore.Node(c.nodeID) + if err != nil { + return nil, err + } + + if ni == nil { + return nil, fmt.Errorf("node %d does not exist", c.nodeID) + } + + conn, err := net.DialTimeout("tcp", ni.Host, c.timeout) + if err != nil { + return nil, err + } + + // Write a marker byte for cluster messages. + _, err = conn.Write([]byte{MuxHeader}) + if err != nil { + conn.Close() + return nil, err + } + + return conn, nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go new file mode 100644 index 000000000..d8e188d3f --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go @@ -0,0 +1,186 @@ +package cluster_test + +import ( + "net" + "strings" + "testing" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/models" +) + +// Ensure the shard writer can successful write a single request. +func TestShardWriter_WriteShard_Success(t *testing.T) { + ts := newTestWriteService(writeShardSuccess) + s := cluster.NewService(cluster.Config{}) + s.Listener = ts.muxln + s.TSDBStore = ts + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer s.Close() + defer ts.Close() + + w := cluster.NewShardWriter(time.Minute) + w.MetaStore = &metaStore{host: ts.ln.Addr().String()} + + // Build a single point. + now := time.Now() + var points []models.Point + points = append(points, models.NewPoint("cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now)) + + // Write to shard and close. + if err := w.WriteShard(1, 2, points); err != nil { + t.Fatal(err) + } else if err := w.Close(); err != nil { + t.Fatal(err) + } + + // Validate response. + responses, err := ts.ResponseN(1) + if err != nil { + t.Fatal(err) + } else if responses[0].shardID != 1 { + t.Fatalf("unexpected shard id: %d", responses[0].shardID) + } + + // Validate point. + if p := responses[0].points[0]; p.Name() != "cpu" { + t.Fatalf("unexpected name: %s", p.Name()) + } else if p.Fields()["value"] != int64(100) { + t.Fatalf("unexpected 'value' field: %d", p.Fields()["value"]) + } else if p.Tags()["host"] != "server01" { + t.Fatalf("unexpected 'host' tag: %s", p.Tags()["host"]) + } else if p.Time().UnixNano() != now.UnixNano() { + t.Fatalf("unexpected time: %s", p.Time()) + } +} + +// Ensure the shard writer can successful write a multiple requests. +func TestShardWriter_WriteShard_Multiple(t *testing.T) { + ts := newTestWriteService(writeShardSuccess) + s := cluster.NewService(cluster.Config{}) + s.Listener = ts.muxln + s.TSDBStore = ts + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer s.Close() + defer ts.Close() + + w := cluster.NewShardWriter(time.Minute) + w.MetaStore = &metaStore{host: ts.ln.Addr().String()} + + // Build a single point. + now := time.Now() + var points []models.Point + points = append(points, models.NewPoint("cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now)) + + // Write to shard twice and close. + if err := w.WriteShard(1, 2, points); err != nil { + t.Fatal(err) + } else if err := w.WriteShard(1, 2, points); err != nil { + t.Fatal(err) + } else if err := w.Close(); err != nil { + t.Fatal(err) + } + + // Validate response. + responses, err := ts.ResponseN(1) + if err != nil { + t.Fatal(err) + } else if responses[0].shardID != 1 { + t.Fatalf("unexpected shard id: %d", responses[0].shardID) + } + + // Validate point. + if p := responses[0].points[0]; p.Name() != "cpu" { + t.Fatalf("unexpected name: %s", p.Name()) + } else if p.Fields()["value"] != int64(100) { + t.Fatalf("unexpected 'value' field: %d", p.Fields()["value"]) + } else if p.Tags()["host"] != "server01" { + t.Fatalf("unexpected 'host' tag: %s", p.Tags()["host"]) + } else if p.Time().UnixNano() != now.UnixNano() { + t.Fatalf("unexpected time: %s", p.Time()) + } +} + +// Ensure the shard writer returns an error when the server fails to accept the write. +func TestShardWriter_WriteShard_Error(t *testing.T) { + ts := newTestWriteService(writeShardFail) + s := cluster.NewService(cluster.Config{}) + s.Listener = ts.muxln + s.TSDBStore = ts + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer s.Close() + defer ts.Close() + + w := cluster.NewShardWriter(time.Minute) + w.MetaStore = &metaStore{host: ts.ln.Addr().String()} + now := time.Now() + + shardID := uint64(1) + ownerID := uint64(2) + var points []models.Point + points = append(points, models.NewPoint( + "cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now, + )) + + if err := w.WriteShard(shardID, ownerID, points); err == nil || err.Error() != "error code 1: write shard 1: failed to write" { + t.Fatalf("unexpected error: %v", err) + } +} + +// Ensure the shard writer returns an error when dialing times out. +func TestShardWriter_Write_ErrDialTimeout(t *testing.T) { + ts := newTestWriteService(writeShardSuccess) + s := cluster.NewService(cluster.Config{}) + s.Listener = ts.muxln + s.TSDBStore = ts + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer s.Close() + defer ts.Close() + + w := cluster.NewShardWriter(time.Nanosecond) + w.MetaStore = &metaStore{host: ts.ln.Addr().String()} + now := time.Now() + + shardID := uint64(1) + ownerID := uint64(2) + var points []models.Point + points = append(points, models.NewPoint( + "cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now, + )) + + if err, exp := w.WriteShard(shardID, ownerID, points), "i/o timeout"; err == nil || !strings.Contains(err.Error(), exp) { + t.Fatalf("expected error %v, to contain %s", err, exp) + } +} + +// Ensure the shard writer returns an error when reading times out. +func TestShardWriter_Write_ErrReadTimeout(t *testing.T) { + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + + w := cluster.NewShardWriter(time.Millisecond) + w.MetaStore = &metaStore{host: ln.Addr().String()} + now := time.Now() + + shardID := uint64(1) + ownerID := uint64(2) + var points []models.Point + points = append(points, models.NewPoint( + "cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now, + )) + + if err := w.WriteShard(shardID, ownerID, points); err == nil || !strings.Contains(err.Error(), "i/o timeout") { + t.Fatalf("unexpected error: %s", err) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go new file mode 100644 index 000000000..06064eced --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go @@ -0,0 +1,779 @@ +package main + +import ( + "encoding/csv" + "encoding/json" + "flag" + "fmt" + "io" + "net" + "net/url" + "os" + "os/user" + "path/filepath" + "sort" + "strconv" + "strings" + "text/tabwriter" + + "github.com/influxdb/influxdb/client" + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/importer/v8" + "github.com/peterh/liner" +) + +// These variables are populated via the Go linker. +var ( + version string = "0.9" +) + +const ( + // defaultFormat is the default format of the results when issuing queries + defaultFormat = "column" + + // defaultPrecision is the default timestamp format of the results when issuing queries + defaultPrecision = "ns" + + // defaultPPS is the default points per second that the import will throttle at + // by default it's 0, which means it will not throttle + defaultPPS = 0 +) + +type CommandLine struct { + Client *client.Client + Line *liner.State + Host string + Port int + Username string + Password string + Database string + Ssl bool + RetentionPolicy string + Version string + Pretty bool // controls pretty print for json + Format string // controls the output format. Valid values are json, csv, or column + Precision string + WriteConsistency string + Execute string + ShowVersion bool + Import bool + PPS int // Controls how many points per second the import will allow via throttling + Path string + Compressed bool +} + +func main() { + c := CommandLine{} + + fs := flag.NewFlagSet("InfluxDB shell version "+version, flag.ExitOnError) + fs.StringVar(&c.Host, "host", client.DefaultHost, "Influxdb host to connect to.") + fs.IntVar(&c.Port, "port", client.DefaultPort, "Influxdb port to connect to.") + fs.StringVar(&c.Username, "username", c.Username, "Username to connect to the server.") + fs.StringVar(&c.Password, "password", c.Password, `Password to connect to the server. Leaving blank will prompt for password (--password="").`) + fs.StringVar(&c.Database, "database", c.Database, "Database to connect to the server.") + fs.BoolVar(&c.Ssl, "ssl", false, "Use https for connecting to cluster.") + fs.StringVar(&c.Format, "format", defaultFormat, "Format specifies the format of the server responses: json, csv, or column.") + fs.StringVar(&c.Precision, "precision", defaultPrecision, "Precision specifies the format of the timestamp: rfc3339,h,m,s,ms,u or ns.") + fs.StringVar(&c.WriteConsistency, "consistency", "any", "Set write consistency level: any, one, quorum, or all.") + fs.BoolVar(&c.Pretty, "pretty", false, "Turns on pretty print for the json format.") + fs.StringVar(&c.Execute, "execute", c.Execute, "Execute command and quit.") + fs.BoolVar(&c.ShowVersion, "version", false, "Displays the InfluxDB version.") + fs.BoolVar(&c.Import, "import", false, "Import a previous database.") + fs.IntVar(&c.PPS, "pps", defaultPPS, "How many points per second the import will allow. By default it is zero and will not throttle importing.") + fs.StringVar(&c.Path, "path", "", "path to the file to import") + fs.BoolVar(&c.Compressed, "compressed", false, "set to true if the import file is compressed") + + // Define our own custom usage to print + fs.Usage = func() { + fmt.Println(`Usage of influx: + -version + Display the version and exit. + -host 'host name' + Host to connect to. + -port 'port #' + Port to connect to. + -database 'database name' + Database to connect to the server. + -password 'password' + Password to connect to the server. Leaving blank will prompt for password (--password ''). + -username 'username' + Username to connect to the server. + -ssl + Use https for requests. + -execute 'command' + Execute command and quit. + -format 'json|csv|column' + Format specifies the format of the server responses: json, csv, or column. + -precision 'rfc3339|h|m|s|ms|u|ns' + Precision specifies the format of the timestamp: rfc3339, h, m, s, ms, u or ns. + -consistency 'any|one|quorum|all' + Set write consistency level: any, one, quorum, or all + -pretty + Turns on pretty print for the json format. + -import + Import a previous database export from file + -pps + How many points per second the import will allow. By default it is zero and will not throttle importing. + -path + Path to file to import + -compressed + Set to true if the import file is compressed + +Examples: + + # Use influx in a non-interactive mode to query the database "metrics" and pretty print json: + $ influx -database 'metrics' -execute 'select * from cpu' -format 'json' -pretty + + # Connect to a specific database on startup and set database context: + $ influx -database 'metrics' -host 'localhost' -port '8086' +`) + } + fs.Parse(os.Args[1:]) + + if c.ShowVersion { + showVersion() + os.Exit(0) + } + + var promptForPassword bool + // determine if they set the password flag but provided no value + for _, v := range os.Args { + v = strings.ToLower(v) + if (strings.HasPrefix(v, "-password") || strings.HasPrefix(v, "--password")) && c.Password == "" { + promptForPassword = true + break + } + } + + c.Line = liner.NewLiner() + defer c.Line.Close() + + if promptForPassword { + p, e := c.Line.PasswordPrompt("password: ") + if e != nil { + fmt.Println("Unable to parse password.") + } else { + c.Password = p + } + } + + if err := c.connect(""); err != nil { + + } + if c.Execute == "" && !c.Import { + fmt.Printf("Connected to %s version %s\n", c.Client.Addr(), c.Version) + } + + if c.Execute != "" { + // Modify precision before executing query + c.SetPrecision(c.Precision) + if err := c.ExecuteQuery(c.Execute); err != nil { + c.Line.Close() + os.Exit(1) + } + c.Line.Close() + os.Exit(0) + } + + if c.Import { + path := net.JoinHostPort(c.Host, strconv.Itoa(c.Port)) + u, e := client.ParseConnectionString(path, c.Ssl) + if e != nil { + fmt.Println(e) + return + } + + config := v8.NewConfig() + config.Username = c.Username + config.Password = c.Password + config.Precision = "ns" + config.WriteConsistency = "any" + config.Path = c.Path + config.Version = version + config.URL = u + config.Compressed = c.Compressed + config.PPS = c.PPS + config.Precision = c.Precision + + i := v8.NewImporter(config) + if err := i.Import(); err != nil { + fmt.Printf("ERROR: %s\n", err) + c.Line.Close() + os.Exit(1) + } + c.Line.Close() + os.Exit(0) + } + + showVersion() + + var historyFile string + usr, err := user.Current() + // Only load history if we can get the user + if err == nil { + historyFile = filepath.Join(usr.HomeDir, ".influx_history") + + if f, err := os.Open(historyFile); err == nil { + c.Line.ReadHistory(f) + f.Close() + } + } + + for { + l, e := c.Line.Prompt("> ") + if e != nil { + break + } + if c.ParseCommand(l) { + // write out the history + if len(historyFile) > 0 { + c.Line.AppendHistory(l) + if f, err := os.Create(historyFile); err == nil { + c.Line.WriteHistory(f) + f.Close() + } + } + } else { + break // exit main loop + } + } +} + +func showVersion() { + fmt.Println("InfluxDB shell " + version) +} + +func (c *CommandLine) ParseCommand(cmd string) bool { + lcmd := strings.TrimSpace(strings.ToLower(cmd)) + switch { + case strings.HasPrefix(lcmd, "exit"): + // signal the program to exit + return false + case strings.HasPrefix(lcmd, "gopher"): + c.gopher() + case strings.HasPrefix(lcmd, "connect"): + c.connect(cmd) + case strings.HasPrefix(lcmd, "auth"): + c.SetAuth(cmd) + case strings.HasPrefix(lcmd, "help"): + c.help() + case strings.HasPrefix(lcmd, "format"): + c.SetFormat(cmd) + case strings.HasPrefix(lcmd, "precision"): + c.SetPrecision(cmd) + case strings.HasPrefix(lcmd, "consistency"): + c.SetWriteConsistency(cmd) + case strings.HasPrefix(lcmd, "settings"): + c.Settings() + case strings.HasPrefix(lcmd, "pretty"): + c.Pretty = !c.Pretty + if c.Pretty { + fmt.Println("Pretty print enabled") + } else { + fmt.Println("Pretty print disabled") + } + case strings.HasPrefix(lcmd, "use"): + c.use(cmd) + case strings.HasPrefix(lcmd, "insert"): + c.Insert(cmd) + case lcmd == "": + break + default: + c.ExecuteQuery(cmd) + } + return true +} + +func (c *CommandLine) connect(cmd string) error { + var cl *client.Client + var u url.URL + + // Remove the "connect" keyword if it exists + path := strings.TrimSpace(strings.Replace(cmd, "connect", "", -1)) + + // If they didn't provide a connection string, use the current settings + if path == "" { + path = net.JoinHostPort(c.Host, strconv.Itoa(c.Port)) + } + + var e error + u, e = client.ParseConnectionString(path, c.Ssl) + if e != nil { + return e + } + + config := client.NewConfig() + config.URL = u + config.Username = c.Username + config.Password = c.Password + config.UserAgent = "InfluxDBShell/" + version + config.Precision = c.Precision + cl, err := client.NewClient(config) + if err != nil { + return fmt.Errorf("Could not create client %s", err) + } + c.Client = cl + if _, v, e := c.Client.Ping(); e != nil { + return fmt.Errorf("Failed to connect to %s\n", c.Client.Addr()) + } else { + c.Version = v + } + return nil +} + +func (c *CommandLine) SetAuth(cmd string) { + // If they pass in the entire command, we should parse it + // auth + args := strings.Fields(cmd) + if len(args) == 3 { + args = args[1:] + } else { + args = []string{} + } + + if len(args) == 2 { + c.Username = args[0] + c.Password = args[1] + } else { + u, e := c.Line.Prompt("username: ") + if e != nil { + fmt.Printf("Unable to process input: %s", e) + return + } + c.Username = strings.TrimSpace(u) + p, e := c.Line.PasswordPrompt("password: ") + if e != nil { + fmt.Printf("Unable to process input: %s", e) + return + } + c.Password = p + } + + // Update the client as well + c.Client.SetAuth(c.Username, c.Password) +} + +func (c *CommandLine) use(cmd string) { + args := strings.Split(strings.TrimSuffix(strings.TrimSpace(cmd), ";"), " ") + if len(args) != 2 { + fmt.Printf("Could not parse database name from %q.\n", cmd) + return + } + d := args[1] + c.Database = d + fmt.Printf("Using database %s\n", d) +} + +func (c *CommandLine) SetPrecision(cmd string) { + // Remove the "precision" keyword if it exists + cmd = strings.TrimSpace(strings.Replace(cmd, "precision", "", -1)) + // normalize cmd + cmd = strings.ToLower(cmd) + + switch cmd { + case "h", "m", "s", "ms", "u", "ns": + c.Precision = cmd + c.Client.SetPrecision(c.Precision) + case "rfc3339": + c.Precision = "" + c.Client.SetPrecision(c.Precision) + default: + fmt.Printf("Unknown precision %q. Please use rfc3339, h, m, s, ms, u or ns.\n", cmd) + } +} + +func (c *CommandLine) SetFormat(cmd string) { + // Remove the "format" keyword if it exists + cmd = strings.TrimSpace(strings.Replace(cmd, "format", "", -1)) + // normalize cmd + cmd = strings.ToLower(cmd) + + switch cmd { + case "json", "csv", "column": + c.Format = cmd + default: + fmt.Printf("Unknown format %q. Please use json, csv, or column.\n", cmd) + } +} + +func (c *CommandLine) SetWriteConsistency(cmd string) { + // Remove the "consistency" keyword if it exists + cmd = strings.TrimSpace(strings.Replace(cmd, "consistency", "", -1)) + // normalize cmd + cmd = strings.ToLower(cmd) + + _, err := cluster.ParseConsistencyLevel(cmd) + if err != nil { + fmt.Printf("Unknown consistency level %q. Please use any, one, quorum, or all.\n", cmd) + return + } + c.WriteConsistency = cmd +} + +// isWhitespace returns true if the rune is a space, tab, or newline. +func isWhitespace(ch rune) bool { return ch == ' ' || ch == '\t' || ch == '\n' } + +// isLetter returns true if the rune is a letter. +func isLetter(ch rune) bool { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') } + +// isDigit returns true if the rune is a digit. +func isDigit(ch rune) bool { return (ch >= '0' && ch <= '9') } + +// isIdentFirstChar returns true if the rune can be used as the first char in an unquoted identifer. +func isIdentFirstChar(ch rune) bool { return isLetter(ch) || ch == '_' } + +// isIdentChar returns true if the rune can be used in an unquoted identifier. +func isNotIdentChar(ch rune) bool { return !(isLetter(ch) || isDigit(ch) || ch == '_') } + +func parseUnquotedIdentifier(stmt string) (string, string) { + if fields := strings.FieldsFunc(stmt, isNotIdentChar); len(fields) > 0 { + return fields[0], strings.TrimPrefix(stmt, fields[0]) + } + return "", stmt +} + +func parseDoubleQuotedIdentifier(stmt string) (string, string) { + escapeNext := false + fields := strings.FieldsFunc(stmt, func(ch rune) bool { + if ch == '\\' { + escapeNext = true + } else if ch == '"' { + if !escapeNext { + return true + } + escapeNext = false + } + return false + }) + if len(fields) > 0 { + return fields[0], strings.TrimPrefix(stmt, "\""+fields[0]+"\"") + } + return "", stmt +} + +func parseNextIdentifier(stmt string) (ident, remainder string) { + if len(stmt) > 0 { + switch { + case isWhitespace(rune(stmt[0])): + return parseNextIdentifier(stmt[1:]) + case isIdentFirstChar(rune(stmt[0])): + return parseUnquotedIdentifier(stmt) + case stmt[0] == '"': + return parseDoubleQuotedIdentifier(stmt) + } + } + return "", stmt +} + +func (c *CommandLine) parseInto(stmt string) string { + ident, stmt := parseNextIdentifier(stmt) + if strings.HasPrefix(stmt, ".") { + c.Database = ident + fmt.Printf("Using database %s\n", c.Database) + ident, stmt = parseNextIdentifier(stmt[1:]) + } + if strings.HasPrefix(stmt, " ") { + c.RetentionPolicy = ident + fmt.Printf("Using retention policy %s\n", c.RetentionPolicy) + return stmt[1:] + } + return stmt +} + +func (c *CommandLine) Insert(stmt string) error { + i, point := parseNextIdentifier(stmt) + if !strings.EqualFold(i, "insert") { + fmt.Printf("ERR: found %s, expected INSERT\n", i) + return nil + } + if i, r := parseNextIdentifier(point); strings.EqualFold(i, "into") { + point = c.parseInto(r) + } + _, err := c.Client.Write(client.BatchPoints{ + Points: []client.Point{ + client.Point{Raw: point}, + }, + Database: c.Database, + RetentionPolicy: c.RetentionPolicy, + Precision: "n", + WriteConsistency: c.WriteConsistency, + }) + if err != nil { + fmt.Printf("ERR: %s\n", err) + if c.Database == "" { + fmt.Println("Note: error may be due to not setting a database or retention policy.") + fmt.Println(`Please set a database with the command "use " or`) + fmt.Println("INSERT INTO . ") + } + return err + } + return nil +} + +func (c *CommandLine) ExecuteQuery(query string) error { + response, err := c.Client.Query(client.Query{Command: query, Database: c.Database}) + if err != nil { + fmt.Printf("ERR: %s\n", err) + return err + } + c.FormatResponse(response, os.Stdout) + if err := response.Error(); err != nil { + fmt.Printf("ERR: %s\n", response.Error()) + if c.Database == "" { + fmt.Println("Warning: It is possible this error is due to not setting a database.") + fmt.Println(`Please set a database with the command "use ".`) + } + return err + } + return nil +} + +func (c *CommandLine) FormatResponse(response *client.Response, w io.Writer) { + switch c.Format { + case "json": + c.writeJSON(response, w) + case "csv": + c.writeCSV(response, w) + case "column": + c.writeColumns(response, w) + default: + fmt.Fprintf(w, "Unknown output format %q.\n", c.Format) + } +} + +func (c *CommandLine) writeJSON(response *client.Response, w io.Writer) { + var data []byte + var err error + if c.Pretty { + data, err = json.MarshalIndent(response, "", " ") + } else { + data, err = json.Marshal(response) + } + if err != nil { + fmt.Fprintf(w, "Unable to parse json: %s\n", err) + return + } + fmt.Fprintln(w, string(data)) +} + +func (c *CommandLine) writeCSV(response *client.Response, w io.Writer) { + csvw := csv.NewWriter(w) + for _, result := range response.Results { + // Create a tabbed writer for each result as they won't always line up + rows := c.formatResults(result, "\t") + for _, r := range rows { + csvw.Write(strings.Split(r, "\t")) + } + csvw.Flush() + } +} + +func (c *CommandLine) writeColumns(response *client.Response, w io.Writer) { + for _, result := range response.Results { + // Create a tabbed writer for each result a they won't always line up + w := new(tabwriter.Writer) + w.Init(os.Stdout, 0, 8, 1, '\t', 0) + csv := c.formatResults(result, "\t") + for _, r := range csv { + fmt.Fprintln(w, r) + } + w.Flush() + } +} + +// formatResults will behave differently if you are formatting for columns or csv +func (c *CommandLine) formatResults(result client.Result, separator string) []string { + rows := []string{} + // Create a tabbed writer for each result a they won't always line up + for i, row := range result.Series { + // gather tags + tags := []string{} + for k, v := range row.Tags { + tags = append(tags, fmt.Sprintf("%s=%s", k, v)) + sort.Strings(tags) + } + + columnNames := []string{} + + // Only put name/tags in a column if format is csv + if c.Format == "csv" { + if len(tags) > 0 { + columnNames = append([]string{"tags"}, columnNames...) + } + + if row.Name != "" { + columnNames = append([]string{"name"}, columnNames...) + } + } + + for _, column := range row.Columns { + columnNames = append(columnNames, column) + } + + // Output a line separator if we have more than one set or results and format is column + if i > 0 && c.Format == "column" { + rows = append(rows, "") + } + + // If we are column format, we break out the name/tag to seperate lines + if c.Format == "column" { + if row.Name != "" { + n := fmt.Sprintf("name: %s", row.Name) + rows = append(rows, n) + if len(tags) == 0 { + l := strings.Repeat("-", len(n)) + rows = append(rows, l) + } + } + if len(tags) > 0 { + t := fmt.Sprintf("tags: %s", (strings.Join(tags, ", "))) + rows = append(rows, t) + } + } + + rows = append(rows, strings.Join(columnNames, separator)) + + // if format is column, break tags to their own line/format + if c.Format == "column" && len(tags) > 0 { + lines := []string{} + for _, columnName := range columnNames { + lines = append(lines, strings.Repeat("-", len(columnName))) + } + rows = append(rows, strings.Join(lines, separator)) + } + + for _, v := range row.Values { + var values []string + if c.Format == "csv" { + if row.Name != "" { + values = append(values, row.Name) + } + if len(tags) > 0 { + values = append(values, strings.Join(tags, ",")) + } + } + + for _, vv := range v { + values = append(values, interfaceToString(vv)) + } + rows = append(rows, strings.Join(values, separator)) + } + // Outout a line separator if in column format + if c.Format == "column" { + rows = append(rows, "") + } + } + return rows +} + +func interfaceToString(v interface{}) string { + switch t := v.(type) { + case nil: + return "" + case bool: + return fmt.Sprintf("%v", v) + case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, uintptr: + return fmt.Sprintf("%d", t) + case float32, float64: + return fmt.Sprintf("%v", t) + default: + return fmt.Sprintf("%v", t) + } +} + +func (c *CommandLine) Settings() { + w := new(tabwriter.Writer) + w.Init(os.Stdout, 0, 8, 1, '\t', 0) + if c.Port > 0 { + fmt.Fprintf(w, "Host\t%s:%d\n", c.Host, c.Port) + } else { + fmt.Fprintf(w, "Host\t%s\n", c.Host) + } + fmt.Fprintf(w, "Username\t%s\n", c.Username) + fmt.Fprintf(w, "Database\t%s\n", c.Database) + fmt.Fprintf(w, "Pretty\t%v\n", c.Pretty) + fmt.Fprintf(w, "Format\t%s\n", c.Format) + fmt.Fprintf(w, "Write Consistency\t%s\n", c.WriteConsistency) + fmt.Fprintln(w) + w.Flush() +} + +func (c *CommandLine) help() { + fmt.Println(`Usage: + connect connect to another node + auth prompt for username and password + pretty toggle pretty print + use set current databases + format set the output format: json, csv, or column + precision set the timestamp format: h,m,s,ms,u,ns + consistency set write consistency level: any, one, quorum, or all + settings output the current settings for the shell + exit quit the influx shell + + show databases show database names + show series show series information + show measurements show measurement information + show tag keys show tag key information + show tag values show tag value information + + a full list of influxql commands can be found at: + https://influxdb.com/docs/v0.9/query_language/spec.html +`) +} + +func (c *CommandLine) gopher() { + fmt.Println(` + .-::-::://:-::- .:/++/' + '://:-''/oo+//++o+/.://o- ./+: + .:-. '++- .o/ '+yydhy' o- + .:/. .h: :osoys .smMN- :/ + -/:.' s- /MMMymh. '/y/ s' + -+s:'''' d -mMMms// '-/o: + -/++/++/////:. o: '... s- :s. + :+-+s-' ':/' 's- /+ 'o: + '+-'o: /ydhsh. '//. '-o- o- + .y. o: .MMMdm+y ':+++:::/+:.' s: + .-h/ y- 'sdmds'h -+ydds:::-.' 'h. + .//-.d' o: '.' 'dsNMMMNh:.:++' :y + +y. 'd 's. .s:mddds: ++ o/ + 'N- odd 'o/. './o-s-' .---+++' o- + 'N' yNd .://:/:::::. -s -+/s/./s' 'o/' + so' .h '''' ////s: '+. .s +y' + os/-.y' 's' 'y::+ +d' + '.:o/ -+:-:.' so.---.' + o' 'd-.''/s' + .s' :y.''.y + -s mo:::' + :: yh + // '''' /M' + o+ .s///:/. 'N: + :+ /: -s' ho + 's- -/s/:+/.+h' +h + ys' ':' '-. -d + oh .h + /o .s + s. .h + -y .d + m/ -h + +d /o + 'N- y: + h: m. + s- -d + o- s+ + +- 'm' + s/ oo--. + y- /s ':+' + s' 'od--' .d: + -+ ':o: ':+-/+ + y- .:+- ' + //o- '.:+/. + .-:+/' ''-/+/. + ./:' ''.:o+/-' + .+o:/:/+-' ''.-+ooo/-' + o: -h///++////-. + /: .o/ + //+ 'y + ./sooy. + +`) +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main_test.go new file mode 100644 index 000000000..045fa319e --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main_test.go @@ -0,0 +1,219 @@ +package main_test + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "net/url" + "testing" + + "github.com/influxdb/influxdb/client" + main "github.com/influxdb/influxdb/cmd/influx" +) + +func TestParseCommand_CommandsExist(t *testing.T) { + t.Parallel() + c := main.CommandLine{} + tests := []struct { + cmd string + }{ + {cmd: "gopher"}, + {cmd: "connect"}, + {cmd: "help"}, + {cmd: "pretty"}, + {cmd: "use"}, + {cmd: ""}, // test that a blank command just returns + } + for _, test := range tests { + if !c.ParseCommand(test.cmd) { + t.Fatalf(`Command failed for %q.`, test.cmd) + } + } +} + +func TestParseCommand_TogglePretty(t *testing.T) { + t.Parallel() + c := main.CommandLine{} + if c.Pretty { + t.Fatalf(`Pretty should be false.`) + } + c.ParseCommand("pretty") + if !c.Pretty { + t.Fatalf(`Pretty should be true.`) + } + c.ParseCommand("pretty") + if c.Pretty { + t.Fatalf(`Pretty should be false.`) + } +} + +func TestParseCommand_Exit(t *testing.T) { + t.Parallel() + c := main.CommandLine{} + tests := []struct { + cmd string + }{ + {cmd: "exit"}, + {cmd: " exit"}, + {cmd: "exit "}, + {cmd: "Exit "}, + } + + for _, test := range tests { + if c.ParseCommand(test.cmd) { + t.Fatalf(`Command "exit" failed for %q.`, test.cmd) + } + } +} + +func TestParseCommand_Use(t *testing.T) { + t.Parallel() + c := main.CommandLine{} + tests := []struct { + cmd string + }{ + {cmd: "use db"}, + {cmd: " use db"}, + {cmd: "use db "}, + {cmd: "use db;"}, + {cmd: "use db; "}, + {cmd: "Use db"}, + } + + for _, test := range tests { + if !c.ParseCommand(test.cmd) { + t.Fatalf(`Command "use" failed for %q.`, test.cmd) + } + + if c.Database != "db" { + t.Fatalf(`Command "use" changed database to %q. Expected db`, c.Database) + } + } +} + +func TestParseCommand_Consistency(t *testing.T) { + t.Parallel() + c := main.CommandLine{} + tests := []struct { + cmd string + }{ + {cmd: "consistency one"}, + {cmd: " consistency one"}, + {cmd: "consistency one "}, + {cmd: "consistency one;"}, + {cmd: "consistency one; "}, + {cmd: "Consistency one"}, + } + + for _, test := range tests { + if !c.ParseCommand(test.cmd) { + t.Fatalf(`Command "consistency" failed for %q.`, test.cmd) + } + + if c.WriteConsistency != "one" { + t.Fatalf(`Command "consistency" changed consistency to %q. Expected one`, c.WriteConsistency) + } + } +} + +func TestParseCommand_Insert(t *testing.T) { + t.Parallel() + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + var data client.Response + w.WriteHeader(http.StatusNoContent) + _ = json.NewEncoder(w).Encode(data) + })) + defer ts.Close() + + u, _ := url.Parse(ts.URL) + config := client.Config{URL: *u} + c, err := client.NewClient(config) + if err != nil { + t.Fatalf("unexpected error. expected %v, actual %v", nil, err) + } + m := main.CommandLine{Client: c} + + tests := []struct { + cmd string + }{ + {cmd: "INSERT cpu,host=serverA,region=us-west value=1.0"}, + {cmd: " INSERT cpu,host=serverA,region=us-west value=1.0"}, + {cmd: "INSERT cpu,host=serverA,region=us-west value=1.0"}, + {cmd: "insert cpu,host=serverA,region=us-west value=1.0 "}, + {cmd: "insert"}, + {cmd: "Insert "}, + {cmd: "insert c"}, + {cmd: "insert int"}, + } + + for _, test := range tests { + if !m.ParseCommand(test.cmd) { + t.Fatalf(`Command "insert" failed for %q.`, test.cmd) + } + } +} + +func TestParseCommand_InsertInto(t *testing.T) { + t.Parallel() + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + var data client.Response + w.WriteHeader(http.StatusNoContent) + _ = json.NewEncoder(w).Encode(data) + })) + defer ts.Close() + + u, _ := url.Parse(ts.URL) + config := client.Config{URL: *u} + c, err := client.NewClient(config) + if err != nil { + t.Fatalf("unexpected error. expected %v, actual %v", nil, err) + } + m := main.CommandLine{Client: c} + + tests := []struct { + cmd, db, rp string + }{ + { + cmd: `INSERT INTO test cpu,host=serverA,region=us-west value=1.0`, + db: "", + rp: "test", + }, + { + cmd: ` INSERT INTO .test cpu,host=serverA,region=us-west value=1.0`, + db: "", + rp: "test", + }, + { + cmd: `INSERT INTO "test test" cpu,host=serverA,region=us-west value=1.0`, + db: "", + rp: "test test", + }, + { + cmd: `Insert iNTO test.test cpu,host=serverA,region=us-west value=1.0`, + db: "test", + rp: "test", + }, + { + cmd: `insert into "test test" cpu,host=serverA,region=us-west value=1.0`, + db: "test", + rp: "test test", + }, + { + cmd: `insert into "d b"."test test" cpu,host=serverA,region=us-west value=1.0`, + db: "d b", + rp: "test test", + }, + } + + for _, test := range tests { + if !m.ParseCommand(test.cmd) { + t.Fatalf(`Command "insert into" failed for %q.`, test.cmd) + } + if m.Database != test.db { + t.Fatalf(`Command "insert into" db parsing failed, expected: %q, actual: %q`, test.db, m.Database) + } + if m.RetentionPolicy != test.rp { + t.Fatalf(`Command "insert into" rp parsing failed, expected: %q, actual: %q`, test.rp, m.RetentionPolicy) + } + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml new file mode 100644 index 000000000..dfa60b083 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml @@ -0,0 +1,30 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "0s" + database = "stress" + precision = "n" + address = "localhost:8086" + reset_database = true + start_date = "2006-Jan-02" + +[[series]] + tick = "10s" + jitter = false + point_count = 1000000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 100000 + + [[series.tag]] + key = "host" + value = "server" + + [[series.tag]] + key = "location" + value = "loc" + + [[series.field]] + key = "value" + type = "float64-flat" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml new file mode 100644 index 000000000..87b00932b --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml @@ -0,0 +1,30 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "0s" + database = "stress" + precision = "n" + address = "localhost:8086" + reset_database = true + start_date = "2006-Jan-02" + +[[series]] + tick = "1ns" + jitter = true + point_count = 100000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 100000 + + [[series.tag]] + key = "host" + value = "server" + + [[series.tag]] + key = "location" + value = "loc" + + [[series.field]] + key = "value" + type = "float64" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml new file mode 100644 index 000000000..7f2c3d03d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml @@ -0,0 +1,47 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "0s" + database = "stress" + precision = "s" + address = "localhost:8086" + reset_database = true + start_date = "2006-Jan-02" + +[[series]] + tick = "5s" + jitter = false + point_count = 10000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 10000 + + # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value) + + [[series.tag]] + key = "host" + value = "server" + + [[series.tag]] + key = "location" + value = "loc" + + [[series.field]] + key = "value" + type = "float64" + + # Doesnt work as expected +## [[series.field]] +## key = "value-2" +## type = "float64-inc" +## +## [[series.field]] +## key = "value-3" +## type = "float64-inc+" + + # Has 80% probability of being a constant value + [[series.field]] + key = "flat_value" + type = "float64-flat" + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml new file mode 100644 index 000000000..8d28f4f1e --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml @@ -0,0 +1,32 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "0s" + database = "stress" + precision = "s" + address = "localhost:8086" + reset_database = true + start_date = "2006-Jan-02" + +[[series]] + tick = "5s" + jitter = false + point_count = 10000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 10000 + + # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value) + + [[series.tag]] + key = "host" + value = "server" + + [[series.tag]] + key = "location" + value = "loc" + + [[series.field]] + key = "value" + type = "float64" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml new file mode 100644 index 000000000..6684e9c20 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml @@ -0,0 +1,33 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 5000 + batch_interval = "0s" + database = "stress" + precision = "s" + address = "localhost:8086" + reset_database = true + start_date = "2006-Jan-02" + +[[series]] + tick = "5s" + jitter = false + point_count = 50 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 100000 + + # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value) + + [[series.tag]] + key = "host" + value = "idk" + + [[series.tag]] + key = "location" + value = "lame" + + [[series.field]] + key = "value" + type = "float64" + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml new file mode 100644 index 000000000..38b860204 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml @@ -0,0 +1,34 @@ +channel_buffer_size = 100000 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "0s" + database = "stress" + precision = "s" + address = "localhost:8086" + reset_database = true + start_date = "Jan 2, 2006 at 3:04pm (MST)" + +[[series]] + tick = "5s" + jitter = true + point_count = 10000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 10000 + + # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value) + + [[series.tag]] + key = "host" + value = "idk" + + [[series.tag]] + key = "location" + value = "lame" + + [[series.field]] + key = "value" + type = "float64" + + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml new file mode 100644 index 000000000..ec193278a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml @@ -0,0 +1,30 @@ +channel_buffer_size = 100 + +[write] + concurrency = 10 + batch_size = 10000 + batch_interval = "1s" + database = "stress" + precision = "n" + address = "localhost:8086" + reset_database = true + +[[series]] + tick = "5s" + jitter = true + point_count = 10000 # number of points that will be written for each of the series + measurement = "cpu" + series_count = 100000 + + [[series.tag]] + key = "host" + value = "server" + + [[series.tag]] + key = "location" + value = "loc" + + [[series.field]] + key = "value" + type = "float64" + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml new file mode 100644 index 000000000..b188ef4d1 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml @@ -0,0 +1,114 @@ +# Set the buffer size for the channel +# that sends points to the influxdb +# client +channel_buffer_size = 100000 + +# Configuration settings for the +# stress test +[write] + # How many concurrent writers to the db + concurrency = 10 + # Size of batches that are sent to db + batch_size = 5000 + # Interval between each batch + batch_interval = "0s" + # Database that is being written to + database = "stress" + # Precision of points that are being written + precision = "n" + # Address of the Influxdb instance + address = "localhost:8086" + # Drop and Create new DB + reset_database = true + # The date for the first point that is written into influx + start_date = "2006-Jan-02" + +# Describes the schema for series that will be +# written +[[series]] + # How much time between each timestamp + tick = "5s" + # Randomize timestamp a bit + jitter = false + # number of points that will be written for each of the series + point_count = 1000 + # name of the measurement that will be written + measurement = "cpu" + series_count = 10000 + + # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value) + # tag_count = 20 + + # Defines a tag for a series + [[series.tag]] + key = "host" + value = "idk" + + [[series.tag]] + key = "location" + value = "lame" + + # Defines a field for a series + [[series.field]] + key = "value" + type = "float64" + + [[series.field]] + key = "percent" + type = "int" + + [[series.field]] + key = "idk" + type = "bool" + + [[series.field]] + key = "default" + +[[series]] + tick = "1ns" + point_count = 100 # number of points that will be written for each of the series + measurement = "mem" + series_count = 100000 + + [[series.tag]] + key = "host" + value = "idk" + + [[series.tag]] + key = "location" + value = "lame" + + [[series.field]] + key = "value" + type = "float64" + + [[series.field]] + key = "loc" + type = "float64" + + [[series.field]] + key = "sunny" + type = "bool" + + [[series.field]] + key = "idk" + type = "int" + +# Generates queries of the form +# SELECT aggregates(values) FROM measurements WHERE time > current_timespan - offset +[measurement_query] + enabled = true + concurrency = 10 + aggregates = ["mean", "count"] + fields = ["value"] + offset = "5h" + +# Generates queries of the form +# SELECT aggregates(values) FROM measurements WHERE tag-key='tag-values-1' +[series_query] + enabled = true + concurrency = 1 + aggregates = ["mean", "count"] + fields = ["value"] + # Interval between queries + interval = "50ms" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go new file mode 100644 index 000000000..660007125 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go @@ -0,0 +1,121 @@ +package main + +import ( + "flag" + "fmt" + "runtime" + "sort" + "time" + + "github.com/influxdb/influxdb/stress" +) + +var ( + batchSize = flag.Int("batchsize", 5000, "number of points per batch") + seriesCount = flag.Int("series", 100000, "number of unique series to create") + pointCount = flag.Int("points", 100, "number of points per series to create") + concurrency = flag.Int("concurrency", 10, "number of simultaneous writes to run") + batchInterval = flag.Duration("batchinterval", 0*time.Second, "duration between batches") + database = flag.String("database", "stress", "name of database") + address = flag.String("addr", "localhost:8086", "IP address and port of database (e.g., localhost:8086)") + precision = flag.String("precision", "n", "The precision that points in the database will be with") + test = flag.String("test", "", "The stress test file") +) + +var ms runner.Measurements + +func init() { + flag.Var(&ms, "m", "comma-separated list of intervals to use between events") +} + +func main() { + var cfg *runner.Config + var err error + + runtime.GOMAXPROCS(runtime.NumCPU()) + flag.Parse() + + cfg = runner.NewConfig() + + if len(ms) == 0 { + ms = append(ms, "cpu") + } + + for _, m := range ms { + cfg.Series = append(cfg.Series, runner.NewSeries(m, 100, 100000)) + } + + if *test != "" { + cfg, err = runner.DecodeFile(*test) + + if err != nil { + fmt.Println(err) + return + } + + } + + d := make(chan struct{}) + seriesQueryResults := make(chan runner.QueryResults) + + if cfg.SeriesQuery.Enabled { + go runner.SeriesQuery(cfg, d, seriesQueryResults) + } + + measurementQueryResults := make(chan runner.QueryResults) + + ts := make(chan time.Time) + if cfg.MeasurementQuery.Enabled { + go runner.MeasurementQuery(cfg, ts, measurementQueryResults) + } + + // Get the stress results + totalPoints, failedRequests, responseTimes, timer := runner.Run(cfg, d, ts) + + sort.Sort(sort.Reverse(sort.Interface(responseTimes))) + + total := int64(0) + for _, t := range responseTimes { + total += int64(t.Value) + } + mean := total / int64(len(responseTimes)) + + fmt.Printf("Wrote %d points at average rate of %.0f\n", totalPoints, float64(totalPoints)/timer.Elapsed().Seconds()) + fmt.Printf("%d requests failed for %d total points that didn't get posted.\n", failedRequests, failedRequests**batchSize) + fmt.Println("Average response time: ", time.Duration(mean)) + fmt.Println("Slowest response times:") + for _, r := range responseTimes[:100] { + fmt.Println(time.Duration(r.Value)) + } + + // Get series query results + if cfg.SeriesQuery.Enabled { + qrs := <-seriesQueryResults + + queryTotal := int64(0) + for _, qt := range qrs.ResponseTimes { + queryTotal += int64(qt.Value) + } + seriesQueryMean := queryTotal / int64(len(qrs.ResponseTimes)) + + fmt.Printf("Queried Series %d times with a average response time of %v milliseconds\n", qrs.TotalQueries, time.Duration(seriesQueryMean).Seconds()*1000) + + } + + // Get measurement query results + if cfg.MeasurementQuery.Enabled { + qrs := <-measurementQueryResults + + queryTotal := int64(0) + for _, qt := range qrs.ResponseTimes { + queryTotal += int64(qt.Value) + } + seriesQueryMean := queryTotal / int64(len(qrs.ResponseTimes)) + + fmt.Printf("Queried Measurement %d times with a average response time of %v milliseconds\n", qrs.TotalQueries, time.Duration(seriesQueryMean).Seconds()*1000) + + } + + return + +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go new file mode 100644 index 000000000..c88652f75 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go @@ -0,0 +1,170 @@ +package backup + +import ( + "encoding/json" + "errors" + "flag" + "fmt" + "io" + "log" + "net" + "os" + + "github.com/influxdb/influxdb/services/snapshotter" + "github.com/influxdb/influxdb/snapshot" +) + +// Suffix is a suffix added to the backup while it's in-process. +const Suffix = ".pending" + +// Command represents the program execution for "influxd backup". +type Command struct { + // The logger passed to the ticker during execution. + Logger *log.Logger + + // Standard input/output, overridden for testing. + Stderr io.Writer +} + +// NewCommand returns a new instance of Command with default settings. +func NewCommand() *Command { + return &Command{ + Stderr: os.Stderr, + } +} + +// Run executes the program. +func (cmd *Command) Run(args ...string) error { + // Set up logger. + cmd.Logger = log.New(cmd.Stderr, "", log.LstdFlags) + cmd.Logger.Printf("influxdb backup") + + // Parse command line arguments. + host, path, err := cmd.parseFlags(args) + if err != nil { + return err + } + + // Retrieve snapshot from local file. + m, err := snapshot.ReadFileManifest(path) + if err != nil && !os.IsNotExist(err) { + return fmt.Errorf("read file snapshot: %s", err) + } + + // Determine temporary path to download to. + tmppath := path + Suffix + + // Calculate path of next backup file. + // This uses the path if it doesn't exist. + // Otherwise it appends an autoincrementing number. + path, err = cmd.nextPath(path) + if err != nil { + return fmt.Errorf("next path: %s", err) + } + + // Retrieve snapshot. + if err := cmd.download(host, m, tmppath); err != nil { + return fmt.Errorf("download: %s", err) + } + + // Rename temporary file to final path. + if err := os.Rename(tmppath, path); err != nil { + return fmt.Errorf("rename: %s", err) + } + + // TODO: Check file integrity. + + // Notify user of completion. + cmd.Logger.Println("backup complete") + + return nil +} + +// parseFlags parses and validates the command line arguments. +func (cmd *Command) parseFlags(args []string) (host string, path string, err error) { + fs := flag.NewFlagSet("", flag.ContinueOnError) + fs.StringVar(&host, "host", "localhost:8088", "") + fs.SetOutput(cmd.Stderr) + fs.Usage = cmd.printUsage + if err := fs.Parse(args); err != nil { + return "", "", err + } + + // Ensure that only one arg is specified. + if fs.NArg() == 0 { + return "", "", errors.New("snapshot path required") + } else if fs.NArg() != 1 { + return "", "", errors.New("only one snapshot path allowed") + } + path = fs.Arg(0) + + return host, path, nil +} + +// nextPath returns the next file to write to. +func (cmd *Command) nextPath(path string) (string, error) { + // Use base path if it doesn't exist. + if _, err := os.Stat(path); os.IsNotExist(err) { + return path, nil + } else if err != nil { + return "", err + } + + // Otherwise iterate through incremental files until one is available. + for i := 0; ; i++ { + s := fmt.Sprintf(path+".%d", i) + if _, err := os.Stat(s); os.IsNotExist(err) { + return s, nil + } else if err != nil { + return "", err + } + } +} + +// download downloads a snapshot from a host to a given path. +func (cmd *Command) download(host string, m *snapshot.Manifest, path string) error { + // Create local file to write to. + f, err := os.Create(path) + if err != nil { + return fmt.Errorf("open temp file: %s", err) + } + defer f.Close() + + // Connect to snapshotter service. + conn, err := net.Dial("tcp", host) + if err != nil { + return err + } + defer conn.Close() + + // Send snapshotter marker byte. + if _, err := conn.Write([]byte{snapshotter.MuxHeader}); err != nil { + return fmt.Errorf("write snapshot header byte: %s", err) + } + + // Write the manifest we currently have. + if err := json.NewEncoder(conn).Encode(m); err != nil { + return fmt.Errorf("encode snapshot manifest: %s", err) + } + + // Read snapshot from the connection. + if _, err := io.Copy(f, conn); err != nil { + return fmt.Errorf("copy snapshot to file: %s", err) + } + + // FIXME(benbjohnson): Verify integrity of snapshot. + + return nil +} + +// printUsage prints the usage message to STDERR. +func (cmd *Command) printUsage() { + fmt.Fprintf(cmd.Stderr, `usage: influxd backup [flags] PATH + +backup downloads a snapshot of a data node and saves it to disk. + + -host + The host to connect to snapshot. + Defaults to 127.0.0.1:8088. +`) +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go new file mode 100644 index 000000000..15db96449 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go @@ -0,0 +1,125 @@ +package backup_test + +/* +import ( + "bytes" + "net/http" + "net/http/httptest" + "os" + "strings" + "testing" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/cmd/influxd" +) + +// Ensure the backup can download from the server and save to disk. +func TestBackupCommand(t *testing.T) { + // Mock the backup endpoint. + s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != "/data/snapshot" { + t.Fatalf("unexpected url path: %s", r.URL.Path) + } + + // Write a simple snapshot to the buffer. + sw := influxdb.NewSnapshotWriter() + sw.Snapshot = &influxdb.Snapshot{Files: []influxdb.SnapshotFile{ + {Name: "meta", Size: 5, Index: 10}, + }} + sw.FileWriters["meta"] = influxdb.NopWriteToCloser(bytes.NewBufferString("55555")) + if _, err := sw.WriteTo(w); err != nil { + t.Fatal(err) + } + })) + defer s.Close() + + // Create a temp path and remove incremental backups at the end. + path := tempfile() + defer os.Remove(path) + defer os.Remove(path + ".0") + defer os.Remove(path + ".1") + + // Execute the backup against the mock server. + for i := 0; i < 3; i++ { + if err := NewBackupCommand().Run("-host", s.URL, path); err != nil { + t.Fatal(err) + } + } + + // Verify snapshot and two incremental snapshots were written. + if _, err := os.Stat(path); err != nil { + t.Fatalf("snapshot not found: %s", err) + } else if _, err = os.Stat(path + ".0"); err != nil { + t.Fatalf("incremental snapshot(0) not found: %s", err) + } else if _, err = os.Stat(path + ".1"); err != nil { + t.Fatalf("incremental snapshot(1) not found: %s", err) + } +} + +// Ensure the backup command returns an error if flags cannot be parsed. +func TestBackupCommand_ErrFlagParse(t *testing.T) { + cmd := NewBackupCommand() + if err := cmd.Run("-bad-flag"); err == nil || err.Error() != `flag provided but not defined: -bad-flag` { + t.Fatal(err) + } else if !strings.Contains(cmd.Stderr.String(), "usage") { + t.Fatal("usage message not displayed") + } +} + +// Ensure the backup command returns an error if the host cannot be parsed. +func TestBackupCommand_ErrInvalidHostURL(t *testing.T) { + if err := NewBackupCommand().Run("-host", "http://%f"); err == nil || err.Error() != `parse host url: parse http://%f: hexadecimal escape in host` { + t.Fatal(err) + } +} + +// Ensure the backup command returns an error if the output path is not specified. +func TestBackupCommand_ErrPathRequired(t *testing.T) { + if err := NewBackupCommand().Run("-host", "//localhost"); err == nil || err.Error() != `snapshot path required` { + t.Fatal(err) + } +} + +// Ensure the backup returns an error if it cannot connect to the server. +func TestBackupCommand_ErrConnectionRefused(t *testing.T) { + // Start and immediately stop a server so we have a dead port. + s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) + s.Close() + + // Execute the backup command. + path := tempfile() + defer os.Remove(path) + if err := NewBackupCommand().Run("-host", s.URL, path); err == nil || + !(strings.Contains(err.Error(), `connection refused`) || strings.Contains(err.Error(), `No connection could be made`)) { + t.Fatal(err) + } +} + +// Ensure the backup returns any non-200 status codes. +func TestBackupCommand_ErrServerError(t *testing.T) { + s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusInternalServerError) + })) + defer s.Close() + + // Execute the backup command. + path := tempfile() + defer os.Remove(path) + if err := NewBackupCommand().Run("-host", s.URL, path); err == nil || err.Error() != `download: snapshot error: status=500` { + t.Fatal(err) + } +} + +// BackupCommand is a test wrapper for main.BackupCommand. +type BackupCommand struct { + *main.BackupCommand + Stderr bytes.Buffer +} + +// NewBackupCommand returns a new instance of BackupCommand. +func NewBackupCommand() *BackupCommand { + cmd := &BackupCommand{BackupCommand: main.NewBackupCommand()} + cmd.BackupCommand.Stderr = &cmd.Stderr + return cmd +} +*/ diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go new file mode 100644 index 000000000..3f6bbfb08 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go @@ -0,0 +1,46 @@ +package help + +import ( + "fmt" + "io" + "os" + "strings" +) + +// Command displays help for command-line sub-commands. +type Command struct { + Stdout io.Writer +} + +// NewCommand returns a new instance of Command. +func NewCommand() *Command { + return &Command{ + Stdout: os.Stdout, + } +} + +// Run executes the command. +func (cmd *Command) Run(args ...string) error { + fmt.Fprintln(cmd.Stdout, strings.TrimSpace(usage)) + return nil +} + +const usage = ` +Configure and start an InfluxDB server. + +Usage: + + influxd [[command] [arguments]] + +The commands are: + + backup downloads a snapshot of a data node and saves it to disk + config display the default configuration + restore uses a snapshot of a data node to rebuild a cluster + run run node with existing configuration + version displays the InfluxDB version + +"run" is the default command. + +Use "influxd help [command]" for more information about a command. +` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go new file mode 100644 index 000000000..5a4cf6d92 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go @@ -0,0 +1,205 @@ +package main + +import ( + "flag" + "fmt" + "io" + "log" + "math/rand" + "os" + "os/signal" + "strings" + "syscall" + "time" + + "github.com/influxdb/influxdb/cmd/influxd/backup" + "github.com/influxdb/influxdb/cmd/influxd/help" + "github.com/influxdb/influxdb/cmd/influxd/restore" + "github.com/influxdb/influxdb/cmd/influxd/run" +) + +// These variables are populated via the Go linker. +var ( + version string = "0.9" + commit string + branch string + buildTime string +) + +func init() { + // If commit, branch, or build time are not set, make that clear. + if commit == "" { + commit = "unknown" + } + if branch == "" { + branch = "unknown" + } + if buildTime == "" { + buildTime = "unknown" + } +} + +func main() { + rand.Seed(time.Now().UnixNano()) + + m := NewMain() + if err := m.Run(os.Args[1:]...); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } +} + +// Main represents the program execution. +type Main struct { + Logger *log.Logger + + Stdin io.Reader + Stdout io.Writer + Stderr io.Writer +} + +// NewMain return a new instance of Main. +func NewMain() *Main { + return &Main{ + Logger: log.New(os.Stderr, "[run] ", log.LstdFlags), + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + } +} + +// Run determines and runs the command specified by the CLI args. +func (m *Main) Run(args ...string) error { + name, args := ParseCommandName(args) + + // Extract name from args. + switch name { + case "", "run": + cmd := run.NewCommand() + + // Tell the server the build details. + cmd.Version = version + cmd.Commit = commit + cmd.Branch = branch + cmd.BuildTime = buildTime + + if err := cmd.Run(args...); err != nil { + return fmt.Errorf("run: %s", err) + } + + signalCh := make(chan os.Signal, 1) + signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM) + m.Logger.Println("Listening for signals") + + // Block until one of the signals above is received + select { + case <-signalCh: + m.Logger.Println("Signal received, initializing clean shutdown...") + go func() { + cmd.Close() + }() + } + + // Block again until another signal is received, a shutdown timeout elapses, + // or the Command is gracefully closed + m.Logger.Println("Waiting for clean shutdown...") + select { + case <-signalCh: + m.Logger.Println("second signal received, initializing hard shutdown") + case <-time.After(time.Second * 30): + m.Logger.Println("time limit reached, initializing hard shutdown") + case <-cmd.Closed: + m.Logger.Println("server shutdown completed") + } + + // goodbye. + + case "backup": + name := backup.NewCommand() + if err := name.Run(args...); err != nil { + return fmt.Errorf("backup: %s", err) + } + case "restore": + name := restore.NewCommand() + if err := name.Run(args...); err != nil { + return fmt.Errorf("restore: %s", err) + } + case "config": + if err := run.NewPrintConfigCommand().Run(args...); err != nil { + return fmt.Errorf("config: %s", err) + } + case "version": + if err := NewVersionCommand().Run(args...); err != nil { + return fmt.Errorf("version: %s", err) + } + case "help": + if err := help.NewCommand().Run(args...); err != nil { + return fmt.Errorf("help: %s", err) + } + default: + return fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'influxd help' for usage`+"\n\n", name) + } + + return nil +} + +// ParseCommandName extracts the command name and args from the args list. +func ParseCommandName(args []string) (string, []string) { + // Retrieve command name as first argument. + var name string + if len(args) > 0 && !strings.HasPrefix(args[0], "-") { + name = args[0] + } + + // Special case -h immediately following binary name + if len(args) > 0 && args[0] == "-h" { + name = "help" + } + + // If command is "help" and has an argument then rewrite args to use "-h". + if name == "help" && len(args) > 1 { + args[0], args[1] = args[1], "-h" + name = args[0] + } + + // If a named command is specified then return it with its arguments. + if name != "" { + return name, args[1:] + } + return "", args +} + +// Command represents the command executed by "influxd version". +type VersionCommand struct { + Stdout io.Writer + Stderr io.Writer +} + +// NewVersionCommand return a new instance of VersionCommand. +func NewVersionCommand() *VersionCommand { + return &VersionCommand{ + Stdout: os.Stdout, + Stderr: os.Stderr, + } +} + +// Run prints the current version and commit info. +func (cmd *VersionCommand) Run(args ...string) error { + // Parse flags in case -h is specified. + fs := flag.NewFlagSet("", flag.ContinueOnError) + fs.Usage = func() { fmt.Fprintln(cmd.Stderr, strings.TrimSpace(versionUsage)) } + if err := fs.Parse(args); err != nil { + return err + } + + // Print version info. + fmt.Fprintf(cmd.Stdout, "InfluxDB v%s (git: %s %s, built %s)\n", version, branch, commit, buildTime) + + return nil +} + +var versionUsage = ` +usage: version + + version displays the InfluxDB version, build branch and git commit hash +` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go new file mode 100644 index 000000000..5a95f8726 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go @@ -0,0 +1,250 @@ +package restore + +import ( + "bytes" + "errors" + "flag" + "fmt" + "io" + "net" + "os" + "path/filepath" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/snapshot" + "github.com/influxdb/influxdb/tsdb" +) + +// Command represents the program execution for "influxd restore". +type Command struct { + Stdout io.Writer + Stderr io.Writer +} + +// NewCommand returns a new instance of Command with default settings. +func NewCommand() *Command { + return &Command{ + Stdout: os.Stdout, + Stderr: os.Stderr, + } +} + +// Run executes the program. +func (cmd *Command) Run(args ...string) error { + config, path, err := cmd.parseFlags(args) + if err != nil { + return err + } + + return cmd.Restore(config, path) +} + +func (cmd *Command) Restore(config *Config, path string) error { + // Remove meta and data directories. + if err := os.RemoveAll(config.Meta.Dir); err != nil { + return fmt.Errorf("remove meta dir: %s", err) + } else if err := os.RemoveAll(config.Data.Dir); err != nil { + return fmt.Errorf("remove data dir: %s", err) + } + + // Open snapshot file and all incremental backups. + mr, files, err := snapshot.OpenFileMultiReader(path) + if err != nil { + return fmt.Errorf("open multireader: %s", err) + } + defer closeAll(files) + + // Unpack files from archive. + if err := cmd.unpack(mr, config); err != nil { + return fmt.Errorf("unpack: %s", err) + } + + // Notify user of completion. + fmt.Fprintf(os.Stdout, "restore complete using %s", path) + return nil +} + +// parseFlags parses and validates the command line arguments. +func (cmd *Command) parseFlags(args []string) (*Config, string, error) { + fs := flag.NewFlagSet("", flag.ContinueOnError) + configPath := fs.String("config", "", "") + fs.SetOutput(cmd.Stderr) + fs.Usage = cmd.printUsage + if err := fs.Parse(args); err != nil { + return nil, "", err + } + + // Parse configuration file from disk. + if *configPath == "" { + return nil, "", fmt.Errorf("config required") + } + + // Parse config. + config := Config{ + Meta: meta.NewConfig(), + Data: tsdb.NewConfig(), + } + if _, err := toml.DecodeFile(*configPath, &config); err != nil { + return nil, "", err + } + + // Require output path. + path := fs.Arg(0) + if path == "" { + return nil, "", fmt.Errorf("snapshot path required") + } + + return &config, path, nil +} + +func closeAll(a []io.Closer) { + for _, c := range a { + _ = c.Close() + } +} + +// unpack expands the files in the snapshot archive into a directory. +func (cmd *Command) unpack(mr *snapshot.MultiReader, config *Config) error { + // Loop over files and extract. + for { + // Read entry header. + sf, err := mr.Next() + if err == io.EOF { + break + } else if err != nil { + return fmt.Errorf("next: entry=%s, err=%s", sf.Name, err) + } + + // Log progress. + fmt.Fprintf(os.Stdout, "unpacking: %s (%d bytes)\n", sf.Name, sf.Size) + + // Handle meta and tsdb files separately. + switch sf.Name { + case "meta": + if err := cmd.unpackMeta(mr, sf, config); err != nil { + return fmt.Errorf("meta: %s", err) + } + default: + if err := cmd.unpackData(mr, sf, config); err != nil { + return fmt.Errorf("data: %s", err) + } + } + } + + return nil +} + +// unpackMeta reads the metadata from the snapshot and initializes a raft +// cluster and replaces the root metadata. +func (cmd *Command) unpackMeta(mr *snapshot.MultiReader, sf snapshot.File, config *Config) error { + // Read meta into buffer. + var buf bytes.Buffer + if _, err := io.CopyN(&buf, mr, sf.Size); err != nil { + return fmt.Errorf("copy: %s", err) + } + + // Unpack into metadata. + var data meta.Data + if err := data.UnmarshalBinary(buf.Bytes()); err != nil { + return fmt.Errorf("unmarshal: %s", err) + } + + // Copy meta config and remove peers so it starts in single mode. + c := config.Meta + c.Peers = nil + + // Initialize meta store. + store := meta.NewStore(config.Meta) + store.RaftListener = newNopListener() + store.ExecListener = newNopListener() + + // Determine advertised address. + _, port, err := net.SplitHostPort(config.Meta.BindAddress) + if err != nil { + return fmt.Errorf("split bind address: %s", err) + } + hostport := net.JoinHostPort(config.Meta.Hostname, port) + + // Resolve address. + addr, err := net.ResolveTCPAddr("tcp", hostport) + if err != nil { + return fmt.Errorf("resolve tcp: addr=%s, err=%s", hostport, err) + } + store.Addr = addr + + // Open the meta store. + if err := store.Open(); err != nil { + return fmt.Errorf("open store: %s", err) + } + defer store.Close() + + // Wait for the store to be ready or error. + select { + case <-store.Ready(): + case err := <-store.Err(): + return err + } + + // Force set the full metadata. + if err := store.SetData(&data); err != nil { + return fmt.Errorf("set data: %s", err) + } + + return nil +} + +func (cmd *Command) unpackData(mr *snapshot.MultiReader, sf snapshot.File, config *Config) error { + path := filepath.Join(config.Data.Dir, sf.Name) + // Create parent directory for output file. + if err := os.MkdirAll(filepath.Dir(path), 0777); err != nil { + return fmt.Errorf("mkdir: entry=%s, err=%s", sf.Name, err) + } + + // Create output file. + f, err := os.Create(path) + if err != nil { + return fmt.Errorf("create: entry=%s, err=%s", sf.Name, err) + } + defer f.Close() + + // Copy contents from reader. + if _, err := io.CopyN(f, mr, sf.Size); err != nil { + return fmt.Errorf("copy: entry=%s, err=%s", sf.Name, err) + } + + return nil +} + +// printUsage prints the usage message to STDERR. +func (cmd *Command) printUsage() { + fmt.Fprintf(cmd.Stderr, `usage: influxd restore [flags] PATH + +restore uses a snapshot of a data node to rebuild a cluster. + + -config + Set the path to the configuration file. +`) +} + +// Config represents a partial config for rebuilding the server. +type Config struct { + Meta *meta.Config `toml:"meta"` + Data tsdb.Config `toml:"data"` +} + +type nopListener struct { + closing chan struct{} +} + +func newNopListener() *nopListener { + return &nopListener{make(chan struct{})} +} + +func (ln *nopListener) Accept() (net.Conn, error) { + <-ln.closing + return nil, errors.New("listener closing") +} + +func (ln *nopListener) Close() error { close(ln.closing); return nil } +func (ln *nopListener) Addr() net.Addr { return nil } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go new file mode 100644 index 000000000..f9d974212 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go @@ -0,0 +1,155 @@ +package restore_test + +/* +import ( + "bytes" + "io/ioutil" + "os" + "path/filepath" + "reflect" + "testing" + "time" + + main "github.com/influxdb/influxdb/cmd/influxd" + "github.com/influxdb/influxdb/tsdb" +) + +func newConfig(path string, port int) main.Config { + config := main.NewConfig() + config.Port = port + config.Broker.Enabled = true + config.Broker.Dir = filepath.Join(path, "broker") + + config.Data.Enabled = true + config.Data.Dir = filepath.Join(path, "data") + return *config +} + +// Ensure the restore command can expand a snapshot and bootstrap a broker. +func TestRestoreCommand(t *testing.T) { + if testing.Short() { + t.Skip("skipping TestRestoreCommand") + } + + now := time.Now() + + // Create root path to server. + path := tempfile() + defer os.Remove(path) + + // Parse configuration. + config := newConfig(path, 8900) + + // Start server. + cmd := main.NewRunCommand() + node := cmd.Open(&config, "") + if node.Broker == nil { + t.Fatal("cannot run broker") + } else if node.DataNode == nil { + t.Fatal("cannot run server") + } + b := node.Broker + s := node.DataNode + + // Create data. + if err := s.CreateDatabase("db"); err != nil { + t.Fatalf("cannot create database: %s", err) + } + if index, err := s.WriteSeries("db", "default", []models.Point{tsdb.NewPoint("cpu", nil, map[string]interface{}{"value": float64(100)}, now)}); err != nil { + t.Fatalf("cannot write series: %s", err) + } else if err = s.Sync(1, index); err != nil { + t.Fatalf("shard sync: %s", err) + } + + // Create snapshot writer. + sw, err := s.CreateSnapshotWriter() + if err != nil { + t.Fatalf("create snapshot writer: %s", err) + } + + // Snapshot to file. + sspath := tempfile() + f, err := os.Create(sspath) + if err != nil { + t.Fatal(err) + } + sw.WriteTo(f) + f.Close() + + // Stop server. + node.Close() + + // Remove data & broker directories. + if err := os.RemoveAll(path); err != nil { + t.Fatalf("remove: %s", err) + } + + // Execute the restore. + if err := NewRestoreCommand().Restore(&config, sspath); err != nil { + t.Fatal(err) + } + + // Rewrite config to a new port and re-parse. + config = newConfig(path, 8910) + + // Restart server. + cmd = main.NewRunCommand() + node = cmd.Open(&config, "") + if b == nil { + t.Fatal("cannot run broker") + } else if s == nil { + t.Fatal("cannot run server") + } + b = node.Broker + s = node.DataNode + + // Write new data. + if err := s.CreateDatabase("newdb"); err != nil { + t.Fatalf("cannot create new database: %s", err) + } + if index, err := s.WriteSeries("newdb", "default", []models.Point{tsdb.NewPoint("mem", nil, map[string]interface{}{"value": float64(1000)}, now)}); err != nil { + t.Fatalf("cannot write new series: %s", err) + } else if err = s.Sync(2, index); err != nil { + t.Fatalf("shard sync: %s", err) + } + + // Read series data. + if v, err := s.ReadSeries("db", "default", "cpu", nil, now); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(v, map[string]interface{}{"value": float64(100)}) { + t.Fatalf("read series(0) mismatch: %#v", v) + } + + // Read new series data. + if v, err := s.ReadSeries("newdb", "default", "mem", nil, now); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(v, map[string]interface{}{"value": float64(1000)}) { + t.Fatalf("read series(1) mismatch: %#v", v) + } + + // Stop server. + node.Close() +} + +// RestoreCommand is a test wrapper for main.RestoreCommand. +type RestoreCommand struct { + *main.RestoreCommand + Stderr bytes.Buffer +} + +// NewRestoreCommand returns a new instance of RestoreCommand. +func NewRestoreCommand() *RestoreCommand { + cmd := &RestoreCommand{RestoreCommand: main.NewRestoreCommand()} + cmd.RestoreCommand.Stderr = &cmd.Stderr + return cmd +} + +// MustReadFile reads data from a file. Panic on error. +func MustReadFile(filename string) []byte { + b, err := ioutil.ReadFile(filename) + if err != nil { + panic(err.Error()) + } + return b +} +*/ diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go new file mode 100644 index 000000000..188981ce0 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go @@ -0,0 +1,240 @@ +package run + +import ( + "flag" + "fmt" + "io" + "io/ioutil" + "log" + "os" + "path/filepath" + "runtime" + "strconv" + "strings" + "time" + + "github.com/BurntSushi/toml" +) + +const logo = ` + 8888888 .d888 888 8888888b. 888888b. + 888 d88P" 888 888 "Y88b 888 "88b + 888 888 888 888 888 888 .88P + 888 88888b. 888888 888 888 888 888 888 888 888 8888888K. + 888 888 "88b 888 888 888 888 Y8bd8P' 888 888 888 "Y88b + 888 888 888 888 888 888 888 X88K 888 888 888 888 + 888 888 888 888 888 Y88b 888 .d8""8b. 888 .d88P 888 d88P + 8888888 888 888 888 888 "Y88888 888 888 8888888P" 8888888P" + +` + +// Command represents the command executed by "influxd run". +type Command struct { + Version string + Branch string + Commit string + BuildTime string + + closing chan struct{} + Closed chan struct{} + + Stdin io.Reader + Stdout io.Writer + Stderr io.Writer + + Server *Server +} + +// NewCommand return a new instance of Command. +func NewCommand() *Command { + return &Command{ + closing: make(chan struct{}), + Closed: make(chan struct{}), + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + } +} + +// Run parses the config from args and runs the server. +func (cmd *Command) Run(args ...string) error { + // Parse the command line flags. + options, err := cmd.ParseFlags(args...) + if err != nil { + return err + } + + // Print sweet InfluxDB logo. + fmt.Print(logo) + + // Mark start-up in log. + log.Printf("InfluxDB starting, version %s, branch %s, commit %s, built %s", + cmd.Version, cmd.Branch, cmd.Commit, cmd.BuildTime) + log.Printf("Go version %s, GOMAXPROCS set to %d", runtime.Version(), runtime.GOMAXPROCS(0)) + + // Write the PID file. + if err := cmd.writePIDFile(options.PIDFile); err != nil { + return fmt.Errorf("write pid file: %s", err) + } + + // Turn on block profiling to debug stuck databases + runtime.SetBlockProfileRate(int(1 * time.Second)) + + // Parse config + config, err := cmd.ParseConfig(options.ConfigPath) + if err != nil { + return fmt.Errorf("parse config: %s", err) + } + + // Apply any environment variables on top of the parsed config + if err := config.ApplyEnvOverrides(); err != nil { + return fmt.Errorf("apply env config: %v", err) + } + + // Override config hostname if specified in the command line args. + if options.Hostname != "" { + config.Meta.Hostname = options.Hostname + } + + if options.Join != "" { + config.Meta.Peers = strings.Split(options.Join, ",") + } + + // Validate the configuration. + if err := config.Validate(); err != nil { + return fmt.Errorf("%s. To generate a valid configuration file run `influxd config > influxdb.generated.conf`.", err) + } + + // Create server from config and start it. + buildInfo := &BuildInfo{ + Version: cmd.Version, + Commit: cmd.Commit, + Branch: cmd.Branch, + Time: cmd.BuildTime, + } + s, err := NewServer(config, buildInfo) + if err != nil { + return fmt.Errorf("create server: %s", err) + } + s.CPUProfile = options.CPUProfile + s.MemProfile = options.MemProfile + if err := s.Open(); err != nil { + return fmt.Errorf("open server: %s", err) + } + cmd.Server = s + + // Begin monitoring the server's error channel. + go cmd.monitorServerErrors() + + return nil +} + +// Close shuts down the server. +func (cmd *Command) Close() error { + defer close(cmd.Closed) + close(cmd.closing) + if cmd.Server != nil { + return cmd.Server.Close() + } + return nil +} + +func (cmd *Command) monitorServerErrors() { + logger := log.New(cmd.Stderr, "", log.LstdFlags) + for { + select { + case err := <-cmd.Server.Err(): + logger.Println(err) + case <-cmd.closing: + return + } + } +} + +// ParseFlags parses the command line flags from args and returns an options set. +func (cmd *Command) ParseFlags(args ...string) (Options, error) { + var options Options + fs := flag.NewFlagSet("", flag.ContinueOnError) + fs.StringVar(&options.ConfigPath, "config", "", "") + fs.StringVar(&options.PIDFile, "pidfile", "", "") + fs.StringVar(&options.Hostname, "hostname", "", "") + fs.StringVar(&options.Join, "join", "", "") + fs.StringVar(&options.CPUProfile, "cpuprofile", "", "") + fs.StringVar(&options.MemProfile, "memprofile", "", "") + fs.Usage = func() { fmt.Fprintln(cmd.Stderr, usage) } + if err := fs.Parse(args); err != nil { + return Options{}, err + } + return options, nil +} + +// writePIDFile writes the process ID to path. +func (cmd *Command) writePIDFile(path string) error { + // Ignore if path is not set. + if path == "" { + return nil + } + + // Ensure the required directory structure exists. + err := os.MkdirAll(filepath.Dir(path), 0777) + if err != nil { + return fmt.Errorf("mkdir: %s", err) + } + + // Retrieve the PID and write it. + pid := strconv.Itoa(os.Getpid()) + if err := ioutil.WriteFile(path, []byte(pid), 0666); err != nil { + return fmt.Errorf("write file: %s", err) + } + + return nil +} + +// ParseConfig parses the config at path. +// Returns a demo configuration if path is blank. +func (cmd *Command) ParseConfig(path string) (*Config, error) { + // Use demo configuration if no config path is specified. + if path == "" { + log.Println("no configuration provided, using default settings") + return NewDemoConfig() + } + + log.Printf("Using configuration at: %s\n", path) + + config := NewConfig() + if _, err := toml.DecodeFile(path, &config); err != nil { + return nil, err + } + + return config, nil +} + +var usage = `usage: run [flags] + +run starts the broker and data node server. If this is the first time running +the command then a new cluster will be initialized unless the -join argument +is used. + + -config + Set the path to the configuration file. + + -hostname + Override the hostname, the 'hostname' configuration + option will be overridden. + + -join + Joins the server to an existing cluster. + + -pidfile + Write process ID to a file. +` + +// Options represents the command line options that can be parsed. +type Options struct { + ConfigPath string + PIDFile string + Hostname string + Join string + CPUProfile string + MemProfile string +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go new file mode 100644 index 000000000..0b35fd95b --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go @@ -0,0 +1,225 @@ +package run + +import ( + "errors" + "fmt" + "os" + "os/user" + "path/filepath" + "reflect" + "strconv" + "strings" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/monitor" + "github.com/influxdb/influxdb/services/admin" + "github.com/influxdb/influxdb/services/collectd" + "github.com/influxdb/influxdb/services/continuous_querier" + "github.com/influxdb/influxdb/services/graphite" + "github.com/influxdb/influxdb/services/hh" + "github.com/influxdb/influxdb/services/httpd" + "github.com/influxdb/influxdb/services/opentsdb" + "github.com/influxdb/influxdb/services/precreator" + "github.com/influxdb/influxdb/services/retention" + "github.com/influxdb/influxdb/services/udp" + "github.com/influxdb/influxdb/tsdb" +) + +// Config represents the configuration format for the influxd binary. +type Config struct { + Meta *meta.Config `toml:"meta"` + Data tsdb.Config `toml:"data"` + Cluster cluster.Config `toml:"cluster"` + Retention retention.Config `toml:"retention"` + Precreator precreator.Config `toml:"shard-precreation"` + + Admin admin.Config `toml:"admin"` + Monitor monitor.Config `toml:"monitor"` + HTTPD httpd.Config `toml:"http"` + Graphites []graphite.Config `toml:"graphite"` + Collectd collectd.Config `toml:"collectd"` + OpenTSDB opentsdb.Config `toml:"opentsdb"` + UDPs []udp.Config `toml:"udp"` + + // Snapshot SnapshotConfig `toml:"snapshot"` + ContinuousQuery continuous_querier.Config `toml:"continuous_queries"` + + HintedHandoff hh.Config `toml:"hinted-handoff"` + + // Server reporting + ReportingDisabled bool `toml:"reporting-disabled"` +} + +// NewConfig returns an instance of Config with reasonable defaults. +func NewConfig() *Config { + c := &Config{} + c.Meta = meta.NewConfig() + c.Data = tsdb.NewConfig() + c.Cluster = cluster.NewConfig() + c.Precreator = precreator.NewConfig() + + c.Admin = admin.NewConfig() + c.Monitor = monitor.NewConfig() + c.HTTPD = httpd.NewConfig() + c.Collectd = collectd.NewConfig() + c.OpenTSDB = opentsdb.NewConfig() + + c.ContinuousQuery = continuous_querier.NewConfig() + c.Retention = retention.NewConfig() + c.HintedHandoff = hh.NewConfig() + + return c +} + +// NewDemoConfig returns the config that runs when no config is specified. +func NewDemoConfig() (*Config, error) { + c := NewConfig() + + var homeDir string + // By default, store meta and data files in current users home directory + u, err := user.Current() + if err == nil { + homeDir = u.HomeDir + } else if os.Getenv("HOME") != "" { + homeDir = os.Getenv("HOME") + } else { + return nil, fmt.Errorf("failed to determine current user for storage") + } + + c.Meta.Dir = filepath.Join(homeDir, ".influxdb/meta") + c.Data.Dir = filepath.Join(homeDir, ".influxdb/data") + c.HintedHandoff.Dir = filepath.Join(homeDir, ".influxdb/hh") + c.Data.WALDir = filepath.Join(homeDir, ".influxdb/wal") + + c.Admin.Enabled = true + + return c, nil +} + +// Validate returns an error if the config is invalid. +func (c *Config) Validate() error { + if c.Meta.Dir == "" { + return errors.New("Meta.Dir must be specified") + } else if c.Data.Dir == "" { + return errors.New("Data.Dir must be specified") + } else if c.HintedHandoff.Dir == "" { + return errors.New("HintedHandoff.Dir must be specified") + } else if c.Data.WALDir == "" { + return errors.New("Data.WALDir must be specified") + } + + for _, g := range c.Graphites { + if err := g.Validate(); err != nil { + return fmt.Errorf("invalid graphite config: %v", err) + } + } + return nil +} + +func (c *Config) ApplyEnvOverrides() error { + return c.applyEnvOverrides("INFLUXDB", reflect.ValueOf(c)) +} + +func (c *Config) applyEnvOverrides(prefix string, spec reflect.Value) error { + // If we have a pointer, dereference it + s := spec + if spec.Kind() == reflect.Ptr { + s = spec.Elem() + } + + // Make sure we have struct + if s.Kind() != reflect.Struct { + return nil + } + + typeOfSpec := s.Type() + for i := 0; i < s.NumField(); i++ { + f := s.Field(i) + // Get the toml tag to determine what env var name to use + configName := typeOfSpec.Field(i).Tag.Get("toml") + // Replace hyphens with underscores to avoid issues with shells + configName = strings.Replace(configName, "-", "_", -1) + fieldName := typeOfSpec.Field(i).Name + + // Skip any fields that we cannot set + if f.CanSet() || f.Kind() == reflect.Slice { + + // Use the upper-case prefix and toml name for the env var + key := strings.ToUpper(configName) + if prefix != "" { + key = strings.ToUpper(fmt.Sprintf("%s_%s", prefix, configName)) + } + value := os.Getenv(key) + + // If the type is s slice, apply to each using the index as a suffix + // e.g. GRAPHITE_0 + if f.Kind() == reflect.Slice || f.Kind() == reflect.Array { + for i := 0; i < f.Len(); i++ { + if err := c.applyEnvOverrides(fmt.Sprintf("%s_%d", key, i), f.Index(i)); err != nil { + return err + } + } + continue + } + + // If it's a sub-config, recursively apply + if f.Kind() == reflect.Struct || f.Kind() == reflect.Ptr { + if err := c.applyEnvOverrides(key, f); err != nil { + return err + } + continue + } + + // Skip any fields we don't have a value to set + if value == "" { + continue + } + + switch f.Kind() { + case reflect.String: + f.SetString(value) + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + + var intValue int64 + + // Handle toml.Duration + if f.Type().Name() == "Duration" { + dur, err := time.ParseDuration(value) + if err != nil { + return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldName, f.Type().String(), value) + } + intValue = dur.Nanoseconds() + } else { + var err error + intValue, err = strconv.ParseInt(value, 0, f.Type().Bits()) + if err != nil { + return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldName, f.Type().String(), value) + } + } + + f.SetInt(intValue) + case reflect.Bool: + boolValue, err := strconv.ParseBool(value) + if err != nil { + return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldName, f.Type().String(), value) + + } + f.SetBool(boolValue) + case reflect.Float32, reflect.Float64: + floatValue, err := strconv.ParseFloat(value, f.Type().Bits()) + if err != nil { + return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldName, f.Type().String(), value) + + } + f.SetFloat(floatValue) + default: + if err := c.applyEnvOverrides(key, f); err != nil { + return err + } + } + } + } + return nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go new file mode 100644 index 000000000..364cf61b3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go @@ -0,0 +1,83 @@ +package run + +import ( + "flag" + "fmt" + "io" + "os" + + "github.com/BurntSushi/toml" +) + +// PrintConfigCommand represents the command executed by "influxd config". +type PrintConfigCommand struct { + Stdin io.Reader + Stdout io.Writer + Stderr io.Writer +} + +// NewPrintConfigCommand return a new instance of PrintConfigCommand. +func NewPrintConfigCommand() *PrintConfigCommand { + return &PrintConfigCommand{ + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + } +} + +// Run parses and prints the current config loaded. +func (cmd *PrintConfigCommand) Run(args ...string) error { + // Parse command flags. + fs := flag.NewFlagSet("", flag.ContinueOnError) + configPath := fs.String("config", "", "") + hostname := fs.String("hostname", "", "") + fs.Usage = func() { fmt.Fprintln(cmd.Stderr, printConfigUsage) } + if err := fs.Parse(args); err != nil { + return err + } + + // Parse config from path. + config, err := cmd.parseConfig(*configPath) + if err != nil { + return fmt.Errorf("parse config: %s", err) + } + + // Apply any environment variables on top of the parsed config + if err := config.ApplyEnvOverrides(); err != nil { + return fmt.Errorf("apply env config: %v", err) + } + + // Override config properties. + if *hostname != "" { + config.Meta.Hostname = *hostname + } + + // Validate the configuration. + if err := config.Validate(); err != nil { + return fmt.Errorf("%s. To generate a valid configuration file run `influxd config > influxdb.generated.conf`.", err) + } + + toml.NewEncoder(cmd.Stdout).Encode(config) + fmt.Fprint(cmd.Stdout, "\n") + + return nil +} + +// ParseConfig parses the config at path. +// Returns a demo configuration if path is blank. +func (cmd *PrintConfigCommand) parseConfig(path string) (*Config, error) { + if path == "" { + return NewDemoConfig() + } + + config := NewConfig() + if _, err := toml.DecodeFile(path, &config); err != nil { + return nil, err + } + return config, nil +} + +var printConfigUsage = `usage: config + + config displays the default configuration +` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go new file mode 100644 index 000000000..7ecbb4f65 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go @@ -0,0 +1,142 @@ +package run_test + +import ( + "os" + "testing" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/cmd/influxd/run" +) + +// Ensure the configuration can be parsed. +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c run.Config + if _, err := toml.Decode(` +[meta] +dir = "/tmp/meta" + +[data] +dir = "/tmp/data" + +[cluster] + +[admin] +bind-address = ":8083" + +[http] +bind-address = ":8087" + +[[graphite]] +protocol = "udp" + +[[graphite]] +protocol = "tcp" + +[collectd] +bind-address = ":1000" + +[opentsdb] +bind-address = ":2000" + +[[udp]] +bind-address = ":4444" + +[monitoring] +enabled = true + +[continuous_queries] +enabled = true +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if c.Meta.Dir != "/tmp/meta" { + t.Fatalf("unexpected meta dir: %s", c.Meta.Dir) + } else if c.Data.Dir != "/tmp/data" { + t.Fatalf("unexpected data dir: %s", c.Data.Dir) + } else if c.Admin.BindAddress != ":8083" { + t.Fatalf("unexpected admin bind address: %s", c.Admin.BindAddress) + } else if c.HTTPD.BindAddress != ":8087" { + t.Fatalf("unexpected api bind address: %s", c.HTTPD.BindAddress) + } else if len(c.Graphites) != 2 { + t.Fatalf("unexpected graphites count: %d", len(c.Graphites)) + } else if c.Graphites[0].Protocol != "udp" { + t.Fatalf("unexpected graphite protocol(0): %s", c.Graphites[0].Protocol) + } else if c.Graphites[1].Protocol != "tcp" { + t.Fatalf("unexpected graphite protocol(1): %s", c.Graphites[1].Protocol) + } else if c.Collectd.BindAddress != ":1000" { + t.Fatalf("unexpected collectd bind address: %s", c.Collectd.BindAddress) + } else if c.OpenTSDB.BindAddress != ":2000" { + t.Fatalf("unexpected opentsdb bind address: %s", c.OpenTSDB.BindAddress) + } else if c.UDPs[0].BindAddress != ":4444" { + t.Fatalf("unexpected udp bind address: %s", c.UDPs[0].BindAddress) + } else if c.ContinuousQuery.Enabled != true { + t.Fatalf("unexpected continuous query enabled: %v", c.ContinuousQuery.Enabled) + } +} + +// Ensure the configuration can be parsed. +func TestConfig_Parse_EnvOverride(t *testing.T) { + // Parse configuration. + var c run.Config + if _, err := toml.Decode(` +[meta] +dir = "/tmp/meta" + +[data] +dir = "/tmp/data" + +[cluster] + +[admin] +bind-address = ":8083" + +[http] +bind-address = ":8087" + +[[graphite]] +protocol = "udp" + +[[graphite]] +protocol = "tcp" + +[collectd] +bind-address = ":1000" + +[opentsdb] +bind-address = ":2000" + +[[udp]] +bind-address = ":4444" + +[monitoring] +enabled = true + +[continuous_queries] +enabled = true +`, &c); err != nil { + t.Fatal(err) + } + + if err := os.Setenv("INFLUXDB_UDP_BIND_ADDRESS", ":1234"); err != nil { + t.Fatalf("failed to set env var: %v", err) + } + + if err := os.Setenv("INFLUXDB_GRAPHITE_1_PROTOCOL", "udp"); err != nil { + t.Fatalf("failed to set env var: %v", err) + } + + if err := c.ApplyEnvOverrides(); err != nil { + t.Fatalf("failed to apply env overrides: %v", err) + } + + if c.UDPs[0].BindAddress != ":4444" { + t.Fatalf("unexpected udp bind address: %s", c.UDPs[0].BindAddress) + } + + if c.Graphites[1].Protocol != "udp" { + t.Fatalf("unexpected graphite protocol(0): %s", c.Graphites[0].Protocol) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go new file mode 100644 index 000000000..0d23c0f1a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go @@ -0,0 +1,589 @@ +package run + +import ( + "bytes" + "fmt" + "log" + "net" + "net/http" + "os" + "runtime" + "runtime/pprof" + "strings" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/monitor" + "github.com/influxdb/influxdb/services/admin" + "github.com/influxdb/influxdb/services/collectd" + "github.com/influxdb/influxdb/services/continuous_querier" + "github.com/influxdb/influxdb/services/copier" + "github.com/influxdb/influxdb/services/graphite" + "github.com/influxdb/influxdb/services/hh" + "github.com/influxdb/influxdb/services/httpd" + "github.com/influxdb/influxdb/services/opentsdb" + "github.com/influxdb/influxdb/services/precreator" + "github.com/influxdb/influxdb/services/retention" + "github.com/influxdb/influxdb/services/snapshotter" + "github.com/influxdb/influxdb/services/udp" + "github.com/influxdb/influxdb/tcp" + "github.com/influxdb/influxdb/tsdb" + _ "github.com/influxdb/influxdb/tsdb/engine" +) + +// BuildInfo represents the build details for the server code. +type BuildInfo struct { + Version string + Commit string + Branch string + Time string +} + +// Server represents a container for the metadata and storage data and services. +// It is built using a Config and it manages the startup and shutdown of all +// services in the proper order. +type Server struct { + buildInfo BuildInfo + + err chan error + closing chan struct{} + + Hostname string + BindAddress string + Listener net.Listener + + MetaStore *meta.Store + TSDBStore *tsdb.Store + QueryExecutor *tsdb.QueryExecutor + PointsWriter *cluster.PointsWriter + ShardWriter *cluster.ShardWriter + ShardMapper *cluster.ShardMapper + HintedHandoff *hh.Service + + Services []Service + + // These references are required for the tcp muxer. + ClusterService *cluster.Service + SnapshotterService *snapshotter.Service + CopierService *copier.Service + + Monitor *monitor.Monitor + + // Server reporting + reportingDisabled bool + + // Profiling + CPUProfile string + MemProfile string +} + +// NewServer returns a new instance of Server built from a config. +func NewServer(c *Config, buildInfo *BuildInfo) (*Server, error) { + // Construct base meta store and data store. + tsdbStore := tsdb.NewStore(c.Data.Dir) + tsdbStore.EngineOptions.Config = c.Data + + s := &Server{ + buildInfo: *buildInfo, + err: make(chan error), + closing: make(chan struct{}), + + Hostname: c.Meta.Hostname, + BindAddress: c.Meta.BindAddress, + + MetaStore: meta.NewStore(c.Meta), + TSDBStore: tsdbStore, + + Monitor: monitor.New(c.Monitor), + + reportingDisabled: c.ReportingDisabled, + } + + // Copy TSDB configuration. + s.TSDBStore.EngineOptions.EngineVersion = c.Data.Engine + s.TSDBStore.EngineOptions.MaxWALSize = c.Data.MaxWALSize + s.TSDBStore.EngineOptions.WALFlushInterval = time.Duration(c.Data.WALFlushInterval) + s.TSDBStore.EngineOptions.WALPartitionFlushDelay = time.Duration(c.Data.WALPartitionFlushDelay) + + // Set the shard mapper + s.ShardMapper = cluster.NewShardMapper(time.Duration(c.Cluster.ShardMapperTimeout)) + s.ShardMapper.ForceRemoteMapping = c.Cluster.ForceRemoteShardMapping + s.ShardMapper.MetaStore = s.MetaStore + s.ShardMapper.TSDBStore = s.TSDBStore + + // Initialize query executor. + s.QueryExecutor = tsdb.NewQueryExecutor(s.TSDBStore) + s.QueryExecutor.MetaStore = s.MetaStore + s.QueryExecutor.MetaStatementExecutor = &meta.StatementExecutor{Store: s.MetaStore} + s.QueryExecutor.MonitorStatementExecutor = &monitor.StatementExecutor{Monitor: s.Monitor} + s.QueryExecutor.ShardMapper = s.ShardMapper + s.QueryExecutor.QueryLogEnabled = c.Data.QueryLogEnabled + + // Set the shard writer + s.ShardWriter = cluster.NewShardWriter(time.Duration(c.Cluster.ShardWriterTimeout)) + s.ShardWriter.MetaStore = s.MetaStore + + // Create the hinted handoff service + s.HintedHandoff = hh.NewService(c.HintedHandoff, s.ShardWriter) + + // Initialize points writer. + s.PointsWriter = cluster.NewPointsWriter() + s.PointsWriter.WriteTimeout = time.Duration(c.Cluster.WriteTimeout) + s.PointsWriter.MetaStore = s.MetaStore + s.PointsWriter.TSDBStore = s.TSDBStore + s.PointsWriter.ShardWriter = s.ShardWriter + s.PointsWriter.HintedHandoff = s.HintedHandoff + + // Initialize the monitor + s.Monitor.Version = s.buildInfo.Version + s.Monitor.Commit = s.buildInfo.Commit + s.Monitor.Branch = s.buildInfo.Branch + s.Monitor.BuildTime = s.buildInfo.Time + s.Monitor.MetaStore = s.MetaStore + s.Monitor.PointsWriter = s.PointsWriter + + // Append services. + s.appendClusterService(c.Cluster) + s.appendPrecreatorService(c.Precreator) + s.appendSnapshotterService() + s.appendCopierService() + s.appendAdminService(c.Admin) + s.appendContinuousQueryService(c.ContinuousQuery) + s.appendHTTPDService(c.HTTPD) + s.appendCollectdService(c.Collectd) + if err := s.appendOpenTSDBService(c.OpenTSDB); err != nil { + return nil, err + } + for _, g := range c.UDPs { + s.appendUDPService(g) + } + s.appendRetentionPolicyService(c.Retention) + for _, g := range c.Graphites { + if err := s.appendGraphiteService(g); err != nil { + return nil, err + } + } + + return s, nil +} + +func (s *Server) appendClusterService(c cluster.Config) { + srv := cluster.NewService(c) + srv.TSDBStore = s.TSDBStore + srv.MetaStore = s.MetaStore + s.Services = append(s.Services, srv) + s.ClusterService = srv +} + +func (s *Server) appendSnapshotterService() { + srv := snapshotter.NewService() + srv.TSDBStore = s.TSDBStore + srv.MetaStore = s.MetaStore + s.Services = append(s.Services, srv) + s.SnapshotterService = srv +} + +func (s *Server) appendCopierService() { + srv := copier.NewService() + srv.TSDBStore = s.TSDBStore + s.Services = append(s.Services, srv) + s.CopierService = srv +} + +func (s *Server) appendRetentionPolicyService(c retention.Config) { + if !c.Enabled { + return + } + srv := retention.NewService(c) + srv.MetaStore = s.MetaStore + srv.TSDBStore = s.TSDBStore + s.Services = append(s.Services, srv) +} + +func (s *Server) appendAdminService(c admin.Config) { + if !c.Enabled { + return + } + srv := admin.NewService(c) + s.Services = append(s.Services, srv) +} + +func (s *Server) appendHTTPDService(c httpd.Config) { + if !c.Enabled { + return + } + srv := httpd.NewService(c) + srv.Handler.MetaStore = s.MetaStore + srv.Handler.QueryExecutor = s.QueryExecutor + srv.Handler.PointsWriter = s.PointsWriter + srv.Handler.Version = s.buildInfo.Version + + // If a ContinuousQuerier service has been started, attach it. + for _, srvc := range s.Services { + if cqsrvc, ok := srvc.(continuous_querier.ContinuousQuerier); ok { + srv.Handler.ContinuousQuerier = cqsrvc + } + } + + s.Services = append(s.Services, srv) +} + +func (s *Server) appendCollectdService(c collectd.Config) { + if !c.Enabled { + return + } + srv := collectd.NewService(c) + srv.MetaStore = s.MetaStore + srv.PointsWriter = s.PointsWriter + s.Services = append(s.Services, srv) +} + +func (s *Server) appendOpenTSDBService(c opentsdb.Config) error { + if !c.Enabled { + return nil + } + srv, err := opentsdb.NewService(c) + if err != nil { + return err + } + srv.PointsWriter = s.PointsWriter + srv.MetaStore = s.MetaStore + s.Services = append(s.Services, srv) + return nil +} + +func (s *Server) appendGraphiteService(c graphite.Config) error { + if !c.Enabled { + return nil + } + srv, err := graphite.NewService(c) + if err != nil { + return err + } + + srv.PointsWriter = s.PointsWriter + srv.MetaStore = s.MetaStore + srv.Monitor = s.Monitor + s.Services = append(s.Services, srv) + return nil +} + +func (s *Server) appendPrecreatorService(c precreator.Config) error { + if !c.Enabled { + return nil + } + srv, err := precreator.NewService(c) + if err != nil { + return err + } + + srv.MetaStore = s.MetaStore + s.Services = append(s.Services, srv) + return nil +} + +func (s *Server) appendUDPService(c udp.Config) { + if !c.Enabled { + return + } + srv := udp.NewService(c) + srv.PointsWriter = s.PointsWriter + s.Services = append(s.Services, srv) +} + +func (s *Server) appendContinuousQueryService(c continuous_querier.Config) { + if !c.Enabled { + return + } + srv := continuous_querier.NewService(c) + srv.MetaStore = s.MetaStore + srv.QueryExecutor = s.QueryExecutor + srv.PointsWriter = s.PointsWriter + s.Services = append(s.Services, srv) +} + +// Err returns an error channel that multiplexes all out of band errors received from all services. +func (s *Server) Err() <-chan error { return s.err } + +// Open opens the meta and data store and all services. +func (s *Server) Open() error { + if err := func() error { + // Start profiling, if set. + startProfile(s.CPUProfile, s.MemProfile) + + host, port, err := s.hostAddr() + if err != nil { + return err + } + + hostport := net.JoinHostPort(host, port) + addr, err := net.ResolveTCPAddr("tcp", hostport) + if err != nil { + return fmt.Errorf("resolve tcp: addr=%s, err=%s", hostport, err) + } + s.MetaStore.Addr = addr + s.MetaStore.RemoteAddr = &tcpaddr{hostport} + + // Open shared TCP connection. + ln, err := net.Listen("tcp", s.BindAddress) + if err != nil { + return fmt.Errorf("listen: %s", err) + } + s.Listener = ln + + // The port 0 is used, we need to retrieve the port assigned by the kernel + if strings.HasSuffix(s.BindAddress, ":0") { + s.MetaStore.Addr = ln.Addr() + } + + // Multiplex listener. + mux := tcp.NewMux() + s.MetaStore.RaftListener = mux.Listen(meta.MuxRaftHeader) + s.MetaStore.ExecListener = mux.Listen(meta.MuxExecHeader) + s.MetaStore.RPCListener = mux.Listen(meta.MuxRPCHeader) + + s.ClusterService.Listener = mux.Listen(cluster.MuxHeader) + s.SnapshotterService.Listener = mux.Listen(snapshotter.MuxHeader) + s.CopierService.Listener = mux.Listen(copier.MuxHeader) + go mux.Serve(ln) + + // Open meta store. + if err := s.MetaStore.Open(); err != nil { + return fmt.Errorf("open meta store: %s", err) + } + go s.monitorErrorChan(s.MetaStore.Err()) + + // Wait for the store to initialize. + <-s.MetaStore.Ready() + + if err := s.Monitor.Open(); err != nil { + return fmt.Errorf("open monitor: %v", err) + } + + // Open TSDB store. + if err := s.TSDBStore.Open(); err != nil { + return fmt.Errorf("open tsdb store: %s", err) + } + + // Open the hinted handoff service + if err := s.HintedHandoff.Open(); err != nil { + return fmt.Errorf("open hinted handoff: %s", err) + } + + for _, service := range s.Services { + if err := service.Open(); err != nil { + return fmt.Errorf("open service: %s", err) + } + } + + // Start the reporting service, if not disabled. + if !s.reportingDisabled { + go s.startServerReporting() + } + + return nil + + }(); err != nil { + s.Close() + return err + } + + return nil +} + +// Close shuts down the meta and data stores and all services. +func (s *Server) Close() error { + stopProfile() + + // Close the listener first to stop any new connections + if s.Listener != nil { + s.Listener.Close() + } + + // Close services to allow any inflight requests to complete + // and prevent new requests from being accepted. + for _, service := range s.Services { + service.Close() + } + + if s.Monitor != nil { + s.Monitor.Close() + } + + if s.HintedHandoff != nil { + s.HintedHandoff.Close() + } + + // Close the TSDBStore, no more reads or writes at this point + if s.TSDBStore != nil { + s.TSDBStore.Close() + } + + // Finally close the meta-store since everything else depends on it + if s.MetaStore != nil { + s.MetaStore.Close() + } + + close(s.closing) + return nil +} + +// startServerReporting starts periodic server reporting. +func (s *Server) startServerReporting() { + for { + select { + case <-s.closing: + return + default: + } + if err := s.MetaStore.WaitForLeader(30 * time.Second); err != nil { + log.Printf("no leader available for reporting: %s", err.Error()) + time.Sleep(time.Second) + continue + } + s.reportServer() + <-time.After(24 * time.Hour) + } +} + +// reportServer reports anonymous statistics about the system. +func (s *Server) reportServer() { + dis, err := s.MetaStore.Databases() + if err != nil { + log.Printf("failed to retrieve databases for reporting: %s", err.Error()) + return + } + numDatabases := len(dis) + + numMeasurements := 0 + numSeries := 0 + for _, di := range dis { + d := s.TSDBStore.DatabaseIndex(di.Name) + if d == nil { + // No data in this store for this database. + continue + } + m, s := d.MeasurementSeriesCounts() + numMeasurements += m + numSeries += s + } + + clusterID, err := s.MetaStore.ClusterID() + if err != nil { + log.Printf("failed to retrieve cluster ID for reporting: %s", err.Error()) + return + } + + json := fmt.Sprintf(`[{ + "name":"reports", + "columns":["os", "arch", "version", "server_id", "cluster_id", "num_series", "num_measurements", "num_databases"], + "points":[["%s", "%s", "%s", "%x", "%x", "%d", "%d", "%d"]] + }]`, runtime.GOOS, runtime.GOARCH, s.buildInfo.Version, s.MetaStore.NodeID(), clusterID, numSeries, numMeasurements, numDatabases) + + data := bytes.NewBufferString(json) + + log.Printf("Sending anonymous usage statistics to m.influxdb.com") + + client := http.Client{Timeout: time.Duration(5 * time.Second)} + go client.Post("http://m.influxdb.com:8086/db/reporting/series?u=reporter&p=influxdb", "application/json", data) +} + +// monitorErrorChan reads an error channel and resends it through the server. +func (s *Server) monitorErrorChan(ch <-chan error) { + for { + select { + case err, ok := <-ch: + if !ok { + return + } + s.err <- err + case <-s.closing: + return + } + } +} + +// hostAddr returns the host and port that remote nodes will use to reach this +// node. +func (s *Server) hostAddr() (string, string, error) { + // Resolve host to address. + _, port, err := net.SplitHostPort(s.BindAddress) + if err != nil { + return "", "", fmt.Errorf("split bind address: %s", err) + } + + host := s.Hostname + + // See if we might have a port that will override the BindAddress port + if host != "" && host[len(host)-1] >= '0' && host[len(host)-1] <= '9' && strings.Contains(host, ":") { + hostArg, portArg, err := net.SplitHostPort(s.Hostname) + if err != nil { + return "", "", err + } + + if hostArg != "" { + host = hostArg + } + + if portArg != "" { + port = portArg + } + } + return host, port, nil +} + +// Service represents a service attached to the server. +type Service interface { + Open() error + Close() error +} + +// prof stores the file locations of active profiles. +var prof struct { + cpu *os.File + mem *os.File +} + +// StartProfile initializes the cpu and memory profile, if specified. +func startProfile(cpuprofile, memprofile string) { + if cpuprofile != "" { + f, err := os.Create(cpuprofile) + if err != nil { + log.Fatalf("cpuprofile: %v", err) + } + log.Printf("writing CPU profile to: %s\n", cpuprofile) + prof.cpu = f + pprof.StartCPUProfile(prof.cpu) + } + + if memprofile != "" { + f, err := os.Create(memprofile) + if err != nil { + log.Fatalf("memprofile: %v", err) + } + log.Printf("writing mem profile to: %s\n", memprofile) + prof.mem = f + runtime.MemProfileRate = 4096 + } + +} + +// StopProfile closes the cpu and memory profiles if they are running. +func stopProfile() { + if prof.cpu != nil { + pprof.StopCPUProfile() + prof.cpu.Close() + log.Println("CPU profile stopped") + } + if prof.mem != nil { + pprof.Lookup("heap").WriteTo(prof.mem, 0) + prof.mem.Close() + log.Println("mem profile stopped") + } +} + +type tcpaddr struct{ host string } + +func (a *tcpaddr) Network() string { return "tcp" } +func (a *tcpaddr) String() string { return a.host } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go new file mode 100644 index 000000000..aeb81826d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go @@ -0,0 +1,356 @@ +// This package is a set of convenience helpers and structs to make integration testing easier +package run_test + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "io/ioutil" + "log" + "math" + "net/http" + "net/url" + "os" + "regexp" + "strings" + "testing" + "time" + + "github.com/influxdb/influxdb/cmd/influxd/run" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/services/httpd" + "github.com/influxdb/influxdb/toml" +) + +// Server represents a test wrapper for run.Server. +type Server struct { + *run.Server + Config *run.Config +} + +// NewServer returns a new instance of Server. +func NewServer(c *run.Config) *Server { + buildInfo := &run.BuildInfo{ + Version: "testServer", + Commit: "testCommit", + Branch: "testBranch", + } + srv, _ := run.NewServer(c, buildInfo) + s := Server{ + Server: srv, + Config: c, + } + s.TSDBStore.EngineOptions.Config = c.Data + configureLogging(&s) + return &s +} + +// OpenServer opens a test server. +func OpenServer(c *run.Config, joinURLs string) *Server { + s := NewServer(c) + configureLogging(s) + if err := s.Open(); err != nil { + panic(err.Error()) + } + + return s +} + +// OpenServerWithVersion opens a test server with a specific version. +func OpenServerWithVersion(c *run.Config, version string) *Server { + buildInfo := &run.BuildInfo{ + Version: version, + Commit: "", + Branch: "", + } + srv, _ := run.NewServer(c, buildInfo) + s := Server{ + Server: srv, + Config: c, + } + configureLogging(&s) + if err := s.Open(); err != nil { + panic(err.Error()) + } + + return &s +} + +// Close shuts down the server and removes all temporary paths. +func (s *Server) Close() { + os.RemoveAll(s.Config.Meta.Dir) + os.RemoveAll(s.Config.Data.Dir) + os.RemoveAll(s.Config.HintedHandoff.Dir) + s.Server.Close() +} + +// URL returns the base URL for the httpd endpoint. +func (s *Server) URL() string { + for _, service := range s.Services { + if service, ok := service.(*httpd.Service); ok { + return "http://" + service.Addr().String() + } + } + panic("httpd server not found in services") +} + +// CreateDatabaseAndRetentionPolicy will create the database and retention policy. +func (s *Server) CreateDatabaseAndRetentionPolicy(db string, rp *meta.RetentionPolicyInfo) error { + if _, err := s.MetaStore.CreateDatabase(db); err != nil { + return err + } else if _, err := s.MetaStore.CreateRetentionPolicy(db, rp); err != nil { + return err + } + return nil +} + +// Query executes a query against the server and returns the results. +func (s *Server) Query(query string) (results string, err error) { + return s.QueryWithParams(query, nil) +} + +// Query executes a query against the server and returns the results. +func (s *Server) QueryWithParams(query string, values url.Values) (results string, err error) { + if values == nil { + values = url.Values{} + } + values.Set("q", query) + return s.HTTPGet(s.URL() + "/query?" + values.Encode()) +} + +// HTTPGet makes an HTTP GET request to the server and returns the response. +func (s *Server) HTTPGet(url string) (results string, err error) { + resp, err := http.Get(url) + if err != nil { + return "", err + } + body := string(MustReadAll(resp.Body)) + switch resp.StatusCode { + case http.StatusBadRequest: + if !expectPattern(".*error parsing query*.", body) { + return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body) + } + return body, nil + case http.StatusOK: + return body, nil + default: + return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body) + } +} + +// HTTPPost makes an HTTP POST request to the server and returns the response. +func (s *Server) HTTPPost(url string, content []byte) (results string, err error) { + buf := bytes.NewBuffer(content) + resp, err := http.Post(url, "application/json", buf) + if err != nil { + return "", err + } + body := string(MustReadAll(resp.Body)) + switch resp.StatusCode { + case http.StatusBadRequest: + if !expectPattern(".*error parsing query*.", body) { + return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body) + } + return body, nil + case http.StatusOK, http.StatusNoContent: + return body, nil + default: + return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body) + } +} + +// Write executes a write against the server and returns the results. +func (s *Server) Write(db, rp, body string, params url.Values) (results string, err error) { + if params == nil { + params = url.Values{} + } + if params.Get("db") == "" { + params.Set("db", db) + } + if params.Get("rp") == "" { + params.Set("rp", rp) + } + resp, err := http.Post(s.URL()+"/write?"+params.Encode(), "", strings.NewReader(body)) + if err != nil { + return "", err + } else if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent { + return "", fmt.Errorf("invalid status code: code=%d, body=%s", resp.StatusCode, MustReadAll(resp.Body)) + } + return string(MustReadAll(resp.Body)), nil +} + +// NewConfig returns the default config with temporary paths. +func NewConfig() *run.Config { + c := run.NewConfig() + c.ReportingDisabled = true + c.Cluster.ShardWriterTimeout = toml.Duration(30 * time.Second) + c.Cluster.WriteTimeout = toml.Duration(30 * time.Second) + c.Meta.Dir = MustTempFile() + c.Meta.BindAddress = "127.0.0.1:0" + c.Meta.HeartbeatTimeout = toml.Duration(50 * time.Millisecond) + c.Meta.ElectionTimeout = toml.Duration(50 * time.Millisecond) + c.Meta.LeaderLeaseTimeout = toml.Duration(50 * time.Millisecond) + c.Meta.CommitTimeout = toml.Duration(5 * time.Millisecond) + + c.Data.Dir = MustTempFile() + c.Data.WALDir = MustTempFile() + c.Data.WALLoggingEnabled = false + + c.HintedHandoff.Dir = MustTempFile() + + c.HTTPD.Enabled = true + c.HTTPD.BindAddress = "127.0.0.1:0" + c.HTTPD.LogEnabled = testing.Verbose() + + c.Monitor.StoreEnabled = false + + return c +} + +func newRetentionPolicyInfo(name string, rf int, duration time.Duration) *meta.RetentionPolicyInfo { + return &meta.RetentionPolicyInfo{Name: name, ReplicaN: rf, Duration: duration} +} + +func maxFloat64() string { + maxFloat64, _ := json.Marshal(math.MaxFloat64) + return string(maxFloat64) +} + +func maxInt64() string { + maxInt64, _ := json.Marshal(^int64(0)) + return string(maxInt64) +} + +func now() time.Time { + return time.Now().UTC() +} + +func yesterday() time.Time { + return now().Add(-1 * time.Hour * 24) +} + +func mustParseTime(layout, value string) time.Time { + tm, err := time.Parse(layout, value) + if err != nil { + panic(err) + } + return tm +} + +// MustReadAll reads r. Panic on error. +func MustReadAll(r io.Reader) []byte { + b, err := ioutil.ReadAll(r) + if err != nil { + panic(err) + } + return b +} + +// MustTempFile returns a path to a temporary file. +func MustTempFile() string { + f, err := ioutil.TempFile("", "influxd-") + if err != nil { + panic(err) + } + f.Close() + os.Remove(f.Name()) + return f.Name() +} + +func expectPattern(exp, act string) bool { + re := regexp.MustCompile(exp) + if !re.MatchString(act) { + return false + } + return true +} + +type Query struct { + name string + command string + params url.Values + exp, act string + pattern bool + skip bool + repeat int +} + +// Execute runs the command and returns an err if it fails +func (q *Query) Execute(s *Server) (err error) { + if q.params == nil { + q.act, err = s.Query(q.command) + return + } + q.act, err = s.QueryWithParams(q.command, q.params) + return +} + +func (q *Query) success() bool { + if q.pattern { + return expectPattern(q.exp, q.act) + } + return q.exp == q.act +} + +func (q *Query) Error(err error) string { + return fmt.Sprintf("%s: %v", q.name, err) +} + +func (q *Query) failureMessage() string { + return fmt.Sprintf("%s: unexpected results\nquery: %s\nexp: %s\nactual: %s\n", q.name, q.command, q.exp, q.act) +} + +type Test struct { + initialized bool + write string + params url.Values + db string + rp string + exp string + queries []*Query +} + +func NewTest(db, rp string) Test { + return Test{ + db: db, + rp: rp, + } +} + +func (t *Test) addQueries(q ...*Query) { + t.queries = append(t.queries, q...) +} + +func (t *Test) init(s *Server) error { + if t.write == "" || t.initialized { + return nil + } + t.initialized = true + if res, err := s.Write(t.db, t.rp, t.write, t.params); err != nil { + return err + } else if t.exp != res { + return fmt.Errorf("unexpected results\nexp: %s\ngot: %s\n", t.exp, res) + } + return nil +} + +func configureLogging(s *Server) { + // Set the logger to discard unless verbose is on + if !testing.Verbose() { + type logSetter interface { + SetLogger(*log.Logger) + } + nullLogger := log.New(ioutil.Discard, "", 0) + s.MetaStore.Logger = nullLogger + s.TSDBStore.Logger = nullLogger + s.HintedHandoff.SetLogger(nullLogger) + s.Monitor.SetLogger(nullLogger) + s.QueryExecutor.SetLogger(nullLogger) + for _, service := range s.Services { + if service, ok := service.(logSetter); ok { + service.SetLogger(nullLogger) + } + } + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go new file mode 100644 index 000000000..375a62941 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go @@ -0,0 +1,4782 @@ +package run_test + +import ( + "fmt" + "net/http" + "net/url" + "strconv" + "strings" + "testing" + "time" +) + +// Ensure that HTTP responses include the InfluxDB version. +func TestServer_HTTPResponseVersion(t *testing.T) { + version := "v1234" + s := OpenServerWithVersion(NewConfig(), version) + defer s.Close() + + resp, _ := http.Get(s.URL() + "/query") + got := resp.Header.Get("X-Influxdb-Version") + if got != version { + t.Errorf("Server responded with incorrect version, exp %s, got %s", version, got) + } +} + +// Ensure the database commands work. +func TestServer_DatabaseCommands(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + test := Test{ + queries: []*Query{ + &Query{ + name: "create database should succeed", + command: `CREATE DATABASE db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "create database should error with bad name", + command: `CREATE DATABASE 0xdb0`, + exp: `{"error":"error parsing query: found 0, expected identifier at line 1, char 17"}`, + }, + &Query{ + name: "show database should succeed", + command: `SHOW DATABASES`, + exp: `{"results":[{"series":[{"name":"databases","columns":["name"],"values":[["db0"]]}]}]}`, + }, + &Query{ + name: "create database should error if it already exists", + command: `CREATE DATABASE db0`, + exp: `{"results":[{"error":"database already exists"}]}`, + }, + &Query{ + name: "create database should not error with existing database with IF NOT EXISTS", + command: `CREATE DATABASE IF NOT EXISTS db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "create database should create non-existing database with IF NOT EXISTS", + command: `CREATE DATABASE IF NOT EXISTS db1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show database should succeed", + command: `SHOW DATABASES`, + exp: `{"results":[{"series":[{"name":"databases","columns":["name"],"values":[["db0"],["db1"]]}]}]}`, + }, + &Query{ + name: "drop database db0 should succeed", + command: `DROP DATABASE db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "drop database db1 should succeed", + command: `DROP DATABASE db1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show database should have no results", + command: `SHOW DATABASES`, + exp: `{"results":[{"series":[{"name":"databases","columns":["name"]}]}]}`, + }, + &Query{ + name: "drop database should error if it doesn't exist", + command: `DROP DATABASE db0`, + exp: `{"results":[{"error":"database not found: db0"}]}`, + }, + }, + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_DropAndRecreateDatabase(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "Drop database after data write", + command: `DROP DATABASE db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "Recreate database", + command: `CREATE DATABASE db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "Recreate retention policy", + command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 365d REPLICATION 1 DEFAULT`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "Show measurements after recreate", + command: `SHOW MEASUREMENTS`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Query data after recreate", + command: `SELECT * FROM cpu`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_DropDatabaseIsolated(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + if err := s.CreateDatabaseAndRetentionPolicy("db1", newRetentionPolicyInfo("rp1", 1, 0)); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "Query data from 1st database", + command: `SELECT * FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","host","region","val"],"values":[["2000-01-01T00:00:00Z","serverA","uswest",23.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Query data from 1st database with GROUP BY *", + command: `SELECT * FROM cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Drop other database", + command: `DROP DATABASE db1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "Query data from 1st database and ensure it's still there", + command: `SELECT * FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","host","region","val"],"values":[["2000-01-01T00:00:00Z","serverA","uswest",23.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Query data from 1st database and ensure it's still there with GROUP BY *", + command: `SELECT * FROM cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_DropAndRecreateSeries(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "Show series is present", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Drop series after data write", + command: `DROP SERIES FROM cpu`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Show series is gone", + command: `SHOW SERIES`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + + // Re-write data and test again. + reTest := NewTest("db0", "rp0") + reTest.write = strings.Join(writes, "\n") + + reTest.addQueries([]*Query{ + &Query{ + name: "Show series is present again after re-write", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range reTest.queries { + if i == 0 { + if err := reTest.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_DropSeriesFromRegex(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`a,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`aa,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`b,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`c,host=serverA,region=uswest val=30.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "Show series is present", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"a","columns":["_key","host","region"],"values":[["a,host=serverA,region=uswest","serverA","uswest"]]},{"name":"aa","columns":["_key","host","region"],"values":[["aa,host=serverA,region=uswest","serverA","uswest"]]},{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Drop series after data write", + command: `DROP SERIES FROM /a.*/`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Show series is gone", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Drop series from regex that matches no measurements", + command: `DROP SERIES FROM /a.*/`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "make sure DROP SERIES doesn't delete anything when regex doesn't match", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure retention policy commands work. +func TestServer_RetentionPolicyCommands(t *testing.T) { + t.Parallel() + c := NewConfig() + c.Meta.RetentionAutoCreate = false + s := OpenServer(c, "") + defer s.Close() + + // Create a database. + if _, err := s.MetaStore.CreateDatabase("db0"); err != nil { + t.Fatal(err) + } + + test := Test{ + queries: []*Query{ + &Query{ + name: "create retention policy should succeed", + command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 1h REPLICATION 1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "create retention policy should error if it already exists", + command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 1h REPLICATION 1`, + exp: `{"results":[{"error":"retention policy already exists"}]}`, + }, + &Query{ + name: "show retention policy should succeed", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","1h0m0s",1,false]]}]}]}`, + }, + &Query{ + name: "alter retention policy should succeed", + command: `ALTER RETENTION POLICY rp0 ON db0 DURATION 2h REPLICATION 3 DEFAULT`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show retention policy should have new altered information", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`, + }, + &Query{ + name: "dropping default retention policy should not succeed", + command: `DROP RETENTION POLICY rp0 ON db0`, + exp: `{"results":[{"error":"retention policy is default"}]}`, + }, + &Query{ + name: "show retention policy should still show policy", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`, + }, + &Query{ + name: "create a second non-default retention policy", + command: `CREATE RETENTION POLICY rp2 ON db0 DURATION 1h REPLICATION 1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show retention policy should show both", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true],["rp2","1h0m0s",1,false]]}]}]}`, + }, + &Query{ + name: "dropping non-default retention policy succeed", + command: `DROP RETENTION POLICY rp2 ON db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show retention policy should show just default", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`, + }, + &Query{ + name: "Ensure retention policy with unacceptable retention cannot be created", + command: `CREATE RETENTION POLICY rp3 ON db0 DURATION 1s REPLICATION 1`, + exp: `{"results":[{"error":"retention policy duration must be at least 1h0m0s"}]}`, + }, + &Query{ + name: "Check error when deleting retention policy on non-existent database", + command: `DROP RETENTION POLICY rp1 ON mydatabase`, + exp: `{"results":[{"error":"database not found"}]}`, + }, + }, + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the autocreation of retention policy works. +func TestServer_DatabaseRetentionPolicyAutoCreate(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + test := Test{ + queries: []*Query{ + &Query{ + name: "create database should succeed", + command: `CREATE DATABASE db0`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show retention policies should return auto-created policy", + command: `SHOW RETENTION POLICIES ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["default","0",1,true]]}]}]}`, + }, + }, + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure user commands work. +func TestServer_UserCommands(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + // Create a database. + if _, err := s.MetaStore.CreateDatabase("db0"); err != nil { + t.Fatal(err) + } + + test := Test{ + queries: []*Query{ + &Query{ + name: "show users, no actual users", + command: `SHOW USERS`, + exp: `{"results":[{"series":[{"columns":["user","admin"]}]}]}`, + }, + &Query{ + name: `create user`, + command: "CREATE USER jdoe WITH PASSWORD '1337'", + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show users, 1 existing user", + command: `SHOW USERS`, + exp: `{"results":[{"series":[{"columns":["user","admin"],"values":[["jdoe",false]]}]}]}`, + }, + &Query{ + name: "grant all priviledges to jdoe", + command: `GRANT ALL PRIVILEGES TO jdoe`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "show users, existing user as admin", + command: `SHOW USERS`, + exp: `{"results":[{"series":[{"columns":["user","admin"],"values":[["jdoe",true]]}]}]}`, + }, + &Query{ + name: "grant DB privileges to user", + command: `GRANT READ ON db0 TO jdoe`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "revoke all privileges", + command: `REVOKE ALL PRIVILEGES FROM jdoe`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "bad create user request", + command: `CREATE USER 0xBAD WITH PASSWORD pwd1337`, + exp: `{"error":"error parsing query: found 0, expected identifier at line 1, char 13"}`, + }, + &Query{ + name: "bad create user request, no name", + command: `CREATE USER WITH PASSWORD pwd1337`, + exp: `{"error":"error parsing query: found WITH, expected identifier at line 1, char 13"}`, + }, + &Query{ + name: "bad create user request, no password", + command: `CREATE USER jdoe`, + exp: `{"error":"error parsing query: found EOF, expected WITH at line 1, char 18"}`, + }, + &Query{ + name: "drop user", + command: `DROP USER jdoe`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "make sure user was dropped", + command: `SHOW USERS`, + exp: `{"results":[{"series":[{"columns":["user","admin"]}]}]}`, + }, + &Query{ + name: "delete non existing user", + command: `DROP USER noone`, + exp: `{"results":[{"error":"user not found"}]}`, + }, + }, + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(fmt.Sprintf("command: %s - err: %s", query.command, query.Error(err))) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can create a single point via json protocol and read it back. +func TestServer_Write_JSON(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + if res, err := s.Write("", "", fmt.Sprintf(`{"database" : "db0", "retentionPolicy" : "rp0", "points": [{"measurement": "cpu", "tags": {"host": "server02"},"fields": {"value": 1.0}}],"time":"%s"} `, now.Format(time.RFC3339Nano)), nil); err != nil { + t.Fatal(err) + } else if exp := ``; exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } + + // Verify the data was written. + if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil { + t.Fatal(err) + } else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } +} + +// Ensure the server can create a single point via line protocol with float type and read it back. +func TestServer_Write_LineProtocol_Float(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=1.0 `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil { + t.Fatal(err) + } else if exp := ``; exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } + + // Verify the data was written. + if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil { + t.Fatal(err) + } else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } +} + +// Ensure the server can create a single point via line protocol with bool type and read it back. +func TestServer_Write_LineProtocol_Bool(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=true `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil { + t.Fatal(err) + } else if exp := ``; exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } + + // Verify the data was written. + if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil { + t.Fatal(err) + } else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",true]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } +} + +// Ensure the server can create a single point via line protocol with string type and read it back. +func TestServer_Write_LineProtocol_String(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + if res, err := s.Write("db0", "rp0", `cpu,host=server01 value="disk full" `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil { + t.Fatal(err) + } else if exp := ``; exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } + + // Verify the data was written. + if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil { + t.Fatal(err) + } else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s","disk full"]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } +} + +// Ensure the server can create a single point via line protocol with integer type and read it back. +func TestServer_Write_LineProtocol_Integer(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=100 `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil { + t.Fatal(err) + } else if exp := ``; exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } + + // Verify the data was written. + if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil { + t.Fatal(err) + } else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res { + t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res) + } +} + +// Ensure the server can query with default databases (via param) and default retention policy +func TestServer_Query_DefaultDBAndRP(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf(`cpu value=1.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()) + + test.addQueries([]*Query{ + &Query{ + name: "default db and rp", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "default rp exists", + command: `show retention policies ON db0`, + exp: `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["default","0",1,false],["rp0","1h0m0s",1,true]]}]}]}`, + }, + &Query{ + name: "default rp", + command: `SELECT * FROM db0..cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "default dp", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM rp0.cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can have a database with multiple measurements. +func TestServer_Query_Multiple_Measurements(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + // Make sure we do writes for measurements that will span across shards + writes := []string{ + fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()), + } + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "measurement in one shard but not another shouldn't panic server", + command: `SELECT host,value FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["2000-01-01T00:00:00Z","server01",100]]}]}]}`, + }, + &Query{ + name: "measurement in one shard but not another shouldn't panic server", + command: `SELECT host,value FROM db0.rp0.cpu GROUP BY host`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server correctly supports data with identical tag values. +func TestServer_Query_IdenticalTagValues(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf("cpu,t1=val1 value=1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf("cpu,t2=val2 value=2 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()), + fmt.Sprintf("cpu,t1=val2 value=3 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:02:00Z").UnixNano()), + } + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "measurements with identical tag values - SELECT *, no GROUP BY", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"t1":"val1","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"t1":"val2","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:02:00Z",3]]},{"name":"cpu","tags":{"t1":"","t2":"val2"},"columns":["time","value"],"values":[["2000-01-01T00:01:00Z",2]]}]}]}`, + }, + &Query{ + name: "measurements with identical tag values - SELECT *, with GROUP BY", + command: `SELECT value FROM db0.rp0.cpu GROUP BY t1,t2`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"t1":"val1","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"t1":"val2","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:02:00Z",3]]},{"name":"cpu","tags":{"t1":"","t2":"val2"},"columns":["time","value"],"values":[["2000-01-01T00:01:00Z",2]]}]}]}`, + }, + &Query{ + name: "measurements with identical tag values - SELECT value no GROUP BY", + command: `SELECT value FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1],["2000-01-01T00:01:00Z",2],["2000-01-01T00:02:00Z",3]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can handle a query that involves accessing no shards. +func TestServer_Query_NoShards(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = `cpu,host=server01 value=1 ` + strconv.FormatInt(now.UnixNano(), 10) + + test.addQueries([]*Query{ + &Query{ + name: "selecting value should succeed", + command: `SELECT value FROM db0.rp0.cpu WHERE time < now() - 1d`, + exp: `{"results":[{}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query a non-existent field +func TestServer_Query_NonExistent(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = `cpu,host=server01 value=1 ` + strconv.FormatInt(now.UnixNano(), 10) + + test.addQueries([]*Query{ + &Query{ + name: "selecting value should succeed", + command: `SELECT value FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "selecting non-existent should succeed", + command: `SELECT foo FROM db0.rp0.cpu`, + exp: `{"results":[{}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can perform basic math +func TestServer_Query_Math(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db", newRetentionPolicyInfo("rp", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + writes := []string{ + "float value=42 " + strconv.FormatInt(now.UnixNano(), 10), + "integer value=42i " + strconv.FormatInt(now.UnixNano(), 10), + } + + test := NewTest("db", "rp") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "SELECT multiple of float value", + command: `SELECT value * 2 from db.rp.float`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"float","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "SELECT multiple of float value", + command: `SELECT 2 * value from db.rp.float`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"float","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "SELECT multiple of integer value", + command: `SELECT value * 2 from db.rp.integer`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"integer","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "SELECT float multiple of integer value", + command: `SELECT value * 2.0 from db.rp.integer`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"integer","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query with the count aggregate function +func TestServer_Query_Count(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10) + + hour_ago := now.Add(-time.Hour).UTC() + + test.addQueries([]*Query{ + &Query{ + name: "selecting count(value) should succeed", + command: `SELECT count(value) FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "selecting count(value) with where time should return result", + command: fmt.Sprintf(`SELECT count(value) FROM db0.rp0.cpu WHERE time >= '%s'`, hour_ago.Format(time.RFC3339Nano)), + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["%s",1]]}]}]}`, hour_ago.Format(time.RFC3339Nano)), + }, + &Query{ + name: "selecting count(*) should error", + command: `SELECT count(*) FROM db0.rp0.cpu`, + exp: `{"error":"error parsing query: expected field argument in count()"}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query with Now(). +func TestServer_Query_Now(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10) + + test.addQueries([]*Query{ + &Query{ + name: "where with time < now() should work", + command: `SELECT * FROM db0.rp0.cpu where time < now()`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["%s","server01",1]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "where with time < now() and GROUP BY * should work", + command: `SELECT * FROM db0.rp0.cpu where time < now() GROUP BY *`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "where with time > now() should return an empty result", + command: `SELECT * FROM db0.rp0.cpu where time > now()`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "where with time > now() with GROUP BY * should return an empty result", + command: `SELECT * FROM db0.rp0.cpu where time > now() GROUP BY *`, + exp: `{"results":[{}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query with epoch precisions. +func TestServer_Query_EpochPrecision(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10) + + test.addQueries([]*Query{ + &Query{ + name: "nanosecond precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"n"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()), + }, + &Query{ + name: "microsecond precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"u"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Microsecond)), + }, + &Query{ + name: "millisecond precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"ms"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Millisecond)), + }, + &Query{ + name: "second precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"s"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Second)), + }, + &Query{ + name: "minute precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"m"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Minute)), + }, + &Query{ + name: "hour precision", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + params: url.Values{"epoch": []string{"h"}}, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Hour)), + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server works with tag queries. +func TestServer_Query_Tags(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + writes := []string{ + fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", now.UnixNano()), + fmt.Sprintf("cpu,host=server02 value=50,core=2 %d", now.Add(1).UnixNano()), + + fmt.Sprintf("cpu1,host=server01,region=us-west value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf("cpu1,host=server02 value=200 %d", mustParseTime(time.RFC3339Nano, "2010-02-28T01:03:37.703820946Z").UnixNano()), + fmt.Sprintf("cpu1,host=server03 value=300 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()), + + fmt.Sprintf("cpu2,host=server01 value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf("cpu2 value=200 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()), + + fmt.Sprintf("cpu3,company=acme01 value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf("cpu3 value=200 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "tag without field should return error", + command: `SELECT host FROM db0.rp0.cpu`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + &Query{ + name: "field with tag should succeed", + command: `SELECT host, value FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["%s","server01",100],["%s","server02",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "field with tag and GROUP BY should succeed", + command: `SELECT host, value FROM db0.rp0.cpu GROUP BY host`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "field with two tags should succeed", + command: `SELECT host, value, core FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value","core"],"values":[["%s","server01",100,4],["%s","server02",50,2]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "field with two tags and GROUP BY should succeed", + command: `SELECT host, value, core FROM db0.rp0.cpu GROUP BY host`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value","core"],"values":[["%s",100,4]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value","core"],"values":[["%s",50,2]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "select * with tags should succeed", + command: `SELECT * FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","core","host","value"],"values":[["%s",4,"server01",100],["%s",2,"server02",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "select * with tags with GROUP BY * should succeed", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","core","value"],"values":[["%s",4,100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","core","value"],"values":[["%s",2,50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "group by tag", + command: `SELECT value FROM db0.rp0.cpu GROUP by host`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "single field (EQ tag value1)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (2 EQ tags)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' AND region = 'us-west'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (OR different tags)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server03' OR region = 'us-west'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (OR with non-existent tag value)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' OR host = 'server66'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (OR with all tag values)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' OR host = 'server02' OR host = 'server03'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (1 EQ and 1 NEQ tag)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' AND region != 'us-west'`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "single field (EQ tag value2)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server02'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200]]}]}]}`, + }, + &Query{ + name: "single field (NEQ tag value1)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300]]}]}]}`, + }, + &Query{ + name: "single field (NEQ tag value1 AND NEQ tag value2)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' AND host != 'server02'`, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",300]]}]}]}`, + }, + &Query{ + name: "single field (NEQ tag value1 OR NEQ tag value2)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' OR host != 'server02'`, // Yes, this is always true, but that's the point. + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (NEQ tag value1 AND NEQ tag value2 AND NEQ tag value3)", + command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' AND host != 'server02' AND host != 'server03'`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "single field (NEQ tag value1, point without any tags)", + command: `SELECT value FROM db0.rp0.cpu2 WHERE host != 'server01'`, + exp: `{"results":[{"series":[{"name":"cpu2","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200]]}]}]}`, + }, + &Query{ + name: "single field (NEQ tag value1, point without any tags)", + command: `SELECT value FROM db0.rp0.cpu3 WHERE company !~ /acme01/`, + exp: `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200]]}]}]}`, + }, + &Query{ + name: "single field (regex tag match)", + command: `SELECT value FROM db0.rp0.cpu3 WHERE company =~ /acme01/`, + exp: `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + &Query{ + name: "single field (regex tag match)", + command: `SELECT value FROM db0.rp0.cpu3 WHERE company !~ /acme[23]/`, + exp: `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server correctly queries with an alias. +func TestServer_Query_Alias(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf("cpu value=1i,steps=3i %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf("cpu value=2i,steps=4i %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()), + } + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "baseline query - SELECT * FROM db0.rp0.cpu", + command: `SELECT * FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","steps","value"],"values":[["2000-01-01T00:00:00Z",3,1],["2000-01-01T00:01:00Z",4,2]]}]}]}`, + }, + &Query{ + name: "basic query with alias - SELECT steps, value as v FROM db0.rp0.cpu", + command: `SELECT steps, value as v FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","steps","v"],"values":[["2000-01-01T00:00:00Z",3,1],["2000-01-01T00:01:00Z",4,2]]}]}]}`, + }, + &Query{ + name: "double aggregate sum - SELECT sum(value), sum(steps) FROM db0.rp0.cpu", + command: `SELECT sum(value), sum(steps) FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum","sum"],"values":[["1970-01-01T00:00:00Z",3,7]]}]}]}`, + }, + &Query{ + name: "double aggregate sum reverse order - SELECT sum(steps), sum(value) FROM db0.rp0.cpu", + command: `SELECT sum(steps), sum(value) FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum","sum"],"values":[["1970-01-01T00:00:00Z",7,3]]}]}]}`, + }, + &Query{ + name: "double aggregate sum with alias - SELECT sum(value) as sumv, sum(steps) as sums FROM db0.rp0.cpu", + command: `SELECT sum(value) as sumv, sum(steps) as sums FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sumv","sums"],"values":[["1970-01-01T00:00:00Z",3,7]]}]}]}`, + }, + &Query{ + name: "double aggregate with same value - SELECT sum(value), mean(value) FROM db0.rp0.cpu", + command: `SELECT sum(value), mean(value) FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",3,1.5]]}]}]}`, + }, + &Query{ + name: "double aggregate with same value and same alias - SELECT mean(value) as mv, max(value) as mv FROM db0.rp0.cpu", + command: `SELECT mean(value) as mv, max(value) as mv FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","mv","mv"],"values":[["1970-01-01T00:00:00Z",1.5,2]]}]}]}`, + }, + &Query{ + name: "double aggregate with non-existent field - SELECT mean(value), max(foo) FROM db0.rp0.cpu", + command: `SELECT mean(value), max(foo) FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","mean","max"],"values":[["1970-01-01T00:00:00Z",1.5,null]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server will succeed and error for common scenarios. +func TestServer_Query_Common(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu,host=server01 value=1 %s", strconv.FormatInt(now.UnixNano(), 10)) + + test.addQueries([]*Query{ + &Query{ + name: "selecting a from a non-existent database should error", + command: `SELECT value FROM db1.rp0.cpu`, + exp: `{"results":[{"error":"database not found: db1"}]}`, + }, + &Query{ + name: "selecting a from a non-existent retention policy should error", + command: `SELECT value FROM db0.rp1.cpu`, + exp: `{"results":[{"error":"retention policy not found"}]}`, + }, + &Query{ + name: "selecting a valid measurement and field should succeed", + command: `SELECT value FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "explicitly selecting time and a valid measurement and field should succeed", + command: `SELECT time,value FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "selecting a measurement that doesn't exist should result in empty set", + command: `SELECT value FROM db0.rp0.idontexist`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "selecting a field that doesn't exist should result in empty set", + command: `SELECT idontexist FROM db0.rp0.cpu`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "selecting wildcard without specifying a database should error", + command: `SELECT * FROM cpu`, + exp: `{"results":[{"error":"database name required"}]}`, + }, + &Query{ + name: "selecting explicit field without specifying a database should error", + command: `SELECT value FROM cpu`, + exp: `{"results":[{"error":"database name required"}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query two points. +func TestServer_Query_SelectTwoPoints(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu value=100 %s\ncpu value=200 %s", strconv.FormatInt(now.UnixNano(), 10), strconv.FormatInt(now.Add(1).UnixNano(), 10)) + + test.addQueries( + &Query{ + name: "selecting two points should result in two points", + command: `SELECT * FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + &Query{ + name: "selecting two points with GROUP BY * should result in two points", + command: `SELECT * FROM db0.rp0.cpu GROUP BY *`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }, + ) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query two negative points. +func TestServer_Query_SelectTwoNegativePoints(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu value=-100 %s\ncpu value=-200 %s", strconv.FormatInt(now.UnixNano(), 10), strconv.FormatInt(now.Add(1).UnixNano(), 10)) + + test.addQueries(&Query{ + name: "selecting two negative points should succeed", + command: `SELECT * FROM db0.rp0.cpu`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",-100],["%s",-200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)), + }) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can query with relative time. +func TestServer_Query_SelectRelativeTime(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + now := now() + yesterday := yesterday() + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu,host=server01 value=100 %s\ncpu,host=server01 value=200 %s", strconv.FormatInt(yesterday.UnixNano(), 10), strconv.FormatInt(now.UnixNano(), 10)) + + test.addQueries([]*Query{ + &Query{ + name: "single point with time pre-calculated for past time queries yesterday", + command: `SELECT * FROM db0.rp0.cpu where time >= '` + yesterday.Add(-1*time.Minute).Format(time.RFC3339Nano) + `' GROUP BY *`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, yesterday.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano)), + }, + &Query{ + name: "single point with time pre-calculated for relative time queries now", + command: `SELECT * FROM db0.rp0.cpu where time >= now() - 1m GROUP BY *`, + exp: fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",200]]}]}]}`, now.Format(time.RFC3339Nano)), + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Ensure the server can handle various simple calculus queries. +func TestServer_Query_SelectRawCalculus(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu value=210 1278010021000000000\ncpu value=10 1278010022000000000") + + test.addQueries([]*Query{ + &Query{ + name: "calculate single derivate", + command: `SELECT derivative(value) from db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","derivative"],"values":[["2010-07-01T18:47:02Z",-200]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// mergeMany ensures that when merging many series together and some of them have a different number +// of points than others in a group by interval the results are correct +func TestServer_Query_MergeMany(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + // set infinite retention policy as we are inserting data in the past and don't want retention policy enforcement to make this test racy + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + + writes := []string{} + for i := 1; i < 11; i++ { + for j := 1; j < 5+i%3; j++ { + data := fmt.Sprintf(`cpu,host=server_%d value=22 %d`, i, time.Unix(int64(j), int64(0)).UTC().UnixNano()) + writes = append(writes, data) + } + } + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "GROUP by time", + command: `SELECT count(value) FROM db0.rp0.cpu WHERE time >= '1970-01-01T00:00:01Z' AND time <= '1970-01-01T00:00:06Z' GROUP BY time(1s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["1970-01-01T00:00:01Z",10],["1970-01-01T00:00:02Z",10],["1970-01-01T00:00:03Z",10],["1970-01-01T00:00:04Z",10],["1970-01-01T00:00:05Z",7],["1970-01-01T00:00:06Z",3]]}]}]}`, + }, + &Query{ + skip: true, + name: "GROUP by tag - FIXME issue #2875", + command: `SELECT count(value) FROM db0.rp0.cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:00Z' group by host`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server03"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "GROUP by field", + command: `SELECT count(value) FROM db0.rp0.cpu group by value`, + exp: `{"results":[{"error":"can not use field in GROUP BY clause: value"}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_SLimitAndSOffset(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + // set infinite retention policy as we are inserting data in the past and don't want retention policy enforcement to make this test racy + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + + writes := []string{} + for i := 1; i < 10; i++ { + data := fmt.Sprintf(`cpu,region=us-east,host=server-%d value=%d %d`, i, i, time.Unix(int64(i), int64(0)).UnixNano()) + writes = append(writes, data) + } + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "SLIMIT 2 SOFFSET 1", + command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 2 SOFFSET 1`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-2","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server-3","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "SLIMIT 2 SOFFSET 3", + command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 2 SOFFSET 3`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-4","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server-5","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "SLIMIT 3 SOFFSET 8", + command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 3 SOFFSET 8`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-9","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Regex(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu1,host=server01 value=10 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf(`cpu2,host=server01 value=20 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf(`cpu3,host=server01 value=30 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "default db and rp", + command: `SELECT * FROM /cpu[13]/`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu1","columns":["time","host","value"],"values":[["2015-02-28T01:03:36.703820946Z","server01",10]]},{"name":"cpu3","columns":["time","host","value"],"values":[["2015-02-28T01:03:36.703820946Z","server01",30]]}]}]}`, + }, + &Query{ + name: "default db and rp with GROUP BY *", + command: `SELECT * FROM /cpu[13]/ GROUP BY *`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`, + }, + &Query{ + name: "specifying db and rp", + command: `SELECT * FROM db0.rp0./cpu[13]/ GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`, + }, + &Query{ + name: "default db and specified rp", + command: `SELECT * FROM rp0./cpu[13]/ GROUP BY *`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`, + }, + &Query{ + name: "specified db and default rp", + command: `SELECT * FROM db0../cpu[13]/ GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_AggregatesCommon(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`int value=45 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + + fmt.Sprintf(`intmax value=%s %d`, maxInt64(), mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`intmax value=%s %d`, maxInt64(), mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + + fmt.Sprintf(`intmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`intmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`intmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + fmt.Sprintf(`intmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()), + fmt.Sprintf(`intmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()), + fmt.Sprintf(`intmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()), + fmt.Sprintf(`intmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()), + fmt.Sprintf(`intmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()), + + fmt.Sprintf(`intoverlap,region=us-east value=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`intoverlap,region=us-east value=30 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`intoverlap,region=us-west value=100 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`intoverlap,region=us-east otherVal=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + + fmt.Sprintf(`floatsingle value=45.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + + fmt.Sprintf(`floatmax value=%s %d`, maxFloat64(), mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`floatmax value=%s %d`, maxFloat64(), mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + + fmt.Sprintf(`floatmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()), + fmt.Sprintf(`floatmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()), + + fmt.Sprintf(`floatoverlap,region=us-east value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`floatoverlap,region=us-east value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`floatoverlap,region=us-west value=100.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`floatoverlap,region=us-east otherVal=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + + fmt.Sprintf(`load,region=us-east,host=serverA value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`load,region=us-east,host=serverB value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`load,region=us-west,host=serverC value=100.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + + fmt.Sprintf(`cpu,region=uk,host=serverZ,service=redis value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + fmt.Sprintf(`cpu,region=uk,host=serverZ,service=mysql value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + + fmt.Sprintf(`stringdata value="first" %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + fmt.Sprintf(`stringdata value="last" %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:04Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + // int64 + &Query{ + name: "stddev with just one point - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT STDDEV(value) FROM int`, + exp: `{"results":[{"series":[{"name":"int","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`, + }, + &Query{ + name: "large mean and stddev - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEAN(value), STDDEV(value) FROM intmax`, + exp: `{"results":[{"series":[{"name":"intmax","columns":["time","mean","stddev"],"values":[["1970-01-01T00:00:00Z",` + maxInt64() + `,0]]}]}]}`, + }, + &Query{ + name: "mean and stddev - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEAN(value), STDDEV(value) FROM intmany WHERE time >= '2000-01-01' AND time < '2000-01-01T00:02:00Z' GROUP BY time(10m)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","mean","stddev"],"values":[["2000-01-01T00:00:00Z",5,2.138089935299395]]}]}]}`, + }, + &Query{ + name: "first - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT FIRST(value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`, + }, + &Query{ + name: "last - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT LAST(value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:01:10Z",9]]}]}]}`, + }, + &Query{ + name: "spread - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SPREAD(value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","spread"],"values":[["1970-01-01T00:00:00Z",7]]}]}]}`, + }, + &Query{ + name: "median - even count - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEDIAN(value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4.5]]}]}]}`, + }, + &Query{ + name: "median - odd count - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEDIAN(value) FROM intmany where time < '2000-01-01T00:01:10Z'`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4]]}]}]}`, + }, + &Query{ + name: "distinct as call - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT(value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`, + }, + &Query{ + name: "distinct alt syntax - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT value FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`, + }, + &Query{ + name: "distinct select tag - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT(host) FROM intmany`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + &Query{ + name: "distinct alt select tag - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT host FROM intmany`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + &Query{ + name: "count distinct - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT value) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`, + }, + &Query{ + name: "count distinct as call - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT(value)) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`, + }, + &Query{ + name: "count distinct select tag - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT host) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`, + }, + &Query{ + name: "count distinct as call select tag - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT host) FROM intmany`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`, + }, + &Query{ + name: "aggregation with no interval - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT count(value) FROM intoverlap WHERE time = '2000-01-01 00:00:00'`, + exp: `{"results":[{"series":[{"name":"intoverlap","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`, + }, + &Query{ + name: "sum - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM intoverlap WHERE time >= '2000-01-01 00:00:05' AND time <= '2000-01-01T00:00:10Z' GROUP BY time(10s), region`, + exp: `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:10Z",30]]}]}]}`, + }, + &Query{ + name: "aggregation with a null field value - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM intoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`, + }, + &Query{ + name: "multiple aggregations - int", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value), MEAN(value) FROM intoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",50,25]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",100,100]]}]}]}`, + }, + &Query{ + skip: true, + name: "multiple aggregations with division - int FIXME issue #2879", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value), mean(value), sum(value) / mean(value) as div FROM intoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean","div"],"values":[["1970-01-01T00:00:00Z",50,25,2]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",100,100,1]]}]}]}`, + }, + + // float64 + &Query{ + name: "stddev with just one point - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT STDDEV(value) FROM floatsingle`, + exp: `{"results":[{"series":[{"name":"floatsingle","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`, + }, + &Query{ + name: "large mean and stddev - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEAN(value), STDDEV(value) FROM floatmax`, + exp: `{"results":[{"series":[{"name":"floatmax","columns":["time","mean","stddev"],"values":[["1970-01-01T00:00:00Z",` + maxFloat64() + `,0]]}]}]}`, + }, + &Query{ + name: "mean and stddev - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEAN(value), STDDEV(value) FROM floatmany WHERE time >= '2000-01-01' AND time < '2000-01-01T00:02:00Z' GROUP BY time(10m)`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","mean","stddev"],"values":[["2000-01-01T00:00:00Z",5,2.138089935299395]]}]}]}`, + }, + &Query{ + name: "first - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT FIRST(value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`, + }, + &Query{ + name: "last - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT LAST(value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","last"],"values":[["2000-01-01T00:01:10Z",9]]}]}]}`, + }, + &Query{ + name: "spread - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SPREAD(value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","spread"],"values":[["1970-01-01T00:00:00Z",7]]}]}]}`, + }, + &Query{ + name: "median - even count - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEDIAN(value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4.5]]}]}]}`, + }, + &Query{ + name: "median - odd count - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEDIAN(value) FROM floatmany where time < '2000-01-01T00:01:10Z'`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4]]}]}]}`, + }, + &Query{ + name: "distinct as call - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT(value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`, + }, + &Query{ + name: "distinct alt syntax - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT value FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`, + }, + &Query{ + name: "distinct select tag - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT(host) FROM floatmany`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + &Query{ + name: "distinct alt select tag - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT DISTINCT host FROM floatmany`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + &Query{ + name: "count distinct - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT value) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`, + }, + &Query{ + name: "count distinct as call - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT(value)) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`, + }, + &Query{ + name: "count distinct select tag - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT host) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`, + }, + &Query{ + name: "count distinct as call select tag - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(DISTINCT host) FROM floatmany`, + exp: `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`, + }, + &Query{ + name: "aggregation with no interval - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT count(value) FROM floatoverlap WHERE time = '2000-01-01 00:00:00'`, + exp: `{"results":[{"series":[{"name":"floatoverlap","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`, + }, + &Query{ + name: "sum - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM floatoverlap WHERE time >= '2000-01-01 00:00:05' AND time <= '2000-01-01T00:00:10Z' GROUP BY time(10s), region`, + exp: `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:10Z",30]]}]}]}`, + }, + &Query{ + name: "aggregation with a null field value - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM floatoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`, + }, + &Query{ + name: "multiple aggregations - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value), MEAN(value) FROM floatoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",50,25]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",100,100]]}]}]}`, + }, + &Query{ + name: "multiple aggregations with division - float", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value) / mean(value) as div FROM floatoverlap GROUP BY region`, + exp: `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",2]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`, + }, + + // strings + &Query{ + name: "STDDEV on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT STDDEV(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`, + }, + &Query{ + name: "MEAN on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEAN(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`, + }, + &Query{ + name: "MEDIAN on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT MEDIAN(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`, + }, + &Query{ + name: "COUNT on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT COUNT(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",2]]}]}]}`, + }, + &Query{ + name: "FIRST on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT FIRST(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","first"],"values":[["2000-01-01T00:00:03Z","first"]]}]}]}`, + }, + &Query{ + name: "LAST on string data - string", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT LAST(value) FROM stringdata`, + exp: `{"results":[{"series":[{"name":"stringdata","columns":["time","last"],"values":[["2000-01-01T00:00:04Z","last"]]}]}]}`, + }, + + // general queries + &Query{ + name: "group by multiple dimensions", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value) FROM load GROUP BY region, host`, + exp: `{"results":[{"series":[{"name":"load","tags":{"host":"serverA","region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",20]]},{"name":"load","tags":{"host":"serverB","region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",30]]},{"name":"load","tags":{"host":"serverC","region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`, + }, + &Query{ + name: "aggregation with WHERE and AND", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value) FROM cpu WHERE region='uk' AND host='serverZ'`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]}]}]}`, + }, + + // Mathematics + &Query{ + name: "group by multiple dimensions", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value)*2 FROM load`, + exp: `{"results":[{"series":[{"name":"load","columns":["time",""],"values":[["1970-01-01T00:00:00Z",300]]}]}]}`, + }, + &Query{ + name: "group by multiple dimensions", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT sum(value)/2 FROM load`, + exp: `{"results":[{"series":[{"name":"load","columns":["time",""],"values":[["1970-01-01T00:00:00Z",75]]}]}]}`, + }, + + // group by + &Query{ + name: "max order by time with time specified group by 10s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(10s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7],["2000-01-01T00:01:10Z",9]]}]}]}`, + }, + &Query{ + name: "max order by time without time specified group by 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:30Z",5],["2000-01-01T00:01:00Z",9]]}]}]}`, + }, + &Query{ + name: "max order by time with time specified group by 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:01:10Z",9]]}]}]}`, + }, + &Query{ + name: "min order by time without time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT min(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`, + }, + &Query{ + name: "min order by time with time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, min(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`, + }, + &Query{ + name: "first order by time without time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT first(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`, + }, + &Query{ + name: "first order by time with time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, first(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`, + }, + &Query{ + name: "last order by time without time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT last(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",5],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",9]]}]}]}`, + }, + &Query{ + name: "last order by time with time specified group by 15s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, last(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:10Z",9]]}]}]}`, + }, + + // order by time desc + &Query{ + name: "aggregate order by time desc", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:00Z' group by time(10s) order by time desc`, + exp: `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:01:00Z",7],["2000-01-01T00:00:50Z",5],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:00Z",2]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_AggregateSelectors(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`network,host=server01,region=west,core=1 rx=10i,tx=20i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`network,host=server02,region=west,core=2 rx=40i,tx=50i,core=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`network,host=server03,region=east,core=3 rx=40i,tx=55i,core=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + fmt.Sprintf(`network,host=server04,region=east,core=4 rx=40i,tx=60i,core=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()), + fmt.Sprintf(`network,host=server05,region=west,core=1 rx=50i,tx=70i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()), + fmt.Sprintf(`network,host=server06,region=east,core=2 rx=50i,tx=40i,core=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()), + fmt.Sprintf(`network,host=server07,region=west,core=3 rx=70i,tx=30i,core=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()), + fmt.Sprintf(`network,host=server08,region=east,core=4 rx=90i,tx=10i,core=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()), + fmt.Sprintf(`network,host=server09,region=east,core=1 rx=5i,tx=4i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:20Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "baseline", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM network`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","core","host","region","rx","tx"],"values":[["2000-01-01T00:00:00Z",2,"server01","west",10,20],["2000-01-01T00:00:10Z",3,"server02","west",40,50],["2000-01-01T00:00:20Z",4,"server03","east",40,55],["2000-01-01T00:00:30Z",1,"server04","east",40,60],["2000-01-01T00:00:40Z",2,"server05","west",50,70],["2000-01-01T00:00:50Z",3,"server06","east",50,40],["2000-01-01T00:01:00Z",4,"server07","west",70,30],["2000-01-01T00:01:10Z",1,"server08","east",90,10],["2000-01-01T00:01:20Z",2,"server09","east",5,4]]}]}]}`, + }, + &Query{ + name: "max - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",90]]}]}]}`, + }, + &Query{ + name: "max - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","max"],"values":[["2000-01-01T00:00:00Z",50,40],["2000-01-01T00:00:30Z",70,50],["2000-01-01T00:01:00Z",10,90]]}]}]}`, + }, + &Query{ + name: "max - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","max"],"values":[["2000-01-01T00:00:10Z",40],["2000-01-01T00:00:40Z",50],["2000-01-01T00:01:10Z",90]]}]}]}`, + }, + &Query{ + name: "max - time and tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, tx, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","max"],"values":[["2000-01-01T00:00:10Z",50,40],["2000-01-01T00:00:40Z",70,50],["2000-01-01T00:01:10Z",10,90]]}]}]}`, + }, + &Query{ + name: "min - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",5]]}]}]}`, + }, + &Query{ + name: "min - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","min"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",4,5]]}]}]}`, + }, + &Query{ + name: "min - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:20Z",5]]}]}]}`, + }, + &Query{ + name: "min - time and tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, tx, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","min"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:20Z",4,5]]}]}]}`, + }, + &Query{ + name: "first - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",70]]}]}]}`, + }, + &Query{ + name: "first - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, tx, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","first"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",30,70]]}]}]}`, + }, + &Query{ + name: "first - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",70]]}]}]}`, + }, + &Query{ + name: "first - time and tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, tx, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","first"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",30,70]]}]}]}`, + }, + &Query{ + name: "last - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",5]]}]}]}`, + }, + &Query{ + name: "last - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","last"],"values":[["2000-01-01T00:00:00Z",55,40],["2000-01-01T00:00:30Z",40,50],["2000-01-01T00:01:00Z",4,5]]}]}]}`, + }, + &Query{ + name: "last - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","last"],"values":[["2000-01-01T00:00:20Z",40],["2000-01-01T00:00:50Z",50],["2000-01-01T00:01:20Z",5]]}]}]}`, + }, + &Query{ + name: "last - time and tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, tx, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","tx","last"],"values":[["2000-01-01T00:00:20Z",55,40],["2000-01-01T00:00:50Z",40,50],["2000-01-01T00:01:20Z",4,5]]}]}]}`, + }, + &Query{ + name: "count - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:30Z",3],["2000-01-01T00:01:00Z",3]]}]}]}`, + }, + &Query{ + name: "count - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "count - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "distinct - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","distinct"],"values":[["2000-01-01T00:00:00Z",[10,40]],["2000-01-01T00:00:30Z",[40,50]],["2000-01-01T00:01:00Z",[5,70,90]]]}]}]}`, + }, + &Query{ + name: "distinct - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: aggregate function distinct() can not be combined with other functions or fields"}`, + }, + &Query{ + name: "distinct - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: aggregate function distinct() can not be combined with other functions or fields"}`, + }, + &Query{ + name: "mean - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30],["2000-01-01T00:00:30Z",46.666666666666664],["2000-01-01T00:01:00Z",55]]}]}]}`, + }, + &Query{ + name: "mean - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "mean - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "median - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","median"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",70]]}]}]}`, + }, + &Query{ + name: "median - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "median - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "spread - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","spread"],"values":[["2000-01-01T00:00:00Z",30],["2000-01-01T00:00:30Z",10],["2000-01-01T00:01:00Z",85]]}]}]}`, + }, + &Query{ + name: "spread - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "spread - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "stddev - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","stddev"],"values":[["2000-01-01T00:00:00Z",17.320508075688775],["2000-01-01T00:00:30Z",5.773502691896258],["2000-01-01T00:01:00Z",44.44097208657794]]}]}]}`, + }, + &Query{ + name: "stddev - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "stddev - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "percentile - baseline 30s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"results":[{"series":[{"name":"network","columns":["time","percentile"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",70]]}]}]}`, + }, + &Query{ + name: "percentile - time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + &Query{ + name: "percentile - tx", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT tx, percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`, + exp: `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_TopInt(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + // cpu data with overlapping duplicate values + // hour 0 + fmt.Sprintf(`cpu,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server02 value=3.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`cpu,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + // hour 1 + fmt.Sprintf(`cpu,host=server04 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server05 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:10Z").UnixNano()), + fmt.Sprintf(`cpu,host=server06 value=6.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:20Z").UnixNano()), + // hour 2 + fmt.Sprintf(`cpu,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:10Z").UnixNano()), + + // memory data + // hour 0 + fmt.Sprintf(`memory,host=a,service=redis value=1000i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=mysql value=2000i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=redis value=1500i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + // hour 1 + fmt.Sprintf(`memory,host=a,service=redis value=1001i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=mysql value=2001i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=redis value=1501i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()), + // hour 2 + fmt.Sprintf(`memory,host=a,service=redis value=1002i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=mysql value=2002i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=b,service=redis value=1502i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "top - cpu", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 1) FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - 2 values", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 2) FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - 3 values - sorts on tie properly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 3) FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - with tag", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, 2) FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top","host"],"values":[["2000-01-01T01:00:10Z",7,"server05"],["2000-01-01T02:00:10Z",9,"server08"]]}]}]}`, + }, + &Query{ + name: "top - cpu - 3 values with limit 2", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 3) FROM cpu limit 2`, + exp: `{"error":"error parsing query: limit (3) in top function can not be larger than the LIMIT (2) in the select statement"}`, + }, + &Query{ + name: "top - cpu - hourly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 1) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T01:00:00Z",7],["2000-01-01T02:00:00Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - time specified - hourly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT time, TOP(value, 1) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - time specified (not first) - hourly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 1), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - 2 values hourly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 2) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:00Z",3],["2000-01-01T01:00:00Z",7],["2000-01-01T01:00:00Z",6],["2000-01-01T02:00:00Z",9],["2000-01-01T02:00:00Z",7]]}]}]}`, + }, + &Query{ + name: "top - cpu - time specified - 2 values hourly", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 2), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:10Z",3],["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T01:00:20Z",6],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - cpu - 3 values hourly - validates that a bucket can have less than limit if no values exist in that time bucket", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 3) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:00Z",2],["2000-01-01T01:00:00Z",7],["2000-01-01T01:00:00Z",6],["2000-01-01T01:00:00Z",5],["2000-01-01T02:00:00Z",9],["2000-01-01T02:00:00Z",7]]}]}]}`, + }, + &Query{ + name: "top - cpu - time specified - 3 values hourly - validates that a bucket can have less than limit if no values exist in that time bucket", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 3), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:10Z",3],["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:00Z",5],["2000-01-01T01:00:10Z",7],["2000-01-01T01:00:20Z",6],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`, + }, + &Query{ + name: "top - memory - 2 values, two tags", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, 2), host, service FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T01:00:00Z",2001,"b","mysql"],["2000-01-01T02:00:00Z",2002,"b","mysql"]]}]}]}`, + }, + &Query{ + name: "top - memory - host tag with limit 2", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, 2) FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host"],"values":[["2000-01-01T02:00:00Z",2002,"b"],["2000-01-01T02:00:00Z",1002,"a"]]}]}]}`, + }, + &Query{ + name: "top - memory - host tag with limit 2, service tag in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, 2), service FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`, + }, + &Query{ + name: "top - memory - service tag with limit 2, host tag in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, service, 2), host FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","service","host"],"values":[["2000-01-01T02:00:00Z",2002,"mysql","b"],["2000-01-01T02:00:00Z",1502,"redis","b"]]}]}]}`, + }, + &Query{ + name: "top - memory - host and service tag with limit 2", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, service, 2) FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1502,"b","redis"]]}]}]}`, + }, + &Query{ + name: "top - memory - host tag with limit 2 with service tag in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, 2), service FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`, + }, + &Query{ + name: "top - memory - host and service tag with limit 3", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT TOP(value, host, service, 3) FROM memory`, + exp: `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1502,"b","redis"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`, + }, + + // TODO + // - Test that specifiying fields or tags in the function will rewrite the query to expand them to the fields + // - Test that a field can be used in the top function + // - Test that asking for a field will come back before a tag if they have the same name for a tag and a field + // - Test that `select top(value, host, 2)` when there is only one value for `host` it will only bring back one value + // - Test that `select top(value, host, 4) from foo where time > now() - 1d and time < now() group by time(1h)` and host is unique in some time buckets that it returns only the unique ones, and not always 4 values + + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +// Test various aggregates when different series only have data for the same timestamp. +func TestServer_Query_Aggregates_IdenticalTime(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`series,host=a value=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=b value=2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=c value=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=d value=4 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=e value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=f value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=g value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=h value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`series,host=i value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "last from multiple series with identical timestamp", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT last(value) FROM "series"`, + exp: `{"results":[{"series":[{"name":"series","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",5]]}]}]}`, + repeat: 100, + }, + &Query{ + name: "first from multiple series with identical timestamp", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT first(value) FROM "series"`, + exp: `{"results":[{"series":[{"name":"series","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",5]]}]}]}`, + repeat: 100, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + for n := 0; n <= query.repeat; n++ { + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + } +} + +// This will test that when using a group by, that it observes the time you asked for +// but will only put the values in the bucket that match the time range +func TestServer_Query_GroupByTimeCutoffs(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu value=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`cpu value=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()), + fmt.Sprintf(`cpu value=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:05Z").UnixNano()), + fmt.Sprintf(`cpu value=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:08Z").UnixNano()), + fmt.Sprintf(`cpu value=5i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:09Z").UnixNano()), + fmt.Sprintf(`cpu value=6i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + } + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "sum all time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",21]]}]}]}`, + }, + &Query{ + name: "sum all time grouped by time 5s", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`, + }, + &Query{ + name: "sum all time grouped by time 5s missing first point", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:01Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`, + }, + &Query{ + name: "sum all time grouped by time 5s missing first points (null for bucket)", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:02Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`, + }, + &Query{ + name: "sum all time grouped by time 5s missing last point - 2 time intervals", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:09Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",12]]}]}]}`, + }, + &Query{ + name: "sum all time grouped by time 5s missing last 2 points - 2 time intervals", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:08Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",7]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Write_Precision(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []struct { + write string + params url.Values + }{ + { + write: fmt.Sprintf("cpu_n0_precision value=1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").UnixNano()), + }, + { + write: fmt.Sprintf("cpu_n1_precision value=1.1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").UnixNano()), + params: url.Values{"precision": []string{"n"}}, + }, + { + write: fmt.Sprintf("cpu_u_precision value=100 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Microsecond).UnixNano()/int64(time.Microsecond)), + params: url.Values{"precision": []string{"u"}}, + }, + { + write: fmt.Sprintf("cpu_ms_precision value=200 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Millisecond).UnixNano()/int64(time.Millisecond)), + params: url.Values{"precision": []string{"ms"}}, + }, + { + write: fmt.Sprintf("cpu_s_precision value=300 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Second).UnixNano()/int64(time.Second)), + params: url.Values{"precision": []string{"s"}}, + }, + { + write: fmt.Sprintf("cpu_m_precision value=400 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Minute).UnixNano()/int64(time.Minute)), + params: url.Values{"precision": []string{"m"}}, + }, + { + write: fmt.Sprintf("cpu_h_precision value=500 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Hour).UnixNano()/int64(time.Hour)), + params: url.Values{"precision": []string{"h"}}, + }, + } + + test := NewTest("db0", "rp0") + + test.addQueries([]*Query{ + &Query{ + name: "point with nanosecond precision time - no precision specified on write", + command: `SELECT * FROM cpu_n0_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_n0_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012345Z",1]]}]}]}`, + }, + &Query{ + name: "point with nanosecond precision time", + command: `SELECT * FROM cpu_n1_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_n1_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012345Z",1.1]]}]}]}`, + }, + &Query{ + name: "point with microsecond precision time", + command: `SELECT * FROM cpu_u_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_u_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012Z",100]]}]}]}`, + }, + &Query{ + name: "point with millisecond precision time", + command: `SELECT * FROM cpu_ms_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_ms_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789Z",200]]}]}]}`, + }, + &Query{ + name: "point with second precision time", + command: `SELECT * FROM cpu_s_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_s_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56Z",300]]}]}]}`, + }, + &Query{ + name: "point with minute precision time", + command: `SELECT * FROM cpu_m_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_m_precision","columns":["time","value"],"values":[["2000-01-01T12:34:00Z",400]]}]}]}`, + }, + &Query{ + name: "point with hour precision time", + command: `SELECT * FROM cpu_h_precision`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"cpu_h_precision","columns":["time","value"],"values":[["2000-01-01T12:00:00Z",500]]}]}]}`, + }, + }...) + + // we are doing writes that require parameter changes, so we are fighting the test harness a little to make this happen properly + for _, w := range writes { + test.write = w.write + test.params = w.params + test.initialized = false + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Wildcards(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`wildcard,region=us-east value=10 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`wildcard,region=us-east valx=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`wildcard,region=us-east value=30,valx=40 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + + fmt.Sprintf(`wgroup,region=us-east value=10.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`wgroup,region=us-east value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`wgroup,region=us-west value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + + fmt.Sprintf(`m1,region=us-east value=10.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`m2,host=server01 field=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "wildcard", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`, + }, + &Query{ + name: "wildcard with group by", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM wildcard GROUP BY *`, + exp: `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`, + }, + &Query{ + name: "GROUP BY queries", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT mean(value) FROM wgroup GROUP BY *`, + exp: `{"results":[{"series":[{"name":"wgroup","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",15]]},{"name":"wgroup","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",30]]}]}]}`, + }, + &Query{ + name: "GROUP BY queries with time", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT mean(value) FROM wgroup WHERE time >= '2000-01-01T00:00:00Z' AND time < '2000-01-01T00:01:00Z' GROUP BY *,TIME(1m)`, + exp: `{"results":[{"series":[{"name":"wgroup","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",15]]},{"name":"wgroup","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30]]}]}]}`, + }, + &Query{ + name: "wildcard and field in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT value, * FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`, + }, + &Query{ + name: "field and wildcard in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT value, * FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`, + }, + &Query{ + name: "field and wildcard in group by", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM wildcard GROUP BY region, *`, + exp: `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`, + }, + &Query{ + name: "wildcard and field in group by", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM wildcard GROUP BY *, region`, + exp: `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`, + }, + &Query{ + name: "wildcard with multiple measurements", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM m1, m2`, + exp: `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`, + }, + &Query{ + name: "wildcard with multiple measurements via regex", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM /^m.*/`, + exp: `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`, + }, + &Query{ + name: "wildcard with multiple measurements via regex and limit", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM db0../^m.*/ LIMIT 2`, + exp: `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_WildcardExpansion(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`wildcard,region=us-east,host=A value=10,cpu=80 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`wildcard,region=us-east,host=B value=20,cpu=90 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`wildcard,region=us-west,host=B value=30,cpu=70 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + fmt.Sprintf(`wildcard,region=us-east,host=A value=40,cpu=60 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()), + + fmt.Sprintf(`dupnames,region=us-east,day=1 value=10,day=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`dupnames,region=us-east,day=2 value=20,day=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()), + fmt.Sprintf(`dupnames,region=us-west,day=3 value=30,day=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "wildcard", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","cpu","host","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`, + }, + &Query{ + name: "no wildcard in select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT cpu, host, region, value FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","cpu","host","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`, + }, + &Query{ + name: "no wildcard in select, preserve column order", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT host, cpu, region, value FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","host","cpu","region","value"],"values":[["2000-01-01T00:00:00Z","A",80,"us-east",10],["2000-01-01T00:00:10Z","B",90,"us-east",20],["2000-01-01T00:00:20Z","B",70,"us-west",30],["2000-01-01T00:00:30Z","A",60,"us-east",40]]}]}]}`, + }, + + &Query{ + name: "only tags, no fields", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT host, region FROM wildcard`, + exp: `{"results":[{"error":"statement must have at least one field in select clause"}]}`, + }, + + &Query{ + name: "no wildcard with alias", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT cpu as c, host as h, region, value FROM wildcard`, + exp: `{"results":[{"series":[{"name":"wildcard","columns":["time","c","h","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`, + }, + &Query{ + name: "duplicate tag and field name, always favor field over tag", + command: `SELECT * FROM dupnames`, + params: url.Values{"db": []string{"db0"}}, + exp: `{"results":[{"series":[{"name":"dupnames","columns":["time","day","region","value"],"values":[["2000-01-01T00:00:00Z",3,"us-east",10],["2000-01-01T00:00:10Z",2,"us-east",20],["2000-01-01T00:00:20Z",1,"us-west",30]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_AcrossShardsAndFields(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu load=100 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`cpu load=200 %d`, mustParseTime(time.RFC3339Nano, "2010-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`cpu core=4 %d`, mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "two results for cpu", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT load FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2000-01-01T00:00:00Z",100],["2010-01-01T00:00:00Z",200]]}]}]}`, + }, + &Query{ + name: "two results for cpu, multi-select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT core,load FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core","load"],"values":[["2000-01-01T00:00:00Z",null,100],["2010-01-01T00:00:00Z",null,200],["2015-01-01T00:00:00Z",4,null]]}]}]}`, + }, + &Query{ + name: "two results for cpu, wildcard select", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT * FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core","load"],"values":[["2000-01-01T00:00:00Z",null,100],["2010-01-01T00:00:00Z",null,200],["2015-01-01T00:00:00Z",4,null]]}]}]}`, + }, + &Query{ + name: "one result for core", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT core FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2015-01-01T00:00:00Z",4]]}]}]}`, + }, + &Query{ + name: "empty result set from non-existent field", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT foo FROM cpu`, + exp: `{"results":[{}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Where_Fields(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu alert_id="alert",tenant_id="tenant",_cust="johnson brothers" %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + fmt.Sprintf(`cpu alert_id="alert",tenant_id="tenant",_cust="johnson brothers" %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()), + + fmt.Sprintf(`cpu load=100.0,core=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()), + fmt.Sprintf(`cpu load=80.0,core=2 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:01:02Z").UnixNano()), + + fmt.Sprintf(`clicks local=true %d`, mustParseTime(time.RFC3339Nano, "2014-11-10T23:00:01Z").UnixNano()), + fmt.Sprintf(`clicks local=false %d`, mustParseTime(time.RFC3339Nano, "2014-11-10T23:00:02Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + // non type specific + &Query{ + name: "missing measurement with group by", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT load from missing group by *`, + exp: `{"results":[{}]}`, + }, + + // string + &Query{ + name: "single string field", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT alert_id FROM cpu WHERE alert_id='alert'`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert"]]}]}]}`, + }, + &Query{ + name: "string AND query, all fields in SELECT", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT alert_id,tenant_id,_cust FROM cpu WHERE alert_id='alert' AND tenant_id='tenant'`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id","tenant_id","_cust"],"values":[["2015-02-28T01:03:36.703820946Z","alert","tenant","johnson brothers"]]}]}]}`, + }, + &Query{ + name: "string AND query, all fields in SELECT, one in parenthesis", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT alert_id,tenant_id FROM cpu WHERE alert_id='alert' AND (tenant_id='tenant')`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id","tenant_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert","tenant"]]}]}]}`, + }, + &Query{ + name: "string underscored field", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT alert_id FROM cpu WHERE _cust='johnson brothers'`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert"]]}]}]}`, + }, + &Query{ + name: "string no match", + params: url.Values{"db": []string{"db0"}}, + command: `SELECT alert_id FROM cpu WHERE _cust='acme'`, + exp: `{"results":[{}]}`, + }, + + // float64 + &Query{ + name: "float64 GT no match", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load > 100`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "float64 GTE match one", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load >= 100`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`, + }, + &Query{ + name: "float64 EQ match upper bound", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load = 100`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`, + }, + &Query{ + name: "float64 LTE match two", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load <= 100`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100],["2009-11-10T23:01:02Z",80]]}]}]}`, + }, + &Query{ + name: "float64 GT match one", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load > 99`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`, + }, + &Query{ + name: "float64 EQ no match", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load = 99`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "float64 LT match one", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load < 99`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:01:02Z",80]]}]}]}`, + }, + &Query{ + name: "float64 LT no match", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load < 80`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "float64 NE match one", + params: url.Values{"db": []string{"db0"}}, + command: `select load from cpu where load != 100`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:01:02Z",80]]}]}]}`, + }, + + // int64 + &Query{ + name: "int64 GT no match", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core > 4`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "int64 GTE match one", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core >= 4`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`, + }, + &Query{ + name: "int64 EQ match upper bound", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core = 4`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`, + }, + &Query{ + name: "int64 LTE match two ", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core <= 4`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4],["2009-11-10T23:01:02Z",2]]}]}]}`, + }, + &Query{ + name: "int64 GT match one", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core > 3`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`, + }, + &Query{ + name: "int64 EQ no match", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core = 3`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "int64 LT match one", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core < 3`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:01:02Z",2]]}]}]}`, + }, + &Query{ + name: "int64 LT no match", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core < 2`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "int64 NE match one", + params: url.Values{"db": []string{"db0"}}, + command: `select core from cpu where core != 4`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:01:02Z",2]]}]}]}`, + }, + + // bool + &Query{ + name: "bool EQ match true", + params: url.Values{"db": []string{"db0"}}, + command: `select local from clicks where local = true`, + exp: `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:01Z",true]]}]}]}`, + }, + &Query{ + name: "bool EQ match false", + params: url.Values{"db": []string{"db0"}}, + command: `select local from clicks where local = false`, + exp: `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:02Z",false]]}]}]}`, + }, + + &Query{ + name: "bool NE match one", + params: url.Values{"db": []string{"db0"}}, + command: `select local from clicks where local != true`, + exp: `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:02Z",false]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Where_With_Tags(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`where_events,tennant=paul foo="bar" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()), + fmt.Sprintf(`where_events,tennant=paul foo="baz" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()), + fmt.Sprintf(`where_events,tennant=paul foo="bat" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()), + fmt.Sprintf(`where_events,tennant=todd foo="bar" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()), + fmt.Sprintf(`where_events,tennant=david foo="bap" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "tag field and time", + params: url.Values{"db": []string{"db0"}}, + command: `select foo from where_events where (tennant = 'paul' OR tennant = 'david') AND time > 1s AND (foo = 'bar' OR foo = 'baz' OR foo = 'bap')`, + exp: `{"results":[{"series":[{"name":"where_events","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z","bar"],["2009-11-10T23:00:03Z","baz"],["2009-11-10T23:00:06Z","bap"]]}]}]}`, + }, + &Query{ + name: "where on tag that should be double quoted but isn't", + params: url.Values{"db": []string{"db0"}}, + command: `show series where data-center = 'foo'`, + exp: `{"results":[{"error":"invalid expression: data - center = 'foo'"}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_LimitAndOffset(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`limited,tennant=paul foo=2 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()), + fmt.Sprintf(`limited,tennant=paul foo=3 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()), + fmt.Sprintf(`limited,tennant=paul foo=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()), + fmt.Sprintf(`limited,tennant=todd foo=5 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "limit on points", + params: url.Values{"db": []string{"db0"}}, + command: `select foo from "limited" LIMIT 2`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3]]}]}]}`, + }, + &Query{ + name: "limit higher than the number of data points", + params: url.Values{"db": []string{"db0"}}, + command: `select foo from "limited" LIMIT 20`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4],["2009-11-10T23:00:05Z",5]]}]}]}`, + }, + &Query{ + name: "limit and offset", + params: url.Values{"db": []string{"db0"}}, + command: `select foo from "limited" LIMIT 2 OFFSET 1`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4]]}]}]}`, + }, + &Query{ + name: "limit + offset equal to total number of points", + params: url.Values{"db": []string{"db0"}}, + command: `select foo from "limited" LIMIT 3 OFFSET 3`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:05Z",5]]}]}]}`, + }, + &Query{ + name: "limit - offset higher than number of points", + command: `select foo from "limited" LIMIT 2 OFFSET 20`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","foo"]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit on points with group by time", + command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit higher than the number of data points with group by time", + command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 20`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4],["2009-11-10T23:00:05Z",5]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit and offset with group by time", + command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2 OFFSET 1`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit + offset equal to the number of points with group by time", + command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 3 OFFSET 3`, + exp: `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:05Z",5]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit - offset higher than number of points with group by time", + command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2 OFFSET 20`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit higher than the number of data points should error", + command: `select mean(foo) from "limited" where time > '2000-01-01T00:00:00Z' group by time(1s), * fill(0) limit 2147483647`, + exp: `{"results":[{"error":"too many points in the group by interval. maybe you forgot to specify a where time clause?"}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "limit1 higher than MaxGroupBy but the number of data points is less than MaxGroupBy", + command: `select mean(foo) from "limited" where time >= '2009-11-10T23:00:02Z' and time < '2009-11-10T23:00:03Z' group by time(1s), * fill(0) limit 2147483647`, + exp: `{"results":[{"series":[{"name":"limited","tags":{"tennant":"paul"},"columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2]]},{"name":"limited","tags":{"tennant":"todd"},"columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",0]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Fill(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`fills val=3 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()), + fmt.Sprintf(`fills val=5 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()), + fmt.Sprintf(`fills val=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()), + fmt.Sprintf(`fills val=10 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:16Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "fill with value", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(1)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",10]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with value, WHERE all values match condition", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val < 50 group by time(5s) FILL(1)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",10]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with value, WHERE no values match condition", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val > 50 group by time(5s) FILL(1)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",1],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",1]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with previous", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(previous)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",4],["2009-11-10T23:00:15Z",10]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with none, i.e. clear out nulls", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(none)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:15Z",10]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill defaults to null", + command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",10]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with count aggregate defaults to null", + command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",2],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",1]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with count aggregate defaults to null, no values match", + command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val > 100 group by time(5s)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",null],["2009-11-10T23:00:05Z",null],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",null]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "fill with count aggregate specific value", + command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) fill(1234)`, + exp: `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",2],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",1234],["2009-11-10T23:00:15Z",1]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_Chunk(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := make([]string, 10001) // 10,000 is the default chunking size, even when no chunking requested. + expectedValues := make([]string, len(writes)) + for i := 0; i < len(writes); i++ { + writes[i] = fmt.Sprintf(`cpu value=%d %d`, i, time.Unix(0, int64(i)).UnixNano()) + expectedValues[i] = fmt.Sprintf(`["%s",%d]`, time.Unix(0, int64(i)).UTC().Format(time.RFC3339Nano), i) + } + expected := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[%s]}]}]}`, strings.Join(expectedValues, ",")) + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "SELECT all values, no chunking", + command: `SELECT value FROM cpu`, + exp: expected, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + +} + +func TestServer_Query_DropAndRecreateMeasurement(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf(`memory,host=serverB,region=uswest val=33.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "Drop Measurement, series tags preserved tests", + command: `SHOW MEASUREMENTS`, + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["memory"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "show series", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]},{"name":"memory","columns":["_key","host","region"],"values":[["memory,host=serverB,region=uswest","serverB","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "ensure we can query for memory with both tags", + command: `SELECT * FROM memory where region='uswest' and host='serverB' GROUP BY *`, + exp: `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "drop measurement cpu", + command: `DROP MEASUREMENT cpu`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify measurements", + command: `SHOW MEASUREMENTS`, + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["memory"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify series", + command: `SHOW SERIES`, + exp: `{"results":[{"series":[{"name":"memory","columns":["_key","host","region"],"values":[["memory,host=serverB,region=uswest","serverB","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify cpu measurement is gone", + command: `SELECT * FROM cpu`, + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify selecting from a tag 'host' still works", + command: `SELECT * FROM memory where host='serverB' GROUP BY *`, + exp: `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify selecting from a tag 'region' still works", + command: `SELECT * FROM memory where region='uswest' GROUP BY *`, + exp: `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify selecting from a tag 'host' and 'region' still works", + command: `SELECT * FROM memory where region='uswest' and host='serverB' GROUP BY *`, + exp: `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "Drop non-existant measurement", + command: `DROP MEASUREMENT doesntexist`, + exp: `{"results":[{"error":"measurement not found: doesntexist"}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + // Test that re-inserting the measurement works fine. + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + + test = NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "verify measurements after recreation", + command: `SHOW MEASUREMENTS`, + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["memory"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "verify cpu measurement has been re-inserted", + command: `SELECT * FROM cpu GROUP BY *`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_ShowSeries(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:01Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()), + fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()), + fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()), + fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()), + fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:07Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: `show series`, + command: "SHOW SERIES", + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]},{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server02,region=useast","server02","useast"],["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series from measurement`, + command: "SHOW SERIES FROM cpu", + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series from regular expression`, + command: "SHOW SERIES FROM /[cg]pu/", + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server02,region=useast","server02","useast"],["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series with where tag`, + command: "SHOW SERIES WHERE region = 'uswest'", + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01,region=uswest","server01","uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series where tag matches regular expression`, + command: "SHOW SERIES WHERE region =~ /ca.*/", + exp: `{"results":[{"series":[{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series`, + command: "SHOW SERIES WHERE host !~ /server0[12]/", + exp: `{"results":[{"series":[{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show series with from and where`, + command: "SHOW SERIES FROM cpu WHERE region = 'useast'", + exp: `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_ShowMeasurements(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server02,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`other,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: `show measurements with limit 2`, + command: "SHOW MEASUREMENTS LIMIT 2", + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["gpu"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show measurements where tag matches regular expression`, + command: "SHOW MEASUREMENTS WHERE region =~ /ca.*/", + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["gpu"],["other"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show measurements where tag does not match a regular expression`, + command: "SHOW MEASUREMENTS WHERE region !~ /ca.*/", + exp: `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_ShowTagKeys(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: `show tag keys`, + command: "SHOW TAG KEYS", + exp: `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"disk","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"gpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "show tag keys from", + command: "SHOW TAG KEYS FROM cpu", + exp: `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "show tag keys from regex", + command: "SHOW TAG KEYS FROM /[cg]pu/", + exp: `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"gpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "show tag keys measurement not found", + command: "SHOW TAG KEYS FROM doesntexist", + exp: `{"results":[{}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: "show tag values with key", + command: "SHOW TAG VALUES WITH KEY = host", + exp: `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"],["server02"],["server03"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show tag values with key and where`, + command: `SHOW TAG VALUES FROM cpu WITH KEY = host WHERE region = 'uswest'`, + exp: `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show tag values with key and where matches regular expression`, + command: `SHOW TAG VALUES WITH KEY = host WHERE region =~ /ca.*/`, + exp: `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server03"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show tag values with key and where does not matche regular expression`, + command: `SHOW TAG VALUES WITH KEY = region WHERE host !~ /server0[12]/`, + exp: `{"results":[{"series":[{"name":"regionTagValues","columns":["region"],"values":[["caeast"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show tag values with key in and where does not matche regular expression`, + command: `SHOW TAG VALUES FROM cpu WITH KEY IN (host, region) WHERE region = 'uswest'`, + exp: `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"]]},{"name":"regionTagValues","columns":["region"],"values":[["uswest"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show tag values with key and measurement matches regular expression`, + command: `SHOW TAG VALUES FROM /[cg]pu/ WITH KEY = host`, + exp: `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"],["server02"],["server03"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_ShowFieldKeys(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=server01 field1=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=uswest field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=useast field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`cpu,host=server02,region=useast field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server01,region=useast field4=200,field5=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`gpu,host=server03,region=caeast field6=200,field7=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + fmt.Sprintf(`disk,host=server03,region=caeast field8=200,field9=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: `show field keys`, + command: `SHOW FIELD KEYS`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]},{"name":"disk","columns":["fieldKey"],"values":[["field8"],["field9"]]},{"name":"gpu","columns":["fieldKey"],"values":[["field4"],["field5"],["field6"],["field7"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show field keys from measurement`, + command: `SHOW FIELD KEYS FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + &Query{ + name: `show field keys measurement with regex`, + command: `SHOW FIELD KEYS FROM /[cg]pu/`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]},{"name":"gpu","columns":["fieldKey"],"values":[["field4"],["field5"],["field6"],["field7"]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_ContinuousQuery(t *testing.T) { + t.Skip() + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + runTest := func(test *Test, t *testing.T) { + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + } + + // Start times of CQ intervals. + interval0 := time.Now().Add(-time.Second).Round(time.Second * 5) + interval1 := interval0.Add(-time.Second * 5) + interval2 := interval0.Add(-time.Second * 10) + interval3 := interval0.Add(-time.Second * 15) + + writes := []string{ + // Point too far in the past for CQ to pick up. + fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, interval3.Add(time.Second).UnixNano()), + + // Points two intervals ago. + fmt.Sprintf(`cpu,host=server01 value=100 %d`, interval2.Add(time.Second).UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, interval2.Add(time.Second*2).UnixNano()), + fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, interval2.Add(time.Second*3).UnixNano()), + + // Points one interval ago. + fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, interval1.Add(time.Second).UnixNano()), + fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, interval1.Add(time.Second*2).UnixNano()), + + // Points in the current interval. + fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, interval0.Add(time.Second).UnixNano()), + fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, interval0.Add(time.Second*2).UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + test.addQueries([]*Query{ + &Query{ + name: `create another retention policy for CQ to write into`, + command: `CREATE RETENTION POLICY rp1 ON db0 DURATION 1h REPLICATION 1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "create continuous query with backreference", + command: `CREATE CONTINUOUS QUERY "cq1" ON db0 BEGIN SELECT count(value) INTO "rp1".:MEASUREMENT FROM /[cg]pu/ GROUP BY time(5s) END`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: `create another retention policy for CQ to write into`, + command: `CREATE RETENTION POLICY rp2 ON db0 DURATION 1h REPLICATION 1`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: "create continuous query with backreference and group by time", + command: `CREATE CONTINUOUS QUERY "cq2" ON db0 BEGIN SELECT count(value) INTO "rp2".:MEASUREMENT FROM /[cg]pu/ GROUP BY time(5s), * END`, + exp: `{"results":[{}]}`, + }, + &Query{ + name: `show continuous queries`, + command: `SHOW CONTINUOUS QUERIES`, + exp: `{"results":[{"series":[{"name":"db0","columns":["name","query"],"values":[["cq1","CREATE CONTINUOUS QUERY cq1 ON db0 BEGIN SELECT count(value) INTO \"db0\".\"rp1\".:MEASUREMENT FROM \"db0\".\"rp0\"./[cg]pu/ GROUP BY time(5s) END"],["cq2","CREATE CONTINUOUS QUERY cq2 ON db0 BEGIN SELECT count(value) INTO \"db0\".\"rp2\".:MEASUREMENT FROM \"db0\".\"rp0\"./[cg]pu/ GROUP BY time(5s), * END"]]}]}]}`, + }, + }...) + + // Run first test to create CQs. + runTest(&test, t) + + // Trigger CQs to run. + u := fmt.Sprintf("%s/data/process_continuous_queries?time=%d", s.URL(), interval0.UnixNano()) + if _, err := s.HTTPPost(u, nil); err != nil { + t.Fatal(err) + } + + // Wait for CQs to run. TODO: fix this ugly hack + time.Sleep(time.Second * 5) + + // Setup tests to check the CQ results. + test2 := NewTest("db0", "rp1") + test2.addQueries([]*Query{ + &Query{ + name: "check results of cq1", + command: `SELECT * FROM "rp1"./[cg]pu/`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","count","host","region","value"],"values":[["` + interval2.UTC().Format(time.RFC3339Nano) + `",3,null,null,null]]},{"name":"gpu","columns":["time","count","host","region","value"],"values":[["` + interval1.UTC().Format(time.RFC3339Nano) + `",2,null,null,null],["` + interval0.UTC().Format(time.RFC3339Nano) + `",1,null,null,null]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + // TODO: restore this test once this is fixed: https://github.com/influxdb/influxdb/issues/3968 + &Query{ + skip: true, + name: "check results of cq2", + command: `SELECT * FROM "rp2"./[cg]pu/`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","count","host","region","value"],"values":[["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","uswest",null],["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","",null],["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","useast",null]]},{"name":"gpu","columns":["time","count","host","region","value"],"values":[["` + interval1.UTC().Format(time.RFC3339Nano) + `",1,"server02","useast",null],["` + interval1.UTC().Format(time.RFC3339Nano) + `",1,"server03","caeast",null],["` + interval0.UTC().Format(time.RFC3339Nano) + `",1,"server03","caeast",null]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + // Run second test to check CQ results. + runTest(&test2, t) +} + +// Tests that a known CQ query with concurrent writes does not deadlock the server +func TestServer_ContinuousQuery_Deadlock(t *testing.T) { + + // Skip until #3517 & #3522 are merged + t.Skip("Skipping CQ deadlock test") + if testing.Short() { + t.Skip("skipping CQ deadlock test") + } + t.Parallel() + s := OpenServer(NewConfig(), "") + defer func() { + s.Close() + // Nil the server so our deadlock detector goroutine can determine if we completed writes + // without timing out + s.Server = nil + }() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + + test.addQueries([]*Query{ + &Query{ + name: "create continuous query", + command: `CREATE CONTINUOUS QUERY "my.query" ON db0 BEGIN SELECT sum(visits) as visits INTO test_1m FROM myseries GROUP BY time(1m), host END`, + exp: `{"results":[{}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } + + // Deadlock detector. If the deadlock is fixed, this test should complete all the writes in ~2.5s seconds (with artifical delays + // added). After 10 seconds, if the server has not been closed then we hit the deadlock bug. + iterations := 0 + go func(s *Server) { + <-time.After(10 * time.Second) + + // If the server is not nil then the test is still running and stuck. We panic to avoid + // having the whole test suite hang indefinitely. + if s.Server != nil { + panic("possible deadlock. writes did not complete in time") + } + }(s) + + for { + + // After the second write, if the deadlock exists, we'll get a write timeout and + // all subsequent writes will timeout + if iterations > 5 { + break + } + writes := []string{} + for i := 0; i < 1000; i++ { + writes = append(writes, fmt.Sprintf(`myseries,host=host-%d visits=1i`, i)) + } + write := strings.Join(writes, "\n") + + if _, err := s.Write(test.db, test.rp, write, test.params); err != nil { + t.Fatal(err) + } + iterations += 1 + time.Sleep(500 * time.Millisecond) + } +} + +func TestServer_Query_EvilIdentifiers(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + test := NewTest("db0", "rp0") + test.write = fmt.Sprintf("cpu select=1,in-bytes=2 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()) + + test.addQueries([]*Query{ + &Query{ + name: `query evil identifiers`, + command: `SELECT "select", "in-bytes" FROM cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","select","in-bytes"],"values":[["2000-01-01T00:00:00Z",1,2]]}]}]}`, + params: url.Values{"db": []string{"db0"}}, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_OrderByTime(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu,host=server1 value=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()), + fmt.Sprintf(`cpu,host=server1 value=2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:02Z").UnixNano()), + fmt.Sprintf(`cpu,host=server1 value=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "order on points", + params: url.Values{"db": []string{"db0"}}, + command: `select value from "cpu" ORDER BY time DESC`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T00:00:03Z",3],["2000-01-01T00:00:02Z",2],["2000-01-01T00:00:01Z",1]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_FieldWithMultiplePeriods(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`cpu foo.bar.baz=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "baseline", + params: url.Values{"db": []string{"db0"}}, + command: `select * from cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "select field with periods", + params: url.Values{"db": []string{"db0"}}, + command: `select "foo.bar.baz" from cpu`, + exp: `{"results":[{"series":[{"name":"cpu","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} + +func TestServer_Query_FieldWithMultiplePeriodsMeasurementPrefixMatch(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil { + t.Fatal(err) + } + if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + + writes := []string{ + fmt.Sprintf(`foo foo.bar.baz=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + } + + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "baseline", + params: url.Values{"db": []string{"db0"}}, + command: `select * from foo`, + exp: `{"results":[{"series":[{"name":"foo","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`, + }, + &Query{ + name: "select field with periods", + params: url.Values{"db": []string{"db0"}}, + command: `select "foo.bar.baz" from foo`, + exp: `{"results":[{"series":[{"name":"foo","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`, + }, + }...) + + for i, query := range test.queries { + if i == 0 { + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + } + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md new file mode 100644 index 000000000..2b6883de7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md @@ -0,0 +1,150 @@ +# Server Integration Tests + +Currently, the file `server_test.go` has integration tests for single node scenarios. +At some point we'll need to add cluster tests, and may add them in a different file, or +rename `server_test.go` to `server_single_node_test.go` or something like that. + +## What is in a test? + +Each test is broken apart effectively into the following areas: + +- Write sample data +- Use cases for table driven test, that include a command (typically a query) and an expected result. + +When each test runs it does the following: + +- init: determines if there are any writes and if so, writes them to the in-memory database +- queries: iterate through each query, executing the command, and comparing the results to the expected result. + +## Idempotent - Allows for parallel tests + +Each test should be `idempotent`, meaining that its data will not be affected by other tests, or use cases within the table tests themselves. +This allows for parallel testing, keeping the test suite total execution time very low. + +### Basic sample test + +```go +// Ensure the server can have a database with multiple measurements. +func TestServer_Query_Multiple_Measurements(t *testing.T) { + t.Parallel() + s := OpenServer(NewConfig(), "") + defer s.Close() + + if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) + } + + // Make sure we do writes for measurements that will span across shards + writes := []string{ + fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()), + } + test := NewTest("db0", "rp0") + test.write = strings.Join(writes, "\n") + + test.addQueries([]*Query{ + &Query{ + name: "measurement in one shard but not another shouldn't panic server", + command: `SELECT host,value FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`, + }, + }...) + + if err := test.init(s); err != nil { + t.Fatalf("test init failed: %s", err) + } + + for _, query := range test.queries { + if query.skip { + t.Logf("SKIP:: %s", query.name) + continue + } + if err := query.Execute(s); err != nil { + t.Error(query.Error(err)) + } else if !query.success() { + t.Error(query.failureMessage()) + } + } +} +``` + +Let's break this down: + +In this test, we first tell it to run in parallel with the `t.Parallel()` call. + +We then open a new server with: + +```go +s := OpenServer(NewConfig(), "") +defer s.Close() +``` + +If needed, we create a database and default retention policy. This is usually needed +when inserting and querying data. This is not needed if you are testing commands like `CREATE DATABASE`, `SHOW DIAGNOSTICS`, etc. + +```go +if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil { + t.Fatal(err) +} +``` + +Next, set up the write data you need: + +```go +writes := []string{ + fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()), + fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()), +} +``` +Create a new test with the database and retention policy: + +```go +test := NewTest("db0", "rp0") +``` + +Send in the writes: +```go +test.write = strings.Join(writes, "\n") +``` + +Add some queries (the second one is mocked out to show how to add more than one): + +```go +test.addQueries([]*Query{ + &Query{ + name: "measurement in one shard but not another shouldn't panic server", + command: `SELECT host,value FROM db0.rp0.cpu`, + exp: `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`, + }, + &Query{ + name: "another test here...", + command: `Some query command`, + exp: `the expected results`, + }, +}...) +``` + +The rest of the code is boilerplate execution code. It is purposefully not refactored out to a helper +to make sure the test failure reports the proper lines for debugging purposes. + +#### Running the tests + +To run the tests: + +```sh +go test ./cmd/influxd/run -parallel 500 -timeout 10s +``` + +#### Running a specific test + +```sh +go test ./cmd/influxd/run -parallel 500 -timeout 10s -run TestServer_Query_Fill +``` + +#### Verbose feedback + +By default, all logs are silenced when testing. If you pass in the `-v` flag, the test suite becomes verbose, and enables all logging in the system + +```sh +go test ./cmd/influxd/run -parallel 500 -timeout 10s -run TestServer_Query_Fill -v +``` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/inspect/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/inspect/main.go new file mode 100644 index 000000000..f299fee1c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/inspect/main.go @@ -0,0 +1,136 @@ +package main + +import ( + "encoding/binary" + "flag" + "fmt" + "io/ioutil" + "log" + "os" + "path/filepath" + "sort" + "strings" + "text/tabwriter" + + "github.com/influxdb/influxdb/tsdb" + _ "github.com/influxdb/influxdb/tsdb/engine" +) + +func main() { + + var path string + flag.StringVar(&path, "p", os.Getenv("HOME")+"/.influxdb", "Root storage path. [$HOME/.influxdb]") + flag.Parse() + + tstore := tsdb.NewStore(filepath.Join(path, "data")) + tstore.Logger = log.New(ioutil.Discard, "", log.LstdFlags) + tstore.EngineOptions.Config.Dir = filepath.Join(path, "data") + tstore.EngineOptions.Config.WALLoggingEnabled = false + tstore.EngineOptions.Config.WALDir = filepath.Join(path, "wal") + if err := tstore.Open(); err != nil { + fmt.Printf("Failed to open dir: %v\n", err) + os.Exit(1) + } + + size, err := tstore.DiskSize() + if err != nil { + fmt.Printf("Failed to determine disk usage: %v\n", err) + } + + // Summary stats + fmt.Printf("Shards: %d, Indexes: %d, Databases: %d, Disk Size: %d, Series: %d\n", + tstore.ShardN(), tstore.DatabaseIndexN(), len(tstore.Databases()), size, countSeries(tstore)) + fmt.Println() + + tw := tabwriter.NewWriter(os.Stdout, 16, 8, 0, '\t', 0) + + fmt.Fprintln(tw, strings.Join([]string{"Shard", "DB", "Measurement", "Tags [#K/#V]", "Fields [Name:Type]", "Series"}, "\t")) + + shardIDs := tstore.ShardIDs() + + databases := tstore.Databases() + sort.Strings(databases) + + for _, db := range databases { + index := tstore.DatabaseIndex(db) + measurements := index.Measurements() + sort.Sort(measurements) + for _, m := range measurements { + tags := m.TagKeys() + tagValues := 0 + for _, tag := range tags { + tagValues += len(m.TagValues(tag)) + } + fields := m.FieldNames() + sort.Strings(fields) + series := m.SeriesKeys() + sort.Strings(series) + sort.Sort(ShardIDs(shardIDs)) + + // Sample a point from each measurement to determine the field types + for _, shardID := range shardIDs { + shard := tstore.Shard(shardID) + tx, err := shard.ReadOnlyTx() + if err != nil { + fmt.Printf("Failed to get transaction: %v", err) + } + + for _, key := range series { + fieldSummary := []string{} + cursor := tx.Cursor(key, m.FieldNames(), shard.FieldCodec(m.Name), true) + + // Series doesn't exist in this shard + if cursor == nil { + continue + } + + // Seek to the beginning + _, fields := cursor.SeekTo(0) + if fields, ok := fields.(map[string]interface{}); ok { + for field, value := range fields { + fieldSummary = append(fieldSummary, fmt.Sprintf("%s:%T", field, value)) + } + sort.Strings(fieldSummary) + + fmt.Fprintf(tw, "%d\t%s\t%s\t%d/%d\t%d [%s]\t%d\n", shardID, db, m.Name, len(tags), tagValues, + len(fields), strings.Join(fieldSummary, ","), len(series)) + } + break + } + tx.Rollback() + } + } + } + tw.Flush() +} + +func countSeries(tstore *tsdb.Store) int { + var count int + for _, shardID := range tstore.ShardIDs() { + shard := tstore.Shard(shardID) + cnt, err := shard.SeriesCount() + if err != nil { + fmt.Printf("series count failed: %v\n", err) + continue + } + count += cnt + } + return count +} + +func btou64(b []byte) uint64 { + return binary.BigEndian.Uint64(b) +} + +// u64tob converts a uint64 into an 8-byte slice. +func u64tob(v uint64) []byte { + b := make([]byte, 8) + binary.BigEndian.PutUint64(b, v) + return b +} + +type ShardIDs []uint64 + +func (a ShardIDs) Len() int { return len(a) } +func (a ShardIDs) Less(i, j int) bool { return a[i] < a[j] } +func (a ShardIDs) Swap(i, j int) { a[i], a[j] = a[j], a[i] } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go new file mode 100644 index 000000000..ff925d68c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go @@ -0,0 +1,82 @@ +package influxdb + +import ( + "encoding/json" + "errors" + "fmt" + "runtime" + "strings" +) + +var ( + // ErrFieldsRequired is returned when a point does not any fields. + ErrFieldsRequired = errors.New("fields required") + + // ErrFieldTypeConflict is returned when a new field already exists with a different type. + ErrFieldTypeConflict = errors.New("field type conflict") +) + +func ErrDatabaseNotFound(name string) error { return fmt.Errorf("database not found: %s", name) } + +func ErrRetentionPolicyNotFound(name string) error { + return fmt.Errorf("retention policy not found: %s", name) +} + +func ErrMeasurementNotFound(name string) error { return fmt.Errorf("measurement not found: %s", name) } + +func Errorf(format string, a ...interface{}) (err error) { + if _, file, line, ok := runtime.Caller(2); ok { + a = append(a, file, line) + err = fmt.Errorf(format+" (%s:%d)", a...) + } else { + err = fmt.Errorf(format, a...) + } + return +} + +// IsClientError indicates whether an error is a known client error. +func IsClientError(err error) bool { + if err == nil { + return false + } + + if err == ErrFieldsRequired { + return true + } + if err == ErrFieldTypeConflict { + return true + } + + if strings.Contains(err.Error(), ErrFieldTypeConflict.Error()) { + return true + } + + return false +} + +// mustMarshal encodes a value to JSON. +// This will panic if an error occurs. This should only be used internally when +// an invalid marshal will cause corruption and a panic is appropriate. +func mustMarshalJSON(v interface{}) []byte { + b, err := json.Marshal(v) + if err != nil { + panic("marshal: " + err.Error()) + } + return b +} + +// mustUnmarshalJSON decodes a value from JSON. +// This will panic if an error occurs. This should only be used internally when +// an invalid unmarshal will cause corruption and a panic is appropriate. +func mustUnmarshalJSON(b []byte, v interface{}) { + if err := json.Unmarshal(b, v); err != nil { + panic("unmarshal: " + err.Error()) + } +} + +// assert will panic with a given formatted message if the given condition is false. +func assert(condition bool, msg string, v ...interface{}) { + if !condition { + panic(fmt.Sprintf("assert failed: "+msg, v...)) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc new file mode 100644 index 000000000..a9c1a9ca3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc @@ -0,0 +1 @@ +rvm use ruby-2.1.0@burn-in --create diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile new file mode 100644 index 000000000..b1816e8b6 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +gem "colorize" +gem "influxdb" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock new file mode 100644 index 000000000..9e721c3a7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock @@ -0,0 +1,14 @@ +GEM + remote: https://rubygems.org/ + specs: + colorize (0.6.0) + influxdb (0.0.16) + json + json (1.8.1) + +PLATFORMS + ruby + +DEPENDENCIES + colorize + influxdb diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb new file mode 100644 index 000000000..1d44bc2c0 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb @@ -0,0 +1,79 @@ +require "influxdb" +require "colorize" +require "benchmark" + +require_relative "log" +require_relative "random_gaussian" + +BATCH_SIZE = 10_000 + +Log.info "Starting burn-in suite" +master = InfluxDB::Client.new +master.delete_database("burn-in") rescue nil +master.create_database("burn-in") +master.create_database_user("burn-in", "user", "pass") + +master.database = "burn-in" +# master.query "select * from test1 into test2;" +# master.query "select count(value) from test1 group by time(1m) into test2;" + +influxdb = InfluxDB::Client.new "burn-in", username: "user", password: "pass" + +Log.success "Connected to server #{influxdb.host}:#{influxdb.port}" + +Log.log "Creating RandomGaussian(500, 25)" +gaussian = RandomGaussian.new(500, 25) +point_count = 0 + +while true + Log.log "Generating 10,000 points.." + points = [] + BATCH_SIZE.times do |n| + points << {value: gaussian.rand.to_i.abs} + end + point_count += points.length + + Log.info "Sending points to server.." + begin + st = Time.now + foo = influxdb.write_point("test1", points) + et = Time.now + Log.log foo.inspect + Log.log "#{et-st} seconds elapsed" + Log.success "Write successful." + rescue => e + Log.failure "Write failed:" + Log.log e + end + sleep 0.5 + + Log.info "Checking regular points" + st = Time.now + response = influxdb.query("select count(value) from test1;") + et = Time.now + + Log.log "#{et-st} seconds elapsed" + + response_count = response["test1"].first["count"] + if point_count == response_count + Log.success "Point counts match: #{point_count} == #{response_count}" + else + Log.failure "Point counts don't match: #{point_count} != #{response_count}" + end + + # Log.info "Checking continuous query points for test2" + # st = Time.now + # response = influxdb.query("select count(value) from test2;") + # et = Time.now + + # Log.log "#{et-st} seconds elapsed" + + # response_count = response["test2"].first["count"] + # if point_count == response_count + # Log.success "Point counts match: #{point_count} == #{response_count}" + # else + # Log.failure "Point counts don't match: #{point_count} != #{response_count}" + # end +end + + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb new file mode 100644 index 000000000..0f70d7633 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb @@ -0,0 +1,23 @@ +module Log + def self.info(msg) + print Time.now.strftime("%r") + " | " + puts msg.to_s.colorize(:yellow) + end + + def self.success(msg) + print Time.now.strftime("%r") + " | " + puts msg.to_s.colorize(:green) + end + + def self.failure(msg) + print Time.now.strftime("%r") + " | " + puts msg.to_s.colorize(:red) + end + + def self.log(msg) + print Time.now.strftime("%r") + " | " + puts msg.to_s + end +end + + diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb new file mode 100644 index 000000000..51d6c3c04 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb @@ -0,0 +1,31 @@ +class RandomGaussian + def initialize(mean, stddev, rand_helper = lambda { Kernel.rand }) + @rand_helper = rand_helper + @mean = mean + @stddev = stddev + @valid = false + @next = 0 + end + + def rand + if @valid then + @valid = false + return @next + else + @valid = true + x, y = self.class.gaussian(@mean, @stddev, @rand_helper) + @next = y + return x + end + end + + private + def self.gaussian(mean, stddev, rand) + theta = 2 * Math::PI * rand.call + rho = Math.sqrt(-2 * Math.log(1 - rand.call)) + scale = stddev * rho + x = mean + scale * Math.cos(theta) + y = mean + scale * Math.sin(theta) + return x, y + end +end diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb new file mode 100644 index 000000000..93bc8314f --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb @@ -0,0 +1,29 @@ +require "influxdb" + +ONE_WEEK_IN_SECONDS = 7*24*60*60 +NUM_POINTS = 10_000 +BATCHES = 100 + +master = InfluxDB::Client.new +master.delete_database("ctx") rescue nil +master.create_database("ctx") + +influxdb = InfluxDB::Client.new "ctx" +influxdb.time_precision = "s" + +names = ["foo", "bar", "baz", "quu", "qux"] + +st = Time.now +BATCHES.times do |m| + points = [] + + puts "Writing #{NUM_POINTS} points, time ##{m}.." + NUM_POINTS.times do |n| + timestamp = Time.now.to_i - rand(ONE_WEEK_IN_SECONDS) + points << {value: names.sample, time: timestamp} + end + + influxdb.write_point("ct1", points) +end +puts st +puts Time.now diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml new file mode 100644 index 000000000..fdf5d50d8 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml @@ -0,0 +1,283 @@ +### Welcome to the InfluxDB configuration file. + +# Once every 24 hours InfluxDB will report anonymous data to m.influxdb.com +# The data includes raft id (random 8 bytes), os, arch, version, and metadata. +# We don't track ip addresses of servers reporting. This is only used +# to track the number of instances running and the versions, which +# is very helpful for us. +# Change this option to true to disable reporting. +reporting-disabled = false + +### +### [meta] +### +### Controls the parameters for the Raft consensus group that stores metadata +### about the InfluxDB cluster. +### + +[meta] + dir = "/var/opt/influxdb/meta" + hostname = "localhost" + bind-address = ":8088" + retention-autocreate = true + election-timeout = "1s" + heartbeat-timeout = "1s" + leader-lease-timeout = "500ms" + commit-timeout = "50ms" + +### +### [data] +### +### Controls where the actual shard data for InfluxDB lives and how it is +### flushed from the WAL. "dir" may need to be changed to a suitable place +### for your system, but the WAL settings are an advanced configuration. The +### defaults should work for most systems. +### + +[data] + dir = "/var/opt/influxdb/data" + + # Controls the engine type for new shards. Options are b1, bz1, or tsm1. + # b1 is the 0.9.2 storage engine, bz1 is the 0.9.3 and 0.9.4 engine. + # tsm1 is the 0.9.5 engine + # engine ="bz1" + + # The following WAL settings are for the b1 storage engine used in 0.9.2. They won't + # apply to any new shards created after upgrading to a version > 0.9.3. + max-wal-size = 104857600 # Maximum size the WAL can reach before a flush. Defaults to 100MB. + wal-flush-interval = "10m" # Maximum time data can sit in WAL before a flush. + wal-partition-flush-delay = "2s" # The delay time between each WAL partition being flushed. + + # These are the WAL settings for the storage engine >= 0.9.3 + wal-dir = "/var/opt/influxdb/wal" + wal-enable-logging = true + + # When a series in the WAL in-memory cache reaches this size in bytes it is marked as ready to + # flush to the index + # wal-ready-series-size = 25600 + + # Flush and compact a partition once this ratio of series are over the ready size + # wal-compaction-threshold = 0.6 + + # Force a flush and compaction if any series in a partition gets above this size in bytes + # wal-max-series-size = 2097152 + + # Force a flush of all series and full compaction if there have been no writes in this + # amount of time. This is useful for ensuring that shards that are cold for writes don't + # keep a bunch of data cached in memory and in the WAL. + # wal-flush-cold-interval = "10m" + + # Force a partition to flush its largest series if it reaches this approximate size in + # bytes. Remember there are 5 partitions so you'll need at least 5x this amount of memory. + # The more memory you have, the bigger this can be. + # wal-partition-size-threshold = 20971520 + + # Whether queries should be logged before execution. Very useful for troubleshooting, but will + # log any sensitive data contained within a query. + # query-log-enabled = true + +### +### [cluster] +### +### Controls non-Raft cluster behavior, which generally includes how data is +### shared across shards. +### + +[cluster] + shard-writer-timeout = "10s" # The time within which a shard must respond to write. + write-timeout = "5s" # The time within which a write operation must complete on the cluster. + +### +### [retention] +### +### Controls the enforcement of retention policies for evicting old data. +### + +[retention] + enabled = true + check-interval = "30m" + +### +### Controls the system self-monitoring, statistics and diagnostics. +### +### The internal database for monitoring data is created automatically if +### if it does not already exist. The target retention within this database +### is called 'monitor' and is also created with a retention period of 7 days +### and a replication factor of 1, if it does not exist. In all cases the +### this retention policy is configured as the default for the database. + +[monitor] + store-enabled = true # Whether to record statistics internally. + store-database = "_internal" # The destination database for recorded statistics + store-interval = "10s" # The interval at which to record statistics + +### +### [admin] +### +### Controls the availability of the built-in, web-based admin interface. If HTTPS is +### enabled for the admin interface, HTTPS must also be enabled on the [http] service. +### + +[admin] + enabled = true + bind-address = ":8083" + https-enabled = false + https-certificate = "/etc/ssl/influxdb.pem" + +### +### [http] +### +### Controls how the HTTP endpoints are configured. These are the primary +### mechanism for getting data into and out of InfluxDB. +### + +[http] + enabled = true + bind-address = ":8086" + auth-enabled = false + log-enabled = true + write-tracing = false + pprof-enabled = false + https-enabled = false + https-certificate = "/etc/ssl/influxdb.pem" + +### +### [[graphite]] +### +### Controls one or many listeners for Graphite data. +### + +[[graphite]] + enabled = false + # database = "graphite" + # bind-address = ":2003" + # protocol = "tcp" + # consistency-level = "one" + # name-separator = "." + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # batch-size = 1000 # will flush if this many points get buffered + # batch-pending = 5 # number of batches that may be pending in memory + # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit + + ## "name-schema" configures tag names for parsing the metric name from graphite protocol; + ## separated by `name-separator`. + ## The "measurement" tag is special and the corresponding field will become + ## the name of the metric. + ## e.g. "type.host.measurement.device" will parse "server.localhost.cpu.cpu0" as + ## { + ## measurement: "cpu", + ## tags: { + ## "type": "server", + ## "host": "localhost, + ## "device": "cpu0" + ## } + ## } + # name-schema = "type.host.measurement.device" + + ## If set to true, when the input metric name has more fields than `name-schema` specified, + ## the extra fields will be ignored. + ## Otherwise an error will be logged and the metric rejected. + # ignore-unnamed = true + +### +### [collectd] +### +### Controls the listener for collectd data. +### + +[collectd] + enabled = false + # bind-address = "" + # database = "" + # typesdb = "" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # batch-size = 1000 # will flush if this many points get buffered + # batch-pending = 5 # number of batches that may be pending in memory + # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit + +### +### [opentsdb] +### +### Controls the listener for OpenTSDB data. +### + +[opentsdb] + enabled = false + # bind-address = ":4242" + # database = "opentsdb" + # retention-policy = "" + # consistency-level = "one" + # tls-enabled = false + # certificate= "" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Only points + # metrics received over the telnet protocol undergo batching. + + # batch-size = 1000 # will flush if this many points get buffered + # batch-pending = 5 # number of batches that may be pending in memory + # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit + +### +### [[udp]] +### +### Controls the listeners for InfluxDB line protocol data via UDP. +### + +[[udp]] + enabled = false + # bind-address = "" + # database = "" + # retention-policy = "" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # batch-size = 1000 # will flush if this many points get buffered + # batch-pending = 5 # number of batches that may be pending in memory + # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit + +### +### [continuous_queries] +### +### Controls how continuous queries are run within InfluxDB. +### + +[continuous_queries] + log-enabled = true + enabled = true + recompute-previous-n = 2 + recompute-no-older-than = "10m" + compute-runs-per-interval = 10 + compute-no-more-than = "2m" + +### +### [hinted-handoff] +### +### Controls the hinted handoff feature, which allows nodes to temporarily +### store queued data when one node of a cluster is down for a short period +### of time. +### + +[hinted-handoff] + enabled = true + dir = "/var/opt/influxdb/hh" + max-size = 1073741824 + max-age = "168h" + retry-rate-limit = 0 + + # Hinted handoff will start retrying writes to down nodes at a rate of once per second. + # If any error occurs, it will backoff in an exponential manner, until the interval + # reaches retry-max-interval. Once writes to all nodes are successfully completed the + # interval will reset to retry-interval. + retry-interval = "1s" + retry-max-interval = "1m" diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md new file mode 100644 index 000000000..b8cd9ad8e --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md @@ -0,0 +1,193 @@ +# Import/Export + +## Exporting from 0.8.9 + +Version `0.8.9` of InfluxDB adds support to export your data to a format that can be imported into `0.9.3` and later. + +Note that `0.8.9` can be found here: + +``` +http://get.influxdb.org.s3.amazonaws.com/influxdb_0.8.9_amd64.deb +http://get.influxdb.org.s3.amazonaws.com/influxdb-0.8.9-1.x86_64.rpm +``` + +### Design + +`0.8.9` exports raw data to a flat file that includes two sections, `DDL` and `DML`. You can choose to export them independently (see below). + +The `DDL` section contains the sql commands to create databases and retention policies. the `DML` section is [line protocol](https://github.com/influxdb/influxdb/blob/master/tsdb/README.md) and can be directly posted to the [http endpoint](https://influxdb.com/docs/v0.9/guides/writing_data.html) in `0.9`. Remember that batching is important and we don't recommend batch sizes over 5k. + +You need to specify a database and shard group when you export. + +To list out your shards, use the following http endpoint: + +`/cluster/shard_spaces` + +example: +```sh +http://username:password@localhost:8086/cluster/shard_spaces +``` + +Then, to export a database with then name "metrics" and a shard space with the name "default", issue the following curl command: + +```sh +curl -o export http://username:password@http://localhost:8086/export/metrics/default +``` + +Compression is supported, and will result in a significantly smaller file size. + +Use the following command for compression: +```sh +curl -o export.gz --compressed http://username:password@http://localhost:8086/export/metrics/default +``` + +You can also export just the `DDL` with this option: + +```sh +curl -o export.ddl http://username:password@http://localhost:8086/export/metrics/default?l=ddl +``` + +Or just the `DML` with this option: + +```sh +curl -o export.dml.gz --compressed http://username:password@http://localhost:8086/export/metrics/default?l=dml +``` + +### Assumptions + +- Series name mapping follows these [guidelines](https://influxdb.com/docs/v0.8/advanced_topics/schema_design.html) +- Database name will map directly from `0.8` to `0.9` +- Shard Spaces map to Retention Policies +- Shard Space Duration is ignored, as in `0.9` we determine shard size automatically +- Regex is used to match the correct series names and only exports that data for the database +- Duration becomes the new Retention Policy duration + +- Users are not migrated due to inability to get passwords. Anyone using users will need to manually set these back up in `0.9` + +### Upgrade Recommendations + +It's recommended that you upgrade to `0.9.3` first and have all your writes going there. Then, on the `0.8.X` instances, upgrade to `0.8.9`. + +It is important that when exporting you change your config to allow for the http endpoints not timing out. To do so, make this change in your config: + +```toml +# Configure the http api +[api] +read-timeout = "0s" +``` + +### Exceptions + +If a series can't be exported to tags based on the guidelines mentioned above, +we will insert the entire series name as the measurement name. You can either +allow that to import into the new InfluxDB instance, or you can do your own +data massage on it prior to importing it. + +For example, if you have the following series name: + +``` +metric.disk.c.host.server01.single +``` + +It will export as exactly thta as the measurement name and no tags: + +``` +metric.disk.c.host.server01.single +``` + +### Export Metrics + +When you export, you will now get comments inline in the `DML`: + +`# Found 999 Series for export` + +As well as count totals for each series exported: + +`# Series FOO - Points Exported: 999` + +With a total at the bottom: + +`# Points Exported: 999` + +You can grep the file that was exported at the end to get all the export metrics: + +`cat myexport | grep Exported` + +## Importing + +Version `0.9.3` of InfluxDB adds support to import your data from version `0.8.9`. + +## Caveats + +For the export/import to work, all requisites have to be met. For export, all series names in `0.8` should be in the following format: + +``` +.... +``` +for example: +``` +az.us-west-1.host.serverA.cpu +``` +or any number of tags +``` +building.2.temperature +``` + +Additionally, the fields need to have a consistent type (all float64, int64, etc) for every write in `0.8`. Otherwise they have the potential to fail writes in the import. +See below for more information. + +## Running the import command + + To import via the cli, you can specify the following command: + + ```sh + influx -import -path=metrics-default.gz -compressed + ``` + + If the file is not compressed you can issue it without the `-compressed` flag: + + ```sh + influx -import -path=metrics-default + ``` + + To redirect failed import lines to another file, run this command: + + ```sh + influx -import -path=metrics-default.gz -compressed > failures + ``` + + The import will use the line protocol in batches of 5,000 lines per batch when sending data to the server. + +### Throttiling the import + + If you need to throttle the import so the database has time to ingest, you can use the `-pps` flag. This will limit the points per second that will be sent to the server. + + ```sh + influx -import -path=metrics-default.gz -compressed -pps 50000 > failures + ``` + + Which is stating that you don't want MORE than 50,000 points per second to write to the database. Due to the processing that is taking place however, you will likely never get exactly 50,000 pps, more like 35,000 pps, etc. + +## Understanding the results of the import + +During the import, a status message will write out for every 100,000 points imported and report stats on the progress of the import: + +``` +2015/08/21 14:48:01 Processed 3100000 lines. Time elapsed: 56.740578415s. Points per second (PPS): 54634 +``` + + The batch will give some basic stats when finished: + + ```sh + 2015/07/29 23:15:20 Processed 2 commands + 2015/07/29 23:15:20 Processed 70207923 inserts + 2015/07/29 23:15:20 Failed 29785000 inserts + ``` + + Most inserts fail due to the following types of error: + + ```sh + 2015/07/29 22:18:28 error writing batch: write failed: field type conflict: input field "value" on measurement "metric" is type float64, already exists as type integer + ``` + + This is due to the fact that in `0.8` a field could get created and saved as int or float types for independent writes. In `0.9` the field has to have a consistent type. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go new file mode 100644 index 000000000..5095868f3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go @@ -0,0 +1,236 @@ +package v8 + +import ( + "bufio" + "compress/gzip" + "fmt" + "io" + "log" + "net/url" + "os" + "strings" + "time" + + "github.com/influxdb/influxdb/client" +) + +const batchSize = 5000 + +// Config is the config used to initialize a Importer importer +type Config struct { + Username string + Password string + URL url.URL + Precision string + WriteConsistency string + Path string + Version string + Compressed bool + PPS int +} + +// NewConfig returns an initialized *Config +func NewConfig() *Config { + return &Config{} +} + +// Importer is the importer used for importing 0.8 data +type Importer struct { + client *client.Client + database string + retentionPolicy string + config *Config + batch []string + totalInserts int + failedInserts int + totalCommands int + throttlePointsWritten int + lastWrite time.Time + throttle *time.Ticker +} + +// NewImporter will return an intialized Importer struct +func NewImporter(config *Config) *Importer { + return &Importer{ + config: config, + batch: make([]string, 0, batchSize), + } +} + +// Import processes the specified file in the Config and writes the data to the databases in chunks specified by batchSize +func (i *Importer) Import() error { + // Create a client and try to connect + config := client.NewConfig() + config.URL = i.config.URL + config.Username = i.config.Username + config.Password = i.config.Password + config.UserAgent = fmt.Sprintf("influxDB importer/%s", i.config.Version) + cl, err := client.NewClient(config) + if err != nil { + return fmt.Errorf("could not create client %s", err) + } + i.client = cl + if _, _, e := i.client.Ping(); e != nil { + return fmt.Errorf("failed to connect to %s\n", i.client.Addr()) + } + + // Validate args + if i.config.Path == "" { + return fmt.Errorf("file argument required") + } + + defer func() { + if i.totalInserts > 0 { + log.Printf("Processed %d commands\n", i.totalCommands) + log.Printf("Processed %d inserts\n", i.totalInserts) + log.Printf("Failed %d inserts\n", i.failedInserts) + } + }() + + // Open the file + f, err := os.Open(i.config.Path) + if err != nil { + return err + } + defer f.Close() + + var r io.Reader + + // If gzipped, wrap in a gzip reader + if i.config.Compressed { + gr, err := gzip.NewReader(f) + if err != nil { + return err + } + defer gr.Close() + // Set the reader to the gzip reader + r = gr + } else { + // Standard text file so our reader can just be the file + r = f + } + + // Get our reader + scanner := bufio.NewScanner(r) + + // Process the DDL + i.processDDL(scanner) + + // Set up our throttle channel. Since there is effectively no other activity at this point + // the smaller resolution gets us much closer to the requested PPS + i.throttle = time.NewTicker(time.Microsecond) + defer i.throttle.Stop() + + // Prime the last write + i.lastWrite = time.Now() + + // Process the DML + i.processDML(scanner) + + // Check if we had any errors scanning the file + if err := scanner.Err(); err != nil { + return fmt.Errorf("reading standard input: %s", err) + } + + return nil +} + +func (i *Importer) processDDL(scanner *bufio.Scanner) { + for scanner.Scan() { + line := scanner.Text() + // If we find the DML token, we are done with DDL + if strings.HasPrefix(line, "# DML") { + return + } + if strings.HasPrefix(line, "#") { + continue + } + i.queryExecutor(line) + } +} + +func (i *Importer) processDML(scanner *bufio.Scanner) { + start := time.Now() + for scanner.Scan() { + line := scanner.Text() + if strings.HasPrefix(line, "# CONTEXT-DATABASE:") { + i.database = strings.TrimSpace(strings.Split(line, ":")[1]) + } + if strings.HasPrefix(line, "# CONTEXT-RETENTION-POLICY:") { + i.retentionPolicy = strings.TrimSpace(strings.Split(line, ":")[1]) + } + if strings.HasPrefix(line, "#") { + continue + } + i.batchAccumulator(line, start) + } +} + +func (i *Importer) execute(command string) { + response, err := i.client.Query(client.Query{Command: command, Database: i.database}) + if err != nil { + log.Printf("error: %s\n", err) + return + } + if err := response.Error(); err != nil { + log.Printf("error: %s\n", response.Error()) + } +} + +func (i *Importer) queryExecutor(command string) { + i.totalCommands++ + i.execute(command) +} + +func (i *Importer) batchAccumulator(line string, start time.Time) { + i.batch = append(i.batch, line) + if len(i.batch) == batchSize { + if e := i.batchWrite(); e != nil { + log.Println("error writing batch: ", e) + // Output failed lines to STDOUT so users can capture lines that failed to import + fmt.Println(strings.Join(i.batch, "\n")) + i.failedInserts += len(i.batch) + } else { + i.totalInserts += len(i.batch) + } + i.batch = i.batch[:0] + // Give some status feedback every 100000 lines processed + processed := i.totalInserts + i.failedInserts + if processed%100000 == 0 { + since := time.Since(start) + pps := float64(processed) / since.Seconds() + log.Printf("Processed %d lines. Time elapsed: %s. Points per second (PPS): %d", processed, since.String(), int64(pps)) + } + } +} + +func (i *Importer) batchWrite() error { + // Accumulate the batch size to see how many points we have written this second + i.throttlePointsWritten += len(i.batch) + + // Find out when we last wrote data + since := time.Since(i.lastWrite) + + // Check to see if we've exceeded our points per second for the current timeframe + var currentPPS int + if since.Seconds() > 0 { + currentPPS = int(float64(i.throttlePointsWritten) / since.Seconds()) + } else { + currentPPS = i.throttlePointsWritten + } + + // If our currentPPS is greater than the PPS specified, then we wait and retry + if int(currentPPS) > i.config.PPS && i.config.PPS != 0 { + // Wait for the next tick + <-i.throttle.C + + // Decrement the batch size back out as it is going to get called again + i.throttlePointsWritten -= len(i.batch) + return i.batchWrite() + } + + _, e := i.client.WriteLineProtocol(strings.Join(i.batch, "\n"), i.database, i.retentionPolicy, i.config.Precision, i.config.WriteConsistency) + i.throttlePointsWritten = 0 + i.lastWrite = time.Now() + return e +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md index 3ef272f41..c7ce2aeb4 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md @@ -87,11 +87,11 @@ CREATE CONTINUOUS DATABASE DATABASES DEFAULT DELETE DESC DROP DURATION END EXISTS EXPLAIN FIELD FROM GRANT GROUP IF IN INNER INSERT INTO KEY KEYS LIMIT -SHOW MEASUREMENT MEASUREMENTS OFFSET ON ORDER -PASSWORD POLICY POLICIES PRIVILEGES QUERIES QUERY -READ REPLICATION RETENTION REVOKE SELECT SERIES -SLIMIT SOFFSET TAG TO USER USERS -VALUES WHERE WITH WRITE +SHOW MEASUREMENT MEASUREMENTS NOT OFFSET ON +ORDER PASSWORD POLICY POLICIES PRIVILEGES QUERIES +QUERY READ REPLICATION RETENTION REVOKE SELECT +SERIES SLIMIT SOFFSET TAG TO USER +USERS VALUES WHERE WITH WRITE ``` ## Literals @@ -124,9 +124,7 @@ string_lit = `'` { unicode_char } `'`' . Duration literals specify a length of time. An integer literal followed immediately (with no spaces) by a duration unit listed below is interpreted as a duration literal. -``` -Duration unit definitions -------------------------- +### Duration units | Units | Meaning | |--------|-----------------------------------------| | u or µ | microseconds (1 millionth of a second) | @@ -136,7 +134,6 @@ Duration unit definitions | h | hour | | d | day | | w | week | -``` ``` duration_lit = int_lit duration_unit . @@ -191,6 +188,7 @@ statement = alter_retention_policy_stmt | show_measurements_stmt | show_retention_policies | show_series_stmt | + show_shards_stmt | show_tag_keys_stmt | show_tag_values_stmt | show_users_stmt | @@ -455,7 +453,7 @@ SHOW FIELD KEYS FROM cpu; ### SHOW MEASUREMENTS -show_measurements_stmt = [ where_clause ] [ group_by_clause ] [ limit_clause ] +show_measurements_stmt = "SHOW MEASUREMENTS" [ where_clause ] [ group_by_clause ] [ limit_clause ] [ offset_clause ] . ```sql @@ -482,7 +480,7 @@ SHOW RETENTION POLICIES ON mydb; ### SHOW SERIES ``` -show_series_stmt = [ from_clause ] [ where_clause ] [ group_by_clause ] +show_series_stmt = "SHOW SERIES" [ from_clause ] [ where_clause ] [ group_by_clause ] [ limit_clause ] [ offset_clause ] . ``` @@ -492,10 +490,22 @@ show_series_stmt = [ from_clause ] [ where_clause ] [ group_by_clause ] ``` +### SHOW SHARDS + +``` +show_shards_stmt = "SHOW SHARDS" . +``` + +#### Example: + +```sql +SHOW SHARDS; +``` + ### SHOW TAG KEYS ``` -show_tag_keys_stmt = [ from_clause ] [ where_clause ] [ group_by_clause ] +show_tag_keys_stmt = "SHOW TAG KEYS" [ from_clause ] [ where_clause ] [ group_by_clause ] [ limit_clause ] [ offset_clause ] . ``` @@ -518,7 +528,7 @@ SHOW TAG KEYS WHERE host = 'serverA'; ### SHOW TAG VALUES ``` -show_tag_values_stmt = [ from_clause ] with_tag_clause [ where_clause ] +show_tag_values_stmt = "SHOW TAG VALUES" [ from_clause ] with_tag_clause [ where_clause ] [ group_by_clause ] [ limit_clause ] [ offset_clause ] . ``` @@ -551,7 +561,7 @@ SHOW USERS; ### REVOKE ``` -revoke_stmt = privilege [ "ON" db_name ] "FROM" user_name +revoke_stmt = "REVOKE" privilege [ "ON" db_name ] "FROM" user_name ``` #### Examples: @@ -567,7 +577,7 @@ REVOKE READ ON mydb FROM jdoe; ### SELECT ``` -select_stmt = fields from_clause [ into_clause ] [ where_clause ] +select_stmt = "SELECT" fields from_clause [ into_clause ] [ where_clause ] [ group_by_clause ] [ order_by_clause ] [ limit_clause ] [ offset_clause ] [ slimit_clause ] [ soffset_clause ]. ``` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go index 31cf82e24..3987a505d 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go @@ -9,6 +9,8 @@ import ( "strconv" "strings" "time" + + "github.com/influxdb/influxdb/pkg/slices" ) // DataType represents the primitive data types available in InfluxQL. @@ -90,6 +92,7 @@ func (*DropDatabaseStatement) node() {} func (*DropMeasurementStatement) node() {} func (*DropRetentionPolicyStatement) node() {} func (*DropSeriesStatement) node() {} +func (*DropServerStatement) node() {} func (*DropUserStatement) node() {} func (*GrantStatement) node() {} func (*GrantAdminStatement) node() {} @@ -105,6 +108,7 @@ func (*ShowFieldKeysStatement) node() {} func (*ShowRetentionPoliciesStatement) node() {} func (*ShowMeasurementsStatement) node() {} func (*ShowSeriesStatement) node() {} +func (*ShowShardsStatement) node() {} func (*ShowStatsStatement) node() {} func (*ShowDiagnosticsStatement) node() {} func (*ShowTagKeysStatement) node() {} @@ -195,6 +199,7 @@ func (*DropDatabaseStatement) stmt() {} func (*DropMeasurementStatement) stmt() {} func (*DropRetentionPolicyStatement) stmt() {} func (*DropSeriesStatement) stmt() {} +func (*DropServerStatement) stmt() {} func (*DropUserStatement) stmt() {} func (*GrantStatement) stmt() {} func (*GrantAdminStatement) stmt() {} @@ -206,6 +211,7 @@ func (*ShowFieldKeysStatement) stmt() {} func (*ShowMeasurementsStatement) stmt() {} func (*ShowRetentionPoliciesStatement) stmt() {} func (*ShowSeriesStatement) stmt() {} +func (*ShowShardsStatement) stmt() {} func (*ShowStatsStatement) stmt() {} func (*ShowDiagnosticsStatement) stmt() {} func (*ShowTagKeysStatement) stmt() {} @@ -274,7 +280,7 @@ type SortField struct { // String returns a string representation of a sort field func (field *SortField) String() string { var buf bytes.Buffer - if field.Name == "" { + if field.Name != "" { _, _ = buf.WriteString(field.Name) _, _ = buf.WriteString(" ") } @@ -302,12 +308,19 @@ func (a SortFields) String() string { type CreateDatabaseStatement struct { // Name of the database to be created. Name string + + // IfNotExists indicates whether to return without error if the database + // already exists. + IfNotExists bool } // String returns a string representation of the create database statement. func (s *CreateDatabaseStatement) String() string { var buf bytes.Buffer _, _ = buf.WriteString("CREATE DATABASE ") + if s.IfNotExists { + _, _ = buf.WriteString("IF NOT EXISTS ") + } _, _ = buf.WriteString(s.Name) return buf.String() } @@ -707,6 +720,18 @@ type SelectStatement struct { FillValue interface{} } +// SourceNames returns a list of source names. +func (s *SelectStatement) SourceNames() []string { + a := make([]string, 0, len(s.Sources)) + for _, src := range s.Sources { + switch src := src.(type) { + case *Measurement: + a = append(a, src.Name) + } + } + return a +} + // HasDerivative returns true if one of the function calls in the statement is a // derivative aggregate func (s *SelectStatement) HasDerivative() bool { @@ -732,6 +757,11 @@ func (s *SelectStatement) IsSimpleDerivative() bool { return false } +// TimeAscending returns true if the time field is sorted in chronological order. +func (s *SelectStatement) TimeAscending() bool { + return len(s.SortFields) == 0 || s.SortFields[0].Ascending +} + // Clone returns a deep copy of the statement. func (s *SelectStatement) Clone() *SelectStatement { clone := &SelectStatement{ @@ -848,6 +878,48 @@ func (s *SelectStatement) RewriteDistinct() { } } +// ColumnNames will walk all fields and functions and return the appropriate field names for the select statement +// while maintaining order of the field names +func (s *SelectStatement) ColumnNames() []string { + // Always set the first column to be time, even if they didn't specify it + columnNames := []string{"time"} + + // First walk each field + for _, field := range s.Fields { + switch f := field.Expr.(type) { + case *Call: + if f.Name == "top" || f.Name == "bottom" { + if len(f.Args) == 2 { + columnNames = append(columnNames, f.Name) + continue + } + // We have a special case now where we have to add the column names for the fields TOP or BOTTOM asked for as well + columnNames = slices.Union(columnNames, f.Fields(), true) + continue + } + columnNames = append(columnNames, field.Name()) + default: + // time is always first, and we already added it, so ignore it if they asked for it anywhere else. + if field.Name() != "time" { + columnNames = append(columnNames, field.Name()) + } + } + } + + return columnNames +} + +// HasTimeFieldSpecified will walk all fields and determine if the user explicitly asked for time +// This is needed to determine re-write behaviors for functions like TOP and BOTTOM +func (s *SelectStatement) HasTimeFieldSpecified() bool { + for _, f := range s.Fields { + if f.Name() == "time" { + return true + } + } + return false +} + // String returns a string representation of the select statement. func (s *SelectStatement) String() string { var buf bytes.Buffer @@ -989,6 +1061,10 @@ func (s *SelectStatement) validate(tr targetRequirement) error { return err } + if err := s.validateDimensions(); err != nil { + return err + } + if err := s.validateDistinct(); err != nil { return err } @@ -1005,10 +1081,6 @@ func (s *SelectStatement) validate(tr targetRequirement) error { return err } - if err := s.validateWildcard(); err != nil { - return err - } - return nil } @@ -1020,40 +1092,155 @@ func (s *SelectStatement) validateFields() error { return nil } -func (s *SelectStatement) validateAggregates(tr targetRequirement) error { - // First, if 1 field is an aggregate, then all fields must be an aggregate. This is - // a explicit limitation of the current system. +func (s *SelectStatement) validateDimensions() error { + var dur time.Duration + for _, dim := range s.Dimensions { + switch expr := dim.Expr.(type) { + case *Call: + // Ensure the call is time() and it only has one duration argument. + // If we already have a duration + if expr.Name != "time" { + return errors.New("only time() calls allowed in dimensions") + } else if len(expr.Args) != 1 { + return errors.New("time dimension expected one argument") + } else if lit, ok := expr.Args[0].(*DurationLiteral); !ok { + return errors.New("time dimension must have one duration argument") + } else if dur != 0 { + return errors.New("multiple time dimensions not allowed") + } else { + dur = lit.Val + } + case *VarRef: + if strings.ToLower(expr.Val) == "time" { + return errors.New("time() is a function and expects at least one argument") + } + case *Wildcard: + default: + return errors.New("only time and tag dimensions allowed") + } + } + return nil +} + +// validSelectWithAggregate determines if a SELECT statement has the correct +// combination of aggregate functions combined with selected fields and tags +// Currently we don't have support for all aggregates, but aggregates that +// can be combined with fields/tags are: +// TOP, BOTTOM, MAX, MIN, FIRST, LAST +func (s *SelectStatement) validSelectWithAggregate() error { + calls := map[string]struct{}{} numAggregates := 0 for _, f := range s.Fields { - if _, ok := f.Expr.(*Call); ok { + if c, ok := f.Expr.(*Call); ok { + calls[c.Name] = struct{}{} numAggregates++ } } + // For TOP, BOTTOM, MAX, MIN, FIRST, LAST (selector functions) it is ok to ask for fields and tags + // but only if one function is specified. Combining multiple functions and fields and tags is not currently supported + onlySelectors := true + for k := range calls { + switch k { + case "top", "bottom", "max", "min", "first", "last": + default: + onlySelectors = false + break + } + } + if onlySelectors { + // If they only have one selector, they can have as many fields or tags as they want + if numAggregates == 1 { + return nil + } + // If they have multiple selectors, they are not allowed to have any other fields or tags specified + if numAggregates > 1 && len(s.Fields) != numAggregates { + return fmt.Errorf("mixing multiple selector functions with tags or fields is not supported") + } + } + if numAggregates != 0 && numAggregates != len(s.Fields) { return fmt.Errorf("mixing aggregate and non-aggregate queries is not supported") } + return nil +} - // Secondly, determine if specific calls have at least one and only one argument +func (s *SelectStatement) validateAggregates(tr targetRequirement) error { for _, f := range s.Fields { - if c, ok := f.Expr.(*Call); ok { - switch c.Name { + switch expr := f.Expr.(type) { + case *Call: + switch expr.Name { case "derivative", "non_negative_derivative": - if min, max, got := 1, 2, len(c.Args); got > max || got < min { - return fmt.Errorf("invalid number of arguments for %s, expected at least %d but no more than %d, got %d", c.Name, min, max, got) + if err := s.validSelectWithAggregate(); err != nil { + return err } + if min, max, got := 1, 2, len(expr.Args); got > max || got < min { + return fmt.Errorf("invalid number of arguments for %s, expected at least %d but no more than %d, got %d", expr.Name, min, max, got) + } + // Validate that if they have grouping by time, they need a sub-call like min/max, etc. + groupByInterval, _ := s.GroupByInterval() + if groupByInterval > 0 { + if _, ok := expr.Args[0].(*Call); !ok { + return fmt.Errorf("aggregate function required inside the call to %s", expr.Name) + } + } + case "percentile": - if exp, got := 2, len(c.Args); got != exp { - return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", c.Name, exp, got) + if err := s.validSelectWithAggregate(); err != nil { + return err + } + if exp, got := 2, len(expr.Args); got != exp { + return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", expr.Name, exp, got) + } + _, ok := expr.Args[1].(*NumberLiteral) + if !ok { + return fmt.Errorf("expected float argument in percentile()") + } + case "top", "bottom": + if exp, got := 2, len(expr.Args); got < exp { + return fmt.Errorf("invalid number of arguments for %s, expected at least %d, got %d", expr.Name, exp, got) + } + if len(expr.Args) > 1 { + callLimit, ok := expr.Args[len(expr.Args)-1].(*NumberLiteral) + if !ok { + return fmt.Errorf("expected integer as last argument in %s(), found %s", expr.Name, expr.Args[len(expr.Args)-1]) + } + // Check if they asked for a limit smaller than what they passed into the call + if int64(callLimit.Val) > int64(s.Limit) && s.Limit != 0 { + return fmt.Errorf("limit (%d) in %s function can not be larger than the LIMIT (%d) in the select statement", int64(callLimit.Val), expr.Name, int64(s.Limit)) + } + + for _, v := range expr.Args[:len(expr.Args)-1] { + if _, ok := v.(*VarRef); !ok { + return fmt.Errorf("only fields or tags are allowed in %s(), found %s", expr.Name, v) + } + } } default: - if exp, got := 1, len(c.Args); got != exp { - return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", c.Name, exp, got) + if err := s.validSelectWithAggregate(); err != nil { + return err + } + if exp, got := 1, len(expr.Args); got != exp { + return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", expr.Name, exp, got) + } + switch fc := expr.Args[0].(type) { + case *VarRef: + // do nothing + case *Call: + if fc.Name != "distinct" { + return fmt.Errorf("expected field argument in %s()", expr.Name) + } + case *Distinct: + if expr.Name != "count" { + return fmt.Errorf("expected field argument in %s()", expr.Name) + } + default: + return fmt.Errorf("expected field argument in %s()", expr.Name) } } } } - // Now, check that we have valid duration and where clauses for aggregates + // Check that we have valid duration and where clauses for aggregates // fetch the group by duration groupByDuration, _ := s.GroupByInterval() @@ -1072,13 +1259,6 @@ func (s *SelectStatement) validateAggregates(tr targetRequirement) error { return nil } -func (s *SelectStatement) validateWildcard() error { - if s.HasWildcard() && len(s.Fields) > 1 { - return fmt.Errorf("wildcards can not be combined with other fields") - } - return nil -} - func (s *SelectStatement) HasDistinct() bool { // determine if we have a call named distinct for _, f := range s.Fields { @@ -1378,6 +1558,25 @@ func (s *SelectStatement) NamesInDimension() []string { return a } +// LimitTagSets returns a tag set list with SLIMIT and SOFFSET applied. +func (s *SelectStatement) LimitTagSets(a []*TagSet) []*TagSet { + // Ignore if no limit or offset is specified. + if s.SLimit == 0 && s.SOffset == 0 { + return a + } + + // If offset is beyond the number of tag sets then return nil. + if s.SOffset > len(a) { + return nil + } + + // Clamp limit to the max number of tag sets. + if s.SOffset+s.SLimit > len(a) { + s.SLimit = len(a) - s.SOffset + } + return a[s.SOffset : s.SOffset+s.SLimit] +} + // walkNames will walk the Expr and return the database fields func walkNames(exp Expr) []string { switch expr := exp.(type) { @@ -1414,6 +1613,15 @@ func (s *SelectStatement) FunctionCalls() []*Call { return a } +// FunctionCallsByPosition returns the Call objects from the query in the order they appear in the select statement +func (s *SelectStatement) FunctionCallsByPosition() [][]*Call { + var a [][]*Call + for _, f := range s.Fields { + a = append(a, walkFunctionCalls(f.Expr)) + } + return a +} + // walkFunctionCalls walks the Field of a query for any function calls made func walkFunctionCalls(exp Expr) []*Call { switch expr := exp.(type) { @@ -1501,6 +1709,9 @@ func (t *Target) String() string { var buf bytes.Buffer _, _ = buf.WriteString("INTO ") _, _ = buf.WriteString(t.Measurement.String()) + if t.Measurement.Name == "" { + _, _ = buf.WriteString(":MEASUREMENT") + } return buf.String() } @@ -1615,6 +1826,30 @@ func (s DropSeriesStatement) RequiredPrivileges() ExecutionPrivileges { return ExecutionPrivileges{{Admin: false, Name: "", Privilege: WritePrivilege}} } +// DropServerStatement represents a command for removing a server from the cluster. +type DropServerStatement struct { + // ID of the node to be dropped. + NodeID uint64 + // Force will force the server to drop even it it means losing data + Force bool +} + +// String returns a string representation of the drop series statement. +func (s *DropServerStatement) String() string { + var buf bytes.Buffer + _, _ = buf.WriteString("DROP SERVER ") + _, _ = buf.WriteString(strconv.FormatUint(s.NodeID, 10)) + if s.Force { + _, _ = buf.WriteString(" FORCE") + } + return buf.String() +} + +// RequiredPrivileges returns the privilege required to execute a DropServerStatement. +func (s *DropServerStatement) RequiredPrivileges() ExecutionPrivileges { + return ExecutionPrivileges{{Name: "", Privilege: AllPrivileges}} +} + // ShowContinuousQueriesStatement represents a command for listing continuous queries. type ShowContinuousQueriesStatement struct{} @@ -1810,18 +2045,19 @@ func (s *ShowRetentionPoliciesStatement) RequiredPrivileges() ExecutionPrivilege return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}} } -// ShowRetentionPoliciesStatement represents a command for displaying stats for a given server. +// ShowStats statement displays statistics for a given module. type ShowStatsStatement struct { - // Hostname or IP of the server for stats. - Host string + // Module + Module string } // String returns a string representation of a ShowStatsStatement. func (s *ShowStatsStatement) String() string { var buf bytes.Buffer _, _ = buf.WriteString("SHOW STATS ") - if s.Host != "" { - _, _ = buf.WriteString(s.Host) + if s.Module != "" { + _, _ = buf.WriteString("FOR ") + _, _ = buf.WriteString(s.Module) } return buf.String() } @@ -1831,11 +2067,33 @@ func (s *ShowStatsStatement) RequiredPrivileges() ExecutionPrivileges { return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}} } +// ShowShardsStatement represents a command for displaying shards in the cluster. +type ShowShardsStatement struct{} + +// String returns a string representation. +func (s *ShowShardsStatement) String() string { return "SHOW SHARDS" } + +// RequiredPrivileges returns the privileges required to execute the statement. +func (s *ShowShardsStatement) RequiredPrivileges() ExecutionPrivileges { + return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}} +} + // ShowDiagnosticsStatement represents a command for show node diagnostics. -type ShowDiagnosticsStatement struct{} +type ShowDiagnosticsStatement struct { + // Module + Module string +} // String returns a string representation of the ShowDiagnosticsStatement. -func (s *ShowDiagnosticsStatement) String() string { return "SHOW DIAGNOSTICS" } +func (s *ShowDiagnosticsStatement) String() string { + var buf bytes.Buffer + _, _ = buf.WriteString("SHOW DIAGNOSTICS ") + if s.Module != "" { + _, _ = buf.WriteString("FOR ") + _, _ = buf.WriteString(s.Module) + } + return buf.String() +} // RequiredPrivileges returns the privilege required to execute a ShowDiagnosticsStatement func (s *ShowDiagnosticsStatement) RequiredPrivileges() ExecutionPrivileges { @@ -1853,12 +2111,17 @@ type ShowTagKeysStatement struct { // Fields to sort results by SortFields SortFields - // Maximum number of rows to be returned. - // Unlimited if zero. + // Maximum number of tag keys per measurement. Unlimited if zero. Limit int - // Returns rows starting at an offset from the first row. + // Returns tag keys starting at an offset from the first row. Offset int + + // Maxiumum number of series to be returned. Unlimited if zero. + SLimit int + + // Returns series starting at an offset from the first one. + SOffset int } // String returns a string representation of the statement. @@ -1886,6 +2149,14 @@ func (s *ShowTagKeysStatement) String() string { _, _ = buf.WriteString(" OFFSET ") _, _ = buf.WriteString(strconv.Itoa(s.Offset)) } + if s.SLimit > 0 { + _, _ = buf.WriteString(" SLIMIT ") + _, _ = buf.WriteString(strconv.Itoa(s.SLimit)) + } + if s.SOffset > 0 { + _, _ = buf.WriteString(" SOFFSET ") + _, _ = buf.WriteString(strconv.Itoa(s.SOffset)) + } return buf.String() } @@ -2100,37 +2371,21 @@ func (a Dimensions) String() string { // Normalize returns the interval and tag dimensions separately. // Returns 0 if no time interval is specified. -// Returns an error if multiple time dimensions exist or if non-VarRef dimensions are specified. -func (a Dimensions) Normalize() (time.Duration, []string, error) { +func (a Dimensions) Normalize() (time.Duration, []string) { var dur time.Duration var tags []string for _, dim := range a { switch expr := dim.Expr.(type) { case *Call: - // Ensure the call is time() and it only has one duration argument. - // If we already have a duration - if expr.Name != "time" { - return 0, nil, errors.New("only time() calls allowed in dimensions") - } else if len(expr.Args) != 1 { - return 0, nil, errors.New("time dimension expected one argument") - } else if lit, ok := expr.Args[0].(*DurationLiteral); !ok { - return 0, nil, errors.New("time dimension must have one duration argument") - } else if dur != 0 { - return 0, nil, errors.New("multiple time dimensions not allowed") - } else { - dur = lit.Val - } - + lit, _ := expr.Args[0].(*DurationLiteral) + dur = lit.Val case *VarRef: tags = append(tags, expr.Val) - - default: - return 0, nil, errors.New("only time and tag dimensions allowed") } } - return dur, tags, nil + return dur, tags } // Dimension represents an expression that a select statement is grouped by. @@ -2159,6 +2414,7 @@ type Measurement struct { RetentionPolicy string Name string Regex *RegexLiteral + IsTarget bool } // String returns a string representation of the measurement. @@ -2217,6 +2473,47 @@ func (c *Call) String() string { return fmt.Sprintf("%s(%s)", c.Name, strings.Join(str, ", ")) } +// Fields will extract any field names from the call. Only specific calls support this. +func (c *Call) Fields() []string { + switch c.Name { + case "top", "bottom": + // maintain the order the user specified in the query + keyMap := make(map[string]struct{}) + keys := []string{} + for i, a := range c.Args { + if i == 0 { + // special case, first argument is always the name of the function regardless of the field name + keys = append(keys, c.Name) + continue + } + switch v := a.(type) { + case *VarRef: + if _, ok := keyMap[v.Val]; !ok { + keyMap[v.Val] = struct{}{} + keys = append(keys, v.Val) + } + } + } + return keys + case "min", "max", "first", "last", "sum", "mean": + // maintain the order the user specified in the query + keyMap := make(map[string]struct{}) + keys := []string{} + for _, a := range c.Args { + switch v := a.(type) { + case *VarRef: + if _, ok := keyMap[v.Val]; !ok { + keyMap[v.Val] = struct{}{} + keys = append(keys, v.Val) + } + } + } + return keys + default: + panic(fmt.Sprintf("*call.Fields is unable to provide information on %s", c.Name)) + } +} + // Distinct represents a DISTINCT expression. type Distinct struct { // Identifier following DISTINCT @@ -2525,6 +2822,10 @@ func Walk(v Visitor, node Node) { Walk(v, c) } + case *DropSeriesStatement: + Walk(v, n.Sources) + Walk(v, n.Condition) + case *Field: Walk(v, n.Expr) @@ -2772,6 +3073,13 @@ func evalBinaryExpr(expr *BinaryExpr, m map[string]interface{}) interface{} { return nil } +// EvalBool evaluates expr and returns true if result is a boolean true. +// Otherwise returns false. +func EvalBool(expr Expr, m map[string]interface{}) bool { + v, _ := Eval(expr, m).(bool) + return v +} + // Reduce evaluates expr using the available values in valuer. // References that don't exist in valuer are ignored. func Reduce(expr Expr, valuer Valuer) Expr { diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go index b58e7353b..ca2836111 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go @@ -451,7 +451,7 @@ func TestSelectStatement_IsRawQuerySet(t *testing.T) { isRaw: false, }, { - stmt: "select mean(*) from foo group by *", + stmt: "select mean(value) from foo group by *", isRaw: false, }, } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go deleted file mode 100644 index 3d75c5a27..000000000 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions.go +++ /dev/null @@ -1,1114 +0,0 @@ -package influxql - -// All aggregate and query functions are defined in this file along with any intermediate data objects they need to process. -// Query functions are represented as two discreet functions: Map and Reduce. These roughly follow the MapReduce -// paradigm popularized by Google and Hadoop. -// -// When adding an aggregate function, define a mapper, a reducer, and add them in the switch statement in the MapReduceFuncs function - -import ( - "encoding/json" - "fmt" - "math" - "math/rand" - "sort" - "strings" -) - -// Iterator represents a forward-only iterator over a set of points. -// These are used by the MapFunctions in this file -type Iterator interface { - Next() (time int64, value interface{}) -} - -// MapFunc represents a function used for mapping over a sequential series of data. -// The iterator represents a single group by interval -type MapFunc func(Iterator) interface{} - -// ReduceFunc represents a function used for reducing mapper output. -type ReduceFunc func([]interface{}) interface{} - -// UnmarshalFunc represents a function that can take bytes from a mapper from remote -// server and marshal it into an interface the reducer can use -type UnmarshalFunc func([]byte) (interface{}, error) - -// InitializeMapFunc takes an aggregate call from the query and returns the MapFunc -func InitializeMapFunc(c *Call) (MapFunc, error) { - // see if it's a query for raw data - if c == nil { - return MapRawQuery, nil - } - - // Ensure that there is either a single argument or if for percentile, two - if c.Name == "percentile" { - if len(c.Args) != 2 { - return nil, fmt.Errorf("expected two arguments for %s()", c.Name) - } - } else if strings.HasSuffix(c.Name, "derivative") { - // derivatives require a field name and optional duration - if len(c.Args) == 0 { - return nil, fmt.Errorf("expected field name argument for %s()", c.Name) - } - } else if len(c.Args) != 1 { - return nil, fmt.Errorf("expected one argument for %s()", c.Name) - } - - // derivative can take a nested aggregate function, everything else expects - // a variable reference as the first arg - if !strings.HasSuffix(c.Name, "derivative") { - // Ensure the argument is appropriate for the aggregate function. - switch fc := c.Args[0].(type) { - case *VarRef: - case *Distinct: - if c.Name != "count" { - return nil, fmt.Errorf("expected field argument in %s()", c.Name) - } - case *Call: - if fc.Name != "distinct" { - return nil, fmt.Errorf("expected field argument in %s()", c.Name) - } - default: - return nil, fmt.Errorf("expected field argument in %s()", c.Name) - } - } - - // Retrieve map function by name. - switch c.Name { - case "count": - if _, ok := c.Args[0].(*Distinct); ok { - return MapCountDistinct, nil - } - if c, ok := c.Args[0].(*Call); ok { - if c.Name == "distinct" { - return MapCountDistinct, nil - } - } - return MapCount, nil - case "distinct": - return MapDistinct, nil - case "sum": - return MapSum, nil - case "mean": - return MapMean, nil - case "median": - return MapStddev, nil - case "min": - return MapMin, nil - case "max": - return MapMax, nil - case "spread": - return MapSpread, nil - case "stddev": - return MapStddev, nil - case "first": - return MapFirst, nil - case "last": - return MapLast, nil - case "percentile": - _, ok := c.Args[1].(*NumberLiteral) - if !ok { - return nil, fmt.Errorf("expected float argument in percentile()") - } - return MapEcho, nil - case "derivative", "non_negative_derivative": - // If the arg is another aggregate e.g. derivative(mean(value)), then - // use the map func for that nested aggregate - if fn, ok := c.Args[0].(*Call); ok { - return InitializeMapFunc(fn) - } - return MapRawQuery, nil - default: - return nil, fmt.Errorf("function not found: %q", c.Name) - } -} - -// InitializeReduceFunc takes an aggregate call from the query and returns the ReduceFunc -func InitializeReduceFunc(c *Call) (ReduceFunc, error) { - // Retrieve reduce function by name. - switch c.Name { - case "count": - if _, ok := c.Args[0].(*Distinct); ok { - return ReduceCountDistinct, nil - } - if c, ok := c.Args[0].(*Call); ok { - if c.Name == "distinct" { - return ReduceCountDistinct, nil - } - } - return ReduceSum, nil - case "distinct": - return ReduceDistinct, nil - case "sum": - return ReduceSum, nil - case "mean": - return ReduceMean, nil - case "median": - return ReduceMedian, nil - case "min": - return ReduceMin, nil - case "max": - return ReduceMax, nil - case "spread": - return ReduceSpread, nil - case "stddev": - return ReduceStddev, nil - case "first": - return ReduceFirst, nil - case "last": - return ReduceLast, nil - case "percentile": - if len(c.Args) != 2 { - return nil, fmt.Errorf("expected float argument in percentile()") - } - - lit, ok := c.Args[1].(*NumberLiteral) - if !ok { - return nil, fmt.Errorf("expected float argument in percentile()") - } - return ReducePercentile(lit.Val), nil - case "derivative", "non_negative_derivative": - // If the arg is another aggregate e.g. derivative(mean(value)), then - // use the map func for that nested aggregate - if fn, ok := c.Args[0].(*Call); ok { - return InitializeReduceFunc(fn) - } - return nil, fmt.Errorf("expected function argument to %s", c.Name) - default: - return nil, fmt.Errorf("function not found: %q", c.Name) - } -} - -func InitializeUnmarshaller(c *Call) (UnmarshalFunc, error) { - // if c is nil it's a raw data query - if c == nil { - return func(b []byte) (interface{}, error) { - a := make([]*rawQueryMapOutput, 0) - err := json.Unmarshal(b, &a) - return a, err - }, nil - } - - // Retrieve marshal function by name - switch c.Name { - case "mean": - return func(b []byte) (interface{}, error) { - var o meanMapOutput - err := json.Unmarshal(b, &o) - return &o, err - }, nil - case "spread": - return func(b []byte) (interface{}, error) { - var o spreadMapOutput - err := json.Unmarshal(b, &o) - return &o, err - }, nil - case "distinct": - return func(b []byte) (interface{}, error) { - var val distinctValues - err := json.Unmarshal(b, &val) - return val, err - }, nil - case "first": - return func(b []byte) (interface{}, error) { - var o firstLastMapOutput - err := json.Unmarshal(b, &o) - return &o, err - }, nil - case "last": - return func(b []byte) (interface{}, error) { - var o firstLastMapOutput - err := json.Unmarshal(b, &o) - return &o, err - }, nil - case "stddev": - return func(b []byte) (interface{}, error) { - val := make([]float64, 0) - err := json.Unmarshal(b, &val) - return val, err - }, nil - case "median": - return func(b []byte) (interface{}, error) { - a := make([]float64, 0) - err := json.Unmarshal(b, &a) - return a, err - }, nil - default: - return func(b []byte) (interface{}, error) { - var val interface{} - err := json.Unmarshal(b, &val) - return val, err - }, nil - } -} - -// MapCount computes the number of values in an iterator. -func MapCount(itr Iterator) interface{} { - n := float64(0) - for k, _ := itr.Next(); k != -1; k, _ = itr.Next() { - n++ - } - if n > 0 { - return n - } - return nil -} - -type distinctValues []interface{} - -func (d distinctValues) Len() int { return len(d) } -func (d distinctValues) Swap(i, j int) { d[i], d[j] = d[j], d[i] } -func (d distinctValues) Less(i, j int) bool { - // Sort by type if types match - { - d1, ok1 := d[i].(float64) - d2, ok2 := d[j].(float64) - if ok1 && ok2 { - return d1 < d2 - } - } - - { - d1, ok1 := d[i].(uint64) - d2, ok2 := d[j].(uint64) - if ok1 && ok2 { - return d1 < d2 - } - } - - { - d1, ok1 := d[i].(bool) - d2, ok2 := d[j].(bool) - if ok1 && ok2 { - return d1 == false && d2 == true - } - } - - { - d1, ok1 := d[i].(string) - d2, ok2 := d[j].(string) - if ok1 && ok2 { - return d1 < d2 - } - } - - // Types did not match, need to sort based on arbitrary weighting of type - const ( - intWeight = iota - floatWeight - boolWeight - stringWeight - ) - - infer := func(val interface{}) (int, float64) { - switch v := val.(type) { - case uint64: - return intWeight, float64(v) - case int64: - return intWeight, float64(v) - case float64: - return floatWeight, v - case bool: - return boolWeight, 0 - case string: - return stringWeight, 0 - } - panic("unreachable code") - } - - w1, n1 := infer(d[i]) - w2, n2 := infer(d[j]) - - // If we had "numeric" data, use that for comparison - if n1 != n2 && (w1 == intWeight && w2 == floatWeight) || (w1 == floatWeight && w2 == intWeight) { - return n1 < n2 - } - - return w1 < w2 -} - -// MapDistinct computes the unique values in an iterator. -func MapDistinct(itr Iterator) interface{} { - var index = make(map[interface{}]struct{}) - - for time, value := itr.Next(); time != -1; time, value = itr.Next() { - index[value] = struct{}{} - } - - if len(index) == 0 { - return nil - } - - results := make(distinctValues, len(index)) - var i int - for value, _ := range index { - results[i] = value - i++ - } - return results -} - -// ReduceDistinct finds the unique values for each key. -func ReduceDistinct(values []interface{}) interface{} { - var index = make(map[interface{}]struct{}) - - // index distinct values from each mapper - for _, v := range values { - if v == nil { - continue - } - d, ok := v.(distinctValues) - if !ok { - msg := fmt.Sprintf("expected distinctValues, got: %T", v) - panic(msg) - } - for _, distinctValue := range d { - index[distinctValue] = struct{}{} - } - } - - // convert map keys to an array - results := make(distinctValues, len(index)) - var i int - for k, _ := range index { - results[i] = k - i++ - } - if len(results) > 0 { - sort.Sort(results) - return results - } - return nil -} - -// MapCountDistinct computes the unique count of values in an iterator. -func MapCountDistinct(itr Iterator) interface{} { - var index = make(map[interface{}]struct{}) - - for time, value := itr.Next(); time != -1; time, value = itr.Next() { - index[value] = struct{}{} - } - - if len(index) == 0 { - return nil - } - - return index -} - -// ReduceCountDistinct finds the unique counts of values. -func ReduceCountDistinct(values []interface{}) interface{} { - var index = make(map[interface{}]struct{}) - - // index distinct values from each mapper - for _, v := range values { - if v == nil { - continue - } - d, ok := v.(map[interface{}]struct{}) - if !ok { - msg := fmt.Sprintf("expected map[interface{}]struct{}, got: %T", v) - panic(msg) - } - for distinctCountValue, _ := range d { - index[distinctCountValue] = struct{}{} - } - } - - return len(index) -} - -type NumberType int8 - -const ( - Float64Type NumberType = iota - Int64Type -) - -// MapSum computes the summation of values in an iterator. -func MapSum(itr Iterator) interface{} { - n := float64(0) - count := 0 - var resultType NumberType - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - count++ - switch n1 := v.(type) { - case float64: - n += n1 - case int64: - n += float64(n1) - resultType = Int64Type - } - } - if count > 0 { - switch resultType { - case Float64Type: - return n - case Int64Type: - return int64(n) - } - } - return nil -} - -// ReduceSum computes the sum of values for each key. -func ReduceSum(values []interface{}) interface{} { - var n float64 - count := 0 - var resultType NumberType - for _, v := range values { - if v == nil { - continue - } - count++ - switch n1 := v.(type) { - case float64: - n += n1 - case int64: - n += float64(n1) - resultType = Int64Type - } - } - if count > 0 { - switch resultType { - case Float64Type: - return n - case Int64Type: - return int64(n) - } - } - return nil -} - -// MapMean computes the count and sum of values in an iterator to be combined by the reducer. -func MapMean(itr Iterator) interface{} { - out := &meanMapOutput{} - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - out.Count++ - switch n1 := v.(type) { - case float64: - out.Mean += (n1 - out.Mean) / float64(out.Count) - case int64: - out.Mean += (float64(n1) - out.Mean) / float64(out.Count) - out.ResultType = Int64Type - } - } - - if out.Count > 0 { - return out - } - - return nil -} - -type meanMapOutput struct { - Count int - Mean float64 - ResultType NumberType -} - -// ReduceMean computes the mean of values for each key. -func ReduceMean(values []interface{}) interface{} { - out := &meanMapOutput{} - var countSum int - for _, v := range values { - if v == nil { - continue - } - val := v.(*meanMapOutput) - countSum = out.Count + val.Count - out.Mean = val.Mean*(float64(val.Count)/float64(countSum)) + out.Mean*(float64(out.Count)/float64(countSum)) - out.Count = countSum - } - if out.Count > 0 { - return out.Mean - } - return nil -} - -// ReduceMedian computes the median of values -func ReduceMedian(values []interface{}) interface{} { - var data []float64 - // Collect all the data points - for _, value := range values { - if value == nil { - continue - } - data = append(data, value.([]float64)...) - } - - length := len(data) - if length < 2 { - if length == 0 { - return nil - } - return data[0] - } - middle := length / 2 - var sortedRange []float64 - if length%2 == 0 { - sortedRange = getSortedRange(data, middle-1, 2) - var low, high = sortedRange[0], sortedRange[1] - return low + (high-low)/2 - } - sortedRange = getSortedRange(data, middle, 1) - return sortedRange[0] -} - -// getSortedRange returns a sorted subset of data. By using discardLowerRange and discardUpperRange to get the target -// subset (unsorted) and then just sorting that subset, the work can be reduced from O(N lg N), where N is len(data), to -// O(N + count lg count) for the average case -// - O(N) to discard the unwanted items -// - O(count lg count) to sort the count number of extracted items -// This can be useful for: -// - finding the median: getSortedRange(data, middle, 1) -// - finding the top N: getSortedRange(data, len(data) - N, N) -// - finding the bottom N: getSortedRange(data, 0, N) -func getSortedRange(data []float64, start int, count int) []float64 { - out := discardLowerRange(data, start) - k := len(out) - count - if k > 0 { - out = discardUpperRange(out, k) - } - sort.Float64s(out) - - return out -} - -// discardLowerRange discards the lower k elements of the sorted data set without sorting all the data. Sorting all of -// the data would take O(NlgN), where N is len(data), but partitioning to find the kth largest number is O(N) in the -// average case. The remaining N-k unsorted elements are returned - no kind of ordering is guaranteed on these elements. -func discardLowerRange(data []float64, k int) []float64 { - out := make([]float64, len(data)-k) - i := 0 - - // discard values lower than the desired range - for k > 0 { - lows, pivotValue, highs := partition(data) - - lowLength := len(lows) - if lowLength > k { - // keep all the highs and the pivot - out[i] = pivotValue - i++ - copy(out[i:], highs) - i += len(highs) - // iterate over the lows again - data = lows - } else { - // discard all the lows - data = highs - k -= lowLength - if k == 0 { - // if discarded enough lows, keep the pivot - out[i] = pivotValue - i++ - } else { - // able to discard the pivot too - k-- - } - } - } - copy(out[i:], data) - return out -} - -// discardUpperRange discards the upper k elements of the sorted data set without sorting all the data. Sorting all of -// the data would take O(NlgN), where N is len(data), but partitioning to find the kth largest number is O(N) in the -// average case. The remaining N-k unsorted elements are returned - no kind of ordering is guaranteed on these elements. -func discardUpperRange(data []float64, k int) []float64 { - out := make([]float64, len(data)-k) - i := 0 - - // discard values higher than the desired range - for k > 0 { - lows, pivotValue, highs := partition(data) - - highLength := len(highs) - if highLength > k { - // keep all the lows and the pivot - out[i] = pivotValue - i++ - copy(out[i:], lows) - i += len(lows) - // iterate over the highs again - data = highs - } else { - // discard all the highs - data = lows - k -= highLength - if k == 0 { - // if discarded enough highs, keep the pivot - out[i] = pivotValue - i++ - } else { - // able to discard the pivot too - k-- - } - } - } - copy(out[i:], data) - return out -} - -// partition takes a list of data, chooses a random pivot index and returns a list of elements lower than the -// pivotValue, the pivotValue, and a list of elements higher than the pivotValue. partition mutates data. -func partition(data []float64) (lows []float64, pivotValue float64, highs []float64) { - length := len(data) - // there are better (more complex) ways to calculate pivotIndex (e.g. median of 3, median of 3 medians) if this - // proves to be inadequate. - pivotIndex := rand.Int() % length - pivotValue = data[pivotIndex] - low, high := 1, length-1 - - // put the pivot in the first position - data[pivotIndex], data[0] = data[0], data[pivotIndex] - - // partition the data around the pivot - for low <= high { - for low <= high && data[low] <= pivotValue { - low++ - } - for high >= low && data[high] >= pivotValue { - high-- - } - if low < high { - data[low], data[high] = data[high], data[low] - } - } - - return data[1:low], pivotValue, data[high+1:] -} - -type minMaxMapOut struct { - Val float64 - Type NumberType -} - -// MapMin collects the values to pass to the reducer -func MapMin(itr Iterator) interface{} { - min := &minMaxMapOut{} - - pointsYielded := false - var val float64 - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - switch n := v.(type) { - case float64: - val = n - case int64: - val = float64(n) - min.Type = Int64Type - } - - // Initialize min - if !pointsYielded { - min.Val = val - pointsYielded = true - } - min.Val = math.Min(min.Val, val) - } - if pointsYielded { - return min - } - return nil -} - -// ReduceMin computes the min of value. -func ReduceMin(values []interface{}) interface{} { - min := &minMaxMapOut{} - pointsYielded := false - - for _, value := range values { - if value == nil { - continue - } - - v, ok := value.(*minMaxMapOut) - if !ok { - continue - } - - // Initialize min - if !pointsYielded { - min.Val = v.Val - min.Type = v.Type - pointsYielded = true - } - min.Val = math.Min(min.Val, v.Val) - } - if pointsYielded { - switch min.Type { - case Float64Type: - return min.Val - case Int64Type: - return int64(min.Val) - } - } - return nil -} - -// MapMax collects the values to pass to the reducer -func MapMax(itr Iterator) interface{} { - max := &minMaxMapOut{} - - pointsYielded := false - var val float64 - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - switch n := v.(type) { - case float64: - val = n - case int64: - val = float64(n) - max.Type = Int64Type - } - - // Initialize max - if !pointsYielded { - max.Val = val - pointsYielded = true - } - max.Val = math.Max(max.Val, val) - } - if pointsYielded { - return max - } - return nil -} - -// ReduceMax computes the max of value. -func ReduceMax(values []interface{}) interface{} { - max := &minMaxMapOut{} - pointsYielded := false - - for _, value := range values { - if value == nil { - continue - } - - v, ok := value.(*minMaxMapOut) - if !ok { - continue - } - - // Initialize max - if !pointsYielded { - max.Val = v.Val - max.Type = v.Type - pointsYielded = true - } - max.Val = math.Max(max.Val, v.Val) - } - if pointsYielded { - switch max.Type { - case Float64Type: - return max.Val - case Int64Type: - return int64(max.Val) - } - } - return nil -} - -type spreadMapOutput struct { - Min, Max float64 - Type NumberType -} - -// MapSpread collects the values to pass to the reducer -func MapSpread(itr Iterator) interface{} { - out := &spreadMapOutput{} - pointsYielded := false - var val float64 - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - switch n := v.(type) { - case float64: - val = n - case int64: - val = float64(n) - out.Type = Int64Type - } - - // Initialize - if !pointsYielded { - out.Max = val - out.Min = val - pointsYielded = true - } - out.Max = math.Max(out.Max, val) - out.Min = math.Min(out.Min, val) - } - if pointsYielded { - return out - } - return nil -} - -// ReduceSpread computes the spread of values. -func ReduceSpread(values []interface{}) interface{} { - result := &spreadMapOutput{} - pointsYielded := false - - for _, v := range values { - if v == nil { - continue - } - val := v.(*spreadMapOutput) - // Initialize - if !pointsYielded { - result.Max = val.Max - result.Min = val.Min - result.Type = val.Type - pointsYielded = true - } - result.Max = math.Max(result.Max, val.Max) - result.Min = math.Min(result.Min, val.Min) - } - if pointsYielded { - switch result.Type { - case Float64Type: - return result.Max - result.Min - case Int64Type: - return int64(result.Max - result.Min) - } - } - return nil -} - -// MapStddev collects the values to pass to the reducer -func MapStddev(itr Iterator) interface{} { - var values []float64 - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - switch n := v.(type) { - case float64: - values = append(values, n) - case int64: - values = append(values, float64(n)) - } - } - - return values -} - -// ReduceStddev computes the stddev of values. -func ReduceStddev(values []interface{}) interface{} { - var data []float64 - // Collect all the data points - for _, value := range values { - if value == nil { - continue - } - data = append(data, value.([]float64)...) - } - - // If no data or we only have one point, it's nil or undefined - if len(data) < 2 { - return nil - } - - // Get the mean - var mean float64 - var count int - for _, v := range data { - count++ - mean += (v - mean) / float64(count) - } - // Get the variance - var variance float64 - for _, v := range data { - dif := v - mean - sq := math.Pow(dif, 2) - variance += sq - } - variance = variance / float64(count-1) - stddev := math.Sqrt(variance) - - return stddev -} - -type firstLastMapOutput struct { - Time int64 - Val interface{} -} - -// MapFirst collects the values to pass to the reducer -func MapFirst(itr Iterator) interface{} { - out := &firstLastMapOutput{} - pointsYielded := false - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - // Initialize first - if !pointsYielded { - out.Time = k - out.Val = v - pointsYielded = true - } - if k < out.Time { - out.Time = k - out.Val = v - } - } - if pointsYielded { - return out - } - return nil -} - -// ReduceFirst computes the first of value. -func ReduceFirst(values []interface{}) interface{} { - out := &firstLastMapOutput{} - pointsYielded := false - - for _, v := range values { - if v == nil { - continue - } - val := v.(*firstLastMapOutput) - // Initialize first - if !pointsYielded { - out.Time = val.Time - out.Val = val.Val - pointsYielded = true - } - if val.Time < out.Time { - out.Time = val.Time - out.Val = val.Val - } - } - if pointsYielded { - return out.Val - } - return nil -} - -// MapLast collects the values to pass to the reducer -func MapLast(itr Iterator) interface{} { - out := &firstLastMapOutput{} - pointsYielded := false - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - // Initialize last - if !pointsYielded { - out.Time = k - out.Val = v - pointsYielded = true - } - if k > out.Time { - out.Time = k - out.Val = v - } - } - if pointsYielded { - return out - } - return nil -} - -// ReduceLast computes the last of value. -func ReduceLast(values []interface{}) interface{} { - out := &firstLastMapOutput{} - pointsYielded := false - - for _, v := range values { - if v == nil { - continue - } - - val := v.(*firstLastMapOutput) - // Initialize last - if !pointsYielded { - out.Time = val.Time - out.Val = val.Val - pointsYielded = true - } - if val.Time > out.Time { - out.Time = val.Time - out.Val = val.Val - } - } - if pointsYielded { - return out.Val - } - return nil -} - -// MapEcho emits the data points for each group by interval -func MapEcho(itr Iterator) interface{} { - var values []interface{} - - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - values = append(values, v) - } - return values -} - -// ReducePercentile computes the percentile of values for each key. -func ReducePercentile(percentile float64) ReduceFunc { - return func(values []interface{}) interface{} { - var allValues []float64 - - for _, v := range values { - if v == nil { - continue - } - - vals := v.([]interface{}) - for _, v := range vals { - switch v.(type) { - case int64: - allValues = append(allValues, float64(v.(int64))) - case float64: - allValues = append(allValues, v.(float64)) - } - } - } - - sort.Float64s(allValues) - length := len(allValues) - index := int(math.Floor(float64(length)*percentile/100.0+0.5)) - 1 - - if index < 0 || index >= len(allValues) { - return nil - } - - return allValues[index] - } -} - -// IsNumeric returns whether a given aggregate can only be run on numeric fields. -func IsNumeric(c *Call) bool { - switch c.Name { - case "count", "first", "last", "distinct": - return false - default: - return true - } -} - -// MapRawQuery is for queries without aggregates -func MapRawQuery(itr Iterator) interface{} { - var values []*rawQueryMapOutput - for k, v := itr.Next(); k != -1; k, v = itr.Next() { - val := &rawQueryMapOutput{k, v} - values = append(values, val) - } - return values -} - -type rawQueryMapOutput struct { - Time int64 - Values interface{} -} - -func (r *rawQueryMapOutput) String() string { - return fmt.Sprintf("{%#v %#v}", r.Time, r.Values) -} - -type rawOutputs []*rawQueryMapOutput - -func (a rawOutputs) Len() int { return len(a) } -func (a rawOutputs) Less(i, j int) bool { return a[i].Time < a[j].Time } -func (a rawOutputs) Swap(i, j int) { a[i], a[j] = a[j], a[i] } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions_test.go deleted file mode 100644 index 56303d8d9..000000000 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/functions_test.go +++ /dev/null @@ -1,534 +0,0 @@ -package influxql - -import ( - "reflect" - "testing" - "time" - - "github.com/davecgh/go-spew/spew" -) - -import "sort" - -type point struct { - seriesKey string - time int64 - value interface{} -} - -type testIterator struct { - values []point -} - -func (t *testIterator) Next() (timestamp int64, value interface{}) { - if len(t.values) > 0 { - v := t.values[0] - t.values = t.values[1:] - return v.time, v.value - } - - return -1, nil -} - -func TestMapMeanNoValues(t *testing.T) { - iter := &testIterator{} - if got := MapMean(iter); got != nil { - t.Errorf("output mismatch: exp nil got %v", got) - } -} - -func TestMapMean(t *testing.T) { - - tests := []struct { - input []point - output *meanMapOutput - }{ - { // Single point - input: []point{point{"0", 1, 1.0}}, - output: &meanMapOutput{1, 1, Float64Type}, - }, - { // Two points - input: []point{ - point{"0", 1, 2.0}, - point{"0", 2, 8.0}, - }, - output: &meanMapOutput{2, 5.0, Float64Type}, - }, - } - - for _, test := range tests { - iter := &testIterator{ - values: test.input, - } - - got := MapMean(iter) - if got == nil { - t.Fatalf("MapMean(%v): output mismatch: exp %v got %v", test.input, test.output, got) - } - - if got.(*meanMapOutput).Count != test.output.Count || got.(*meanMapOutput).Mean != test.output.Mean { - t.Errorf("output mismatch: exp %v got %v", test.output, got) - } - } -} -func TestInitializeMapFuncPercentile(t *testing.T) { - // No args - c := &Call{ - Name: "percentile", - Args: []Expr{}, - } - _, err := InitializeMapFunc(c) - if err == nil { - t.Errorf("InitializeMapFunc(%v) expected error. got nil", c) - } - - if exp := "expected two arguments for percentile()"; err.Error() != exp { - t.Errorf("InitializeMapFunc(%v) mismatch. exp %v got %v", c, exp, err.Error()) - } - - // No percentile arg - c = &Call{ - Name: "percentile", - Args: []Expr{ - &VarRef{Val: "field1"}, - }, - } - - _, err = InitializeMapFunc(c) - if err == nil { - t.Errorf("InitializeMapFunc(%v) expected error. got nil", c) - } - - if exp := "expected two arguments for percentile()"; err.Error() != exp { - t.Errorf("InitializeMapFunc(%v) mismatch. exp %v got %v", c, exp, err.Error()) - } -} - -func TestInitializeMapFuncDerivative(t *testing.T) { - - for _, fn := range []string{"derivative", "non_negative_derivative"} { - // No args should fail - c := &Call{ - Name: fn, - Args: []Expr{}, - } - - _, err := InitializeMapFunc(c) - if err == nil { - t.Errorf("InitializeMapFunc(%v) expected error. got nil", c) - } - - // Single field arg should return MapEcho - c = &Call{ - Name: fn, - Args: []Expr{ - &VarRef{Val: " field1"}, - &DurationLiteral{Val: time.Hour}, - }, - } - - _, err = InitializeMapFunc(c) - if err != nil { - t.Errorf("InitializeMapFunc(%v) unexpected error. got %v", c, err) - } - - // Nested Aggregate func should return the map func for the nested aggregate - c = &Call{ - Name: fn, - Args: []Expr{ - &Call{Name: "mean", Args: []Expr{&VarRef{Val: "field1"}}}, - &DurationLiteral{Val: time.Hour}, - }, - } - - _, err = InitializeMapFunc(c) - if err != nil { - t.Errorf("InitializeMapFunc(%v) unexpected error. got %v", c, err) - } - } -} - -func TestInitializeReduceFuncPercentile(t *testing.T) { - // No args - c := &Call{ - Name: "percentile", - Args: []Expr{}, - } - _, err := InitializeReduceFunc(c) - if err == nil { - t.Errorf("InitializedReduceFunc(%v) expected error. got nil", c) - } - - if exp := "expected float argument in percentile()"; err.Error() != exp { - t.Errorf("InitializedReduceFunc(%v) mismatch. exp %v got %v", c, exp, err.Error()) - } - - // No percentile arg - c = &Call{ - Name: "percentile", - Args: []Expr{ - &VarRef{Val: "field1"}, - }, - } - - _, err = InitializeReduceFunc(c) - if err == nil { - t.Errorf("InitializedReduceFunc(%v) expected error. got nil", c) - } - - if exp := "expected float argument in percentile()"; err.Error() != exp { - t.Errorf("InitializedReduceFunc(%v) mismatch. exp %v got %v", c, exp, err.Error()) - } -} - -func TestReducePercentileNil(t *testing.T) { - - // ReducePercentile should ignore nil values when calculating the percentile - fn := ReducePercentile(100) - input := []interface{}{ - nil, - } - - got := fn(input) - if got != nil { - t.Fatalf("ReducePercentile(100) returned wrong type. exp nil got %v", got) - } -} - -func TestMapDistinct(t *testing.T) { - const ( // prove that we're ignoring seriesKey - seriesKey1 = "1" - seriesKey2 = "2" - ) - - const ( // prove that we're ignoring time - timeId1 = iota + 1 - timeId2 - timeId3 - timeId4 - timeId5 - timeId6 - ) - - iter := &testIterator{ - values: []point{ - {seriesKey1, timeId1, uint64(1)}, - {seriesKey1, timeId2, uint64(1)}, - {seriesKey1, timeId3, "1"}, - {seriesKey2, timeId4, uint64(1)}, - {seriesKey2, timeId5, float64(1.0)}, - {seriesKey2, timeId6, "1"}, - }, - } - - values := MapDistinct(iter).(distinctValues) - - if exp, got := 3, len(values); exp != got { - t.Errorf("Wrong number of values. exp %v got %v", exp, got) - } - - sort.Sort(values) - - exp := distinctValues{ - uint64(1), - float64(1), - "1", - } - - if !reflect.DeepEqual(values, exp) { - t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(values)) - } -} - -func TestMapDistinctNil(t *testing.T) { - iter := &testIterator{ - values: []point{}, - } - - values := MapDistinct(iter) - - if values != nil { - t.Errorf("Wrong values. exp nil got %v", spew.Sdump(values)) - } -} - -func TestReduceDistinct(t *testing.T) { - v1 := distinctValues{ - "2", - "1", - float64(2.0), - float64(1), - uint64(2), - uint64(1), - true, - false, - } - - expect := distinctValues{ - uint64(1), - float64(1), - uint64(2), - float64(2), - false, - true, - "1", - "2", - } - - got := ReduceDistinct([]interface{}{v1, v1, expect}) - - if !reflect.DeepEqual(got, expect) { - t.Errorf("Wrong values. exp %v got %v", spew.Sdump(expect), spew.Sdump(got)) - } -} - -func TestReduceDistinctNil(t *testing.T) { - tests := []struct { - name string - values []interface{} - }{ - { - name: "nil values", - values: nil, - }, - { - name: "nil mapper", - values: []interface{}{nil}, - }, - { - name: "no mappers", - values: []interface{}{}, - }, - { - name: "empty mappper (len 1)", - values: []interface{}{distinctValues{}}, - }, - { - name: "empty mappper (len 2)", - values: []interface{}{distinctValues{}, distinctValues{}}, - }, - } - - for _, test := range tests { - t.Log(test.name) - got := ReduceDistinct(test.values) - if got != nil { - t.Errorf("Wrong values. exp nil got %v", spew.Sdump(got)) - } - } -} - -func Test_distinctValues_Sort(t *testing.T) { - values := distinctValues{ - "2", - "1", - float64(2.0), - float64(1), - uint64(2), - uint64(1), - true, - false, - } - - expect := distinctValues{ - uint64(1), - float64(1), - uint64(2), - float64(2), - false, - true, - "1", - "2", - } - - sort.Sort(values) - - if !reflect.DeepEqual(values, expect) { - t.Errorf("Wrong values. exp %v got %v", spew.Sdump(expect), spew.Sdump(values)) - } -} - -func TestMapCountDistinct(t *testing.T) { - const ( // prove that we're ignoring seriesKey - seriesKey1 = "1" - seriesKey2 = "2" - ) - - const ( // prove that we're ignoring time - timeId1 = iota + 1 - timeId2 - timeId3 - timeId4 - timeId5 - timeId6 - timeId7 - ) - - iter := &testIterator{ - values: []point{ - {seriesKey1, timeId1, uint64(1)}, - {seriesKey1, timeId2, uint64(1)}, - {seriesKey1, timeId3, "1"}, - {seriesKey2, timeId4, uint64(1)}, - {seriesKey2, timeId5, float64(1.0)}, - {seriesKey2, timeId6, "1"}, - {seriesKey2, timeId7, true}, - }, - } - - values := MapCountDistinct(iter).(map[interface{}]struct{}) - - if exp, got := 4, len(values); exp != got { - t.Errorf("Wrong number of values. exp %v got %v", exp, got) - } - - exp := map[interface{}]struct{}{ - uint64(1): struct{}{}, - float64(1): struct{}{}, - "1": struct{}{}, - true: struct{}{}, - } - - if !reflect.DeepEqual(values, exp) { - t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(values)) - } -} - -func TestMapCountDistinctNil(t *testing.T) { - iter := &testIterator{ - values: []point{}, - } - - values := MapCountDistinct(iter) - - if values != nil { - t.Errorf("Wrong values. exp nil got %v", spew.Sdump(values)) - } -} - -func TestReduceCountDistinct(t *testing.T) { - v1 := map[interface{}]struct{}{ - "2": struct{}{}, - "1": struct{}{}, - float64(2.0): struct{}{}, - float64(1): struct{}{}, - uint64(2): struct{}{}, - uint64(1): struct{}{}, - true: struct{}{}, - false: struct{}{}, - } - - v2 := map[interface{}]struct{}{ - uint64(1): struct{}{}, - float64(1): struct{}{}, - uint64(2): struct{}{}, - float64(2): struct{}{}, - false: struct{}{}, - true: struct{}{}, - "1": struct{}{}, - "2": struct{}{}, - } - - exp := 8 - got := ReduceCountDistinct([]interface{}{v1, v1, v2}) - - if !reflect.DeepEqual(got, exp) { - t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(got)) - } -} - -func TestReduceCountDistinctNil(t *testing.T) { - emptyResults := make(map[interface{}]struct{}) - tests := []struct { - name string - values []interface{} - }{ - { - name: "nil values", - values: nil, - }, - { - name: "nil mapper", - values: []interface{}{nil}, - }, - { - name: "no mappers", - values: []interface{}{}, - }, - { - name: "empty mappper (len 1)", - values: []interface{}{emptyResults}, - }, - { - name: "empty mappper (len 2)", - values: []interface{}{emptyResults, emptyResults}, - }, - } - - for _, test := range tests { - t.Log(test.name) - got := ReduceCountDistinct(test.values) - if got != 0 { - t.Errorf("Wrong values. exp nil got %v", spew.Sdump(got)) - } - } -} - -var getSortedRangeData = []float64{ - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, -} - -var getSortedRangeTests = []struct { - name string - data []float64 - start int - count int - expected []float64 -}{ - {"first 5", getSortedRangeData, 0, 5, []float64{0, 1, 2, 3, 4}}, - {"0 length", getSortedRangeData, 8, 0, []float64{}}, - {"past end of data", getSortedRangeData, len(getSortedRangeData) - 3, 5, []float64{67, 68, 69}}, -} - -func TestGetSortedRange(t *testing.T) { - for _, tt := range getSortedRangeTests { - results := getSortedRange(tt.data, tt.start, tt.count) - if len(results) != len(tt.expected) { - t.Errorf("Test %s error. Expected getSortedRange to return %v but got %v", tt.name, tt.expected, results) - } - for i, point := range tt.expected { - if point != results[i] { - t.Errorf("Test %s error. getSortedRange returned wrong result for index %v. Expected %v but got %v", tt.name, i, point, results[i]) - } - } - } -} - -var benchGetSortedRangeResults []float64 - -func BenchmarkGetSortedRangeByPivot(b *testing.B) { - data := make([]float64, len(getSortedRangeData)) - var results []float64 - for i := 0; i < b.N; i++ { - copy(data, getSortedRangeData) - results = getSortedRange(data, 8, 15) - } - benchGetSortedRangeResults = results -} - -func BenchmarkGetSortedRangeBySort(b *testing.B) { - data := make([]float64, len(getSortedRangeData)) - var results []float64 - for i := 0; i < b.N; i++ { - copy(data, getSortedRangeData) - sort.Float64s(data) - results = data[8:23] - } - benchGetSortedRangeResults = results -} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go index b2c51e595..f7b801dcb 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go @@ -7,6 +7,7 @@ import ( "io" "math" "regexp" + "sort" "strconv" "strings" "time" @@ -129,6 +130,8 @@ func (p *Parser) parseShowStatement() (Statement, error) { return nil, newParseError(tokstr(tok, lit), []string{"POLICIES"}, pos) case SERIES: return p.parseShowSeriesStatement() + case SHARDS: + return p.parseShowShardsStatement() case STATS: return p.parseShowStatsStatement() case DIAGNOSTICS: @@ -145,7 +148,24 @@ func (p *Parser) parseShowStatement() (Statement, error) { return p.parseShowUsersStatement() } - return nil, newParseError(tokstr(tok, lit), []string{"CONTINUOUS", "DATABASES", "FIELD", "GRANTS", "MEASUREMENTS", "RETENTION", "SERIES", "SERVERS", "TAG", "USERS"}, pos) + showQueryKeywords := []string{ + "CONTINUOUS", + "DATABASES", + "FIELD", + "GRANTS", + "MEASUREMENTS", + "RETENTION", + "SERIES", + "SERVERS", + "TAG", + "USERS", + "STATS", + "DIAGNOSTICS", + "SHARDS", + } + sort.Strings(showQueryKeywords) + + return nil, newParseError(tokstr(tok, lit), showQueryKeywords, pos) } // parseCreateStatement parses a string and returns a create statement. @@ -188,6 +208,8 @@ func (p *Parser) parseDropStatement() (Statement, error) { return p.parseDropRetentionPolicyStatement() } else if tok == USER { return p.parseDropUserStatement() + } else if tok == SERVER { + return p.parseDropServerStatement() } return nil, newParseError(tokstr(tok, lit), []string{"SERIES", "CONTINUOUS", "MEASUREMENT"}, pos) @@ -291,8 +313,8 @@ func (p *Parser) parseCreateRetentionPolicyStatement() (*CreateRetentionPolicySt // Parse optional DEFAULT token. if tok, pos, lit = p.scanIgnoreWhitespace(); tok == DEFAULT { stmt.Default = true - } else { - p.unscan() + } else if tok != EOF && tok != SEMICOLON { + return nil, newParseError(tokstr(tok, lit), []string{"DEFAULT"}, pos) } return stmt, nil @@ -488,6 +510,9 @@ func (p *Parser) parseSegmentedIdents() ([]string, error) { if ch := p.peekRune(); ch == '/' { // Next segment is a regex so we're done. break + } else if ch == ':' { + // Next segment is context-specific so let caller handle it. + break } else if ch == '.' { // Add an empty identifier. idents = append(idents, "") @@ -799,7 +824,18 @@ func (p *Parser) parseTarget(tr targetRequirement) (*Target, error) { return nil, err } - t := &Target{Measurement: &Measurement{}} + if len(idents) < 3 { + // Check for source measurement reference. + if ch := p.peekRune(); ch == ':' { + if err := p.parseTokens([]Token{COLON, MEASUREMENT}); err != nil { + return nil, err + } + // Append empty measurement name. + idents = append(idents, "") + } + } + + t := &Target{Measurement: &Measurement{IsTarget: true}} switch len(idents) { case 1: @@ -963,6 +999,16 @@ func (p *Parser) parseShowTagKeysStatement() (*ShowTagKeysStatement, error) { return nil, err } + // Parse series limit: "SLIMIT ". + if stmt.SLimit, err = p.parseOptionalTokenAndInt(SLIMIT); err != nil { + return nil, err + } + + // Parse series offset: "SOFFSET ". + if stmt.SOffset, err = p.parseOptionalTokenAndInt(SOFFSET); err != nil { + return nil, err + } + return stmt, nil } @@ -1134,6 +1180,27 @@ func (p *Parser) parseDropSeriesStatement() (*DropSeriesStatement, error) { return stmt, nil } +// parseDropServerStatement parses a string and returns a DropServerStatement. +// This function assumes the "DROP SERVER" tokens have already been consumed. +func (p *Parser) parseDropServerStatement() (*DropServerStatement, error) { + s := &DropServerStatement{} + var err error + + // Parse the server's ID. + if s.NodeID, err = p.parseUInt64(); err != nil { + return nil, err + } + + // Parse optional FORCE token. + if tok, pos, lit := p.scanIgnoreWhitespace(); tok == FORCE { + s.Force = true + } else if tok != EOF && tok != SEMICOLON { + return nil, newParseError(tokstr(tok, lit), []string{"FORCE"}, pos) + } + + return s, nil +} + // parseShowContinuousQueriesStatement parses a string and returns a ShowContinuousQueriesStatement. // This function assumes the "SHOW CONTINUOUS" tokens have already been consumed. func (p *Parser) parseShowContinuousQueriesStatement() (*ShowContinuousQueriesStatement, error) { @@ -1250,6 +1317,16 @@ func (p *Parser) parseCreateContinuousQueryStatement() (*CreateContinuousQuerySt func (p *Parser) parseCreateDatabaseStatement() (*CreateDatabaseStatement, error) { stmt := &CreateDatabaseStatement{} + // Look for "IF NOT EXISTS" + if tok, _, _ := p.scanIgnoreWhitespace(); tok == IF { + if err := p.parseTokens([]Token{NOT, EXISTS}); err != nil { + return nil, err + } + stmt.IfNotExists = true + } else { + p.unscan() + } + // Parse the name of the database to be created. lit, err := p.parseIdent() if err != nil { @@ -1385,14 +1462,20 @@ func (p *Parser) parseRetentionPolicy() (name string, dfault bool, err error) { return } +// parseShowShardsStatement parses a string for "SHOW SHARDS" statement. +// This function assumes the "SHOW SHARDS" tokens have already been consumed. +func (p *Parser) parseShowShardsStatement() (*ShowShardsStatement, error) { + return &ShowShardsStatement{}, nil +} + // parseShowStatsStatement parses a string and returns a ShowStatsStatement. // This function assumes the "SHOW STATS" tokens have already been consumed. func (p *Parser) parseShowStatsStatement() (*ShowStatsStatement, error) { stmt := &ShowStatsStatement{} var err error - if tok, _, _ := p.scanIgnoreWhitespace(); tok == ON { - stmt.Host, err = p.parseString() + if tok, _, _ := p.scanIgnoreWhitespace(); tok == FOR { + stmt.Module, err = p.parseString() } else { p.unscan() } @@ -1403,7 +1486,15 @@ func (p *Parser) parseShowStatsStatement() (*ShowStatsStatement, error) { // parseShowDiagnostics parses a string and returns a ShowDiagnosticsStatement. func (p *Parser) parseShowDiagnosticsStatement() (*ShowDiagnosticsStatement, error) { stmt := &ShowDiagnosticsStatement{} - return stmt, nil + var err error + + if tok, _, _ := p.scanIgnoreWhitespace(); tok == FOR { + stmt.Module, err = p.parseString() + } else { + p.unscan() + } + + return stmt, err } // parseDropContinuousQueriesStatement parses a string and returns a DropContinuousQueryStatement. @@ -1441,13 +1532,6 @@ func (p *Parser) parseDropContinuousQueryStatement() (*DropContinuousQueryStatem func (p *Parser) parseFields() (Fields, error) { var fields Fields - // Check for "*" (i.e., "all fields") - if tok, _, _ := p.scanIgnoreWhitespace(); tok == MUL { - fields = append(fields, &Field{&Wildcard{}, ""}) - return fields, nil - } - p.unscan() - for { // Parse the field. f, err := p.parseField() @@ -1777,24 +1861,29 @@ func (p *Parser) parseOrderBy() (SortFields, error) { func (p *Parser) parseSortFields() (SortFields, error) { var fields SortFields - // If first token is ASC or DESC, all fields are sorted. - if tok, pos, lit := p.scanIgnoreWhitespace(); tok == ASC || tok == DESC { - if tok == DESC { - // Token must be ASC, until other sort orders are supported. - return nil, errors.New("only ORDER BY time ASC supported at this time") + tok, pos, lit := p.scanIgnoreWhitespace() + + switch tok { + // The first field after an order by may not have a field name (e.g. ORDER BY ASC) + case ASC, DESC: + fields = append(fields, &SortField{Ascending: (tok == ASC)}) + // If it's a token, parse it as a sort field. At least one is required. + case IDENT: + p.unscan() + field, err := p.parseSortField() + if err != nil { + return nil, err } - return append(fields, &SortField{Ascending: (tok == ASC)}), nil - } else if tok != IDENT { + + if lit != "time" { + return nil, errors.New("only ORDER BY time supported at this time") + } + + fields = append(fields, field) + // Parse error... + default: return nil, newParseError(tokstr(tok, lit), []string{"identifier", "ASC", "DESC"}, pos) } - p.unscan() - - // At least one field is required. - field, err := p.parseSortField() - if err != nil { - return nil, err - } - fields = append(fields, field) // Parse additional fields. for { @@ -1813,9 +1902,8 @@ func (p *Parser) parseSortFields() (SortFields, error) { fields = append(fields, field) } - // First SortField must be time ASC, until other sort orders are supported. - if len(fields) > 1 || fields[0].Name != "time" || !fields[0].Ascending { - return nil, errors.New("only ORDER BY time ASC supported at this time") + if len(fields) > 1 { + return nil, errors.New("only ORDER BY time supported at this time") } return fields, nil diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go index b9bb9756d..47f43e554 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go @@ -73,11 +73,45 @@ func TestParser_ParseStatement(t *testing.T) { Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, }, }, + { + s: `SELECT * FROM myseries GROUP BY *`, + stmt: &influxql.SelectStatement{ + IsRawQuery: true, + Fields: []*influxql.Field{ + {Expr: &influxql.Wildcard{}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, + Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}}, + }, + }, + { + s: `SELECT field1, * FROM myseries GROUP BY *`, + stmt: &influxql.SelectStatement{ + IsRawQuery: true, + Fields: []*influxql.Field{ + {Expr: &influxql.VarRef{Val: "field1"}}, + {Expr: &influxql.Wildcard{}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, + Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}}, + }, + }, + { + s: `SELECT *, field1 FROM myseries GROUP BY *`, + stmt: &influxql.SelectStatement{ + IsRawQuery: true, + Fields: []*influxql.Field{ + {Expr: &influxql.Wildcard{}}, + {Expr: &influxql.VarRef{Val: "field1"}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, + Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}}, + }, + }, // SELECT statement { - skip: true, - s: fmt.Sprintf(`SELECT mean(field1), sum(field2) ,count(field3) AS field_x FROM myseries WHERE host = 'hosta.influxdb.org' and time > '%s' GROUP BY time(10h) ORDER BY ASC LIMIT 20 OFFSET 10;`, now.UTC().Format(time.RFC3339Nano)), + s: fmt.Sprintf(`SELECT mean(field1), sum(field2) ,count(field3) AS field_x FROM myseries WHERE host = 'hosta.influxdb.org' and time > '%s' GROUP BY time(10h) ORDER BY DESC LIMIT 20 OFFSET 10;`, now.UTC().Format(time.RFC3339Nano)), stmt: &influxql.SelectStatement{ IsRawQuery: false, Fields: []*influxql.Field{ @@ -101,12 +135,32 @@ func TestParser_ParseStatement(t *testing.T) { }, Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 10 * time.Hour}}}}}, SortFields: []*influxql.SortField{ - {Ascending: true}, + {Ascending: false}, }, Limit: 20, Offset: 10, }, }, + { + s: `SELECT "foo.bar.baz" AS foo FROM myseries`, + stmt: &influxql.SelectStatement{ + IsRawQuery: true, + Fields: []*influxql.Field{ + {Expr: &influxql.VarRef{Val: "foo.bar.baz"}, Alias: "foo"}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, + }, + }, + { + s: `SELECT "foo.bar.baz" AS foo FROM foo`, + stmt: &influxql.SelectStatement{ + IsRawQuery: true, + Fields: []*influxql.Field{ + {Expr: &influxql.VarRef{Val: "foo.bar.baz"}, Alias: "foo"}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "foo"}}, + }, + }, // derivative { @@ -120,6 +174,22 @@ func TestParser_ParseStatement(t *testing.T) { }, }, + { + s: fmt.Sprintf(`SELECT derivative(field1, 1h) FROM myseries WHERE time > '%s'`, now.UTC().Format(time.RFC3339Nano)), + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "derivative", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.DurationLiteral{Val: time.Hour}}}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, + Condition: &influxql.BinaryExpr{ + Op: influxql.GT, + LHS: &influxql.VarRef{Val: "time"}, + RHS: &influxql.TimeLiteral{Val: now.UTC()}, + }, + }, + }, + { s: `SELECT derivative(mean(field1), 1h) FROM myseries;`, stmt: &influxql.SelectStatement{ @@ -214,6 +284,65 @@ func TestParser_ParseStatement(t *testing.T) { }, }, + // select percentile statements + { + s: `select percentile("field1", 2.0) from cpu`, + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "percentile", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2.0}}}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}}, + }, + }, + + // select top statements + { + s: `select top("field1", 2) from cpu`, + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}}, + }, + }, + + { + s: `select top(field1, 2) from cpu`, + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}}, + }, + }, + + { + s: `select top(field1, 2), tag1 from cpu`, + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}}, + {Expr: &influxql.VarRef{Val: "tag1"}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}}, + }, + }, + + { + s: `select top(field1, tag1, 2), tag1 from cpu`, + stmt: &influxql.SelectStatement{ + IsRawQuery: false, + Fields: []*influxql.Field{ + {Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.VarRef{Val: "tag1"}, &influxql.NumberLiteral{Val: 2}}}}, + {Expr: &influxql.VarRef{Val: "tag1"}}, + }, + Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}}, + }, + }, + // select distinct statements { s: `select distinct(field1) from cpu`, @@ -587,17 +716,17 @@ func TestParser_ParseStatement(t *testing.T) { // SHOW SERIES WHERE with ORDER BY and LIMIT { skip: true, - s: `SHOW SERIES WHERE region = 'uswest' ORDER BY ASC, field1, field2 DESC LIMIT 10`, + s: `SHOW SERIES WHERE region = 'order by desc' ORDER BY DESC, field1, field2 DESC LIMIT 10`, stmt: &influxql.ShowSeriesStatement{ Condition: &influxql.BinaryExpr{ Op: influxql.EQ, LHS: &influxql.VarRef{Val: "region"}, - RHS: &influxql.StringLiteral{Val: "uswest"}, + RHS: &influxql.StringLiteral{Val: "order by desc"}, }, SortFields: []*influxql.SortField{ - {Ascending: true}, - {Name: "field1"}, - {Name: "field2"}, + &influxql.SortField{Ascending: false}, + &influxql.SortField{Name: "field1", Ascending: true}, + &influxql.SortField{Name: "field2"}, }, Limit: 10, }, @@ -638,6 +767,74 @@ func TestParser_ParseStatement(t *testing.T) { }, }, + // SHOW TAG KEYS with LIMIT + { + s: `SHOW TAG KEYS FROM src LIMIT 2`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + Limit: 2, + }, + }, + + // SHOW TAG KEYS with OFFSET + { + s: `SHOW TAG KEYS FROM src OFFSET 1`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + Offset: 1, + }, + }, + + // SHOW TAG KEYS with LIMIT and OFFSET + { + s: `SHOW TAG KEYS FROM src LIMIT 2 OFFSET 1`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + Limit: 2, + Offset: 1, + }, + }, + + // SHOW TAG KEYS with SLIMIT + { + s: `SHOW TAG KEYS FROM src SLIMIT 2`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + SLimit: 2, + }, + }, + + // SHOW TAG KEYS with SOFFSET + { + s: `SHOW TAG KEYS FROM src SOFFSET 1`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + SOffset: 1, + }, + }, + + // SHOW TAG KEYS with SLIMIT and SOFFSET + { + s: `SHOW TAG KEYS FROM src SLIMIT 2 SOFFSET 1`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + SLimit: 2, + SOffset: 1, + }, + }, + + // SHOW TAG KEYS with LIMIT, OFFSET, SLIMIT, and SOFFSET + { + s: `SHOW TAG KEYS FROM src LIMIT 4 OFFSET 3 SLIMIT 2 SOFFSET 1`, + stmt: &influxql.ShowTagKeysStatement{ + Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}, + Limit: 4, + Offset: 3, + SLimit: 2, + SOffset: 1, + }, + }, + // SHOW TAG KEYS FROM // { s: `SHOW TAG KEYS FROM /[cg]pu/`, @@ -816,6 +1013,16 @@ func TestParser_ParseStatement(t *testing.T) { }, }, + // DROP SERVER statement + { + s: `DROP SERVER 123`, + stmt: &influxql.DropServerStatement{NodeID: 123}, + }, + { + s: `DROP SERVER 123 FORCE`, + stmt: &influxql.DropServerStatement{NodeID: 123, Force: true}, + }, + // SHOW CONTINUOUS QUERIES statement { s: `SHOW CONTINUOUS QUERIES`, @@ -830,7 +1037,7 @@ func TestParser_ParseStatement(t *testing.T) { Database: "testdb", Source: &influxql.SelectStatement{ Fields: []*influxql.Field{{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}}}, - Target: &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1"}}, + Target: &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1", IsTarget: true}}, Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, Dimensions: []*influxql.Dimension{ { @@ -854,7 +1061,7 @@ func TestParser_ParseStatement(t *testing.T) { Source: &influxql.SelectStatement{ IsRawQuery: true, Fields: []*influxql.Field{{Expr: &influxql.Wildcard{}}}, - Target: &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1"}}, + Target: &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1", IsTarget: true}}, Sources: []influxql.Source{&influxql.Measurement{Name: "cpu_load_short"}}, }, }, @@ -869,7 +1076,7 @@ func TestParser_ParseStatement(t *testing.T) { Source: &influxql.SelectStatement{ Fields: []*influxql.Field{{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}}}, Target: &influxql.Target{ - Measurement: &influxql.Measurement{RetentionPolicy: "1h.policy1", Name: "cpu.load"}, + Measurement: &influxql.Measurement{RetentionPolicy: "1h.policy1", Name: "cpu.load", IsTarget: true}, }, Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, Dimensions: []*influxql.Dimension{ @@ -896,7 +1103,7 @@ func TestParser_ParseStatement(t *testing.T) { IsRawQuery: true, Fields: []*influxql.Field{{Expr: &influxql.VarRef{Val: "value"}}}, Target: &influxql.Target{ - Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "value"}, + Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "value", IsTarget: true}, }, Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, }, @@ -914,18 +1121,52 @@ func TestParser_ParseStatement(t *testing.T) { Fields: []*influxql.Field{{Expr: &influxql.VarRef{Val: "transmit_rx"}}, {Expr: &influxql.VarRef{Val: "transmit_tx"}}}, Target: &influxql.Target{ - Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "network"}, + Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "network", IsTarget: true}, }, Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}}, }, }, }, + // CREATE CONTINUOUS QUERY with backreference measurement name + { + s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT mean(value) INTO "policy1".:measurement FROM /^[a-z]+.*/ GROUP BY time(1m) END`, + stmt: &influxql.CreateContinuousQueryStatement{ + Name: "myquery", + Database: "testdb", + Source: &influxql.SelectStatement{ + Fields: []*influxql.Field{{Expr: &influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}}, + Target: &influxql.Target{ + Measurement: &influxql.Measurement{RetentionPolicy: "policy1", IsTarget: true}, + }, + Sources: []influxql.Source{&influxql.Measurement{Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`^[a-z]+.*`)}}}, + Dimensions: []*influxql.Dimension{ + { + Expr: &influxql.Call{ + Name: "time", + Args: []influxql.Expr{ + &influxql.DurationLiteral{Val: 1 * time.Minute}, + }, + }, + }, + }, + }, + }, + }, + // CREATE DATABASE statement { s: `CREATE DATABASE testdb`, stmt: &influxql.CreateDatabaseStatement{ - Name: "testdb", + Name: "testdb", + IfNotExists: false, + }, + }, + { + s: `CREATE DATABASE IF NOT EXISTS testdb`, + stmt: &influxql.CreateDatabaseStatement{ + Name: "testdb", + IfNotExists: true, }, }, @@ -1181,20 +1422,20 @@ func TestParser_ParseStatement(t *testing.T) { { s: `SHOW STATS`, stmt: &influxql.ShowStatsStatement{ - Host: "", + Module: "", }, }, { - s: `SHOW STATS ON 'servera'`, + s: `SHOW STATS FOR 'cluster'`, stmt: &influxql.ShowStatsStatement{ - Host: "servera", + Module: "cluster", }, }, + + // SHOW SHARDS { - s: `SHOW STATS ON '192.167.1.44'`, - stmt: &influxql.ShowStatsStatement{ - Host: "192.167.1.44", - }, + s: `SHOW SHARDS`, + stmt: &influxql.ShowShardsStatement{}, }, // SHOW DIAGNOSTICS @@ -1202,6 +1443,12 @@ func TestParser_ParseStatement(t *testing.T) { s: `SHOW DIAGNOSTICS`, stmt: &influxql.ShowDiagnosticsStatement{}, }, + { + s: `SHOW DIAGNOSTICS FOR 'build'`, + stmt: &influxql.ShowDiagnosticsStatement{ + Module: "build", + }, + }, // Errors {s: ``, err: `found EOF, expected SELECT, DELETE, SHOW, CREATE, DROP, GRANT, REVOKE, ALTER, SET at line 1, char 1`}, @@ -1213,6 +1460,21 @@ func TestParser_ParseStatement(t *testing.T) { {s: `SELECT field1 FROM myseries GROUP`, err: `found EOF, expected BY at line 1, char 35`}, {s: `SELECT field1 FROM myseries LIMIT`, err: `found EOF, expected number at line 1, char 35`}, {s: `SELECT field1 FROM myseries LIMIT 10.5`, err: `fractional parts not allowed in LIMIT at line 1, char 35`}, + {s: `SELECT top() FROM myseries`, err: `invalid number of arguments for top, expected at least 2, got 0`}, + {s: `SELECT top(field1) FROM myseries`, err: `invalid number of arguments for top, expected at least 2, got 1`}, + {s: `SELECT top(field1,foo) FROM myseries`, err: `expected integer as last argument in top(), found foo`}, + {s: `SELECT top(field1,host,'server',foo) FROM myseries`, err: `expected integer as last argument in top(), found foo`}, + {s: `SELECT top(field1,5,'server',2) FROM myseries`, err: `only fields or tags are allowed in top(), found 5.000`}, + {s: `SELECT top(field1,max(foo),'server',2) FROM myseries`, err: `only fields or tags are allowed in top(), found max(foo)`}, + {s: `SELECT bottom() FROM myseries`, err: `invalid number of arguments for bottom, expected at least 2, got 0`}, + {s: `SELECT bottom(field1) FROM myseries`, err: `invalid number of arguments for bottom, expected at least 2, got 1`}, + {s: `SELECT bottom(field1,foo) FROM myseries`, err: `expected integer as last argument in bottom(), found foo`}, + {s: `SELECT bottom(field1,host,'server',foo) FROM myseries`, err: `expected integer as last argument in bottom(), found foo`}, + {s: `SELECT bottom(field1,5,'server',2) FROM myseries`, err: `only fields or tags are allowed in bottom(), found 5.000`}, + {s: `SELECT bottom(field1,max(foo),'server',2) FROM myseries`, err: `only fields or tags are allowed in bottom(), found max(foo)`}, + {s: `SELECT percentile() FROM myseries`, err: `invalid number of arguments for percentile, expected 2, got 0`}, + {s: `SELECT percentile(field1) FROM myseries`, err: `invalid number of arguments for percentile, expected 2, got 1`}, + {s: `SELECT percentile(field1, foo) FROM myseries`, err: `expected float argument in percentile()`}, {s: `SELECT field1 FROM myseries OFFSET`, err: `found EOF, expected number at line 1, char 36`}, {s: `SELECT field1 FROM myseries OFFSET 10.5`, err: `fractional parts not allowed in OFFSET at line 1, char 36`}, {s: `SELECT field1 FROM myseries ORDER`, err: `found EOF, expected BY at line 1, char 35`}, @@ -1220,19 +1482,20 @@ func TestParser_ParseStatement(t *testing.T) { {s: `SELECT field1 FROM myseries ORDER BY /`, err: `found /, expected identifier, ASC, DESC at line 1, char 38`}, {s: `SELECT field1 FROM myseries ORDER BY 1`, err: `found 1, expected identifier, ASC, DESC at line 1, char 38`}, {s: `SELECT field1 FROM myseries ORDER BY time ASC,`, err: `found EOF, expected identifier at line 1, char 47`}, - {s: `SELECT field1 FROM myseries ORDER BY DESC`, err: `only ORDER BY time ASC supported at this time`}, - {s: `SELECT field1 FROM myseries ORDER BY field1`, err: `only ORDER BY time ASC supported at this time`}, - {s: `SELECT field1 FROM myseries ORDER BY time DESC`, err: `only ORDER BY time ASC supported at this time`}, - {s: `SELECT field1 FROM myseries ORDER BY time, field1`, err: `only ORDER BY time ASC supported at this time`}, + {s: `SELECT field1 FROM myseries ORDER BY time, field1`, err: `only ORDER BY time supported at this time`}, {s: `SELECT field1 AS`, err: `found EOF, expected identifier at line 1, char 18`}, {s: `SELECT field1 FROM foo group by time(1s)`, err: `GROUP BY requires at least one aggregate function`}, {s: `SELECT count(value), value FROM foo`, err: `mixing aggregate and non-aggregate queries is not supported`}, {s: `SELECT count(value) FROM foo group by time(1s)`, err: `aggregate functions with GROUP BY time require a WHERE time clause`}, {s: `SELECT count(value) FROM foo group by time(1s) where host = 'hosta.influxdb.org'`, err: `aggregate functions with GROUP BY time require a WHERE time clause`}, + {s: `SELECT count(value) FROM foo group by time`, err: `time() is a function and expects at least one argument`}, + {s: `SELECT count(value) FROM foo group by 'time'`, err: `only time and tag dimensions allowed`}, + {s: `SELECT count(value) FROM foo where time > now() and time < now() group by time()`, err: `time dimension expected one argument`}, + {s: `SELECT count(value) FROM foo where time > now() and time < now() group by time(b)`, err: `time dimension must have one duration argument`}, + {s: `SELECT count(value) FROM foo where time > now() and time < now() group by time(1s), time(2s)`, err: `multiple time dimensions not allowed`}, {s: `SELECT field1 FROM 12`, err: `found 12, expected identifier at line 1, char 20`}, {s: `SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 FROM myseries`, err: `unable to parse number at line 1, char 8`}, {s: `SELECT 10.5h FROM myseries`, err: `found h, expected FROM at line 1, char 12`}, - {s: `SELECT derivative(field1), field1 FROM myseries`, err: `mixing aggregate and non-aggregate queries is not supported`}, {s: `SELECT distinct(field1), sum(field1) FROM myseries`, err: `aggregate function distinct() can not be combined with other functions or fields`}, {s: `SELECT distinct(field1), field2 FROM myseries`, err: `aggregate function distinct() can not be combined with other functions or fields`}, {s: `SELECT distinct(field1, field2) FROM myseries`, err: `distinct function can only have one argument`}, @@ -1243,15 +1506,18 @@ func TestParser_ParseStatement(t *testing.T) { {s: `SELECT count(distinct field1, field2) FROM myseries`, err: `count(distinct ) can only have one argument`}, {s: `select count(distinct(too, many, arguments)) from myseries`, err: `count(distinct ) can only have one argument`}, {s: `select count() from myseries`, err: `invalid number of arguments for count, expected 1, got 0`}, + {s: `SELECT derivative(), field1 FROM myseries`, err: `mixing aggregate and non-aggregate queries is not supported`}, {s: `select derivative() from myseries`, err: `invalid number of arguments for derivative, expected at least 1 but no more than 2, got 0`}, {s: `select derivative(mean(value), 1h, 3) from myseries`, err: `invalid number of arguments for derivative, expected at least 1 but no more than 2, got 3`}, + {s: `SELECT derivative(value) FROM myseries group by time(1h)`, err: `aggregate function required inside the call to derivative`}, + {s: `SELECT non_negative_derivative(), field1 FROM myseries`, err: `mixing aggregate and non-aggregate queries is not supported`}, + {s: `select non_negative_derivative() from myseries`, err: `invalid number of arguments for non_negative_derivative, expected at least 1 but no more than 2, got 0`}, + {s: `select non_negative_derivative(mean(value), 1h, 3) from myseries`, err: `invalid number of arguments for non_negative_derivative, expected at least 1 but no more than 2, got 3`}, + {s: `SELECT non_negative_derivative(value) FROM myseries group by time(1h)`, err: `aggregate function required inside the call to non_negative_derivative`}, {s: `SELECT field1 from myseries WHERE host =~ 'asd' LIMIT 1`, err: `found asd, expected regex at line 1, char 42`}, {s: `SELECT value > 2 FROM cpu`, err: `invalid operator > in SELECT clause at line 1, char 8; operator is intended for WHERE clause`}, {s: `SELECT value = 2 FROM cpu`, err: `invalid operator = in SELECT clause at line 1, char 8; operator is intended for WHERE clause`}, {s: `SELECT s =~ /foo/ FROM cpu`, err: `invalid operator =~ in SELECT clause at line 1, char 8; operator is intended for WHERE clause`}, - {s: `SELECT foo, * from cpu`, err: `wildcards can not be combined with other fields`}, - {s: `SELECT *, * from cpu`, err: `found ,, expected FROM at line 1, char 9`}, - {s: `SELECT *, foo from cpu`, err: `found ,, expected FROM at line 1, char 9`}, {s: `DELETE`, err: `found EOF, expected FROM at line 1, char 8`}, {s: `DELETE FROM`, err: `found EOF, expected identifier at line 1, char 13`}, {s: `DELETE FROM myseries WHERE`, err: `found EOF, expected identifier, string, number, bool at line 1, char 28`}, @@ -1259,14 +1525,18 @@ func TestParser_ParseStatement(t *testing.T) { {s: `DROP SERIES`, err: `found EOF, expected FROM, WHERE at line 1, char 13`}, {s: `DROP SERIES FROM`, err: `found EOF, expected identifier at line 1, char 18`}, {s: `DROP SERIES FROM src WHERE`, err: `found EOF, expected identifier, string, number, bool at line 1, char 28`}, + {s: `DROP SERVER`, err: `found EOF, expected number at line 1, char 13`}, + {s: `DROP SERVER abc`, err: `found abc, expected number at line 1, char 13`}, + {s: `DROP SERVER 1 1`, err: `found 1, expected FORCE at line 1, char 15`}, {s: `SHOW CONTINUOUS`, err: `found EOF, expected QUERIES at line 1, char 17`}, {s: `SHOW RETENTION`, err: `found EOF, expected POLICIES at line 1, char 16`}, {s: `SHOW RETENTION ON`, err: `found ON, expected POLICIES at line 1, char 16`}, {s: `SHOW RETENTION POLICIES`, err: `found EOF, expected ON at line 1, char 25`}, {s: `SHOW RETENTION POLICIES mydb`, err: `found mydb, expected ON at line 1, char 25`}, {s: `SHOW RETENTION POLICIES ON`, err: `found EOF, expected identifier at line 1, char 28`}, - {s: `SHOW FOO`, err: `found FOO, expected CONTINUOUS, DATABASES, FIELD, GRANTS, MEASUREMENTS, RETENTION, SERIES, SERVERS, TAG, USERS at line 1, char 6`}, - {s: `SHOW STATS ON`, err: `found EOF, expected string at line 1, char 15`}, + {s: `SHOW FOO`, err: `found FOO, expected CONTINUOUS, DATABASES, DIAGNOSTICS, FIELD, GRANTS, MEASUREMENTS, RETENTION, SERIES, SERVERS, SHARDS, STATS, TAG, USERS at line 1, char 6`}, + {s: `SHOW STATS FOR`, err: `found EOF, expected string at line 1, char 16`}, + {s: `SHOW DIAGNOSTICS FOR`, err: `found EOF, expected string at line 1, char 22`}, {s: `SHOW GRANTS`, err: `found EOF, expected FOR at line 1, char 13`}, {s: `SHOW GRANTS FOR`, err: `found EOF, expected identifier at line 1, char 17`}, {s: `DROP CONTINUOUS`, err: `found EOF, expected QUERY at line 1, char 17`}, @@ -1276,6 +1546,10 @@ func TestParser_ParseStatement(t *testing.T) { {s: `CREATE CONTINUOUS`, err: `found EOF, expected QUERY at line 1, char 19`}, {s: `CREATE CONTINUOUS QUERY`, err: `found EOF, expected identifier at line 1, char 25`}, {s: `DROP FOO`, err: `found FOO, expected SERIES, CONTINUOUS, MEASUREMENT at line 1, char 6`}, + {s: `CREATE DATABASE`, err: `found EOF, expected identifier at line 1, char 17`}, + {s: `CREATE DATABASE IF`, err: `found EOF, expected NOT at line 1, char 20`}, + {s: `CREATE DATABASE IF NOT`, err: `found EOF, expected EXISTS at line 1, char 24`}, + {s: `CREATE DATABASE IF NOT EXISTS`, err: `found EOF, expected identifier at line 1, char 31`}, {s: `DROP DATABASE`, err: `found EOF, expected identifier at line 1, char 15`}, {s: `DROP RETENTION`, err: `found EOF, expected POLICY at line 1, char 16`}, {s: `DROP RETENTION POLICY`, err: `found EOF, expected identifier at line 1, char 23`}, @@ -1363,6 +1637,7 @@ func TestParser_ParseStatement(t *testing.T) { {s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 3.14`, err: `number must be an integer at line 1, char 67`}, {s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 0`, err: `invalid value 0: must be 1 <= n <= 2147483647 at line 1, char 67`}, {s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION bad`, err: `found bad, expected number at line 1, char 67`}, + {s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 1 foo`, err: `found foo, expected DEFAULT at line 1, char 69`}, {s: `ALTER`, err: `found EOF, expected RETENTION at line 1, char 7`}, {s: `ALTER RETENTION`, err: `found EOF, expected POLICY at line 1, char 17`}, {s: `ALTER RETENTION POLICY`, err: `found EOF, expected identifier at line 1, char 24`}, @@ -1396,7 +1671,8 @@ func TestParser_ParseStatement(t *testing.T) { if !reflect.DeepEqual(tt.err, errstring(err)) { t.Errorf("%d. %q: error mismatch:\n exp=%s\n got=%s\n\n", i, tt.s, tt.err, err) } else if tt.err == "" && !reflect.DeepEqual(tt.stmt, stmt) { - t.Logf("\nexp=%s\ngot=%s\n", mustMarshalJSON(tt.stmt), mustMarshalJSON(stmt)) + t.Logf("\n# %s\nexp=%s\ngot=%s\n", tt.s, mustMarshalJSON(tt.stmt), mustMarshalJSON(stmt)) + t.Logf("\nSQL exp=%s\nSQL got=%s\n", tt.stmt.String(), stmt.String()) t.Errorf("%d. %q\n\nstmt mismatch:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.s, tt.stmt, stmt) } } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go index a9a8cd561..b6a749ccf 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go @@ -3,8 +3,8 @@ package influxql import ( "encoding/json" "errors" - "hash/fnv" - "sort" + + "github.com/influxdb/influxdb/models" ) // TagSet is a fundamental concept within the query system. It represents a composite series, @@ -22,66 +22,13 @@ func (t *TagSet) AddFilter(key string, filter Expr) { t.Filters = append(t.Filters, filter) } -// Row represents a single row returned from the execution of a statement. -type Row struct { - Name string `json:"name,omitempty"` - Tags map[string]string `json:"tags,omitempty"` - Columns []string `json:"columns,omitempty"` - Values [][]interface{} `json:"values,omitempty"` - Err error `json:"err,omitempty"` -} - -// SameSeries returns true if r contains values for the same series as o. -func (r *Row) SameSeries(o *Row) bool { - return r.tagsHash() == o.tagsHash() && r.Name == o.Name -} - -// tagsHash returns a hash of tag key/value pairs. -func (r *Row) tagsHash() uint64 { - h := fnv.New64a() - keys := r.tagsKeys() - for _, k := range keys { - h.Write([]byte(k)) - h.Write([]byte(r.Tags[k])) - } - return h.Sum64() -} - -// tagKeys returns a sorted list of tag keys. -func (r *Row) tagsKeys() []string { - a := make([]string, 0, len(r.Tags)) - for k := range r.Tags { - a = append(a, k) - } - sort.Strings(a) - return a -} - // Rows represents a list of rows that can be sorted consistently by name/tag. -type Rows []*Row - -func (p Rows) Len() int { return len(p) } - -func (p Rows) Less(i, j int) bool { - // Sort by name first. - if p[i].Name != p[j].Name { - return p[i].Name < p[j].Name - } - - // Sort by tag set hash. Tags don't have a meaningful sort order so we - // just compute a hash and sort by that instead. This allows the tests - // to receive rows in a predictable order every time. - return p[i].tagsHash() < p[j].tagsHash() -} - -func (p Rows) Swap(i, j int) { p[i], p[j] = p[j], p[i] } - // Result represents a resultset returned from a single statement. type Result struct { // StatementID is just the statement's position in the query. It's used // to combine statement results if they're being buffered in memory. StatementID int `json:"-"` - Series Rows + Series models.Rows Err error } @@ -89,8 +36,8 @@ type Result struct { func (r *Result) MarshalJSON() ([]byte, error) { // Define a struct that outputs "error" as a string. var o struct { - Series []*Row `json:"series,omitempty"` - Err string `json:"error,omitempty"` + Series []*models.Row `json:"series,omitempty"` + Err string `json:"error,omitempty"` } // Copy fields to output struct. @@ -105,8 +52,8 @@ func (r *Result) MarshalJSON() ([]byte, error) { // UnmarshalJSON decodes the data into the Result struct func (r *Result) UnmarshalJSON(b []byte) error { var o struct { - Series []*Row `json:"series,omitempty"` - Err string `json:"error,omitempty"` + Series []*models.Row `json:"series,omitempty"` + Err string `json:"error,omitempty"` } err := json.Unmarshal(b, &o) diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go index c6dab019c..d071c8571 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go @@ -95,6 +95,8 @@ func (s *Scanner) Scan() (tok Token, pos Pos, lit string) { return COMMA, pos, "" case ';': return SEMICOLON, pos, "" + case ':': + return COLON, pos, "" } return ILLEGAL, pos, string(ch0) diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go index 4a0124d53..277848ced 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go @@ -136,8 +136,10 @@ func TestScanner_Scan(t *testing.T) { {s: `KEYS`, tok: influxql.KEYS}, {s: `LIMIT`, tok: influxql.LIMIT}, {s: `SHOW`, tok: influxql.SHOW}, + {s: `SHARDS`, tok: influxql.SHARDS}, {s: `MEASUREMENT`, tok: influxql.MEASUREMENT}, {s: `MEASUREMENTS`, tok: influxql.MEASUREMENTS}, + {s: `NOT`, tok: influxql.NOT}, {s: `OFFSET`, tok: influxql.OFFSET}, {s: `ON`, tok: influxql.ON}, {s: `ORDER`, tok: influxql.ORDER}, @@ -152,6 +154,8 @@ func TestScanner_Scan(t *testing.T) { {s: `REVOKE`, tok: influxql.REVOKE}, {s: `SELECT`, tok: influxql.SELECT}, {s: `SERIES`, tok: influxql.SERIES}, + {s: `SERVER`, tok: influxql.SERVER}, + {s: `SERVERS`, tok: influxql.SERVERS}, {s: `TAG`, tok: influxql.TAG}, {s: `TO`, tok: influxql.TO}, {s: `USER`, tok: influxql.USER}, diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go index 0eb5b7a9a..fe521f4eb 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go @@ -50,6 +50,7 @@ const ( LPAREN // ( RPAREN // ) COMMA // , + COLON // : SEMICOLON // ; DOT // . @@ -76,6 +77,7 @@ const ( EXPLAIN FIELD FOR + FORCE FROM GRANT GRANTS @@ -91,6 +93,7 @@ const ( LIMIT MEASUREMENT MEASUREMENTS + NOT OFFSET ON ORDER @@ -106,9 +109,11 @@ const ( REVOKE SELECT SERIES + SERVER SERVERS SET SHOW + SHARDS SLIMIT STATS DIAGNOSTICS @@ -159,6 +164,7 @@ var tokens = [...]string{ LPAREN: "(", RPAREN: ")", COMMA: ",", + COLON: ":", SEMICOLON: ";", DOT: ".", @@ -183,6 +189,7 @@ var tokens = [...]string{ EXPLAIN: "EXPLAIN", FIELD: "FIELD", FOR: "FOR", + FORCE: "FORCE", FROM: "FROM", GRANT: "GRANT", GRANTS: "GRANTS", @@ -198,6 +205,7 @@ var tokens = [...]string{ LIMIT: "LIMIT", MEASUREMENT: "MEASUREMENT", MEASUREMENTS: "MEASUREMENTS", + NOT: "NOT", OFFSET: "OFFSET", ON: "ON", ORDER: "ORDER", @@ -213,9 +221,11 @@ var tokens = [...]string{ REVOKE: "REVOKE", SELECT: "SELECT", SERIES: "SERIES", + SERVER: "SERVER", SERVERS: "SERVERS", SET: "SET", SHOW: "SHOW", + SHARDS: "SHARDS", SLIMIT: "SLIMIT", SOFFSET: "SOFFSET", STATS: "STATS", diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go new file mode 100644 index 000000000..58455515a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go @@ -0,0 +1,45 @@ +package influxdb + +import ( + "expvar" + "sync" +) + +var expvarMu sync.Mutex + +// NewStatistics returns an expvar-based map with the given key. Within that map +// is another map. Within there "name" is the Measurement name, "tags" are the tags, +// and values are placed at the key "values". +func NewStatistics(key, name string, tags map[string]string) *expvar.Map { + expvarMu.Lock() + defer expvarMu.Unlock() + + // Add expvar for this service. + var v expvar.Var + if v = expvar.Get(key); v == nil { + v = expvar.NewMap(key) + } + m := v.(*expvar.Map) + + // Set the name + nameVar := &expvar.String{} + nameVar.Set(name) + m.Set("name", nameVar) + + // Set the tags + tagsVar := &expvar.Map{} + tagsVar.Init() + for k, v := range tags { + value := &expvar.String{} + value.Set(v) + tagsVar.Set(k, value) + } + m.Set("tags", tagsVar) + + // Create and set the values entry used for actual stats. + statMap := &expvar.Map{} + statMap.Init() + m.Set("values", statMap) + + return statMap +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go index 2b9168901..9257e61cb 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go @@ -74,14 +74,71 @@ func (data *Data) CreateNode(host string) error { } // DeleteNode removes a node from the metadata. -func (data *Data) DeleteNode(id uint64) error { - for i := range data.Nodes { - if data.Nodes[i].ID == id { - data.Nodes = append(data.Nodes[:i], data.Nodes[i+1:]...) - return nil +func (data *Data) DeleteNode(id uint64, force bool) error { + // Node has to be larger than 0 to be real + if id == 0 { + return ErrNodeIDRequired + } + // Is this a valid node? + nodeInfo := data.Node(id) + if nodeInfo == nil { + return ErrNodeNotFound + } + + // Am I the only node? If so, nothing to do + if len(data.Nodes) == 1 { + return ErrNodeUnableToDropFinalNode + } + + // Determine if there are any any non-replicated nodes and force was not specified + if !force { + for _, d := range data.Databases { + for _, rp := range d.RetentionPolicies { + // ignore replicated retention policies + if rp.ReplicaN > 1 { + continue + } + for _, sg := range rp.ShardGroups { + for _, s := range sg.Shards { + if s.OwnedBy(id) && len(s.Owners) == 1 { + return ErrShardNotReplicated + } + } + } + } } } - return ErrNodeNotFound + + // Remove node id from all shard infos + for di, d := range data.Databases { + for ri, rp := range d.RetentionPolicies { + for sgi, sg := range rp.ShardGroups { + for si, s := range sg.Shards { + if s.OwnedBy(id) { + var owners []ShardOwner + for _, o := range s.Owners { + if o.NodeID != id { + owners = append(owners, o) + } + } + data.Databases[di].RetentionPolicies[ri].ShardGroups[sgi].Shards[si].Owners = owners + } + } + } + } + } + + // Remove this node from the in memory nodes + var nodes []NodeInfo + for _, n := range data.Nodes { + if n.ID == id { + continue + } + nodes = append(nodes, n) + } + data.Nodes = nodes + + return nil } // Database returns a database by name. @@ -132,7 +189,7 @@ func (data *Data) RetentionPolicy(database, name string) (*RetentionPolicyInfo, return &di.RetentionPolicies[i], nil } } - return nil, ErrRetentionPolicyNotFound + return nil, nil } // CreateRetentionPolicy creates a new retention policy on a database. @@ -172,6 +229,11 @@ func (data *Data) DropRetentionPolicy(database, name string) error { return ErrDatabaseNotFound } + // Prohibit dropping the default retention policy. + if di.DefaultRetentionPolicy == name { + return ErrRetentionPolicyDefault + } + // Remove from list. for i := range di.RetentionPolicies { if di.RetentionPolicies[i].Name == name { @@ -273,7 +335,6 @@ func (data *Data) ShardGroupsByTimeRange(database, policy string, tmin, tmax tim } groups = append(groups, g) } - sort.Sort(ShardGroupInfos(groups)) return groups, nil } @@ -344,13 +405,16 @@ func (data *Data) CreateShardGroup(database, policy string, timestamp time.Time) si := &sgi.Shards[i] for j := 0; j < replicaN; j++ { nodeID := data.Nodes[nodeIndex%len(data.Nodes)].ID - si.OwnerIDs = append(si.OwnerIDs, nodeID) + si.Owners = append(si.Owners, ShardOwner{NodeID: nodeID}) nodeIndex++ } } - // Retention policy has a new shard group, so update the policy. + // Retention policy has a new shard group, so update the policy. Shard + // Groups must be stored in sorted order, as other parts of the system + // assume this to be the case. rpi.ShardGroups = append(rpi.ShardGroups, sgi) + sort.Sort(ShardGroupInfos(rpi.ShardGroups)) return nil } @@ -662,6 +726,31 @@ func (di DatabaseInfo) RetentionPolicy(name string) *RetentionPolicyInfo { return nil } +// ShardInfos returns a list of all shards' info for the database. +func (di DatabaseInfo) ShardInfos() []ShardInfo { + shards := map[uint64]*ShardInfo{} + for i := range di.RetentionPolicies { + for j := range di.RetentionPolicies[i].ShardGroups { + sg := di.RetentionPolicies[i].ShardGroups[j] + // Skip deleted shard groups + if sg.Deleted() { + continue + } + for k := range sg.Shards { + si := &di.RetentionPolicies[i].ShardGroups[j].Shards[k] + shards[si.ID] = si + } + } + } + + infos := make([]ShardInfo, 0, len(shards)) + for _, info := range shards { + infos = append(infos, *info) + } + + return infos +} + // clone returns a deep copy of di. func (di DatabaseInfo) clone() DatabaseInfo { other := di @@ -917,14 +1006,14 @@ func (sgi *ShardGroupInfo) unmarshal(pb *internal.ShardGroupInfo) { // ShardInfo represents metadata about a shard. type ShardInfo struct { - ID uint64 - OwnerIDs []uint64 + ID uint64 + Owners []ShardOwner } // OwnedBy returns whether the shard's owner IDs includes nodeID. func (si ShardInfo) OwnedBy(nodeID uint64) bool { - for _, id := range si.OwnerIDs { - if id == nodeID { + for _, so := range si.Owners { + if so.NodeID == nodeID { return true } } @@ -935,9 +1024,11 @@ func (si ShardInfo) OwnedBy(nodeID uint64) bool { func (si ShardInfo) clone() ShardInfo { other := si - if si.OwnerIDs != nil { - other.OwnerIDs = make([]uint64, len(si.OwnerIDs)) - copy(other.OwnerIDs, si.OwnerIDs) + if si.Owners != nil { + other.Owners = make([]ShardOwner, len(si.Owners)) + for i := range si.Owners { + other.Owners[i] = si.Owners[i].clone() + } } return other @@ -949,17 +1040,64 @@ func (si ShardInfo) marshal() *internal.ShardInfo { ID: proto.Uint64(si.ID), } - pb.OwnerIDs = make([]uint64, len(si.OwnerIDs)) - copy(pb.OwnerIDs, si.OwnerIDs) + pb.Owners = make([]*internal.ShardOwner, len(si.Owners)) + for i := range si.Owners { + pb.Owners[i] = si.Owners[i].marshal() + } return pb } +// UnmarshalBinary decodes the object from a binary format. +func (si *ShardInfo) UnmarshalBinary(buf []byte) error { + var pb internal.ShardInfo + if err := proto.Unmarshal(buf, &pb); err != nil { + return err + } + si.unmarshal(&pb) + return nil +} + // unmarshal deserializes from a protobuf representation. func (si *ShardInfo) unmarshal(pb *internal.ShardInfo) { si.ID = pb.GetID() - si.OwnerIDs = make([]uint64, len(pb.GetOwnerIDs())) - copy(si.OwnerIDs, pb.GetOwnerIDs()) + + // If deprecated "OwnerIDs" exists then convert it to "Owners" format. + if len(pb.GetOwnerIDs()) > 0 { + si.Owners = make([]ShardOwner, len(pb.GetOwnerIDs())) + for i, x := range pb.GetOwnerIDs() { + si.Owners[i].unmarshal(&internal.ShardOwner{ + NodeID: proto.Uint64(x), + }) + } + } else if len(pb.GetOwners()) > 0 { + si.Owners = make([]ShardOwner, len(pb.GetOwners())) + for i, x := range pb.GetOwners() { + si.Owners[i].unmarshal(x) + } + } +} + +// ShardOwner represents a node that owns a shard. +type ShardOwner struct { + NodeID uint64 +} + +// clone returns a deep copy of so. +func (so ShardOwner) clone() ShardOwner { + return so +} + +// marshal serializes to a protobuf representation. +func (so ShardOwner) marshal() *internal.ShardOwner { + return &internal.ShardOwner{ + NodeID: proto.Uint64(so.NodeID), + } +} + +// unmarshal deserializes from a protobuf representation. +func (so *ShardOwner) unmarshal(pb *internal.ShardOwner) { + so.NodeID = pb.GetNodeID() } // ContinuousQueryInfo represents metadata about a continuous query. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go index 6e0314c76..8b7fcc6ab 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go @@ -9,8 +9,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" + "github.com/gogo/protobuf/proto" "github.com/influxdb/influxdb/influxql" "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/meta/internal" ) // Ensure a node can be created. @@ -24,7 +26,7 @@ func TestData_CreateNode(t *testing.T) { } // Ensure a node can be removed. -func TestData_DeleteNode(t *testing.T) { +func TestData_DeleteNode_Basic(t *testing.T) { var data meta.Data if err := data.CreateNode("host0"); err != nil { t.Fatal(err) @@ -34,7 +36,7 @@ func TestData_DeleteNode(t *testing.T) { t.Fatal(err) } - if err := data.DeleteNode(1); err != nil { + if err := data.DeleteNode(1, false); err != nil { t.Fatal(err) } else if len(data.Nodes) != 2 { t.Fatalf("unexpected node count: %d", len(data.Nodes)) @@ -45,6 +47,49 @@ func TestData_DeleteNode(t *testing.T) { } } +// Ensure a node can be removed with shard info in play +func TestData_DeleteNode_Shards(t *testing.T) { + var data meta.Data + if err := data.CreateNode("host0"); err != nil { + t.Fatal(err) + } else if err = data.CreateNode("host1"); err != nil { + t.Fatal(err) + } else if err := data.CreateNode("host2"); err != nil { + t.Fatal(err) + } else if err := data.CreateNode("host3"); err != nil { + t.Fatal(err) + } + + if err := data.CreateDatabase("mydb"); err != nil { + t.Fatal(err) + } + + rpi := &meta.RetentionPolicyInfo{ + Name: "myrp", + ReplicaN: 3, + } + if err := data.CreateRetentionPolicy("mydb", rpi); err != nil { + t.Fatal(err) + } + if err := data.CreateShardGroup("mydb", "myrp", time.Now()); err != nil { + t.Fatal(err) + } + if len(data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners) != 3 { + t.Fatal("wrong number of shard owners") + } + if err := data.DeleteNode(2, false); err != nil { + t.Fatal(err) + } + if got, exp := len(data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners), 2; exp != got { + t.Fatalf("wrong number of shard owners, got %d, exp %d", got, exp) + } + for _, s := range data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards { + if s.OwnedBy(2) { + t.Fatal("shard still owned by delted node") + } + } +} + // Ensure a database can be created. func TestData_CreateDatabase(t *testing.T) { var data meta.Data @@ -299,7 +344,13 @@ func TestData_CreateShardGroup(t *testing.T) { StartTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC), EndTime: time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC), Shards: []meta.ShardInfo{ - {ID: 1, OwnerIDs: []uint64{1, 2}}, + { + ID: 1, + Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + }, + }, }, }) { t.Fatalf("unexpected shard group: %#v", sgi) @@ -570,8 +621,12 @@ func TestData_Clone(t *testing.T) { EndTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC), Shards: []meta.ShardInfo{ { - ID: 200, - OwnerIDs: []uint64{1, 3, 4}, + ID: 200, + Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 3}, + {NodeID: 4}, + }, }, }, }, @@ -605,8 +660,8 @@ func TestData_Clone(t *testing.T) { } // Ensure that changing data in the clone does not affect the original. - other.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].OwnerIDs[1] = 9 - if v := data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].OwnerIDs[1]; v != 3 { + other.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners[1].NodeID = 9 + if v := data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners[1].NodeID; v != 3 { t.Fatalf("editing clone changed original: %v", v) } } @@ -637,8 +692,12 @@ func TestData_MarshalBinary(t *testing.T) { EndTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC), Shards: []meta.ShardInfo{ { - ID: 200, - OwnerIDs: []uint64{1, 3, 4}, + ID: 200, + Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 3}, + {NodeID: 4}, + }, }, }, }, @@ -682,3 +741,33 @@ func TestData_MarshalBinary(t *testing.T) { t.Fatalf("unexpected users: %#v", other.Users) } } + +// Ensure shards with deprecated "OwnerIDs" can be decoded. +func TestShardInfo_UnmarshalBinary_OwnerIDs(t *testing.T) { + // Encode deprecated form to bytes. + buf, err := proto.Marshal(&internal.ShardInfo{ + ID: proto.Uint64(1), + OwnerIDs: []uint64{10, 20, 30}, + }) + if err != nil { + t.Fatal(err) + } + + // Decode deprecated form. + var si meta.ShardInfo + if err := si.UnmarshalBinary(buf); err != nil { + t.Fatal(err) + } + + // Verify data is migrated correctly. + if !reflect.DeepEqual(si, meta.ShardInfo{ + ID: 1, + Owners: []meta.ShardOwner{ + {NodeID: 10}, + {NodeID: 20}, + {NodeID: 30}, + }, + }) { + t.Fatalf("unexpected shard info: %s", spew.Sdump(si)) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go index 44c54f964..213b102f4 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go @@ -7,102 +7,114 @@ import ( var ( // ErrStoreOpen is returned when opening an already open store. - ErrStoreOpen = errors.New("store already open") + ErrStoreOpen = newError("store already open") // ErrStoreClosed is returned when closing an already closed store. - ErrStoreClosed = errors.New("raft store already closed") + ErrStoreClosed = newError("raft store already closed") // ErrTooManyPeers is returned when more than 3 peers are used. - ErrTooManyPeers = errors.New("too many peers; influxdb v0.9.0 is limited to 3 nodes in a cluster") + ErrTooManyPeers = newError("too many peers; influxdb v0.9.0 is limited to 3 nodes in a cluster") ) var ( // ErrNodeExists is returned when creating an already existing node. - ErrNodeExists = errors.New("node already exists") + ErrNodeExists = newError("node already exists") // ErrNodeNotFound is returned when mutating a node that doesn't exist. - ErrNodeNotFound = errors.New("node not found") + ErrNodeNotFound = newError("node not found") // ErrNodesRequired is returned when at least one node is required for an operation. // This occurs when creating a shard group. - ErrNodesRequired = errors.New("at least one node required") + ErrNodesRequired = newError("at least one node required") + + // ErrNodeIDRequired is returned when using a zero node id. + ErrNodeIDRequired = newError("node id must be greater than 0") + + // ErrNodeUnableToDropSingleNode is returned if the node being dropped is the last + // node in the cluster + ErrNodeUnableToDropFinalNode = newError("unable to drop the final node in a cluster") + + // ErrNodeRaft is returned when attempting an operation prohibted for a Raft-node. + ErrNodeRaft = newError("node is a Raft node") ) var ( // ErrDatabaseExists is returned when creating an already existing database. - ErrDatabaseExists = errors.New("database already exists") + ErrDatabaseExists = newError("database already exists") // ErrDatabaseNotFound is returned when mutating a database that doesn't exist. - ErrDatabaseNotFound = errors.New("database not found") + ErrDatabaseNotFound = newError("database not found") // ErrDatabaseNameRequired is returned when creating a database without a name. - ErrDatabaseNameRequired = errors.New("database name required") + ErrDatabaseNameRequired = newError("database name required") ) var ( // ErrRetentionPolicyExists is returned when creating an already existing policy. - ErrRetentionPolicyExists = errors.New("retention policy already exists") + ErrRetentionPolicyExists = newError("retention policy already exists") + + // ErrRetentionPolicyDefault is returned when attempting a prohibited operation + // on a default retention policy. + ErrRetentionPolicyDefault = newError("retention policy is default") // ErrRetentionPolicyNotFound is returned when mutating a policy that doesn't exist. - ErrRetentionPolicyNotFound = errors.New("retention policy not found") + ErrRetentionPolicyNotFound = newError("retention policy not found") // ErrRetentionPolicyNameRequired is returned when creating a policy without a name. - ErrRetentionPolicyNameRequired = errors.New("retention policy name required") + ErrRetentionPolicyNameRequired = newError("retention policy name required") // ErrRetentionPolicyNameExists is returned when renaming a policy to // the same name as another existing policy. - ErrRetentionPolicyNameExists = errors.New("retention policy name already exists") + ErrRetentionPolicyNameExists = newError("retention policy name already exists") // ErrRetentionPolicyDurationTooLow is returned when updating a retention // policy that has a duration lower than the allowed minimum. - ErrRetentionPolicyDurationTooLow = errors.New(fmt.Sprintf("retention policy duration must be at least %s", + ErrRetentionPolicyDurationTooLow = newError(fmt.Sprintf("retention policy duration must be at least %s", RetentionPolicyMinDuration)) // ErrReplicationFactorTooLow is returned when the replication factor is not in an // acceptable range. - ErrReplicationFactorTooLow = errors.New("replication factor must be greater than 0") + ErrReplicationFactorTooLow = newError("replication factor must be greater than 0") ) var ( // ErrShardGroupExists is returned when creating an already existing shard group. - ErrShardGroupExists = errors.New("shard group already exists") + ErrShardGroupExists = newError("shard group already exists") // ErrShardGroupNotFound is returned when mutating a shard group that doesn't exist. - ErrShardGroupNotFound = errors.New("shard group not found") + ErrShardGroupNotFound = newError("shard group not found") + + // ErrShardNotReplicated is returned if the node requested to be dropped has + // the last copy of a shard present and the force keyword was not used + ErrShardNotReplicated = newError("shard not replicated") ) var ( // ErrContinuousQueryExists is returned when creating an already existing continuous query. - ErrContinuousQueryExists = errors.New("continuous query already exists") + ErrContinuousQueryExists = newError("continuous query already exists") // ErrContinuousQueryNotFound is returned when removing a continuous query that doesn't exist. - ErrContinuousQueryNotFound = errors.New("continuous query not found") + ErrContinuousQueryNotFound = newError("continuous query not found") ) var ( // ErrUserExists is returned when creating an already existing user. - ErrUserExists = errors.New("user already exists") + ErrUserExists = newError("user already exists") // ErrUserNotFound is returned when mutating a user that doesn't exist. - ErrUserNotFound = errors.New("user not found") + ErrUserNotFound = newError("user not found") // ErrUsernameRequired is returned when creating a user without a username. - ErrUsernameRequired = errors.New("username required") + ErrUsernameRequired = newError("username required") ) -var errs = [...]error{ - ErrStoreOpen, ErrStoreClosed, - ErrNodeExists, ErrNodeNotFound, - ErrDatabaseExists, ErrDatabaseNotFound, ErrDatabaseNameRequired, -} - // errLookup stores a mapping of error strings to well defined error types. var errLookup = make(map[string]error) -func init() { - for _, err := range errs { - errLookup[err.Error()] = err - } +func newError(msg string) error { + err := errors.New(msg) + errLookup[err.Error()] = err + return err } // lookupError returns a known error reference, if one exists. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go index fbd8cc504..285ccb2e4 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go @@ -15,6 +15,7 @@ It has these top-level messages: RetentionPolicyInfo ShardGroupInfo ShardInfo + ShardOwner ContinuousQueryInfo UserInfo UserPrivilege @@ -49,10 +50,12 @@ It has these top-level messages: package internal import proto "github.com/gogo/protobuf/proto" +import fmt "fmt" import math "math" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal +var _ = fmt.Errorf var _ = math.Inf type RPCType int32 @@ -176,15 +179,15 @@ func (x *Command_Type) UnmarshalJSON(data []byte) error { } type Data struct { - Term *uint64 `protobuf:"varint,1,req" json:"Term,omitempty"` - Index *uint64 `protobuf:"varint,2,req" json:"Index,omitempty"` - ClusterID *uint64 `protobuf:"varint,3,req" json:"ClusterID,omitempty"` - Nodes []*NodeInfo `protobuf:"bytes,4,rep" json:"Nodes,omitempty"` - Databases []*DatabaseInfo `protobuf:"bytes,5,rep" json:"Databases,omitempty"` - Users []*UserInfo `protobuf:"bytes,6,rep" json:"Users,omitempty"` - MaxNodeID *uint64 `protobuf:"varint,7,req" json:"MaxNodeID,omitempty"` - MaxShardGroupID *uint64 `protobuf:"varint,8,req" json:"MaxShardGroupID,omitempty"` - MaxShardID *uint64 `protobuf:"varint,9,req" json:"MaxShardID,omitempty"` + Term *uint64 `protobuf:"varint,1,req,name=Term" json:"Term,omitempty"` + Index *uint64 `protobuf:"varint,2,req,name=Index" json:"Index,omitempty"` + ClusterID *uint64 `protobuf:"varint,3,req,name=ClusterID" json:"ClusterID,omitempty"` + Nodes []*NodeInfo `protobuf:"bytes,4,rep,name=Nodes" json:"Nodes,omitempty"` + Databases []*DatabaseInfo `protobuf:"bytes,5,rep,name=Databases" json:"Databases,omitempty"` + Users []*UserInfo `protobuf:"bytes,6,rep,name=Users" json:"Users,omitempty"` + MaxNodeID *uint64 `protobuf:"varint,7,req,name=MaxNodeID" json:"MaxNodeID,omitempty"` + MaxShardGroupID *uint64 `protobuf:"varint,8,req,name=MaxShardGroupID" json:"MaxShardGroupID,omitempty"` + MaxShardID *uint64 `protobuf:"varint,9,req,name=MaxShardID" json:"MaxShardID,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -256,8 +259,8 @@ func (m *Data) GetMaxShardID() uint64 { } type NodeInfo struct { - ID *uint64 `protobuf:"varint,1,req" json:"ID,omitempty"` - Host *string `protobuf:"bytes,2,req" json:"Host,omitempty"` + ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` + Host *string `protobuf:"bytes,2,req,name=Host" json:"Host,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -280,10 +283,10 @@ func (m *NodeInfo) GetHost() string { } type DatabaseInfo struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - DefaultRetentionPolicy *string `protobuf:"bytes,2,req" json:"DefaultRetentionPolicy,omitempty"` - RetentionPolicies []*RetentionPolicyInfo `protobuf:"bytes,3,rep" json:"RetentionPolicies,omitempty"` - ContinuousQueries []*ContinuousQueryInfo `protobuf:"bytes,4,rep" json:"ContinuousQueries,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + DefaultRetentionPolicy *string `protobuf:"bytes,2,req,name=DefaultRetentionPolicy" json:"DefaultRetentionPolicy,omitempty"` + RetentionPolicies []*RetentionPolicyInfo `protobuf:"bytes,3,rep,name=RetentionPolicies" json:"RetentionPolicies,omitempty"` + ContinuousQueries []*ContinuousQueryInfo `protobuf:"bytes,4,rep,name=ContinuousQueries" json:"ContinuousQueries,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -320,11 +323,11 @@ func (m *DatabaseInfo) GetContinuousQueries() []*ContinuousQueryInfo { } type RetentionPolicyInfo struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - Duration *int64 `protobuf:"varint,2,req" json:"Duration,omitempty"` - ShardGroupDuration *int64 `protobuf:"varint,3,req" json:"ShardGroupDuration,omitempty"` - ReplicaN *uint32 `protobuf:"varint,4,req" json:"ReplicaN,omitempty"` - ShardGroups []*ShardGroupInfo `protobuf:"bytes,5,rep" json:"ShardGroups,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + Duration *int64 `protobuf:"varint,2,req,name=Duration" json:"Duration,omitempty"` + ShardGroupDuration *int64 `protobuf:"varint,3,req,name=ShardGroupDuration" json:"ShardGroupDuration,omitempty"` + ReplicaN *uint32 `protobuf:"varint,4,req,name=ReplicaN" json:"ReplicaN,omitempty"` + ShardGroups []*ShardGroupInfo `protobuf:"bytes,5,rep,name=ShardGroups" json:"ShardGroups,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -368,11 +371,11 @@ func (m *RetentionPolicyInfo) GetShardGroups() []*ShardGroupInfo { } type ShardGroupInfo struct { - ID *uint64 `protobuf:"varint,1,req" json:"ID,omitempty"` - StartTime *int64 `protobuf:"varint,2,req" json:"StartTime,omitempty"` - EndTime *int64 `protobuf:"varint,3,req" json:"EndTime,omitempty"` - DeletedAt *int64 `protobuf:"varint,4,req" json:"DeletedAt,omitempty"` - Shards []*ShardInfo `protobuf:"bytes,5,rep" json:"Shards,omitempty"` + ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` + StartTime *int64 `protobuf:"varint,2,req,name=StartTime" json:"StartTime,omitempty"` + EndTime *int64 `protobuf:"varint,3,req,name=EndTime" json:"EndTime,omitempty"` + DeletedAt *int64 `protobuf:"varint,4,req,name=DeletedAt" json:"DeletedAt,omitempty"` + Shards []*ShardInfo `protobuf:"bytes,5,rep,name=Shards" json:"Shards,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -416,9 +419,10 @@ func (m *ShardGroupInfo) GetShards() []*ShardInfo { } type ShardInfo struct { - ID *uint64 `protobuf:"varint,1,req" json:"ID,omitempty"` - OwnerIDs []uint64 `protobuf:"varint,2,rep" json:"OwnerIDs,omitempty"` - XXX_unrecognized []byte `json:"-"` + ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` + OwnerIDs []uint64 `protobuf:"varint,2,rep,name=OwnerIDs" json:"OwnerIDs,omitempty"` + Owners []*ShardOwner `protobuf:"bytes,3,rep,name=Owners" json:"Owners,omitempty"` + XXX_unrecognized []byte `json:"-"` } func (m *ShardInfo) Reset() { *m = ShardInfo{} } @@ -439,9 +443,32 @@ func (m *ShardInfo) GetOwnerIDs() []uint64 { return nil } +func (m *ShardInfo) GetOwners() []*ShardOwner { + if m != nil { + return m.Owners + } + return nil +} + +type ShardOwner struct { + NodeID *uint64 `protobuf:"varint,1,req,name=NodeID" json:"NodeID,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *ShardOwner) Reset() { *m = ShardOwner{} } +func (m *ShardOwner) String() string { return proto.CompactTextString(m) } +func (*ShardOwner) ProtoMessage() {} + +func (m *ShardOwner) GetNodeID() uint64 { + if m != nil && m.NodeID != nil { + return *m.NodeID + } + return 0 +} + type ContinuousQueryInfo struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - Query *string `protobuf:"bytes,2,req" json:"Query,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + Query *string `protobuf:"bytes,2,req,name=Query" json:"Query,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -464,10 +491,10 @@ func (m *ContinuousQueryInfo) GetQuery() string { } type UserInfo struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - Hash *string `protobuf:"bytes,2,req" json:"Hash,omitempty"` - Admin *bool `protobuf:"varint,3,req" json:"Admin,omitempty"` - Privileges []*UserPrivilege `protobuf:"bytes,4,rep" json:"Privileges,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + Hash *string `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"` + Admin *bool `protobuf:"varint,3,req,name=Admin" json:"Admin,omitempty"` + Privileges []*UserPrivilege `protobuf:"bytes,4,rep,name=Privileges" json:"Privileges,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -504,8 +531,8 @@ func (m *UserInfo) GetPrivileges() []*UserPrivilege { } type UserPrivilege struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Privilege *int32 `protobuf:"varint,2,req" json:"Privilege,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Privilege *int32 `protobuf:"varint,2,req,name=Privilege" json:"Privilege,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -559,8 +586,8 @@ func (m *Command) GetType() Command_Type { } type CreateNodeCommand struct { - Host *string `protobuf:"bytes,1,req" json:"Host,omitempty"` - Rand *uint64 `protobuf:"varint,2,req" json:"Rand,omitempty"` + Host *string `protobuf:"bytes,1,req,name=Host" json:"Host,omitempty"` + Rand *uint64 `protobuf:"varint,2,req,name=Rand" json:"Rand,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -591,7 +618,8 @@ var E_CreateNodeCommand_Command = &proto.ExtensionDesc{ } type DeleteNodeCommand struct { - ID *uint64 `protobuf:"varint,1,req" json:"ID,omitempty"` + ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` + Force *bool `protobuf:"varint,2,req,name=Force" json:"Force,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -606,6 +634,13 @@ func (m *DeleteNodeCommand) GetID() uint64 { return 0 } +func (m *DeleteNodeCommand) GetForce() bool { + if m != nil && m.Force != nil { + return *m.Force + } + return false +} + var E_DeleteNodeCommand_Command = &proto.ExtensionDesc{ ExtendedType: (*Command)(nil), ExtensionType: (*DeleteNodeCommand)(nil), @@ -615,7 +650,7 @@ var E_DeleteNodeCommand_Command = &proto.ExtensionDesc{ } type CreateDatabaseCommand struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -639,7 +674,7 @@ var E_CreateDatabaseCommand_Command = &proto.ExtensionDesc{ } type DropDatabaseCommand struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -663,8 +698,8 @@ var E_DropDatabaseCommand_Command = &proto.ExtensionDesc{ } type CreateRetentionPolicyCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - RetentionPolicy *RetentionPolicyInfo `protobuf:"bytes,2,req" json:"RetentionPolicy,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + RetentionPolicy *RetentionPolicyInfo `protobuf:"bytes,2,req,name=RetentionPolicy" json:"RetentionPolicy,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -695,8 +730,8 @@ var E_CreateRetentionPolicyCommand_Command = &proto.ExtensionDesc{ } type DropRetentionPolicyCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Name *string `protobuf:"bytes,2,req" json:"Name,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Name *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -727,8 +762,8 @@ var E_DropRetentionPolicyCommand_Command = &proto.ExtensionDesc{ } type SetDefaultRetentionPolicyCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Name *string `protobuf:"bytes,2,req" json:"Name,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Name *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -759,11 +794,11 @@ var E_SetDefaultRetentionPolicyCommand_Command = &proto.ExtensionDesc{ } type UpdateRetentionPolicyCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Name *string `protobuf:"bytes,2,req" json:"Name,omitempty"` - NewName *string `protobuf:"bytes,3,opt" json:"NewName,omitempty"` - Duration *int64 `protobuf:"varint,4,opt" json:"Duration,omitempty"` - ReplicaN *uint32 `protobuf:"varint,5,opt" json:"ReplicaN,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Name *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"` + NewName *string `protobuf:"bytes,3,opt,name=NewName" json:"NewName,omitempty"` + Duration *int64 `protobuf:"varint,4,opt,name=Duration" json:"Duration,omitempty"` + ReplicaN *uint32 `protobuf:"varint,5,opt,name=ReplicaN" json:"ReplicaN,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -815,9 +850,9 @@ var E_UpdateRetentionPolicyCommand_Command = &proto.ExtensionDesc{ } type CreateShardGroupCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Policy *string `protobuf:"bytes,2,req" json:"Policy,omitempty"` - Timestamp *int64 `protobuf:"varint,3,req" json:"Timestamp,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Policy *string `protobuf:"bytes,2,req,name=Policy" json:"Policy,omitempty"` + Timestamp *int64 `protobuf:"varint,3,req,name=Timestamp" json:"Timestamp,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -855,9 +890,9 @@ var E_CreateShardGroupCommand_Command = &proto.ExtensionDesc{ } type DeleteShardGroupCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Policy *string `protobuf:"bytes,2,req" json:"Policy,omitempty"` - ShardGroupID *uint64 `protobuf:"varint,3,req" json:"ShardGroupID,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Policy *string `protobuf:"bytes,2,req,name=Policy" json:"Policy,omitempty"` + ShardGroupID *uint64 `protobuf:"varint,3,req,name=ShardGroupID" json:"ShardGroupID,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -895,9 +930,9 @@ var E_DeleteShardGroupCommand_Command = &proto.ExtensionDesc{ } type CreateContinuousQueryCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Name *string `protobuf:"bytes,2,req" json:"Name,omitempty"` - Query *string `protobuf:"bytes,3,req" json:"Query,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Name *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"` + Query *string `protobuf:"bytes,3,req,name=Query" json:"Query,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -935,8 +970,8 @@ var E_CreateContinuousQueryCommand_Command = &proto.ExtensionDesc{ } type DropContinuousQueryCommand struct { - Database *string `protobuf:"bytes,1,req" json:"Database,omitempty"` - Name *string `protobuf:"bytes,2,req" json:"Name,omitempty"` + Database *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"` + Name *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -967,9 +1002,9 @@ var E_DropContinuousQueryCommand_Command = &proto.ExtensionDesc{ } type CreateUserCommand struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - Hash *string `protobuf:"bytes,2,req" json:"Hash,omitempty"` - Admin *bool `protobuf:"varint,3,req" json:"Admin,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + Hash *string `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"` + Admin *bool `protobuf:"varint,3,req,name=Admin" json:"Admin,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1007,7 +1042,7 @@ var E_CreateUserCommand_Command = &proto.ExtensionDesc{ } type DropUserCommand struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1031,8 +1066,8 @@ var E_DropUserCommand_Command = &proto.ExtensionDesc{ } type UpdateUserCommand struct { - Name *string `protobuf:"bytes,1,req" json:"Name,omitempty"` - Hash *string `protobuf:"bytes,2,req" json:"Hash,omitempty"` + Name *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"` + Hash *string `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1063,9 +1098,9 @@ var E_UpdateUserCommand_Command = &proto.ExtensionDesc{ } type SetPrivilegeCommand struct { - Username *string `protobuf:"bytes,1,req" json:"Username,omitempty"` - Database *string `protobuf:"bytes,2,req" json:"Database,omitempty"` - Privilege *int32 `protobuf:"varint,3,req" json:"Privilege,omitempty"` + Username *string `protobuf:"bytes,1,req,name=Username" json:"Username,omitempty"` + Database *string `protobuf:"bytes,2,req,name=Database" json:"Database,omitempty"` + Privilege *int32 `protobuf:"varint,3,req,name=Privilege" json:"Privilege,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1103,7 +1138,7 @@ var E_SetPrivilegeCommand_Command = &proto.ExtensionDesc{ } type SetDataCommand struct { - Data *Data `protobuf:"bytes,1,req" json:"Data,omitempty"` + Data *Data `protobuf:"bytes,1,req,name=Data" json:"Data,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1127,8 +1162,8 @@ var E_SetDataCommand_Command = &proto.ExtensionDesc{ } type SetAdminPrivilegeCommand struct { - Username *string `protobuf:"bytes,1,req" json:"Username,omitempty"` - Admin *bool `protobuf:"varint,2,req" json:"Admin,omitempty"` + Username *string `protobuf:"bytes,1,req,name=Username" json:"Username,omitempty"` + Admin *bool `protobuf:"varint,2,req,name=Admin" json:"Admin,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1159,8 +1194,8 @@ var E_SetAdminPrivilegeCommand_Command = &proto.ExtensionDesc{ } type UpdateNodeCommand struct { - ID *uint64 `protobuf:"varint,1,req" json:"ID,omitempty"` - Host *string `protobuf:"bytes,2,req" json:"Host,omitempty"` + ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` + Host *string `protobuf:"bytes,2,req,name=Host" json:"Host,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1191,9 +1226,9 @@ var E_UpdateNodeCommand_Command = &proto.ExtensionDesc{ } type Response struct { - OK *bool `protobuf:"varint,1,req" json:"OK,omitempty"` - Error *string `protobuf:"bytes,2,opt" json:"Error,omitempty"` - Index *uint64 `protobuf:"varint,3,opt" json:"Index,omitempty"` + OK *bool `protobuf:"varint,1,req,name=OK" json:"OK,omitempty"` + Error *string `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"` + Index *uint64 `protobuf:"varint,3,opt,name=Index" json:"Index,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1223,8 +1258,8 @@ func (m *Response) GetIndex() uint64 { } type ResponseHeader struct { - OK *bool `protobuf:"varint,1,req" json:"OK,omitempty"` - Error *string `protobuf:"bytes,2,opt" json:"Error,omitempty"` + OK *bool `protobuf:"varint,1,req,name=OK" json:"OK,omitempty"` + Error *string `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1247,7 +1282,7 @@ func (m *ResponseHeader) GetError() string { } type ErrorResponse struct { - Header *ResponseHeader `protobuf:"bytes,1,req" json:"Header,omitempty"` + Header *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1263,9 +1298,9 @@ func (m *ErrorResponse) GetHeader() *ResponseHeader { } type FetchDataRequest struct { - Index *uint64 `protobuf:"varint,1,req" json:"Index,omitempty"` - Term *uint64 `protobuf:"varint,2,req" json:"Term,omitempty"` - Blocking *bool `protobuf:"varint,3,opt,def=0" json:"Blocking,omitempty"` + Index *uint64 `protobuf:"varint,1,req,name=Index" json:"Index,omitempty"` + Term *uint64 `protobuf:"varint,2,req,name=Term" json:"Term,omitempty"` + Blocking *bool `protobuf:"varint,3,opt,name=Blocking,def=0" json:"Blocking,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1297,10 +1332,10 @@ func (m *FetchDataRequest) GetBlocking() bool { } type FetchDataResponse struct { - Header *ResponseHeader `protobuf:"bytes,1,req" json:"Header,omitempty"` - Index *uint64 `protobuf:"varint,2,req" json:"Index,omitempty"` - Term *uint64 `protobuf:"varint,3,req" json:"Term,omitempty"` - Data []byte `protobuf:"bytes,4,opt" json:"Data,omitempty"` + Header *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"` + Index *uint64 `protobuf:"varint,2,req,name=Index" json:"Index,omitempty"` + Term *uint64 `protobuf:"varint,3,req,name=Term" json:"Term,omitempty"` + Data []byte `protobuf:"bytes,4,opt,name=Data" json:"Data,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1337,7 +1372,7 @@ func (m *FetchDataResponse) GetData() []byte { } type JoinRequest struct { - Addr *string `protobuf:"bytes,1,req" json:"Addr,omitempty"` + Addr *string `protobuf:"bytes,1,req,name=Addr" json:"Addr,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -1353,14 +1388,14 @@ func (m *JoinRequest) GetAddr() string { } type JoinResponse struct { - Header *ResponseHeader `protobuf:"bytes,1,req" json:"Header,omitempty"` + Header *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"` // Indicates that this node should take part in the raft cluster. - EnableRaft *bool `protobuf:"varint,2,opt" json:"EnableRaft,omitempty"` + EnableRaft *bool `protobuf:"varint,2,opt,name=EnableRaft" json:"EnableRaft,omitempty"` // The addresses of raft peers to use if joining as a raft member. If not joining // as a raft member, these are the nodes running raft. - RaftNodes []string `protobuf:"bytes,3,rep" json:"RaftNodes,omitempty"` + RaftNodes []string `protobuf:"bytes,3,rep,name=RaftNodes" json:"RaftNodes,omitempty"` // The node ID assigned to the requesting node. - NodeID *uint64 `protobuf:"varint,4,opt" json:"NodeID,omitempty"` + NodeID *uint64 `protobuf:"varint,4,opt,name=NodeID" json:"NodeID,omitempty"` XXX_unrecognized []byte `json:"-"` } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto index 2aa50244b..1dc1d76fd 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto @@ -49,8 +49,13 @@ message ShardGroupInfo { } message ShardInfo { - required uint64 ID = 1; - repeated uint64 OwnerIDs = 2; + required uint64 ID = 1; + repeated uint64 OwnerIDs = 2 [deprecated=true]; + repeated ShardOwner Owners = 3; +} + +message ShardOwner { + required uint64 NodeID = 1; } message ContinuousQueryInfo { @@ -118,6 +123,7 @@ message DeleteNodeCommand { optional DeleteNodeCommand command = 102; } required uint64 ID = 1; + required bool Force = 2; } message CreateDatabaseCommand { diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go index 3f60c6bd0..40f3540af 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go @@ -122,7 +122,7 @@ func TestRPCFetchDataMatchesBlocking(t *testing.T) { // Simulate the rmote index changing and unblocking fs.mu.Lock() - fs.md.Index = 100 + fs.md = &Data{Index: 100} fs.mu.Unlock() close(fs.blockChan) wg.Wait() diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go index 08207a1b2..af4432006 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go @@ -1,17 +1,24 @@ package meta import ( + "bytes" "fmt" + "strconv" + "time" "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/models" ) // StatementExecutor translates InfluxQL queries to meta store methods. type StatementExecutor struct { Store interface { + Node(id uint64) (ni *NodeInfo, err error) Nodes() ([]NodeInfo, error) Peers() ([]string, error) + Leader() string + DeleteNode(nodeID uint64, force bool) error Database(name string) (*DatabaseInfo, error) Databases() ([]DatabaseInfo, error) CreateDatabase(name string) (*DatabaseInfo, error) @@ -80,8 +87,12 @@ func (e *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql. return e.executeDropContinuousQueryStatement(stmt) case *influxql.ShowContinuousQueriesStatement: return e.executeShowContinuousQueriesStatement(stmt) + case *influxql.ShowShardsStatement: + return e.executeShowShardsStatement(stmt) case *influxql.ShowStatsStatement: return e.executeShowStatsStatement(stmt) + case *influxql.DropServerStatement: + return e.executeDropServerStatement(stmt) default: panic(fmt.Sprintf("unsupported statement type: %T", stmt)) } @@ -89,6 +100,9 @@ func (e *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql. func (e *StatementExecutor) executeCreateDatabaseStatement(q *influxql.CreateDatabaseStatement) *influxql.Result { _, err := e.Store.CreateDatabase(q.Name) + if err == ErrDatabaseExists && q.IfNotExists { + err = nil + } return &influxql.Result{Err: err} } @@ -102,11 +116,11 @@ func (e *StatementExecutor) executeShowDatabasesStatement(q *influxql.ShowDataba return &influxql.Result{Err: err} } - row := &influxql.Row{Name: "databases", Columns: []string{"name"}} + row := &models.Row{Name: "databases", Columns: []string{"name"}} for _, di := range dis { row.Values = append(row.Values, []interface{}{di.Name}) } - return &influxql.Result{Series: []*influxql.Row{row}} + return &influxql.Result{Series: []*models.Row{row}} } func (e *StatementExecutor) executeShowGrantsForUserStatement(q *influxql.ShowGrantsForUserStatement) *influxql.Result { @@ -115,11 +129,11 @@ func (e *StatementExecutor) executeShowGrantsForUserStatement(q *influxql.ShowGr return &influxql.Result{Err: err} } - row := &influxql.Row{Columns: []string{"database", "privilege"}} + row := &models.Row{Columns: []string{"database", "privilege"}} for d, p := range priv { row.Values = append(row.Values, []interface{}{d, p.String()}) } - return &influxql.Result{Series: []*influxql.Row{row}} + return &influxql.Result{Series: []*models.Row{row}} } func (e *StatementExecutor) executeShowServersStatement(q *influxql.ShowServersStatement) *influxql.Result { @@ -133,11 +147,35 @@ func (e *StatementExecutor) executeShowServersStatement(q *influxql.ShowServersS return &influxql.Result{Err: err} } - row := &influxql.Row{Columns: []string{"id", "cluster_addr", "raft"}} + leader := e.Store.Leader() + + row := &models.Row{Columns: []string{"id", "cluster_addr", "raft", "raft-leader"}} for _, ni := range nis { - row.Values = append(row.Values, []interface{}{ni.ID, ni.Host, contains(peers, ni.Host)}) + row.Values = append(row.Values, []interface{}{ni.ID, ni.Host, contains(peers, ni.Host), leader == ni.Host}) } - return &influxql.Result{Series: []*influxql.Row{row}} + return &influxql.Result{Series: []*models.Row{row}} +} + +func (e *StatementExecutor) executeDropServerStatement(q *influxql.DropServerStatement) *influxql.Result { + ni, err := e.Store.Node(q.NodeID) + if err != nil { + return &influxql.Result{Err: err} + } + if ni == nil { + return &influxql.Result{Err: ErrNodeNotFound} + } + + // Dropping only non-Raft nodes supported. + peers, err := e.Store.Peers() + if err != nil { + return &influxql.Result{Err: err} + } + if contains(peers, ni.Host) { + return &influxql.Result{Err: ErrNodeRaft} + } + + err = e.Store.DeleteNode(q.NodeID, q.Force) + return &influxql.Result{Err: err} } func (e *StatementExecutor) executeCreateUserStatement(q *influxql.CreateUserStatement) *influxql.Result { @@ -159,11 +197,11 @@ func (e *StatementExecutor) executeShowUsersStatement(q *influxql.ShowUsersState return &influxql.Result{Err: err} } - row := &influxql.Row{Columns: []string{"user", "admin"}} + row := &models.Row{Columns: []string{"user", "admin"}} for _, ui := range uis { row.Values = append(row.Values, []interface{}{ui.Name, ui.Admin}) } - return &influxql.Result{Series: []*influxql.Row{row}} + return &influxql.Result{Series: []*models.Row{row}} } func (e *StatementExecutor) executeGrantStatement(stmt *influxql.GrantStatement) *influxql.Result { @@ -245,11 +283,11 @@ func (e *StatementExecutor) executeShowRetentionPoliciesStatement(q *influxql.Sh return &influxql.Result{Err: ErrDatabaseNotFound} } - row := &influxql.Row{Columns: []string{"name", "duration", "replicaN", "default"}} + row := &models.Row{Columns: []string{"name", "duration", "replicaN", "default"}} for _, rpi := range di.RetentionPolicies { row.Values = append(row.Values, []interface{}{rpi.Name, rpi.Duration.String(), rpi.ReplicaN, di.DefaultRetentionPolicy == rpi.Name}) } - return &influxql.Result{Series: []*influxql.Row{row}} + return &influxql.Result{Series: []*models.Row{row}} } func (e *StatementExecutor) executeCreateContinuousQueryStatement(q *influxql.CreateContinuousQueryStatement) *influxql.Result { @@ -270,9 +308,9 @@ func (e *StatementExecutor) executeShowContinuousQueriesStatement(stmt *influxql return &influxql.Result{Err: err} } - rows := []*influxql.Row{} + rows := []*models.Row{} for _, di := range dis { - row := &influxql.Row{Columns: []string{"name", "query"}, Name: di.Name} + row := &models.Row{Columns: []string{"name", "query"}, Name: di.Name} for _, cqi := range di.ContinuousQueries { row.Values = append(row.Values, []interface{}{cqi.Name, cqi.Query}) } @@ -281,6 +319,50 @@ func (e *StatementExecutor) executeShowContinuousQueriesStatement(stmt *influxql return &influxql.Result{Series: rows} } +func (e *StatementExecutor) executeShowShardsStatement(stmt *influxql.ShowShardsStatement) *influxql.Result { + dis, err := e.Store.Databases() + if err != nil { + return &influxql.Result{Err: err} + } + + rows := []*models.Row{} + for _, di := range dis { + row := &models.Row{Columns: []string{"id", "start_time", "end_time", "expiry_time", "owners"}, Name: di.Name} + for _, rpi := range di.RetentionPolicies { + for _, sgi := range rpi.ShardGroups { + for _, si := range sgi.Shards { + ownerIDs := make([]uint64, len(si.Owners)) + for i, owner := range si.Owners { + ownerIDs[i] = owner.NodeID + } + + row.Values = append(row.Values, []interface{}{ + si.ID, + sgi.StartTime.UTC().Format(time.RFC3339), + sgi.EndTime.UTC().Format(time.RFC3339), + sgi.EndTime.Add(rpi.Duration).UTC().Format(time.RFC3339), + joinUint64(ownerIDs), + }) + } + } + } + rows = append(rows, row) + } + return &influxql.Result{Series: rows} +} + func (e *StatementExecutor) executeShowStatsStatement(stmt *influxql.ShowStatsStatement) *influxql.Result { return &influxql.Result{Err: fmt.Errorf("SHOW STATS is not implemented yet")} } + +// joinUint64 returns a comma-delimited string of uint64 numbers. +func joinUint64(a []uint64) string { + var buf bytes.Buffer + for i, x := range a { + buf.WriteString(strconv.FormatUint(x, 10)) + if i < len(a)-1 { + buf.WriteRune(',') + } + } + return buf.String() +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go index 64894aaea..9aef1618a 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go @@ -9,6 +9,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/influxdb/influxdb/influxql" "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" ) // Ensure a CREATE DATABASE statement can be executed. @@ -57,7 +58,7 @@ func TestStatementExecutor_ExecuteStatement_ShowDatabases(t *testing.T) { if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW DATABASES`)); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { Name: "databases", Columns: []string{"name"}, @@ -99,7 +100,7 @@ func TestStatementExecutor_ExecuteStatement_ShowGrantsFor(t *testing.T) { if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW GRANTS FOR dejan`)); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { Columns: []string{"database", "privilege"}, Values: [][]interface{}{ @@ -124,15 +125,18 @@ func TestStatementExecutor_ExecuteStatement_ShowServers(t *testing.T) { e.Store.PeersFn = func() ([]string, error) { return []string{"node0"}, nil } + e.Store.LeaderFn = func() string { + return "node0" + } if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW SERVERS`)); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { - Columns: []string{"id", "cluster_addr", "raft"}, + Columns: []string{"id", "cluster_addr", "raft", "raft-leader"}, Values: [][]interface{}{ - {uint64(1), "node0", true}, - {uint64(2), "node1", false}, + {uint64(1), "node0", true, true}, + {uint64(2), "node1", false, false}, }, }, }) { @@ -140,6 +144,45 @@ func TestStatementExecutor_ExecuteStatement_ShowServers(t *testing.T) { } } +// Ensure a DROP SERVER statement can be executed. +func TestStatementExecutor_ExecuteStatement_DropServer(t *testing.T) { + e := NewStatementExecutor() + e.Store.PeersFn = func() ([]string, error) { + return []string{"node1"}, nil + } + + // Ensure non-existent nodes do not cause a problem. + e.Store.NodeFn = func(id uint64) (*meta.NodeInfo, error) { + return nil, nil + } + if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 666`)); res.Err != meta.ErrNodeNotFound { + t.Fatalf("unexpected error: %s", res.Err) + } + + // Make a node exist. + e.Store.NodeFn = func(id uint64) (*meta.NodeInfo, error) { + return &meta.NodeInfo{ + ID: 1, Host: "node1", + }, nil + } + + // Ensure Raft nodes cannot be dropped. + if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 1`)); res.Err != meta.ErrNodeRaft { + t.Fatalf("unexpected error: %s", res.Err) + } + + // Ensure non-Raft nodes can be dropped. + e.Store.PeersFn = func() ([]string, error) { + return []string{"node2"}, nil + } + e.Store.DeleteNodeFn = func(id uint64, force bool) error { + return nil + } + if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 1`)); res.Err != nil { + t.Fatalf("unexpected error: %s", res.Err) + } +} + // Ensure a SHOW SERVERS statement returns errors from the store. func TestStatementExecutor_ExecuteStatement_ShowServers_Err(t *testing.T) { e := NewStatementExecutor() @@ -257,7 +300,7 @@ func TestStatementExecutor_ExecuteStatement_ShowUsers(t *testing.T) { if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW USERS`)); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { Columns: []string{"user", "admin"}, Values: [][]interface{}{ @@ -580,7 +623,7 @@ func TestStatementExecutor_ExecuteStatement_ShowRetentionPolicies(t *testing.T) if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW RETENTION POLICIES ON db0`)); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { Columns: []string{"name", "duration", "replicaN", "default"}, Values: [][]interface{}{ @@ -625,13 +668,13 @@ func TestStatementExecutor_ExecuteStatement_CreateContinuousQuery(t *testing.T) t.Fatalf("unexpected database: %s", database) } else if name != "cq0" { t.Fatalf("unexpected name: %s", name) - } else if query != `CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(*) INTO db1 FROM db0 GROUP BY time(1h) END` { + } else if query != `CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END` { t.Fatalf("unexpected query: %s", query) } return nil } - stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(*) INTO db1 FROM db0 GROUP BY time(1h) END`) + stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END`) if res := e.ExecuteStatement(stmt); res.Err != nil { t.Fatal(res.Err) } else if res.Series != nil { @@ -646,7 +689,7 @@ func TestStatementExecutor_ExecuteStatement_CreateContinuousQuery_Err(t *testing return errors.New("marker") } - stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(*) INTO db1 FROM db0 GROUP BY time(1h) END`) + stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END`) if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" { t.Fatalf("unexpected error: %s", res.Err) } @@ -693,14 +736,14 @@ func TestStatementExecutor_ExecuteStatement_ShowContinuousQueries(t *testing.T) { Name: "db0", ContinuousQueries: []meta.ContinuousQueryInfo{ - {Name: "cq0", Query: "SELECT count(*) INTO db1 FROM db0"}, - {Name: "cq1", Query: "SELECT count(*) INTO db2 FROM db0"}, + {Name: "cq0", Query: "SELECT count(field1) INTO db1 FROM db0"}, + {Name: "cq1", Query: "SELECT count(field1) INTO db2 FROM db0"}, }, }, { Name: "db1", ContinuousQueries: []meta.ContinuousQueryInfo{ - {Name: "cq2", Query: "SELECT count(*) INTO db3 FROM db1"}, + {Name: "cq2", Query: "SELECT count(field1) INTO db3 FROM db1"}, }, }, }, nil @@ -709,20 +752,20 @@ func TestStatementExecutor_ExecuteStatement_ShowContinuousQueries(t *testing.T) stmt := influxql.MustParseStatement(`SHOW CONTINUOUS QUERIES`) if res := e.ExecuteStatement(stmt); res.Err != nil { t.Fatal(res.Err) - } else if !reflect.DeepEqual(res.Series, influxql.Rows{ + } else if !reflect.DeepEqual(res.Series, models.Rows{ { Name: "db0", Columns: []string{"name", "query"}, Values: [][]interface{}{ - {"cq0", "SELECT count(*) INTO db1 FROM db0"}, - {"cq1", "SELECT count(*) INTO db2 FROM db0"}, + {"cq0", "SELECT count(field1) INTO db1 FROM db0"}, + {"cq1", "SELECT count(field1) INTO db2 FROM db0"}, }, }, { Name: "db1", Columns: []string{"name", "query"}, Values: [][]interface{}{ - {"cq2", "SELECT count(*) INTO db3 FROM db1"}, + {"cq2", "SELECT count(field1) INTO db3 FROM db1"}, }, }, }) { @@ -755,7 +798,7 @@ func TestStatementExecutor_ExecuteStatement_Unsupported(t *testing.T) { // Execute a SELECT statement. NewStatementExecutor().ExecuteStatement( - influxql.MustParseStatement(`SELECT count(*) FROM db0`), + influxql.MustParseStatement(`SELECT count(field1) FROM db0`), ) }() @@ -765,6 +808,57 @@ func TestStatementExecutor_ExecuteStatement_Unsupported(t *testing.T) { } } +// Ensure a SHOW SHARDS statement can be executed. +func TestStatementExecutor_ExecuteStatement_ShowShards(t *testing.T) { + e := NewStatementExecutor() + e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) { + return []meta.DatabaseInfo{ + { + Name: "foo", + RetentionPolicies: []meta.RetentionPolicyInfo{ + { + Duration: time.Second, + ShardGroups: []meta.ShardGroupInfo{ + { + StartTime: time.Unix(0, 0), + EndTime: time.Unix(1, 0), + Shards: []meta.ShardInfo{ + { + ID: 1, + Owners: []meta.ShardOwner{ + {NodeID: 1}, + {NodeID: 2}, + {NodeID: 3}, + }, + }, + { + ID: 2, + }, + }, + }, + }, + }, + }, + }, + }, nil + } + + if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW SHARDS`)); res.Err != nil { + t.Fatal(res.Err) + } else if !reflect.DeepEqual(res.Series, models.Rows{ + { + Name: "foo", + Columns: []string{"id", "start_time", "end_time", "expiry_time", "owners"}, + Values: [][]interface{}{ + {uint64(1), "1970-01-01T00:00:00Z", "1970-01-01T00:00:01Z", "1970-01-01T00:00:02Z", "1,2,3"}, + {uint64(2), "1970-01-01T00:00:00Z", "1970-01-01T00:00:01Z", "1970-01-01T00:00:02Z", ""}, + }, + }, + }) { + t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series)) + } +} + // StatementExecutor represents a test wrapper for meta.StatementExecutor. type StatementExecutor struct { *meta.StatementExecutor @@ -780,12 +874,15 @@ func NewStatementExecutor() *StatementExecutor { // StatementExecutorStore represents a mock implementation of StatementExecutor.Store. type StatementExecutorStore struct { + NodeFn func(id uint64) (*meta.NodeInfo, error) NodesFn func() ([]meta.NodeInfo, error) PeersFn func() ([]string, error) + LeaderFn func() string DatabaseFn func(name string) (*meta.DatabaseInfo, error) DatabasesFn func() ([]meta.DatabaseInfo, error) CreateDatabaseFn func(name string) (*meta.DatabaseInfo, error) DropDatabaseFn func(name string) error + DeleteNodeFn func(nodeID uint64, force bool) error DefaultRetentionPolicyFn func(database string) (*meta.RetentionPolicyInfo, error) CreateRetentionPolicyFn func(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) UpdateRetentionPolicyFn func(database, name string, rpu *meta.RetentionPolicyUpdate) error @@ -804,6 +901,10 @@ type StatementExecutorStore struct { DropContinuousQueryFn func(database, name string) error } +func (s *StatementExecutorStore) Node(id uint64) (*meta.NodeInfo, error) { + return s.NodeFn(id) +} + func (s *StatementExecutorStore) Nodes() ([]meta.NodeInfo, error) { return s.NodesFn() } @@ -812,6 +913,17 @@ func (s *StatementExecutorStore) Peers() ([]string, error) { return s.PeersFn() } +func (s *StatementExecutorStore) Leader() string { + if s.LeaderFn != nil { + return s.LeaderFn() + } + return "" +} + +func (s *StatementExecutorStore) DeleteNode(nodeID uint64, force bool) error { + return s.DeleteNodeFn(nodeID, force) +} + func (s *StatementExecutorStore) Database(name string) (*meta.DatabaseInfo, error) { return s.DatabaseFn(name) } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go index 23bac17f2..1d8da401c 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go @@ -254,7 +254,10 @@ func (s *Store) Open() error { close(s.ready) } - return nil + // Wait for a leader to be elected so we know the raft log is loaded + // and up to date + <-s.ready + return s.WaitForLeader(0) } // syncNodeInfo continuously tries to update the current nodes hostname @@ -689,7 +692,7 @@ func (s *Store) handleExecConn(conn net.Conn) { // Apply against the raft log. if err := s.apply(buf); err != nil { - return fmt.Errorf("apply: %s", err) + return err } return nil }() @@ -820,10 +823,16 @@ func (s *Store) UpdateNode(id uint64, host string) (*NodeInfo, error) { } // DeleteNode removes a node from the metastore by id. -func (s *Store) DeleteNode(id uint64) error { +func (s *Store) DeleteNode(id uint64, force bool) error { + ni := s.data.Node(id) + if ni == nil { + return ErrNodeNotFound + } + return s.exec(internal.Command_DeleteNodeCommand, internal.E_DeleteNodeCommand_Command, &internal.DeleteNodeCommand{ - ID: proto.Uint64(id), + ID: proto.Uint64(id), + Force: proto.Bool(force), }, ) } @@ -858,6 +867,7 @@ func (s *Store) CreateDatabase(name string) (*DatabaseInfo, error) { ); err != nil { return nil, err } + s.Logger.Printf("database '%s' created", name) if s.retentionAutoCreate { // Read node count. @@ -977,6 +987,7 @@ func (s *Store) CreateRetentionPolicy(database string, rpi *RetentionPolicyInfo) return nil, err } + s.Logger.Printf("retention policy '%s' for database '%s' created", rpi.Name, database) return s.RetentionPolicy(database, rpi.Name) } @@ -1047,8 +1058,6 @@ func (s *Store) DropRetentionPolicy(database, name string) error { ) } -// FIX: CreateRetentionPolicyIfNotExists(database string, rp *RetentionPolicyInfo) (*RetentionPolicyInfo, error) - // CreateShardGroup creates a new shard group in a retention policy for a given time. func (s *Store) CreateShardGroup(database, policy string, timestamp time.Time) (*ShardGroupInfo, error) { if err := s.exec(internal.Command_CreateShardGroupCommand, internal.E_CreateShardGroupCommand_Command, @@ -1389,38 +1398,34 @@ func (s *Store) UserCount() (count int, err error) { return } -// PrecreateShardGroups creates shard groups whose endtime is before the cutoff time passed in. This -// avoid the need for these shards to be created when data for the corresponding time range arrives. -// Shard creation involves Raft consensus, and precreation avoids taking the hit at write-time. -func (s *Store) PrecreateShardGroups(cutoff time.Time) error { +// PrecreateShardGroups creates shard groups whose endtime is before the 'to' time passed in, but +// is yet to expire before 'from'. This is to avoid the need for these shards to be created when data +// for the corresponding time range arrives. Shard creation involves Raft consensus, and precreation +// avoids taking the hit at write-time. +func (s *Store) PrecreateShardGroups(from, to time.Time) error { s.read(func(data *Data) error { for _, di := range data.Databases { for _, rp := range di.RetentionPolicies { - for _, g := range rp.ShardGroups { - // Check to see if it is not deleted and going to end before our interval - if !g.Deleted() && g.EndTime.Before(cutoff) { - nextShardGroupTime := g.EndTime.Add(1 * time.Nanosecond) + if len(rp.ShardGroups) == 0 { + // No data was ever written to this group, or all groups have been deleted. + continue + } + g := rp.ShardGroups[len(rp.ShardGroups)-1] // Get the last group in time. + if !g.Deleted() && g.EndTime.Before(to) && g.EndTime.After(from) { + // Group is not deleted, will end before the future time, but is still yet to expire. + // This last check is important, so the system doesn't create shards groups wholly + // in the past. - // Check if successive shard group exists. - if sgi, err := s.ShardGroupByTimestamp(di.Name, rp.Name, nextShardGroupTime); err != nil { - s.Logger.Printf("failed to check if successive shard group for group exists %d: %s", - g.ID, err.Error()) - continue - } else if sgi != nil && !sgi.Deleted() { - continue - } - - // It doesn't. Create it. - if newGroup, err := s.CreateShardGroupIfNotExists(di.Name, rp.Name, nextShardGroupTime); err != nil { - s.Logger.Printf("failed to create successive shard group for group %d: %s", - g.ID, err.Error()) - } else { - s.Logger.Printf("new shard group %d successfully created for database %s, retention policy %s", - newGroup.ID, di.Name, rp.Name) - } + // Create successive shard group. + nextShardGroupTime := g.EndTime.Add(1 * time.Nanosecond) + if newGroup, err := s.CreateShardGroupIfNotExists(di.Name, rp.Name, nextShardGroupTime); err != nil { + s.Logger.Printf("failed to create successive shard group for group %d: %s", + g.ID, err.Error()) + } else { + s.Logger.Printf("new shard group %d successfully created for database %s, retention policy %s", + newGroup.ID, di.Name, rp.Name) } } - } } return nil @@ -1554,7 +1559,7 @@ func (s *Store) remoteExec(b []byte) error { if err := proto.Unmarshal(buf, &resp); err != nil { return fmt.Errorf("unmarshal response: %s", err) } else if !resp.GetOK() { - return fmt.Errorf("exec failed: %s", resp.GetError()) + return lookupError(fmt.Errorf(resp.GetError())) } // Wait for local FSM to sync to index. @@ -1707,11 +1712,14 @@ func (fsm *storeFSM) applyDeleteNodeCommand(cmd *internal.Command) interface{} { // Copy data and update. other := fsm.data.Clone() - if err := other.DeleteNode(v.GetID()); err != nil { + if err := other.DeleteNode(v.GetID(), v.GetForce()); err != nil { return err } fsm.data = other + id := v.GetID() + fsm.Logger.Printf("node '%d' removed", id) + return nil } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go index ef79306b7..ae8d9bf1f 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go @@ -151,7 +151,7 @@ func TestStore_DeleteNode(t *testing.T) { } // Remove second node. - if err := s.DeleteNode(3); err != nil { + if err := s.DeleteNode(3, false); err != nil { t.Fatal(err) } @@ -173,7 +173,7 @@ func TestStore_DeleteNode_ErrNodeNotFound(t *testing.T) { s := MustOpenStore() defer s.Close() - if err := s.DeleteNode(2); err != meta.ErrNodeNotFound { + if err := s.DeleteNode(2, false); err != meta.ErrNodeNotFound { t.Fatalf("unexpected error: %s", err) } } @@ -274,6 +274,47 @@ func TestStore_CreateRetentionPolicy(t *testing.T) { } } +// Ensure the store can create and get a retention policy on a database. +func TestStore_CreateAndGetRetentionPolicy(t *testing.T) { + t.Parallel() + s := MustOpenStore() + defer s.Close() + + // Create an additional nodes and database. + if _, err := s.CreateNode("hostX"); err != nil { + t.Fatal(err) + } else if _, err := s.CreateDatabase("db0"); err != nil { + t.Fatal(err) + } + + // Create policy on database. + if _, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{ + Name: "rp0", + ReplicaN: 2, + Duration: 48 * time.Hour, + }); err != nil { + t.Fatal(err) + } + + // Get the policy on database. + if rpi, err := s.RetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{ + Name: "rp0", + ReplicaN: 2, + Duration: 48 * time.Hour, + ShardGroupDuration: 24 * time.Hour, + }) { + t.Fatalf("unexpected policy: %#v", rpi) + } + + // Get non-existent policies. + if _, err := s.RetentionPolicy("db0", "rp0"); err != nil { + t.Fatal(err) + } + +} + // Ensure the store can delete a retention policy. func TestStore_DropRetentionPolicy(t *testing.T) { t.Parallel() @@ -489,30 +530,57 @@ func TestStore_PrecreateShardGroup(t *testing.T) { s := MustOpenStore() defer s.Close() - // Create node, database, policy, & group. + // Create node, database, policy, & groups. if _, err := s.CreateNode("host0"); err != nil { t.Fatal(err) } else if _, err := s.CreateDatabase("db0"); err != nil { t.Fatal(err) } else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil { t.Fatal(err) - } else if _, err := s.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil { + } else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp1", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil { t.Fatal(err) - } else if err := s.PrecreateShardGroups(time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil { + } else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp2", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil { + t.Fatal(err) + } else if _, err := s.CreateShardGroup("db0", "rp0", time.Date(2001, time.January, 1, 1, 0, 0, 0, time.UTC)); err != nil { + t.Fatal(err) + } else if _, err := s.CreateShardGroup("db0", "rp1", time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC)); err != nil { t.Fatal(err) } + if err := s.PrecreateShardGroups(time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(2001, time.January, 1, 3, 0, 0, 0, time.UTC)); err != nil { + t.Fatal(err) + } + + // rp0 should undergo precreation. groups, err := s.ShardGroups("db0", "rp0") if err != nil { t.Fatal(err) } if len(groups) != 2 { - t.Fatalf("shard group precreation failed to create new shard group") + t.Fatalf("shard group precreation failed to create new shard group for rp0") } - if groups[1].StartTime != time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC) { + if groups[1].StartTime != time.Date(2001, time.January, 1, 2, 0, 0, 0, time.UTC) { t.Fatalf("precreated shard group has wrong start time, exp %s, got %s", time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC), groups[1].StartTime) } + + // rp1 should not undergo precreation since it is completely in the past. + groups, err = s.ShardGroups("db0", "rp1") + if err != nil { + t.Fatal(err) + } + if len(groups) != 1 { + t.Fatalf("shard group precreation created new shard group for rp1") + } + + // rp2 should not undergo precreation since it has no shards. + groups, err = s.ShardGroups("db0", "rp2") + if err != nil { + t.Fatal(err) + } + if len(groups) != 0 { + t.Fatalf("shard group precreation created new shard group for rp2") + } } // Ensure the store can create a new continuous query. @@ -828,14 +896,14 @@ func TestCluster_Restart(t *testing.T) { t.Fatal("no leader found") } - // Add 5 more ndes, 2 should become raft peers, 3 remote raft clients + // Add 5 more nodes, 2 should become raft peers, 3 remote raft clients for i := 0; i < 5; i++ { if err := c.Join(); err != nil { t.Fatalf("failed to join cluster: %v", err) } } - // The tests use a host host assigned listener port. We need to re-use + // The tests use a host assigned listener port. We need to re-use // the original ports when the new cluster is restarted so that the existing // peer store addresses can be reached. addrs := []string{} @@ -858,10 +926,25 @@ func TestCluster_Restart(t *testing.T) { // Re-create the cluster nodes from existing disk paths and addresses stores := []*Store{} + storeChan := make(chan *Store) for i, s := range c.Stores { - store := MustOpenStoreWithPath(addrs[i], s.Path()) + + // Need to start each instance asynchronously because they have existing raft peers + // store. Starting one will block indefinitely because it will not be able to become + // leader until another peer is available to hold an election. + go func(addr, path string) { + store := MustOpenStoreWithPath(addr, path) + storeChan <- store + }(addrs[i], s.Path()) + + } + + // Collect up our restart meta-stores + for range c.Stores { + store := <-storeChan stores = append(stores, store) } + c.Stores = stores // Wait for the cluster to stabilize diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go similarity index 93% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points.go rename to Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go index fd0267af7..592780389 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go @@ -1,15 +1,27 @@ -package tsdb +package models import ( "bytes" "fmt" "hash/fnv" - "math" - "regexp" "sort" "strconv" - "strings" "time" + + "github.com/influxdb/influxdb/pkg/escape" +) + +var ( + measurementEscapeCodes = map[byte][]byte{ + ',': []byte(`\,`), + ' ': []byte(`\ `), + } + + tagEscapeCodes = map[byte][]byte{ + ',': []byte(`\,`), + ' ': []byte(`\ `), + '=': []byte(`\=`), + } ) // Point defines the values that will be written to the database @@ -34,7 +46,15 @@ type Point interface { Data() []byte SetData(buf []byte) + // String returns a string representation of the point object, if there is a + // timestamp associated with the point then it will be specified with the default + // precision of nanoseconds String() string + + // PrecisionString returns a string representation of the point object, if there + // is a timestamp associated with the point then it will be specified in the + // given unit + PrecisionString(precision string) string } // Points represents a sortable list of points by timestamp. @@ -85,36 +105,7 @@ const ( minFloat64Digits = 27 ) -var ( - // Compile the regex that detects unquoted double quote sequences - quoteReplacer = regexp.MustCompile(`([^\\])"`) - - escapeCodes = map[byte][]byte{ - ',': []byte(`\,`), - '"': []byte(`\"`), - ' ': []byte(`\ `), - '=': []byte(`\=`), - } - - escapeCodesStr = map[string]string{} - - measurementEscapeCodes = map[byte][]byte{ - ',': []byte(`\,`), - ' ': []byte(`\ `), - } - - tagEscapeCodes = map[byte][]byte{ - ',': []byte(`\,`), - ' ': []byte(`\ `), - '=': []byte(`\=`), - } -) - -func init() { - for k, v := range escapeCodes { - escapeCodesStr[string(k)] = string(v) - } -} +var () func ParsePointsString(buf string) ([]Point, error) { return ParsePoints([]byte(buf)) @@ -414,7 +405,7 @@ func less(buf []byte, indices []int, i, j int) bool { } func isFieldEscapeChar(b byte) bool { - for c := range escapeCodes { + for c := range escape.Codes { if c == b { return true } @@ -569,6 +560,10 @@ func scanNumber(buf []byte, i int) (int, error) { // Is negative number? if i < len(buf) && buf[i] == '-' { i += 1 + // There must be more characters now, as just '-' is illegal. + if i == len(buf) { + return i, fmt.Errorf("invalid number") + } } // how many decimal points we've see @@ -740,14 +735,19 @@ func skipWhitespace(buf []byte, i int) int { func scanLine(buf []byte, i int) (int, []byte) { start := i quoted := false + fields := false for { // reached the end of buf? if i >= len(buf) { break } + if buf[i] == ' ' { + fields = true + } + // If we see a double quote, makes sure it is not escaped - if buf[i] == '"' && (i-1 > 0 && buf[i-1] != '\\') { + if fields && buf[i] == '"' && (i-1 > 0 && buf[i-1] != '\\') { i += 1 quoted = !quoted continue @@ -891,62 +891,6 @@ func unescapeTag(in []byte) []byte { return in } -func escape(in []byte) []byte { - for b, esc := range escapeCodes { - in = bytes.Replace(in, []byte{b}, esc, -1) - } - return in -} - -func escapeString(in string) string { - for b, esc := range escapeCodesStr { - in = strings.Replace(in, b, esc, -1) - } - return in -} - -func unescape(in []byte) []byte { - i := 0 - inLen := len(in) - var out []byte - - for { - if i >= inLen { - break - } - if in[i] == '\\' && i+1 < inLen { - switch in[i+1] { - case ',': - out = append(out, ',') - i += 2 - continue - case '"': - out = append(out, '"') - i += 2 - continue - case ' ': - out = append(out, ' ') - i += 2 - continue - case '=': - out = append(out, '=') - i += 2 - continue - } - } - out = append(out, in[i]) - i += 1 - } - return out -} - -func unescapeString(in string) string { - for b, esc := range escapeCodesStr { - in = strings.Replace(in, esc, b, -1) - } - return in -} - // escapeStringField returns a copy of in with any double quotes or // backslashes with escaped values func escapeStringField(in string) string { @@ -1036,7 +980,7 @@ func (p *point) Name() string { if p.cachedName != "" { return p.cachedName } - p.cachedName = string(unescape(p.name())) + p.cachedName = string(escape.Unescape(p.name())) return p.cachedName } @@ -1077,6 +1021,10 @@ func (p *point) Tags() Tags { i, key = scanTo(p.key, i, '=') i, value = scanTagValue(p.key, i+1) + if len(value) == 0 { + continue + } + tags[string(unescapeTag(key))] = string(unescapeTag(value)) i += 1 @@ -1162,6 +1110,14 @@ func (p *point) String() string { return fmt.Sprintf("%s %s %d", p.Key(), string(p.fields), p.UnixNano()) } +func (p *point) PrecisionString(precision string) string { + if p.Time().IsZero() { + return fmt.Sprintf("%s %s", p.Key(), string(p.fields)) + } + return fmt.Sprintf("%s %s %d", p.Key(), string(p.fields), + p.UnixNano()/p.GetPrecisionMultiplier(precision)) +} + func (p *point) unmarshalBinary() Fields { return newFieldsFromBinary(p.fields) } @@ -1189,7 +1145,10 @@ func (t Tags) HashKey() []byte { for k, v := range t { ek := escapeTag([]byte(k)) ev := escapeTag([]byte(v)) - escaped[string(ek)] = string(ev) + + if len(ev) > 0 { + escaped[string(ek)] = string(ev) + } } // Extract keys and determine final size. @@ -1257,7 +1216,7 @@ func newFieldsFromBinary(buf []byte) Fields { if len(name) == 0 { continue } - name = unescape(name) + name = escape.Unescape(name) i, valueBuf = scanFieldValue(buf, i+1) if len(valueBuf) == 0 { @@ -1291,6 +1250,10 @@ func newFieldsFromBinary(buf []byte) Fields { return fields } +// MarshalBinary encodes all the fields to their proper type and returns the binary +// represenation +// NOTE: uint64 is specifically not supported due to potential overflow when we decode +// again later to an int64 func (p Fields) MarshalBinary() []byte { b := []byte{} keys := make([]string, len(p)) @@ -1303,31 +1266,42 @@ func (p Fields) MarshalBinary() []byte { for _, k := range keys { v := p[k] - b = append(b, []byte(escapeString(k))...) + b = append(b, []byte(escape.String(k))...) b = append(b, '=') switch t := v.(type) { case int: b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) b = append(b, 'i') - case int32: + case int8: b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) b = append(b, 'i') - case uint64: - b = append(b, []byte(strconv.FormatUint(t, 10))...) + case int16: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) + b = append(b, 'i') + case int32: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) b = append(b, 'i') case int64: b = append(b, []byte(strconv.FormatInt(t, 10))...) b = append(b, 'i') - case float64: - // ensure there is a decimal in the encoded for - - val := []byte(strconv.FormatFloat(t, 'f', -1, 64)) - _, frac := math.Modf(t) - hasDecimal := frac != 0 + case uint: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) + b = append(b, 'i') + case uint8: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) + b = append(b, 'i') + case uint16: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) + b = append(b, 'i') + case uint32: + b = append(b, []byte(strconv.FormatInt(int64(t), 10))...) + b = append(b, 'i') + case float32: + val := []byte(strconv.FormatFloat(float64(t), 'f', -1, 32)) + b = append(b, val...) + case float64: + val := []byte(strconv.FormatFloat(t, 'f', -1, 64)) b = append(b, val...) - if !hasDecimal { - b = append(b, []byte(".0")...) - } case bool: b = append(b, []byte(strconv.FormatBool(t))...) case []byte: diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go similarity index 70% rename from Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points_test.go rename to Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go index 720a24e77..4186b89d9 100644 --- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/points_test.go +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go @@ -1,4 +1,4 @@ -package tsdb_test +package models_test import ( "bytes" @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/influxdb/influxdb/tsdb" + "github.com/influxdb/influxdb/models" ) var ( - tags = tsdb.Tags{"foo": "bar", "apple": "orange", "host": "serverA", "region": "uswest"} + tags = models.Tags{"foo": "bar", "apple": "orange", "host": "serverA", "region": "uswest"} maxFloat64 = strconv.FormatFloat(math.MaxFloat64, 'f', 1, 64) minFloat64 = strconv.FormatFloat(-math.MaxFloat64, 'f', 1, 64) ) @@ -37,7 +37,7 @@ func BenchmarkMarshal(b *testing.B) { func BenchmarkParsePointNoTags(b *testing.B) { line := `cpu value=1i 1000000000` for i := 0; i < b.N; i++ { - tsdb.ParsePoints([]byte(line)) + models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) } } @@ -45,7 +45,7 @@ func BenchmarkParsePointNoTags(b *testing.B) { func BenchmarkParsePointsTagsSorted2(b *testing.B) { line := `cpu,host=serverA,region=us-west value=1i 1000000000` for i := 0; i < b.N; i++ { - tsdb.ParsePoints([]byte(line)) + models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) } } @@ -53,7 +53,7 @@ func BenchmarkParsePointsTagsSorted2(b *testing.B) { func BenchmarkParsePointsTagsSorted5(b *testing.B) { line := `cpu,env=prod,host=serverA,region=us-west,target=servers,zone=1c value=1i 1000000000` for i := 0; i < b.N; i++ { - tsdb.ParsePoints([]byte(line)) + models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) } } @@ -61,7 +61,7 @@ func BenchmarkParsePointsTagsSorted5(b *testing.B) { func BenchmarkParsePointsTagsSorted10(b *testing.B) { line := `cpu,env=prod,host=serverA,region=us-west,tag1=value1,tag2=value2,tag3=value3,tag4=value4,tag5=value5,target=servers,zone=1c value=1i 1000000000` for i := 0; i < b.N; i++ { - tsdb.ParsePoints([]byte(line)) + models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) } } @@ -69,7 +69,7 @@ func BenchmarkParsePointsTagsSorted10(b *testing.B) { func BenchmarkParsePointsTagsUnSorted2(b *testing.B) { line := `cpu,region=us-west,host=serverA value=1i 1000000000` for i := 0; i < b.N; i++ { - pt, _ := tsdb.ParsePoints([]byte(line)) + pt, _ := models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) pt[0].Key() } @@ -78,7 +78,7 @@ func BenchmarkParsePointsTagsUnSorted2(b *testing.B) { func BenchmarkParsePointsTagsUnSorted5(b *testing.B) { line := `cpu,region=us-west,host=serverA,env=prod,target=servers,zone=1c value=1i 1000000000` for i := 0; i < b.N; i++ { - pt, _ := tsdb.ParsePoints([]byte(line)) + pt, _ := models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) pt[0].Key() } @@ -87,14 +87,14 @@ func BenchmarkParsePointsTagsUnSorted5(b *testing.B) { func BenchmarkParsePointsTagsUnSorted10(b *testing.B) { line := `cpu,region=us-west,host=serverA,env=prod,target=servers,zone=1c,tag1=value1,tag2=value2,tag3=value3,tag4=value4,tag5=value5 value=1i 1000000000` for i := 0; i < b.N; i++ { - pt, _ := tsdb.ParsePoints([]byte(line)) + pt, _ := models.ParsePoints([]byte(line)) b.SetBytes(int64(len(line))) pt[0].Key() } } -func test(t *testing.T, line string, point tsdb.Point) { - pts, err := tsdb.ParsePointsWithPrecision([]byte(line), time.Unix(0, 0), "n") +func test(t *testing.T, line string, point models.Point) { + pts, err := models.ParsePointsWithPrecision([]byte(line), time.Unix(0, 0), "n") if err != nil { t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, line, err) } @@ -141,7 +141,7 @@ func test(t *testing.T, line string, point tsdb.Point) { } func TestParsePointNoValue(t *testing.T) { - pts, err := tsdb.ParsePointsString("") + pts, err := models.ParsePointsString("") if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, "", err) } @@ -152,7 +152,7 @@ func TestParsePointNoValue(t *testing.T) { } func TestParsePointWhitespaceValue(t *testing.T) { - pts, err := tsdb.ParsePointsString(" ") + pts, err := models.ParsePointsString(" ") if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, "", err) } @@ -163,7 +163,7 @@ func TestParsePointWhitespaceValue(t *testing.T) { } func TestParsePointSingleEquals(t *testing.T) { - pts, err := tsdb.ParsePointsString("=") + pts, err := models.ParsePointsString("=") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. expected error`, "=") } @@ -174,27 +174,27 @@ func TestParsePointSingleEquals(t *testing.T) { } func TestParsePointNoFields(t *testing.T) { - _, err := tsdb.ParsePointsString("cpu_load_short,host=server01,region=us-west") + _, err := models.ParsePointsString("cpu_load_short,host=server01,region=us-west") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu_load_short,host=server01,region=us-west") } - _, err = tsdb.ParsePointsString("cpu") + _, err = models.ParsePointsString("cpu") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu") } - _, err = tsdb.ParsePointsString("cpu,") + _, err = models.ParsePointsString("cpu,") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu,") } - _, err = tsdb.ParsePointsString("cpu, value=1") + _, err = models.ParsePointsString("cpu, value=1") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu, value=1") } - _, err = tsdb.ParsePointsString("cpu,,, value=1") + _, err = models.ParsePointsString("cpu,,, value=1") if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu,,, value=1") } @@ -202,70 +202,70 @@ func TestParsePointNoFields(t *testing.T) { } func TestParsePointNoTimestamp(t *testing.T) { - test(t, "cpu value=1", tsdb.NewPoint("cpu", nil, nil, time.Unix(0, 0))) + test(t, "cpu value=1", models.NewPoint("cpu", nil, nil, time.Unix(0, 0))) } func TestParsePointMissingQuote(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA value="test`) + _, err := models.ParsePointsString(`cpu,host=serverA value="test`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu") } } func TestParsePointMissingTagName(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,=us-east value=1i`) + _, err := models.ParsePointsString(`cpu,host=serverA,=us-east value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,=us-east value=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverAa\,,=us-east value=1i`) + _, err = models.ParsePointsString(`cpu,host=serverAa\,,=us-east value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverAa\,,=us-east value=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA\,,=us-east value=1i`) + _, err = models.ParsePointsString(`cpu,host=serverA\,,=us-east value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA\,,=us-east value=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,\ =us-east value=1i`) + _, err = models.ParsePointsString(`cpu,host=serverA,\ =us-east value=1i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,\ =us-east value=1i`, err) } } func TestParsePointMissingTagValue(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host value=1i`) + _, err := models.ParsePointsString(`cpu,host value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host value=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region value=1i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region value=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region= value=1i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region= value=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region= value=1i`) } } func TestParsePointMissingFieldName(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west =`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west =`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west =`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west =123i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west =123i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west =123i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west a\ =123i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west a\ =123i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west a\ =123i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=123i,=456i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=123i,=456i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=123i,=456i`) } @@ -273,42 +273,42 @@ func TestParsePointMissingFieldName(t *testing.T) { } func TestParsePointMissingFieldValue(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value= 1000000000i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value= 1000000000i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value= 1000000000i`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=,value2=1i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=,value2=1i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=,value2=1i`) } - _, err = tsdb.ParsePointsString(`cpu,host=server01,region=us-west 1434055562000000000i`) + _, err = models.ParsePointsString(`cpu,host=server01,region=us-west 1434055562000000000i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=server01,region=us-west 1434055562000000000i`) } - _, err = tsdb.ParsePointsString(`cpu,host=server01,region=us-west value=1i,b`) + _, err = models.ParsePointsString(`cpu,host=server01,region=us-west value=1i,b`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=server01,region=us-west value=1i,b`) } } func TestParsePointBadNumber(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1a`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1a`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1a`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1ii`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=1ii`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1ii`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1.0i`) } @@ -316,14 +316,14 @@ func TestParsePointBadNumber(t *testing.T) { func TestParsePointMaxInt64(t *testing.T) { // out of range - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775808i`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775808i`) exp := `unable to parse 'cpu,host=serverA,region=us-west value=9223372036854775808i': unable to parse integer 9223372036854775808: strconv.ParseInt: parsing "9223372036854775808": value out of range` if err == nil || (err != nil && err.Error() != exp) { t.Fatalf("Error mismatch:\nexp: %s\ngot: %v", exp, err) } // max int - p, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775807i`) + p, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775807i`) if err != nil { t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=9223372036854775807i`, err) } @@ -332,7 +332,7 @@ func TestParsePointMaxInt64(t *testing.T) { } // leading zeros - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=0009223372036854775807i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=0009223372036854775807i`) if err != nil { t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=0009223372036854775807i`, err) } @@ -340,19 +340,19 @@ func TestParsePointMaxInt64(t *testing.T) { func TestParsePointMinInt64(t *testing.T) { // out of range - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775809i`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775809i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=-9223372036854775809i`) } // min int - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775808i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775808i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-9223372036854775808i`, err) } // leading zeros - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-0009223372036854775808i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=-0009223372036854775808i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-0009223372036854775808i`, err) } @@ -360,19 +360,19 @@ func TestParsePointMinInt64(t *testing.T) { func TestParsePointMaxFloat64(t *testing.T) { // out of range - _, err := tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "1"+string(maxFloat64))) + _, err := models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "1"+string(maxFloat64))) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=...`) } // max float - _, err = tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(maxFloat64))) + _, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(maxFloat64))) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=9223372036854775807`, err) } // leading zeros - _, err = tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "0000"+string(maxFloat64))) + _, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "0000"+string(maxFloat64))) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=0009223372036854775807`, err) } @@ -380,81 +380,87 @@ func TestParsePointMaxFloat64(t *testing.T) { func TestParsePointMinFloat64(t *testing.T) { // out of range - _, err := tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-1"+string(minFloat64)[1:])) + _, err := models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-1"+string(minFloat64)[1:])) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=...`) } // min float - _, err = tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(minFloat64))) + _, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(minFloat64))) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=...`, err) } // leading zeros - _, err = tsdb.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-0000000"+string(minFloat64)[1:])) + _, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-0000000"+string(minFloat64)[1:])) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=...`, err) } } func TestParsePointNumberNonNumeric(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=.1a`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=.1a`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=.1a`) } } func TestParsePointNegativeWrongPlace(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=0.-1`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=0.-1`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=0.-1`) } } +func TestParsePointOnlyNegativeSign(t *testing.T) { + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-`) + if err == nil { + t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=-`) + } +} + func TestParsePointFloatMultipleDecimals(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1.1.1`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.1.1`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1.1.1`) } - println(err.Error()) } func TestParsePointInteger(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1i`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1i`, err) } } func TestParsePointNegativeInteger(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-1i`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1i`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1i`, err) } } func TestParsePointNegativeFloat(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0`, err) } } func TestParsePointFloatNoLeadingDigit(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=.1`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=.1`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0`, err) } } func TestParsePointFloatScientific(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e4`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e4`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e4`, err) } - pts, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1e4`) + pts, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1e4`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e4`, err) } @@ -466,33 +472,33 @@ func TestParsePointFloatScientific(t *testing.T) { } func TestParsePointFloatScientificDecimal(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e-4`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e-4`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e-4`, err) } } func TestParsePointFloatNegativeScientific(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0e-4`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0e-4`) if err != nil { t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0e-4`, err) } } func TestParsePointBooleanInvalid(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=a`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=a`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=a`) } } func TestParsePointScientificIntInvalid(t *testing.T) { - _, err := tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=9ie10`) + _, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9ie10`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=9ie10`) } - _, err = tsdb.ParsePointsString(`cpu,host=serverA,region=us-west value=9e10i`) + _, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=9e10i`) if err == nil { t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=9e10i`) } @@ -501,145 +507,157 @@ func TestParsePointScientificIntInvalid(t *testing.T) { func TestParsePointUnescape(t *testing.T) { test(t, `foo\,bar value=1i`, - tsdb.NewPoint( + models.NewPoint( "foo,bar", // comma in the name - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": 1, }, time.Unix(0, 0))) // commas in measuremnt name test(t, `cpu\,main,regions=east\,west value=1.0`, - tsdb.NewPoint( + models.NewPoint( "cpu,main", // comma in the name - tsdb.Tags{ + models.Tags{ "regions": "east,west", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // spaces in measurement name test(t, `cpu\ load,region=east value=1.0`, - tsdb.NewPoint( + models.NewPoint( "cpu load", // space in the name - tsdb.Tags{ + models.Tags{ "region": "east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // commas in tag names test(t, `cpu,region\,zone=east value=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "region,zone": "east", // comma in the tag name }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // spaces in tag names test(t, `cpu,region\ zone=east value=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "region zone": "east", // comma in the tag name }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // commas in tag values test(t, `cpu,regions=east\,west value=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "regions": "east,west", // comma in the tag value }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // spaces in tag values test(t, `cpu,regions=east\ west value=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "regions": "east west", // comma in the tag value }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // commas in field names test(t, `cpu,regions=east value\,ms=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "regions": "east", }, - tsdb.Fields{ + models.Fields{ "value,ms": 1.0, // comma in the field name }, time.Unix(0, 0))) // spaces in field names test(t, `cpu,regions=east value\ ms=1.0`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "regions": "east", }, - tsdb.Fields{ + models.Fields{ "value ms": 1.0, // comma in the field name }, time.Unix(0, 0))) + // tag with no value + test(t, `cpu,regions=east value="1"`, + models.NewPoint("cpu", + models.Tags{ + "regions": "east", + "foobar": "", + }, + models.Fields{ + "value": "1", + }, + time.Unix(0, 0))) + // commas in field values test(t, `cpu,regions=east value="1,0"`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "regions": "east", }, - tsdb.Fields{ + models.Fields{ "value": "1,0", // comma in the field value }, time.Unix(0, 0))) // random character escaped test(t, `cpu,regions=eas\t value=1.0`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "regions": "eas\\t", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(0, 0))) // field name using escape char. test(t, `cpu \a=1i`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "\\a": 1, // Left as parsed since it's not a known escape sequence. }, time.Unix(0, 0))) // measurement, tag and tag value with equals test(t, `cpu=load,equals\=foo=tag\=value value=1i`, - tsdb.NewPoint( + models.NewPoint( "cpu=load", // Not escaped - tsdb.Tags{ + models.Tags{ "equals=foo": "tag=value", // Tag and value unescaped }, - tsdb.Fields{ + models.Fields{ "value": 1, }, time.Unix(0, 0))) @@ -649,13 +667,13 @@ func TestParsePointUnescape(t *testing.T) { func TestParsePointWithTags(t *testing.T) { test(t, "cpu,host=serverA,region=us-east value=1.0 1000000000", - tsdb.NewPoint("cpu", - tsdb.Tags{"host": "serverA", "region": "us-east"}, - tsdb.Fields{"value": 1.0}, time.Unix(1, 0))) + models.NewPoint("cpu", + models.Tags{"host": "serverA", "region": "us-east"}, + models.Fields{"value": 1.0}, time.Unix(1, 0))) } func TestParsPointWithDuplicateTags(t *testing.T) { - _, err := tsdb.ParsePoints([]byte(`cpu,host=serverA,host=serverB value=1i 1000000000`)) + _, err := models.ParsePoints([]byte(`cpu,host=serverA,host=serverB value=1i 1000000000`)) if err == nil { t.Fatalf(`ParsePoint() expected error. got nil`) } @@ -663,12 +681,12 @@ func TestParsPointWithDuplicateTags(t *testing.T) { func TestParsePointWithStringField(t *testing.T) { test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo",str2="bar" 1000000000`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": "foo", "str2": "bar", @@ -677,12 +695,12 @@ func TestParsePointWithStringField(t *testing.T) { ) test(t, `cpu,host=serverA,region=us-east str="foo \" bar" 1000000000`, - tsdb.NewPoint("cpu", - tsdb.Tags{ + models.NewPoint("cpu", + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "str": `foo " bar`, }, time.Unix(1, 0)), @@ -692,13 +710,13 @@ func TestParsePointWithStringField(t *testing.T) { func TestParsePointWithStringWithSpaces(t *testing.T) { test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo bar" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": "foo bar", // spaces in string value }, @@ -708,13 +726,13 @@ func TestParsePointWithStringWithSpaces(t *testing.T) { func TestParsePointWithStringWithNewline(t *testing.T) { test(t, "cpu,host=serverA,region=us-east value=1.0,str=\"foo\nbar\" 1000000000", - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": "foo\nbar", // newline in string value }, @@ -725,13 +743,13 @@ func TestParsePointWithStringWithNewline(t *testing.T) { func TestParsePointWithStringWithCommas(t *testing.T) { // escaped comma test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo\,bar" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": `foo\,bar`, // commas in string value }, @@ -740,13 +758,13 @@ func TestParsePointWithStringWithCommas(t *testing.T) { // non-escaped comma test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo,bar" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": "foo,bar", // commas in string value }, @@ -757,13 +775,13 @@ func TestParsePointWithStringWithCommas(t *testing.T) { func TestParsePointQuotedMeasurement(t *testing.T) { // non-escaped comma test(t, `"cpu",host=serverA,region=us-east value=1.0 1000000000`, - tsdb.NewPoint( + models.NewPoint( `"cpu"`, - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(1, 0)), @@ -772,29 +790,57 @@ func TestParsePointQuotedMeasurement(t *testing.T) { func TestParsePointQuotedTags(t *testing.T) { test(t, `cpu,"host"="serverA",region=us-east value=1.0 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ `"host"`: `"serverA"`, "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, }, time.Unix(1, 0)), ) } +func TestParsePointsUnbalancedQuotedTags(t *testing.T) { + pts, err := models.ParsePointsString("baz,mytag=\"a x=1 1441103862125\nbaz,mytag=a z=1 1441103862126") + if err != nil { + t.Fatalf("ParsePoints failed: %v", err) + } + + if exp := 2; len(pts) != exp { + t.Fatalf("ParsePoints count mismatch. got %v, exp %v", len(pts), exp) + } + + // Expected " in the tag value + exp := models.NewPoint("baz", models.Tags{"mytag": `"a`}, + models.Fields{"x": float64(1)}, time.Unix(0, 1441103862125)) + + if pts[0].String() != exp.String() { + t.Errorf("Point mismatch:\ngot: %v\nexp: %v", pts[0].String(), exp.String()) + } + + // Expected two points to ensure we did not overscan the line + exp = models.NewPoint("baz", models.Tags{"mytag": `a`}, + models.Fields{"z": float64(1)}, time.Unix(0, 1441103862126)) + + if pts[1].String() != exp.String() { + t.Errorf("Point mismatch:\ngot: %v\nexp: %v", pts[1].String(), exp.String()) + } + +} + func TestParsePointEscapedStringsAndCommas(t *testing.T) { // non-escaped comma and quotes test(t, `cpu,host=serverA,region=us-east value="{Hello\"{,}\" World}" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": `{Hello"{,}" World}`, }, time.Unix(1, 0)), @@ -802,13 +848,13 @@ func TestParsePointEscapedStringsAndCommas(t *testing.T) { // escaped comma and quotes test(t, `cpu,host=serverA,region=us-east value="{Hello\"{\,}\" World}" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": `{Hello"{\,}" World}`, }, time.Unix(1, 0)), @@ -817,13 +863,13 @@ func TestParsePointEscapedStringsAndCommas(t *testing.T) { func TestParsePointWithStringWithEquals(t *testing.T) { test(t, `cpu,host=serverA,region=us-east str="foo=bar",value=1.0 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": 1.0, "str": "foo=bar", // spaces in string value }, @@ -833,40 +879,40 @@ func TestParsePointWithStringWithEquals(t *testing.T) { func TestParsePointWithStringWithBackslash(t *testing.T) { test(t, `cpu value="test\\\"" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": `test\"`, }, time.Unix(1, 0)), ) test(t, `cpu value="test\\" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": `test\`, }, time.Unix(1, 0)), ) test(t, `cpu value="test\\\"" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": `test\"`, }, time.Unix(1, 0)), ) test(t, `cpu value="test\"" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": `test"`, }, time.Unix(1, 0)), @@ -875,13 +921,13 @@ func TestParsePointWithStringWithBackslash(t *testing.T) { func TestParsePointWithBoolField(t *testing.T) { test(t, `cpu,host=serverA,region=us-east true=true,t=t,T=T,TRUE=TRUE,True=True,false=false,f=f,F=F,FALSE=FALSE,False=False 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "t": true, "T": true, "true": true, @@ -899,13 +945,13 @@ func TestParsePointWithBoolField(t *testing.T) { func TestParsePointUnicodeString(t *testing.T) { test(t, `cpu,host=serverA,region=us-east value="wè" 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{ + models.Tags{ "host": "serverA", "region": "us-east", }, - tsdb.Fields{ + models.Fields{ "value": "wè", }, time.Unix(1, 0)), @@ -914,10 +960,10 @@ func TestParsePointUnicodeString(t *testing.T) { func TestNewPointFloatWithoutDecimal(t *testing.T) { test(t, `cpu value=1 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": 1.0, }, time.Unix(1, 0)), @@ -925,10 +971,10 @@ func TestNewPointFloatWithoutDecimal(t *testing.T) { } func TestNewPointNegativeFloat(t *testing.T) { test(t, `cpu value=-0.64 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": -0.64, }, time.Unix(1, 0)), @@ -937,10 +983,10 @@ func TestNewPointNegativeFloat(t *testing.T) { func TestNewPointFloatNoDecimal(t *testing.T) { test(t, `cpu value=1. 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": 1.0, }, time.Unix(1, 0)), @@ -949,10 +995,10 @@ func TestNewPointFloatNoDecimal(t *testing.T) { func TestNewPointFloatScientific(t *testing.T) { test(t, `cpu value=6.632243e+06 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": float64(6632243), }, time.Unix(1, 0)), @@ -961,10 +1007,10 @@ func TestNewPointFloatScientific(t *testing.T) { func TestNewPointLargeInteger(t *testing.T) { test(t, `cpu value=6632243i 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": 6632243, // if incorrectly encoded as a float, it would show up as 6.632243e+06 }, time.Unix(1, 0)), @@ -973,30 +1019,30 @@ func TestNewPointLargeInteger(t *testing.T) { func TestNewPointNaN(t *testing.T) { test(t, `cpu value=NaN 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": math.NaN(), }, time.Unix(1, 0)), ) test(t, `cpu value=nAn 1000000000`, - tsdb.NewPoint( + models.NewPoint( "cpu", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": math.NaN(), }, time.Unix(1, 0)), ) test(t, `nan value=NaN`, - tsdb.NewPoint( + models.NewPoint( "nan", - tsdb.Tags{}, - tsdb.Fields{ + models.Tags{}, + models.Fields{ "value": math.NaN(), }, time.Unix(0, 0)), @@ -1010,7 +1056,7 @@ func TestNewPointLargeNumberOfTags(t *testing.T) { tags += fmt.Sprintf(",tag%d=value%d", i, i) } - pt, err := tsdb.ParsePointsString(fmt.Sprintf("cpu%s value=1", tags)) + pt, err := models.ParsePointsString(fmt.Sprintf("cpu%s value=1", tags)) if err != nil { t.Fatalf("ParsePoints() with max tags failed: %v", err) } @@ -1021,7 +1067,7 @@ func TestNewPointLargeNumberOfTags(t *testing.T) { } func TestParsePointIntsFloats(t *testing.T) { - pts, err := tsdb.ParsePoints([]byte(`cpu,host=serverA,region=us-east int=10i,float=11.0,float2=12.1 1000000000`)) + pts, err := models.ParsePoints([]byte(`cpu,host=serverA,region=us-east int=10i,float=11.0,float2=12.1 1000000000`)) if err != nil { t.Fatalf(`ParsePoints() failed. got %s`, err) } @@ -1046,7 +1092,7 @@ func TestParsePointIntsFloats(t *testing.T) { } func TestParsePointKeyUnsorted(t *testing.T) { - pts, err := tsdb.ParsePoints([]byte("cpu,last=1,first=2 value=1i")) + pts, err := models.ParsePoints([]byte("cpu,last=1,first=2 value=1i")) if err != nil { t.Fatalf(`ParsePoints() failed. got %s`, err) } @@ -1062,8 +1108,8 @@ func TestParsePointKeyUnsorted(t *testing.T) { } func TestParsePointToString(t *testing.T) { - line := `cpu,host=serverA,region=us-east bool=false,float=11.0,float2=12.123,int=10i,str="string val" 1000000000` - pts, err := tsdb.ParsePoints([]byte(line)) + line := `cpu,host=serverA,region=us-east bool=false,float=11,float2=12.123,int=10i,str="string val" 1000000000` + pts, err := models.ParsePoints([]byte(line)) if err != nil { t.Fatalf(`ParsePoints() failed. got %s`, err) } @@ -1077,8 +1123,8 @@ func TestParsePointToString(t *testing.T) { t.Errorf("ParsePoint() to string mismatch:\n got %v\n exp %v", got, line) } - pt = tsdb.NewPoint("cpu", tsdb.Tags{"host": "serverA", "region": "us-east"}, - tsdb.Fields{"int": 10, "float": float64(11.0), "float2": float64(12.123), "bool": false, "str": "string val"}, + pt = models.NewPoint("cpu", models.Tags{"host": "serverA", "region": "us-east"}, + models.Fields{"int": 10, "float": float64(11.0), "float2": float64(12.123), "bool": false, "str": "string val"}, time.Unix(1, 0)) got = pt.String() @@ -1138,7 +1184,7 @@ func TestParsePointsWithPrecision(t *testing.T) { }, } for _, test := range tests { - pts, err := tsdb.ParsePointsWithPrecision([]byte(test.line), time.Now().UTC(), test.precision) + pts, err := models.ParsePointsWithPrecision([]byte(test.line), time.Now().UTC(), test.precision) if err != nil { t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err) } @@ -1200,7 +1246,7 @@ func TestParsePointsWithPrecisionNoTime(t *testing.T) { } for _, test := range tests { - pts, err := tsdb.ParsePointsWithPrecision([]byte(line), tm, test.precision) + pts, err := models.ParsePointsWithPrecision([]byte(line), tm, test.precision) if err != nil { t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err) } @@ -1252,7 +1298,7 @@ cpu,host=serverA,region=us-east value=1.0 946730096789012345`, }, } for _, test := range tests { - pts, err := tsdb.ParsePointsWithPrecision([]byte(test.batch), time.Now().UTC(), "") + pts, err := models.ParsePointsWithPrecision([]byte(test.batch), time.Now().UTC(), "") if err != nil { t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err) } @@ -1274,34 +1320,34 @@ cpu,host=serverA,region=us-east value=1.0 946730096789012345`, func TestNewPointEscaped(t *testing.T) { // commas - pt := tsdb.NewPoint("cpu,main", tsdb.Tags{"tag,bar": "value"}, tsdb.Fields{"name,bar": 1.0}, time.Unix(0, 0)) - if exp := `cpu\,main,tag\,bar=value name\,bar=1.0 0`; pt.String() != exp { + pt := models.NewPoint("cpu,main", models.Tags{"tag,bar": "value"}, models.Fields{"name,bar": 1.0}, time.Unix(0, 0)) + if exp := `cpu\,main,tag\,bar=value name\,bar=1 0`; pt.String() != exp { t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp) } // spaces - pt = tsdb.NewPoint("cpu main", tsdb.Tags{"tag bar": "value"}, tsdb.Fields{"name bar": 1.0}, time.Unix(0, 0)) - if exp := `cpu\ main,tag\ bar=value name\ bar=1.0 0`; pt.String() != exp { + pt = models.NewPoint("cpu main", models.Tags{"tag bar": "value"}, models.Fields{"name bar": 1.0}, time.Unix(0, 0)) + if exp := `cpu\ main,tag\ bar=value name\ bar=1 0`; pt.String() != exp { t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp) } // equals - pt = tsdb.NewPoint("cpu=main", tsdb.Tags{"tag=bar": "value=foo"}, tsdb.Fields{"name=bar": 1.0}, time.Unix(0, 0)) - if exp := `cpu=main,tag\=bar=value\=foo name\=bar=1.0 0`; pt.String() != exp { + pt = models.NewPoint("cpu=main", models.Tags{"tag=bar": "value=foo"}, models.Fields{"name=bar": 1.0}, time.Unix(0, 0)) + if exp := `cpu=main,tag\=bar=value\=foo name\=bar=1 0`; pt.String() != exp { t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp) } } func TestNewPointUnhandledType(t *testing.T) { // nil value - pt := tsdb.NewPoint("cpu", nil, tsdb.Fields{"value": nil}, time.Unix(0, 0)) + pt := models.NewPoint("cpu", nil, models.Fields{"value": nil}, time.Unix(0, 0)) if exp := `cpu value= 0`; pt.String() != exp { t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp) } // unsupported type gets stored as string now := time.Unix(0, 0).UTC() - pt = tsdb.NewPoint("cpu", nil, tsdb.Fields{"value": now}, time.Unix(0, 0)) + pt = models.NewPoint("cpu", nil, models.Fields{"value": now}, time.Unix(0, 0)) if exp := `cpu value="1970-01-01 00:00:00 +0000 UTC" 0`; pt.String() != exp { t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp) } @@ -1312,20 +1358,76 @@ func TestNewPointUnhandledType(t *testing.T) { } func TestMakeKeyEscaped(t *testing.T) { - if exp, got := `cpu\ load`, tsdb.MakeKey([]byte(`cpu\ load`), tsdb.Tags{}); string(got) != exp { + if exp, got := `cpu\ load`, models.MakeKey([]byte(`cpu\ load`), models.Tags{}); string(got) != exp { t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp) } - if exp, got := `cpu\ load`, tsdb.MakeKey([]byte(`cpu load`), tsdb.Tags{}); string(got) != exp { + if exp, got := `cpu\ load`, models.MakeKey([]byte(`cpu load`), models.Tags{}); string(got) != exp { t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp) } - if exp, got := `cpu\,load`, tsdb.MakeKey([]byte(`cpu\,load`), tsdb.Tags{}); string(got) != exp { + if exp, got := `cpu\,load`, models.MakeKey([]byte(`cpu\,load`), models.Tags{}); string(got) != exp { t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp) } - if exp, got := `cpu\,load`, tsdb.MakeKey([]byte(`cpu,load`), tsdb.Tags{}); string(got) != exp { + if exp, got := `cpu\,load`, models.MakeKey([]byte(`cpu,load`), models.Tags{}); string(got) != exp { t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp) } } + +func TestPrecisionString(t *testing.T) { + tags := map[string]interface{}{"value": float64(1)} + tm, _ := time.Parse(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z") + tests := []struct { + name string + precision string + exp string + }{ + { + name: "no precision", + precision: "", + exp: "cpu value=1 946730096789012345", + }, + { + name: "nanosecond precision", + precision: "ns", + exp: "cpu value=1 946730096789012345", + }, + { + name: "microsecond precision", + precision: "u", + exp: "cpu value=1 946730096789012", + }, + { + name: "millisecond precision", + precision: "ms", + exp: "cpu value=1 946730096789", + }, + { + name: "second precision", + precision: "s", + exp: "cpu value=1 946730096", + }, + { + name: "minute precision", + precision: "m", + exp: "cpu value=1 15778834", + }, + { + name: "hour precision", + precision: "h", + exp: "cpu value=1 262980", + }, + } + + for _, test := range tests { + pt := models.NewPoint("cpu", nil, tags, tm) + act := pt.PrecisionString(test.precision) + + if act != test.exp { + t.Errorf("%s: PrecisionString() mismatch:\n actual: %v\n exp: %v", + test.name, act, test.exp) + } + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go new file mode 100644 index 000000000..a4350faa7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go @@ -0,0 +1,59 @@ +package models + +import ( + "hash/fnv" + "sort" +) + +// Row represents a single row returned from the execution of a statement. +type Row struct { + Name string `json:"name,omitempty"` + Tags map[string]string `json:"tags,omitempty"` + Columns []string `json:"columns,omitempty"` + Values [][]interface{} `json:"values,omitempty"` + Err error `json:"err,omitempty"` +} + +// SameSeries returns true if r contains values for the same series as o. +func (r *Row) SameSeries(o *Row) bool { + return r.tagsHash() == o.tagsHash() && r.Name == o.Name +} + +// tagsHash returns a hash of tag key/value pairs. +func (r *Row) tagsHash() uint64 { + h := fnv.New64a() + keys := r.tagsKeys() + for _, k := range keys { + h.Write([]byte(k)) + h.Write([]byte(r.Tags[k])) + } + return h.Sum64() +} + +// tagKeys returns a sorted list of tag keys. +func (r *Row) tagsKeys() []string { + a := make([]string, 0, len(r.Tags)) + for k := range r.Tags { + a = append(a, k) + } + sort.Strings(a) + return a +} + +type Rows []*Row + +func (p Rows) Len() int { return len(p) } + +func (p Rows) Less(i, j int) bool { + // Sort by name first. + if p[i].Name != p[j].Name { + return p[i].Name < p[j].Name + } + + // Sort by tag set hash. Tags don't have a meaningful sort order so we + // just compute a hash and sort by that instead. This allows the tests + // to receive rows in a predictable order every time. + return p[i].tagsHash() < p[j].tagsHash() +} + +func (p Rows) Swap(i, j int) { p[i], p[j] = p[j], p[i] } diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md new file mode 100644 index 000000000..1218c9f2a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md @@ -0,0 +1,73 @@ +# System Monitoring +_This functionality should be considered experimental and is subject to change._ + +_System Monitoring_ means all statistical and diagnostic information made availabe to the user of InfluxDB system, about the system itself. Its purpose is to assist with troubleshooting and performance analysis of the database itself. + +## Statistics vs. Diagnostics +A distinction is made between _statistics_ and _diagnostics_ for the purposes of monitoring. Generally a statistical quality is something that is being counted, and for which it makes sense to store persistently for historical analysis. Diagnostic information is not necessarily numerical, and may not make sense to store. + +An example of statistical information would be the number of points received over UDP, or the number of queries executed. Examples of diagnostic information would be a list of current Graphite TCP connections, the version of InfluxDB, or the uptime of the process. + +## System Statistics +`SHOW STATS [FOR ]` displays statisics about subsystems within the running `influxd` process. Statistics include points received, points indexed, bytes written to disk, TCP connections handled etc. These statistics are all zero when the InfluxDB process starts. If _module_ is specified, it must be single-quoted. For example `SHOW STATS FOR 'httpd'`. + +All statistics are written, by default, by each node to a "monitor" database within the InfluxDB system, allowing analysis of aggregated statistical data using the standard InfluxQL language. This allows users to track the performance of their system. Importantly, this allows cluster-level statistics to be viewed, since by querying the monitor database, statistics from all nodes may be queried. This can be a very powerful approach for troubleshooting your InfluxDB system and understanding its behaviour. + +## System Diagnostics +`SHOW DIAGNOSTICS [FOR ]` displays various diagnostic information about the `influxd` process. This information is not stored persistently within the InfluxDB system. If _module_ is specified, it must be single-quoted. For example `SHOW STATS FOR 'build'`. + +## Standard expvar support +All statistical information is available at HTTP API endpoint `/debug/vars`, in [expvar](https://golang.org/pkg/expvar/) format, allowing external systems to monitor an InfluxDB node. By default, the full path to this endpoint is `http://localhost:8086/debug/vars`. + +## Configuration +The `monitor` module allows the following configuration: + + * Whether to write statistical and diagnostic information to an InfluxDB system. This is enabled by default. + * The name of the database to where this information should be written. Defaults to `_internal`. The information is written to the default retention policy for the given database. + * The name of the retention policy, along with full configuration control of the retention policy, if the default retention policy is not suitable. + * The rate at which this information should be written. The default rate is once every 10 seconds. + +# Design and Implementation + +A new module named `monitor` supports all basic statistics and diagnostic functionality. This includes: + + * Allowing other modules to register statistics and diagnostics information, allowing it to be accessed on demand by the `monitor` module. + * Serving the statistics and diagnostic information to the user, in response to commands such as `SHOW DIAGNOSTICS`. + * Expose standard Go runtime information such as garbage collection statistics. + * Make all collected expvar data via HTTP, for collection by 3rd-party tools. + * Writing the statistical information to the "monitor" database, for query purposes. + +## Registering statistics and diagnostics + +To export statistical information with the `monitor` system, code simply calls `influxdb.NewStatistics()` and receives an `expvar.Map` instance in response. This object can then be used to store statistics. + +For example, if you have a component called `Service`, you can statistics like so: + +``` +import ( + "expvar" + "github.com/influxdb/influxdb" +) +. +. +. +. +type Service struct { + ....some other fields.... + statMap *expvar.Map /// Add a map of type *expvar.Map. Check GoDocs for how to use this. +} + + +func NewService() *Service { + s = &NewService{} + s.statMap = NewStatistics(key, name, tags) +} +``` +When calling `NewStatistics` `key` should be unique for the Service instance (if a network service, the protocol and binding port are good to include in the key). `name` will be the name of the Measurement used to store these statistics. Finally, when these statistics are written to the `monitor` database, all points will be tagged with `tags`. A value of nil for `tags` is legal. + +To register diagnostic information, `monitor.RegisterDiagnosticsClient` is called, passing a `influxdb.monitor.DiagsClient` object to `monitor`. Implementing the `influxdb.monitor.DiagsClient` interface requires that your component have function returning diagnostic information in specific form, so that it can be displayed by the `monitor` system. + +## expvar +Statistical information is gathered by each package using [expvar](https://golang.org/pkg/expvar). Each package registers a map using its package name. + +Due to the nature of `expvar`, statistical information is reset to its initial state when a server is restarted. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go new file mode 100644 index 000000000..d65ae5a45 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go @@ -0,0 +1,20 @@ +package monitor + +// system captures build diagnostics +type build struct { + Version string + Commit string + Branch string + Time string +} + +func (b *build) Diagnostics() (*Diagnostic, error) { + diagnostics := map[string]interface{}{ + "Version": b.Version, + "Commit": b.Commit, + "Branch": b.Branch, + "Build Time": b.Time, + } + + return DiagnosticFromMap(diagnostics), nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go new file mode 100644 index 000000000..a5a78bf28 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go @@ -0,0 +1,35 @@ +package monitor + +import ( + "time" + + "github.com/influxdb/influxdb/toml" +) + +const ( + // DefaultStoreEnabled is whether the system writes gathered information in + // an InfluxDB system for historical analysis. + DefaultStoreEnabled = true + + // DefaultStoreDatabase is the name of the database where gathered information is written + DefaultStoreDatabase = "_internal" + + // DefaultStoreInterval is the period between storing gathered information. + DefaultStoreInterval = 10 * time.Second +) + +// Config represents the configuration for the monitor service. +type Config struct { + StoreEnabled bool `toml:"store-enabled"` + StoreDatabase string `toml:"store-database"` + StoreInterval toml.Duration `toml:"store-interval"` +} + +// NewConfig returns an instance of Config with defaults. +func NewConfig() Config { + return Config{ + StoreEnabled: true, + StoreDatabase: DefaultStoreDatabase, + StoreInterval: toml.Duration(DefaultStoreInterval), + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go new file mode 100644 index 000000000..ee62e7346 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go @@ -0,0 +1,30 @@ +package monitor_test + +import ( + "testing" + "time" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/monitor" +) + +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c monitor.Config + if _, err := toml.Decode(` +store-enabled=true +store-database="the_db" +store-interval="10m" +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if !c.StoreEnabled { + t.Fatalf("unexpected store-enabled: %v", c.StoreEnabled) + } else if c.StoreDatabase != "the_db" { + t.Fatalf("unexpected store-database: %s", c.StoreDatabase) + } else if time.Duration(c.StoreInterval) != 10*time.Minute { + t.Fatalf("unexpected store-interval: %s", c.StoreInterval) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go new file mode 100644 index 000000000..f45f4fce2 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go @@ -0,0 +1,19 @@ +package monitor + +import ( + "runtime" +) + +// goRuntime captures Go runtime diagnostics +type goRuntime struct{} + +func (g *goRuntime) Diagnostics() (*Diagnostic, error) { + diagnostics := map[string]interface{}{ + "GOARCH": runtime.GOARCH, + "GOOS": runtime.GOOS, + "GOMAXPROCS": runtime.GOMAXPROCS(-1), + "version": runtime.Version(), + } + + return DiagnosticFromMap(diagnostics), nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go new file mode 100644 index 000000000..80c0f6c9c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go @@ -0,0 +1,21 @@ +package monitor + +import ( + "os" +) + +// network captures network diagnostics +type network struct{} + +func (n *network) Diagnostics() (*Diagnostic, error) { + h, err := os.Hostname() + if err != nil { + return nil, err + } + + diagnostics := map[string]interface{}{ + "hostname": h, + } + + return DiagnosticFromMap(diagnostics), nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go new file mode 100644 index 000000000..3e76f6b1d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go @@ -0,0 +1,434 @@ +package monitor + +import ( + "expvar" + "fmt" + "log" + "os" + "runtime" + "sort" + "strconv" + "sync" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" +) + +const leaderWaitTimeout = 30 * time.Second + +const ( + MonitorRetentionPolicy = "monitor" + MonitorRetentionPolicyDuration = 7 * 24 * time.Hour +) + +// DiagsClient is the interface modules implement if they register diags with monitor. +type DiagsClient interface { + Diagnostics() (*Diagnostic, error) +} + +// The DiagsClientFunc type is an adapter to allow the use of +// ordinary functions as Diagnostis clients. +type DiagsClientFunc func() (*Diagnostic, error) + +// Diagnostics calls f(). +func (f DiagsClientFunc) Diagnostics() (*Diagnostic, error) { + return f() +} + +// Diagnostic represents a table of diagnostic information. The first value +// is the name of the columns, the second is a slice of interface slices containing +// the values for each column, by row. This information is never written to an InfluxDB +// system and is display-only. An example showing, say, connections follows: +// +// source_ip source_port dest_ip dest_port +// 182.1.0.2 2890 127.0.0.1 38901 +// 174.33.1.2 2924 127.0.0.1 38902 +type Diagnostic struct { + Columns []string + Rows [][]interface{} +} + +func NewDiagnostic(columns []string) *Diagnostic { + return &Diagnostic{ + Columns: columns, + Rows: make([][]interface{}, 0), + } +} + +func (d *Diagnostic) AddRow(r []interface{}) { + d.Rows = append(d.Rows, r) +} + +// Monitor represents an instance of the monitor system. +type Monitor struct { + // Build information for diagnostics. + Version string + Commit string + Branch string + BuildTime string + + wg sync.WaitGroup + done chan struct{} + mu sync.Mutex + + diagRegistrations map[string]DiagsClient + + storeCreated bool + storeEnabled bool + storeDatabase string + storeRetentionPolicy string + storeRetentionDuration time.Duration + storeReplicationFactor int + storeAddress string + storeInterval time.Duration + + MetaStore interface { + ClusterID() (uint64, error) + NodeID() uint64 + WaitForLeader(d time.Duration) error + IsLeader() bool + CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) + CreateRetentionPolicyIfNotExists(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) + SetDefaultRetentionPolicy(database, name string) error + DropRetentionPolicy(database, name string) error + } + + PointsWriter interface { + WritePoints(p *cluster.WritePointsRequest) error + } + + Logger *log.Logger +} + +// New returns a new instance of the monitor system. +func New(c Config) *Monitor { + return &Monitor{ + done: make(chan struct{}), + diagRegistrations: make(map[string]DiagsClient), + storeEnabled: c.StoreEnabled, + storeDatabase: c.StoreDatabase, + storeInterval: time.Duration(c.StoreInterval), + Logger: log.New(os.Stderr, "[monitor] ", log.LstdFlags), + } +} + +// Open opens the monitoring system, using the given clusterID, node ID, and hostname +// for identification purposem. +func (m *Monitor) Open() error { + m.Logger.Printf("Starting monitor system") + + // Self-register various stats and diagnostics. + m.RegisterDiagnosticsClient("build", &build{ + Version: m.Version, + Commit: m.Commit, + Branch: m.Branch, + Time: m.BuildTime, + }) + m.RegisterDiagnosticsClient("runtime", &goRuntime{}) + m.RegisterDiagnosticsClient("network", &network{}) + m.RegisterDiagnosticsClient("system", &system{}) + + // If enabled, record stats in a InfluxDB system. + if m.storeEnabled { + + // Start periodic writes to system. + m.wg.Add(1) + go m.storeStatistics() + } + + return nil +} + +// Close closes the monitor system. +func (m *Monitor) Close() { + m.Logger.Println("shutting down monitor system") + close(m.done) + m.wg.Wait() + m.done = nil +} + +// SetLogger sets the internal logger to the logger passed in. +func (m *Monitor) SetLogger(l *log.Logger) { + m.Logger = l +} + +// RegisterDiagnosticsClient registers a diagnostics client with the given name and tags. +func (m *Monitor) RegisterDiagnosticsClient(name string, client DiagsClient) { + m.mu.Lock() + defer m.mu.Unlock() + m.diagRegistrations[name] = client + m.Logger.Printf(`'%s' registered for diagnostics monitoring`, name) +} + +// DeregisterDiagnosticsClient deregisters a diagnostics client by name. +func (m *Monitor) DeregisterDiagnosticsClient(name string) { + m.mu.Lock() + defer m.mu.Unlock() + delete(m.diagRegistrations, name) +} + +// Statistics returns the combined statistics for all expvar data. The given +// tags are added to each of the returned statistics. +func (m *Monitor) Statistics(tags map[string]string) ([]*statistic, error) { + statistics := make([]*statistic, 0) + + expvar.Do(func(kv expvar.KeyValue) { + // Skip built-in expvar stats. + if kv.Key == "memstats" || kv.Key == "cmdline" { + return + } + + statistic := &statistic{ + Tags: make(map[string]string), + Values: make(map[string]interface{}), + } + + // Add any supplied tags. + for k, v := range tags { + statistic.Tags[k] = v + } + + // Every other top-level expvar value is a map. + m := kv.Value.(*expvar.Map) + + m.Do(func(subKV expvar.KeyValue) { + switch subKV.Key { + case "name": + // straight to string name. + u, err := strconv.Unquote(subKV.Value.String()) + if err != nil { + return + } + statistic.Name = u + case "tags": + // string-string tags map. + n := subKV.Value.(*expvar.Map) + n.Do(func(t expvar.KeyValue) { + u, err := strconv.Unquote(t.Value.String()) + if err != nil { + return + } + statistic.Tags[t.Key] = u + }) + case "values": + // string-interface map. + n := subKV.Value.(*expvar.Map) + n.Do(func(kv expvar.KeyValue) { + var f interface{} + var err error + switch v := kv.Value.(type) { + case *expvar.Float: + f, err = strconv.ParseFloat(v.String(), 64) + if err != nil { + return + } + case *expvar.Int: + f, err = strconv.ParseInt(v.String(), 10, 64) + if err != nil { + return + } + default: + return + } + statistic.Values[kv.Key] = f + }) + } + }) + + // If a registered client has no field data, don't include it in the results + if len(statistic.Values) == 0 { + return + } + + statistics = append(statistics, statistic) + }) + + // Add Go memstats. + statistic := &statistic{ + Name: "runtime", + Tags: make(map[string]string), + Values: make(map[string]interface{}), + } + + // Add any supplied tags to Go memstats + for k, v := range tags { + statistic.Tags[k] = v + } + + var rt runtime.MemStats + runtime.ReadMemStats(&rt) + statistic.Values = map[string]interface{}{ + "Alloc": int64(rt.Alloc), + "TotalAlloc": int64(rt.TotalAlloc), + "Sys": int64(rt.Sys), + "Lookups": int64(rt.Lookups), + "Mallocs": int64(rt.Mallocs), + "Frees": int64(rt.Frees), + "HeapAlloc": int64(rt.HeapAlloc), + "HeapSys": int64(rt.HeapSys), + "HeapIdle": int64(rt.HeapIdle), + "HeapInUse": int64(rt.HeapInuse), + "HeapReleased": int64(rt.HeapReleased), + "HeapObjects": int64(rt.HeapObjects), + "PauseTotalNs": int64(rt.PauseTotalNs), + "NumGC": int64(rt.NumGC), + "NumGoroutine": int64(runtime.NumGoroutine()), + } + statistics = append(statistics, statistic) + + return statistics, nil +} + +func (m *Monitor) Diagnostics() (map[string]*Diagnostic, error) { + m.mu.Lock() + defer m.mu.Unlock() + + diags := make(map[string]*Diagnostic, len(m.diagRegistrations)) + for k, v := range m.diagRegistrations { + d, err := v.Diagnostics() + if err != nil { + continue + } + diags[k] = d + } + return diags, nil +} + +// createInternalStorage ensures the internal storage has been created. +func (m *Monitor) createInternalStorage() { + if !m.MetaStore.IsLeader() || m.storeCreated { + return + } + + if _, err := m.MetaStore.CreateDatabaseIfNotExists(m.storeDatabase); err != nil { + m.Logger.Printf("failed to create database '%s', failed to create storage: %s", + m.storeDatabase, err.Error()) + return + } + + rpi := meta.NewRetentionPolicyInfo(MonitorRetentionPolicy) + rpi.Duration = MonitorRetentionPolicyDuration + rpi.ReplicaN = 1 + if _, err := m.MetaStore.CreateRetentionPolicyIfNotExists(m.storeDatabase, rpi); err != nil { + m.Logger.Printf("failed to create retention policy '%s', failed to create internal storage: %s", + rpi.Name, err.Error()) + return + } + + if err := m.MetaStore.SetDefaultRetentionPolicy(m.storeDatabase, rpi.Name); err != nil { + m.Logger.Printf("failed to set default retention policy on '%s', failed to create internal storage: %s", + m.storeDatabase, err.Error()) + return + } + + if err := m.MetaStore.DropRetentionPolicy(m.storeDatabase, "default"); err != nil && err != meta.ErrRetentionPolicyNotFound { + m.Logger.Printf("failed to delete retention policy 'default', failed to created internal storage: %s", err.Error()) + return + } + + // Mark storage creation complete. + m.storeCreated = true +} + +// storeStatistics writes the statistics to an InfluxDB system. +func (m *Monitor) storeStatistics() { + defer m.wg.Done() + m.Logger.Printf("Storing statistics in database '%s' retention policy '%s', at interval %s", + m.storeDatabase, m.storeRetentionPolicy, m.storeInterval) + + if err := m.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil { + m.Logger.Printf("failed to detect a cluster leader, terminating storage: %s", err.Error()) + return + } + + // Get cluster-level metadata. Nothing different is going to happen if errors occur. + clusterID, _ := m.MetaStore.ClusterID() + nodeID := m.MetaStore.NodeID() + hostname, _ := os.Hostname() + clusterTags := map[string]string{ + "clusterID": fmt.Sprintf("%d", clusterID), + "nodeID": fmt.Sprintf("%d", nodeID), + "hostname": hostname, + } + + tick := time.NewTicker(m.storeInterval) + defer tick.Stop() + for { + select { + case <-tick.C: + m.createInternalStorage() + + stats, err := m.Statistics(clusterTags) + if err != nil { + m.Logger.Printf("failed to retrieve registered statistics: %s", err) + continue + } + + points := make(models.Points, 0, len(stats)) + for _, s := range stats { + points = append(points, models.NewPoint(s.Name, s.Tags, s.Values, time.Now())) + } + + err = m.PointsWriter.WritePoints(&cluster.WritePointsRequest{ + Database: m.storeDatabase, + RetentionPolicy: m.storeRetentionPolicy, + ConsistencyLevel: cluster.ConsistencyLevelOne, + Points: points, + }) + if err != nil { + m.Logger.Printf("failed to store statistics: %s", err) + } + case <-m.done: + m.Logger.Printf("terminating storage of statistics") + return + } + + } +} + +// statistic represents the information returned by a single monitor client. +type statistic struct { + Name string + Tags map[string]string + Values map[string]interface{} +} + +// newStatistic returns a new statistic object. +func newStatistic(name string, tags map[string]string, values map[string]interface{}) *statistic { + return &statistic{ + Name: name, + Tags: tags, + Values: values, + } +} + +// valueNames returns a sorted list of the value names, if any. +func (s *statistic) valueNames() []string { + a := make([]string, 0, len(s.Values)) + for k, _ := range s.Values { + a = append(a, k) + } + sort.Strings(a) + return a +} + +// DiagnosticFromMap returns a Diagnostic from a map. +func DiagnosticFromMap(m map[string]interface{}) *Diagnostic { + // Display columns in deterministic order. + sortedKeys := make([]string, 0, len(m)) + for k, _ := range m { + sortedKeys = append(sortedKeys, k) + } + sort.Strings(sortedKeys) + + d := NewDiagnostic(sortedKeys) + row := make([]interface{}, len(sortedKeys)) + for i, k := range sortedKeys { + row[i] = m[k] + } + d.AddRow(row) + + return d +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go new file mode 100644 index 000000000..776e59a57 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go @@ -0,0 +1,72 @@ +package monitor + +import ( + "strings" + "testing" + "time" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/meta" +) + +// Test that a registered stats client results in the correct SHOW STATS output. +func Test_RegisterStats(t *testing.T) { + monitor := openMonitor(t) + executor := &StatementExecutor{Monitor: monitor} + + // Register stats without tags. + statMap := influxdb.NewStatistics("foo", "foo", nil) + statMap.Add("bar", 1) + statMap.AddFloat("qux", 2.4) + json := executeShowStatsJSON(t, executor) + if !strings.Contains(json, `"columns":["bar","qux"],"values":[[1,2.4]]`) || !strings.Contains(json, `"name":"foo"`) { + t.Fatalf("SHOW STATS response incorrect, got: %s\n", json) + } + + // Register a client with tags. + statMap = influxdb.NewStatistics("bar", "baz", map[string]string{"proto": "tcp"}) + statMap.Add("bar", 1) + statMap.AddFloat("qux", 2.4) + json = executeShowStatsJSON(t, executor) + if !strings.Contains(json, `"columns":["bar","qux"],"values":[[1,2.4]]`) || + !strings.Contains(json, `"name":"baz"`) || + !strings.Contains(json, `"proto":"tcp"`) { + t.Fatalf("SHOW STATS response incorrect, got: %s\n", json) + + } +} + +type mockMetastore struct{} + +func (m *mockMetastore) ClusterID() (uint64, error) { return 1, nil } +func (m *mockMetastore) NodeID() uint64 { return 2 } +func (m *mockMetastore) WaitForLeader(d time.Duration) error { return nil } +func (m *mockMetastore) IsLeader() bool { return true } +func (m *mockMetastore) SetDefaultRetentionPolicy(database, name string) error { return nil } +func (m *mockMetastore) DropRetentionPolicy(database, name string) error { return nil } +func (m *mockMetastore) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) { + return nil, nil +} +func (m *mockMetastore) CreateRetentionPolicyIfNotExists(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) { + return nil, nil +} + +func openMonitor(t *testing.T) *Monitor { + monitor := New(NewConfig()) + monitor.MetaStore = &mockMetastore{} + err := monitor.Open() + if err != nil { + t.Fatalf("failed to open monitor: %s", err.Error()) + } + return monitor +} + +func executeShowStatsJSON(t *testing.T, s *StatementExecutor) string { + r := s.ExecuteStatement(&influxql.ShowStatsStatement{}) + b, err := r.MarshalJSON() + if err != nil { + t.Fatalf("failed to decode SHOW STATS response: %s", err.Error()) + } + return string(b) +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go new file mode 100644 index 000000000..acfff7bea --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go @@ -0,0 +1,81 @@ +package monitor + +import ( + "fmt" + "sort" + + "github.com/influxdb/influxdb/influxql" + "github.com/influxdb/influxdb/models" +) + +// StatementExecutor translates InfluxQL queries to Monitor methods. +type StatementExecutor struct { + Monitor interface { + Statistics(map[string]string) ([]*statistic, error) + Diagnostics() (map[string]*Diagnostic, error) + } +} + +// ExecuteStatement executes monitor-related query statements. +func (s *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql.Result { + switch stmt := stmt.(type) { + case *influxql.ShowStatsStatement: + return s.executeShowStatistics(stmt.Module) + case *influxql.ShowDiagnosticsStatement: + return s.executeShowDiagnostics(stmt.Module) + default: + panic(fmt.Sprintf("unsupported statement type: %T", stmt)) + } +} + +func (s *StatementExecutor) executeShowStatistics(module string) *influxql.Result { + stats, err := s.Monitor.Statistics(nil) + if err != nil { + return &influxql.Result{Err: err} + } + rows := make([]*models.Row, 0) + + for _, stat := range stats { + if module != "" && stat.Name != module { + continue + } + row := &models.Row{Name: stat.Name, Tags: stat.Tags} + + values := make([]interface{}, 0, len(stat.Values)) + for _, k := range stat.valueNames() { + row.Columns = append(row.Columns, k) + values = append(values, stat.Values[k]) + } + row.Values = [][]interface{}{values} + rows = append(rows, row) + } + return &influxql.Result{Series: rows} +} + +func (s *StatementExecutor) executeShowDiagnostics(module string) *influxql.Result { + diags, err := s.Monitor.Diagnostics() + if err != nil { + return &influxql.Result{Err: err} + } + rows := make([]*models.Row, 0, len(diags)) + + // Get a sorted list of diagnostics keys. + sortedKeys := make([]string, 0, len(diags)) + for k, _ := range diags { + sortedKeys = append(sortedKeys, k) + } + sort.Strings(sortedKeys) + + for _, k := range sortedKeys { + if module != "" && k != module { + continue + } + + row := &models.Row{Name: k} + + row.Columns = diags[k].Columns + row.Values = diags[k].Rows + rows = append(rows, row) + } + return &influxql.Result{Series: rows} +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go new file mode 100644 index 000000000..1f113f176 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go @@ -0,0 +1,26 @@ +package monitor + +import ( + "os" + "time" +) + +var startTime time.Time + +func init() { + startTime = time.Now().UTC() +} + +// system captures system-level diagnostics +type system struct{} + +func (s *system) Diagnostics() (*Diagnostic, error) { + diagnostics := map[string]interface{}{ + "PID": os.Getpid(), + "currentTime": time.Now().UTC(), + "started": startTime, + "uptime": time.Since(startTime).String(), + } + + return DiagnosticFromMap(diagnostics), nil +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh new file mode 100644 index 000000000..992e8fb20 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +SWAKS="/root/swaks" + +# Bump this whenever a release branch is created from master +MASTER_VERSION=0.9.5 + +# send_failure_notification sends an e-mail with a build failure notification. +function send_failure_notification { + smtp=$1 + user=$2 + password=$3 + to=$4 + version=$5 + $SWAKS --auth \ + --server $smtp \ + --au $user \ + --ap $password \ + --to $to \ + --h-Subject: "Nightly build has FAILED" \ + --body "The nightly build has failed, version: $version" +} + +if [ $# -ne 4 ]; then + echo "$0 " + exit 1 +fi +SMTP=$1 +USER=$2 +PASSWORD=$3 +TO=$4 + +REPO_DIR=`mktemp -d` +echo "Using $REPO_DIR for all work..." + +cd $REPO_DIR +export GOPATH=`pwd` +mkdir -p $GOPATH/src/github.com/influxdb +cd $GOPATH/src/github.com/influxdb +git clone https://github.com/influxdb/influxdb.git + +cd $GOPATH/src/github.com/influxdb/influxdb +VERSION="$MASTER_VERSION-nightly-`git log --pretty=format:'%h' -n 1`" +NIGHTLY_BUILD=true ./package.sh $VERSION + +if [ $? -ne 0 ]; then + # Send notification e-mail. + send_failure_notification $SMTP $USER $PASSWORD $TO $VERSION +fi + +rm -rf $REPO_DIR diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh new file mode 100644 index 000000000..e147590bc --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh @@ -0,0 +1,611 @@ +#!/usr/bin/env bash + +########################################################################### +# Packaging script which creates debian and RPM packages. It optionally +# tags the repo with the given version. +# +# Requirements: GOPATH must be set. 'fpm' must be on the path, and the AWS +# CLI tools must also be installed. +# +# https://github.com/jordansissel/fpm +# http://aws.amazon.com/cli/ +# +# Packaging process: to package a build, simple execute: +# +# package.sh +# +# where is the desired version. If generation of a debian and RPM +# package is successful, the script will offer to tag the repo using the +# supplied version string. +# +# See package.sh -h for options +# +# AWS upload: the script will also offer to upload the packages to S3. If +# this option is selected, the credentials should be present in the file +# ~/aws.conf. The contents should be of the form: +# +# [default] +# aws_access_key_id= +# aws_secret_access_key= +# region = us-east-1 +# +# Trim the leading spaces when creating the file. The script will exit if +# S3 upload is requested, but this file does not exist. + +[ -z $DEBUG ] || set -x + +AWS_FILE=~/aws.conf + +INSTALL_ROOT_DIR=/opt/influxdb +INFLUXDB_LOG_DIR=/var/log/influxdb +INFLUXDB_DATA_DIR=/var/opt/influxdb +CONFIG_ROOT_DIR=/etc/opt/influxdb +LOGROTATE_DIR=/etc/logrotate.d + +SAMPLE_CONFIGURATION=etc/config.sample.toml +INITD_SCRIPT=scripts/init.sh +SYSTEMD_SCRIPT=scripts/influxdb.service +LOGROTATE=scripts/logrotate + +TMP_WORK_DIR=`mktemp -d` +POST_INSTALL_PATH=`mktemp` +POST_UNINSTALL_PATH=`mktemp` +ARCH=`uname -i` +LICENSE=MIT +URL=influxdb.com +MAINTAINER=support@influxdb.com +VENDOR=Influxdb +DESCRIPTION="Distributed time-series database" + +# Allow path to FPM to be set by environment variables. Some execution contexts +# like cron don't have PATH set correctly to pick it up. +if [ -z "$FPM" ]; then + FPM=`which fpm` +fi + +GO_VERSION="go1.5.1" +GOPATH_INSTALL= +BINS=( + influxd + influx + ) + +########################################################################### +# Helper functions. + +# usage prints simple usage information. +usage() { + cat << EOF >&2 +$0 [-h] [-p|-w] [-t ] [-r ] + + should be a dotted version such as 0.9.5. + + -r release candidate number, if any. + Example: -r 7 + -p just build packages + -w build packages for current working directory + imply -p + -t + build package for + can be rpm, tar or deb + can have multiple -t + + Examples: + + $0 0.9.5 -r 9 # Creates 0.9.5-rc9 + $0 0.9.4 # Creates 0.9.4 + +EOF + cleanup_exit $1 +} + +# full_version echoes the full version string, given a version and an optiona;l +# RC number. If the just the version is present, that is echoed. If the RC is +# also provided, then "rc" and the number is concatenated with the version. +# For example, 0.9.4rc4 would be returned if version was 0.9.4 and the RC number +# was 4. +full_version() { + version=$1 + rc=$2 + if [ -z "$rc" ]; then + echo $version + else + echo ${version}-rc${rc} + fi +} + +# rpm_release echoes the RPM release or "iteration" given an RC number. +rpm_release() { + rc=$1 + if [ -z "$rc" ]; then + echo 1 + else + echo 0.1.rc${rc} + fi +} + +# cleanup_exit removes all resources created during the process and exits with +# the supplied returned code. +cleanup_exit() { + rm -r $TMP_WORK_DIR + rm $POST_INSTALL_PATH + rm $POST_UNINSTALL_PATH + exit $1 +} + +# current_branch echos the current git branch. +current_branch() { + echo `git rev-parse --abbrev-ref HEAD` +} + +# check_gopath sanity checks the value of the GOPATH env variable, and determines +# the path where build artifacts are installed. GOPATH may be a colon-delimited +# list of directories. +check_gopath() { + [ -z "$GOPATH" ] && echo "GOPATH is not set." && cleanup_exit 1 + GOPATH_INSTALL=`echo $GOPATH | cut -d ':' -f 1` + [ ! -d "$GOPATH_INSTALL" ] && echo "GOPATH_INSTALL is not a directory." && cleanup_exit 1 + echo "GOPATH ($GOPATH) looks sane, using $GOPATH_INSTALL for installation." +} + +check_gvm() { + if [ -n "$GOPATH" ]; then + existing_gopath=$GOPATH + fi + + source $HOME/.gvm/scripts/gvm + which gvm + if [ $? -ne 0 ]; then + echo "gvm not found -- aborting." + cleanup_exit $1 + fi + gvm use $GO_VERSION + if [ $? -ne 0 ]; then + echo "gvm cannot find Go version $GO_VERSION -- aborting." + cleanup_exit $1 + fi + + # Keep any existing GOPATH set. + if [ -n "$existing_gopath" ]; then + GOPATH=$existing_gopath + fi +} + +# check_clean_tree ensures that no source file is locally modified. +check_clean_tree() { + modified=$(git ls-files --modified | wc -l) + if [ $modified -ne 0 ]; then + echo "The source tree is not clean -- aborting." + cleanup_exit 1 + fi + echo "Git tree is clean." +} + +# update_tree ensures the tree is in-sync with the repo. +update_tree() { + git pull origin $TARGET_BRANCH + if [ $? -ne 0 ]; then + echo "Failed to pull latest code -- aborting." + cleanup_exit 1 + fi + git fetch --tags + if [ $? -ne 0 ]; then + echo "Failed to fetch tags -- aborting." + cleanup_exit 1 + fi + echo "Git tree updated successfully." +} + +# check_tag_exists checks if the existing release already exists in the tags. +check_tag_exists () { + version=$1 + git tag | grep -q "^v$version$" + if [ $? -eq 0 ]; then + echo "Proposed version $version already exists as a tag -- aborting." + cleanup_exit 1 + fi +} + +# make_dir_tree creates the directory structure within the packages. +make_dir_tree() { + work_dir=$1 + version=$2 + mkdir -p $work_dir/$INSTALL_ROOT_DIR/versions/$version/scripts + if [ $? -ne 0 ]; then + echo "Failed to create installation directory -- aborting." + cleanup_exit 1 + fi + mkdir -p $work_dir/$CONFIG_ROOT_DIR + if [ $? -ne 0 ]; then + echo "Failed to create configuration directory -- aborting." + cleanup_exit 1 + fi + mkdir -p $work_dir/$LOGROTATE_DIR + if [ $? -ne 0 ]; then + echo "Failed to create logrotate directory -- aborting." + cleanup_exit 1 + fi +} + +# do_build builds the code. The version and commit must be passed in. +do_build() { + for b in ${BINS[*]}; do + rm -f $GOPATH_INSTALL/bin/$b + done + + if [ -n "$WORKING_DIR" ]; then + STASH=`git stash create -a` + if [ $? -ne 0 ]; then + echo "WARNING: failed to stash uncommited local changes" + fi + git reset --hard + fi + + go get -u -f -d ./... + if [ $? -ne 0 ]; then + echo "WARNING: failed to 'go get' packages." + fi + + git checkout $TARGET_BRANCH # go get switches to master, so ensure we're back. + + if [ -n "$WORKING_DIR" ]; then + git stash apply $STASH + if [ $? -ne 0 ]; then #and apply previous uncommited local changes + echo "WARNING: failed to restore uncommited local changes" + fi + fi + + version=$1 + commit=`git rev-parse HEAD` + branch=`current_branch` + if [ $? -ne 0 ]; then + echo "Unable to retrieve current commit -- aborting" + cleanup_exit 1 + fi + + date=`date -u --iso-8601=seconds` + go install -a -ldflags="-X main.version=$version -X main.branch=$branch -X main.commit=$commit -X main.buildTime='$date'" ./... + if [ $? -ne 0 ]; then + echo "Build failed, unable to create package -- aborting" + cleanup_exit 1 + fi + echo "Build completed successfully." +} + +# generate_postinstall_script creates the post-install script for the +# package. It must be passed the version. +generate_postinstall_script() { + version=$1 + cat <$POST_INSTALL_PATH +#!/bin/sh +rm -f $INSTALL_ROOT_DIR/influxd +rm -f $INSTALL_ROOT_DIR/influx +rm -f $INSTALL_ROOT_DIR/init.sh +ln -s $INSTALL_ROOT_DIR/versions/$version/influxd $INSTALL_ROOT_DIR/influxd +ln -s $INSTALL_ROOT_DIR/versions/$version/influx $INSTALL_ROOT_DIR/influx +ln -s $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh $INSTALL_ROOT_DIR/init.sh + +if ! id influxdb >/dev/null 2>&1; then + useradd --system -U -M influxdb +fi + +# Systemd +if which systemctl > /dev/null 2>&1 ; then + cp $INSTALL_ROOT_DIR/versions/$version/scripts/influxdb.service \ + /lib/systemd/system/influxdb.service + systemctl enable influxdb + +# Sysv +else + rm -f /etc/init.d/influxdb + ln -sfn $INSTALL_ROOT_DIR/init.sh /etc/init.d/influxdb + chmod +x /etc/init.d/influxdb + if which update-rc.d > /dev/null 2>&1 ; then + update-rc.d -f influxdb remove + update-rc.d influxdb defaults + else + chkconfig --add influxdb + fi +fi + +chown -R -L influxdb:influxdb $INSTALL_ROOT_DIR +chmod -R a+rX $INSTALL_ROOT_DIR + +mkdir -p $INFLUXDB_LOG_DIR +chown -R -L influxdb:influxdb $INFLUXDB_LOG_DIR +mkdir -p $INFLUXDB_DATA_DIR +chown -R -L influxdb:influxdb $INFLUXDB_DATA_DIR +EOF + echo "Post-install script created successfully at $POST_INSTALL_PATH" +} + +########################################################################### +# Process options +while : +do + case $1 in + -h | --help) + usage 0 + ;; + + -p | --packages-only) + PACKAGES_ONLY="PACKAGES_ONLY" + shift + ;; + + -t | --target) + case "$2" in + 'tar') TAR_WANTED="gz" + ;; + 'deb') DEB_WANTED="deb" + ;; + 'rpm') RPM_WANTED="rpm" + ;; + *) + echo "Unknown target distribution $2" + usage 1 + ;; + esac + shift 2 + ;; + + -r) + RC=$2 + if [ -z "$RC" ]; then + echo "RC number required" + fi + shift 2 + ;; + + -w | --working-directory) + PACKAGES_ONLY="PACKAGES_ONLY" + WORKING_DIR="WORKING_DIR" + shift + ;; + + -*) + echo "Unknown option $1" + usage 1 + ;; + + ?*) + if [ -z $VERSION ]; then + VERSION=$1 + shift + else + echo "$1 : aborting version already set to $VERSION" + usage 1 + fi + + echo $VERSION | grep -i '[r|c]' 2>&1 >/dev/null + if [ $? -ne 1 -a -z "$NIGHTLY_BUILD" ]; then + echo + echo "$VERSION contains reference to RC - specify RC separately" + echo + usage 1 + fi + ;; + + *) break + esac +done + +if [ -z "$DEB_WANTED$RPM_WANTED$TAR_WANTED" ]; then + TAR_WANTED="gz" + DEB_WANTED="deb" + RPM_WANTED="rpm" +fi + +if [ -z "$VERSION" ]; then + echo -e "Missing version" + usage 1 +fi + +########################################################################### +# Start the packaging process. + +echo -e "\nStarting package process...\n" + +# Ensure the current is correct. +TARGET_BRANCH=`current_branch` +if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then +echo -n "Current branch is $TARGET_BRANCH. Start packaging this branch? [Y/n] " + read response + response=`echo $response | tr 'A-Z' 'a-z'` + if [ "x$response" == "xn" ]; then + echo "Packaging aborted." + cleanup_exit 1 + fi +fi + +check_gvm +check_gopath +if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then + check_clean_tree + update_tree + check_tag_exists `full_version $VERSION $RC` +fi + +do_build `full_version $VERSION $RC` +make_dir_tree $TMP_WORK_DIR `full_version $VERSION $RC` + +########################################################################### +# Copy the assets to the installation directories. + +for b in ${BINS[*]}; do + cp $GOPATH_INSTALL/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC` + if [ $? -ne 0 ]; then + echo "Failed to copy binaries to packaging directory -- aborting." + cleanup_exit 1 + fi +done +echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`" + +cp $INITD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts +if [ $? -ne 0 ]; then + echo "Failed to copy init.d script to packaging directory -- aborting." + cleanup_exit 1 +fi +echo "$INITD_SCRIPT copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts" + +cp $SYSTEMD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts +if [ $? -ne 0 ]; then + echo "Failed to copy systemd script to packaging directory -- aborting." + cleanup_exit 1 +fi +echo "$SYSTEMD_SCRIPT copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts" + +cp $SAMPLE_CONFIGURATION $TMP_WORK_DIR/$CONFIG_ROOT_DIR/influxdb.conf +if [ $? -ne 0 ]; then + echo "Failed to copy $SAMPLE_CONFIGURATION to packaging directory -- aborting." + cleanup_exit 1 +fi + +cp $LOGROTATE $TMP_WORK_DIR/$LOGROTATE_DIR/influxd +if [ $? -ne 0 ]; then + echo "Failed to copy logrotate configuration to packaging directory -- aborting." + cleanup_exit 1 +fi + +generate_postinstall_script `full_version $VERSION $RC` + +########################################################################### +# Create the actual packages. + +if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then + echo -n "Commence creation of $ARCH packages, version `full_version $VERSION $RC`? [Y/n] " + read response + response=`echo $response | tr 'A-Z' 'a-z'` + if [ "x$response" == "xn" ]; then + echo "Packaging aborted." + cleanup_exit 1 + fi +fi + +if [ $ARCH == "i386" ]; then + rpm_package=influxdb-${VERSION}-1.i686.rpm # RPM packages use 1 for default package release. + debian_package=influxdb_`full_version $VERSION $RC`_i686.deb + deb_args="-a i686" + rpm_args="setarch i686" +elif [ $ARCH == "arm" ]; then + rpm_package=influxdb-${VERSION}-1.armel.rpm + debian_package=influxdb_`full_version $VERSION $RC`_armel.deb +else + rpm_package=influxdb-${VERSION}-1.x86_64.rpm + debian_package=influxdb_`full_version $VERSION $RC`_amd64.deb +fi + +COMMON_FPM_ARGS="\ +--log error \ +-C $TMP_WORK_DIR \ +--vendor $VENDOR \ +--url $URL \ +--license $LICENSE \ +--maintainer $MAINTAINER \ +--after-install $POST_INSTALL_PATH \ +--after-remove $POST_UNINSTALL_PATH \ +--name influxdb \ +--config-files $CONFIG_ROOT_DIR \ +--config-files $LOGROTATE_DIR" + +if [ -n "$DEB_WANTED" ]; then + $FPM -s dir -t deb $deb_args --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC` . + if [ $? -ne 0 ]; then + echo "Failed to create Debian package -- aborting." + cleanup_exit 1 + fi + echo "Debian package created successfully." +fi + +if [ -n "$TAR_WANTED" ]; then + $FPM -s dir -t tar --prefix influxdb_`full_version $VERSION $RC`_${ARCH} -p influxdb_`full_version $VERSION $RC`_${ARCH}.tar.gz --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC ` . + if [ $? -ne 0 ]; then + echo "Failed to create Tar package -- aborting." + cleanup_exit 1 + fi + echo "Tar package created successfully." +fi + +if [ -n "$RPM_WANTED" ]; then + $rpm_args $FPM -s dir -t rpm --description "$DESCRIPTION" $COMMON_FPM_ARGS --depends coreutils --version $VERSION --iteration `rpm_release $RC` . + if [ $? -ne 0 ]; then + echo "Failed to create RPM package -- aborting." + cleanup_exit 1 + fi + echo "RPM package created successfully." +fi + +########################################################################### +# Offer to tag the repo. + +if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then + echo -n "Tag source tree with v`full_version $VERSION $RC` and push to repo? [y/N] " + read response + response=`echo $response | tr 'A-Z' 'a-z'` + if [ "x$response" == "xy" ]; then + echo "Creating tag v`full_version $VERSION $RC` and pushing to repo" + git tag v`full_version $VERSION $RC` + if [ $? -ne 0 ]; then + echo "Failed to create tag v`full_version $VERSION $RC` -- aborting" + cleanup_exit 1 + fi + echo "Tag v`full_version $VERSION $RC` created" + git push origin v`full_version $VERSION $RC` + if [ $? -ne 0 ]; then + echo "Failed to push tag v`full_version $VERSION $RC` to repo -- aborting" + cleanup_exit 1 + fi + echo "Tag v`full_version $VERSION $RC` pushed to repo" + else + echo "Not creating tag v`full_version $VERSION $RC`." + fi +fi + +########################################################################### +# Offer to publish the packages. + +if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then + echo -n "Publish packages to S3? [y/N] " + read response + response=`echo $response | tr 'A-Z' 'a-z'` +fi + +if [ "x$response" == "xy" -o -n "$NIGHTLY_BUILD" ]; then + echo "Publishing packages to S3." + if [ ! -e "$AWS_FILE" ]; then + echo "$AWS_FILE does not exist -- aborting." + cleanup_exit 1 + fi + + for filepath in `ls *.{$DEB_WANTED,$RPM_WANTED,$TAR_WANTED} 2> /dev/null`; do + filename=`basename $filepath` + + if [ -n "$NIGHTLY_BUILD" ]; then + # Replace the version string in the filename with "nightly". + v=`full_version $VERSION $RC` + v_underscored=`echo "$v" | tr - _` + v_rpm=$VERSION-`rpm_release $RC` + + # It's ok to run each of these since only 1 will match, leaving + # filename untouched otherwise. + filename=`echo $filename | sed s/$v/nightly/` + filename=`echo $filename | sed s/$v_underscored/nightly/` + filename=`echo $filename | sed s/$v_rpm/nightly-1/` + fi + + AWS_CONFIG_FILE=$AWS_FILE aws s3 cp $filepath s3://influxdb/$filename --acl public-read --region us-east-1 + if [ $? -ne 0 ]; then + echo "Upload failed ($filename) -- aborting". + cleanup_exit 1 + fi + echo "$filename uploaded" + done +else + echo "Not publishing packages to S3." +fi + +########################################################################### +# All done. + +echo -e "\nPackaging process complete." +cleanup_exit 0 diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md new file mode 100644 index 000000000..1c73a9e85 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md @@ -0,0 +1,5 @@ +pkg/ is a collection of utility packages used by the InfluxDB project without being specific to its internals. + +Utility packages are kept separate from the InfluxDB core codebase to keep it as small and concise as possible. If some utilities grow larger and their APIs stabilize, they may be moved to their own repository under the InfluxDB organization, to facilitate re-use by other projects. However that is not the priority. + +Because utility packages are small and neatly separated from the rest of the codebase, they are a good place to start for aspiring maintainers and contributors. Get in touch if you want to help maintain them! diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go new file mode 100644 index 000000000..15e9cf29d --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go @@ -0,0 +1,45 @@ +package escape + +import "bytes" + +func Bytes(in []byte) []byte { + for b, esc := range Codes { + in = bytes.Replace(in, []byte{b}, esc, -1) + } + return in +} + +func Unescape(in []byte) []byte { + i := 0 + inLen := len(in) + var out []byte + + for { + if i >= inLen { + break + } + if in[i] == '\\' && i+1 < inLen { + switch in[i+1] { + case ',': + out = append(out, ',') + i += 2 + continue + case '"': + out = append(out, '"') + i += 2 + continue + case ' ': + out = append(out, ' ') + i += 2 + continue + case '=': + out = append(out, '=') + i += 2 + continue + } + } + out = append(out, in[i]) + i += 1 + } + return out +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go new file mode 100644 index 000000000..330fbf422 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go @@ -0,0 +1,34 @@ +package escape + +import "strings" + +var ( + Codes = map[byte][]byte{ + ',': []byte(`\,`), + '"': []byte(`\"`), + ' ': []byte(`\ `), + '=': []byte(`\=`), + } + + codesStr = map[string]string{} +) + +func init() { + for k, v := range Codes { + codesStr[string(k)] = string(v) + } +} + +func UnescapeString(in string) string { + for b, esc := range codesStr { + in = strings.Replace(in, esc, b, -1) + } + return in +} + +func String(in string) string { + for b, esc := range codesStr { + in = strings.Replace(in, b, esc, -1) + } + return in +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go new file mode 100644 index 000000000..16d6a13f7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go @@ -0,0 +1,37 @@ +package slices + +import "strings" + +func Union(setA, setB []string, ignoreCase bool) []string { + for _, b := range setB { + if ignoreCase { + if !ExistsIgnoreCase(setA, b) { + setA = append(setA, b) + } + continue + } + if !Exists(setA, b) { + setA = append(setA, b) + } + } + return setA +} + +func Exists(set []string, find string) bool { + for _, s := range set { + if s == find { + return true + } + } + return false +} + +func ExistsIgnoreCase(set []string, find string) bool { + find = strings.ToLower(find) + for _, s := range set { + if strings.ToLower(s) == find { + return true + } + } + return false +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service new file mode 100644 index 000000000..e8633acb0 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service @@ -0,0 +1,19 @@ +# If you modify this, please also make sure to edit init.sh + +[Unit] +Description=InfluxDB is an open-source, distributed, time series database +Documentation=https://influxdb.com/docs/ +After=network.target + +[Service] +User=influxdb +Group=influxdb +LimitNOFILE=65536 +EnvironmentFile=-/etc/default/influxdb +ExecStart=/opt/influxdb/influxd -config /etc/opt/influxdb/influxdb.conf $INFLUXD_OPTS +KillMode=process +Restart=on-failure + +[Install] +WantedBy=multi-user.target +Alias=influxd.service diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh new file mode 100644 index 000000000..cbee4ce3a --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh @@ -0,0 +1,218 @@ +#! /usr/bin/env bash + +### BEGIN INIT INFO +# Provides: influxd +# Required-Start: $all +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start influxd at boot time +### END INIT INFO + +# If you modify this, please make sure to also edit influxdb.service +# this init script supports three different variations: +# 1. New lsb that define start-stop-daemon +# 2. Old lsb that don't have start-stop-daemon but define, log, pidofproc and killproc +# 3. Centos installations without lsb-core installed +# +# In the third case we have to define our own functions which are very dumb +# and expect the args to be positioned correctly. + +# Command-line options that can be set in /etc/default/influxdb. These will override +# any config file values. Example: "-join http://1.2.3.4:8086" +DEFAULT=/etc/default/influxdb + +# Daemon options +INFLUXD_OPTS= + +# Process name ( For display ) +NAME=influxdb + +# User and group +USER=influxdb +GROUP=influxdb + +# Daemon name, where is the actual executable +# If the daemon is not there, then exit. +DAEMON=/opt/influxdb/influxd +[ -x $DAEMON ] || exit 5 + +# Configuration file +CONFIG=/etc/opt/influxdb/influxdb.conf + +# PID file for the daemon +PIDFILE=/var/run/influxdb/influxd.pid +PIDDIR=`dirname $PIDFILE` +if [ ! -d "$PIDDIR" ]; then + mkdir -p $PIDDIR + chown $USER:$GROUP $PIDDIR +fi + +# Max open files +OPEN_FILE_LIMIT=65536 + +if [ -r /lib/lsb/init-functions ]; then + source /lib/lsb/init-functions +fi + +# Logging +if [ -z "$STDOUT" ]; then + STDOUT=/dev/null +fi + +if [ ! -f "$STDOUT" ]; then + mkdir -p $(dirname $STDOUT) +fi + +if [ -z "$STDERR" ]; then + STDERR=/var/log/influxdb/influxd.log +fi + +if [ ! -f "$STDERR" ]; then + mkdir -p $(dirname $STDERR) +fi + +# Overwrite init script variables with /etc/default/influxdb values +if [ -r $DEFAULT ]; then + source $DEFAULT +fi + +function pidofproc() { + if [ $# -ne 3 ]; then + echo "Expected three arguments, e.g. $0 -p pidfile daemon-name" + fi + + PID=`pgrep -f $3` + local PIDFILE=`cat $2` + + if [ "x$PIDFILE" == "x" ]; then + return 1 + fi + + if [ "x$PID" != "x" -a "$PIDFILE" == "$PID" ]; then + return 0 + fi + + return 1 +} + +function killproc() { + if [ $# -ne 3 ]; then + echo "Expected three arguments, e.g. $0 -p pidfile signal" + fi + + PID=`cat $2` + + /bin/kill -s $3 $PID + while true; do + pidof `basename $DAEMON` >/dev/null + if [ $? -ne 0 ]; then + return 0 + fi + + sleep 1 + n=$(expr $n + 1) + if [ $n -eq 30 ]; then + /bin/kill -s SIGKILL $PID + return 0 + fi + done +} + +function log_failure_msg() { + echo "$@" "[ FAILED ]" +} + +function log_success_msg() { + echo "$@" "[ OK ]" +} + +case $1 in + start) + # Check if config file exist + if [ ! -r $CONFIG ]; then + log_failure_msg "config file doesn't exists" + exit 4 + fi + + # Checked the PID file exists and check the actual status of process + if [ -e $PIDFILE ]; then + pidofproc -p $PIDFILE $DAEMON > /dev/null 2>&1 && STATUS="0" || STATUS="$?" + # If the status is SUCCESS then don't need to start again. + if [ "x$STATUS" = "x0" ]; then + log_failure_msg "$NAME process is running" + exit 0 # Exit + fi + # if PID file does not exist, check if writable + else + su -s /bin/sh -c "touch $PIDFILE" $USER > /dev/null 2>&1 + if [ $? -ne 0 ]; then + log_failure_msg "$PIDFILE not writable, check permissions" + exit 5 + fi + fi + + # Bump the file limits, before launching the daemon. These will carry over to + # launched processes. + ulimit -n $OPEN_FILE_LIMIT + if [ $? -ne 0 ]; then + log_failure_msg "set open file limit to $OPEN_FILE_LIMIT" + exit 1 + fi + + log_success_msg "Starting the process" "$NAME" + if which start-stop-daemon > /dev/null 2>&1; then + start-stop-daemon --chuid $GROUP:$USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -pidfile $PIDFILE -config $CONFIG $INFLUXD_OPTS >>$STDOUT 2>>$STDERR & + else + su -s /bin/sh -c "nohup $DAEMON -pidfile $PIDFILE -config $CONFIG $INFLUXD_OPTS >>$STDOUT 2>>$STDERR &" $USER + fi + log_success_msg "$NAME process was started" + ;; + + stop) + # Stop the daemon. + if [ -e $PIDFILE ]; then + pidofproc -p $PIDFILE $DAEMON > /dev/null 2>&1 && STATUS="0" || STATUS="$?" + if [ "$STATUS" = 0 ]; then + if killproc -p $PIDFILE SIGTERM && /bin/rm -rf $PIDFILE; then + log_success_msg "$NAME process was stopped" + else + log_failure_msg "$NAME failed to stop service" + fi + fi + else + log_failure_msg "$NAME process is not running" + fi + ;; + + restart) + # Restart the daemon. + $0 stop && sleep 2 && $0 start + ;; + + status) + # Check the status of the process. + if [ -e $PIDFILE ]; then + if pidofproc -p $PIDFILE $DAEMON > /dev/null; then + log_success_msg "$NAME Process is running" + exit 0 + else + log_failure_msg "$NAME Process is not running" + exit 1 + fi + else + log_failure_msg "$NAME Process is not running" + exit 3 + fi + ;; + + version) + $DAEMON version + ;; + + *) + # For invalid arguments, print the usage message. + echo "Usage: $0 {start|stop|restart|status|version}" + exit 2 + ;; +esac diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate new file mode 100644 index 000000000..de410d48c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate @@ -0,0 +1,8 @@ +/var/log/influxdb/influxd.log { + daily + rotate 7 + missingok + dateext + copytruncate + compress +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go new file mode 100644 index 000000000..860dff864 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go @@ -0,0 +1,21 @@ +package admin + +const ( + // DefaultBindAddress is the default bind address for the HTTP server. + DefaultBindAddress = ":8083" +) + +type Config struct { + Enabled bool `toml:"enabled"` + BindAddress string `toml:"bind-address"` + HttpsEnabled bool `toml:"https-enabled"` + HttpsCertificate string `toml:"https-certificate"` +} + +func NewConfig() Config { + return Config{ + BindAddress: DefaultBindAddress, + HttpsEnabled: false, + HttpsCertificate: "/etc/ssl/influxdb.pem", + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go new file mode 100644 index 000000000..1b0422505 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go @@ -0,0 +1,32 @@ +package admin_test + +import ( + "testing" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/services/admin" +) + +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c admin.Config + if _, err := toml.Decode(` +enabled = true +bind-address = ":8083" +https-enabled = true +https-certificate = "/dev/null" +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if c.Enabled != true { + t.Fatalf("unexpected enabled: %v", c.Enabled) + } else if c.BindAddress != ":8083" { + t.Fatalf("unexpected bind address: %s", c.BindAddress) + } else if c.HttpsEnabled != true { + t.Fatalf("unexpected https enabled: %v", c.HttpsEnabled) + } else if c.HttpsCertificate != "/dev/null" { + t.Fatalf("unexpected https certificate: %v", c.HttpsCertificate) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go new file mode 100644 index 000000000..2618bdb6b --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go @@ -0,0 +1,111 @@ +package admin + +import ( + "crypto/tls" + "fmt" + "log" + "net" + "net/http" + "os" + "strings" + + // Register static assets via statik. + _ "github.com/influxdb/influxdb/statik" + "github.com/rakyll/statik/fs" +) + +// Service manages the listener for an admin endpoint. +type Service struct { + listener net.Listener + addr string + https bool + cert string + err chan error + + logger *log.Logger +} + +// NewService returns a new instance of Service. +func NewService(c Config) *Service { + return &Service{ + addr: c.BindAddress, + https: c.HttpsEnabled, + cert: c.HttpsCertificate, + err: make(chan error), + logger: log.New(os.Stderr, "[admin] ", log.LstdFlags), + } +} + +// Open starts the service +func (s *Service) Open() error { + s.logger.Printf("Starting admin service") + + // Open listener. + if s.https { + cert, err := tls.LoadX509KeyPair(s.cert, s.cert) + if err != nil { + return err + } + + listener, err := tls.Listen("tcp", s.addr, &tls.Config{ + Certificates: []tls.Certificate{cert}, + }) + if err != nil { + return err + } + + s.logger.Println("Listening on HTTPS:", listener.Addr().String()) + s.listener = listener + } else { + listener, err := net.Listen("tcp", s.addr) + if err != nil { + return err + } + + s.logger.Println("Listening on HTTP:", listener.Addr().String()) + s.listener = listener + } + + // Begin listening for requests in a separate goroutine. + go s.serve() + return nil +} + +// Close closes the underlying listener. +func (s *Service) Close() error { + if s.listener != nil { + return s.listener.Close() + } + return nil +} + +// SetLogger sets the internal logger to the logger passed in. +func (s *Service) SetLogger(l *log.Logger) { + s.logger = l +} + +// Err returns a channel for fatal errors that occur on the listener. +func (s *Service) Err() <-chan error { return s.err } + +// Addr returns the listener's address. Returns nil if listener is closed. +func (s *Service) Addr() net.Addr { + if s.listener != nil { + return s.listener.Addr() + } + return nil +} + +// serve serves the handler from the listener. +func (s *Service) serve() { + // Instantiate file system from embedded admin. + statikFS, err := fs.New() + if err != nil { + panic(err) + } + + // Run file system handler on listener. + err = http.Serve(s.listener, http.FileServer(statikFS)) + if err != nil && !strings.Contains(err.Error(), "closed") { + s.err <- fmt.Errorf("listener error: addr=%s, err=%s", s.Addr(), err) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go new file mode 100644 index 000000000..497b12ea3 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go @@ -0,0 +1,33 @@ +package admin_test + +import ( + "io/ioutil" + "net/http" + "testing" + + "github.com/influxdb/influxdb/services/admin" +) + +// Ensure service can serve the root index page of the admin. +func TestService_Index(t *testing.T) { + // Start service on random port. + s := admin.NewService(admin.Config{BindAddress: "127.0.0.1:0"}) + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer s.Close() + + // Request root index page. + resp, err := http.Get("http://" + s.Addr().String()) + if err != nil { + t.Fatal(err) + } + defer resp.Body.Close() + + // Validate status code and body. + if resp.StatusCode != http.StatusOK { + t.Fatalf("unexpected status: %d", resp.StatusCode) + } else if _, err := ioutil.ReadAll(resp.Body); err != nil { + t.Fatalf("unable to read body: %s", err) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf new file mode 100644 index 000000000..97cc4cc08 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf @@ -0,0 +1,209 @@ +absolute value:ABSOLUTE:0:U +apache_bytes value:DERIVE:0:U +apache_connections value:GAUGE:0:65535 +apache_idle_workers value:GAUGE:0:65535 +apache_requests value:DERIVE:0:U +apache_scoreboard value:GAUGE:0:65535 +ath_nodes value:GAUGE:0:65535 +ath_stat value:DERIVE:0:U +backends value:GAUGE:0:65535 +bitrate value:GAUGE:0:4294967295 +bytes value:GAUGE:0:U +cache_eviction value:DERIVE:0:U +cache_operation value:DERIVE:0:U +cache_ratio value:GAUGE:0:100 +cache_result value:DERIVE:0:U +cache_size value:GAUGE:0:U +charge value:GAUGE:0:U +compression_ratio value:GAUGE:0:2 +compression uncompressed:DERIVE:0:U, compressed:DERIVE:0:U +connections value:DERIVE:0:U +conntrack value:GAUGE:0:4294967295 +contextswitch value:DERIVE:0:U +counter value:COUNTER:U:U +cpufreq value:GAUGE:0:U +cpu value:DERIVE:0:U +current_connections value:GAUGE:0:U +current_sessions value:GAUGE:0:U +current value:GAUGE:U:U +delay value:GAUGE:-1000000:1000000 +derive value:DERIVE:0:U +df_complex value:GAUGE:0:U +df_inodes value:GAUGE:0:U +df used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623 +disk_latency read:GAUGE:0:U, write:GAUGE:0:U +disk_merged read:DERIVE:0:U, write:DERIVE:0:U +disk_octets read:DERIVE:0:U, write:DERIVE:0:U +disk_ops_complex value:DERIVE:0:U +disk_ops read:DERIVE:0:U, write:DERIVE:0:U +disk_time read:DERIVE:0:U, write:DERIVE:0:U +dns_answer value:DERIVE:0:U +dns_notify value:DERIVE:0:U +dns_octets queries:DERIVE:0:U, responses:DERIVE:0:U +dns_opcode value:DERIVE:0:U +dns_qtype_cached value:GAUGE:0:4294967295 +dns_qtype value:DERIVE:0:U +dns_query value:DERIVE:0:U +dns_question value:DERIVE:0:U +dns_rcode value:DERIVE:0:U +dns_reject value:DERIVE:0:U +dns_request value:DERIVE:0:U +dns_resolver value:DERIVE:0:U +dns_response value:DERIVE:0:U +dns_transfer value:DERIVE:0:U +dns_update value:DERIVE:0:U +dns_zops value:DERIVE:0:U +duration seconds:GAUGE:0:U +email_check value:GAUGE:0:U +email_count value:GAUGE:0:U +email_size value:GAUGE:0:U +entropy value:GAUGE:0:4294967295 +fanspeed value:GAUGE:0:U +file_size value:GAUGE:0:U +files value:GAUGE:0:U +flow value:GAUGE:0:U +fork_rate value:DERIVE:0:U +frequency_offset value:GAUGE:-1000000:1000000 +frequency value:GAUGE:0:U +fscache_stat value:DERIVE:0:U +gauge value:GAUGE:U:U +hash_collisions value:DERIVE:0:U +http_request_methods value:DERIVE:0:U +http_requests value:DERIVE:0:U +http_response_codes value:DERIVE:0:U +humidity value:GAUGE:0:100 +if_collisions value:DERIVE:0:U +if_dropped rx:DERIVE:0:U, tx:DERIVE:0:U +if_errors rx:DERIVE:0:U, tx:DERIVE:0:U +if_multicast value:DERIVE:0:U +if_octets rx:DERIVE:0:U, tx:DERIVE:0:U +if_packets rx:DERIVE:0:U, tx:DERIVE:0:U +if_rx_errors value:DERIVE:0:U +if_rx_octets value:DERIVE:0:U +if_tx_errors value:DERIVE:0:U +if_tx_octets value:DERIVE:0:U +invocations value:DERIVE:0:U +io_octets rx:DERIVE:0:U, tx:DERIVE:0:U +io_packets rx:DERIVE:0:U, tx:DERIVE:0:U +ipt_bytes value:DERIVE:0:U +ipt_packets value:DERIVE:0:U +irq value:DERIVE:0:U +latency value:GAUGE:0:U +links value:GAUGE:0:U +load shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000 +md_disks value:GAUGE:0:U +memcached_command value:DERIVE:0:U +memcached_connections value:GAUGE:0:U +memcached_items value:GAUGE:0:U +memcached_octets rx:DERIVE:0:U, tx:DERIVE:0:U +memcached_ops value:DERIVE:0:U +memory value:GAUGE:0:281474976710656 +multimeter value:GAUGE:U:U +mutex_operations value:DERIVE:0:U +mysql_commands value:DERIVE:0:U +mysql_handler value:DERIVE:0:U +mysql_locks value:DERIVE:0:U +mysql_log_position value:DERIVE:0:U +mysql_octets rx:DERIVE:0:U, tx:DERIVE:0:U +nfs_procedure value:DERIVE:0:U +nginx_connections value:GAUGE:0:U +nginx_requests value:DERIVE:0:U +node_octets rx:DERIVE:0:U, tx:DERIVE:0:U +node_rssi value:GAUGE:0:255 +node_stat value:DERIVE:0:U +node_tx_rate value:GAUGE:0:127 +objects value:GAUGE:0:U +operations value:DERIVE:0:U +percent value:GAUGE:0:100.1 +percent_bytes value:GAUGE:0:100.1 +percent_inodes value:GAUGE:0:100.1 +pf_counters value:DERIVE:0:U +pf_limits value:DERIVE:0:U +pf_source value:DERIVE:0:U +pf_states value:GAUGE:0:U +pf_state value:DERIVE:0:U +pg_blks value:DERIVE:0:U +pg_db_size value:GAUGE:0:U +pg_n_tup_c value:DERIVE:0:U +pg_n_tup_g value:GAUGE:0:U +pg_numbackends value:GAUGE:0:U +pg_scan value:DERIVE:0:U +pg_xact value:DERIVE:0:U +ping_droprate value:GAUGE:0:100 +ping_stddev value:GAUGE:0:65535 +ping value:GAUGE:0:65535 +players value:GAUGE:0:1000000 +power value:GAUGE:0:U +protocol_counter value:DERIVE:0:U +ps_code value:GAUGE:0:9223372036854775807 +ps_count processes:GAUGE:0:1000000, threads:GAUGE:0:1000000 +ps_cputime user:DERIVE:0:U, syst:DERIVE:0:U +ps_data value:GAUGE:0:9223372036854775807 +ps_disk_octets read:DERIVE:0:U, write:DERIVE:0:U +ps_disk_ops read:DERIVE:0:U, write:DERIVE:0:U +ps_pagefaults minflt:DERIVE:0:U, majflt:DERIVE:0:U +ps_rss value:GAUGE:0:9223372036854775807 +ps_stacksize value:GAUGE:0:9223372036854775807 +ps_state value:GAUGE:0:65535 +ps_vm value:GAUGE:0:9223372036854775807 +queue_length value:GAUGE:0:U +records value:GAUGE:0:U +requests value:GAUGE:0:U +response_time value:GAUGE:0:U +response_code value:GAUGE:0:U +route_etx value:GAUGE:0:U +route_metric value:GAUGE:0:U +routes value:GAUGE:0:U +serial_octets rx:DERIVE:0:U, tx:DERIVE:0:U +signal_noise value:GAUGE:U:0 +signal_power value:GAUGE:U:0 +signal_quality value:GAUGE:0:U +snr value:GAUGE:0:U +spam_check value:GAUGE:0:U +spam_score value:GAUGE:U:U +spl value:GAUGE:U:U +swap_io value:DERIVE:0:U +swap value:GAUGE:0:1099511627776 +tcp_connections value:GAUGE:0:4294967295 +temperature value:GAUGE:U:U +threads value:GAUGE:0:U +time_dispersion value:GAUGE:-1000000:1000000 +timeleft value:GAUGE:0:U +time_offset value:GAUGE:-1000000:1000000 +total_bytes value:DERIVE:0:U +total_connections value:DERIVE:0:U +total_objects value:DERIVE:0:U +total_operations value:DERIVE:0:U +total_requests value:DERIVE:0:U +total_sessions value:DERIVE:0:U +total_threads value:DERIVE:0:U +total_time_in_ms value:DERIVE:0:U +total_values value:DERIVE:0:U +uptime value:GAUGE:0:4294967295 +users value:GAUGE:0:65535 +vcl value:GAUGE:0:65535 +vcpu value:GAUGE:0:U +virt_cpu_total value:DERIVE:0:U +virt_vcpu value:DERIVE:0:U +vmpage_action value:DERIVE:0:U +vmpage_faults minflt:DERIVE:0:U, majflt:DERIVE:0:U +vmpage_io in:DERIVE:0:U, out:DERIVE:0:U +vmpage_number value:GAUGE:0:4294967295 +volatile_changes value:GAUGE:0:U +voltage_threshold value:GAUGE:U:U, threshold:GAUGE:U:U +voltage value:GAUGE:U:U +vs_memory value:GAUGE:0:9223372036854775807 +vs_processes value:GAUGE:0:65535 +vs_threads value:GAUGE:0:65535 + +# +# Legacy types +# (required for the v5 upgrade target) +# +arc_counts demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U +arc_l2_bytes read:COUNTER:0:U, write:COUNTER:0:U +arc_l2_size value:GAUGE:0:U +arc_ratio value:GAUGE:0:U +arc_size current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U +mysql_qcache hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U +mysql_threads running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go new file mode 100644 index 000000000..427598ca6 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go @@ -0,0 +1,48 @@ +package collectd + +import ( + "time" + + "github.com/influxdb/influxdb/toml" +) + +const ( + DefaultBindAddress = ":25826" + + DefaultDatabase = "collectd" + + DefaultRetentionPolicy = "" + + DefaultBatchSize = 1000 + + DefaultBatchPending = 5 + + DefaultBatchDuration = toml.Duration(10 * time.Second) + + DefaultTypesDB = "/usr/share/collectd/types.db" +) + +// Config represents a configuration for the collectd service. +type Config struct { + Enabled bool `toml:"enabled"` + BindAddress string `toml:"bind-address"` + Database string `toml:"database"` + RetentionPolicy string `toml:"retention-policy"` + BatchSize int `toml:"batch-size"` + BatchPending int `toml:"batch-pending"` + BatchDuration toml.Duration `toml:"batch-timeout"` + TypesDB string `toml:"typesdb"` +} + +// NewConfig returns a new instance of Config with defaults. +func NewConfig() Config { + return Config{ + BindAddress: DefaultBindAddress, + Database: DefaultDatabase, + RetentionPolicy: DefaultRetentionPolicy, + BatchSize: DefaultBatchSize, + BatchPending: DefaultBatchPending, + BatchDuration: DefaultBatchDuration, + TypesDB: DefaultTypesDB, + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go new file mode 100644 index 000000000..c419dcfa9 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go @@ -0,0 +1,32 @@ +package collectd_test + +import ( + "testing" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/services/collectd" +) + +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c collectd.Config + if _, err := toml.Decode(` +enabled = true +bind-address = ":9000" +database = "xxx" +typesdb = "yyy" +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if c.Enabled != true { + t.Fatalf("unexpected enabled: %v", c.Enabled) + } else if c.BindAddress != ":9000" { + t.Fatalf("unexpected bind address: %s", c.BindAddress) + } else if c.Database != "xxx" { + t.Fatalf("unexpected database: %s", c.Database) + } else if c.TypesDB != "yyy" { + t.Fatalf("unexpected types db: %s", c.TypesDB) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go new file mode 100644 index 000000000..ddd9bce5c --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go @@ -0,0 +1,308 @@ +package collectd + +import ( + "expvar" + "fmt" + "log" + "net" + "os" + "strings" + "sync" + "time" + + "github.com/influxdb/influxdb" + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "github.com/influxdb/influxdb/tsdb" + "github.com/kimor79/gollectd" +) + +const leaderWaitTimeout = 30 * time.Second + +// statistics gathered by the collectd service. +const ( + statPointsReceived = "points_rx" + statBytesReceived = "bytes_rx" + statPointsParseFail = "points_parse_fail" + statReadFail = "read_fail" + statBatchesTrasmitted = "batches_tx" + statPointsTransmitted = "points_tx" + statBatchesTransmitFail = "batches_tx_fail" +) + +// pointsWriter is an internal interface to make testing easier. +type pointsWriter interface { + WritePoints(p *cluster.WritePointsRequest) error +} + +// metaStore is an internal interface to make testing easier. +type metaStore interface { + WaitForLeader(d time.Duration) error + CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) +} + +// Service represents a UDP server which receives metrics in collectd's binary +// protocol and stores them in InfluxDB. +type Service struct { + Config *Config + MetaStore metaStore + PointsWriter pointsWriter + Logger *log.Logger + + wg sync.WaitGroup + err chan error + stop chan struct{} + ln *net.UDPConn + batcher *tsdb.PointBatcher + typesdb gollectd.Types + addr net.Addr + + // expvar-based stats. + statMap *expvar.Map +} + +// NewService returns a new instance of the collectd service. +func NewService(c Config) *Service { + s := &Service{ + Config: &c, + Logger: log.New(os.Stderr, "[collectd] ", log.LstdFlags), + err: make(chan error), + } + + return s +} + +// Open starts the service. +func (s *Service) Open() error { + s.Logger.Printf("Starting collectd service") + + // Configure expvar monitoring. It's OK to do this even if the service fails to open and + // should be done before any data could arrive for the service. + key := strings.Join([]string{"collectd", s.Config.BindAddress}, ":") + tags := map[string]string{"bind": s.Config.BindAddress} + s.statMap = influxdb.NewStatistics(key, "collectd", tags) + + if s.Config.BindAddress == "" { + return fmt.Errorf("bind address is blank") + } else if s.Config.Database == "" { + return fmt.Errorf("database name is blank") + } else if s.PointsWriter == nil { + return fmt.Errorf("PointsWriter is nil") + } + + if err := s.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil { + s.Logger.Printf("Failed to detect a cluster leader: %s", err.Error()) + return err + } + + if _, err := s.MetaStore.CreateDatabaseIfNotExists(s.Config.Database); err != nil { + s.Logger.Printf("Failed to ensure target database %s exists: %s", s.Config.Database, err.Error()) + return err + } + + if s.typesdb == nil { + // Open collectd types. + typesdb, err := gollectd.TypesDBFile(s.Config.TypesDB) + if err != nil { + return fmt.Errorf("Open(): %s", err) + } + s.typesdb = typesdb + } + + // Resolve our address. + addr, err := net.ResolveUDPAddr("udp", s.Config.BindAddress) + if err != nil { + return fmt.Errorf("unable to resolve UDP address: %s", err) + } + s.addr = addr + + // Start listening + ln, err := net.ListenUDP("udp", addr) + if err != nil { + return fmt.Errorf("unable to listen on UDP: %s", err) + } + s.ln = ln + + s.Logger.Println("Listening on UDP: ", ln.LocalAddr().String()) + + // Start the points batcher. + s.batcher = tsdb.NewPointBatcher(s.Config.BatchSize, s.Config.BatchPending, time.Duration(s.Config.BatchDuration)) + s.batcher.Start() + + // Create channel and wait group for signalling goroutines to stop. + s.stop = make(chan struct{}) + s.wg.Add(2) + + // Start goroutines that process collectd packets. + go s.serve() + go s.writePoints() + + return nil +} + +// Close stops the service. +func (s *Service) Close() error { + // Close the connection, and wait for the goroutine to exit. + if s.stop != nil { + close(s.stop) + } + if s.ln != nil { + s.ln.Close() + } + if s.batcher != nil { + s.batcher.Stop() + } + s.wg.Wait() + + // Release all remaining resources. + s.stop = nil + s.ln = nil + s.batcher = nil + s.Logger.Println("collectd UDP closed") + return nil +} + +// SetLogger sets the internal logger to the logger passed in. +func (s *Service) SetLogger(l *log.Logger) { + s.Logger = l +} + +// SetTypes sets collectd types db. +func (s *Service) SetTypes(types string) (err error) { + s.typesdb, err = gollectd.TypesDB([]byte(types)) + return +} + +// Err returns a channel for fatal errors that occur on go routines. +func (s *Service) Err() chan error { return s.err } + +// Addr returns the listener's address. Returns nil if listener is closed. +func (s *Service) Addr() net.Addr { + return s.ln.LocalAddr() +} + +func (s *Service) serve() { + defer s.wg.Done() + + // From https://collectd.org/wiki/index.php/Binary_protocol + // 1024 bytes (payload only, not including UDP / IP headers) + // In versions 4.0 through 4.7, the receive buffer has a fixed size + // of 1024 bytes. When longer packets are received, the trailing data + // is simply ignored. Since version 4.8, the buffer size can be + // configured. Version 5.0 will increase the default buffer size to + // 1452 bytes (the maximum payload size when using UDP/IPv6 over + // Ethernet). + buffer := make([]byte, 1452) + + for { + select { + case <-s.stop: + // We closed the connection, time to go. + return + default: + // Keep processing. + } + + n, _, err := s.ln.ReadFromUDP(buffer) + if err != nil { + s.statMap.Add(statReadFail, 1) + s.Logger.Printf("collectd ReadFromUDP error: %s", err) + continue + } + if n > 0 { + s.statMap.Add(statBytesReceived, int64(n)) + s.handleMessage(buffer[:n]) + } + } +} + +func (s *Service) handleMessage(buffer []byte) { + packets, err := gollectd.Packets(buffer, s.typesdb) + if err != nil { + s.statMap.Add(statPointsParseFail, 1) + s.Logger.Printf("Collectd parse error: %s", err) + return + } + for _, packet := range *packets { + points := Unmarshal(&packet) + for _, p := range points { + s.batcher.In() <- p + } + s.statMap.Add(statPointsReceived, int64(len(points))) + } +} + +func (s *Service) writePoints() { + defer s.wg.Done() + + for { + select { + case <-s.stop: + return + case batch := <-s.batcher.Out(): + if err := s.PointsWriter.WritePoints(&cluster.WritePointsRequest{ + Database: s.Config.Database, + RetentionPolicy: s.Config.RetentionPolicy, + ConsistencyLevel: cluster.ConsistencyLevelAny, + Points: batch, + }); err == nil { + s.statMap.Add(statBatchesTrasmitted, 1) + s.statMap.Add(statPointsTransmitted, int64(len(batch))) + } else { + s.Logger.Printf("failed to write point batch to database %q: %s", s.Config.Database, err) + s.statMap.Add(statBatchesTransmitFail, 1) + } + } + } +} + +// Unmarshal translates a collectd packet into InfluxDB data points. +func Unmarshal(packet *gollectd.Packet) []models.Point { + // Prefer high resolution timestamp. + var timestamp time.Time + if packet.TimeHR > 0 { + // TimeHR is "near" nanosecond measurement, but not exactly nanasecond time + // Since we store time in microseconds, we round here (mostly so tests will work easier) + sec := packet.TimeHR >> 30 + // Shifting, masking, and dividing by 1 billion to get nanoseconds. + nsec := ((packet.TimeHR & 0x3FFFFFFF) << 30) / 1000 / 1000 / 1000 + timestamp = time.Unix(int64(sec), int64(nsec)).UTC().Round(time.Microsecond) + } else { + // If we don't have high resolution time, fall back to basic unix time + timestamp = time.Unix(int64(packet.Time), 0).UTC() + } + + var points []models.Point + for i := range packet.Values { + name := fmt.Sprintf("%s_%s", packet.Plugin, packet.Values[i].Name) + tags := make(map[string]string) + fields := make(map[string]interface{}) + + fields["value"] = packet.Values[i].Value + + if packet.Hostname != "" { + tags["host"] = packet.Hostname + } + if packet.PluginInstance != "" { + tags["instance"] = packet.PluginInstance + } + if packet.Type != "" { + tags["type"] = packet.Type + } + if packet.TypeInstance != "" { + tags["type_instance"] = packet.TypeInstance + } + p := models.NewPoint(name, tags, fields, timestamp) + + points = append(points, p) + } + return points +} + +// assert will panic with a given formatted message if the given condition is false. +func assert(condition bool, msg string, v ...interface{}) { + if !condition { + panic(fmt.Sprintf("assert failed: "+msg, v...)) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go new file mode 100644 index 000000000..5699a7507 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go @@ -0,0 +1,501 @@ +package collectd + +import ( + "encoding/hex" + "errors" + "io/ioutil" + "log" + "net" + "testing" + "time" + + "github.com/influxdb/influxdb/cluster" + "github.com/influxdb/influxdb/meta" + "github.com/influxdb/influxdb/models" + "github.com/influxdb/influxdb/toml" +) + +// Test that the service checks / creates the target database on startup. +func TestService_CreatesDatabase(t *testing.T) { + t.Parallel() + + s := newTestService(1, time.Second) + + createDatabaseCalled := false + + ms := &testMetaStore{} + ms.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) { + if name != s.Config.Database { + t.Errorf("\n\texp = %s\n\tgot = %s\n", s.Config.Database, name) + } + createDatabaseCalled = true + return nil, nil + } + s.Service.MetaStore = ms + + s.Open() + s.Close() + + if !createDatabaseCalled { + t.Errorf("CreateDatabaseIfNotExists should have been called when the service opened.") + } +} + +// Test that the collectd service correctly batches points by BatchSize. +func TestService_BatchSize(t *testing.T) { + t.Parallel() + + totalPoints := len(expPoints) + + // Batch sizes that totalTestPoints divide evenly by. + batchSizes := []int{1, 2, 13} + + for _, batchSize := range batchSizes { + func() { + s := newTestService(batchSize, time.Second) + + pointCh := make(chan models.Point) + s.MetaStore.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) { return nil, nil } + s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error { + if len(req.Points) != batchSize { + t.Errorf("\n\texp = %d\n\tgot = %d\n", batchSize, len(req.Points)) + } + + for _, p := range req.Points { + pointCh <- p + } + return nil + } + + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer func() { t.Log("closing service"); s.Close() }() + + // Get the address & port the service is listening on for collectd data. + addr := s.Addr() + conn, err := net.Dial("udp", addr.String()) + if err != nil { + t.Fatal(err) + } + + // Send the test data to the service. + if n, err := conn.Write(testData); err != nil { + t.Fatal(err) + } else if n != len(testData) { + t.Fatalf("only sent %d of %d bytes", n, len(testData)) + } + + points := []models.Point{} + Loop: + for { + select { + case p := <-pointCh: + points = append(points, p) + if len(points) == totalPoints { + break Loop + } + case <-time.After(time.Second): + t.Logf("exp %d points, got %d", totalPoints, len(points)) + t.Fatal("timed out waiting for points from collectd service") + } + } + + if len(points) != totalPoints { + t.Fatalf("exp %d points, got %d", totalPoints, len(points)) + } + + for i, exp := range expPoints { + got := points[i].String() + if got != exp { + t.Fatalf("\n\texp = %s\n\tgot = %s\n", exp, got) + } + } + }() + } +} + +// Test that the collectd service correctly batches points using BatchDuration. +func TestService_BatchDuration(t *testing.T) { + t.Parallel() + + totalPoints := len(expPoints) + + s := newTestService(5000, 250*time.Millisecond) + + pointCh := make(chan models.Point, 1000) + s.MetaStore.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) { return nil, nil } + s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error { + for _, p := range req.Points { + pointCh <- p + } + return nil + } + + if err := s.Open(); err != nil { + t.Fatal(err) + } + defer func() { t.Log("closing service"); s.Close() }() + + // Get the address & port the service is listening on for collectd data. + addr := s.Addr() + conn, err := net.Dial("udp", addr.String()) + if err != nil { + t.Fatal(err) + } + + // Send the test data to the service. + if n, err := conn.Write(testData); err != nil { + t.Fatal(err) + } else if n != len(testData) { + t.Fatalf("only sent %d of %d bytes", n, len(testData)) + } + + points := []models.Point{} +Loop: + for { + select { + case p := <-pointCh: + points = append(points, p) + if len(points) == totalPoints { + break Loop + } + case <-time.After(time.Second): + t.Logf("exp %d points, got %d", totalPoints, len(points)) + t.Fatal("timed out waiting for points from collectd service") + } + } + + if len(points) != totalPoints { + t.Fatalf("exp %d points, got %d", totalPoints, len(points)) + } + + for i, exp := range expPoints { + got := points[i].String() + if got != exp { + t.Fatalf("\n\texp = %s\n\tgot = %s\n", exp, got) + } + } +} + +type testService struct { + *Service + MetaStore testMetaStore + PointsWriter testPointsWriter +} + +func newTestService(batchSize int, batchDuration time.Duration) *testService { + s := &testService{ + Service: NewService(Config{ + BindAddress: "127.0.0.1:0", + Database: "collectd_test", + BatchSize: batchSize, + BatchDuration: toml.Duration(batchDuration), + }), + } + s.Service.PointsWriter = &s.PointsWriter + s.Service.MetaStore = &s.MetaStore + + // Set the collectd types using test string. + if err := s.SetTypes(typesDBText); err != nil { + panic(err) + } + + if !testing.Verbose() { + s.Logger = log.New(ioutil.Discard, "", log.LstdFlags) + } + + return s +} + +type testPointsWriter struct { + WritePointsFn func(*cluster.WritePointsRequest) error +} + +func (w *testPointsWriter) WritePoints(p *cluster.WritePointsRequest) error { + return w.WritePointsFn(p) +} + +type testMetaStore struct { + CreateDatabaseIfNotExistsFn func(name string) (*meta.DatabaseInfo, error) + //DatabaseFn func(name string) (*meta.DatabaseInfo, error) +} + +func (ms *testMetaStore) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) { + return ms.CreateDatabaseIfNotExistsFn(name) +} + +func (ms *testMetaStore) WaitForLeader(d time.Duration) error { + return nil +} + +func wait(c chan struct{}, d time.Duration) (err error) { + select { + case <-c: + case <-time.After(d): + err = errors.New("timed out") + } + return +} + +func waitInt(c chan int, d time.Duration) (i int, err error) { + select { + case i = <-c: + case <-time.After(d): + err = errors.New("timed out") + } + return +} + +func check(err error) { + if err != nil { + panic(err) + } +} + +// Raw data sent by collectd, captured using Wireshark. +var testData = func() []byte { + b, err := hex.DecodeString("000000167066312d36322d3231302d39342d313733000001000c00000000544928ff0007000c00000000000000050002000c656e74726f7079000004000c656e74726f7079000006000f0001010000000000007240000200086370750000030006310000040008637075000005000969646c65000006000f0001000000000000a674620005000977616974000006000f0001000000000000000000000200076466000003000500000400076466000005000d6c6976652d636f7700000600180002010100000000a090b641000000a0cb6a2742000200086370750000030006310000040008637075000005000e696e74657272757074000006000f00010000000000000000fe0005000c736f6674697271000006000f000100000000000000000000020007646600000300050000040007646600000500096c6976650000060018000201010000000000000000000000e0ec972742000200086370750000030006310000040008637075000005000a737465616c000006000f00010000000000000000000003000632000005000975736572000006000f0001000000000000005f36000500096e696365000006000f0001000000000000000ad80002000e696e746572666163650000030005000004000e69665f6f6374657473000005000b64756d6d79300000060018000200000000000000000000000000000000041a000200076466000004000764660000050008746d70000006001800020101000000000000f240000000a0ea972742000200086370750000030006320000040008637075000005000b73797374656d000006000f00010000000000000045d30002000e696e746572666163650000030005000004000f69665f7061636b657473000005000b64756d6d79300000060018000200000000000000000000000000000000000f000200086370750000030006320000040008637075000005000969646c65000006000f0001000000000000a66480000200076466000003000500000400076466000005000d72756e2d6c6f636b000006001800020101000000000000000000000000000054410002000e696e74657266616365000004000e69665f6572726f7273000005000b64756d6d793000000600180002000000000000000000000000000000000000000200086370750000030006320000040008637075000005000977616974000006000f00010000000000000000000005000e696e74657272757074000006000f0001000000000000000132") + check(err) + return b +}() + +var expPoints = []string{ + "entropy_value,host=pf1-62-210-94-173,type=entropy value=288 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=idle value=10908770 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=wait value=0 1414080767000000000", + "df_used,host=pf1-62-210-94-173,type=df,type_instance=live-cow value=378576896 1414080767000000000", + "df_free,host=pf1-62-210-94-173,type=df,type_instance=live-cow value=50287988736 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=interrupt value=254 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=softirq value=0 1414080767000000000", + "df_used,host=pf1-62-210-94-173,type=df,type_instance=live value=0 1414080767000000000", + "df_free,host=pf1-62-210-94-173,type=df,type_instance=live value=50666565632 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=steal value=0 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=user value=24374 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=nice value=2776 1414080767000000000", + "interface_rx,host=pf1-62-210-94-173,type=if_octets,type_instance=dummy0 value=0 1414080767000000000", + "interface_tx,host=pf1-62-210-94-173,type=if_octets,type_instance=dummy0 value=1050 1414080767000000000", + "df_used,host=pf1-62-210-94-173,type=df,type_instance=tmp value=73728 1414080767000000000", + "df_free,host=pf1-62-210-94-173,type=df,type_instance=tmp value=50666491904 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=system value=17875 1414080767000000000", + "interface_rx,host=pf1-62-210-94-173,type=if_packets,type_instance=dummy0 value=0 1414080767000000000", + "interface_tx,host=pf1-62-210-94-173,type=if_packets,type_instance=dummy0 value=15 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=idle value=10904704 1414080767000000000", + "df_used,host=pf1-62-210-94-173,type=df,type_instance=run-lock value=0 1414080767000000000", + "df_free,host=pf1-62-210-94-173,type=df,type_instance=run-lock value=5242880 1414080767000000000", + "interface_rx,host=pf1-62-210-94-173,type=if_errors,type_instance=dummy0 value=0 1414080767000000000", + "interface_tx,host=pf1-62-210-94-173,type=if_errors,type_instance=dummy0 value=0 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=wait value=0 1414080767000000000", + "cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=interrupt value=306 1414080767000000000", +} + +// Taken from /usr/share/collectd/types.db on a Ubuntu system +var typesDBText = ` +absolute value:ABSOLUTE:0:U +apache_bytes value:DERIVE:0:U +apache_connections value:GAUGE:0:65535 +apache_idle_workers value:GAUGE:0:65535 +apache_requests value:DERIVE:0:U +apache_scoreboard value:GAUGE:0:65535 +ath_nodes value:GAUGE:0:65535 +ath_stat value:DERIVE:0:U +backends value:GAUGE:0:65535 +bitrate value:GAUGE:0:4294967295 +bytes value:GAUGE:0:U +cache_eviction value:DERIVE:0:U +cache_operation value:DERIVE:0:U +cache_ratio value:GAUGE:0:100 +cache_result value:DERIVE:0:U +cache_size value:GAUGE:0:4294967295 +charge value:GAUGE:0:U +compression_ratio value:GAUGE:0:2 +compression uncompressed:DERIVE:0:U, compressed:DERIVE:0:U +connections value:DERIVE:0:U +conntrack value:GAUGE:0:4294967295 +contextswitch value:DERIVE:0:U +counter value:COUNTER:U:U +cpufreq value:GAUGE:0:U +cpu value:DERIVE:0:U +current_connections value:GAUGE:0:U +current_sessions value:GAUGE:0:U +current value:GAUGE:U:U +delay value:GAUGE:-1000000:1000000 +derive value:DERIVE:0:U +df_complex value:GAUGE:0:U +df_inodes value:GAUGE:0:U +df used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623 +disk_latency read:GAUGE:0:U, write:GAUGE:0:U +disk_merged read:DERIVE:0:U, write:DERIVE:0:U +disk_octets read:DERIVE:0:U, write:DERIVE:0:U +disk_ops_complex value:DERIVE:0:U +disk_ops read:DERIVE:0:U, write:DERIVE:0:U +disk_time read:DERIVE:0:U, write:DERIVE:0:U +dns_answer value:DERIVE:0:U +dns_notify value:DERIVE:0:U +dns_octets queries:DERIVE:0:U, responses:DERIVE:0:U +dns_opcode value:DERIVE:0:U +dns_qtype_cached value:GAUGE:0:4294967295 +dns_qtype value:DERIVE:0:U +dns_query value:DERIVE:0:U +dns_question value:DERIVE:0:U +dns_rcode value:DERIVE:0:U +dns_reject value:DERIVE:0:U +dns_request value:DERIVE:0:U +dns_resolver value:DERIVE:0:U +dns_response value:DERIVE:0:U +dns_transfer value:DERIVE:0:U +dns_update value:DERIVE:0:U +dns_zops value:DERIVE:0:U +duration seconds:GAUGE:0:U +email_check value:GAUGE:0:U +email_count value:GAUGE:0:U +email_size value:GAUGE:0:U +entropy value:GAUGE:0:4294967295 +fanspeed value:GAUGE:0:U +file_size value:GAUGE:0:U +files value:GAUGE:0:U +fork_rate value:DERIVE:0:U +frequency_offset value:GAUGE:-1000000:1000000 +frequency value:GAUGE:0:U +fscache_stat value:DERIVE:0:U +gauge value:GAUGE:U:U +hash_collisions value:DERIVE:0:U +http_request_methods value:DERIVE:0:U +http_requests value:DERIVE:0:U +http_response_codes value:DERIVE:0:U +humidity value:GAUGE:0:100 +if_collisions value:DERIVE:0:U +if_dropped rx:DERIVE:0:U, tx:DERIVE:0:U +if_errors rx:DERIVE:0:U, tx:DERIVE:0:U +if_multicast value:DERIVE:0:U +if_octets rx:DERIVE:0:U, tx:DERIVE:0:U +if_packets rx:DERIVE:0:U, tx:DERIVE:0:U +if_rx_errors value:DERIVE:0:U +if_rx_octets value:DERIVE:0:U +if_tx_errors value:DERIVE:0:U +if_tx_octets value:DERIVE:0:U +invocations value:DERIVE:0:U +io_octets rx:DERIVE:0:U, tx:DERIVE:0:U +io_packets rx:DERIVE:0:U, tx:DERIVE:0:U +ipt_bytes value:DERIVE:0:U +ipt_packets value:DERIVE:0:U +irq value:DERIVE:0:U +latency value:GAUGE:0:U +links value:GAUGE:0:U +load shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000 +md_disks value:GAUGE:0:U +memcached_command value:DERIVE:0:U +memcached_connections value:GAUGE:0:U +memcached_items value:GAUGE:0:U +memcached_octets rx:DERIVE:0:U, tx:DERIVE:0:U +memcached_ops value:DERIVE:0:U +memory value:GAUGE:0:281474976710656 +multimeter value:GAUGE:U:U +mutex_operations value:DERIVE:0:U +mysql_commands value:DERIVE:0:U +mysql_handler value:DERIVE:0:U +mysql_locks value:DERIVE:0:U +mysql_log_position value:DERIVE:0:U +mysql_octets rx:DERIVE:0:U, tx:DERIVE:0:U +nfs_procedure value:DERIVE:0:U +nginx_connections value:GAUGE:0:U +nginx_requests value:DERIVE:0:U +node_octets rx:DERIVE:0:U, tx:DERIVE:0:U +node_rssi value:GAUGE:0:255 +node_stat value:DERIVE:0:U +node_tx_rate value:GAUGE:0:127 +objects value:GAUGE:0:U +operations value:DERIVE:0:U +percent value:GAUGE:0:100.1 +percent_bytes value:GAUGE:0:100.1 +percent_inodes value:GAUGE:0:100.1 +pf_counters value:DERIVE:0:U +pf_limits value:DERIVE:0:U +pf_source value:DERIVE:0:U +pf_states value:GAUGE:0:U +pf_state value:DERIVE:0:U +pg_blks value:DERIVE:0:U +pg_db_size value:GAUGE:0:U +pg_n_tup_c value:DERIVE:0:U +pg_n_tup_g value:GAUGE:0:U +pg_numbackends value:GAUGE:0:U +pg_scan value:DERIVE:0:U +pg_xact value:DERIVE:0:U +ping_droprate value:GAUGE:0:100 +ping_stddev value:GAUGE:0:65535 +ping value:GAUGE:0:65535 +players value:GAUGE:0:1000000 +power value:GAUGE:0:U +protocol_counter value:DERIVE:0:U +ps_code value:GAUGE:0:9223372036854775807 +ps_count processes:GAUGE:0:1000000, threads:GAUGE:0:1000000 +ps_cputime user:DERIVE:0:U, syst:DERIVE:0:U +ps_data value:GAUGE:0:9223372036854775807 +ps_disk_octets read:DERIVE:0:U, write:DERIVE:0:U +ps_disk_ops read:DERIVE:0:U, write:DERIVE:0:U +ps_pagefaults minflt:DERIVE:0:U, majflt:DERIVE:0:U +ps_rss value:GAUGE:0:9223372036854775807 +ps_stacksize value:GAUGE:0:9223372036854775807 +ps_state value:GAUGE:0:65535 +ps_vm value:GAUGE:0:9223372036854775807 +queue_length value:GAUGE:0:U +records value:GAUGE:0:U +requests value:GAUGE:0:U +response_time value:GAUGE:0:U +response_code value:GAUGE:0:U +route_etx value:GAUGE:0:U +route_metric value:GAUGE:0:U +routes value:GAUGE:0:U +serial_octets rx:DERIVE:0:U, tx:DERIVE:0:U +signal_noise value:GAUGE:U:0 +signal_power value:GAUGE:U:0 +signal_quality value:GAUGE:0:U +snr value:GAUGE:0:U +spam_check value:GAUGE:0:U +spam_score value:GAUGE:U:U +spl value:GAUGE:U:U +swap_io value:DERIVE:0:U +swap value:GAUGE:0:1099511627776 +tcp_connections value:GAUGE:0:4294967295 +temperature value:GAUGE:U:U +threads value:GAUGE:0:U +time_dispersion value:GAUGE:-1000000:1000000 +timeleft value:GAUGE:0:U +time_offset value:GAUGE:-1000000:1000000 +total_bytes value:DERIVE:0:U +total_connections value:DERIVE:0:U +total_objects value:DERIVE:0:U +total_operations value:DERIVE:0:U +total_requests value:DERIVE:0:U +total_sessions value:DERIVE:0:U +total_threads value:DERIVE:0:U +total_time_in_ms value:DERIVE:0:U +total_values value:DERIVE:0:U +uptime value:GAUGE:0:4294967295 +users value:GAUGE:0:65535 +vcl value:GAUGE:0:65535 +vcpu value:GAUGE:0:U +virt_cpu_total value:DERIVE:0:U +virt_vcpu value:DERIVE:0:U +vmpage_action value:DERIVE:0:U +vmpage_faults minflt:DERIVE:0:U, majflt:DERIVE:0:U +vmpage_io in:DERIVE:0:U, out:DERIVE:0:U +vmpage_number value:GAUGE:0:4294967295 +volatile_changes value:GAUGE:0:U +voltage_threshold value:GAUGE:U:U, threshold:GAUGE:U:U +voltage value:GAUGE:U:U +vs_memory value:GAUGE:0:9223372036854775807 +vs_processes value:GAUGE:0:65535 +vs_threads value:GAUGE:0:65535 +# +# Legacy types +# (required for the v5 upgrade target) +# +arc_counts demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U +arc_l2_bytes read:COUNTER:0:U, write:COUNTER:0:U +arc_l2_size value:GAUGE:0:U +arc_ratio value:GAUGE:0:U +arc_size current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U +mysql_qcache hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U +mysql_threads running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U +` diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md new file mode 100644 index 000000000..90de2b2b6 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md @@ -0,0 +1,3 @@ +collectD Client +============ +This directory contains code for generating collectd load. diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go new file mode 100644 index 000000000..790f5e871 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go @@ -0,0 +1,71 @@ +package main + +import ( + "collectd.org/api" + "collectd.org/network" + + "flag" + "fmt" + "math/rand" + "os" + "strconv" + "time" +) + +var nMeasurments = flag.Int("m", 1, "Number of measurements") +var tagVariance = flag.Int("v", 1, "Number of values per tag. Client is fixed at one tag") +var rate = flag.Int("r", 1, "Number of points per second") +var total = flag.Int("t", -1, "Total number of points to send (default is no limit)") +var host = flag.String("u", "127.0.0.1:25826", "Destination host in the form host:port") + +func main() { + flag.Parse() + + conn, err := network.Dial(*host, network.ClientOptions{}) + if err != nil { + fmt.Println(err) + os.Exit(1) + } + defer conn.Close() + + rateLimiter := make(chan int, *rate) + + go func() { + ticker := time.NewTicker(time.Second) + for { + select { + case <-ticker.C: + for i := 0; i < *rate; i++ { + rateLimiter <- i + } + } + } + }() + + nSent := 0 + for { + if nSent >= *total && *total > 0 { + break + } + <-rateLimiter + + vl := api.ValueList{ + Identifier: api.Identifier{ + Host: "tagvalue" + strconv.Itoa(int(rand.Int31n(int32(*tagVariance)))), + Plugin: "golang" + strconv.Itoa(int(rand.Int31n(int32(*nMeasurments)))), + Type: "gauge", + }, + Time: time.Now(), + Interval: 10 * time.Second, + Values: []api.Value{api.Gauge(42.0)}, + } + if err := conn.Write(vl); err != nil { + fmt.Println(err) + os.Exit(1) + } + conn.Flush() + nSent = nSent + 1 + } + + fmt.Println("Number of points sent:", nSent) +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go new file mode 100644 index 000000000..1549a816b --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go @@ -0,0 +1,65 @@ +package continuous_querier + +import ( + "time" + + "github.com/influxdb/influxdb/toml" +) + +const ( + DefaultRecomputePreviousN = 2 + + DefaultRecomputeNoOlderThan = 10 * time.Minute + + DefaultComputeRunsPerInterval = 10 + + DefaultComputeNoMoreThan = 2 * time.Minute +) + +// Config represents a configuration for the continuous query service. +type Config struct { + // Enables logging in CQ service to display when CQ's are processed and how many points are wrote. + LogEnabled bool `toml:"log-enabled"` + + // If this flag is set to false, both the brokers and data nodes should ignore any CQ processing. + Enabled bool `toml:"enabled"` + + // when continuous queries are run we'll automatically recompute previous intervals + // in case lagged data came in. Set to zero if you never have lagged data. We do + // it this way because invalidating previously computed intervals would be insanely hard + // and expensive. + RecomputePreviousN int `toml:"recompute-previous-n"` + + // The RecomputePreviousN setting provides guidance for how far back to recompute, the RecomputeNoOlderThan + // setting sets a ceiling on how far back in time it will go. For example, if you have 2 PreviousN + // and have this set to 10m, then we'd only compute the previous two intervals for any + // CQs that have a group by time <= 5m. For all others, we'd only recompute the previous window + RecomputeNoOlderThan toml.Duration `toml:"recompute-no-older-than"` + + // ComputeRunsPerInterval will determine how many times the current and previous N intervals + // will be computed. The group by time will be divided by this and it will get computed this many times: + // group by time seconds / runs per interval + // This will give partial results for current group by intervals and will determine how long it will + // be until lagged data is recomputed. For example, if this number is 10 and the group by time is 10m, it + // will be a minute past the previous 10m bucket of time before lagged data is picked up + ComputeRunsPerInterval int `toml:"compute-runs-per-interval"` + + // ComputeNoMoreThan paired with the RunsPerInterval will determine the ceiling of how many times smaller + // group by times will be computed. For example, if you have RunsPerInterval set to 10 and this setting + // to 1m. Then for a group by time(1m) will actually only get computed once per interval (and once per PreviousN). + // If you have a group by time(5m) then you'll get five computes per interval. Any group by time window larger + // than 10m will get computed 10 times for each interval. + ComputeNoMoreThan toml.Duration `toml:"compute-no-more-than"` +} + +// NewConfig returns a new instance of Config with defaults. +func NewConfig() Config { + return Config{ + LogEnabled: true, + Enabled: true, + RecomputePreviousN: DefaultRecomputePreviousN, + RecomputeNoOlderThan: toml.Duration(DefaultRecomputeNoOlderThan), + ComputeRunsPerInterval: DefaultComputeRunsPerInterval, + ComputeNoMoreThan: toml.Duration(DefaultComputeNoMoreThan), + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go new file mode 100644 index 000000000..2a0edc4f2 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go @@ -0,0 +1,36 @@ +package continuous_querier_test + +import ( + "testing" + "time" + + "github.com/BurntSushi/toml" + "github.com/influxdb/influxdb/services/continuous_querier" +) + +func TestConfig_Parse(t *testing.T) { + // Parse configuration. + var c continuous_querier.Config + if _, err := toml.Decode(` +recompute-previous-n = 1 +recompute-no-older-than = "10s" +compute-runs-per-interval = 2 +compute-no-more-than = "20s" +enabled = true +`, &c); err != nil { + t.Fatal(err) + } + + // Validate configuration. + if c.RecomputePreviousN != 1 { + t.Fatalf("unexpected recompute previous n: %d", c.RecomputePreviousN) + } else if time.Duration(c.RecomputeNoOlderThan) != 10*time.Second { + t.Fatalf("unexpected recompute no older than: %v", c.RecomputeNoOlderThan) + } else if c.ComputeRunsPerInterval != 2 { + t.Fatalf("unexpected compute runs per interval: %d", c.ComputeRunsPerInterval) + } else if time.Duration(c.ComputeNoMoreThan) != 20*time.Second { + t.Fatalf("unexpected compute no more than: %v", c.ComputeNoMoreThan) + } else if c.Enabled != true { + t.Fatalf("unexpected enabled: %v", c.Enabled) + } +} diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md new file mode 100644 index 000000000..bd14b5161 --- /dev/null +++ b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md @@ -0,0 +1,236 @@ +# Continuous Queries + +This document lays out continuous queries and a proposed architecture for how they'll work within an InfluxDB cluster. + +## Definition of Continuous Queries + +Continuous queries serve two purposes in InfluxDB: + +1. Combining many series into a single series (i.e. removing 1 or more tag dimensions to make queries more efficient) +2. Aggregating and downsampling series + +The purpose of both types of continuous queries is to duplicate or downsample data automatically in the background to make querying thier results fast and efficient. Think of them as another way to create indexes on data. + +Generally, there are continuous queries that create copyies of data into another measurement or tagset and queries that downsample and aggregate data. The only difference between the two types is if the query has a `GROUP BY time` clause. + +Before we get to the continuous query examples, we need to define the `INTO` syntax of queries. + +### INTO + +`INTO` is a method for running a query and having it output into either another measurement name, retention policy, or database. The syntax looks like this: + +```sql +SELECT * +INTO [.] [ON ] +FROM +[WHERE ...] +[GROUP BY ...] +``` + +The syntax states that the retention policy, database, where clause, and group by clause are all optional. If a retention policy isn't specified, the database's default retention policy will be written into. If the database isn't specified, the database the query is running from will be written into. + +By selecting specific fields, `INTO` can merge many series into one that will go into a new either a new measurement, retention policy, or database. For example: + +```sql +SELECT mean(value) as value, region +INTO "1h.cpu_load" +FROM cpu_load +GROUP BY time(1h), region +``` + +That will give 1h summaries of the mean value of the `cpu_load` for each `region`. Specifying `region` in the `GROUP BY` clause is unnecessary since having it in the `SELECT` clause forces it to be grouped by that tag, we've just included it in the example for clarity. + +With `SELECT ... INTO`, fields will be written as fields and tags will be written as tags. + +### Continuous Query Syntax + +The `INTO` queries run once. Continuous queries will turn `INTO` queries into something that run in the background in the cluster. They're kind of like triggers in SQL. + +```sql +CREATE CONTINUOUS QUERY "1h_cpu_load" +ON database_name +BEGIN + SELECT mean(value) as value, region + INTO "1h.cpu_load" + FROM cpu_load + GROUP BY time(1h), region +END +``` + +Or chain them together: + +```sql +CREATE CONTINUOUS QUERY "10m_event_count" +ON database_name +BEGIN + SELECT count(value) + INTO "10m.events" + FROM events + GROUP BY time(10m) +END + +-- this selects from the output of one continuous query and outputs to another series +CREATE CONTINUOUS QUERY "1h_event_count" +ON database_name +BEGIN + SELECT sum(count) as count + INTO "1h.events" + FROM events + GROUP BY time(1h) +END +``` + +Or multiple aggregations from all series in a measurement. This example assumes you have a retention policy named `1h`. + +```sql +CREATE CONTINUOUS QUERY "1h_cpu_load" +ON database_name +BEGIN + SELECT mean(value), percentile(80, value) as percentile_80, percentile(95, value) as percentile_95 + INTO "1h.cpu_load" + FROM cpu_load + GROUP BY time(1h), * +END +``` + +The `GROUP BY *` indicates that we want to group by the tagset of the points written in. The same tags will be written to the output series. The multiple aggregates in the `SELECT` clause (percentile, mean) will be written in as fields to the resulting series. + +Showing what continuous queries we have: + +```sql +LIST CONTINUOUS QUERIES +``` + +Dropping continuous queries: + +```sql +DROP CONTINUOUS QUERY +ON +``` + +### Security + +To create or drop a continuous query, the user must be an admin. + +### Limitations + +In order to prevent cycles and endless copying of data, the following limitation is enforced on continuous queries at create time: + +*The output of a continuous query must go to either a different measurement or to a different retention policy.* + +In theory they'd still be able to create a cycle with multiple continuous queries. We should check for these and disallow. + +## Proposed Architecture + +Continuous queries should be stored in the metastore cluster wide. That is, they amount to database schema that should be stored in every server in a cluster. + +Continuous queries will have to be handled in a different way for two different use cases: those that simply copy data (CQs without a group by time) and those that aggregate and downsample data (those with a group by time). + +### No group by time + +For CQs that have no `GROUP BY time` clause, they should be evaluated at the data node as part of the write. The single write should create any other writes for the CQ and submit those in the same request to the brokers to ensure that all writes succeed (both the original and the new CQ writes) or none do. + +I imagine the process going something like this: + +1. Convert the data point into its compact form `