From 65f353baccbd7ed76dcf7a9540c9b367c4400d99 Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 10:32:55 -0400 Subject: [PATCH 1/9] Change coordinator to query --- .../services/m3coordinator/config/config.go | 2 +- src/cmd/services/m3coordinator/main/main.go | 2 +- .../integration/testdata/read_data.snappy | 2 -- src/{coordinator => query}/.excludefmt | 0 src/{coordinator => query}/.excludelint | 0 src/{coordinator => query}/.excludemetalint | 0 src/{coordinator => query}/.metalinter.json | 0 src/{coordinator => query}/README.md | 10 ++++----- .../api/v1/handler/common.go | 2 +- .../api/v1/handler/common_test.go | 0 .../api/v1/handler/database/common.go | 2 +- .../api/v1/handler/database/create.go | 12 +++++----- .../api/v1/handler/database/create_test.go | 4 ++-- .../api/v1/handler/errors.go | 0 .../api/v1/handler/headers.go | 0 .../api/v1/handler/namespace/add.go | 6 ++--- .../api/v1/handler/namespace/add_test.go | 0 .../api/v1/handler/namespace/common.go | 2 +- .../api/v1/handler/namespace/common_test.go | 2 +- .../api/v1/handler/namespace/delete.go | 4 ++-- .../api/v1/handler/namespace/delete_test.go | 0 .../api/v1/handler/namespace/get.go | 6 ++--- .../api/v1/handler/namespace/get_test.go | 2 +- .../api/v1/handler/openapi/openapi.go | 6 ++--- .../api/v1/handler/openapi/openapi_test.go | 0 .../api/v1/handler/placement/add.go | 6 ++--- .../api/v1/handler/placement/add_test.go | 0 .../api/v1/handler/placement/common.go | 2 +- .../api/v1/handler/placement/common_test.go | 0 .../api/v1/handler/placement/delete.go | 6 ++--- .../api/v1/handler/placement/delete_all.go | 4 ++-- .../v1/handler/placement/delete_all_test.go | 0 .../api/v1/handler/placement/delete_test.go | 0 .../api/v1/handler/placement/get.go | 6 ++--- .../api/v1/handler/placement/get_test.go | 2 +- .../api/v1/handler/placement/init.go | 6 ++--- .../api/v1/handler/placement/init_test.go | 0 .../api/v1/handler/prometheus/common.go | 2 +- .../api/v1/handler/prometheus/common_test.go | 2 +- .../v1/handler/prometheus/native/common.go | 16 +++++++------- .../handler/prometheus/native/common_test.go | 0 .../api/v1/handler/prometheus/native/read.go | 14 ++++++------ .../v1/handler/prometheus/native/read_test.go | 10 ++++----- .../api/v1/handler/prometheus/remote/read.go | 12 +++++----- .../v1/handler/prometheus/remote/read_test.go | 10 ++++----- .../api/v1/handler/prometheus/remote/write.go | 12 +++++----- .../handler/prometheus/remote/write_test.go | 6 ++--- .../api/v1/handler/search.go | 4 ++-- .../api/v1/handler/search_test.go | 10 ++++----- .../api/v1/httpd/handler.go | 20 ++++++++--------- .../api/v1/httpd/handler_test.go | 10 ++++----- .../benchmark/README.MD | 0 .../benchmark/benchmarker/main/README.MD | 10 ++++----- .../benchmark/benchmarker/main/benchmarker.go | 4 ++-- .../benchmarker/main/convert_to_prom.go | 4 ++-- .../benchmark/benchmarker/main/data_gen.sh | 0 .../main/m3coordinator-local-config.yml | 0 .../main/m3dbnode-local-config.yaml | 0 .../benchmark/common/http_utils.go | 0 .../benchmark/common/parse_json.go | 4 ++-- .../benchmark/configs/benchmark.yml | 0 .../benchmark/configs/m3db_config.yaml | 0 .../m3dbnode-server1-config.yaml | 0 .../m3dbnode-server2-config.yaml | 0 .../m3dbnode-server3-config.yaml | 0 .../benchmark/data/data_gen.sh | 0 .../benchmark/read/main/read_benchmark.go | 4 ++-- .../benchmark/write/main/benchmarker.go | 0 .../benchmark/write/main/write_benchmark.go | 2 +- src/{coordinator => query}/block/column.go | 0 src/{coordinator => query}/block/series.go | 0 src/{coordinator => query}/block/types.go | 2 +- .../cluster/m3db/async_client.go | 0 .../cluster/m3db/async_client_test.go | 2 +- .../config/m3coordinator-cluster-template.yml | 0 .../config/m3coordinator-local-etcd.yml | 0 .../errors/execution.go | 0 src/{coordinator => query}/errors/handler.go | 0 src/{coordinator => query}/errors/storage.go | 0 src/{coordinator => query}/executor/engine.go | 10 ++++----- .../executor/engine_test.go | 6 ++--- src/{coordinator => query}/executor/result.go | 4 ++-- src/{coordinator => query}/executor/state.go | 10 ++++----- .../executor/state_test.go | 10 ++++----- .../executor/tracker.go | 4 ++-- .../executor/transform/cache.go | 4 ++-- .../executor/transform/controller.go | 4 ++-- .../executor/transform/lazy.go | 4 ++-- .../executor/transform/lazy_test.go | 6 ++--- .../executor/transform/types.go | 4 ++-- src/{coordinator => query}/functions/count.go | 6 ++--- .../functions/count_test.go | 6 ++--- src/{coordinator => query}/functions/fetch.go | 8 +++---- .../functions/fetch_test.go | 12 +++++----- .../functions/linear/absent.go | 2 +- .../functions/linear/absent_test.go | 6 ++--- .../functions/linear/base.go | 6 ++--- .../functions/linear/clamp.go | 2 +- .../functions/linear/clamp_test.go | 6 ++--- .../functions/linear/math.go | 2 +- .../functions/linear/math_test.go | 6 ++--- .../functions/linear/round.go | 2 +- .../functions/linear/round_test.go | 6 ++--- .../functions/logical/and.go | 6 ++--- .../functions/logical/and_test.go | 6 ++--- .../functions/logical/common.go | 6 ++--- .../functions/logical/node.go | 6 ++--- .../generated/assets/asset-gen.sh | 0 .../generated/assets/generated.go | 2 +- .../generated/assets/openapi/assets.go | 0 .../generated/assets/openapi/index.html | 0 .../generated/assets/openapi/spec.yml | 0 .../generated/proto/admin/database.pb.go | 10 ++++----- .../generated/proto/admin/database.proto | 4 ++-- .../generated/proto/admin/namespace.pb.go | 4 ++-- .../generated/proto/admin/namespace.proto | 0 .../generated/proto/admin/placement.pb.go | 4 ++-- .../generated/proto/admin/placement.proto | 0 .../generated/proto/generated.go | 2 +- .../generated/proto/prompb/remote.pb.go | 8 +++---- .../generated/proto/prompb/remote.proto | 2 +- .../generated/proto/prompb/types.pb.go | 4 ++-- .../generated/proto/prompb/types.proto | 0 .../generated/proto/rpc/query.pb.go | 8 +++---- .../generated/proto/rpc/query.proto | 0 .../integration/read_curl.sh | 0 .../integration/testdata/read_data.snappy | 2 ++ src/{coordinator => query}/mocks/block.go | 0 src/{coordinator => query}/mocks/resolver.go | 4 ++-- src/{coordinator => query}/models/params.go | 0 src/{coordinator => query}/models/tag.go | 0 src/{coordinator => query}/models/tag_test.go | 0 .../parser/common/types.go | 0 .../parser/interface.go | 0 .../parser/promql/item.go | 0 .../parser/promql/parse.go | 4 ++-- .../parser/promql/parse_test.go | 8 +++---- .../parser/promql/types.go | 12 +++++----- src/{coordinator => query}/plan/logical.go | 2 +- .../plan/logical_test.go | 4 ++-- src/{coordinator => query}/plan/physical.go | 8 +++---- .../plan/physical_test.go | 6 ++--- .../policy/filter/storage.go | 2 +- .../policy/filter/storage_test.go | 4 ++-- .../policy/resolver/interface.go | 4 ++-- .../policy/resolver/static.go | 4 ++-- .../services/m3coordinator/server/server.go | 22 +++++++++---------- src/{coordinator => query}/storage/block.go | 4 ++-- src/{coordinator => query}/storage/config.go | 0 .../storage/config_test.go | 0 .../storage/converter.go | 6 ++--- .../storage/converter_test.go | 4 ++-- .../storage/fanout/storage.go | 16 +++++++------- .../storage/fanout/storage_test.go | 14 ++++++------ src/{coordinator => query}/storage/index.go | 2 +- .../storage/interface.go | 6 ++--- .../storage/local/cluster.go | 2 +- .../storage/local/cluster_test.go | 2 +- .../storage/local/config.go | 4 ++-- .../storage/local/storage.go | 10 ++++----- .../storage/local/storage_test.go | 10 ++++----- .../storage/mock/storage.go | 4 ++-- .../storage/remote/storage.go | 8 +++---- .../stores/m3db/async_session.go | 0 .../stores/m3db/async_session_test.go | 2 +- src/{coordinator => query}/test/block.go | 4 ++-- .../test/executor/transform.go | 6 ++--- src/{coordinator => query}/test/handler.go | 2 +- .../test/local/storage.go | 4 ++-- .../test/seriesiter/mock_iter.go | 0 src/{coordinator => query}/test/storage.go | 4 ++-- .../test/test_series_iterator.go | 0 src/{coordinator => query}/test/util.go | 0 src/{coordinator => query}/ts/m3db/blocks.go | 0 .../ts/m3db/blocks_test.go | 0 src/{coordinator => query}/ts/m3db/convert.go | 0 .../ts/m3db/convert_test.go | 4 ++-- .../ts/m3db/storage/local.go | 6 ++--- .../ts/m3db/storage/local_test.go | 10 ++++----- src/{coordinator => query}/ts/m3db/types.go | 0 src/{coordinator => query}/ts/memset.go | 0 src/{coordinator => query}/ts/memset_test.go | 0 src/{coordinator => query}/ts/series.go | 4 ++-- src/{coordinator => query}/ts/series_test.go | 2 +- src/{coordinator => query}/ts/values.go | 2 +- src/{coordinator => query}/ts/values_test.go | 0 src/{coordinator => query}/tsdb/interface.go | 0 .../tsdb/remote/client.go | 12 +++++----- .../tsdb/remote/codecs.go | 8 +++---- .../tsdb/remote/codecs_test.go | 8 +++---- .../tsdb/remote/compressed_codecs.go | 4 ++-- .../tsdb/remote/compressed_codecs_test.go | 6 ++--- .../tsdb/remote/server.go | 6 ++--- .../tsdb/remote/server_test.go | 12 +++++----- .../tsdb/remote/staticResolver.go | 0 .../util/execution/parallel.go | 0 .../util/execution/parallel_test.go | 0 .../util/execution/state.go | 0 .../util/json/writer.go | 0 .../util/json/writer_test.go | 0 .../util/logging/log.go | 0 src/{coordinator => query}/util/strings.go | 0 .../util/strings_test.go | 0 src/{coordinator => query}/util/timing.go | 0 204 files changed, 374 insertions(+), 374 deletions(-) delete mode 100644 src/coordinator/integration/testdata/read_data.snappy rename src/{coordinator => query}/.excludefmt (100%) rename src/{coordinator => query}/.excludelint (100%) rename src/{coordinator => query}/.excludemetalint (100%) rename src/{coordinator => query}/.metalinter.json (100%) rename src/{coordinator => query}/README.md (91%) rename src/{coordinator => query}/api/v1/handler/common.go (99%) rename src/{coordinator => query}/api/v1/handler/common_test.go (100%) rename src/{coordinator => query}/api/v1/handler/database/common.go (97%) rename src/{coordinator => query}/api/v1/handler/database/create.go (97%) rename src/{coordinator => query}/api/v1/handler/database/create_test.go (99%) rename src/{coordinator => query}/api/v1/handler/errors.go (100%) rename src/{coordinator => query}/api/v1/handler/headers.go (100%) rename src/{coordinator => query}/api/v1/handler/namespace/add.go (95%) rename src/{coordinator => query}/api/v1/handler/namespace/add_test.go (100%) rename src/{coordinator => query}/api/v1/handler/namespace/common.go (98%) rename src/{coordinator => query}/api/v1/handler/namespace/common_test.go (98%) rename src/{coordinator => query}/api/v1/handler/namespace/delete.go (97%) rename src/{coordinator => query}/api/v1/handler/namespace/delete_test.go (100%) rename src/{coordinator => query}/api/v1/handler/namespace/get.go (94%) rename src/{coordinator => query}/api/v1/handler/namespace/get_test.go (98%) rename src/{coordinator => query}/api/v1/handler/openapi/openapi.go (92%) rename src/{coordinator => query}/api/v1/handler/openapi/openapi_test.go (100%) rename src/{coordinator => query}/api/v1/handler/placement/add.go (95%) rename src/{coordinator => query}/api/v1/handler/placement/add_test.go (100%) rename src/{coordinator => query}/api/v1/handler/placement/common.go (98%) rename src/{coordinator => query}/api/v1/handler/placement/common_test.go (100%) rename src/{coordinator => query}/api/v1/handler/placement/delete.go (94%) rename src/{coordinator => query}/api/v1/handler/placement/delete_all.go (95%) rename src/{coordinator => query}/api/v1/handler/placement/delete_all_test.go (100%) rename src/{coordinator => query}/api/v1/handler/placement/delete_test.go (100%) rename src/{coordinator => query}/api/v1/handler/placement/get.go (93%) rename src/{coordinator => query}/api/v1/handler/placement/get_test.go (98%) rename src/{coordinator => query}/api/v1/handler/placement/init.go (95%) rename src/{coordinator => query}/api/v1/handler/placement/init_test.go (100%) rename src/{coordinator => query}/api/v1/handler/prometheus/common.go (97%) rename src/{coordinator => query}/api/v1/handler/prometheus/common_test.go (98%) rename src/{coordinator => query}/api/v1/handler/prometheus/native/common.go (91%) rename src/{coordinator => query}/api/v1/handler/prometheus/native/common_test.go (100%) rename src/{coordinator => query}/api/v1/handler/prometheus/native/read.go (95%) rename src/{coordinator => query}/api/v1/handler/prometheus/native/read_test.go (89%) rename src/{coordinator => query}/api/v1/handler/prometheus/remote/read.go (94%) rename src/{coordinator => query}/api/v1/handler/prometheus/remote/read_test.go (95%) rename src/{coordinator => query}/api/v1/handler/prometheus/remote/write.go (92%) rename src/{coordinator => query}/api/v1/handler/prometheus/remote/write_test.go (96%) rename src/{coordinator => query}/api/v1/handler/search.go (97%) rename src/{coordinator => query}/api/v1/handler/search_test.go (93%) rename src/{coordinator => query}/api/v1/httpd/handler.go (88%) rename src/{coordinator => query}/api/v1/httpd/handler_test.go (93%) rename src/{coordinator => query}/benchmark/README.MD (100%) rename src/{coordinator => query}/benchmark/benchmarker/main/README.MD (81%) rename src/{coordinator => query}/benchmark/benchmarker/main/benchmarker.go (98%) rename src/{coordinator => query}/benchmark/benchmarker/main/convert_to_prom.go (97%) rename src/{coordinator => query}/benchmark/benchmarker/main/data_gen.sh (100%) rename src/{coordinator => query}/benchmark/benchmarker/main/m3coordinator-local-config.yml (100%) rename src/{coordinator => query}/benchmark/benchmarker/main/m3dbnode-local-config.yaml (100%) rename src/{coordinator => query}/benchmark/common/http_utils.go (100%) rename src/{coordinator => query}/benchmark/common/parse_json.go (98%) rename src/{coordinator => query}/benchmark/configs/benchmark.yml (100%) rename src/{coordinator => query}/benchmark/configs/m3db_config.yaml (100%) rename src/{coordinator => query}/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml (100%) rename src/{coordinator => query}/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml (100%) rename src/{coordinator => query}/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml (100%) rename src/{coordinator => query}/benchmark/data/data_gen.sh (100%) rename src/{coordinator => query}/benchmark/read/main/read_benchmark.go (98%) rename src/{coordinator => query}/benchmark/write/main/benchmarker.go (100%) rename src/{coordinator => query}/benchmark/write/main/write_benchmark.go (99%) rename src/{coordinator => query}/block/column.go (100%) rename src/{coordinator => query}/block/series.go (100%) rename src/{coordinator => query}/block/types.go (98%) rename src/{coordinator => query}/cluster/m3db/async_client.go (100%) rename src/{coordinator => query}/cluster/m3db/async_client_test.go (98%) rename src/{coordinator => query}/config/m3coordinator-cluster-template.yml (100%) rename src/{coordinator => query}/config/m3coordinator-local-etcd.yml (100%) rename src/{coordinator => query}/errors/execution.go (100%) rename src/{coordinator => query}/errors/handler.go (100%) rename src/{coordinator => query}/errors/storage.go (100%) rename src/{coordinator => query}/executor/engine.go (94%) rename src/{coordinator => query}/executor/engine_test.go (92%) rename src/{coordinator => query}/executor/result.go (96%) rename src/{coordinator => query}/executor/state.go (95%) rename src/{coordinator => query}/executor/state_test.go (94%) rename src/{coordinator => query}/executor/tracker.go (98%) rename src/{coordinator => query}/executor/transform/cache.go (95%) rename src/{coordinator => query}/executor/transform/controller.go (95%) rename src/{coordinator => query}/executor/transform/lazy.go (97%) rename src/{coordinator => query}/executor/transform/lazy_test.go (94%) rename src/{coordinator => query}/executor/transform/types.go (96%) rename src/{coordinator => query}/functions/count.go (94%) rename src/{coordinator => query}/functions/count_test.go (93%) rename src/{coordinator => query}/functions/fetch.go (93%) rename src/{coordinator => query}/functions/fetch_test.go (85%) rename src/{coordinator => query}/functions/linear/absent.go (97%) rename src/{coordinator => query}/functions/linear/absent_test.go (93%) rename src/{coordinator => query}/functions/linear/base.go (96%) rename src/{coordinator => query}/functions/linear/clamp.go (97%) rename src/{coordinator => query}/functions/linear/clamp_test.go (94%) rename src/{coordinator => query}/functions/linear/math.go (98%) rename src/{coordinator => query}/functions/linear/math_test.go (97%) rename src/{coordinator => query}/functions/linear/round.go (97%) rename src/{coordinator => query}/functions/linear/round_test.go (92%) rename src/{coordinator => query}/functions/logical/and.go (96%) rename src/{coordinator => query}/functions/logical/and_test.go (94%) rename src/{coordinator => query}/functions/logical/common.go (94%) rename src/{coordinator => query}/functions/logical/node.go (95%) rename src/{coordinator => query}/generated/assets/asset-gen.sh (100%) rename src/{coordinator => query}/generated/assets/generated.go (88%) rename src/{coordinator => query}/generated/assets/openapi/assets.go (100%) rename src/{coordinator => query}/generated/assets/openapi/index.html (100%) rename src/{coordinator => query}/generated/assets/openapi/spec.yml (100%) rename src/{coordinator => query}/generated/proto/admin/database.pb.go (98%) rename src/{coordinator => query}/generated/proto/admin/database.proto (91%) rename src/{coordinator => query}/generated/proto/admin/namespace.pb.go (98%) rename src/{coordinator => query}/generated/proto/admin/namespace.proto (100%) rename src/{coordinator => query}/generated/proto/admin/placement.pb.go (98%) rename src/{coordinator => query}/generated/proto/admin/placement.proto (100%) rename src/{coordinator => query}/generated/proto/generated.go (96%) rename src/{coordinator => query}/generated/proto/prompb/remote.pb.go (98%) rename src/{coordinator => query}/generated/proto/prompb/remote.proto (86%) rename src/{coordinator => query}/generated/proto/prompb/types.pb.go (99%) rename src/{coordinator => query}/generated/proto/prompb/types.proto (100%) rename src/{coordinator => query}/generated/proto/rpc/query.pb.go (99%) rename src/{coordinator => query}/generated/proto/rpc/query.proto (100%) rename src/{coordinator => query}/integration/read_curl.sh (100%) create mode 100644 src/query/integration/testdata/read_data.snappy rename src/{coordinator => query}/mocks/block.go (100%) rename src/{coordinator => query}/mocks/resolver.go (96%) rename src/{coordinator => query}/models/params.go (100%) rename src/{coordinator => query}/models/tag.go (100%) rename src/{coordinator => query}/models/tag_test.go (100%) rename src/{coordinator => query}/parser/common/types.go (100%) rename src/{coordinator => query}/parser/interface.go (100%) rename src/{coordinator => query}/parser/promql/item.go (100%) rename src/{coordinator => query}/parser/promql/parse.go (97%) rename src/{coordinator => query}/parser/promql/parse_test.go (97%) rename src/{coordinator => query}/parser/promql/types.go (94%) rename src/{coordinator => query}/plan/logical.go (98%) rename src/{coordinator => query}/plan/logical_test.go (97%) rename src/{coordinator => query}/plan/physical.go (94%) rename src/{coordinator => query}/plan/physical_test.go (93%) rename src/{coordinator => query}/policy/filter/storage.go (96%) rename src/{coordinator => query}/policy/filter/storage_test.go (94%) rename src/{coordinator => query}/policy/resolver/interface.go (94%) rename src/{coordinator => query}/policy/resolver/static.go (95%) rename src/{coordinator => query}/services/m3coordinator/server/server.go (93%) rename src/{coordinator => query}/storage/block.go (98%) rename src/{coordinator => query}/storage/config.go (100%) rename src/{coordinator => query}/storage/config_test.go (100%) rename src/{coordinator => query}/storage/converter.go (98%) rename src/{coordinator => query}/storage/converter_test.go (97%) rename src/{coordinator => query}/storage/fanout/storage.go (93%) rename src/{coordinator => query}/storage/fanout/storage_test.go (94%) rename src/{coordinator => query}/storage/index.go (98%) rename src/{coordinator => query}/storage/interface.go (97%) rename src/{coordinator => query}/storage/local/cluster.go (99%) rename src/{coordinator => query}/storage/local/cluster_test.go (99%) rename src/{coordinator => query}/storage/local/config.go (98%) rename src/{coordinator => query}/storage/local/storage.go (97%) rename src/{coordinator => query}/storage/local/storage_test.go (97%) rename src/{coordinator => query}/storage/mock/storage.go (96%) rename src/{coordinator => query}/storage/remote/storage.go (92%) rename src/{coordinator => query}/stores/m3db/async_session.go (100%) rename src/{coordinator => query}/stores/m3db/async_session_test.go (99%) rename src/{coordinator => query}/test/block.go (96%) rename src/{coordinator => query}/test/executor/transform.go (92%) rename src/{coordinator => query}/test/handler.go (96%) rename src/{coordinator => query}/test/local/storage.go (95%) rename src/{coordinator => query}/test/seriesiter/mock_iter.go (100%) rename src/{coordinator => query}/test/storage.go (96%) rename src/{coordinator => query}/test/test_series_iterator.go (100%) rename src/{coordinator => query}/test/util.go (100%) rename src/{coordinator => query}/ts/m3db/blocks.go (100%) rename src/{coordinator => query}/ts/m3db/blocks_test.go (100%) rename src/{coordinator => query}/ts/m3db/convert.go (100%) rename src/{coordinator => query}/ts/m3db/convert_test.go (97%) rename src/{coordinator => query}/ts/m3db/storage/local.go (96%) rename src/{coordinator => query}/ts/m3db/storage/local_test.go (94%) rename src/{coordinator => query}/ts/m3db/types.go (100%) rename src/{coordinator => query}/ts/memset.go (100%) rename src/{coordinator => query}/ts/memset_test.go (100%) rename src/{coordinator => query}/ts/series.go (97%) rename src/{coordinator => query}/ts/series_test.go (97%) rename src/{coordinator => query}/ts/values.go (99%) rename src/{coordinator => query}/ts/values_test.go (100%) rename src/{coordinator => query}/tsdb/interface.go (100%) rename src/{coordinator => query}/tsdb/remote/client.go (92%) rename src/{coordinator => query}/tsdb/remote/codecs.go (97%) rename src/{coordinator => query}/tsdb/remote/codecs_test.go (97%) rename src/{coordinator => query}/tsdb/remote/compressed_codecs.go (99%) rename src/{coordinator => query}/tsdb/remote/compressed_codecs_test.go (99%) rename src/{coordinator => query}/tsdb/remote/server.go (95%) rename src/{coordinator => query}/tsdb/remote/server_test.go (97%) rename src/{coordinator => query}/tsdb/remote/staticResolver.go (100%) rename src/{coordinator => query}/util/execution/parallel.go (100%) rename src/{coordinator => query}/util/execution/parallel_test.go (100%) rename src/{coordinator => query}/util/execution/state.go (100%) rename src/{coordinator => query}/util/json/writer.go (100%) rename src/{coordinator => query}/util/json/writer_test.go (100%) rename src/{coordinator => query}/util/logging/log.go (100%) rename src/{coordinator => query}/util/strings.go (100%) rename src/{coordinator => query}/util/strings_test.go (100%) rename src/{coordinator => query}/util/timing.go (100%) diff --git a/src/cmd/services/m3coordinator/config/config.go b/src/cmd/services/m3coordinator/config/config.go index a8e9625d1e..57cbd95acb 100644 --- a/src/cmd/services/m3coordinator/config/config.go +++ b/src/cmd/services/m3coordinator/config/config.go @@ -24,7 +24,7 @@ import ( "time" etcdclient "github.com/m3db/m3cluster/client/etcd" - "github.com/m3db/m3db/src/coordinator/storage/local" + "github.com/m3db/m3db/src/query/storage/local" "github.com/m3db/m3x/instrument" ) diff --git a/src/cmd/services/m3coordinator/main/main.go b/src/cmd/services/m3coordinator/main/main.go index e867bed29d..ab39a5f782 100644 --- a/src/cmd/services/m3coordinator/main/main.go +++ b/src/cmd/services/m3coordinator/main/main.go @@ -25,7 +25,7 @@ import ( _ "net/http/pprof" // pprof: for debug listen server if configured "os" - "github.com/m3db/m3db/src/coordinator/services/m3coordinator/server" + "github.com/m3db/m3db/src/query/services/m3coordinator/server" ) var ( diff --git a/src/coordinator/integration/testdata/read_data.snappy b/src/coordinator/integration/testdata/read_data.snappy deleted file mode 100644 index eb68d139bc..0000000000 --- a/src/coordinator/integration/testdata/read_data.snappy +++ /dev/null @@ -1,2 +0,0 @@ -` -õ¯·À–,õçÐé–,eqa \ No newline at end of file diff --git a/src/coordinator/.excludefmt b/src/query/.excludefmt similarity index 100% rename from src/coordinator/.excludefmt rename to src/query/.excludefmt diff --git a/src/coordinator/.excludelint b/src/query/.excludelint similarity index 100% rename from src/coordinator/.excludelint rename to src/query/.excludelint diff --git a/src/coordinator/.excludemetalint b/src/query/.excludemetalint similarity index 100% rename from src/coordinator/.excludemetalint rename to src/query/.excludemetalint diff --git a/src/coordinator/.metalinter.json b/src/query/.metalinter.json similarity index 100% rename from src/coordinator/.metalinter.json rename to src/query/.metalinter.json diff --git a/src/coordinator/README.md b/src/query/README.md similarity index 91% rename from src/coordinator/README.md rename to src/query/README.md index 0c395b0402..48451aadc0 100644 --- a/src/coordinator/README.md +++ b/src/query/README.md @@ -50,13 +50,13 @@ Run m3coordinator binary: Run Prometheus Docker image: - $ docker run -p 9090:9090 -v $GOPATH/src/github.com/m3db/m3db/src/coordinator/docker/prometheus-mac.yml:/etc/prometheus/prometheus.yml quay.io/prometheus/prometheus + $ docker run -p 9090:9090 -v $GOPATH/src/github.com/m3db/m3db/src/query/docker/prometheus-mac.yml:/etc/prometheus/prometheus.yml quay.io/prometheus/prometheus ### Running on GCP Setup GCP for [single m3db node](https://github.com/m3db/m3db/pull/452/files?short_path=20bfc3f#diff-20bfc3ff6a860483887b93bf9cf0d135) -> For a multi-node cluster, [see here](https://github.com/m3db/m3db/src/coordinator/tree/master/benchmark) +> For a multi-node cluster, [see here](https://github.com/m3db/m3db/src/query/tree/master/benchmark) Setup GCP for m3coordinator: @@ -80,7 +80,7 @@ Setup and run Prometheus: - url: http://10.142.0.8:7201/api/v1/prom/remote/write ``` 3. Run Prometheus - $ sudo docker run -p 9090:9090 -v $GOPATH/src/github.com/m3db/m3db/src/coordinator/docker/prometheus.yml:/etc/prometheus/prometheus.yml quay.io/prometheus/prometheus + $ sudo docker run -p 9090:9090 -v $GOPATH/src/github.com/m3db/m3db/src/query/docker/prometheus.yml:/etc/prometheus/prometheus.yml quay.io/prometheus/prometheus -[doc-img]: https://godoc.org/github.com/m3db/m3db/src/coordinator?status.svg -[doc]: https://godoc.org/github.com/m3db/m3db/src/coordinator +[doc-img]: https://godoc.org/github.com/m3db/m3db/src/query?status.svg +[doc]: https://godoc.org/github.com/m3db/m3db/src/query diff --git a/src/coordinator/api/v1/handler/common.go b/src/query/api/v1/handler/common.go similarity index 99% rename from src/coordinator/api/v1/handler/common.go rename to src/query/api/v1/handler/common.go index 8c2827f37d..569784179d 100644 --- a/src/coordinator/api/v1/handler/common.go +++ b/src/query/api/v1/handler/common.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/src/coordinator/api/v1/handler/common_test.go b/src/query/api/v1/handler/common_test.go similarity index 100% rename from src/coordinator/api/v1/handler/common_test.go rename to src/query/api/v1/handler/common_test.go diff --git a/src/coordinator/api/v1/handler/database/common.go b/src/query/api/v1/handler/database/common.go similarity index 97% rename from src/coordinator/api/v1/handler/database/common.go rename to src/query/api/v1/handler/database/common.go index 0f8274f19f..119ad11edb 100644 --- a/src/coordinator/api/v1/handler/database/common.go +++ b/src/query/api/v1/handler/database/common.go @@ -24,7 +24,7 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" ) diff --git a/src/coordinator/api/v1/handler/database/create.go b/src/query/api/v1/handler/database/create.go similarity index 97% rename from src/coordinator/api/v1/handler/database/create.go rename to src/query/api/v1/handler/database/create.go index 614cf2a85e..add50ffa99 100644 --- a/src/coordinator/api/v1/handler/database/create.go +++ b/src/query/api/v1/handler/database/create.go @@ -34,12 +34,12 @@ import ( "github.com/m3db/m3cluster/generated/proto/placementpb" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/namespace" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/placement" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler/namespace" + "github.com/m3db/m3db/src/query/api/v1/handler/placement" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util" + "github.com/m3db/m3db/src/query/util/logging" dbnamespace "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/golang/protobuf/jsonpb" diff --git a/src/coordinator/api/v1/handler/database/create_test.go b/src/query/api/v1/handler/database/create_test.go similarity index 99% rename from src/coordinator/api/v1/handler/database/create_test.go rename to src/query/api/v1/handler/database/create_test.go index 81808c27f6..a05798ea84 100644 --- a/src/coordinator/api/v1/handler/database/create_test.go +++ b/src/query/api/v1/handler/database/create_test.go @@ -38,8 +38,8 @@ import ( "github.com/m3db/m3cluster/services" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/namespace" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler/namespace" + "github.com/m3db/m3db/src/query/util/logging" xtest "github.com/m3db/m3db/src/dbnode/x/test" "github.com/golang/mock/gomock" diff --git a/src/coordinator/api/v1/handler/errors.go b/src/query/api/v1/handler/errors.go similarity index 100% rename from src/coordinator/api/v1/handler/errors.go rename to src/query/api/v1/handler/errors.go diff --git a/src/coordinator/api/v1/handler/headers.go b/src/query/api/v1/handler/headers.go similarity index 100% rename from src/coordinator/api/v1/handler/headers.go rename to src/query/api/v1/handler/headers.go diff --git a/src/coordinator/api/v1/handler/namespace/add.go b/src/query/api/v1/handler/namespace/add.go similarity index 95% rename from src/coordinator/api/v1/handler/namespace/add.go rename to src/query/api/v1/handler/namespace/add.go index 33e2ff5ca7..1084b0ba0e 100644 --- a/src/coordinator/api/v1/handler/namespace/add.go +++ b/src/query/api/v1/handler/namespace/add.go @@ -26,9 +26,9 @@ import ( "net/http" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/m3db/m3db/src/dbnode/storage/namespace" diff --git a/src/coordinator/api/v1/handler/namespace/add_test.go b/src/query/api/v1/handler/namespace/add_test.go similarity index 100% rename from src/coordinator/api/v1/handler/namespace/add_test.go rename to src/query/api/v1/handler/namespace/add_test.go diff --git a/src/coordinator/api/v1/handler/namespace/common.go b/src/query/api/v1/handler/namespace/common.go similarity index 98% rename from src/coordinator/api/v1/handler/namespace/common.go rename to src/query/api/v1/handler/namespace/common.go index c231b9a1aa..7fb7e6bad3 100644 --- a/src/coordinator/api/v1/handler/namespace/common.go +++ b/src/query/api/v1/handler/namespace/common.go @@ -25,7 +25,7 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/m3db/m3db/src/dbnode/storage/namespace" diff --git a/src/coordinator/api/v1/handler/namespace/common_test.go b/src/query/api/v1/handler/namespace/common_test.go similarity index 98% rename from src/coordinator/api/v1/handler/namespace/common_test.go rename to src/query/api/v1/handler/namespace/common_test.go index 0c273dc110..073325e2ce 100644 --- a/src/coordinator/api/v1/handler/namespace/common_test.go +++ b/src/query/api/v1/handler/namespace/common_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/golang/mock/gomock" diff --git a/src/coordinator/api/v1/handler/namespace/delete.go b/src/query/api/v1/handler/namespace/delete.go similarity index 97% rename from src/coordinator/api/v1/handler/namespace/delete.go rename to src/query/api/v1/handler/namespace/delete.go index ef18e6698f..3c4d1264b7 100644 --- a/src/coordinator/api/v1/handler/namespace/delete.go +++ b/src/query/api/v1/handler/namespace/delete.go @@ -28,8 +28,8 @@ import ( "strings" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/gorilla/mux" diff --git a/src/coordinator/api/v1/handler/namespace/delete_test.go b/src/query/api/v1/handler/namespace/delete_test.go similarity index 100% rename from src/coordinator/api/v1/handler/namespace/delete_test.go rename to src/query/api/v1/handler/namespace/delete_test.go diff --git a/src/coordinator/api/v1/handler/namespace/get.go b/src/query/api/v1/handler/namespace/get.go similarity index 94% rename from src/coordinator/api/v1/handler/namespace/get.go rename to src/query/api/v1/handler/namespace/get.go index 153da263b8..ab401c4ecf 100644 --- a/src/coordinator/api/v1/handler/namespace/get.go +++ b/src/query/api/v1/handler/namespace/get.go @@ -26,9 +26,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "go.uber.org/zap" diff --git a/src/coordinator/api/v1/handler/namespace/get_test.go b/src/query/api/v1/handler/namespace/get_test.go similarity index 98% rename from src/coordinator/api/v1/handler/namespace/get_test.go rename to src/query/api/v1/handler/namespace/get_test.go index b22b675c3c..d28051c37c 100644 --- a/src/coordinator/api/v1/handler/namespace/get_test.go +++ b/src/query/api/v1/handler/namespace/get_test.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/golang/mock/gomock" diff --git a/src/coordinator/api/v1/handler/openapi/openapi.go b/src/query/api/v1/handler/openapi/openapi.go similarity index 92% rename from src/coordinator/api/v1/handler/openapi/openapi.go rename to src/query/api/v1/handler/openapi/openapi.go index e6a6c91f7e..c7f42222ce 100644 --- a/src/coordinator/api/v1/handler/openapi/openapi.go +++ b/src/query/api/v1/handler/openapi/openapi.go @@ -23,9 +23,9 @@ package openapi import ( "net/http" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - assets "github.com/m3db/m3db/src/coordinator/generated/assets/openapi" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + assets "github.com/m3db/m3db/src/query/generated/assets/openapi" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/openapi/openapi_test.go b/src/query/api/v1/handler/openapi/openapi_test.go similarity index 100% rename from src/coordinator/api/v1/handler/openapi/openapi_test.go rename to src/query/api/v1/handler/openapi/openapi_test.go diff --git a/src/coordinator/api/v1/handler/placement/add.go b/src/query/api/v1/handler/placement/add.go similarity index 95% rename from src/coordinator/api/v1/handler/placement/add.go rename to src/query/api/v1/handler/placement/add.go index 503101f8b3..7a9e063106 100644 --- a/src/coordinator/api/v1/handler/placement/add.go +++ b/src/query/api/v1/handler/placement/add.go @@ -26,9 +26,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/placement" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gogo/protobuf/jsonpb" "go.uber.org/zap" diff --git a/src/coordinator/api/v1/handler/placement/add_test.go b/src/query/api/v1/handler/placement/add_test.go similarity index 100% rename from src/coordinator/api/v1/handler/placement/add_test.go rename to src/query/api/v1/handler/placement/add_test.go diff --git a/src/coordinator/api/v1/handler/placement/common.go b/src/query/api/v1/handler/placement/common.go similarity index 98% rename from src/coordinator/api/v1/handler/placement/common.go rename to src/query/api/v1/handler/placement/common.go index eb3588bcda..4229605f1a 100644 --- a/src/coordinator/api/v1/handler/placement/common.go +++ b/src/query/api/v1/handler/placement/common.go @@ -30,7 +30,7 @@ import ( "github.com/m3db/m3cluster/services" "github.com/m3db/m3cluster/shard" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" ) diff --git a/src/coordinator/api/v1/handler/placement/common_test.go b/src/query/api/v1/handler/placement/common_test.go similarity index 100% rename from src/coordinator/api/v1/handler/placement/common_test.go rename to src/query/api/v1/handler/placement/common_test.go diff --git a/src/coordinator/api/v1/handler/placement/delete.go b/src/query/api/v1/handler/placement/delete.go similarity index 94% rename from src/coordinator/api/v1/handler/placement/delete.go rename to src/query/api/v1/handler/placement/delete.go index dd00e49603..741c673a51 100644 --- a/src/coordinator/api/v1/handler/placement/delete.go +++ b/src/query/api/v1/handler/placement/delete.go @@ -27,9 +27,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" "go.uber.org/zap" diff --git a/src/coordinator/api/v1/handler/placement/delete_all.go b/src/query/api/v1/handler/placement/delete_all.go similarity index 95% rename from src/coordinator/api/v1/handler/placement/delete_all.go rename to src/query/api/v1/handler/placement/delete_all.go index f4f8585150..f1de8ca663 100644 --- a/src/coordinator/api/v1/handler/placement/delete_all.go +++ b/src/query/api/v1/handler/placement/delete_all.go @@ -26,8 +26,8 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/placement/delete_all_test.go b/src/query/api/v1/handler/placement/delete_all_test.go similarity index 100% rename from src/coordinator/api/v1/handler/placement/delete_all_test.go rename to src/query/api/v1/handler/placement/delete_all_test.go diff --git a/src/coordinator/api/v1/handler/placement/delete_test.go b/src/query/api/v1/handler/placement/delete_test.go similarity index 100% rename from src/coordinator/api/v1/handler/placement/delete_test.go rename to src/query/api/v1/handler/placement/delete_test.go diff --git a/src/coordinator/api/v1/handler/placement/get.go b/src/query/api/v1/handler/placement/get.go similarity index 93% rename from src/coordinator/api/v1/handler/placement/get.go rename to src/query/api/v1/handler/placement/get.go index 90aa8555b5..421e088dc0 100644 --- a/src/coordinator/api/v1/handler/placement/get.go +++ b/src/query/api/v1/handler/placement/get.go @@ -26,9 +26,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/placement/get_test.go b/src/query/api/v1/handler/placement/get_test.go similarity index 98% rename from src/coordinator/api/v1/handler/placement/get_test.go rename to src/query/api/v1/handler/placement/get_test.go index c7b3a9167d..e085e91926 100644 --- a/src/coordinator/api/v1/handler/placement/get_test.go +++ b/src/query/api/v1/handler/placement/get_test.go @@ -32,7 +32,7 @@ import ( "github.com/m3db/m3cluster/placement" "github.com/m3db/m3cluster/services" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/coordinator/api/v1/handler/placement/init.go b/src/query/api/v1/handler/placement/init.go similarity index 95% rename from src/coordinator/api/v1/handler/placement/init.go rename to src/query/api/v1/handler/placement/init.go index 2bb9c6467d..c149064c75 100644 --- a/src/coordinator/api/v1/handler/placement/init.go +++ b/src/query/api/v1/handler/placement/init.go @@ -26,9 +26,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/placement" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/generated/proto/admin" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/generated/proto/admin" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gogo/protobuf/jsonpb" "go.uber.org/zap" diff --git a/src/coordinator/api/v1/handler/placement/init_test.go b/src/query/api/v1/handler/placement/init_test.go similarity index 100% rename from src/coordinator/api/v1/handler/placement/init_test.go rename to src/query/api/v1/handler/placement/init_test.go diff --git a/src/coordinator/api/v1/handler/prometheus/common.go b/src/query/api/v1/handler/prometheus/common.go similarity index 97% rename from src/coordinator/api/v1/handler/prometheus/common.go rename to src/query/api/v1/handler/prometheus/common.go index 9951cf9648..2738cdedd5 100644 --- a/src/coordinator/api/v1/handler/prometheus/common.go +++ b/src/query/api/v1/handler/prometheus/common.go @@ -26,7 +26,7 @@ import ( "net/http" "time" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/golang/snappy" ) diff --git a/src/coordinator/api/v1/handler/prometheus/common_test.go b/src/query/api/v1/handler/prometheus/common_test.go similarity index 98% rename from src/coordinator/api/v1/handler/prometheus/common_test.go rename to src/query/api/v1/handler/prometheus/common_test.go index 49a9113b66..c4f15f0b9f 100644 --- a/src/coordinator/api/v1/handler/prometheus/common_test.go +++ b/src/query/api/v1/handler/prometheus/common_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/test" + "github.com/m3db/m3db/src/query/test" "github.com/stretchr/testify/assert" ) diff --git a/src/coordinator/api/v1/handler/prometheus/native/common.go b/src/query/api/v1/handler/prometheus/native/common.go similarity index 91% rename from src/coordinator/api/v1/handler/prometheus/native/common.go rename to src/query/api/v1/handler/prometheus/native/common.go index 2d924411b6..01e7f3d7a6 100644 --- a/src/coordinator/api/v1/handler/prometheus/native/common.go +++ b/src/query/api/v1/handler/prometheus/native/common.go @@ -27,14 +27,14 @@ import ( "strconv" "time" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util" - "github.com/m3db/m3db/src/coordinator/util/json" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util" + "github.com/m3db/m3db/src/query/util/json" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/prometheus/native/common_test.go b/src/query/api/v1/handler/prometheus/native/common_test.go similarity index 100% rename from src/coordinator/api/v1/handler/prometheus/native/common_test.go rename to src/query/api/v1/handler/prometheus/native/common_test.go diff --git a/src/coordinator/api/v1/handler/prometheus/native/read.go b/src/query/api/v1/handler/prometheus/native/read.go similarity index 95% rename from src/coordinator/api/v1/handler/prometheus/native/read.go rename to src/query/api/v1/handler/prometheus/native/read.go index 8db49857ed..181d1e209b 100644 --- a/src/coordinator/api/v1/handler/prometheus/native/read.go +++ b/src/query/api/v1/handler/prometheus/native/read.go @@ -27,13 +27,13 @@ import ( "net/http" "sort" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser/promql" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser/promql" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/prometheus/native/read_test.go b/src/query/api/v1/handler/prometheus/native/read_test.go similarity index 89% rename from src/coordinator/api/v1/handler/prometheus/native/read_test.go rename to src/query/api/v1/handler/prometheus/native/read_test.go index fe79287bd7..b49c1c789f 100644 --- a/src/coordinator/api/v1/handler/prometheus/native/read_test.go +++ b/src/query/api/v1/handler/prometheus/native/read_test.go @@ -26,11 +26,11 @@ import ( "net/http/httptest" "testing" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/storage/mock" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/storage/mock" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/api/v1/handler/prometheus/remote/read.go b/src/query/api/v1/handler/prometheus/remote/read.go similarity index 94% rename from src/coordinator/api/v1/handler/prometheus/remote/read.go rename to src/query/api/v1/handler/prometheus/remote/read.go index 86a49db078..ed8526d556 100644 --- a/src/coordinator/api/v1/handler/prometheus/remote/read.go +++ b/src/query/api/v1/handler/prometheus/remote/read.go @@ -26,12 +26,12 @@ import ( "net/http" "time" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/protobuf/proto" "github.com/golang/snappy" diff --git a/src/coordinator/api/v1/handler/prometheus/remote/read_test.go b/src/query/api/v1/handler/prometheus/remote/read_test.go similarity index 95% rename from src/coordinator/api/v1/handler/prometheus/remote/read_test.go rename to src/query/api/v1/handler/prometheus/remote/read_test.go index cb9cd93650..a8a8b76f21 100644 --- a/src/coordinator/api/v1/handler/prometheus/remote/read_test.go +++ b/src/query/api/v1/handler/prometheus/remote/read_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/x/metrics" xclock "github.com/m3db/m3x/clock" diff --git a/src/coordinator/api/v1/handler/prometheus/remote/write.go b/src/query/api/v1/handler/prometheus/remote/write.go similarity index 92% rename from src/coordinator/api/v1/handler/prometheus/remote/write.go rename to src/query/api/v1/handler/prometheus/remote/write.go index e9867ca872..ac602fd85b 100644 --- a/src/coordinator/api/v1/handler/prometheus/remote/write.go +++ b/src/query/api/v1/handler/prometheus/remote/write.go @@ -24,12 +24,12 @@ import ( "context" "net/http" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/execution" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/execution" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/protobuf/proto" "github.com/uber-go/tally" diff --git a/src/coordinator/api/v1/handler/prometheus/remote/write_test.go b/src/query/api/v1/handler/prometheus/remote/write_test.go similarity index 96% rename from src/coordinator/api/v1/handler/prometheus/remote/write_test.go rename to src/query/api/v1/handler/prometheus/remote/write_test.go index 2404da206a..6b8bc46fcd 100644 --- a/src/coordinator/api/v1/handler/prometheus/remote/write_test.go +++ b/src/query/api/v1/handler/prometheus/remote/write_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/x/metrics" xclock "github.com/m3db/m3x/clock" diff --git a/src/coordinator/api/v1/handler/search.go b/src/query/api/v1/handler/search.go similarity index 97% rename from src/coordinator/api/v1/handler/search.go rename to src/query/api/v1/handler/search.go index e2eac9f5df..a024393ef8 100644 --- a/src/coordinator/api/v1/handler/search.go +++ b/src/query/api/v1/handler/search.go @@ -27,8 +27,8 @@ import ( "net/http" "strconv" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/api/v1/handler/search_test.go b/src/query/api/v1/handler/search_test.go similarity index 93% rename from src/coordinator/api/v1/handler/search_test.go rename to src/query/api/v1/handler/search_test.go index aa3af63572..eb38f9cbbc 100644 --- a/src/coordinator/api/v1/handler/search_test.go +++ b/src/query/api/v1/handler/search_test.go @@ -31,11 +31,11 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/test/seriesiter" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/test/seriesiter" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/api/v1/httpd/handler.go b/src/query/api/v1/httpd/handler.go similarity index 88% rename from src/coordinator/api/v1/httpd/handler.go rename to src/query/api/v1/httpd/handler.go index f539d5c33f..12c836506f 100644 --- a/src/coordinator/api/v1/httpd/handler.go +++ b/src/query/api/v1/httpd/handler.go @@ -30,16 +30,16 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/database" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/namespace" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/openapi" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/placement" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus/native" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus/remote" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler" + "github.com/m3db/m3db/src/query/api/v1/handler/database" + "github.com/m3db/m3db/src/query/api/v1/handler/namespace" + "github.com/m3db/m3db/src/query/api/v1/handler/openapi" + "github.com/m3db/m3db/src/query/api/v1/handler/placement" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/native" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/remote" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" "github.com/uber-go/tally" diff --git a/src/coordinator/api/v1/httpd/handler_test.go b/src/query/api/v1/httpd/handler_test.go similarity index 93% rename from src/coordinator/api/v1/httpd/handler_test.go rename to src/query/api/v1/httpd/handler_test.go index e26510cc4b..996a9f98d9 100644 --- a/src/coordinator/api/v1/httpd/handler_test.go +++ b/src/query/api/v1/httpd/handler_test.go @@ -27,11 +27,11 @@ import ( "testing" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus/native" - "github.com/m3db/m3db/src/coordinator/api/v1/handler/prometheus/remote" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/native" + "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/remote" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/coordinator/benchmark/README.MD b/src/query/benchmark/README.MD similarity index 100% rename from src/coordinator/benchmark/README.MD rename to src/query/benchmark/README.MD diff --git a/src/coordinator/benchmark/benchmarker/main/README.MD b/src/query/benchmark/benchmarker/main/README.MD similarity index 81% rename from src/coordinator/benchmark/benchmarker/main/README.MD rename to src/query/benchmark/benchmarker/main/README.MD index ba35fe9c6d..d3e7584ced 100644 --- a/src/coordinator/benchmark/benchmarker/main/README.MD +++ b/src/query/benchmark/benchmarker/main/README.MD @@ -5,13 +5,13 @@ Setup m3db and coordinator: 1) Run m3dbnode $ cd $GOPATH/src/github.com/m3db/m3db/ - $ sudo ./bin/m3dbnode -f $GOPATH/src/github.com/m3db/m3db/src/coordinator/benchmark/benchmarker/main/m3dbnode-local-config.yaml + $ sudo ./bin/m3dbnode -f $GOPATH/src/github.com/m3db/m3db/src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml 2) Run m3coordinator - $ cd $GOPATH/src/github.com/m3db/m3db/src/coordinator + $ cd $GOPATH/src/github.com/m3db/m3db/src/query $ make services - $ ./bin/m3coordinator --config.file=$GOPATH/src/github.com/m3db/m3db/src/coordinator/benchmark/benchmarker/main/m3coordinator-local-config.yml + $ ./bin/m3coordinator --config.file=$GOPATH/src/github.com/m3db/m3db/src/query/benchmark/benchmarker/main/m3coordinator-local-config.yml This new benchmarker requires a list of files in opentsdb format. These can be generated using the influxdb-comparisons tool, and may need to be regenerated periodically if the data gets too stale: @@ -20,7 +20,7 @@ This new benchmarker requires a list of files in opentsdb format. These can be g $ git clone https://github.com/benraskin92/influxdb-comparisons.git $GOPATH/src/github.com/ $ cd cmd/bulk_data_gen $ go build - $ cd $GOPATH/src/github.com/m3db/m3db/src/coordinator/benchmark/benchmarker/main/ + $ cd $GOPATH/src/github.com/m3db/m3db/src/query/benchmark/benchmarker/main/ $ ./data_gen.sh (NB: the path during these steps and/or in data_gen.sh may not be correct depending on $GOPATH setup) @@ -28,7 +28,7 @@ This new benchmarker requires a list of files in opentsdb format. These can be g 2) Build the benchmarker - $ cd $GOPATH/src/github.com/m3db/m3db/src/coordinator/benchmark/benchmarker/main/ + $ cd $GOPATH/src/github.com/m3db/m3db/src/query/benchmark/benchmarker/main/ $ go build 3) The first time you run the benchmarker, or any time you need to regenerate data (e.g. if generated data is too stale to be written to m3db), add the --regenerateData flag: diff --git a/src/coordinator/benchmark/benchmarker/main/benchmarker.go b/src/query/benchmark/benchmarker/main/benchmarker.go similarity index 98% rename from src/coordinator/benchmark/benchmarker/main/benchmarker.go rename to src/query/benchmark/benchmarker/main/benchmarker.go index b25e5db562..c6a658a141 100644 --- a/src/coordinator/benchmark/benchmarker/main/benchmarker.go +++ b/src/query/benchmark/benchmarker/main/benchmarker.go @@ -31,8 +31,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/benchmark/common" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/benchmark/common" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/benchmark/benchmarker/main/convert_to_prom.go b/src/query/benchmark/benchmarker/main/convert_to_prom.go similarity index 97% rename from src/coordinator/benchmark/benchmarker/main/convert_to_prom.go rename to src/query/benchmark/benchmarker/main/convert_to_prom.go index c5439fca36..8d3580c8bf 100644 --- a/src/coordinator/benchmark/benchmarker/main/convert_to_prom.go +++ b/src/query/benchmark/benchmarker/main/convert_to_prom.go @@ -28,8 +28,8 @@ import ( "os" "path" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/storage" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" diff --git a/src/coordinator/benchmark/benchmarker/main/data_gen.sh b/src/query/benchmark/benchmarker/main/data_gen.sh similarity index 100% rename from src/coordinator/benchmark/benchmarker/main/data_gen.sh rename to src/query/benchmark/benchmarker/main/data_gen.sh diff --git a/src/coordinator/benchmark/benchmarker/main/m3coordinator-local-config.yml b/src/query/benchmark/benchmarker/main/m3coordinator-local-config.yml similarity index 100% rename from src/coordinator/benchmark/benchmarker/main/m3coordinator-local-config.yml rename to src/query/benchmark/benchmarker/main/m3coordinator-local-config.yml diff --git a/src/coordinator/benchmark/benchmarker/main/m3dbnode-local-config.yaml b/src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml similarity index 100% rename from src/coordinator/benchmark/benchmarker/main/m3dbnode-local-config.yaml rename to src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml diff --git a/src/coordinator/benchmark/common/http_utils.go b/src/query/benchmark/common/http_utils.go similarity index 100% rename from src/coordinator/benchmark/common/http_utils.go rename to src/query/benchmark/common/http_utils.go diff --git a/src/coordinator/benchmark/common/parse_json.go b/src/query/benchmark/common/parse_json.go similarity index 98% rename from src/coordinator/benchmark/common/parse_json.go rename to src/query/benchmark/common/parse_json.go index 978b5a2618..e45ce9b3bd 100644 --- a/src/coordinator/benchmark/common/parse_json.go +++ b/src/query/benchmark/common/parse_json.go @@ -31,8 +31,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/storage" "github.com/golang/protobuf/proto" "github.com/golang/snappy" diff --git a/src/coordinator/benchmark/configs/benchmark.yml b/src/query/benchmark/configs/benchmark.yml similarity index 100% rename from src/coordinator/benchmark/configs/benchmark.yml rename to src/query/benchmark/configs/benchmark.yml diff --git a/src/coordinator/benchmark/configs/m3db_config.yaml b/src/query/benchmark/configs/m3db_config.yaml similarity index 100% rename from src/coordinator/benchmark/configs/m3db_config.yaml rename to src/query/benchmark/configs/m3db_config.yaml diff --git a/src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml similarity index 100% rename from src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml rename to src/query/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml diff --git a/src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml similarity index 100% rename from src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml rename to src/query/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml diff --git a/src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml similarity index 100% rename from src/coordinator/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml rename to src/query/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml diff --git a/src/coordinator/benchmark/data/data_gen.sh b/src/query/benchmark/data/data_gen.sh similarity index 100% rename from src/coordinator/benchmark/data/data_gen.sh rename to src/query/benchmark/data/data_gen.sh diff --git a/src/coordinator/benchmark/read/main/read_benchmark.go b/src/query/benchmark/read/main/read_benchmark.go similarity index 98% rename from src/coordinator/benchmark/read/main/read_benchmark.go rename to src/query/benchmark/read/main/read_benchmark.go index 187f2b0687..d1053faafb 100644 --- a/src/coordinator/benchmark/read/main/read_benchmark.go +++ b/src/query/benchmark/read/main/read_benchmark.go @@ -28,8 +28,8 @@ import ( "time" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/benchmark/common" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" + "github.com/m3db/m3db/src/query/benchmark/common" + "github.com/m3db/m3db/src/query/generated/proto/prompb" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/encoding" xconfig "github.com/m3db/m3x/config" diff --git a/src/coordinator/benchmark/write/main/benchmarker.go b/src/query/benchmark/write/main/benchmarker.go similarity index 100% rename from src/coordinator/benchmark/write/main/benchmarker.go rename to src/query/benchmark/write/main/benchmarker.go diff --git a/src/coordinator/benchmark/write/main/write_benchmark.go b/src/query/benchmark/write/main/write_benchmark.go similarity index 99% rename from src/coordinator/benchmark/write/main/write_benchmark.go rename to src/query/benchmark/write/main/write_benchmark.go index 4521a6ee86..0c54f017ca 100644 --- a/src/coordinator/benchmark/write/main/write_benchmark.go +++ b/src/query/benchmark/write/main/write_benchmark.go @@ -29,7 +29,7 @@ import ( "time" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/coordinator/benchmark/common" + "github.com/m3db/m3db/src/query/benchmark/common" "github.com/m3db/m3db/src/dbnode/client" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/block/column.go b/src/query/block/column.go similarity index 100% rename from src/coordinator/block/column.go rename to src/query/block/column.go diff --git a/src/coordinator/block/series.go b/src/query/block/series.go similarity index 100% rename from src/coordinator/block/series.go rename to src/query/block/series.go diff --git a/src/coordinator/block/types.go b/src/query/block/types.go similarity index 98% rename from src/coordinator/block/types.go rename to src/query/block/types.go index 0f2def4dd0..fa67e23df7 100644 --- a/src/coordinator/block/types.go +++ b/src/query/block/types.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/models" ) // Block represents a group of series across a time bound diff --git a/src/coordinator/cluster/m3db/async_client.go b/src/query/cluster/m3db/async_client.go similarity index 100% rename from src/coordinator/cluster/m3db/async_client.go rename to src/query/cluster/m3db/async_client.go diff --git a/src/coordinator/cluster/m3db/async_client_test.go b/src/query/cluster/m3db/async_client_test.go similarity index 98% rename from src/coordinator/cluster/m3db/async_client_test.go rename to src/query/cluster/m3db/async_client_test.go index 5f0ac841a9..707c436b07 100644 --- a/src/coordinator/cluster/m3db/async_client_test.go +++ b/src/query/cluster/m3db/async_client_test.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/services" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/coordinator/config/m3coordinator-cluster-template.yml b/src/query/config/m3coordinator-cluster-template.yml similarity index 100% rename from src/coordinator/config/m3coordinator-cluster-template.yml rename to src/query/config/m3coordinator-cluster-template.yml diff --git a/src/coordinator/config/m3coordinator-local-etcd.yml b/src/query/config/m3coordinator-local-etcd.yml similarity index 100% rename from src/coordinator/config/m3coordinator-local-etcd.yml rename to src/query/config/m3coordinator-local-etcd.yml diff --git a/src/coordinator/errors/execution.go b/src/query/errors/execution.go similarity index 100% rename from src/coordinator/errors/execution.go rename to src/query/errors/execution.go diff --git a/src/coordinator/errors/handler.go b/src/query/errors/handler.go similarity index 100% rename from src/coordinator/errors/handler.go rename to src/query/errors/handler.go diff --git a/src/coordinator/errors/storage.go b/src/query/errors/storage.go similarity index 100% rename from src/coordinator/errors/storage.go rename to src/query/errors/storage.go diff --git a/src/coordinator/executor/engine.go b/src/query/executor/engine.go similarity index 94% rename from src/coordinator/executor/engine.go rename to src/query/executor/engine.go index eaa0e3ab52..3c7d718ef9 100644 --- a/src/coordinator/executor/engine.go +++ b/src/query/executor/engine.go @@ -23,11 +23,11 @@ package executor import ( "context" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/plan" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/plan" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/executor/engine_test.go b/src/query/executor/engine_test.go similarity index 92% rename from src/coordinator/executor/engine_test.go rename to src/query/executor/engine_test.go index 5073e7e3b9..983fa5f99e 100644 --- a/src/coordinator/executor/engine_test.go +++ b/src/query/executor/engine_test.go @@ -25,9 +25,9 @@ import ( "fmt" "testing" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/coordinator/executor/result.go b/src/query/executor/result.go similarity index 96% rename from src/coordinator/executor/result.go rename to src/query/executor/result.go index 75acf64859..828f2e7ff7 100644 --- a/src/coordinator/executor/result.go +++ b/src/query/executor/result.go @@ -23,8 +23,8 @@ package executor import ( "sync" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" "github.com/pkg/errors" ) diff --git a/src/coordinator/executor/state.go b/src/query/executor/state.go similarity index 95% rename from src/coordinator/executor/state.go rename to src/query/executor/state.go index 6b6cb7210a..44023ea41a 100644 --- a/src/coordinator/executor/state.go +++ b/src/query/executor/state.go @@ -24,11 +24,11 @@ import ( "context" "fmt" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/plan" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/execution" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/plan" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/execution" "github.com/pkg/errors" ) diff --git a/src/coordinator/executor/state_test.go b/src/query/executor/state_test.go similarity index 94% rename from src/coordinator/executor/state_test.go rename to src/query/executor/state_test.go index 8265e92303..3fcec89ab3 100644 --- a/src/coordinator/executor/state_test.go +++ b/src/query/executor/state_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/functions" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/plan" - "github.com/m3db/m3db/src/coordinator/storage/mock" + "github.com/m3db/m3db/src/query/functions" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/plan" + "github.com/m3db/m3db/src/query/storage/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/executor/tracker.go b/src/query/executor/tracker.go similarity index 98% rename from src/coordinator/executor/tracker.go rename to src/query/executor/tracker.go index 63dff9e035..b38d0fe18a 100644 --- a/src/coordinator/executor/tracker.go +++ b/src/query/executor/tracker.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/storage" ) const ( diff --git a/src/coordinator/executor/transform/cache.go b/src/query/executor/transform/cache.go similarity index 95% rename from src/coordinator/executor/transform/cache.go rename to src/query/executor/transform/cache.go index ec9a6e4e75..8645de3a40 100644 --- a/src/coordinator/executor/transform/cache.go +++ b/src/query/executor/transform/cache.go @@ -23,8 +23,8 @@ package transform import ( "sync" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" "github.com/pkg/errors" ) diff --git a/src/coordinator/executor/transform/controller.go b/src/query/executor/transform/controller.go similarity index 95% rename from src/coordinator/executor/transform/controller.go rename to src/query/executor/transform/controller.go index e3fbc0afd9..80bd8ad0d0 100644 --- a/src/coordinator/executor/transform/controller.go +++ b/src/query/executor/transform/controller.go @@ -21,8 +21,8 @@ package transform import ( - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" ) // Controller controls the caching and forwarding the request to downstream. diff --git a/src/coordinator/executor/transform/lazy.go b/src/query/executor/transform/lazy.go similarity index 97% rename from src/coordinator/executor/transform/lazy.go rename to src/query/executor/transform/lazy.go index e162b7a6ba..d7314f781c 100644 --- a/src/coordinator/executor/transform/lazy.go +++ b/src/query/executor/transform/lazy.go @@ -23,8 +23,8 @@ package transform import ( "sync" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" ) type sinkNode struct { diff --git a/src/coordinator/executor/transform/lazy_test.go b/src/query/executor/transform/lazy_test.go similarity index 94% rename from src/coordinator/executor/transform/lazy_test.go rename to src/query/executor/transform/lazy_test.go index c919e96a36..700d31ed88 100644 --- a/src/coordinator/executor/transform/lazy_test.go +++ b/src/query/executor/transform/lazy_test.go @@ -23,9 +23,9 @@ package transform import ( "testing" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" "github.com/stretchr/testify/assert" ) diff --git a/src/coordinator/executor/transform/types.go b/src/query/executor/transform/types.go similarity index 96% rename from src/coordinator/executor/transform/types.go rename to src/query/executor/transform/types.go index d4db23e13b..41d99067a9 100644 --- a/src/coordinator/executor/transform/types.go +++ b/src/query/executor/transform/types.go @@ -23,8 +23,8 @@ package transform import ( "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/parser" ) // Options to create transform nodes diff --git a/src/coordinator/functions/count.go b/src/query/functions/count.go similarity index 94% rename from src/coordinator/functions/count.go rename to src/query/functions/count.go index 0f56ba033d..cd4028de99 100644 --- a/src/coordinator/functions/count.go +++ b/src/query/functions/count.go @@ -24,9 +24,9 @@ import ( "fmt" "math" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" ) // CountType counts all non nan elements in a list of series diff --git a/src/coordinator/functions/count_test.go b/src/query/functions/count_test.go similarity index 93% rename from src/coordinator/functions/count_test.go rename to src/query/functions/count_test.go index 2ef10201f3..b22fa026b7 100644 --- a/src/coordinator/functions/count_test.go +++ b/src/query/functions/count_test.go @@ -24,9 +24,9 @@ import ( "math" "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/fetch.go b/src/query/functions/fetch.go similarity index 93% rename from src/coordinator/functions/fetch.go rename to src/query/functions/fetch.go index b6f7e01f04..4c1d0d282f 100644 --- a/src/coordinator/functions/fetch.go +++ b/src/query/functions/fetch.go @@ -25,10 +25,10 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/storage" ) // FetchType gets the series from storage diff --git a/src/coordinator/functions/fetch_test.go b/src/query/functions/fetch_test.go similarity index 85% rename from src/coordinator/functions/fetch_test.go rename to src/query/functions/fetch_test.go index 8fd3edda57..7fd3a6d8e7 100644 --- a/src/coordinator/functions/fetch_test.go +++ b/src/query/functions/fetch_test.go @@ -24,12 +24,12 @@ import ( "context" "testing" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/storage/mock" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/storage/mock" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/linear/absent.go b/src/query/functions/linear/absent.go similarity index 97% rename from src/coordinator/functions/linear/absent.go rename to src/query/functions/linear/absent.go index 1b89c4b9bc..e893f54ef5 100644 --- a/src/coordinator/functions/linear/absent.go +++ b/src/query/functions/linear/absent.go @@ -23,7 +23,7 @@ package linear import ( "math" - "github.com/m3db/m3db/src/coordinator/executor/transform" + "github.com/m3db/m3db/src/query/executor/transform" ) // AbsentType returns a timeseries with all NaNs if the timeseries passed in has any non NaNs, diff --git a/src/coordinator/functions/linear/absent_test.go b/src/query/functions/linear/absent_test.go similarity index 93% rename from src/coordinator/functions/linear/absent_test.go rename to src/query/functions/linear/absent_test.go index 870cf5b19a..56ba8551aa 100644 --- a/src/coordinator/functions/linear/absent_test.go +++ b/src/query/functions/linear/absent_test.go @@ -24,9 +24,9 @@ import ( "math" "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/linear/base.go b/src/query/functions/linear/base.go similarity index 96% rename from src/coordinator/functions/linear/base.go rename to src/query/functions/linear/base.go index 0e053d0966..a42812e1fc 100644 --- a/src/coordinator/functions/linear/base.go +++ b/src/query/functions/linear/base.go @@ -23,9 +23,9 @@ package linear import ( "fmt" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" ) var emptyOp = BaseOp{} diff --git a/src/coordinator/functions/linear/clamp.go b/src/query/functions/linear/clamp.go similarity index 97% rename from src/coordinator/functions/linear/clamp.go rename to src/query/functions/linear/clamp.go index 4fae28a22e..48b94a1d79 100644 --- a/src/coordinator/functions/linear/clamp.go +++ b/src/query/functions/linear/clamp.go @@ -24,7 +24,7 @@ import ( "fmt" "math" - "github.com/m3db/m3db/src/coordinator/executor/transform" + "github.com/m3db/m3db/src/query/executor/transform" ) const ( diff --git a/src/coordinator/functions/linear/clamp_test.go b/src/query/functions/linear/clamp_test.go similarity index 94% rename from src/coordinator/functions/linear/clamp_test.go rename to src/query/functions/linear/clamp_test.go index aaecc3bf52..c3c2f15a89 100644 --- a/src/coordinator/functions/linear/clamp_test.go +++ b/src/query/functions/linear/clamp_test.go @@ -24,9 +24,9 @@ import ( "math" "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/linear/math.go b/src/query/functions/linear/math.go similarity index 98% rename from src/coordinator/functions/linear/math.go rename to src/query/functions/linear/math.go index 639cb4bef4..fbf49eb835 100644 --- a/src/coordinator/functions/linear/math.go +++ b/src/query/functions/linear/math.go @@ -24,7 +24,7 @@ import ( "fmt" "math" - "github.com/m3db/m3db/src/coordinator/executor/transform" + "github.com/m3db/m3db/src/query/executor/transform" ) const ( diff --git a/src/coordinator/functions/linear/math_test.go b/src/query/functions/linear/math_test.go similarity index 97% rename from src/coordinator/functions/linear/math_test.go rename to src/query/functions/linear/math_test.go index cdc1b82a5f..fb3ecd36fb 100644 --- a/src/coordinator/functions/linear/math_test.go +++ b/src/query/functions/linear/math_test.go @@ -24,9 +24,9 @@ import ( "math" "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/linear/round.go b/src/query/functions/linear/round.go similarity index 97% rename from src/coordinator/functions/linear/round.go rename to src/query/functions/linear/round.go index b34e6bc342..1b887389f8 100644 --- a/src/coordinator/functions/linear/round.go +++ b/src/query/functions/linear/round.go @@ -24,7 +24,7 @@ import ( "fmt" "math" - "github.com/m3db/m3db/src/coordinator/executor/transform" + "github.com/m3db/m3db/src/query/executor/transform" ) // RoundType rounds each value in the timeseries to the nearest integer. diff --git a/src/coordinator/functions/linear/round_test.go b/src/query/functions/linear/round_test.go similarity index 92% rename from src/coordinator/functions/linear/round_test.go rename to src/query/functions/linear/round_test.go index b3f78718ad..97151868d1 100644 --- a/src/coordinator/functions/linear/round_test.go +++ b/src/query/functions/linear/round_test.go @@ -23,9 +23,9 @@ package linear import ( "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/logical/and.go b/src/query/functions/logical/and.go similarity index 96% rename from src/coordinator/functions/logical/and.go rename to src/query/functions/logical/and.go index 81b0a3b18d..0f83fe0639 100644 --- a/src/coordinator/functions/logical/and.go +++ b/src/query/functions/logical/and.go @@ -23,9 +23,9 @@ package logical import ( "math" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" ) const ( diff --git a/src/coordinator/functions/logical/and_test.go b/src/query/functions/logical/and_test.go similarity index 94% rename from src/coordinator/functions/logical/and_test.go rename to src/query/functions/logical/and_test.go index 927bcc5f94..fb5ee8f7bc 100644 --- a/src/coordinator/functions/logical/and_test.go +++ b/src/query/functions/logical/and_test.go @@ -24,9 +24,9 @@ import ( "math" "testing" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/test/executor" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/test/executor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/functions/logical/common.go b/src/query/functions/logical/common.go similarity index 94% rename from src/coordinator/functions/logical/common.go rename to src/query/functions/logical/common.go index 34f8a1832e..979d1b42e7 100644 --- a/src/coordinator/functions/logical/common.go +++ b/src/query/functions/logical/common.go @@ -21,9 +21,9 @@ package logical import ( - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/models" ) // VectorMatchCardinality describes the cardinality relationship diff --git a/src/coordinator/functions/logical/node.go b/src/query/functions/logical/node.go similarity index 95% rename from src/coordinator/functions/logical/node.go rename to src/query/functions/logical/node.go index a2352ee990..f23bbbad8c 100644 --- a/src/coordinator/functions/logical/node.go +++ b/src/query/functions/logical/node.go @@ -24,9 +24,9 @@ import ( "fmt" "sync" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" ) // BaseOp stores required properties for logical operations diff --git a/src/coordinator/generated/assets/asset-gen.sh b/src/query/generated/assets/asset-gen.sh similarity index 100% rename from src/coordinator/generated/assets/asset-gen.sh rename to src/query/generated/assets/asset-gen.sh diff --git a/src/coordinator/generated/assets/generated.go b/src/query/generated/assets/generated.go similarity index 88% rename from src/coordinator/generated/assets/generated.go rename to src/query/generated/assets/generated.go index dff6db3b0c..ecf37e4066 100644 --- a/src/coordinator/generated/assets/generated.go +++ b/src/query/generated/assets/generated.go @@ -18,6 +18,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -//go:generate sh -c "$GOPATH/src/$PACKAGE/src/coordinator/generated/assets/asset-gen.sh $GOPATH/src/$PACKAGE/src/coordinator/generated/assets" +//go:generate sh -c "$GOPATH/src/$PACKAGE/src/query/generated/assets/asset-gen.sh $GOPATH/src/$PACKAGE/src/query/generated/assets" package assets diff --git a/src/coordinator/generated/assets/openapi/assets.go b/src/query/generated/assets/openapi/assets.go similarity index 100% rename from src/coordinator/generated/assets/openapi/assets.go rename to src/query/generated/assets/openapi/assets.go diff --git a/src/coordinator/generated/assets/openapi/index.html b/src/query/generated/assets/openapi/index.html similarity index 100% rename from src/coordinator/generated/assets/openapi/index.html rename to src/query/generated/assets/openapi/index.html diff --git a/src/coordinator/generated/assets/openapi/spec.yml b/src/query/generated/assets/openapi/spec.yml similarity index 100% rename from src/coordinator/generated/assets/openapi/spec.yml rename to src/query/generated/assets/openapi/spec.yml diff --git a/src/coordinator/generated/proto/admin/database.pb.go b/src/query/generated/proto/admin/database.pb.go similarity index 98% rename from src/coordinator/generated/proto/admin/database.pb.go rename to src/query/generated/proto/admin/database.pb.go index b3099729f8..5cd857f2e8 100644 --- a/src/coordinator/generated/proto/admin/database.pb.go +++ b/src/query/generated/proto/admin/database.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/admin/database.proto +// source: github.com/m3db/m3db/src/query/generated/proto/admin/database.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -25,9 +25,9 @@ Package admin is a generated protocol buffer package. It is generated from these files: - github.com/m3db/m3db/src/coordinator/generated/proto/admin/database.proto - github.com/m3db/m3db/src/coordinator/generated/proto/admin/namespace.proto - github.com/m3db/m3db/src/coordinator/generated/proto/admin/placement.proto + github.com/m3db/m3db/src/query/generated/proto/admin/database.proto + github.com/m3db/m3db/src/query/generated/proto/admin/namespace.proto + github.com/m3db/m3db/src/query/generated/proto/admin/placement.proto It has these top-level messages: DatabaseCreateRequest @@ -1311,7 +1311,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/admin/database.proto", fileDescriptorDatabase) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/admin/database.proto", fileDescriptorDatabase) } var fileDescriptorDatabase = []byte{ diff --git a/src/coordinator/generated/proto/admin/database.proto b/src/query/generated/proto/admin/database.proto similarity index 91% rename from src/coordinator/generated/proto/admin/database.proto rename to src/query/generated/proto/admin/database.proto index ca690e8248..3a9f15f58a 100644 --- a/src/coordinator/generated/proto/admin/database.proto +++ b/src/query/generated/proto/admin/database.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package admin; -import "github.com/m3db/m3db/src/coordinator/generated/proto/admin/namespace.proto"; -import "github.com/m3db/m3db/src/coordinator/generated/proto/admin/placement.proto"; +import "github.com/m3db/m3db/src/query/generated/proto/admin/namespace.proto"; +import "github.com/m3db/m3db/src/query/generated/proto/admin/placement.proto"; message DatabaseCreateRequest { // Required fields diff --git a/src/coordinator/generated/proto/admin/namespace.pb.go b/src/query/generated/proto/admin/namespace.pb.go similarity index 98% rename from src/coordinator/generated/proto/admin/namespace.pb.go rename to src/query/generated/proto/admin/namespace.pb.go index c3dc9f494b..f8dd7bb652 100644 --- a/src/coordinator/generated/proto/admin/namespace.pb.go +++ b/src/query/generated/proto/admin/namespace.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/admin/namespace.proto +// source: github.com/m3db/m3db/src/query/generated/proto/admin/namespace.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -488,7 +488,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/admin/namespace.proto", fileDescriptorNamespace) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/admin/namespace.proto", fileDescriptorNamespace) } var fileDescriptorNamespace = []byte{ diff --git a/src/coordinator/generated/proto/admin/namespace.proto b/src/query/generated/proto/admin/namespace.proto similarity index 100% rename from src/coordinator/generated/proto/admin/namespace.proto rename to src/query/generated/proto/admin/namespace.proto diff --git a/src/coordinator/generated/proto/admin/placement.pb.go b/src/query/generated/proto/admin/placement.pb.go similarity index 98% rename from src/coordinator/generated/proto/admin/placement.pb.go rename to src/query/generated/proto/admin/placement.pb.go index 5c10ec69fc..1b27f53de4 100644 --- a/src/coordinator/generated/proto/admin/placement.pb.go +++ b/src/query/generated/proto/admin/placement.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/admin/placement.proto +// source: github.com/m3db/m3db/src/query/generated/proto/admin/placement.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -688,7 +688,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/admin/placement.proto", fileDescriptorPlacement) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/admin/placement.proto", fileDescriptorPlacement) } var fileDescriptorPlacement = []byte{ diff --git a/src/coordinator/generated/proto/admin/placement.proto b/src/query/generated/proto/admin/placement.proto similarity index 100% rename from src/coordinator/generated/proto/admin/placement.proto rename to src/query/generated/proto/admin/placement.proto diff --git a/src/coordinator/generated/proto/generated.go b/src/query/generated/proto/generated.go similarity index 96% rename from src/coordinator/generated/proto/generated.go rename to src/query/generated/proto/generated.go index bee1df7c56..aae17206ea 100644 --- a/src/coordinator/generated/proto/generated.go +++ b/src/query/generated/proto/generated.go @@ -18,6 +18,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -//go:generate sh -c "$GOPATH/src/$PACKAGE/scripts/proto-gen.sh $PACKAGE/src/coordinator/generated/proto" +//go:generate sh -c "$GOPATH/src/$PACKAGE/scripts/proto-gen.sh $PACKAGE/src/query/generated/proto" package prompb diff --git a/src/coordinator/generated/proto/prompb/remote.pb.go b/src/query/generated/proto/prompb/remote.pb.go similarity index 98% rename from src/coordinator/generated/proto/prompb/remote.pb.go rename to src/query/generated/proto/prompb/remote.pb.go index bf4c2a7816..1dacd15e73 100644 --- a/src/coordinator/generated/proto/prompb/remote.pb.go +++ b/src/query/generated/proto/prompb/remote.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/prompb/remote.proto +// source: github.com/m3db/m3db/src/query/generated/proto/prompb/remote.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -25,8 +25,8 @@ Package prompb is a generated protocol buffer package. It is generated from these files: - github.com/m3db/m3db/src/coordinator/generated/proto/prompb/remote.proto - github.com/m3db/m3db/src/coordinator/generated/proto/prompb/types.proto + github.com/m3db/m3db/src/query/generated/proto/prompb/remote.proto + github.com/m3db/m3db/src/query/generated/proto/prompb/types.proto It has these top-level messages: WriteRequest @@ -960,7 +960,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/prompb/remote.proto", fileDescriptorRemote) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/prompb/remote.proto", fileDescriptorRemote) } var fileDescriptorRemote = []byte{ diff --git a/src/coordinator/generated/proto/prompb/remote.proto b/src/query/generated/proto/prompb/remote.proto similarity index 86% rename from src/coordinator/generated/proto/prompb/remote.proto rename to src/query/generated/proto/prompb/remote.proto index 9e8b50eac0..7e10f4d2ed 100644 --- a/src/coordinator/generated/proto/prompb/remote.proto +++ b/src/query/generated/proto/prompb/remote.proto @@ -4,7 +4,7 @@ package prometheus; option go_package = "prompb"; -import "github.com/m3db/m3db/src/coordinator/generated/proto/prompb/types.proto"; +import "github.com/m3db/m3db/src/query/generated/proto/prompb/types.proto"; message WriteRequest { repeated prometheus.TimeSeries timeseries = 1; diff --git a/src/coordinator/generated/proto/prompb/types.pb.go b/src/query/generated/proto/prompb/types.pb.go similarity index 99% rename from src/coordinator/generated/proto/prompb/types.pb.go rename to src/query/generated/proto/prompb/types.pb.go index fcd90e082f..61e285eb0a 100644 --- a/src/coordinator/generated/proto/prompb/types.pb.go +++ b/src/query/generated/proto/prompb/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/prompb/types.proto +// source: github.com/m3db/m3db/src/query/generated/proto/prompb/types.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -1068,7 +1068,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/prompb/types.proto", fileDescriptorTypes) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/prompb/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ diff --git a/src/coordinator/generated/proto/prompb/types.proto b/src/query/generated/proto/prompb/types.proto similarity index 100% rename from src/coordinator/generated/proto/prompb/types.proto rename to src/query/generated/proto/prompb/types.proto diff --git a/src/coordinator/generated/proto/rpc/query.pb.go b/src/query/generated/proto/rpc/query.pb.go similarity index 99% rename from src/coordinator/generated/proto/rpc/query.pb.go rename to src/query/generated/proto/rpc/query.pb.go index 01a13b617c..fb934bdf15 100644 --- a/src/coordinator/generated/proto/rpc/query.pb.go +++ b/src/query/generated/proto/rpc/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/coordinator/generated/proto/rpc/query.proto +// source: github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -25,7 +25,7 @@ Package rpc is a generated protocol buffer package. It is generated from these files: - github.com/m3db/m3db/src/coordinator/generated/proto/rpc/query.proto + github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto It has these top-level messages: WriteMessage @@ -709,7 +709,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "github.com/m3db/m3db/src/coordinator/generated/proto/rpc/query.proto", + Metadata: "github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto", } func (m *WriteMessage) Marshal() (dAtA []byte, err error) { @@ -3781,7 +3781,7 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/coordinator/generated/proto/rpc/query.proto", fileDescriptorQuery) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto", fileDescriptorQuery) } var fileDescriptorQuery = []byte{ diff --git a/src/coordinator/generated/proto/rpc/query.proto b/src/query/generated/proto/rpc/query.proto similarity index 100% rename from src/coordinator/generated/proto/rpc/query.proto rename to src/query/generated/proto/rpc/query.proto diff --git a/src/coordinator/integration/read_curl.sh b/src/query/integration/read_curl.sh similarity index 100% rename from src/coordinator/integration/read_curl.sh rename to src/query/integration/read_curl.sh diff --git a/src/query/integration/testdata/read_data.snappy b/src/query/integration/testdata/read_data.snappy new file mode 100644 index 0000000000..46263e2d1d --- /dev/null +++ b/src/query/integration/testdata/read_data.snappy @@ -0,0 +1,2 @@ +` +�����,����,eqa \ No newline at end of file diff --git a/src/coordinator/mocks/block.go b/src/query/mocks/block.go similarity index 100% rename from src/coordinator/mocks/block.go rename to src/query/mocks/block.go diff --git a/src/coordinator/mocks/resolver.go b/src/query/mocks/resolver.go similarity index 96% rename from src/coordinator/mocks/resolver.go rename to src/query/mocks/resolver.go index b9c52026f2..27e22d5148 100644 --- a/src/coordinator/mocks/resolver.go +++ b/src/query/mocks/resolver.go @@ -27,8 +27,8 @@ package mocks import ( context "context" gomock "github.com/golang/mock/gomock" - models "github.com/m3db/m3db/src/coordinator/models" - tsdb "github.com/m3db/m3db/src/coordinator/tsdb" + models "github.com/m3db/m3db/src/query/models" + tsdb "github.com/m3db/m3db/src/query/tsdb" reflect "reflect" time "time" ) diff --git a/src/coordinator/models/params.go b/src/query/models/params.go similarity index 100% rename from src/coordinator/models/params.go rename to src/query/models/params.go diff --git a/src/coordinator/models/tag.go b/src/query/models/tag.go similarity index 100% rename from src/coordinator/models/tag.go rename to src/query/models/tag.go diff --git a/src/coordinator/models/tag_test.go b/src/query/models/tag_test.go similarity index 100% rename from src/coordinator/models/tag_test.go rename to src/query/models/tag_test.go diff --git a/src/coordinator/parser/common/types.go b/src/query/parser/common/types.go similarity index 100% rename from src/coordinator/parser/common/types.go rename to src/query/parser/common/types.go diff --git a/src/coordinator/parser/interface.go b/src/query/parser/interface.go similarity index 100% rename from src/coordinator/parser/interface.go rename to src/query/parser/interface.go diff --git a/src/coordinator/parser/promql/item.go b/src/query/parser/promql/item.go similarity index 100% rename from src/coordinator/parser/promql/item.go rename to src/query/parser/promql/item.go diff --git a/src/coordinator/parser/promql/parse.go b/src/query/parser/promql/parse.go similarity index 97% rename from src/coordinator/parser/promql/parse.go rename to src/query/parser/promql/parse.go index 2bcec842aa..d897c7f280 100644 --- a/src/coordinator/parser/promql/parse.go +++ b/src/query/parser/promql/parse.go @@ -23,8 +23,8 @@ package promql import ( "fmt" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/parser" pql "github.com/prometheus/prometheus/promql" ) diff --git a/src/coordinator/parser/promql/parse_test.go b/src/query/parser/promql/parse_test.go similarity index 97% rename from src/coordinator/parser/promql/parse_test.go rename to src/query/parser/promql/parse_test.go index 0510ba79c4..7e407867c0 100644 --- a/src/coordinator/parser/promql/parse_test.go +++ b/src/query/parser/promql/parse_test.go @@ -23,10 +23,10 @@ package promql import ( "testing" - "github.com/m3db/m3db/src/coordinator/functions" - "github.com/m3db/m3db/src/coordinator/functions/linear" - "github.com/m3db/m3db/src/coordinator/functions/logical" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/functions" + "github.com/m3db/m3db/src/query/functions/linear" + "github.com/m3db/m3db/src/query/functions/logical" + "github.com/m3db/m3db/src/query/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/parser/promql/types.go b/src/query/parser/promql/types.go similarity index 94% rename from src/coordinator/parser/promql/types.go rename to src/query/parser/promql/types.go index b57bc161cd..728c0889d4 100644 --- a/src/coordinator/parser/promql/types.go +++ b/src/query/parser/promql/types.go @@ -23,12 +23,12 @@ package promql import ( "fmt" - "github.com/m3db/m3db/src/coordinator/functions" - "github.com/m3db/m3db/src/coordinator/functions/linear" - "github.com/m3db/m3db/src/coordinator/functions/logical" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/parser/common" + "github.com/m3db/m3db/src/query/functions" + "github.com/m3db/m3db/src/query/functions/linear" + "github.com/m3db/m3db/src/query/functions/logical" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/parser/common" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" diff --git a/src/coordinator/plan/logical.go b/src/query/plan/logical.go similarity index 98% rename from src/coordinator/plan/logical.go rename to src/query/plan/logical.go index b1fb2bbc49..cb094caa35 100644 --- a/src/coordinator/plan/logical.go +++ b/src/query/plan/logical.go @@ -23,7 +23,7 @@ package plan import ( "fmt" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/parser" ) // LogicalPlan converts a DAG into a list of steps to be executed in order diff --git a/src/coordinator/plan/logical_test.go b/src/query/plan/logical_test.go similarity index 97% rename from src/coordinator/plan/logical_test.go rename to src/query/plan/logical_test.go index 91a2e1cb0d..894ff80b7c 100644 --- a/src/coordinator/plan/logical_test.go +++ b/src/query/plan/logical_test.go @@ -23,8 +23,8 @@ package plan import ( "testing" - "github.com/m3db/m3db/src/coordinator/functions" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/functions" + "github.com/m3db/m3db/src/query/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/plan/physical.go b/src/query/plan/physical.go similarity index 94% rename from src/coordinator/plan/physical.go rename to src/query/plan/physical.go index d29fac9769..0688b1cfb3 100644 --- a/src/coordinator/plan/physical.go +++ b/src/query/plan/physical.go @@ -23,10 +23,10 @@ package plan import ( "fmt" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" + "github.com/m3db/m3db/src/query/storage" ) // PhysicalPlan represents the physical plan diff --git a/src/coordinator/plan/physical_test.go b/src/query/plan/physical_test.go similarity index 93% rename from src/coordinator/plan/physical_test.go rename to src/query/plan/physical_test.go index 41c6102750..57c11c224e 100644 --- a/src/coordinator/plan/physical_test.go +++ b/src/query/plan/physical_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/functions" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/functions" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/policy/filter/storage.go b/src/query/policy/filter/storage.go similarity index 96% rename from src/coordinator/policy/filter/storage.go rename to src/query/policy/filter/storage.go index 97d05a65a7..189cb451c1 100644 --- a/src/coordinator/policy/filter/storage.go +++ b/src/query/policy/filter/storage.go @@ -20,7 +20,7 @@ package filter -import "github.com/m3db/m3db/src/coordinator/storage" +import "github.com/m3db/m3db/src/query/storage" // Storage determines whether storage can fulfil the read query type Storage func(query storage.Query, store storage.Storage) bool diff --git a/src/coordinator/policy/filter/storage_test.go b/src/query/policy/filter/storage_test.go similarity index 94% rename from src/coordinator/policy/filter/storage_test.go rename to src/query/policy/filter/storage_test.go index ec7e3e3f37..d73ac23a82 100644 --- a/src/coordinator/policy/filter/storage_test.go +++ b/src/query/policy/filter/storage_test.go @@ -23,8 +23,8 @@ package filter import ( "testing" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/storage/mock" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/mock" "github.com/stretchr/testify/assert" ) diff --git a/src/coordinator/policy/resolver/interface.go b/src/query/policy/resolver/interface.go similarity index 94% rename from src/coordinator/policy/resolver/interface.go rename to src/query/policy/resolver/interface.go index 1aede16f85..072cbde846 100644 --- a/src/coordinator/policy/resolver/interface.go +++ b/src/query/policy/resolver/interface.go @@ -24,8 +24,8 @@ import ( "context" "time" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/tsdb" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/tsdb" ) // PolicyResolver resolves policy for a query. diff --git a/src/coordinator/policy/resolver/static.go b/src/query/policy/resolver/static.go similarity index 95% rename from src/coordinator/policy/resolver/static.go rename to src/query/policy/resolver/static.go index 8a5fae5524..e7c9c41a2f 100644 --- a/src/coordinator/policy/resolver/static.go +++ b/src/query/policy/resolver/static.go @@ -24,8 +24,8 @@ import ( "context" "time" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/tsdb" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/tsdb" "github.com/m3db/m3metrics/policy" ) diff --git a/src/coordinator/services/m3coordinator/server/server.go b/src/query/services/m3coordinator/server/server.go similarity index 93% rename from src/coordinator/services/m3coordinator/server/server.go rename to src/query/services/m3coordinator/server/server.go index 72d5dda566..76c40bdb43 100644 --- a/src/coordinator/services/m3coordinator/server/server.go +++ b/src/query/services/m3coordinator/server/server.go @@ -34,17 +34,17 @@ import ( etcdclient "github.com/m3db/m3cluster/client/etcd" "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/coordinator/api/v1/httpd" - m3dbcluster "github.com/m3db/m3db/src/coordinator/cluster/m3db" - "github.com/m3db/m3db/src/coordinator/executor" - "github.com/m3db/m3db/src/coordinator/policy/filter" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/storage/fanout" - "github.com/m3db/m3db/src/coordinator/storage/local" - "github.com/m3db/m3db/src/coordinator/storage/remote" - "github.com/m3db/m3db/src/coordinator/stores/m3db" - tsdbRemote "github.com/m3db/m3db/src/coordinator/tsdb/remote" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/api/v1/httpd" + m3dbcluster "github.com/m3db/m3db/src/query/cluster/m3db" + "github.com/m3db/m3db/src/query/executor" + "github.com/m3db/m3db/src/query/policy/filter" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/fanout" + "github.com/m3db/m3db/src/query/storage/local" + "github.com/m3db/m3db/src/query/storage/remote" + "github.com/m3db/m3db/src/query/stores/m3db" + tsdbRemote "github.com/m3db/m3db/src/query/tsdb/remote" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/block.go b/src/query/storage/block.go similarity index 98% rename from src/coordinator/storage/block.go rename to src/query/storage/block.go index bf3c04f9ac..86318c59d7 100644 --- a/src/coordinator/storage/block.go +++ b/src/query/storage/block.go @@ -24,8 +24,8 @@ import ( "math" "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/ts" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/ts" ) // FetchResultToBlockResult converts a fetch result into coordinator blocks diff --git a/src/coordinator/storage/config.go b/src/query/storage/config.go similarity index 100% rename from src/coordinator/storage/config.go rename to src/query/storage/config.go diff --git a/src/coordinator/storage/config_test.go b/src/query/storage/config_test.go similarity index 100% rename from src/coordinator/storage/config_test.go rename to src/query/storage/config_test.go diff --git a/src/coordinator/storage/converter.go b/src/query/storage/converter.go similarity index 98% rename from src/coordinator/storage/converter.go rename to src/query/storage/converter.go index 16a07033d2..fa4eea529c 100644 --- a/src/coordinator/storage/converter.go +++ b/src/query/storage/converter.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/ts" + "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/ts" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" diff --git a/src/coordinator/storage/converter_test.go b/src/query/storage/converter_test.go similarity index 97% rename from src/coordinator/storage/converter_test.go rename to src/query/storage/converter_test.go index 2a8773d336..81518258a3 100644 --- a/src/coordinator/storage/converter_test.go +++ b/src/query/storage/converter_test.go @@ -24,8 +24,8 @@ import ( "errors" "testing" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/test/seriesiter" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/test/seriesiter" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" diff --git a/src/coordinator/storage/fanout/storage.go b/src/query/storage/fanout/storage.go similarity index 93% rename from src/coordinator/storage/fanout/storage.go rename to src/query/storage/fanout/storage.go index d9d441d031..8e9c0ab16a 100644 --- a/src/coordinator/storage/fanout/storage.go +++ b/src/query/storage/fanout/storage.go @@ -23,14 +23,14 @@ package fanout import ( "context" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/policy/filter" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/execution" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/policy/filter" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/execution" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" ) diff --git a/src/coordinator/storage/fanout/storage_test.go b/src/query/storage/fanout/storage_test.go similarity index 94% rename from src/coordinator/storage/fanout/storage_test.go rename to src/query/storage/fanout/storage_test.go index 20432d611a..faf3af5bd0 100644 --- a/src/coordinator/storage/fanout/storage_test.go +++ b/src/query/storage/fanout/storage_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/policy/filter" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test/local" - "github.com/m3db/m3db/src/coordinator/test/seriesiter" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/policy/filter" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test/local" + "github.com/m3db/m3db/src/query/test/seriesiter" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/index.go b/src/query/storage/index.go similarity index 98% rename from src/coordinator/storage/index.go rename to src/query/storage/index.go index 4ceea297c1..8bd0c3f04e 100644 --- a/src/coordinator/storage/index.go +++ b/src/query/storage/index.go @@ -23,7 +23,7 @@ package storage import ( "fmt" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/dbnode/storage/index" "github.com/m3db/m3db/src/m3ninx/idx" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/interface.go b/src/query/storage/interface.go similarity index 97% rename from src/coordinator/storage/interface.go rename to src/query/storage/interface.go index 938d824f52..921467dd5b 100644 --- a/src/coordinator/storage/interface.go +++ b/src/query/storage/interface.go @@ -25,9 +25,9 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/ts" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/ts" xtime "github.com/m3db/m3x/time" ) diff --git a/src/coordinator/storage/local/cluster.go b/src/query/storage/local/cluster.go similarity index 99% rename from src/coordinator/storage/local/cluster.go rename to src/query/storage/local/cluster.go index d89cea2a40..e0bff53533 100644 --- a/src/coordinator/storage/local/cluster.go +++ b/src/query/storage/local/cluster.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/dbnode/client" xerrors "github.com/m3db/m3x/errors" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/local/cluster_test.go b/src/query/storage/local/cluster_test.go similarity index 99% rename from src/coordinator/storage/local/cluster_test.go rename to src/query/storage/local/cluster_test.go index f770da5aef..f21d275452 100644 --- a/src/coordinator/storage/local/cluster_test.go +++ b/src/query/storage/local/cluster_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/local/config.go b/src/query/storage/local/config.go similarity index 98% rename from src/coordinator/storage/local/config.go rename to src/query/storage/local/config.go index a1abbfb7bd..5f420ffd81 100644 --- a/src/coordinator/storage/local/config.go +++ b/src/query/storage/local/config.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/stores/m3db" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/stores/m3db" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" ) diff --git a/src/coordinator/storage/local/storage.go b/src/query/storage/local/storage.go similarity index 97% rename from src/coordinator/storage/local/storage.go rename to src/query/storage/local/storage.go index e4f161d535..db426d8e74 100644 --- a/src/coordinator/storage/local/storage.go +++ b/src/query/storage/local/storage.go @@ -27,11 +27,11 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/execution" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/execution" "github.com/m3db/m3db/src/dbnode/storage/index" xerrors "github.com/m3db/m3x/errors" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/storage/local/storage_test.go b/src/query/storage/local/storage_test.go similarity index 97% rename from src/coordinator/storage/local/storage_test.go rename to src/query/storage/local/storage_test.go index 14e9fb5dc1..2bcadedbdb 100644 --- a/src/coordinator/storage/local/storage_test.go +++ b/src/query/storage/local/storage_test.go @@ -28,11 +28,11 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test/seriesiter" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test/seriesiter" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/coordinator/storage/mock/storage.go b/src/query/storage/mock/storage.go similarity index 96% rename from src/coordinator/storage/mock/storage.go rename to src/query/storage/mock/storage.go index 7d4d5b32ef..76ac80dab6 100644 --- a/src/coordinator/storage/mock/storage.go +++ b/src/query/storage/mock/storage.go @@ -23,8 +23,8 @@ package mock import ( "context" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/storage" ) type mockStorage struct { diff --git a/src/coordinator/storage/remote/storage.go b/src/query/storage/remote/storage.go similarity index 92% rename from src/coordinator/storage/remote/storage.go rename to src/query/storage/remote/storage.go index afc6cf9c1a..3b678ab20a 100644 --- a/src/coordinator/storage/remote/storage.go +++ b/src/query/storage/remote/storage.go @@ -23,10 +23,10 @@ package remote import ( "context" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/tsdb/remote" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/tsdb/remote" ) type remoteStorage struct { diff --git a/src/coordinator/stores/m3db/async_session.go b/src/query/stores/m3db/async_session.go similarity index 100% rename from src/coordinator/stores/m3db/async_session.go rename to src/query/stores/m3db/async_session.go diff --git a/src/coordinator/stores/m3db/async_session_test.go b/src/query/stores/m3db/async_session_test.go similarity index 99% rename from src/coordinator/stores/m3db/async_session_test.go rename to src/query/stores/m3db/async_session_test.go index 6dcd87f278..fe48840a0a 100644 --- a/src/coordinator/stores/m3db/async_session_test.go +++ b/src/query/stores/m3db/async_session_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/storage/index" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/test/block.go b/src/query/test/block.go similarity index 96% rename from src/coordinator/test/block.go rename to src/query/test/block.go index ba3b41f36c..4035b7fcf3 100644 --- a/src/coordinator/test/block.go +++ b/src/query/test/block.go @@ -23,8 +23,8 @@ package test import ( "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/models" ) // NewBlockFromValues creates a new block using the provided values diff --git a/src/coordinator/test/executor/transform.go b/src/query/test/executor/transform.go similarity index 92% rename from src/coordinator/test/executor/transform.go rename to src/query/test/executor/transform.go index f8d735f2a2..d929ae3eae 100644 --- a/src/coordinator/test/executor/transform.go +++ b/src/query/test/executor/transform.go @@ -21,9 +21,9 @@ package executor import ( - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/executor/transform" - "github.com/m3db/m3db/src/coordinator/parser" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/executor/transform" + "github.com/m3db/m3db/src/query/parser" ) // NewControllerWithSink creates a new controller which has a sink useful for comparison in tests diff --git a/src/coordinator/test/handler.go b/src/query/test/handler.go similarity index 96% rename from src/coordinator/test/handler.go rename to src/query/test/handler.go index 8b2b280c6e..66bbae0de7 100644 --- a/src/coordinator/test/handler.go +++ b/src/query/test/handler.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/prompb" + "github.com/m3db/m3db/src/query/generated/proto/prompb" "github.com/golang/protobuf/proto" "github.com/golang/snappy" diff --git a/src/coordinator/test/local/storage.go b/src/query/test/local/storage.go similarity index 95% rename from src/coordinator/test/local/storage.go rename to src/query/test/local/storage.go index 772495132f..e471408f0c 100644 --- a/src/coordinator/test/local/storage.go +++ b/src/query/test/local/storage.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/storage/local" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/local" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/test/seriesiter/mock_iter.go b/src/query/test/seriesiter/mock_iter.go similarity index 100% rename from src/coordinator/test/seriesiter/mock_iter.go rename to src/query/test/seriesiter/mock_iter.go diff --git a/src/coordinator/test/storage.go b/src/query/test/storage.go similarity index 96% rename from src/coordinator/test/storage.go rename to src/query/test/storage.go index 67abefe3e1..4c3fc4b559 100644 --- a/src/coordinator/test/storage.go +++ b/src/query/test/storage.go @@ -24,8 +24,8 @@ import ( "context" "time" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/storage" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/storage" ) // slowStorage slows down a request by delay diff --git a/src/coordinator/test/test_series_iterator.go b/src/query/test/test_series_iterator.go similarity index 100% rename from src/coordinator/test/test_series_iterator.go rename to src/query/test/test_series_iterator.go diff --git a/src/coordinator/test/util.go b/src/query/test/util.go similarity index 100% rename from src/coordinator/test/util.go rename to src/query/test/util.go diff --git a/src/coordinator/ts/m3db/blocks.go b/src/query/ts/m3db/blocks.go similarity index 100% rename from src/coordinator/ts/m3db/blocks.go rename to src/query/ts/m3db/blocks.go diff --git a/src/coordinator/ts/m3db/blocks_test.go b/src/query/ts/m3db/blocks_test.go similarity index 100% rename from src/coordinator/ts/m3db/blocks_test.go rename to src/query/ts/m3db/blocks_test.go diff --git a/src/coordinator/ts/m3db/convert.go b/src/query/ts/m3db/convert.go similarity index 100% rename from src/coordinator/ts/m3db/convert.go rename to src/query/ts/m3db/convert.go diff --git a/src/coordinator/ts/m3db/convert_test.go b/src/query/ts/m3db/convert_test.go similarity index 97% rename from src/coordinator/ts/m3db/convert_test.go rename to src/query/ts/m3db/convert_test.go index 3b1db84c91..fc953f41db 100644 --- a/src/coordinator/ts/m3db/convert_test.go +++ b/src/query/ts/m3db/convert_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/test" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/ts/m3db/storage/local.go b/src/query/ts/m3db/storage/local.go similarity index 96% rename from src/coordinator/ts/m3db/storage/local.go rename to src/query/ts/m3db/storage/local.go index c917e52525..9cbea74d16 100644 --- a/src/coordinator/ts/m3db/storage/local.go +++ b/src/query/ts/m3db/storage/local.go @@ -24,9 +24,9 @@ import ( "context" "io" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/storage/local" - m3block "github.com/m3db/m3db/src/coordinator/ts/m3db" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/local" + m3block "github.com/m3db/m3db/src/query/ts/m3db" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/storage/index" diff --git a/src/coordinator/ts/m3db/storage/local_test.go b/src/query/ts/m3db/storage/local_test.go similarity index 94% rename from src/coordinator/ts/m3db/storage/local_test.go rename to src/query/ts/m3db/storage/local_test.go index d34729a4fc..84dc7e1a36 100644 --- a/src/coordinator/ts/m3db/storage/local_test.go +++ b/src/query/ts/m3db/storage/local_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/storage/local" - "github.com/m3db/m3db/src/coordinator/test" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/local" + "github.com/m3db/m3db/src/query/test" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" diff --git a/src/coordinator/ts/m3db/types.go b/src/query/ts/m3db/types.go similarity index 100% rename from src/coordinator/ts/m3db/types.go rename to src/query/ts/m3db/types.go diff --git a/src/coordinator/ts/memset.go b/src/query/ts/memset.go similarity index 100% rename from src/coordinator/ts/memset.go rename to src/query/ts/memset.go diff --git a/src/coordinator/ts/memset_test.go b/src/query/ts/memset_test.go similarity index 100% rename from src/coordinator/ts/memset_test.go rename to src/query/ts/memset_test.go diff --git a/src/coordinator/ts/series.go b/src/query/ts/series.go similarity index 97% rename from src/coordinator/ts/series.go rename to src/query/ts/series.go index 754ae51bb0..a197920483 100644 --- a/src/coordinator/ts/series.go +++ b/src/query/ts/series.go @@ -24,8 +24,8 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/models" ) // Series is the public interface to a block of timeseries values. Each block has a start time, diff --git a/src/coordinator/ts/series_test.go b/src/query/ts/series_test.go similarity index 97% rename from src/coordinator/ts/series_test.go rename to src/query/ts/series_test.go index 2f24b9177a..0b8674a4df 100644 --- a/src/coordinator/ts/series_test.go +++ b/src/query/ts/series_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/models" + "github.com/m3db/m3db/src/query/models" "github.com/stretchr/testify/assert" ) diff --git a/src/coordinator/ts/values.go b/src/query/ts/values.go similarity index 99% rename from src/coordinator/ts/values.go rename to src/query/ts/values.go index 4f1782e26d..cccbb49772 100644 --- a/src/coordinator/ts/values.go +++ b/src/query/ts/values.go @@ -25,7 +25,7 @@ import ( "math" "time" - "github.com/m3db/m3db/src/coordinator/errors" + "github.com/m3db/m3db/src/query/errors" ) // Values holds the values for a timeseries. It provides a minimal interface diff --git a/src/coordinator/ts/values_test.go b/src/query/ts/values_test.go similarity index 100% rename from src/coordinator/ts/values_test.go rename to src/query/ts/values_test.go diff --git a/src/coordinator/tsdb/interface.go b/src/query/tsdb/interface.go similarity index 100% rename from src/coordinator/tsdb/interface.go rename to src/query/tsdb/interface.go diff --git a/src/coordinator/tsdb/remote/client.go b/src/query/tsdb/remote/client.go similarity index 92% rename from src/coordinator/tsdb/remote/client.go rename to src/query/tsdb/remote/client.go index 430c6e51b2..ef12c6ae80 100644 --- a/src/coordinator/tsdb/remote/client.go +++ b/src/query/tsdb/remote/client.go @@ -24,12 +24,12 @@ import ( "context" "io" - "github.com/m3db/m3db/src/coordinator/block" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/block" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/logging" "google.golang.org/grpc" ) diff --git a/src/coordinator/tsdb/remote/codecs.go b/src/query/tsdb/remote/codecs.go similarity index 97% rename from src/coordinator/tsdb/remote/codecs.go rename to src/query/tsdb/remote/codecs.go index d84b2e6d61..0792130954 100644 --- a/src/coordinator/tsdb/remote/codecs.go +++ b/src/query/tsdb/remote/codecs.go @@ -25,10 +25,10 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/ts" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/ts" xtime "github.com/m3db/m3x/time" ) diff --git a/src/coordinator/tsdb/remote/codecs_test.go b/src/query/tsdb/remote/codecs_test.go similarity index 97% rename from src/coordinator/tsdb/remote/codecs_test.go rename to src/query/tsdb/remote/codecs_test.go index 46aa59f2d8..db572bb1cb 100644 --- a/src/coordinator/tsdb/remote/codecs_test.go +++ b/src/query/tsdb/remote/codecs_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/ts" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/ts" xtime "github.com/m3db/m3x/time" "github.com/stretchr/testify/assert" diff --git a/src/coordinator/tsdb/remote/compressed_codecs.go b/src/query/tsdb/remote/compressed_codecs.go similarity index 99% rename from src/coordinator/tsdb/remote/compressed_codecs.go rename to src/query/tsdb/remote/compressed_codecs.go index 83b2224976..b23df614d8 100644 --- a/src/coordinator/tsdb/remote/compressed_codecs.go +++ b/src/query/tsdb/remote/compressed_codecs.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/generated/proto/rpc" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/serialize" diff --git a/src/coordinator/tsdb/remote/compressed_codecs_test.go b/src/query/tsdb/remote/compressed_codecs_test.go similarity index 99% rename from src/coordinator/tsdb/remote/compressed_codecs_test.go rename to src/query/tsdb/remote/compressed_codecs_test.go index 4d7ad3bb9d..69fe1f2ee7 100644 --- a/src/coordinator/tsdb/remote/compressed_codecs_test.go +++ b/src/query/tsdb/remote/compressed_codecs_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" - "github.com/m3db/m3db/src/coordinator/test" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/serialize" diff --git a/src/coordinator/tsdb/remote/server.go b/src/query/tsdb/remote/server.go similarity index 95% rename from src/coordinator/tsdb/remote/server.go rename to src/query/tsdb/remote/server.go index 2a4954606b..5ddc12edb7 100644 --- a/src/coordinator/tsdb/remote/server.go +++ b/src/query/tsdb/remote/server.go @@ -24,9 +24,9 @@ import ( "io" "net" - "github.com/m3db/m3db/src/coordinator/generated/proto/rpc" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/util/logging" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/src/coordinator/tsdb/remote/server_test.go b/src/query/tsdb/remote/server_test.go similarity index 97% rename from src/coordinator/tsdb/remote/server_test.go rename to src/query/tsdb/remote/server_test.go index 73b58574b4..ffb13c75b1 100644 --- a/src/coordinator/tsdb/remote/server_test.go +++ b/src/query/tsdb/remote/server_test.go @@ -28,12 +28,12 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/coordinator/block" - m3err "github.com/m3db/m3db/src/coordinator/errors" - "github.com/m3db/m3db/src/coordinator/models" - "github.com/m3db/m3db/src/coordinator/storage" - "github.com/m3db/m3db/src/coordinator/ts" - "github.com/m3db/m3db/src/coordinator/util/logging" + "github.com/m3db/m3db/src/query/block" + m3err "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/models" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/ts" + "github.com/m3db/m3db/src/query/util/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/coordinator/tsdb/remote/staticResolver.go b/src/query/tsdb/remote/staticResolver.go similarity index 100% rename from src/coordinator/tsdb/remote/staticResolver.go rename to src/query/tsdb/remote/staticResolver.go diff --git a/src/coordinator/util/execution/parallel.go b/src/query/util/execution/parallel.go similarity index 100% rename from src/coordinator/util/execution/parallel.go rename to src/query/util/execution/parallel.go diff --git a/src/coordinator/util/execution/parallel_test.go b/src/query/util/execution/parallel_test.go similarity index 100% rename from src/coordinator/util/execution/parallel_test.go rename to src/query/util/execution/parallel_test.go diff --git a/src/coordinator/util/execution/state.go b/src/query/util/execution/state.go similarity index 100% rename from src/coordinator/util/execution/state.go rename to src/query/util/execution/state.go diff --git a/src/coordinator/util/json/writer.go b/src/query/util/json/writer.go similarity index 100% rename from src/coordinator/util/json/writer.go rename to src/query/util/json/writer.go diff --git a/src/coordinator/util/json/writer_test.go b/src/query/util/json/writer_test.go similarity index 100% rename from src/coordinator/util/json/writer_test.go rename to src/query/util/json/writer_test.go diff --git a/src/coordinator/util/logging/log.go b/src/query/util/logging/log.go similarity index 100% rename from src/coordinator/util/logging/log.go rename to src/query/util/logging/log.go diff --git a/src/coordinator/util/strings.go b/src/query/util/strings.go similarity index 100% rename from src/coordinator/util/strings.go rename to src/query/util/strings.go diff --git a/src/coordinator/util/strings_test.go b/src/query/util/strings_test.go similarity index 100% rename from src/coordinator/util/strings_test.go rename to src/query/util/strings_test.go diff --git a/src/coordinator/util/timing.go b/src/query/util/timing.go similarity index 100% rename from src/coordinator/util/timing.go rename to src/query/util/timing.go From 5cf2c0b65a66242d636c452792abd1fc8f0ade4a Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 13:50:12 -0400 Subject: [PATCH 2/9] Create m3query service --- Makefile | 3 +- src/cmd/services/m3dbnode/config/config.go | 2 +- src/cmd/services/m3dbnode/main/main.go | 2 +- .../config/config.go | 0 src/cmd/services/m3query/main/main.go | 46 +++++++++++++++++++ src/query/api/v1/handler/database/common.go | 2 +- src/query/api/v1/handler/database/create.go | 4 +- .../api/v1/handler/database/create_test.go | 4 +- src/query/api/v1/handler/placement/add.go | 2 +- .../api/v1/handler/placement/add_test.go | 2 +- src/query/api/v1/handler/placement/common.go | 2 +- src/query/api/v1/handler/placement/delete.go | 2 +- .../api/v1/handler/placement/delete_all.go | 2 +- .../v1/handler/placement/delete_all_test.go | 2 +- .../api/v1/handler/placement/delete_test.go | 2 +- src/query/api/v1/handler/placement/get.go | 2 +- .../api/v1/handler/placement/get_test.go | 2 +- src/query/api/v1/handler/placement/init.go | 2 +- .../api/v1/handler/placement/init_test.go | 2 +- src/query/api/v1/httpd/handler.go | 2 +- src/query/api/v1/httpd/handler_test.go | 2 +- .../integration/testdata/read_data.snappy | 2 +- .../services/m3coordinator/server/server.go | 4 +- 23 files changed, 71 insertions(+), 24 deletions(-) rename src/cmd/services/{m3coordinator => m3query}/config/config.go (100%) create mode 100644 src/cmd/services/m3query/main/main.go diff --git a/Makefile b/Makefile index 57965bea21..8024674893 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,12 @@ SERVICES := \ m3coordinator \ m3nsch_server \ m3nsch_client \ + m3query \ SUBDIRS := \ cmd \ dbnode \ - coordinator \ + query \ m3nsch \ m3ninx \ diff --git a/src/cmd/services/m3dbnode/config/config.go b/src/cmd/services/m3dbnode/config/config.go index ad73ecd4dd..cd17e95b16 100644 --- a/src/cmd/services/m3dbnode/config/config.go +++ b/src/cmd/services/m3dbnode/config/config.go @@ -29,7 +29,7 @@ import ( "strings" "time" - coordinatorcfg "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + coordinatorcfg "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/environment" "github.com/m3db/m3x/config/hostid" diff --git a/src/cmd/services/m3dbnode/main/main.go b/src/cmd/services/m3dbnode/main/main.go index b7f626cc8b..524efcaf04 100644 --- a/src/cmd/services/m3dbnode/main/main.go +++ b/src/cmd/services/m3dbnode/main/main.go @@ -29,8 +29,8 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" dbserver "github.com/m3db/m3db/src/cmd/services/m3dbnode/server" - coordinatorserver "github.com/m3db/m3db/src/coordinator/services/m3coordinator/server" "github.com/m3db/m3db/src/dbnode/client" + coordinatorserver "github.com/m3db/m3db/src/query/services/m3coordinator/server" xconfig "github.com/m3db/m3x/config" ) diff --git a/src/cmd/services/m3coordinator/config/config.go b/src/cmd/services/m3query/config/config.go similarity index 100% rename from src/cmd/services/m3coordinator/config/config.go rename to src/cmd/services/m3query/config/config.go diff --git a/src/cmd/services/m3query/main/main.go b/src/cmd/services/m3query/main/main.go new file mode 100644 index 0000000000..ab39a5f782 --- /dev/null +++ b/src/cmd/services/m3query/main/main.go @@ -0,0 +1,46 @@ +// Copyright (c) 2018 Uber Technologies, 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. + +package main + +import ( + "flag" + _ "net/http/pprof" // pprof: for debug listen server if configured + "os" + + "github.com/m3db/m3db/src/query/services/m3coordinator/server" +) + +var ( + configFile = flag.String("f", "", "configuration file") +) + +func main() { + flag.Parse() + + if len(*configFile) == 0 { + flag.Usage() + os.Exit(1) + } + + server.Run(server.RunOptions{ + ConfigFile: *configFile, + }) +} diff --git a/src/query/api/v1/handler/database/common.go b/src/query/api/v1/handler/database/common.go index 119ad11edb..85f1eb2171 100644 --- a/src/query/api/v1/handler/database/common.go +++ b/src/query/api/v1/handler/database/common.go @@ -22,8 +22,8 @@ package database import ( clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" diff --git a/src/query/api/v1/handler/database/create.go b/src/query/api/v1/handler/database/create.go index add50ffa99..6a71e836fc 100644 --- a/src/query/api/v1/handler/database/create.go +++ b/src/query/api/v1/handler/database/create.go @@ -32,15 +32,15 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/generated/proto/placementpb" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" + dbnamespace "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/api/v1/handler/namespace" "github.com/m3db/m3db/src/query/api/v1/handler/placement" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util" "github.com/m3db/m3db/src/query/util/logging" - dbnamespace "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/golang/protobuf/jsonpb" "go.uber.org/zap" diff --git a/src/query/api/v1/handler/database/create_test.go b/src/query/api/v1/handler/database/create_test.go index a05798ea84..c487724b68 100644 --- a/src/query/api/v1/handler/database/create_test.go +++ b/src/query/api/v1/handler/database/create_test.go @@ -36,11 +36,11 @@ import ( "github.com/m3db/m3cluster/kv" "github.com/m3db/m3cluster/placement" "github.com/m3db/m3cluster/services" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" + xtest "github.com/m3db/m3db/src/dbnode/x/test" "github.com/m3db/m3db/src/query/api/v1/handler/namespace" "github.com/m3db/m3db/src/query/util/logging" - xtest "github.com/m3db/m3db/src/dbnode/x/test" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/handler/placement/add.go b/src/query/api/v1/handler/placement/add.go index 7a9e063106..d7e56b6324 100644 --- a/src/query/api/v1/handler/placement/add.go +++ b/src/query/api/v1/handler/placement/add.go @@ -25,7 +25,7 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/placement" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/api/v1/handler/placement/add_test.go b/src/query/api/v1/handler/placement/add_test.go index 88c9e44b7d..c2d806b976 100644 --- a/src/query/api/v1/handler/placement/add_test.go +++ b/src/query/api/v1/handler/placement/add_test.go @@ -29,7 +29,7 @@ import ( "testing" "github.com/m3db/m3cluster/placement" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/handler/placement/common.go b/src/query/api/v1/handler/placement/common.go index 4229605f1a..6cf9e154bf 100644 --- a/src/query/api/v1/handler/placement/common.go +++ b/src/query/api/v1/handler/placement/common.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3cluster/placement" "github.com/m3db/m3cluster/services" "github.com/m3db/m3cluster/shard" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" diff --git a/src/query/api/v1/handler/placement/delete.go b/src/query/api/v1/handler/placement/delete.go index 741c673a51..7c6cc4c61f 100644 --- a/src/query/api/v1/handler/placement/delete.go +++ b/src/query/api/v1/handler/placement/delete.go @@ -26,7 +26,7 @@ import ( "net/http" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/api/v1/handler/placement/delete_all.go b/src/query/api/v1/handler/placement/delete_all.go index f1de8ca663..4079267abc 100644 --- a/src/query/api/v1/handler/placement/delete_all.go +++ b/src/query/api/v1/handler/placement/delete_all.go @@ -25,7 +25,7 @@ import ( "net/http" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/api/v1/handler/placement/delete_all_test.go b/src/query/api/v1/handler/placement/delete_all_test.go index 0cf0b140df..8d13120d3c 100644 --- a/src/query/api/v1/handler/placement/delete_all_test.go +++ b/src/query/api/v1/handler/placement/delete_all_test.go @@ -26,7 +26,7 @@ import ( "net/http/httptest" "testing" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/query/api/v1/handler/placement/delete_test.go b/src/query/api/v1/handler/placement/delete_test.go index 0342885d77..8dfa7111c6 100644 --- a/src/query/api/v1/handler/placement/delete_test.go +++ b/src/query/api/v1/handler/placement/delete_test.go @@ -28,7 +28,7 @@ import ( "testing" "github.com/m3db/m3cluster/placement" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/handler/placement/get.go b/src/query/api/v1/handler/placement/get.go index 421e088dc0..0d1b48d21f 100644 --- a/src/query/api/v1/handler/placement/get.go +++ b/src/query/api/v1/handler/placement/get.go @@ -25,7 +25,7 @@ import ( "net/http" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/api/v1/handler/placement/get_test.go b/src/query/api/v1/handler/placement/get_test.go index e085e91926..682426b9c4 100644 --- a/src/query/api/v1/handler/placement/get_test.go +++ b/src/query/api/v1/handler/placement/get_test.go @@ -31,7 +31,7 @@ import ( "github.com/m3db/m3cluster/generated/proto/placementpb" "github.com/m3db/m3cluster/placement" "github.com/m3db/m3cluster/services" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" diff --git a/src/query/api/v1/handler/placement/init.go b/src/query/api/v1/handler/placement/init.go index c149064c75..a34983fb8d 100644 --- a/src/query/api/v1/handler/placement/init.go +++ b/src/query/api/v1/handler/placement/init.go @@ -25,7 +25,7 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/placement" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/api/v1/handler/placement/init_test.go b/src/query/api/v1/handler/placement/init_test.go index 416b2b8db4..aa5ba772b8 100644 --- a/src/query/api/v1/handler/placement/init_test.go +++ b/src/query/api/v1/handler/placement/init_test.go @@ -30,7 +30,7 @@ import ( "github.com/m3db/m3cluster/generated/proto/placementpb" "github.com/m3db/m3cluster/placement" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/httpd/handler.go b/src/query/api/v1/httpd/handler.go index 12c836506f..ea6cf2a551 100644 --- a/src/query/api/v1/httpd/handler.go +++ b/src/query/api/v1/httpd/handler.go @@ -28,8 +28,8 @@ import ( "os" clusterclient "github.com/m3db/m3cluster/client" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/api/v1/handler/database" "github.com/m3db/m3db/src/query/api/v1/handler/namespace" diff --git a/src/query/api/v1/httpd/handler_test.go b/src/query/api/v1/httpd/handler_test.go index 996a9f98d9..8a5561ad0f 100644 --- a/src/query/api/v1/httpd/handler_test.go +++ b/src/query/api/v1/httpd/handler_test.go @@ -26,7 +26,7 @@ import ( "net/http/httptest" "testing" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/native" "github.com/m3db/m3db/src/query/api/v1/handler/prometheus/remote" "github.com/m3db/m3db/src/query/executor" diff --git a/src/query/integration/testdata/read_data.snappy b/src/query/integration/testdata/read_data.snappy index 46263e2d1d..b700e8fd54 100644 --- a/src/query/integration/testdata/read_data.snappy +++ b/src/query/integration/testdata/read_data.snappy @@ -1,2 +1,2 @@ ` -�����,����,eqa \ No newline at end of file +�����,����,eqa diff --git a/src/query/services/m3coordinator/server/server.go b/src/query/services/m3coordinator/server/server.go index 76c40bdb43..402b5a251a 100644 --- a/src/query/services/m3coordinator/server/server.go +++ b/src/query/services/m3coordinator/server/server.go @@ -32,8 +32,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" etcdclient "github.com/m3db/m3cluster/client/etcd" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" dbconfig "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" + "github.com/m3db/m3db/src/cmd/services/m3query/config" + "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/query/api/v1/httpd" m3dbcluster "github.com/m3db/m3db/src/query/cluster/m3db" "github.com/m3db/m3db/src/query/executor" @@ -45,7 +46,6 @@ import ( "github.com/m3db/m3db/src/query/stores/m3db" tsdbRemote "github.com/m3db/m3db/src/query/tsdb/remote" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/client" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/instrument" From 2a5289a92178097be0dc69056214a5b85c739679 Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 14:05:35 -0400 Subject: [PATCH 3/9] Fix lint issues --- src/query/api/v1/handler/namespace/add.go | 4 ++-- src/query/api/v1/handler/namespace/common.go | 2 +- src/query/api/v1/handler/namespace/common_test.go | 2 +- src/query/api/v1/handler/namespace/delete.go | 2 +- src/query/api/v1/handler/namespace/get.go | 2 +- src/query/api/v1/handler/namespace/get_test.go | 2 +- src/query/api/v1/handler/prometheus/remote/read_test.go | 2 +- src/query/api/v1/handler/prometheus/remote/write_test.go | 2 +- src/query/api/v1/handler/search_test.go | 2 +- src/query/benchmark/read/main/read_benchmark.go | 6 +++--- src/query/benchmark/write/main/write_benchmark.go | 4 ++-- src/query/storage/converter.go | 2 +- src/query/storage/converter_test.go | 2 +- src/query/storage/fanout/storage_test.go | 2 +- src/query/storage/index.go | 2 +- src/query/storage/local/cluster.go | 2 +- src/query/storage/local/cluster_test.go | 2 +- src/query/storage/local/config.go | 2 +- src/query/storage/local/storage.go | 2 +- src/query/storage/local/storage_test.go | 2 +- src/query/stores/m3db/async_session_test.go | 2 +- src/query/test/local/storage.go | 2 +- src/query/ts/m3db/convert_test.go | 4 ++-- src/query/ts/m3db/storage/local.go | 6 +++--- src/query/ts/m3db/storage/local_test.go | 4 ++-- src/query/tsdb/remote/compressed_codecs.go | 4 ++-- src/query/tsdb/remote/compressed_codecs_test.go | 6 +++--- 27 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/query/api/v1/handler/namespace/add.go b/src/query/api/v1/handler/namespace/add.go index 1084b0ba0e..d2a50951f8 100644 --- a/src/query/api/v1/handler/namespace/add.go +++ b/src/query/api/v1/handler/namespace/add.go @@ -26,11 +26,11 @@ import ( "net/http" clusterclient "github.com/m3db/m3cluster/client" + nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" + "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" - nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" - "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/gogo/protobuf/jsonpb" "go.uber.org/zap" diff --git a/src/query/api/v1/handler/namespace/common.go b/src/query/api/v1/handler/namespace/common.go index 7fb7e6bad3..bd43909e6d 100644 --- a/src/query/api/v1/handler/namespace/common.go +++ b/src/query/api/v1/handler/namespace/common.go @@ -25,9 +25,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/m3db/m3db/src/dbnode/storage/namespace" + "github.com/m3db/m3db/src/query/util/logging" "github.com/gorilla/mux" ) diff --git a/src/query/api/v1/handler/namespace/common_test.go b/src/query/api/v1/handler/namespace/common_test.go index 073325e2ce..f038f51f02 100644 --- a/src/query/api/v1/handler/namespace/common_test.go +++ b/src/query/api/v1/handler/namespace/common_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/handler/namespace/delete.go b/src/query/api/v1/handler/namespace/delete.go index 3c4d1264b7..1f2b1d3967 100644 --- a/src/query/api/v1/handler/namespace/delete.go +++ b/src/query/api/v1/handler/namespace/delete.go @@ -28,9 +28,9 @@ import ( "strings" clusterclient "github.com/m3db/m3cluster/client" + "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/storage/namespace" "github.com/gorilla/mux" "go.uber.org/zap" diff --git a/src/query/api/v1/handler/namespace/get.go b/src/query/api/v1/handler/namespace/get.go index ab401c4ecf..0ee34d0c88 100644 --- a/src/query/api/v1/handler/namespace/get.go +++ b/src/query/api/v1/handler/namespace/get.go @@ -26,10 +26,10 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" + nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "github.com/m3db/m3db/src/query/api/v1/handler" "github.com/m3db/m3db/src/query/generated/proto/admin" "github.com/m3db/m3db/src/query/util/logging" - nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" "go.uber.org/zap" ) diff --git a/src/query/api/v1/handler/namespace/get_test.go b/src/query/api/v1/handler/namespace/get_test.go index d28051c37c..5848f1f47c 100644 --- a/src/query/api/v1/handler/namespace/get_test.go +++ b/src/query/api/v1/handler/namespace/get_test.go @@ -28,8 +28,8 @@ import ( "github.com/m3db/m3cluster/client" "github.com/m3db/m3cluster/kv" - "github.com/m3db/m3db/src/query/util/logging" nsproto "github.com/m3db/m3db/src/dbnode/generated/proto/namespace" + "github.com/m3db/m3db/src/query/util/logging" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/src/query/api/v1/handler/prometheus/remote/read_test.go b/src/query/api/v1/handler/prometheus/remote/read_test.go index a8a8b76f21..c653bef285 100644 --- a/src/query/api/v1/handler/prometheus/remote/read_test.go +++ b/src/query/api/v1/handler/prometheus/remote/read_test.go @@ -29,12 +29,12 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/x/metrics" "github.com/m3db/m3db/src/query/executor" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/query/test/local" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/x/metrics" xclock "github.com/m3db/m3x/clock" "github.com/golang/mock/gomock" diff --git a/src/query/api/v1/handler/prometheus/remote/write_test.go b/src/query/api/v1/handler/prometheus/remote/write_test.go index 6b8bc46fcd..dce88aab45 100644 --- a/src/query/api/v1/handler/prometheus/remote/write_test.go +++ b/src/query/api/v1/handler/prometheus/remote/write_test.go @@ -29,10 +29,10 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/x/metrics" "github.com/m3db/m3db/src/query/generated/proto/prompb" "github.com/m3db/m3db/src/query/test/local" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/x/metrics" xclock "github.com/m3db/m3x/clock" "github.com/golang/mock/gomock" diff --git a/src/query/api/v1/handler/search_test.go b/src/query/api/v1/handler/search_test.go index eb38f9cbbc..e23ac6d3ed 100644 --- a/src/query/api/v1/handler/search_test.go +++ b/src/query/api/v1/handler/search_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/test/local" "github.com/m3db/m3db/src/query/test/seriesiter" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" "github.com/golang/mock/gomock" diff --git a/src/query/benchmark/read/main/read_benchmark.go b/src/query/benchmark/read/main/read_benchmark.go index d1053faafb..bb7baa132f 100644 --- a/src/query/benchmark/read/main/read_benchmark.go +++ b/src/query/benchmark/read/main/read_benchmark.go @@ -27,11 +27,11 @@ import ( "log" "time" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/query/benchmark/common" - "github.com/m3db/m3db/src/query/generated/proto/prompb" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/encoding" + "github.com/m3db/m3db/src/query/benchmark/common" + "github.com/m3db/m3db/src/query/generated/proto/prompb" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" diff --git a/src/query/benchmark/write/main/write_benchmark.go b/src/query/benchmark/write/main/write_benchmark.go index 0c54f017ca..b9f047069f 100644 --- a/src/query/benchmark/write/main/write_benchmark.go +++ b/src/query/benchmark/write/main/write_benchmark.go @@ -28,9 +28,9 @@ import ( "sync/atomic" "time" - "github.com/m3db/m3db/src/cmd/services/m3coordinator/config" - "github.com/m3db/m3db/src/query/benchmark/common" + "github.com/m3db/m3db/src/cmd/services/m3query/config" "github.com/m3db/m3db/src/dbnode/client" + "github.com/m3db/m3db/src/query/benchmark/common" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/storage/converter.go b/src/query/storage/converter.go index fa4eea529c..7140a119de 100644 --- a/src/query/storage/converter.go +++ b/src/query/storage/converter.go @@ -25,10 +25,10 @@ import ( "sync" "time" + "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/query/generated/proto/prompb" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/ts" - "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" xsync "github.com/m3db/m3x/sync" diff --git a/src/query/storage/converter_test.go b/src/query/storage/converter_test.go index 81518258a3..21ac14e03f 100644 --- a/src/query/storage/converter_test.go +++ b/src/query/storage/converter_test.go @@ -24,9 +24,9 @@ import ( "errors" "testing" + "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/test/seriesiter" - "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" xsync "github.com/m3db/m3x/sync" diff --git a/src/query/storage/fanout/storage_test.go b/src/query/storage/fanout/storage_test.go index faf3af5bd0..3c64ac4e2c 100644 --- a/src/query/storage/fanout/storage_test.go +++ b/src/query/storage/fanout/storage_test.go @@ -26,6 +26,7 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/query/errors" "github.com/m3db/m3db/src/query/policy/filter" "github.com/m3db/m3db/src/query/storage" @@ -33,7 +34,6 @@ import ( "github.com/m3db/m3db/src/query/test/seriesiter" "github.com/m3db/m3db/src/query/ts" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/golang/mock/gomock" diff --git a/src/query/storage/index.go b/src/query/storage/index.go index 8bd0c3f04e..416c3bf10a 100644 --- a/src/query/storage/index.go +++ b/src/query/storage/index.go @@ -23,9 +23,9 @@ package storage import ( "fmt" - "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/dbnode/storage/index" "github.com/m3db/m3db/src/m3ninx/idx" + "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3x/ident" ) diff --git a/src/query/storage/local/cluster.go b/src/query/storage/local/cluster.go index e0bff53533..03983cdfa3 100644 --- a/src/query/storage/local/cluster.go +++ b/src/query/storage/local/cluster.go @@ -27,8 +27,8 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/dbnode/client" + "github.com/m3db/m3db/src/query/storage" xerrors "github.com/m3db/m3x/errors" "github.com/m3db/m3x/ident" ) diff --git a/src/query/storage/local/cluster_test.go b/src/query/storage/local/cluster_test.go index f21d275452..a60173cbb1 100644 --- a/src/query/storage/local/cluster_test.go +++ b/src/query/storage/local/cluster_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/dbnode/client" + "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3x/ident" "github.com/golang/mock/gomock" diff --git a/src/query/storage/local/config.go b/src/query/storage/local/config.go index 5f420ffd81..eedb330b4e 100644 --- a/src/query/storage/local/config.go +++ b/src/query/storage/local/config.go @@ -25,9 +25,9 @@ import ( "sync" "time" + "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/stores/m3db" - "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" ) diff --git a/src/query/storage/local/storage.go b/src/query/storage/local/storage.go index db426d8e74..72292c9522 100644 --- a/src/query/storage/local/storage.go +++ b/src/query/storage/local/storage.go @@ -27,12 +27,12 @@ import ( "sync" "time" + "github.com/m3db/m3db/src/dbnode/storage/index" "github.com/m3db/m3db/src/query/block" "github.com/m3db/m3db/src/query/errors" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/util/execution" - "github.com/m3db/m3db/src/dbnode/storage/index" xerrors "github.com/m3db/m3x/errors" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" diff --git a/src/query/storage/local/storage_test.go b/src/query/storage/local/storage_test.go index 2bcadedbdb..94ff4ffb5a 100644 --- a/src/query/storage/local/storage_test.go +++ b/src/query/storage/local/storage_test.go @@ -28,12 +28,12 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/test/seriesiter" "github.com/m3db/m3db/src/query/ts" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/stores/m3db/async_session_test.go b/src/query/stores/m3db/async_session_test.go index fe48840a0a..2008845e83 100644 --- a/src/query/stores/m3db/async_session_test.go +++ b/src/query/stores/m3db/async_session_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/storage/index" + "github.com/m3db/m3db/src/query/util/logging" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/test/local/storage.go b/src/query/test/local/storage.go index e471408f0c..0dfc1e2245 100644 --- a/src/query/test/local/storage.go +++ b/src/query/test/local/storage.go @@ -24,9 +24,9 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/storage/local" - "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3x/ident" "github.com/golang/mock/gomock" diff --git a/src/query/ts/m3db/convert_test.go b/src/query/ts/m3db/convert_test.go index fc953f41db..bd922fe10a 100644 --- a/src/query/ts/m3db/convert_test.go +++ b/src/query/ts/m3db/convert_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/storage" - "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3x/ident" "github.com/stretchr/testify/assert" diff --git a/src/query/ts/m3db/storage/local.go b/src/query/ts/m3db/storage/local.go index 9cbea74d16..1a0aa30684 100644 --- a/src/query/ts/m3db/storage/local.go +++ b/src/query/ts/m3db/storage/local.go @@ -24,12 +24,12 @@ import ( "context" "io" - "github.com/m3db/m3db/src/query/storage" - "github.com/m3db/m3db/src/query/storage/local" - m3block "github.com/m3db/m3db/src/query/ts/m3db" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/storage/index" + "github.com/m3db/m3db/src/query/storage" + "github.com/m3db/m3db/src/query/storage/local" + m3block "github.com/m3db/m3db/src/query/ts/m3db" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" ) diff --git a/src/query/ts/m3db/storage/local_test.go b/src/query/ts/m3db/storage/local_test.go index 84dc7e1a36..9df1e26c47 100644 --- a/src/query/ts/m3db/storage/local_test.go +++ b/src/query/ts/m3db/storage/local_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" + "github.com/m3db/m3db/src/dbnode/client" + "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/storage/local" "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/query/util/logging" - "github.com/m3db/m3db/src/dbnode/client" - "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3x/ident" "github.com/golang/mock/gomock" diff --git a/src/query/tsdb/remote/compressed_codecs.go b/src/query/tsdb/remote/compressed_codecs.go index b23df614d8..742dabddd8 100644 --- a/src/query/tsdb/remote/compressed_codecs.go +++ b/src/query/tsdb/remote/compressed_codecs.go @@ -26,14 +26,14 @@ import ( "sync" "time" - "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpc" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/serialize" "github.com/m3db/m3db/src/dbnode/ts" "github.com/m3db/m3db/src/dbnode/x/xio" "github.com/m3db/m3db/src/dbnode/x/xpool" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/generated/proto/rpc" "github.com/m3db/m3x/checked" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/tsdb/remote/compressed_codecs_test.go b/src/query/tsdb/remote/compressed_codecs_test.go index 69fe1f2ee7..2a8904c695 100644 --- a/src/query/tsdb/remote/compressed_codecs_test.go +++ b/src/query/tsdb/remote/compressed_codecs_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpc" - "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3db/src/dbnode/encoding" "github.com/m3db/m3db/src/dbnode/encoding/m3tsz" "github.com/m3db/m3db/src/dbnode/serialize" "github.com/m3db/m3db/src/dbnode/x/xpool" + "github.com/m3db/m3db/src/query/errors" + "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" From 2b6fd6a440bfde6a39e92db0246a318e888138dd Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 15:04:17 -0400 Subject: [PATCH 4/9] Fix gen stuff --- .../generated/proto/admin/database.pb.go | 67 ++++---- .../generated/proto/admin/namespace.pb.go | 32 ++-- .../generated/proto/admin/placement.pb.go | 40 ++--- src/query/generated/proto/prompb/remote.pb.go | 44 ++--- src/query/generated/proto/prompb/types.pb.go | 49 +++--- .../proto/{rpc => rpcpb}/query.pb.go | 155 +++++++++--------- .../proto/{rpc => rpcpb}/query.proto | 2 +- src/query/tsdb/remote/client.go | 2 +- src/query/tsdb/remote/codecs.go | 2 +- src/query/tsdb/remote/codecs_test.go | 2 +- src/query/tsdb/remote/compressed_codecs.go | 2 +- .../tsdb/remote/compressed_codecs_test.go | 2 +- src/query/tsdb/remote/server.go | 2 +- 13 files changed, 199 insertions(+), 202 deletions(-) rename src/query/generated/proto/{rpc => rpcpb}/query.pb.go (92%) rename src/query/generated/proto/{rpc => rpcpb}/query.proto (99%) diff --git a/src/query/generated/proto/admin/database.pb.go b/src/query/generated/proto/admin/database.pb.go index 5cd857f2e8..9c8ce46539 100644 --- a/src/query/generated/proto/admin/database.pb.go +++ b/src/query/generated/proto/admin/database.pb.go @@ -1315,38 +1315,37 @@ func init() { } var fileDescriptorDatabase = []byte{ - // 513 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0xc5, 0x69, 0x92, 0xca, 0x13, 0x25, 0x94, 0x91, 0xa8, 0x2c, 0x10, 0x21, 0x04, 0x21, 0xb2, - 0x21, 0x96, 0xd2, 0x15, 0xdb, 0x52, 0xd1, 0x82, 0x50, 0x55, 0x39, 0xec, 0xad, 0xb1, 0xe7, 0x92, - 0x8c, 0xc8, 0x3c, 0x98, 0x19, 0x0b, 0xc8, 0x47, 0x20, 0xb6, 0x88, 0x1f, 0x62, 0xc9, 0x27, 0xa0, - 0xf0, 0x23, 0xc8, 0x37, 0xf6, 0x14, 0xd8, 0x76, 0x63, 0x9d, 0x39, 0xf7, 0xdc, 0xd7, 0xf1, 0x25, - 0xaf, 0x56, 0xc2, 0xaf, 0xab, 0x62, 0x5e, 0x6a, 0x99, 0xca, 0x13, 0x5e, 0xec, 0x3f, 0xce, 0x96, - 0x69, 0xa9, 0xb5, 0xe5, 0x42, 0x31, 0xaf, 0x6d, 0xba, 0x02, 0x05, 0x96, 0x79, 0xe0, 0xa9, 0xb1, - 0xda, 0xeb, 0x94, 0x71, 0x29, 0x54, 0xca, 0x99, 0x67, 0x05, 0x73, 0x30, 0x47, 0x92, 0xf6, 0x90, - 0xbd, 0xf7, 0xfa, 0x06, 0x15, 0x15, 0x93, 0xe0, 0x0c, 0x2b, 0x9b, 0x92, 0x37, 0xaa, 0x65, 0x36, - 0xac, 0x04, 0x09, 0xca, 0xef, 0x6b, 0x4d, 0xbf, 0x77, 0xc8, 0xdd, 0xb3, 0x66, 0xe2, 0x17, 0x16, - 0x98, 0x87, 0x0c, 0x3e, 0x54, 0xe0, 0x3c, 0x7d, 0x42, 0x46, 0xa1, 0x71, 0x5e, 0xa3, 0x24, 0x9a, - 0x44, 0xb3, 0x38, 0x1b, 0x06, 0xf6, 0x92, 0x49, 0xa0, 0x94, 0x74, 0xfd, 0x67, 0x03, 0x49, 0x07, - 0x83, 0x88, 0xe9, 0x03, 0x42, 0x54, 0x25, 0x73, 0xb7, 0x66, 0x96, 0xbb, 0xe4, 0x60, 0x12, 0xcd, - 0x7a, 0x59, 0xac, 0x2a, 0xb9, 0x44, 0x82, 0x3e, 0x23, 0xd4, 0x82, 0xd9, 0x88, 0x92, 0x79, 0xa1, - 0x55, 0xfe, 0x8e, 0x95, 0x5e, 0xdb, 0xa4, 0x8b, 0xb2, 0x3b, 0x7f, 0x45, 0x5e, 0x62, 0xa0, 0x1e, - 0xc4, 0x82, 0x07, 0x85, 0x62, 0x2f, 0x24, 0x24, 0xbd, 0xfd, 0x20, 0x81, 0x7d, 0x2b, 0x24, 0xd0, - 0x94, 0x90, 0x62, 0xa3, 0xcb, 0xf7, 0xb9, 0x13, 0x5b, 0x48, 0xfa, 0x93, 0x68, 0x36, 0x58, 0x1c, - 0xcd, 0x71, 0xeb, 0xf9, 0x69, 0x1d, 0x58, 0x8a, 0x2d, 0x64, 0x71, 0xd1, 0x42, 0xfa, 0x88, 0xf4, - 0xd6, 0xda, 0x79, 0x97, 0x1c, 0x4e, 0x0e, 0x66, 0x83, 0xc5, 0xa0, 0xd1, 0x5e, 0x68, 0xe7, 0xb3, - 0x7d, 0x64, 0x2a, 0x49, 0x1c, 0x52, 0x71, 0x53, 0x11, 0x6c, 0x40, 0x4c, 0xdf, 0x90, 0xc7, 0xf0, - 0xc9, 0x40, 0xe9, 0x81, 0xe7, 0x0e, 0xac, 0x00, 0x97, 0xd7, 0xff, 0xdf, 0x68, 0xa1, 0xbc, 0xcb, - 0x0d, 0xd8, 0x7c, 0xad, 0x2b, 0x8b, 0xe6, 0x1c, 0x64, 0x0f, 0x5b, 0xe9, 0x12, 0x95, 0x67, 0x41, - 0x78, 0x05, 0xf6, 0x42, 0x57, 0x76, 0xfa, 0x2d, 0x22, 0xdd, 0xba, 0x3d, 0x1d, 0x91, 0x8e, 0xe0, - 0x4d, 0xa3, 0x8e, 0xe0, 0x34, 0x21, 0x87, 0x8c, 0x73, 0x0b, 0xce, 0x35, 0x3e, 0xb7, 0xcf, 0x7a, - 0x28, 0xa3, 0xad, 0x47, 0x93, 0x87, 0x19, 0x62, 0xfa, 0x94, 0xdc, 0x16, 0x4e, 0x6f, 0xf6, 0xee, - 0xae, 0xac, 0xae, 0x0c, 0x9a, 0x1b, 0x67, 0xa3, 0x40, 0x9f, 0xd7, 0x6c, 0x9d, 0xbc, 0xd5, 0xaa, - 0xf5, 0x13, 0x31, 0x3d, 0x26, 0xfd, 0x8f, 0x20, 0x56, 0x6b, 0x8f, 0x16, 0x0e, 0xb3, 0xe6, 0x35, - 0xfd, 0x12, 0x91, 0xe3, 0xff, 0x0f, 0xc5, 0x19, 0xad, 0x1c, 0xd0, 0xe7, 0x24, 0x0e, 0x37, 0x81, - 0x43, 0x0f, 0x16, 0xf7, 0x1b, 0x33, 0x2f, 0x5b, 0xfe, 0x1c, 0x7c, 0xab, 0xcf, 0xae, 0xd5, 0x75, - 0x6a, 0xb8, 0x48, 0x5c, 0xed, 0x3a, 0xf5, 0xaa, 0xe5, 0xff, 0x49, 0x0d, 0xea, 0xd3, 0xa3, 0x1f, - 0xbb, 0x71, 0xf4, 0x73, 0x37, 0x8e, 0x7e, 0xed, 0xc6, 0xd1, 0xd7, 0xdf, 0xe3, 0x5b, 0x45, 0x1f, - 0x4f, 0xfa, 0xe4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xb6, 0xa9, 0xdc, 0xbe, 0x03, 0x00, - 0x00, + // 510 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xfd, 0x9c, 0xbf, 0xca, 0x13, 0x25, 0x5f, 0x19, 0x89, 0xca, 0x02, 0x11, 0x42, 0x10, 0x22, + 0x1b, 0x62, 0x29, 0x5d, 0xb1, 0x6d, 0x23, 0xda, 0x05, 0xaa, 0x2a, 0x87, 0xbd, 0x35, 0xb6, 0x2f, + 0xc9, 0x88, 0xcc, 0x4f, 0x67, 0xc6, 0x82, 0xe6, 0x21, 0x10, 0x5b, 0xc4, 0x0b, 0xb1, 0xe4, 0x11, + 0x50, 0x78, 0x11, 0xe4, 0x6b, 0x7b, 0x0a, 0x2c, 0xbb, 0xb1, 0xce, 0x9c, 0x7b, 0xee, 0xdf, 0xf1, + 0x25, 0xe7, 0x1b, 0xee, 0xb6, 0x65, 0xb6, 0xc8, 0x95, 0x88, 0xc5, 0x69, 0x91, 0xd5, 0x1f, 0x6b, + 0xf2, 0xf8, 0xa6, 0x04, 0x73, 0x1b, 0x6f, 0x40, 0x82, 0x61, 0x0e, 0x8a, 0x58, 0x1b, 0xe5, 0x54, + 0xcc, 0x0a, 0xc1, 0x65, 0x5c, 0x30, 0xc7, 0x32, 0x66, 0x61, 0x81, 0x24, 0xed, 0x23, 0xfb, 0x68, + 0x75, 0xaf, 0x5a, 0x92, 0x09, 0xb0, 0x9a, 0xe5, 0x4d, 0xb1, 0x7b, 0x56, 0xd1, 0x3b, 0x96, 0x83, + 0x00, 0xe9, 0xea, 0x2a, 0xb3, 0x6f, 0x1d, 0xf2, 0x70, 0xd5, 0x4c, 0x79, 0x6e, 0x80, 0x39, 0x48, + 0xe0, 0xa6, 0x04, 0xeb, 0xe8, 0x0b, 0x32, 0xf6, 0x2d, 0xd3, 0x0a, 0x45, 0xc1, 0x34, 0x98, 0x87, + 0xc9, 0xc8, 0xb3, 0x57, 0x4c, 0x00, 0xa5, 0xa4, 0xe7, 0x6e, 0x35, 0x44, 0x1d, 0x0c, 0x22, 0xa6, + 0x4f, 0x08, 0x91, 0xa5, 0x48, 0xed, 0x96, 0x99, 0xc2, 0x46, 0xdd, 0x69, 0x30, 0xef, 0x27, 0xa1, + 0x2c, 0xc5, 0x1a, 0x09, 0xfa, 0x8a, 0x50, 0x03, 0x7a, 0xc7, 0x73, 0xe6, 0xb8, 0x92, 0xe9, 0x7b, + 0x96, 0x3b, 0x65, 0xa2, 0x1e, 0xca, 0x1e, 0xfc, 0x11, 0x79, 0x83, 0x81, 0x6a, 0x10, 0x03, 0x0e, + 0x24, 0x8a, 0x1d, 0x17, 0x10, 0xf5, 0xeb, 0x41, 0x3c, 0xfb, 0x8e, 0x0b, 0xa0, 0x31, 0x21, 0xd9, + 0x4e, 0xe5, 0x1f, 0x52, 0xcb, 0xf7, 0x10, 0x0d, 0xa6, 0xc1, 0x7c, 0xb8, 0x3c, 0x5e, 0xe0, 0xd6, + 0x8b, 0xb3, 0x2a, 0xb0, 0xe6, 0x7b, 0x48, 0xc2, 0xac, 0x85, 0xf4, 0x19, 0xe9, 0x6f, 0x95, 0x75, + 0x36, 0x3a, 0x9a, 0x76, 0xe7, 0xc3, 0xe5, 0xb0, 0xd1, 0x5e, 0x2a, 0xeb, 0x92, 0x3a, 0x32, 0x13, + 0x24, 0xf4, 0xa9, 0xb8, 0x29, 0xf7, 0x36, 0x20, 0xa6, 0x6f, 0xc9, 0x73, 0xf8, 0xa4, 0x21, 0x77, + 0x50, 0xa4, 0x16, 0x0c, 0x07, 0x9b, 0x56, 0xff, 0x5c, 0x2b, 0x2e, 0x9d, 0x4d, 0x35, 0x98, 0x74, + 0xab, 0x4a, 0x83, 0xe6, 0x74, 0x93, 0xa7, 0xad, 0x74, 0x8d, 0xca, 0x95, 0x17, 0x5e, 0x83, 0xb9, + 0x54, 0xa5, 0x99, 0x7d, 0x0d, 0x48, 0xaf, 0x6a, 0x4f, 0xc7, 0xa4, 0xc3, 0x8b, 0xa6, 0x51, 0x87, + 0x17, 0x34, 0x22, 0x47, 0xac, 0x28, 0x0c, 0x58, 0xdb, 0xf8, 0xdc, 0x3e, 0xab, 0xa1, 0xb4, 0x32, + 0x0e, 0x4d, 0x1e, 0x25, 0x88, 0xe9, 0x4b, 0xf2, 0x3f, 0xb7, 0x6a, 0x57, 0xbb, 0xbb, 0x31, 0xaa, + 0xd4, 0x68, 0x6e, 0x98, 0x8c, 0x3d, 0x7d, 0x51, 0xb1, 0x55, 0xf2, 0x5e, 0xc9, 0xd6, 0x4f, 0xc4, + 0xf4, 0x84, 0x0c, 0x3e, 0x02, 0xdf, 0x6c, 0x1d, 0x5a, 0x38, 0x4a, 0x9a, 0xd7, 0xec, 0x73, 0x40, + 0x4e, 0xfe, 0x3d, 0x14, 0xab, 0x95, 0xb4, 0x40, 0x5f, 0x93, 0xd0, 0xdf, 0x04, 0x0e, 0x3d, 0x5c, + 0x3e, 0x6e, 0xcc, 0xbc, 0x6a, 0xf9, 0x0b, 0x70, 0xad, 0x3e, 0xb9, 0x53, 0x57, 0xa9, 0xfe, 0x22, + 0x71, 0xb5, 0xbb, 0xd4, 0xeb, 0x96, 0xff, 0x2b, 0xd5, 0xab, 0xcf, 0x8e, 0xbf, 0x1f, 0x26, 0xc1, + 0x8f, 0xc3, 0x24, 0xf8, 0x79, 0x98, 0x04, 0x5f, 0x7e, 0x4d, 0xfe, 0xcb, 0x06, 0x78, 0xd2, 0xa7, + 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x52, 0x61, 0x77, 0x5d, 0xac, 0x03, 0x00, 0x00, } diff --git a/src/query/generated/proto/admin/namespace.pb.go b/src/query/generated/proto/admin/namespace.pb.go index f8dd7bb652..94ca21149b 100644 --- a/src/query/generated/proto/admin/namespace.pb.go +++ b/src/query/generated/proto/admin/namespace.pb.go @@ -492,20 +492,20 @@ func init() { } var fileDescriptorNamespace = []byte{ - // 238 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xcf, 0x3f, 0x4a, 0x04, 0x31, - 0x14, 0x06, 0x70, 0x23, 0xfe, 0x8d, 0x8d, 0x64, 0x2d, 0x16, 0x85, 0x41, 0xb6, 0xb2, 0x9a, 0x80, - 0x8b, 0x07, 0xd0, 0x66, 0xd1, 0x42, 0x21, 0x27, 0x30, 0x33, 0xef, 0x31, 0xa6, 0x48, 0x5e, 0x4c, - 0xde, 0x16, 0xde, 0xc2, 0x63, 0x59, 0x7a, 0x04, 0x19, 0x2f, 0x22, 0x66, 0xdd, 0x28, 0x8a, 0x4d, - 0x08, 0x5f, 0xbe, 0xef, 0x07, 0x91, 0x37, 0x83, 0xe3, 0x87, 0x65, 0xd7, 0xf6, 0xe4, 0xb5, 0x9f, - 0x43, 0xb7, 0x3a, 0x72, 0xea, 0x75, 0x4f, 0x94, 0xc0, 0x05, 0xcb, 0x94, 0xf4, 0x80, 0x01, 0x93, - 0x65, 0x04, 0x1d, 0x13, 0x31, 0x69, 0x0b, 0xde, 0x05, 0x1d, 0xac, 0xc7, 0x1c, 0x6d, 0x8f, 0x6d, - 0x49, 0xd5, 0x76, 0x89, 0x8f, 0xaf, 0xff, 0x25, 0xa1, 0x0b, 0x04, 0xf8, 0x47, 0xab, 0xce, 0x6f, - 0x71, 0xb6, 0x90, 0x47, 0xb7, 0xeb, 0x68, 0x81, 0x6c, 0x30, 0x47, 0x0a, 0x19, 0x95, 0x96, 0x7b, - 0x09, 0x07, 0x97, 0x39, 0x3d, 0x4d, 0xc5, 0xa9, 0x38, 0x3b, 0x38, 0x9f, 0xb4, 0xdf, 0x5b, 0xf3, - 0xf5, 0x64, 0x6a, 0x69, 0x76, 0x2f, 0x27, 0x15, 0xba, 0x04, 0x30, 0xf8, 0xb8, 0xc4, 0xcc, 0x4a, - 0xc9, 0xad, 0xcf, 0x59, 0x31, 0xf6, 0x4d, 0xb9, 0xab, 0x0b, 0xb9, 0x4b, 0x91, 0x1d, 0x85, 0x3c, - 0xdd, 0x2c, 0xf4, 0xc9, 0x0f, 0xba, 0x22, 0x77, 0xab, 0x8a, 0x59, 0x77, 0xaf, 0x0e, 0x5f, 0xc6, - 0x46, 0xbc, 0x8e, 0x8d, 0x78, 0x1b, 0x1b, 0xf1, 0xfc, 0xde, 0x6c, 0x74, 0x3b, 0xe5, 0x0f, 0xf3, - 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x22, 0x2c, 0x00, 0x63, 0x01, 0x00, 0x00, + // 233 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcf, 0x2c, 0xc9, + 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0x35, 0x4e, 0x49, 0x82, 0x10, 0xc5, 0x45, 0xc9, + 0xfa, 0x85, 0xa5, 0xa9, 0x45, 0x95, 0xfa, 0xe9, 0xa9, 0x79, 0xa9, 0x45, 0x89, 0x25, 0xa9, 0x29, + 0xfa, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0xfa, 0x89, 0x29, 0xb9, 0x99, 0x79, 0xfa, 0x79, 0x89, 0xb9, + 0xa9, 0xc5, 0x05, 0x89, 0xc9, 0xa9, 0x7a, 0x60, 0x51, 0x21, 0x56, 0xb0, 0xb0, 0x94, 0x27, 0x4e, + 0xc3, 0x52, 0x92, 0xf2, 0xf2, 0x53, 0x52, 0x31, 0x4c, 0x83, 0x9b, 0x83, 0x6e, 0xa2, 0x92, 0x3b, + 0x97, 0x88, 0x1f, 0x4c, 0xc8, 0x3d, 0xb5, 0x24, 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, + 0x48, 0x9f, 0x8b, 0xa3, 0x28, 0x35, 0x3d, 0xb3, 0xb8, 0xa4, 0xa8, 0x52, 0x82, 0x51, 0x81, 0x51, + 0x83, 0xdb, 0x48, 0x58, 0x0f, 0xa1, 0x37, 0x08, 0x2a, 0x15, 0x04, 0x57, 0xa4, 0x94, 0xc0, 0x25, + 0x0c, 0x37, 0xc8, 0x31, 0x25, 0x25, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48, 0x88, 0x8b, + 0x05, 0xa4, 0x0d, 0x6c, 0x06, 0x67, 0x10, 0x98, 0x2d, 0x64, 0xca, 0xc5, 0x9e, 0x5f, 0x50, 0x92, + 0x99, 0x9f, 0x57, 0x2c, 0xc1, 0x04, 0x36, 0x5a, 0x1a, 0xc9, 0x68, 0xb8, 0x21, 0xfe, 0x10, 0x25, + 0x41, 0x30, 0xb5, 0x4e, 0x02, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, + 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x49, 0x6c, 0x60, 0x3f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x23, 0xf0, 0x8c, 0x73, 0x5d, 0x01, 0x00, 0x00, } diff --git a/src/query/generated/proto/admin/placement.pb.go b/src/query/generated/proto/admin/placement.pb.go index 1b27f53de4..d1f6a8140f 100644 --- a/src/query/generated/proto/admin/placement.pb.go +++ b/src/query/generated/proto/admin/placement.pb.go @@ -692,24 +692,24 @@ func init() { } var fileDescriptorPlacement = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x90, 0x4f, 0x4a, 0x03, 0x31, - 0x18, 0xc5, 0x8d, 0xa5, 0x4a, 0xd3, 0x8d, 0xc6, 0x3f, 0x0c, 0x82, 0x43, 0xe9, 0xaa, 0x1b, 0x67, - 0xa0, 0xf5, 0x02, 0x0a, 0x2a, 0xed, 0x4a, 0xc6, 0x03, 0x94, 0x4c, 0xf2, 0xb5, 0x0d, 0x74, 0xbe, - 0x8c, 0xc9, 0x37, 0x9e, 0xc3, 0xad, 0x37, 0x72, 0xe9, 0x11, 0xa4, 0x5e, 0x44, 0x88, 0xed, 0x74, - 0xb4, 0x4b, 0x37, 0x81, 0xbc, 0xf7, 0xbe, 0x1f, 0x8f, 0xc7, 0x27, 0x73, 0x43, 0x8b, 0x2a, 0x4f, - 0x94, 0x2d, 0xd2, 0x62, 0xa4, 0xf3, 0x9f, 0xc7, 0x3b, 0x95, 0x2a, 0x6b, 0x9d, 0x36, 0x28, 0xc9, - 0xba, 0x74, 0x0e, 0x08, 0x4e, 0x12, 0xe8, 0xb4, 0x74, 0x96, 0x6c, 0x2a, 0x75, 0x61, 0x30, 0x2d, - 0x97, 0x52, 0x41, 0x01, 0x48, 0x49, 0x50, 0x45, 0x3b, 0xc8, 0x17, 0x77, 0xbb, 0x48, 0xb5, 0xac, - 0x3c, 0xc1, 0x2e, 0xa7, 0x26, 0x94, 0xf9, 0x5f, 0x5a, 0xff, 0x8d, 0xf1, 0xd3, 0xc7, 0x8d, 0x36, - 0x46, 0x43, 0x19, 0x3c, 0x57, 0xe0, 0x49, 0x8c, 0x78, 0xc7, 0xa0, 0x27, 0x89, 0x0a, 0x7c, 0xc4, - 0x7a, 0xad, 0x41, 0x77, 0x78, 0x96, 0x34, 0x48, 0xc9, 0x78, 0xed, 0x66, 0xdb, 0x9c, 0xb8, 0xe4, - 0x1c, 0xab, 0x62, 0xea, 0x17, 0xd2, 0x69, 0x1f, 0xed, 0xf7, 0xd8, 0xa0, 0x9d, 0x75, 0xb0, 0x2a, - 0x9e, 0x82, 0x20, 0xae, 0xb8, 0x70, 0x50, 0x2e, 0x8d, 0x92, 0x64, 0x2c, 0x4e, 0x67, 0x52, 0x91, - 0x75, 0x51, 0x2b, 0xc4, 0x8e, 0x1b, 0xce, 0x7d, 0x30, 0xfa, 0xb3, 0x46, 0xb5, 0x07, 0xa0, 0x0c, - 0x7c, 0x69, 0xd1, 0x83, 0xb8, 0xe6, 0x9d, 0xba, 0x48, 0xc4, 0x7a, 0x6c, 0xd0, 0x1d, 0x9e, 0xff, - 0xaa, 0x56, 0x5f, 0x65, 0xdb, 0xa0, 0x88, 0xf8, 0xe1, 0x0b, 0x38, 0x6f, 0x2c, 0xae, 0x8b, 0x6d, - 0xbe, 0xfd, 0x09, 0x3f, 0xa9, 0x2f, 0x6e, 0xb4, 0xfe, 0xcf, 0x02, 0xb7, 0x47, 0xef, 0xab, 0x98, - 0x7d, 0xac, 0x62, 0xf6, 0xb9, 0x8a, 0xd9, 0xeb, 0x57, 0xbc, 0x97, 0x1f, 0x84, 0xa1, 0x47, 0xdf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xef, 0x0a, 0xfd, 0x04, 0x02, 0x00, 0x00, + // 299 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x90, 0x4d, 0x4a, 0x03, 0x31, + 0x1c, 0xc5, 0x8d, 0xa5, 0x4a, 0xd3, 0x8d, 0xc6, 0x0f, 0x06, 0xc1, 0xa1, 0x74, 0xd5, 0x8d, 0x13, + 0x68, 0xbd, 0x80, 0xe2, 0x07, 0x75, 0x25, 0xe3, 0x01, 0x4a, 0x26, 0xf9, 0xb7, 0x0d, 0x34, 0xc9, + 0x34, 0x1f, 0x82, 0xb7, 0x70, 0xeb, 0x8d, 0x5c, 0x7a, 0x04, 0x19, 0x2f, 0x22, 0xc4, 0x76, 0x3a, + 0xda, 0xa5, 0x9b, 0x40, 0xde, 0x7b, 0xff, 0x1f, 0x8f, 0x87, 0x6f, 0x66, 0xd2, 0xcf, 0x43, 0x91, + 0x71, 0xa3, 0xa8, 0x1a, 0x89, 0xe2, 0xe7, 0x71, 0x96, 0xd3, 0x65, 0x00, 0xfb, 0x42, 0x67, 0xa0, + 0xc1, 0x32, 0x0f, 0x82, 0x96, 0xd6, 0x78, 0x43, 0x99, 0x50, 0x52, 0xd3, 0x72, 0xc1, 0x38, 0x28, + 0xd0, 0x3e, 0x8b, 0x2a, 0x69, 0x47, 0xf9, 0xec, 0x76, 0x1b, 0xc6, 0x17, 0xc1, 0x79, 0xb0, 0x5b, + 0x9c, 0x9a, 0x50, 0x16, 0x7f, 0x69, 0xfd, 0x37, 0x84, 0x8f, 0x1f, 0xd7, 0xda, 0x58, 0x4b, 0x9f, + 0xc3, 0x32, 0x80, 0xf3, 0x64, 0x84, 0x3b, 0x52, 0x3b, 0xcf, 0x34, 0x07, 0x97, 0xa0, 0x5e, 0x6b, + 0xd0, 0x1d, 0x9e, 0x64, 0x0d, 0x52, 0x36, 0x5e, 0xb9, 0xf9, 0x26, 0x47, 0xce, 0x31, 0xd6, 0x41, + 0x4d, 0xdc, 0x9c, 0x59, 0xe1, 0x92, 0xdd, 0x1e, 0x1a, 0xb4, 0xf3, 0x8e, 0x0e, 0xea, 0x29, 0x0a, + 0xe4, 0x02, 0x13, 0x0b, 0xe5, 0x42, 0x72, 0xe6, 0xa5, 0xd1, 0x93, 0x29, 0xe3, 0xde, 0xd8, 0xa4, + 0x15, 0x63, 0x87, 0x0d, 0xe7, 0x2e, 0x1a, 0xfd, 0x69, 0xa3, 0xda, 0x3d, 0xf8, 0x1c, 0x5c, 0x69, + 0xb4, 0x03, 0x72, 0x89, 0x3b, 0x75, 0x91, 0x04, 0xf5, 0xd0, 0xa0, 0x3b, 0x3c, 0xfd, 0x55, 0xad, + 0xbe, 0xca, 0x37, 0x41, 0x92, 0xe0, 0xfd, 0x67, 0xb0, 0x4e, 0x1a, 0xbd, 0x2a, 0xb6, 0xfe, 0xf6, + 0x1f, 0xf0, 0x51, 0x7d, 0x71, 0x25, 0xc4, 0x7f, 0x16, 0xb8, 0x3e, 0x78, 0xaf, 0x52, 0xf4, 0x51, + 0xa5, 0xe8, 0xb3, 0x4a, 0xd1, 0xeb, 0x57, 0xba, 0x53, 0xec, 0xc5, 0xa1, 0x47, 0xdf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x15, 0xc2, 0x2d, 0xdc, 0xfe, 0x01, 0x00, 0x00, } diff --git a/src/query/generated/proto/prompb/remote.pb.go b/src/query/generated/proto/prompb/remote.pb.go index 1dacd15e73..6be9610137 100644 --- a/src/query/generated/proto/prompb/remote.pb.go +++ b/src/query/generated/proto/prompb/remote.pb.go @@ -964,26 +964,26 @@ func init() { } var fileDescriptorRemote = []byte{ - // 333 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xcf, 0x4a, 0xf3, 0x40, - 0x14, 0xc5, 0xbf, 0x7c, 0xc5, 0x56, 0x6e, 0x8b, 0xd4, 0x2c, 0x34, 0xb8, 0x08, 0x92, 0x55, 0x41, - 0x49, 0xd0, 0x8a, 0x0b, 0x77, 0x0a, 0xfe, 0x59, 0xd8, 0x85, 0x63, 0x41, 0x70, 0x53, 0x26, 0xc9, - 0xa5, 0x0d, 0x74, 0x32, 0xe9, 0xdc, 0x9b, 0x45, 0xdf, 0xc2, 0x8d, 0xef, 0xe4, 0xd2, 0x47, 0x90, - 0xfa, 0x22, 0xd2, 0x09, 0xd1, 0x88, 0x3b, 0xdd, 0xdc, 0xc5, 0x3d, 0xbf, 0x73, 0xe6, 0x30, 0x17, - 0x6e, 0xa6, 0x19, 0xcf, 0xca, 0x38, 0x4c, 0xb4, 0x8a, 0xd4, 0x30, 0x8d, 0xab, 0x41, 0x26, 0x89, - 0x12, 0xad, 0x4d, 0x9a, 0xe5, 0x92, 0xb5, 0x89, 0xa6, 0x98, 0xa3, 0x91, 0x8c, 0x69, 0x54, 0x18, - 0xcd, 0x7a, 0x3d, 0x55, 0x11, 0x47, 0x06, 0x95, 0x66, 0x0c, 0xed, 0xce, 0x85, 0xf5, 0x12, 0x79, - 0x86, 0x25, 0xed, 0x5d, 0xff, 0x25, 0x95, 0x97, 0x05, 0x52, 0x15, 0x1a, 0x5c, 0x41, 0xef, 0xc1, - 0x64, 0x8c, 0x02, 0x17, 0x25, 0x12, 0xbb, 0xa7, 0x00, 0x9c, 0x29, 0x24, 0x34, 0x19, 0x92, 0xe7, - 0xec, 0xb7, 0x06, 0xdd, 0xe3, 0x9d, 0xf0, 0xeb, 0xe5, 0x70, 0x9c, 0x29, 0xbc, 0xb7, 0xaa, 0x68, - 0x90, 0xc1, 0x19, 0x74, 0x05, 0xca, 0xb4, 0x8e, 0x39, 0x80, 0xce, 0xa2, 0x6c, 0x66, 0x6c, 0x37, - 0x33, 0xee, 0x4a, 0x34, 0x4b, 0x51, 0x13, 0xc1, 0x39, 0xf4, 0x2a, 0x2f, 0x15, 0x3a, 0x27, 0x74, - 0x8f, 0xa0, 0x63, 0x90, 0xca, 0x39, 0xd7, 0xe6, 0xdd, 0x9f, 0x66, 0xab, 0x8b, 0x9a, 0x0b, 0x9e, - 0x1d, 0xd8, 0xb0, 0x82, 0x7b, 0x08, 0x2e, 0xb1, 0x34, 0x3c, 0xb1, 0xe5, 0x58, 0xaa, 0x62, 0xa2, - 0xd6, 0x39, 0xce, 0xa0, 0x25, 0xfa, 0x56, 0x19, 0xd7, 0xc2, 0x88, 0xdc, 0x01, 0xf4, 0x31, 0x4f, - 0xbf, 0xb3, 0xff, 0x2d, 0xbb, 0x85, 0x79, 0xda, 0x24, 0x4f, 0x60, 0x53, 0x49, 0x4e, 0x66, 0x68, - 0xc8, 0x6b, 0xd9, 0x56, 0x5e, 0xb3, 0xd5, 0xad, 0x8c, 0x71, 0x3e, 0xaa, 0x00, 0xf1, 0x49, 0x06, - 0x97, 0xd0, 0x6d, 0xf4, 0xfd, 0xed, 0xef, 0x5e, 0x78, 0x2f, 0x2b, 0xdf, 0x79, 0x5d, 0xf9, 0xce, - 0xdb, 0xca, 0x77, 0x9e, 0xde, 0xfd, 0x7f, 0x8f, 0xed, 0xea, 0x96, 0x71, 0xdb, 0x9e, 0x71, 0xf8, - 0x11, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x78, 0x59, 0x7d, 0x67, 0x02, 0x00, 0x00, + // 326 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xb1, 0x4a, 0xc3, 0x50, + 0x14, 0x86, 0x8d, 0xc5, 0x56, 0x4e, 0x8b, 0xd4, 0x0c, 0x1a, 0x1c, 0x82, 0x64, 0x2a, 0x28, 0x09, + 0x5a, 0x71, 0x70, 0x6b, 0x41, 0x27, 0x3b, 0x78, 0x2d, 0x08, 0x2e, 0xe5, 0xa6, 0x39, 0xb4, 0x81, + 0xde, 0x24, 0xbd, 0xe7, 0x64, 0xe8, 0x5b, 0xb8, 0xf8, 0x4e, 0x8e, 0x3e, 0x82, 0xc4, 0x17, 0x91, + 0xdc, 0x10, 0x1b, 0x71, 0xeb, 0x72, 0x86, 0xf3, 0x7f, 0xff, 0x7f, 0x7f, 0xee, 0x81, 0xf1, 0x22, + 0xe6, 0x65, 0x1e, 0xfa, 0xf3, 0x54, 0x05, 0x6a, 0x18, 0x85, 0xd5, 0x20, 0x3d, 0x0f, 0xd6, 0x39, + 0xea, 0x4d, 0xb0, 0xc0, 0x04, 0xb5, 0x64, 0x8c, 0x82, 0x4c, 0xa7, 0x9c, 0x96, 0x53, 0x65, 0x61, + 0xa0, 0x51, 0xa5, 0x8c, 0xbe, 0xd9, 0xd9, 0x50, 0x2e, 0x91, 0x97, 0x98, 0xd3, 0xd9, 0x68, 0xb7, + 0x3c, 0xde, 0x64, 0x48, 0x55, 0x9c, 0xf7, 0x00, 0xbd, 0x17, 0x1d, 0x33, 0x0a, 0x5c, 0xe7, 0x48, + 0x6c, 0xdf, 0x02, 0x70, 0xac, 0x90, 0x50, 0xc7, 0x48, 0x8e, 0x75, 0xde, 0x1a, 0x74, 0xaf, 0x4f, + 0xfc, 0xed, 0x9b, 0xfe, 0x34, 0x56, 0xf8, 0x6c, 0x54, 0xd1, 0x20, 0xbd, 0x3b, 0xe8, 0x0a, 0x94, + 0x51, 0x1d, 0x73, 0x01, 0x9d, 0xb2, 0xc2, 0x36, 0xe3, 0xb8, 0x99, 0xf1, 0x54, 0xb6, 0x13, 0x35, + 0xe1, 0x8d, 0xa0, 0x57, 0x79, 0x29, 0x4b, 0x13, 0x42, 0xfb, 0x0a, 0x3a, 0x1a, 0x29, 0x5f, 0x71, + 0x6d, 0x3e, 0xfd, 0x6f, 0x36, 0xba, 0xa8, 0x39, 0xef, 0xdd, 0x82, 0x03, 0x23, 0xd8, 0x97, 0x60, + 0x13, 0x4b, 0xcd, 0x33, 0x53, 0x8e, 0xa5, 0xca, 0x66, 0xaa, 0xcc, 0xb1, 0x06, 0x2d, 0xd1, 0x37, + 0xca, 0xb4, 0x16, 0x26, 0x64, 0x0f, 0xa0, 0x8f, 0x49, 0xf4, 0x97, 0xdd, 0x37, 0xec, 0x11, 0x26, + 0x51, 0x93, 0xbc, 0x81, 0x43, 0x25, 0x79, 0xbe, 0x44, 0x4d, 0x4e, 0xcb, 0xb4, 0x72, 0x9a, 0xad, + 0x1e, 0x65, 0x88, 0xab, 0x49, 0x05, 0x88, 0x5f, 0xd2, 0xbb, 0x87, 0x6e, 0xa3, 0xef, 0xae, 0xbf, + 0x3b, 0x76, 0x3e, 0x0a, 0xd7, 0xfa, 0x2c, 0x5c, 0xeb, 0xab, 0x70, 0xad, 0xb7, 0x6f, 0x77, 0xef, + 0xb5, 0x5d, 0xdd, 0x32, 0x6c, 0x9b, 0x33, 0x0e, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x77, + 0xa0, 0x49, 0x5b, 0x02, 0x00, 0x00, } diff --git a/src/query/generated/proto/prompb/types.pb.go b/src/query/generated/proto/prompb/types.pb.go index 61e285eb0a..0cfada887c 100644 --- a/src/query/generated/proto/prompb/types.pb.go +++ b/src/query/generated/proto/prompb/types.pb.go @@ -1072,29 +1072,28 @@ func init() { } var fileDescriptorTypes = []byte{ - // 369 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0xca, 0xd3, 0x40, - 0x10, 0xc7, 0xbb, 0x49, 0xbe, 0x7c, 0x74, 0x14, 0x89, 0x8b, 0x87, 0x20, 0x1a, 0x4b, 0x4e, 0x11, - 0x34, 0xa1, 0xed, 0x49, 0xf0, 0x54, 0x08, 0x5e, 0xaa, 0xd0, 0x6d, 0x4f, 0xde, 0x36, 0xe9, 0x98, - 0x06, 0xb2, 0xdd, 0x90, 0xdd, 0x08, 0x7d, 0x0b, 0x2f, 0xbe, 0x53, 0x8f, 0x3e, 0x81, 0x48, 0x7d, - 0x11, 0xc9, 0x6e, 0x6b, 0x0b, 0x0a, 0xdf, 0x65, 0x98, 0xf9, 0xe7, 0xff, 0x9f, 0xf9, 0x91, 0x04, - 0x3e, 0x54, 0xb5, 0xde, 0xf5, 0x45, 0x5a, 0x4a, 0x91, 0x89, 0xf9, 0xb6, 0xb0, 0x45, 0x75, 0x65, - 0x56, 0x4a, 0xd9, 0x6d, 0xeb, 0x3d, 0xd7, 0xb2, 0xcb, 0x2a, 0xdc, 0x63, 0xc7, 0x35, 0x6e, 0xb3, - 0xb6, 0x93, 0x5a, 0x0e, 0x55, 0xb4, 0x45, 0xa6, 0x0f, 0x2d, 0xaa, 0xd4, 0x48, 0x14, 0x06, 0x0d, - 0xf5, 0x0e, 0x7b, 0xf5, 0xfc, 0xed, 0xcd, 0xd2, 0x4a, 0x56, 0xd2, 0xa6, 0x8a, 0xfe, 0x8b, 0x99, - 0xec, 0x8a, 0xa1, 0xb3, 0xd1, 0xf8, 0x3d, 0xf8, 0x6b, 0x2e, 0xda, 0x06, 0xe9, 0x33, 0xb8, 0xfb, - 0xca, 0x9b, 0x1e, 0x43, 0x32, 0x21, 0x09, 0x61, 0x76, 0xa0, 0x2f, 0x60, 0xac, 0x6b, 0x81, 0x4a, - 0x73, 0xd1, 0x86, 0xce, 0x84, 0x24, 0x2e, 0xbb, 0x0a, 0x31, 0x02, 0x6c, 0x6a, 0x81, 0x6b, 0xec, - 0x6a, 0x54, 0xf4, 0x35, 0xf8, 0x0d, 0x2f, 0xb0, 0x51, 0x21, 0x99, 0xb8, 0xc9, 0xa3, 0xd9, 0xd3, - 0xf4, 0xca, 0x95, 0x2e, 0x87, 0x27, 0xec, 0x6c, 0xa0, 0x6f, 0xe0, 0x5e, 0x99, 0xb3, 0x2a, 0x74, - 0x8c, 0x97, 0xde, 0x7a, 0x2d, 0x11, 0xbb, 0x58, 0xe2, 0x29, 0xdc, 0x99, 0x38, 0xa5, 0xe0, 0xed, - 0xb9, 0xb0, 0x88, 0x63, 0x66, 0xfa, 0x2b, 0xb7, 0x63, 0x44, 0x3b, 0xc4, 0xef, 0xc0, 0x5f, 0xda, - 0x53, 0xd9, 0x83, 0x54, 0x0b, 0xef, 0xf8, 0xf3, 0xd5, 0xe8, 0xc2, 0x16, 0x7f, 0x27, 0xf0, 0xd8, - 0xe8, 0x1f, 0xb9, 0x2e, 0x77, 0xd8, 0xd1, 0x29, 0x78, 0xc3, 0xdb, 0x36, 0x57, 0x9f, 0xcc, 0x5e, - 0xfe, 0x93, 0x3f, 0xfb, 0xd2, 0xcd, 0xa1, 0x45, 0x66, 0xac, 0x7f, 0x41, 0x9d, 0xff, 0x81, 0xba, - 0xb7, 0xa0, 0x09, 0x78, 0x43, 0x8e, 0xfa, 0xe0, 0xe4, 0xab, 0x60, 0x44, 0xef, 0xc1, 0xfd, 0x94, - 0xaf, 0x02, 0x32, 0x08, 0x2c, 0x0f, 0x1c, 0x23, 0xb0, 0x3c, 0x70, 0x17, 0xe1, 0xf1, 0x14, 0x91, - 0x1f, 0xa7, 0x88, 0xfc, 0x3a, 0x45, 0xe4, 0xdb, 0xef, 0x68, 0xf4, 0xd9, 0xb7, 0xff, 0x42, 0xe1, - 0x9b, 0x6f, 0x39, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x17, 0xd7, 0xfd, 0x55, 0x51, 0x02, 0x00, - 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6a, 0xdb, 0x40, + 0x10, 0x86, 0xbd, 0x92, 0x2c, 0xe3, 0x69, 0x29, 0xea, 0xd2, 0x83, 0x28, 0xad, 0x6a, 0x74, 0x52, + 0xa1, 0x95, 0xb0, 0x7d, 0x2a, 0xf4, 0x52, 0x83, 0x6e, 0x6e, 0xc0, 0x6b, 0x9f, 0x72, 0x93, 0xec, + 0x89, 0x2c, 0xd0, 0x5a, 0x8a, 0x76, 0x15, 0xf0, 0x5b, 0xe4, 0x92, 0x77, 0xf2, 0x31, 0x4f, 0x10, + 0x82, 0xf3, 0x22, 0x41, 0xbb, 0x76, 0x6c, 0x48, 0x20, 0x97, 0x61, 0xe6, 0xd7, 0xff, 0xcf, 0x7c, + 0x48, 0x82, 0x7f, 0x59, 0x2e, 0xd7, 0x4d, 0x1a, 0x2e, 0x4b, 0x1e, 0xf1, 0xf1, 0x2a, 0xd5, 0x45, + 0xd4, 0xcb, 0xe8, 0xba, 0xc1, 0x7a, 0x1b, 0x65, 0xb8, 0xc1, 0x3a, 0x91, 0xb8, 0x8a, 0xaa, 0xba, + 0x94, 0x65, 0x5b, 0x79, 0x95, 0x46, 0x72, 0x5b, 0xa1, 0x08, 0x95, 0x44, 0xa1, 0xd5, 0x50, 0xae, + 0xb1, 0x11, 0x5f, 0x7f, 0x9f, 0xad, 0xcb, 0xca, 0xac, 0xd4, 0xa9, 0xb4, 0xb9, 0x52, 0x93, 0x5e, + 0xd1, 0x76, 0x3a, 0xea, 0xff, 0x05, 0x7b, 0x9e, 0xf0, 0xaa, 0x40, 0xfa, 0x05, 0xba, 0x37, 0x49, + 0xd1, 0xa0, 0x4b, 0x06, 0x24, 0x20, 0x4c, 0x0f, 0xf4, 0x1b, 0xf4, 0x65, 0xce, 0x51, 0xc8, 0x84, + 0x57, 0xae, 0x31, 0x20, 0x81, 0xc9, 0x4e, 0x82, 0x8f, 0x00, 0x8b, 0x9c, 0xe3, 0x1c, 0xeb, 0x1c, + 0x05, 0xfd, 0x09, 0x76, 0x91, 0xa4, 0x58, 0x08, 0x97, 0x0c, 0xcc, 0xe0, 0xc3, 0xe8, 0x73, 0x78, + 0xe2, 0x0a, 0xa7, 0xed, 0x13, 0x76, 0x30, 0xd0, 0x5f, 0xd0, 0x13, 0xea, 0xac, 0x70, 0x0d, 0xe5, + 0xa5, 0xe7, 0x5e, 0x4d, 0xc4, 0x8e, 0x16, 0x7f, 0x08, 0x5d, 0x15, 0xa7, 0x14, 0xac, 0x4d, 0xc2, + 0x35, 0x62, 0x9f, 0xa9, 0xfe, 0xc4, 0x6d, 0x28, 0x51, 0x0f, 0xfe, 0x1f, 0xb0, 0xa7, 0xfa, 0x54, + 0xf4, 0x2e, 0xd5, 0xc4, 0xda, 0x3d, 0xfc, 0xe8, 0x1c, 0xd9, 0xfc, 0x3b, 0x02, 0x1f, 0x95, 0xfe, + 0x3f, 0x91, 0xcb, 0x35, 0xd6, 0x74, 0x08, 0x56, 0xfb, 0xb6, 0xd5, 0xd5, 0x4f, 0xa3, 0xef, 0xaf, + 0xf2, 0x07, 0x5f, 0xb8, 0xd8, 0x56, 0xc8, 0x94, 0xf5, 0x05, 0xd4, 0x78, 0x0b, 0xd4, 0x3c, 0x07, + 0x0d, 0xc0, 0x6a, 0x73, 0xd4, 0x06, 0x23, 0x9e, 0x39, 0x1d, 0xda, 0x03, 0xf3, 0x22, 0x9e, 0x39, + 0xa4, 0x15, 0x58, 0xec, 0x18, 0x4a, 0x60, 0xb1, 0x63, 0x4e, 0xdc, 0xdd, 0xde, 0x23, 0xf7, 0x7b, + 0x8f, 0x3c, 0xee, 0x3d, 0x72, 0xfb, 0xe4, 0x75, 0x2e, 0x6d, 0xfd, 0x2f, 0xa4, 0xb6, 0xfa, 0x96, + 0xe3, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x28, 0xca, 0x33, 0x4b, 0x02, 0x00, 0x00, } diff --git a/src/query/generated/proto/rpc/query.pb.go b/src/query/generated/proto/rpcpb/query.pb.go similarity index 92% rename from src/query/generated/proto/rpc/query.pb.go rename to src/query/generated/proto/rpcpb/query.pb.go index fb934bdf15..aa629196d1 100644 --- a/src/query/generated/proto/rpc/query.pb.go +++ b/src/query/generated/proto/rpcpb/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto +// source: github.com/m3db/m3db/src/query/generated/proto/rpcpb/query.proto // Copyright (c) 2018 Uber Technologies, Inc. // @@ -22,10 +22,10 @@ // THE SOFTWARE. /* - Package rpc is a generated protocol buffer package. + Package rpcpb is a generated protocol buffer package. It is generated from these files: - github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto + github.com/m3db/m3db/src/query/generated/proto/rpcpb/query.proto It has these top-level messages: WriteMessage @@ -46,7 +46,7 @@ Tag Series */ -package rpc +package rpcpb import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -527,23 +527,23 @@ func (m *Series) GetCompressed() *CompressedDatapoints { } func init() { - proto.RegisterType((*WriteMessage)(nil), "rpc.WriteMessage") - proto.RegisterType((*WriteQuery)(nil), "rpc.WriteQuery") - proto.RegisterType((*WriteOptions)(nil), "rpc.WriteOptions") - proto.RegisterType((*Datapoint)(nil), "rpc.Datapoint") - proto.RegisterType((*Datapoints)(nil), "rpc.Datapoints") - proto.RegisterType((*Error)(nil), "rpc.Error") - proto.RegisterType((*FetchMessage)(nil), "rpc.FetchMessage") - proto.RegisterType((*FetchQuery)(nil), "rpc.FetchQuery") - proto.RegisterType((*FetchOptions)(nil), "rpc.FetchOptions") - proto.RegisterType((*Matcher)(nil), "rpc.Matcher") - proto.RegisterType((*FetchResult)(nil), "rpc.FetchResult") - proto.RegisterType((*Segment)(nil), "rpc.Segment") - proto.RegisterType((*Segments)(nil), "rpc.Segments") - proto.RegisterType((*CompressedValuesReplica)(nil), "rpc.CompressedValuesReplica") - proto.RegisterType((*CompressedDatapoints)(nil), "rpc.CompressedDatapoints") - proto.RegisterType((*Tag)(nil), "rpc.Tag") - proto.RegisterType((*Series)(nil), "rpc.Series") + proto.RegisterType((*WriteMessage)(nil), "rpcpb.WriteMessage") + proto.RegisterType((*WriteQuery)(nil), "rpcpb.WriteQuery") + proto.RegisterType((*WriteOptions)(nil), "rpcpb.WriteOptions") + proto.RegisterType((*Datapoint)(nil), "rpcpb.Datapoint") + proto.RegisterType((*Datapoints)(nil), "rpcpb.Datapoints") + proto.RegisterType((*Error)(nil), "rpcpb.Error") + proto.RegisterType((*FetchMessage)(nil), "rpcpb.FetchMessage") + proto.RegisterType((*FetchQuery)(nil), "rpcpb.FetchQuery") + proto.RegisterType((*FetchOptions)(nil), "rpcpb.FetchOptions") + proto.RegisterType((*Matcher)(nil), "rpcpb.Matcher") + proto.RegisterType((*FetchResult)(nil), "rpcpb.FetchResult") + proto.RegisterType((*Segment)(nil), "rpcpb.Segment") + proto.RegisterType((*Segments)(nil), "rpcpb.Segments") + proto.RegisterType((*CompressedValuesReplica)(nil), "rpcpb.CompressedValuesReplica") + proto.RegisterType((*CompressedDatapoints)(nil), "rpcpb.CompressedDatapoints") + proto.RegisterType((*Tag)(nil), "rpcpb.Tag") + proto.RegisterType((*Series)(nil), "rpcpb.Series") } // Reference imports to suppress errors if they are not otherwise used. @@ -570,7 +570,7 @@ func NewQueryClient(cc *grpc.ClientConn) QueryClient { } func (c *queryClient) Fetch(ctx context.Context, in *FetchMessage, opts ...grpc.CallOption) (Query_FetchClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[0], c.cc, "/rpc.Query/Fetch", opts...) + stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[0], c.cc, "/rpcpb.Query/Fetch", opts...) if err != nil { return nil, err } @@ -602,7 +602,7 @@ func (x *queryFetchClient) Recv() (*FetchResult, error) { } func (c *queryClient) Write(ctx context.Context, opts ...grpc.CallOption) (Query_WriteClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[1], c.cc, "/rpc.Query/Write", opts...) + stream, err := grpc.NewClientStream(ctx, &_Query_serviceDesc.Streams[1], c.cc, "/rpcpb.Query/Write", opts...) if err != nil { return nil, err } @@ -694,7 +694,7 @@ func (x *queryWriteServer) Recv() (*WriteMessage, error) { } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "rpc.Query", + ServiceName: "rpcpb.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ @@ -709,7 +709,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto", + Metadata: "github.com/m3db/m3db/src/query/generated/proto/rpcpb/query.proto", } func (m *WriteMessage) Marshal() (dAtA []byte, err error) { @@ -3781,60 +3781,59 @@ var ( ) func init() { - proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/rpc/query.proto", fileDescriptorQuery) + proto.RegisterFile("github.com/m3db/m3db/src/query/generated/proto/rpcpb/query.proto", fileDescriptorQuery) } var fileDescriptorQuery = []byte{ - // 801 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4b, 0x8f, 0xe3, 0x44, - 0x10, 0xc6, 0xf1, 0x38, 0x93, 0x54, 0xcc, 0xcc, 0xd0, 0x5a, 0x09, 0xb3, 0x1a, 0xa2, 0x95, 0x79, - 0x05, 0x21, 0x1c, 0x34, 0x7b, 0x60, 0xe1, 0x82, 0x04, 0x59, 0x38, 0xad, 0x10, 0x3d, 0x11, 0x48, - 0xdc, 0x3a, 0x76, 0xad, 0x63, 0x6d, 0xfc, 0xa0, 0xbb, 0x83, 0x18, 0x7e, 0x05, 0x67, 0x7e, 0x11, - 0x27, 0xc4, 0x91, 0x23, 0x1a, 0xfe, 0x08, 0xea, 0xea, 0xf6, 0x23, 0x99, 0x01, 0xf6, 0x12, 0x55, - 0x57, 0x7d, 0xa9, 0xc7, 0xd7, 0x5f, 0x97, 0x61, 0x95, 0x17, 0x7a, 0xbb, 0xdf, 0x24, 0x69, 0x5d, - 0x2e, 0xcb, 0xc7, 0xd9, 0xc6, 0xfe, 0x28, 0x99, 0x2e, 0xd3, 0xba, 0x96, 0x59, 0x51, 0x09, 0x5d, - 0xcb, 0x65, 0x8e, 0x15, 0x4a, 0xa1, 0x31, 0x5b, 0x36, 0xb2, 0xd6, 0xf5, 0x52, 0x36, 0xe9, 0xf2, - 0x87, 0x3d, 0xca, 0x9b, 0x84, 0xce, 0xcc, 0x97, 0x4d, 0x1a, 0x6f, 0x20, 0xfc, 0x4e, 0x16, 0x1a, - 0x9f, 0xa1, 0x52, 0x22, 0x47, 0xf6, 0x0e, 0x04, 0x84, 0x89, 0xbc, 0x47, 0xde, 0x62, 0x76, 0x75, - 0x9e, 0xc8, 0x26, 0x4d, 0x08, 0xf1, 0x8d, 0x71, 0x73, 0x1b, 0x65, 0x1f, 0xc0, 0x69, 0xdd, 0xe8, - 0xa2, 0xae, 0x54, 0x34, 0x22, 0xe0, 0x6b, 0x3d, 0xf0, 0x6b, 0x1b, 0xe0, 0x2d, 0x22, 0xfe, 0xd3, - 0x03, 0xe8, 0x53, 0x30, 0x06, 0x27, 0xfb, 0xaa, 0xd0, 0x54, 0x21, 0xe0, 0x64, 0xb3, 0x39, 0x80, - 0xa8, 0xaa, 0x5a, 0x0b, 0xf3, 0x0f, 0x4a, 0x19, 0xf2, 0x81, 0x87, 0x25, 0x00, 0x99, 0xd0, 0xa2, - 0xa9, 0x8b, 0x4a, 0xab, 0xc8, 0x7f, 0xe4, 0x2f, 0x66, 0x57, 0x67, 0x54, 0x72, 0xd5, 0xba, 0xf9, - 0x00, 0xc1, 0x3e, 0x84, 0x13, 0x2d, 0x72, 0x15, 0x9d, 0x10, 0xf2, 0x8d, 0xa3, 0x29, 0x92, 0xb5, - 0xc8, 0xd5, 0xd3, 0x4a, 0xcb, 0x1b, 0x4e, 0xb0, 0x87, 0x1f, 0xc3, 0xb4, 0x73, 0xb1, 0x0b, 0xf0, - 0x5f, 0xa0, 0x25, 0x60, 0xca, 0x8d, 0xc9, 0x1e, 0x40, 0xf0, 0xa3, 0xd8, 0xed, 0x91, 0x1a, 0x9b, - 0x72, 0x7b, 0xf8, 0x74, 0xf4, 0xc4, 0x8b, 0xe7, 0x8e, 0x3e, 0x37, 0x33, 0x3b, 0x83, 0x51, 0x91, - 0xb9, 0xbf, 0x8e, 0x8a, 0x2c, 0xfe, 0x0c, 0xa6, 0x5d, 0x83, 0xec, 0x12, 0xa6, 0xba, 0x28, 0x51, - 0x69, 0x51, 0x36, 0x84, 0xf1, 0x79, 0xef, 0x38, 0x2c, 0xe2, 0xb9, 0x22, 0xf1, 0x73, 0x80, 0x55, - 0x3f, 0xd6, 0x21, 0x0d, 0xde, 0xff, 0xd2, 0xb0, 0x80, 0xf3, 0xe7, 0xc5, 0x4f, 0x98, 0x71, 0x54, - 0xf5, 0x6e, 0xdf, 0x71, 0x3b, 0xe1, 0xc7, 0xee, 0xf8, 0x4d, 0x08, 0x9e, 0x4a, 0x59, 0x4b, 0xd3, - 0x06, 0x1a, 0xc3, 0x0d, 0x61, 0x0f, 0x46, 0x26, 0x5f, 0xa2, 0x4e, 0xb7, 0xff, 0x29, 0x13, 0x42, - 0xbc, 0x8c, 0x4c, 0x08, 0x78, 0x47, 0x26, 0x19, 0x40, 0x9f, 0xc1, 0xf4, 0xa1, 0xb4, 0x90, 0xda, - 0x11, 0x65, 0x0f, 0xe6, 0x6e, 0xb0, 0xca, 0x28, 0x99, 0xcf, 0x8d, 0xc9, 0x12, 0x98, 0x69, 0x91, - 0x3f, 0x13, 0x3a, 0xdd, 0xa2, 0x6c, 0xa5, 0x11, 0x52, 0x19, 0xe7, 0xe4, 0x43, 0x80, 0xb9, 0xb1, - 0x61, 0xf9, 0x3b, 0x37, 0xf6, 0x15, 0x9c, 0x3a, 0xac, 0x11, 0x6a, 0x25, 0x4a, 0x74, 0x41, 0xb2, - 0xef, 0x97, 0x82, 0x41, 0xea, 0x9b, 0x06, 0x23, 0x9f, 0xfa, 0x22, 0x3b, 0xbe, 0x82, 0x19, 0x15, - 0xe2, 0xa8, 0xf6, 0x3b, 0xcd, 0xde, 0x82, 0xb1, 0x42, 0x59, 0x60, 0x7b, 0x6d, 0x33, 0x6a, 0xf1, - 0x9a, 0x5c, 0xdc, 0x85, 0xe2, 0x12, 0x4e, 0xaf, 0x31, 0x2f, 0xb1, 0xd2, 0x26, 0xe5, 0x16, 0x85, - 0xed, 0x2c, 0xe4, 0x64, 0x53, 0x19, 0x51, 0xec, 0xdc, 0xfb, 0x20, 0xdb, 0x88, 0x8a, 0xa8, 0x59, - 0x17, 0x65, 0x5b, 0xbf, 0x77, 0x98, 0xe8, 0x66, 0x57, 0xa7, 0x2f, 0xae, 0x8b, 0x9f, 0x31, 0x3a, - 0xb1, 0xd1, 0xce, 0x11, 0x7f, 0x0f, 0x13, 0x57, 0x4e, 0xb1, 0xb7, 0x61, 0x5c, 0xa2, 0xcc, 0x31, - 0x73, 0x57, 0x1a, 0xba, 0xfe, 0x28, 0xcc, 0x5d, 0x8c, 0x2d, 0x60, 0xb2, 0xaf, 0x1c, 0x6e, 0x34, - 0xa0, 0xba, 0xc5, 0x75, 0xd1, 0x78, 0x05, 0xaf, 0x7f, 0x51, 0x97, 0x8d, 0x44, 0xa5, 0x30, 0xfb, - 0xd6, 0xb0, 0xa4, 0x38, 0x36, 0xbb, 0x22, 0x15, 0xec, 0x7d, 0x98, 0x28, 0x57, 0xd6, 0x91, 0xf1, - 0xea, 0x30, 0x89, 0xe2, 0x5d, 0x38, 0xfe, 0xdd, 0x83, 0x07, 0x7d, 0x9a, 0xc1, 0x4b, 0xb8, 0x84, - 0xa9, 0xb9, 0x0f, 0xd5, 0x88, 0x14, 0x1d, 0x47, 0xbd, 0xe3, 0x90, 0x94, 0xd1, 0x31, 0x29, 0x11, - 0x9c, 0x62, 0x95, 0x0d, 0x08, 0x6b, 0x8f, 0xec, 0x5d, 0x38, 0x4b, 0xbb, 0x6a, 0x6b, 0xbb, 0x40, - 0x4c, 0xea, 0x23, 0x2f, 0x7b, 0x02, 0x13, 0x69, 0x87, 0x51, 0x51, 0x40, 0x13, 0x5c, 0xd2, 0x04, - 0xff, 0x32, 0x31, 0xef, 0xd0, 0xf1, 0x12, 0xfc, 0xb5, 0xc8, 0x0f, 0xa4, 0x15, 0xde, 0x27, 0xad, - 0xb0, 0x5d, 0x00, 0xbf, 0x7a, 0x30, 0xb6, 0x2a, 0x19, 0x48, 0x35, 0x34, 0x52, 0x65, 0xef, 0xc1, - 0x98, 0x30, 0xed, 0xe3, 0x3a, 0x3f, 0xdc, 0x04, 0x8a, 0xbb, 0x30, 0xbb, 0x74, 0xdb, 0xd0, 0x3e, - 0x8e, 0x09, 0xc1, 0xd6, 0x22, 0xb7, 0xcb, 0x8f, 0x7d, 0x02, 0xd0, 0x8f, 0x47, 0x03, 0xb7, 0x1b, - 0xf3, 0x3e, 0xe6, 0xf9, 0x00, 0x7c, 0x25, 0x20, 0xb0, 0xaf, 0x35, 0x81, 0x80, 0xc4, 0xce, 0x06, - 0x0f, 0xdc, 0xed, 0x8a, 0x87, 0x17, 0xbd, 0xcb, 0xbe, 0x85, 0x8f, 0x3c, 0xb6, 0x80, 0x80, 0xf6, - 0x26, 0x1b, 0x7c, 0x37, 0x5a, 0x3c, 0x90, 0x8b, 0xb6, 0xd1, 0xc2, 0xfb, 0xfc, 0xe2, 0xb7, 0xdb, - 0xb9, 0xf7, 0xc7, 0xed, 0xdc, 0xfb, 0xeb, 0x76, 0xee, 0xfd, 0xf2, 0xf7, 0xfc, 0x95, 0xcd, 0x98, - 0x3e, 0x5f, 0x8f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x0e, 0xe9, 0x10, 0x06, 0x07, 0x00, - 0x00, + // 800 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdb, 0x8e, 0x1b, 0x45, + 0x10, 0x65, 0xec, 0x1d, 0xaf, 0x5d, 0x36, 0xce, 0xa6, 0x89, 0xc4, 0x28, 0x84, 0x51, 0x34, 0x12, + 0xc1, 0xdc, 0xec, 0x95, 0x83, 0x04, 0x0a, 0x0f, 0x20, 0x48, 0xc2, 0x53, 0x84, 0xe8, 0xb5, 0xe0, + 0x0d, 0xa9, 0x3d, 0x53, 0x3b, 0x1e, 0xc5, 0x73, 0xa1, 0xbb, 0x8d, 0x58, 0xbe, 0x82, 0x4f, 0xe0, + 0x73, 0x78, 0xcc, 0x07, 0xf0, 0x80, 0x96, 0x1f, 0x41, 0x5d, 0xdd, 0x73, 0xf3, 0x2e, 0x22, 0x2f, + 0x56, 0x75, 0xd5, 0x99, 0xba, 0x9c, 0x3e, 0x5d, 0x86, 0xaf, 0xd2, 0x4c, 0xef, 0x0e, 0xdb, 0x65, + 0x5c, 0xe6, 0xab, 0xfc, 0x71, 0xb2, 0xb5, 0x3f, 0x4a, 0xc6, 0xab, 0x9f, 0x0f, 0x28, 0xaf, 0x56, + 0x29, 0x16, 0x28, 0x85, 0xc6, 0x64, 0x55, 0xc9, 0x52, 0x97, 0x2b, 0x59, 0xc5, 0xd5, 0xd6, 0xc6, + 0x96, 0xe4, 0x61, 0x3e, 0xb9, 0xa2, 0x4b, 0x98, 0xfd, 0x28, 0x33, 0x8d, 0x2f, 0x50, 0x29, 0x91, + 0x22, 0x7b, 0x1f, 0x7c, 0x42, 0x05, 0xde, 0x43, 0x6f, 0x31, 0x5d, 0xdf, 0x5d, 0x12, 0x6c, 0x49, + 0x98, 0xef, 0x4d, 0x80, 0xdb, 0x38, 0xfb, 0x04, 0x4e, 0xcb, 0x4a, 0x67, 0x65, 0xa1, 0x82, 0x01, + 0x41, 0xdf, 0xea, 0x42, 0xbf, 0xb3, 0x21, 0x5e, 0x63, 0xa2, 0xbf, 0x3c, 0x80, 0x36, 0x09, 0x63, + 0x70, 0x72, 0x28, 0x32, 0x4d, 0x55, 0x7c, 0x4e, 0x36, 0x0b, 0x01, 0x44, 0x51, 0x94, 0x5a, 0x98, + 0x2f, 0x28, 0xe9, 0x8c, 0x77, 0x3c, 0xec, 0x1c, 0x20, 0x11, 0x5a, 0x54, 0x65, 0x56, 0x68, 0x15, + 0x0c, 0x1f, 0x0e, 0x17, 0xd3, 0xf5, 0x99, 0x2b, 0xfa, 0xb4, 0x0e, 0xf0, 0x0e, 0x86, 0xad, 0xe0, + 0x44, 0x8b, 0x54, 0x05, 0x27, 0x84, 0x7d, 0xe7, 0xc6, 0x2c, 0xcb, 0x8d, 0x48, 0xd5, 0xb3, 0x42, + 0xcb, 0x2b, 0x4e, 0xc0, 0xfb, 0x9f, 0xc1, 0xa4, 0x71, 0xb1, 0x33, 0x18, 0xbe, 0x44, 0x4b, 0xc4, + 0x84, 0x1b, 0x93, 0xdd, 0x03, 0xff, 0x17, 0xb1, 0x3f, 0x20, 0x35, 0x37, 0xe1, 0xf6, 0xf0, 0x64, + 0xf0, 0xb9, 0x17, 0x85, 0x8e, 0x46, 0x37, 0x37, 0x9b, 0xc3, 0x20, 0x4b, 0xdc, 0xa7, 0x83, 0x2c, + 0x89, 0xbe, 0x84, 0x49, 0xd3, 0x22, 0x7b, 0x00, 0x13, 0x9d, 0xe5, 0xa8, 0xb4, 0xc8, 0x2b, 0xc2, + 0x0c, 0x79, 0xeb, 0xe8, 0x17, 0xf1, 0x5c, 0x91, 0x68, 0x07, 0xf0, 0xb4, 0x1d, 0xac, 0x4f, 0x85, + 0xf7, 0x1a, 0x54, 0x2c, 0xe0, 0xce, 0x65, 0xf6, 0x2b, 0x26, 0x1c, 0x55, 0xb9, 0x3f, 0x34, 0x0c, + 0x8f, 0xf9, 0xb1, 0x3b, 0x7a, 0x17, 0xfc, 0x67, 0x52, 0x96, 0xd2, 0x34, 0x82, 0xc6, 0x70, 0x63, + 0xd8, 0x83, 0x11, 0xcc, 0x73, 0xd4, 0xf1, 0xee, 0x7f, 0x04, 0x43, 0x98, 0xd7, 0x13, 0x0c, 0x41, + 0x6f, 0x08, 0xe6, 0x12, 0xa0, 0xcd, 0x61, 0x7a, 0x51, 0x5a, 0x48, 0xed, 0xe8, 0xb2, 0x07, 0x73, + 0x43, 0x58, 0x24, 0x94, 0x6e, 0xc8, 0x8d, 0xc9, 0xce, 0x61, 0xaa, 0x45, 0xfa, 0x42, 0xe8, 0x78, + 0x87, 0xb2, 0x16, 0xc9, 0xdc, 0x15, 0x72, 0x6e, 0xde, 0x85, 0x98, 0x9b, 0xeb, 0x36, 0x70, 0xe3, + 0xe6, 0xbe, 0x85, 0x53, 0x87, 0x35, 0xa2, 0x2d, 0x44, 0x8e, 0x2e, 0x48, 0xf6, 0xed, 0x92, 0x30, + 0x48, 0x7d, 0x55, 0x61, 0x30, 0xa4, 0xce, 0xc8, 0x8e, 0x3e, 0x85, 0x29, 0x15, 0xe2, 0xa8, 0x0e, + 0x7b, 0xcd, 0xde, 0x83, 0x91, 0x42, 0x99, 0x61, 0x7d, 0x7d, 0x6f, 0xba, 0x26, 0x2f, 0xc8, 0xc9, + 0x5d, 0x30, 0xca, 0xe1, 0xf4, 0x02, 0xd3, 0x1c, 0x0b, 0x6d, 0x92, 0xee, 0x50, 0xd8, 0xde, 0x66, + 0x9c, 0x6c, 0x2a, 0x24, 0xb2, 0xbd, 0x7b, 0x2d, 0x64, 0x1b, 0x79, 0x11, 0x3d, 0x9b, 0x2c, 0xaf, + 0x3b, 0x68, 0x1d, 0x26, 0xba, 0xdd, 0x97, 0xf1, 0xcb, 0x8b, 0xec, 0x37, 0x0c, 0x4e, 0x6c, 0xb4, + 0x71, 0x44, 0x3f, 0xc1, 0xd8, 0x95, 0x53, 0xec, 0x11, 0x8c, 0x72, 0x94, 0x29, 0x26, 0xee, 0x6a, + 0xe7, 0x4d, 0x87, 0x04, 0xe0, 0x2e, 0xca, 0x3e, 0x84, 0xf1, 0xa1, 0x70, 0xc8, 0x41, 0x8f, 0xf0, + 0x1a, 0xd9, 0xc4, 0xa3, 0xe7, 0xf0, 0xf6, 0x37, 0x65, 0x5e, 0x49, 0x54, 0x0a, 0x93, 0x1f, 0x0c, + 0x57, 0x8a, 0x63, 0xb5, 0xcf, 0x62, 0xc1, 0x3e, 0x82, 0xb1, 0x72, 0xa5, 0x1d, 0x25, 0x77, 0xfa, + 0x69, 0x14, 0x6f, 0x00, 0xd1, 0x2b, 0x0f, 0xee, 0xb5, 0x89, 0x3a, 0x2f, 0xe3, 0x01, 0x4c, 0xcc, + 0xbd, 0xa8, 0x4a, 0xc4, 0xe8, 0x98, 0x6a, 0x1d, 0x7d, 0x6a, 0x06, 0xc7, 0xd4, 0x04, 0x70, 0x8a, + 0x45, 0xd2, 0xa1, 0xad, 0x3e, 0xb2, 0x47, 0x30, 0x8f, 0x9b, 0x6a, 0x1b, 0xbb, 0x52, 0x4c, 0xea, + 0x23, 0x2f, 0x7b, 0x02, 0x63, 0x69, 0xc7, 0x51, 0x81, 0x4f, 0x33, 0x84, 0x6e, 0x86, 0xff, 0x98, + 0x9a, 0x37, 0xf8, 0x68, 0x05, 0xc3, 0x8d, 0x48, 0x7b, 0x22, 0x9b, 0xdd, 0x26, 0xb2, 0x59, 0xbd, + 0x12, 0xfe, 0xf0, 0x60, 0x64, 0xd5, 0xd2, 0x11, 0xed, 0xcc, 0x88, 0x96, 0x7d, 0x00, 0x23, 0xc2, + 0xd4, 0x4f, 0xed, 0xee, 0xf1, 0x6e, 0x50, 0xdc, 0x01, 0x58, 0xe8, 0x76, 0xa4, 0x7d, 0x2a, 0xe0, + 0x80, 0x1b, 0x91, 0xda, 0x95, 0xc8, 0xbe, 0x00, 0x68, 0x87, 0xa4, 0xb1, 0xdb, 0x4d, 0x7a, 0xdb, + 0x0d, 0xf0, 0x0e, 0x7c, 0x9d, 0x81, 0x6f, 0xdf, 0xef, 0x1a, 0x7c, 0x12, 0x3f, 0xeb, 0x3d, 0x7a, + 0xb7, 0x43, 0xee, 0xb3, 0xae, 0xd3, 0xbe, 0x8f, 0x73, 0x8f, 0x7d, 0x0c, 0x3e, 0xed, 0x54, 0xd6, + 0xfb, 0x67, 0xa9, 0xbf, 0x99, 0x39, 0x27, 0xed, 0xaa, 0x85, 0xf7, 0xf5, 0xd9, 0x9f, 0xd7, 0xa1, + 0xf7, 0xea, 0x3a, 0xf4, 0xfe, 0xbe, 0x0e, 0xbd, 0xdf, 0xff, 0x09, 0xdf, 0xd8, 0x8e, 0xe8, 0x8f, + 0xee, 0xf1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0x1b, 0xb7, 0xbc, 0x2c, 0x07, 0x00, 0x00, } diff --git a/src/query/generated/proto/rpc/query.proto b/src/query/generated/proto/rpcpb/query.proto similarity index 99% rename from src/query/generated/proto/rpc/query.proto rename to src/query/generated/proto/rpcpb/query.proto index 3976af105e..5c94ff942c 100644 --- a/src/query/generated/proto/rpc/query.proto +++ b/src/query/generated/proto/rpcpb/query.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package rpc; +package rpcpb; service Query { rpc Fetch(FetchMessage) returns (stream FetchResult); diff --git a/src/query/tsdb/remote/client.go b/src/query/tsdb/remote/client.go index ef12c6ae80..089e857931 100644 --- a/src/query/tsdb/remote/client.go +++ b/src/query/tsdb/remote/client.go @@ -26,7 +26,7 @@ import ( "github.com/m3db/m3db/src/query/block" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/tsdb/remote/codecs.go b/src/query/tsdb/remote/codecs.go index 0792130954..7a5214888a 100644 --- a/src/query/tsdb/remote/codecs.go +++ b/src/query/tsdb/remote/codecs.go @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" diff --git a/src/query/tsdb/remote/codecs_test.go b/src/query/tsdb/remote/codecs_test.go index db572bb1cb..e9e174ef4c 100644 --- a/src/query/tsdb/remote/codecs_test.go +++ b/src/query/tsdb/remote/codecs_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" diff --git a/src/query/tsdb/remote/compressed_codecs.go b/src/query/tsdb/remote/compressed_codecs.go index 742dabddd8..d7387a55c1 100644 --- a/src/query/tsdb/remote/compressed_codecs.go +++ b/src/query/tsdb/remote/compressed_codecs.go @@ -33,7 +33,7 @@ import ( "github.com/m3db/m3db/src/dbnode/x/xio" "github.com/m3db/m3db/src/dbnode/x/xpool" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3x/checked" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/tsdb/remote/compressed_codecs_test.go b/src/query/tsdb/remote/compressed_codecs_test.go index 2a8904c695..a4690c7aeb 100644 --- a/src/query/tsdb/remote/compressed_codecs_test.go +++ b/src/query/tsdb/remote/compressed_codecs_test.go @@ -30,7 +30,7 @@ import ( "github.com/m3db/m3db/src/dbnode/serialize" "github.com/m3db/m3db/src/dbnode/x/xpool" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" diff --git a/src/query/tsdb/remote/server.go b/src/query/tsdb/remote/server.go index 5ddc12edb7..9ecc959c88 100644 --- a/src/query/tsdb/remote/server.go +++ b/src/query/tsdb/remote/server.go @@ -24,7 +24,7 @@ import ( "io" "net" - "github.com/m3db/m3db/src/query/generated/proto/rpc" + "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/util/logging" From c68df8997b7030d44ee621ff9ed5483af67e3c24 Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 15:52:20 -0400 Subject: [PATCH 5/9] Update rpc naming --- src/query/tsdb/remote/client.go | 2 +- src/query/tsdb/remote/codecs.go | 2 +- src/query/tsdb/remote/compressed_codecs.go | 2 +- src/query/tsdb/remote/server.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/query/tsdb/remote/client.go b/src/query/tsdb/remote/client.go index 089e857931..726f940948 100644 --- a/src/query/tsdb/remote/client.go +++ b/src/query/tsdb/remote/client.go @@ -26,7 +26,7 @@ import ( "github.com/m3db/m3db/src/query/block" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" "github.com/m3db/m3db/src/query/util/logging" diff --git a/src/query/tsdb/remote/codecs.go b/src/query/tsdb/remote/codecs.go index 7a5214888a..730088baaf 100644 --- a/src/query/tsdb/remote/codecs.go +++ b/src/query/tsdb/remote/codecs.go @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" diff --git a/src/query/tsdb/remote/compressed_codecs.go b/src/query/tsdb/remote/compressed_codecs.go index d7387a55c1..2b8eed2eb9 100644 --- a/src/query/tsdb/remote/compressed_codecs.go +++ b/src/query/tsdb/remote/compressed_codecs.go @@ -33,7 +33,7 @@ import ( "github.com/m3db/m3db/src/dbnode/x/xio" "github.com/m3db/m3db/src/dbnode/x/xpool" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3x/checked" "github.com/m3db/m3x/ident" xtime "github.com/m3db/m3x/time" diff --git a/src/query/tsdb/remote/server.go b/src/query/tsdb/remote/server.go index 9ecc959c88..f544cc0e43 100644 --- a/src/query/tsdb/remote/server.go +++ b/src/query/tsdb/remote/server.go @@ -24,7 +24,7 @@ import ( "io" "net" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/util/logging" From a27f3f012a37429ee7909a272bb4ba4bacccc3fa Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 16:16:05 -0400 Subject: [PATCH 6/9] Fix build issues --- scripts/process-cover.sh | 2 +- scripts/site-build.sh | 2 +- src/query/tsdb/remote/codecs_test.go | 2 +- src/query/tsdb/remote/compressed_codecs_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/process-cover.sh b/scripts/process-cover.sh index 529cdc455d..ac5cde5fcc 100755 --- a/scripts/process-cover.sh +++ b/scripts/process-cover.sh @@ -12,7 +12,7 @@ TARGETS=("dbnode" "coordinator" "m3ninx") target_patterns() { case $1 in 'dbnode') echo "^mode|github.com/m3db/m3db/src/dbnode|github.com/m3db/m3db/src/cmd/services/m3dbnode";; - 'coordinator') echo "^mode|github.com/m3db/m3db/src/coordinator|github.com/m3db/m3db/src/cmd/services/m3coordinator";; + 'coordinator') echo "^mode|github.com/m3db/m3db/src/query|github.com/m3db/m3db/src/cmd/services/m3coordinator";; 'm3ninx') echo "^mode|github.com/m3db/m3db/src/m3ninx";; *) echo "unknown key: $1"; exit 1;; esac diff --git a/scripts/site-build.sh b/scripts/site-build.sh index b56e4ab592..7d7c6d2054 100755 --- a/scripts/site-build.sh +++ b/scripts/site-build.sh @@ -2,7 +2,7 @@ set -e -ASSET_DIR=${1:-src/coordinator/generated/assets/openapi} +ASSET_DIR=${1:-src/query/generated/assets/openapi} # Copy over OpenAPI doc. mkdir -p m3metrics.io/openapi diff --git a/src/query/tsdb/remote/codecs_test.go b/src/query/tsdb/remote/codecs_test.go index e9e174ef4c..1c2fe1f407 100644 --- a/src/query/tsdb/remote/codecs_test.go +++ b/src/query/tsdb/remote/codecs_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/models" "github.com/m3db/m3db/src/query/storage" "github.com/m3db/m3db/src/query/ts" diff --git a/src/query/tsdb/remote/compressed_codecs_test.go b/src/query/tsdb/remote/compressed_codecs_test.go index a4690c7aeb..770cb15db4 100644 --- a/src/query/tsdb/remote/compressed_codecs_test.go +++ b/src/query/tsdb/remote/compressed_codecs_test.go @@ -30,7 +30,7 @@ import ( "github.com/m3db/m3db/src/dbnode/serialize" "github.com/m3db/m3db/src/dbnode/x/xpool" "github.com/m3db/m3db/src/query/errors" - "github.com/m3db/m3db/src/query/generated/proto/rpcpb" + rpc "github.com/m3db/m3db/src/query/generated/proto/rpcpb" "github.com/m3db/m3db/src/query/test" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/pool" From f50e49813aa547a9707bb1385e8932c5f22d0dbd Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Wed, 1 Aug 2018 16:17:39 -0400 Subject: [PATCH 7/9] Fix docker --- docker/m3coordinator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/m3coordinator/Dockerfile b/docker/m3coordinator/Dockerfile index d9d974c7a6..3494c820d9 100644 --- a/docker/m3coordinator/Dockerfile +++ b/docker/m3coordinator/Dockerfile @@ -21,7 +21,7 @@ LABEL maintainer="The M3DB Authors " EXPOSE 7201/tcp 7203/tcp COPY --from=builder /go/src/github.com/m3db/m3db/bin/m3coordinator /bin/ -COPY --from=builder /go/src/github.com/m3db/m3db/src/coordinator/config/m3coordinator-local-etcd.yml /etc/m3coordinator/m3coordinator.yml +COPY --from=builder /go/src/github.com/m3db/m3db/src/query/config/m3coordinator-local-etcd.yml /etc/m3coordinator/m3coordinator.yml ENTRYPOINT [ "/bin/m3coordinator" ] CMD [ "-f", "/etc/m3coordinator/m3coordinator.yml" ] From a3758fa12155a32ebc47357e6156da5751a821b5 Mon Sep 17 00:00:00 2001 From: Benjamin Raskin Date: Thu, 2 Aug 2018 09:58:04 -0400 Subject: [PATCH 8/9] Address comments --- .codecov.yml | 8 ++++---- scripts/process-cover.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 800edac038..91495df884 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -6,8 +6,8 @@ coverage: status: project: default: on - coordinator: - flags: coordinator + query: + flags: query dbnode: flags: dbnode m3ninx: @@ -18,9 +18,9 @@ coverage: default: off flags: - coordinator: + query: paths: - - src/coordinator/ + - src/query/ - src/cmd/services/m3coordinator/ dbnode: paths: diff --git a/scripts/process-cover.sh b/scripts/process-cover.sh index ac5cde5fcc..eeb9190ae5 100755 --- a/scripts/process-cover.sh +++ b/scripts/process-cover.sh @@ -8,11 +8,11 @@ fi COVERFILE=$1 SUBMIT_COVER="$(dirname $0)/../.ci/codecov.sh" -TARGETS=("dbnode" "coordinator" "m3ninx") +TARGETS=("dbnode" "query" "m3ninx") target_patterns() { case $1 in 'dbnode') echo "^mode|github.com/m3db/m3db/src/dbnode|github.com/m3db/m3db/src/cmd/services/m3dbnode";; - 'coordinator') echo "^mode|github.com/m3db/m3db/src/query|github.com/m3db/m3db/src/cmd/services/m3coordinator";; + 'query') echo "^mode|github.com/m3db/m3db/src/query|github.com/m3db/m3db/src/cmd/services/m3coordinator";; 'm3ninx') echo "^mode|github.com/m3db/m3db/src/m3ninx";; *) echo "unknown key: $1"; exit 1;; esac From 529807b07aea1951cc28a38af9ec00b446952099 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Thu, 2 Aug 2018 16:57:15 -0400 Subject: [PATCH 9/9] Clean some references up, add m3query Dockerfile and dedicated config --- .codecov.yml | 2 +- docker/m3query/Dockerfile | 27 ++++++++++ .../docker-integration-test.sh | 28 ++++++----- scripts/process-cover.sh | 2 +- src/cmd/services/m3coordinator/main/main.go | 2 +- src/cmd/services/m3dbnode/main/main.go | 4 +- .../services/m3dbnode/main/main_index_test.go | 2 +- src/cmd/services/m3dbnode/main/main_test.go | 2 +- src/cmd/services/m3query/config/config.go | 2 +- src/cmd/services/m3query/main/main.go | 2 +- .../m3dbnode => dbnode}/server/server.go | 0 src/query/config/m3query-local-etcd.yml | 50 +++++++++++++++++++ .../m3coordinator => }/server/server.go | 0 13 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 docker/m3query/Dockerfile rename src/{cmd/services/m3dbnode => dbnode}/server/server.go (100%) create mode 100644 src/query/config/m3query-local-etcd.yml rename src/query/{services/m3coordinator => }/server/server.go (100%) diff --git a/.codecov.yml b/.codecov.yml index 91495df884..9eb3a3877c 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -21,7 +21,7 @@ coverage: query: paths: - src/query/ - - src/cmd/services/m3coordinator/ + - src/cmd/services/m3query/ dbnode: paths: - src/dbnode/ diff --git a/docker/m3query/Dockerfile b/docker/m3query/Dockerfile new file mode 100644 index 0000000000..50079f365e --- /dev/null +++ b/docker/m3query/Dockerfile @@ -0,0 +1,27 @@ +# stage 1: build +FROM golang:1.10-alpine AS builder +LABEL maintainer="The M3DB Authors " + +# Install Glide +RUN apk add --update glide git make bash + +# Add source code +RUN mkdir -p /go/src/github.com/m3db/m3db +ADD . /go/src/github.com/m3db/m3db + +# Build m3coordinator binary +RUN cd /go/src/github.com/m3db/m3db/ && \ + git submodule update --init && \ + make m3query-linux-amd64 + +# stage 2: lightweight "release" +FROM alpine:latest +LABEL maintainer="The M3DB Authors " + +EXPOSE 7201/tcp 7203/tcp + +COPY --from=builder /go/src/github.com/m3db/m3db/bin/m3query /bin/ +COPY --from=builder /go/src/github.com/m3db/m3db/src/query/config/m3query-local-etcd.yml /etc/m3query/m3query.yml + +ENTRYPOINT [ "/bin/m3query" ] +CMD [ "-f", "/etc/m3query/m3query.yml" ] diff --git a/scripts/integration-tests/docker-integration-test.sh b/scripts/integration-tests/docker-integration-test.sh index 2ba8688686..b90933397e 100755 --- a/scripts/integration-tests/docker-integration-test.sh +++ b/scripts/integration-tests/docker-integration-test.sh @@ -2,15 +2,17 @@ set -xe -echo "Build docker image" +echo "Build docker images" docker build -t "m3dbnode:$(git rev-parse HEAD)" -f ./docker/m3dbnode/Dockerfile . +docker build -t "m3coordinator:$(git rev-parse HEAD)" -f ./docker/m3coordinator/Dockerfile . +docker build -t "m3query:$(git rev-parse HEAD)" -f ./docker/m3query/Dockerfile . -echo "Run docker container" +echo "Run m3dbnode docker container" docker run --name "m3dbnode-version-$(git rev-parse HEAD)" -d --rm -p 9000:9000 -p 9001:9001 -p 9002:9002 -p 9003:9003 -p 9004:9004 -p 7201:7201 "m3dbnode:$(git rev-parse HEAD)" -echo "Sleeping for a bit to ensure db" +echo "Sleeping for a bit to ensure db up" sleep 10 # TODO Replace sleeps with logic to determine when to proceed @@ -40,13 +42,13 @@ curl -vvvsSf -X POST localhost:7201/api/v1/namespace -d '{ } }' -echo "Sleep while namespace is init'd" +echo "Sleep while namespace is init'd" sleep 10 # TODO Replace sleeps with logic to determine when to proceed [ "$(curl -sSf localhost:7201/api/v1/namespace | jq .registry.namespaces.default.indexOptions.enabled)" == true ] -echo "Initialization placement" +echo "Initialization placement" curl -vvvsSf -X POST localhost:7201/api/v1/placement/init -d '{ "num_shards": 64, @@ -66,11 +68,11 @@ curl -vvvsSf -X POST localhost:7201/api/v1/placement/init -d '{ [ "$(curl -sSf localhost:7201/api/v1/placement | jq .placement.instances.m3db_local.id)" == '"m3db_local"' ] -echo "Wait for placement to fully initialize" +echo "Wait for placement to fully initialize" sleep 60 # TODO Replace sleeps with logic to determine when to proceed -echo "Write data" +echo "Write data" curl -vvvsSf -X POST localhost:9003/writetagged -d '{ "namespace": "default", @@ -103,16 +105,16 @@ queryResult=$(curl -sSf -X POST localhost:9003/query -d '{ }, "rangeStart": 0, "rangeEnd":'"$(date +"%s")"' -}' | jq '.results | length') +}' | jq '.results | length') -if [ "$queryResult" -lt 1 ]; then - echo "Result not found" +if [ "$queryResult" -lt 1 ]; then + echo "Result not found" exit 1 -else +else echo "Result found" fi -echo "Deleting placement" +echo "Deleting placement" curl -vvvsSf -X DELETE localhost:7201/api/v1/placement @@ -120,7 +122,7 @@ echo "Deleting namespace" curl -vvvsSf -X DELETE localhost:7201/api/v1/namespace/default -echo "Stop docker container" +echo "Stop docker container" docker stop "m3dbnode-version-$(git rev-parse HEAD)" diff --git a/scripts/process-cover.sh b/scripts/process-cover.sh index eeb9190ae5..c711356511 100755 --- a/scripts/process-cover.sh +++ b/scripts/process-cover.sh @@ -12,7 +12,7 @@ TARGETS=("dbnode" "query" "m3ninx") target_patterns() { case $1 in 'dbnode') echo "^mode|github.com/m3db/m3db/src/dbnode|github.com/m3db/m3db/src/cmd/services/m3dbnode";; - 'query') echo "^mode|github.com/m3db/m3db/src/query|github.com/m3db/m3db/src/cmd/services/m3coordinator";; + 'query') echo "^mode|github.com/m3db/m3db/src/query|github.com/m3db/m3db/src/cmd/services/m3query";; 'm3ninx') echo "^mode|github.com/m3db/m3db/src/m3ninx";; *) echo "unknown key: $1"; exit 1;; esac diff --git a/src/cmd/services/m3coordinator/main/main.go b/src/cmd/services/m3coordinator/main/main.go index ab39a5f782..255cfd50ba 100644 --- a/src/cmd/services/m3coordinator/main/main.go +++ b/src/cmd/services/m3coordinator/main/main.go @@ -25,7 +25,7 @@ import ( _ "net/http/pprof" // pprof: for debug listen server if configured "os" - "github.com/m3db/m3db/src/query/services/m3coordinator/server" + "github.com/m3db/m3db/src/query/server" ) var ( diff --git a/src/cmd/services/m3dbnode/main/main.go b/src/cmd/services/m3dbnode/main/main.go index 524efcaf04..004a530d02 100644 --- a/src/cmd/services/m3dbnode/main/main.go +++ b/src/cmd/services/m3dbnode/main/main.go @@ -28,9 +28,9 @@ import ( clusterclient "github.com/m3db/m3cluster/client" "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - dbserver "github.com/m3db/m3db/src/cmd/services/m3dbnode/server" "github.com/m3db/m3db/src/dbnode/client" - coordinatorserver "github.com/m3db/m3db/src/query/services/m3coordinator/server" + dbserver "github.com/m3db/m3db/src/dbnode/server" + coordinatorserver "github.com/m3db/m3db/src/query/server" xconfig "github.com/m3db/m3x/config" ) diff --git a/src/cmd/services/m3dbnode/main/main_index_test.go b/src/cmd/services/m3dbnode/main/main_index_test.go index 050c74611f..800a935d57 100644 --- a/src/cmd/services/m3dbnode/main/main_index_test.go +++ b/src/cmd/services/m3dbnode/main/main_index_test.go @@ -34,9 +34,9 @@ import ( "github.com/m3db/m3cluster/placement" "github.com/m3db/m3cluster/services" "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/cmd/services/m3dbnode/server" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/kvconfig" + "github.com/m3db/m3db/src/dbnode/server" "github.com/m3db/m3db/src/dbnode/storage/index" m3ninxidx "github.com/m3db/m3db/src/m3ninx/idx" xconfig "github.com/m3db/m3x/config" diff --git a/src/cmd/services/m3dbnode/main/main_test.go b/src/cmd/services/m3dbnode/main/main_test.go index 6d2beca50b..463b260a86 100644 --- a/src/cmd/services/m3dbnode/main/main_test.go +++ b/src/cmd/services/m3dbnode/main/main_test.go @@ -35,9 +35,9 @@ import ( "github.com/m3db/m3cluster/services" "github.com/m3db/m3cluster/shard" "github.com/m3db/m3db/src/cmd/services/m3dbnode/config" - "github.com/m3db/m3db/src/cmd/services/m3dbnode/server" "github.com/m3db/m3db/src/dbnode/client" "github.com/m3db/m3db/src/dbnode/kvconfig" + "github.com/m3db/m3db/src/dbnode/server" xconfig "github.com/m3db/m3x/config" "github.com/m3db/m3x/ident" "github.com/m3db/m3x/instrument" diff --git a/src/cmd/services/m3query/config/config.go b/src/cmd/services/m3query/config/config.go index 57cbd95acb..9bd078dc96 100644 --- a/src/cmd/services/m3query/config/config.go +++ b/src/cmd/services/m3query/config/config.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3x/instrument" ) -// Configuration is the configuration for the coordinator. +// Configuration is the configuration for the query service. type Configuration struct { // Metrics configuration. Metrics instrument.MetricsConfiguration `yaml:"metrics"` diff --git a/src/cmd/services/m3query/main/main.go b/src/cmd/services/m3query/main/main.go index ab39a5f782..255cfd50ba 100644 --- a/src/cmd/services/m3query/main/main.go +++ b/src/cmd/services/m3query/main/main.go @@ -25,7 +25,7 @@ import ( _ "net/http/pprof" // pprof: for debug listen server if configured "os" - "github.com/m3db/m3db/src/query/services/m3coordinator/server" + "github.com/m3db/m3db/src/query/server" ) var ( diff --git a/src/cmd/services/m3dbnode/server/server.go b/src/dbnode/server/server.go similarity index 100% rename from src/cmd/services/m3dbnode/server/server.go rename to src/dbnode/server/server.go diff --git a/src/query/config/m3query-local-etcd.yml b/src/query/config/m3query-local-etcd.yml new file mode 100644 index 0000000000..28ba29c826 --- /dev/null +++ b/src/query/config/m3query-local-etcd.yml @@ -0,0 +1,50 @@ +listenAddress: 0.0.0.0:7201 + +metrics: + scope: + prefix: "coordinator" + prometheus: + handlerPath: /metrics + listenAddress: 0.0.0.0:7203 # until https://github.com/m3db/m3db/issues/682 is resolved + sanitization: prometheus + samplingRate: 1.0 + extended: none + +clusters: + - namespaces: + - namespace: default + storageMetricsType: unaggregated + retention: 48h + client: + config: + service: + env: default_env + zone: embedded + service: m3db + cacheDir: /var/lib/m3kv + etcdClusters: + - zone: embedded + endpoints: + - 127.0.0.1:2379 + seedNodes: + initialCluster: + - hostID: m3db_local + endpoint: http://127.0.0.1:2380 + writeConsistencyLevel: majority + readConsistencyLevel: unstrict_majority + writeTimeout: 10s + fetchTimeout: 15s + connectTimeout: 20s + writeRetry: + initialBackoff: 500ms + backoffFactor: 3 + maxRetries: 2 + jitter: true + fetchRetry: + initialBackoff: 500ms + backoffFactor: 2 + maxRetries: 3 + jitter: true + backgroundHealthCheckFailLimit: 4 + backgroundHealthCheckFailThrottleFactor: 0.5 + diff --git a/src/query/services/m3coordinator/server/server.go b/src/query/server/server.go similarity index 100% rename from src/query/services/m3coordinator/server/server.go rename to src/query/server/server.go