diff --git a/Cargo.toml b/Cargo.toml index b4a09bac4a..4db454858d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,41 +1,17 @@ -[package] -name = "influxdb_iox" -version = "0.1.0" -authors = ["Paul Dix "] -edition = "2021" -default-run = "influxdb_iox" -readme = "README.md" - -exclude = [ - "*.md", - "*.txt", - ".circleci/", - ".editorconfig", - ".git*", - ".github/", - ".kodiak.toml", - "Dockerfile*", - "LICENSE*", - "buf.yaml", - "docker/", - "docs/", - "massif.out.*", - "perf/", - "scripts/", - "tools/", -] - - -[workspace] # In alphabetical order +[workspace] +# In alphabetical order members = [ "arrow_util", - "data_types", "client_util", + "data_types", "datafusion", "datafusion_util", "entry", "generated_types", + "grpc-router", + "grpc-router-test-gen", "influxdb2_client", + "influxdb_iox", "influxdb_iox_client", "influxdb_line_protocol", "influxdb_storage_client", @@ -62,6 +38,7 @@ members = [ "query", "query_tests", "read_buffer", + "schema", "server", "server_benchmarks", "test_helpers", @@ -71,130 +48,32 @@ members = [ "trace_http", "tracker", "trogging", - "schema", - "grpc-router", - "grpc-router/grpc-router-test-gen", "write_buffer", ] +default-members = ["influxdb_iox"] + +exclude = [ + "*.md", + "*.txt", + ".circleci/", + ".editorconfig", + ".git*", + ".github/", + ".kodiak.toml", + "Dockerfile*", + "LICENSE*", + "buf.yaml", + "docker/", + "docs/", + "massif.out.*", + "perf/", + "scripts/", + "test_fixtures/", + "tools/", +] [profile.release] debug = true [profile.bench] debug = true - -[dependencies] -# Workspace dependencies, in alphabetical order -datafusion = { path = "datafusion" } -data_types = { path = "data_types" } -entry = { path = "entry" } -generated_types = { path = "generated_types" } - -influxdb_iox_client = { path = "influxdb_iox_client", features = ["flight", "format"] } -influxdb_line_protocol = { path = "influxdb_line_protocol" } -internal_types = { path = "internal_types" } -iox_object_store = { path = "iox_object_store" } -logfmt = { path = "logfmt" } -metric = { path = "metric" } -metric_exporters = { path = "metric_exporters" } -mutable_buffer = { path = "mutable_buffer" } -num_cpus = "1.13.0" -object_store = { path = "object_store" } -observability_deps = { path = "observability_deps" } -panic_logging = { path = "panic_logging" } -parquet_catalog = { path = "parquet_catalog" } -parquet_file = { path = "parquet_file" } -predicate = { path = "predicate" } -query = { path = "query" } -read_buffer = { path = "read_buffer" } -server = { path = "server" } -trace = { path = "trace" } -trace_exporters = { path = "trace_exporters" } -trace_http = { path = "trace_http" } -tracker = { path = "tracker" } -trogging = { path = "trogging", default-features = false, features = ["structopt"] } -time = { path = "time" } - -# Crates.io dependencies, in alphabetical order -arrow = { version = "6.0", features = ["prettyprint"] } -arrow-flight = "6.0" -backtrace = "0.3" -byteorder = "1.3.4" -bytes = "1.0" -chrono = "0.4" -clap = "2.33.1" -csv = "1.1" -dirs = "4.0.0" -dotenv = "0.15.0" -flate2 = "1.0" -futures = "0.3" -hashbrown = "0.11" -http = "0.2.0" -humantime = "2.1.0" -hyper = "0.14" -libc = { version = "0.2" } -log = "0.4" -once_cell = { version = "1.4.0", features = ["parking_lot"] } -parking_lot = "0.11.2" -itertools = "0.10.1" -parquet = "6.0" -pin-project = "1.0" -# used by arrow/datafusion anyway -comfy-table = { version = "4.0", default-features = false } -pprof = { version = "^0.5", default-features = false, features = ["flamegraph", "protobuf"], optional = true } -prost = "0.8" -rustyline = { version = "9.0", default-features = false } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.67" -serde_urlencoded = "0.7.0" -snafu = "0.6.9" -structopt = "0.3.25" -thiserror = "1.0.30" -tikv-jemalloc-ctl = { version = "0.4.0" } -tokio = { version = "1.11", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] } -tokio-stream = { version = "0.1.2", features = ["net"] } -tokio-util = { version = "0.6.3" } -tonic = "0.5.0" -tonic-health = "0.4.0" -tonic-reflection = "0.2.0" -tower = "0.4" -uuid = { version = "0.8", features = ["v4"] } - -# jemalloc-sys with unprefixed_malloc_on_supported_platforms feature and heappy are mutually exclusive -tikv-jemalloc-sys = { version = "0.4.0", optional = true, features = ["unprefixed_malloc_on_supported_platforms"] } -heappy = { git = "https://github.com/mkmik/heappy", rev = "20aa466524ac9ce34a4bae29f27ec11869b50e21", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true } - - -[dev-dependencies] -# Workspace dependencies, in alphabetical order -arrow_util = { path = "arrow_util" } -entry = { path = "entry" } -influxdb2_client = { path = "influxdb2_client" } -influxdb_storage_client = { path = "influxdb_storage_client" } -influxdb_iox_client = { path = "influxdb_iox_client", features = ["flight"] } -test_helpers = { path = "test_helpers" } -parking_lot = "0.11.2" -write_buffer = { path = "write_buffer" } - -# Crates.io dependencies, in alphabetical order -assert_cmd = "2.0.2" -flate2 = "1.0" -hex = "0.4.2" -predicates = "2.0.3" -rand = "0.8.3" -reqwest = "0.11" -tempfile = "3.1.0" - -[features] -default = ["jemalloc_replacing_malloc"] - -azure = ["object_store/azure"] # Optional Azure Object store support -gcp = ["object_store/gcp"] # Optional GCP object store support -aws = ["object_store/aws"] # Optional AWS / S3 object store support -# pprof is an optional feature for pprof support - -# heappy is an optional feature; Not on by default as it -# runtime overhead on all allocations (calls to malloc). -# Cargo cannot currently implement mutually exclusive features so let's force every build -# to pick either heappy or jemalloc_replacing_malloc feature at least until we figure out something better. -jemalloc_replacing_malloc = ["tikv-jemalloc-sys"] diff --git a/grpc-router/grpc-router-test-gen/Cargo.toml b/grpc-router-test-gen/Cargo.toml similarity index 100% rename from grpc-router/grpc-router-test-gen/Cargo.toml rename to grpc-router-test-gen/Cargo.toml diff --git a/grpc-router/grpc-router-test-gen/build.rs b/grpc-router-test-gen/build.rs similarity index 100% rename from grpc-router/grpc-router-test-gen/build.rs rename to grpc-router-test-gen/build.rs diff --git a/grpc-router/grpc-router-test-gen/protos/test.proto b/grpc-router-test-gen/protos/test.proto similarity index 100% rename from grpc-router/grpc-router-test-gen/protos/test.proto rename to grpc-router-test-gen/protos/test.proto diff --git a/grpc-router/grpc-router-test-gen/src/lib.rs b/grpc-router-test-gen/src/lib.rs similarity index 100% rename from grpc-router/grpc-router-test-gen/src/lib.rs rename to grpc-router-test-gen/src/lib.rs diff --git a/grpc-router/Cargo.toml b/grpc-router/Cargo.toml index 4d832b9b73..48b8c02c3f 100644 --- a/grpc-router/Cargo.toml +++ b/grpc-router/Cargo.toml @@ -25,4 +25,4 @@ prost-build = "0.8" tonic-build = "0.5" [dev-dependencies] -grpc-router-test-gen = { path = "./grpc-router-test-gen" } +grpc-router-test-gen = { path = "../grpc-router-test-gen" } diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml new file mode 100644 index 0000000000..76b8ee2dd0 --- /dev/null +++ b/influxdb_iox/Cargo.toml @@ -0,0 +1,122 @@ +[package] +name = "influxdb_iox" +version = "0.1.0" +authors = ["Paul Dix "] +edition = "2021" +default-run = "influxdb_iox" + +[dependencies] +# Workspace dependencies, in alphabetical order +datafusion = { path = "../datafusion" } +data_types = { path = "../data_types" } +entry = { path = "../entry" } +generated_types = { path = "../generated_types" } + +influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight", "format"] } +influxdb_line_protocol = { path = "../influxdb_line_protocol" } +internal_types = { path = "../internal_types" } +iox_object_store = { path = "../iox_object_store" } +logfmt = { path = "../logfmt" } +metric = { path = "../metric" } +metric_exporters = { path = "../metric_exporters" } +mutable_buffer = { path = "../mutable_buffer" } +num_cpus = "1.13.0" +object_store = { path = "../object_store" } +observability_deps = { path = "../observability_deps" } +panic_logging = { path = "../panic_logging" } +parquet_catalog = { path = "../parquet_catalog" } +parquet_file = { path = "../parquet_file" } +predicate = { path = "../predicate" } +query = { path = "../query" } +read_buffer = { path = "../read_buffer" } +server = { path = "../server" } +trace = { path = "../trace" } +trace_exporters = { path = "../trace_exporters" } +trace_http = { path = "../trace_http" } +tracker = { path = "../tracker" } +trogging = { path = "../trogging", default-features = false, features = ["structopt"] } +time = { path = "../time" } + +# Crates.io dependencies, in alphabetical order +arrow = { version = "6.0", features = ["prettyprint"] } +arrow-flight = "6.0" +backtrace = "0.3" +byteorder = "1.3.4" +bytes = "1.0" +chrono = "0.4" +clap = "2.33.1" +csv = "1.1" +dirs = "4.0.0" +dotenv = "0.15.0" +flate2 = "1.0" +futures = "0.3" +hashbrown = "0.11" +http = "0.2.0" +humantime = "2.1.0" +hyper = "0.14" +libc = { version = "0.2" } +log = "0.4" +once_cell = { version = "1.4.0", features = ["parking_lot"] } +parking_lot = "0.11.2" +itertools = "0.10.1" +parquet = "6.0" +pin-project = "1.0" +# used by arrow/datafusion anyway +comfy-table = { version = "4.0", default-features = false } +pprof = { version = "^0.5", default-features = false, features = ["flamegraph", "protobuf"], optional = true } +prost = "0.8" +rustyline = { version = "9.0", default-features = false } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0.67" +serde_urlencoded = "0.7.0" +snafu = "0.6.9" +structopt = "0.3.25" +thiserror = "1.0.30" +tikv-jemalloc-ctl = { version = "0.4.0" } +tokio = { version = "1.11", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] } +tokio-stream = { version = "0.1.2", features = ["net"] } +tokio-util = { version = "0.6.3" } +tonic = "0.5.0" +tonic-health = "0.4.0" +tonic-reflection = "0.2.0" +tower = "0.4" +uuid = { version = "0.8", features = ["v4"] } + +# jemalloc-sys with unprefixed_malloc_on_supported_platforms feature and heappy are mutually exclusive +tikv-jemalloc-sys = { version = "0.4.0", optional = true, features = ["unprefixed_malloc_on_supported_platforms"] } +heappy = { git = "https://github.com/mkmik/heappy", rev = "20aa466524ac9ce34a4bae29f27ec11869b50e21", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true } + + +[dev-dependencies] +# Workspace dependencies, in alphabetical order +arrow_util = { path = "../arrow_util" } +entry = { path = "../entry" } +influxdb2_client = { path = "../influxdb2_client" } +influxdb_storage_client = { path = "../influxdb_storage_client" } +influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight"] } +test_helpers = { path = "../test_helpers" } +parking_lot = "0.11.2" +write_buffer = { path = "../write_buffer" } + +# Crates.io dependencies, in alphabetical order +assert_cmd = "2.0.2" +flate2 = "1.0" +hex = "0.4.2" +predicates = "2.0.3" +rand = "0.8.3" +reqwest = "0.11" +tempfile = "3.1.0" + +[features] +default = ["jemalloc_replacing_malloc"] + +azure = ["object_store/azure"] # Optional Azure Object store support +gcp = ["object_store/gcp"] # Optional GCP object store support +aws = ["object_store/aws"] # Optional AWS / S3 object store support +# pprof is an optional feature for pprof support + +# heappy is an optional feature; Not on by default as it +# runtime overhead on all allocations (calls to malloc). +# Cargo cannot currently implement mutually exclusive features so let's force every build +# to pick either heappy or jemalloc_replacing_malloc feature at least until we figure out something better. +jemalloc_replacing_malloc = ["tikv-jemalloc-sys"] diff --git a/src/commands/database.rs b/influxdb_iox/src/commands/database.rs similarity index 100% rename from src/commands/database.rs rename to influxdb_iox/src/commands/database.rs diff --git a/src/commands/database/chunk.rs b/influxdb_iox/src/commands/database/chunk.rs similarity index 100% rename from src/commands/database/chunk.rs rename to influxdb_iox/src/commands/database/chunk.rs diff --git a/src/commands/database/partition.rs b/influxdb_iox/src/commands/database/partition.rs similarity index 100% rename from src/commands/database/partition.rs rename to influxdb_iox/src/commands/database/partition.rs diff --git a/src/commands/database/recover.rs b/influxdb_iox/src/commands/database/recover.rs similarity index 100% rename from src/commands/database/recover.rs rename to influxdb_iox/src/commands/database/recover.rs diff --git a/src/commands/debug/dump_catalog.rs b/influxdb_iox/src/commands/debug/dump_catalog.rs similarity index 100% rename from src/commands/debug/dump_catalog.rs rename to influxdb_iox/src/commands/debug/dump_catalog.rs diff --git a/src/commands/debug/mod.rs b/influxdb_iox/src/commands/debug/mod.rs similarity index 100% rename from src/commands/debug/mod.rs rename to influxdb_iox/src/commands/debug/mod.rs diff --git a/src/commands/debug/print_cpu.rs b/influxdb_iox/src/commands/debug/print_cpu.rs similarity index 100% rename from src/commands/debug/print_cpu.rs rename to influxdb_iox/src/commands/debug/print_cpu.rs diff --git a/src/commands/operations.rs b/influxdb_iox/src/commands/operations.rs similarity index 100% rename from src/commands/operations.rs rename to influxdb_iox/src/commands/operations.rs diff --git a/src/commands/run.rs b/influxdb_iox/src/commands/run.rs similarity index 100% rename from src/commands/run.rs rename to influxdb_iox/src/commands/run.rs diff --git a/src/commands/server.rs b/influxdb_iox/src/commands/server.rs similarity index 100% rename from src/commands/server.rs rename to influxdb_iox/src/commands/server.rs diff --git a/src/commands/server_remote.rs b/influxdb_iox/src/commands/server_remote.rs similarity index 100% rename from src/commands/server_remote.rs rename to influxdb_iox/src/commands/server_remote.rs diff --git a/src/commands/sql.rs b/influxdb_iox/src/commands/sql.rs similarity index 100% rename from src/commands/sql.rs rename to influxdb_iox/src/commands/sql.rs diff --git a/src/commands/sql/observer.rs b/influxdb_iox/src/commands/sql/observer.rs similarity index 100% rename from src/commands/sql/observer.rs rename to influxdb_iox/src/commands/sql/observer.rs diff --git a/src/commands/sql/repl.rs b/influxdb_iox/src/commands/sql/repl.rs similarity index 100% rename from src/commands/sql/repl.rs rename to influxdb_iox/src/commands/sql/repl.rs diff --git a/src/commands/sql/repl_command.rs b/influxdb_iox/src/commands/sql/repl_command.rs similarity index 100% rename from src/commands/sql/repl_command.rs rename to influxdb_iox/src/commands/sql/repl_command.rs diff --git a/src/commands/tracing.rs b/influxdb_iox/src/commands/tracing.rs similarity index 100% rename from src/commands/tracing.rs rename to influxdb_iox/src/commands/tracing.rs diff --git a/src/influxdb_ioxd.rs b/influxdb_iox/src/influxdb_ioxd.rs similarity index 100% rename from src/influxdb_ioxd.rs rename to influxdb_iox/src/influxdb_ioxd.rs diff --git a/src/influxdb_ioxd/http.rs b/influxdb_iox/src/influxdb_ioxd/http.rs similarity index 100% rename from src/influxdb_ioxd/http.rs rename to influxdb_iox/src/influxdb_ioxd/http.rs diff --git a/src/influxdb_ioxd/http/heappy.rs b/influxdb_iox/src/influxdb_ioxd/http/heappy.rs similarity index 100% rename from src/influxdb_ioxd/http/heappy.rs rename to influxdb_iox/src/influxdb_ioxd/http/heappy.rs diff --git a/src/influxdb_ioxd/http/metrics.rs b/influxdb_iox/src/influxdb_ioxd/http/metrics.rs similarity index 100% rename from src/influxdb_ioxd/http/metrics.rs rename to influxdb_iox/src/influxdb_ioxd/http/metrics.rs diff --git a/src/influxdb_ioxd/http/pprof.rs b/influxdb_iox/src/influxdb_ioxd/http/pprof.rs similarity index 100% rename from src/influxdb_ioxd/http/pprof.rs rename to influxdb_iox/src/influxdb_ioxd/http/pprof.rs diff --git a/src/influxdb_ioxd/jemalloc.rs b/influxdb_iox/src/influxdb_ioxd/jemalloc.rs similarity index 100% rename from src/influxdb_ioxd/jemalloc.rs rename to influxdb_iox/src/influxdb_ioxd/jemalloc.rs diff --git a/src/influxdb_ioxd/planner.rs b/influxdb_iox/src/influxdb_ioxd/planner.rs similarity index 100% rename from src/influxdb_ioxd/planner.rs rename to influxdb_iox/src/influxdb_ioxd/planner.rs diff --git a/src/influxdb_ioxd/rpc.rs b/influxdb_iox/src/influxdb_ioxd/rpc.rs similarity index 100% rename from src/influxdb_ioxd/rpc.rs rename to influxdb_iox/src/influxdb_ioxd/rpc.rs diff --git a/src/influxdb_ioxd/rpc/error.rs b/influxdb_iox/src/influxdb_ioxd/rpc/error.rs similarity index 100% rename from src/influxdb_ioxd/rpc/error.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/error.rs diff --git a/src/influxdb_ioxd/rpc/flight.rs b/influxdb_iox/src/influxdb_ioxd/rpc/flight.rs similarity index 100% rename from src/influxdb_ioxd/rpc/flight.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/flight.rs diff --git a/src/influxdb_ioxd/rpc/management.rs b/influxdb_iox/src/influxdb_ioxd/rpc/management.rs similarity index 100% rename from src/influxdb_ioxd/rpc/management.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/management.rs diff --git a/src/influxdb_ioxd/rpc/operations.rs b/influxdb_iox/src/influxdb_ioxd/rpc/operations.rs similarity index 100% rename from src/influxdb_ioxd/rpc/operations.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/operations.rs diff --git a/src/influxdb_ioxd/rpc/storage.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage.rs similarity index 100% rename from src/influxdb_ioxd/rpc/storage.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage.rs diff --git a/src/influxdb_ioxd/rpc/storage/data.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage/data.rs similarity index 100% rename from src/influxdb_ioxd/rpc/storage/data.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage/data.rs diff --git a/src/influxdb_ioxd/rpc/storage/expr.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage/expr.rs similarity index 100% rename from src/influxdb_ioxd/rpc/storage/expr.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage/expr.rs diff --git a/src/influxdb_ioxd/rpc/storage/id.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage/id.rs similarity index 100% rename from src/influxdb_ioxd/rpc/storage/id.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage/id.rs diff --git a/src/influxdb_ioxd/rpc/storage/input.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage/input.rs similarity index 100% rename from src/influxdb_ioxd/rpc/storage/input.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage/input.rs diff --git a/src/influxdb_ioxd/rpc/storage/service.rs b/influxdb_iox/src/influxdb_ioxd/rpc/storage/service.rs similarity index 99% rename from src/influxdb_ioxd/rpc/storage/service.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/storage/service.rs index 4374466835..68d606f02a 100644 --- a/src/influxdb_ioxd/rpc/storage/service.rs +++ b/influxdb_iox/src/influxdb_ioxd/rpc/storage/service.rs @@ -1725,7 +1725,8 @@ mod tests { // Note we don't include the actual line / column in the // expected panic message to avoid needing to update the test // whenever the source code file changed. - let expected_error = "panicked at 'This is a test panic', src/influxdb_ioxd/rpc/testing.rs"; + let expected_error = + "panicked at 'This is a test panic', influxdb_iox/src/influxdb_ioxd/rpc/testing.rs"; assert_contains!(captured_logs, expected_error); // Ensure that panics don't exhaust the tokio executor by diff --git a/src/influxdb_ioxd/rpc/testing.rs b/influxdb_iox/src/influxdb_ioxd/rpc/testing.rs similarity index 100% rename from src/influxdb_ioxd/rpc/testing.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/testing.rs diff --git a/src/influxdb_ioxd/rpc/write.rs b/influxdb_iox/src/influxdb_ioxd/rpc/write.rs similarity index 100% rename from src/influxdb_ioxd/rpc/write.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/write.rs diff --git a/src/influxdb_ioxd/rpc/write_pb.rs b/influxdb_iox/src/influxdb_ioxd/rpc/write_pb.rs similarity index 100% rename from src/influxdb_ioxd/rpc/write_pb.rs rename to influxdb_iox/src/influxdb_ioxd/rpc/write_pb.rs diff --git a/src/influxdb_ioxd/serving_readiness.rs b/influxdb_iox/src/influxdb_ioxd/serving_readiness.rs similarity index 100% rename from src/influxdb_ioxd/serving_readiness.rs rename to influxdb_iox/src/influxdb_ioxd/serving_readiness.rs diff --git a/src/main.rs b/influxdb_iox/src/main.rs similarity index 100% rename from src/main.rs rename to influxdb_iox/src/main.rs diff --git a/src/structopt_blocks/mod.rs b/influxdb_iox/src/structopt_blocks/mod.rs similarity index 100% rename from src/structopt_blocks/mod.rs rename to influxdb_iox/src/structopt_blocks/mod.rs diff --git a/src/structopt_blocks/object_store.rs b/influxdb_iox/src/structopt_blocks/object_store.rs similarity index 100% rename from src/structopt_blocks/object_store.rs rename to influxdb_iox/src/structopt_blocks/object_store.rs diff --git a/src/structopt_blocks/server_id.rs b/influxdb_iox/src/structopt_blocks/server_id.rs similarity index 100% rename from src/structopt_blocks/server_id.rs rename to influxdb_iox/src/structopt_blocks/server_id.rs diff --git a/tests/common/mod.rs b/influxdb_iox/tests/common/mod.rs similarity index 100% rename from tests/common/mod.rs rename to influxdb_iox/tests/common/mod.rs diff --git a/tests/common/server_fixture.rs b/influxdb_iox/tests/common/server_fixture.rs similarity index 100% rename from tests/common/server_fixture.rs rename to influxdb_iox/tests/common/server_fixture.rs diff --git a/tests/common/udp_listener.rs b/influxdb_iox/tests/common/udp_listener.rs similarity index 100% rename from tests/common/udp_listener.rs rename to influxdb_iox/tests/common/udp_listener.rs diff --git a/tests/end_to_end.rs b/influxdb_iox/tests/end_to_end.rs similarity index 100% rename from tests/end_to_end.rs rename to influxdb_iox/tests/end_to_end.rs diff --git a/tests/end_to_end_cases/debug_cli.rs b/influxdb_iox/tests/end_to_end_cases/debug_cli.rs similarity index 100% rename from tests/end_to_end_cases/debug_cli.rs rename to influxdb_iox/tests/end_to_end_cases/debug_cli.rs diff --git a/tests/end_to_end_cases/deletes.rs b/influxdb_iox/tests/end_to_end_cases/deletes.rs similarity index 100% rename from tests/end_to_end_cases/deletes.rs rename to influxdb_iox/tests/end_to_end_cases/deletes.rs diff --git a/tests/end_to_end_cases/flight_api.rs b/influxdb_iox/tests/end_to_end_cases/flight_api.rs similarity index 100% rename from tests/end_to_end_cases/flight_api.rs rename to influxdb_iox/tests/end_to_end_cases/flight_api.rs diff --git a/tests/end_to_end_cases/freeze.rs b/influxdb_iox/tests/end_to_end_cases/freeze.rs similarity index 100% rename from tests/end_to_end_cases/freeze.rs rename to influxdb_iox/tests/end_to_end_cases/freeze.rs diff --git a/tests/end_to_end_cases/http.rs b/influxdb_iox/tests/end_to_end_cases/http.rs similarity index 100% rename from tests/end_to_end_cases/http.rs rename to influxdb_iox/tests/end_to_end_cases/http.rs diff --git a/tests/end_to_end_cases/influxdb_ioxd.rs b/influxdb_iox/tests/end_to_end_cases/influxdb_ioxd.rs similarity index 100% rename from tests/end_to_end_cases/influxdb_ioxd.rs rename to influxdb_iox/tests/end_to_end_cases/influxdb_ioxd.rs diff --git a/tests/end_to_end_cases/management_api.rs b/influxdb_iox/tests/end_to_end_cases/management_api.rs similarity index 100% rename from tests/end_to_end_cases/management_api.rs rename to influxdb_iox/tests/end_to_end_cases/management_api.rs diff --git a/tests/end_to_end_cases/management_cli.rs b/influxdb_iox/tests/end_to_end_cases/management_cli.rs similarity index 100% rename from tests/end_to_end_cases/management_cli.rs rename to influxdb_iox/tests/end_to_end_cases/management_cli.rs diff --git a/tests/end_to_end_cases/metrics.rs b/influxdb_iox/tests/end_to_end_cases/metrics.rs similarity index 100% rename from tests/end_to_end_cases/metrics.rs rename to influxdb_iox/tests/end_to_end_cases/metrics.rs diff --git a/tests/end_to_end_cases/mod.rs b/influxdb_iox/tests/end_to_end_cases/mod.rs similarity index 100% rename from tests/end_to_end_cases/mod.rs rename to influxdb_iox/tests/end_to_end_cases/mod.rs diff --git a/tests/end_to_end_cases/operations_api.rs b/influxdb_iox/tests/end_to_end_cases/operations_api.rs similarity index 100% rename from tests/end_to_end_cases/operations_api.rs rename to influxdb_iox/tests/end_to_end_cases/operations_api.rs diff --git a/tests/end_to_end_cases/operations_cli.rs b/influxdb_iox/tests/end_to_end_cases/operations_cli.rs similarity index 100% rename from tests/end_to_end_cases/operations_cli.rs rename to influxdb_iox/tests/end_to_end_cases/operations_cli.rs diff --git a/tests/end_to_end_cases/persistence.rs b/influxdb_iox/tests/end_to_end_cases/persistence.rs similarity index 100% rename from tests/end_to_end_cases/persistence.rs rename to influxdb_iox/tests/end_to_end_cases/persistence.rs diff --git a/tests/end_to_end_cases/read_api.rs b/influxdb_iox/tests/end_to_end_cases/read_api.rs similarity index 100% rename from tests/end_to_end_cases/read_api.rs rename to influxdb_iox/tests/end_to_end_cases/read_api.rs diff --git a/tests/end_to_end_cases/read_cli.rs b/influxdb_iox/tests/end_to_end_cases/read_cli.rs similarity index 100% rename from tests/end_to_end_cases/read_cli.rs rename to influxdb_iox/tests/end_to_end_cases/read_cli.rs diff --git a/tests/end_to_end_cases/run_cli.rs b/influxdb_iox/tests/end_to_end_cases/run_cli.rs similarity index 100% rename from tests/end_to_end_cases/run_cli.rs rename to influxdb_iox/tests/end_to_end_cases/run_cli.rs diff --git a/tests/end_to_end_cases/scenario.rs b/influxdb_iox/tests/end_to_end_cases/scenario.rs similarity index 100% rename from tests/end_to_end_cases/scenario.rs rename to influxdb_iox/tests/end_to_end_cases/scenario.rs diff --git a/tests/end_to_end_cases/sql_cli.rs b/influxdb_iox/tests/end_to_end_cases/sql_cli.rs similarity index 100% rename from tests/end_to_end_cases/sql_cli.rs rename to influxdb_iox/tests/end_to_end_cases/sql_cli.rs diff --git a/tests/end_to_end_cases/storage_api.rs b/influxdb_iox/tests/end_to_end_cases/storage_api.rs similarity index 100% rename from tests/end_to_end_cases/storage_api.rs rename to influxdb_iox/tests/end_to_end_cases/storage_api.rs diff --git a/tests/end_to_end_cases/system_tables.rs b/influxdb_iox/tests/end_to_end_cases/system_tables.rs similarity index 100% rename from tests/end_to_end_cases/system_tables.rs rename to influxdb_iox/tests/end_to_end_cases/system_tables.rs diff --git a/tests/end_to_end_cases/tracing.rs b/influxdb_iox/tests/end_to_end_cases/tracing.rs similarity index 100% rename from tests/end_to_end_cases/tracing.rs rename to influxdb_iox/tests/end_to_end_cases/tracing.rs diff --git a/tests/end_to_end_cases/write_api.rs b/influxdb_iox/tests/end_to_end_cases/write_api.rs similarity index 100% rename from tests/end_to_end_cases/write_api.rs rename to influxdb_iox/tests/end_to_end_cases/write_api.rs diff --git a/tests/end_to_end_cases/write_buffer.rs b/influxdb_iox/tests/end_to_end_cases/write_buffer.rs similarity index 100% rename from tests/end_to_end_cases/write_buffer.rs rename to influxdb_iox/tests/end_to_end_cases/write_buffer.rs diff --git a/tests/end_to_end_cases/write_cli.rs b/influxdb_iox/tests/end_to_end_cases/write_cli.rs similarity index 100% rename from tests/end_to_end_cases/write_cli.rs rename to influxdb_iox/tests/end_to_end_cases/write_cli.rs diff --git a/tests/end_to_end_cases/write_pb.rs b/influxdb_iox/tests/end_to_end_cases/write_pb.rs similarity index 100% rename from tests/end_to_end_cases/write_pb.rs rename to influxdb_iox/tests/end_to_end_cases/write_pb.rs diff --git a/influxdb_tsm/src/mapper.rs b/influxdb_tsm/src/mapper.rs index 19195c4e47..cf30aeb89e 100644 --- a/influxdb_tsm/src/mapper.rs +++ b/influxdb_tsm/src/mapper.rs @@ -655,7 +655,7 @@ mod tests { #[test] fn map_tsm_index() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); @@ -671,7 +671,7 @@ mod tests { #[test] fn map_field_columns_file() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); @@ -714,7 +714,7 @@ mod tests { #[test] fn measurement_table_columns() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); diff --git a/influxdb_tsm/src/reader.rs b/influxdb_tsm/src/reader.rs index dd3366c0ce..eccd02b6ca 100644 --- a/influxdb_tsm/src/reader.rs +++ b/influxdb_tsm/src/reader.rs @@ -19,7 +19,7 @@ use std::u64; /// # use std::io::BufReader; /// # use std::io::Cursor; /// # use std::io::Read; -/// # let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); +/// # let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); /// # let mut decoder = GzDecoder::new(file.unwrap()); /// # let mut buf = Vec::new(); /// # decoder.read_to_end(&mut buf).unwrap(); @@ -687,7 +687,7 @@ mod tests { #[test] fn read_tsm_index() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); @@ -700,7 +700,7 @@ mod tests { #[test] fn read_tsm_block() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); @@ -754,7 +754,7 @@ mod tests { #[test] fn decode_tsm_blocks() { - let file = File::open("../tests/fixtures/000000000000005-000000002.tsm.gz"); + let file = File::open("../test_fixtures/000000000000005-000000002.tsm.gz"); let mut decoder = GzDecoder::new(file.unwrap()); let mut buf = Vec::new(); decoder.read_to_end(&mut buf).unwrap(); @@ -833,12 +833,12 @@ mod tests { #[test] fn check_tsm_cpu_usage() { - walk_index_and_check_for_errors("../tests/fixtures/cpu_usage.tsm.gz"); + walk_index_and_check_for_errors("../test_fixtures/cpu_usage.tsm.gz"); } #[test] fn check_tsm_000000000000005_000000002() { - walk_index_and_check_for_errors("../tests/fixtures/000000000000005-000000002.tsm.gz"); + walk_index_and_check_for_errors("../test_fixtures/000000000000005-000000002.tsm.gz"); } #[test] diff --git a/mutable_batch_lp/benches/write_lp.rs b/mutable_batch_lp/benches/write_lp.rs index 0a52daf739..d3038cd6e4 100644 --- a/mutable_batch_lp/benches/write_lp.rs +++ b/mutable_batch_lp/benches/write_lp.rs @@ -7,7 +7,7 @@ use flate2::read::GzDecoder; use mutable_batch_lp::lines_to_batches; fn generate_lp_bytes() -> Bytes { - let raw = include_bytes!("../../tests/fixtures/lineproto/read_filter.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/read_filter.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut buffer = Vec::new(); diff --git a/server_benchmarks/benches/line_parser.rs b/server_benchmarks/benches/line_parser.rs index 42eef49fac..44f6c2bc96 100644 --- a/server_benchmarks/benches/line_parser.rs +++ b/server_benchmarks/benches/line_parser.rs @@ -1,7 +1,7 @@ use criterion::{criterion_group, criterion_main, Criterion, Throughput}; use std::time::Duration; -static LINES: &str = include_str!("../../tests/fixtures/lineproto/prometheus.lp"); +static LINES: &str = include_str!("../../test_fixtures/lineproto/prometheus.lp"); fn line_parser(c: &mut Criterion) { let mut group = c.benchmark_group("line_parser"); diff --git a/server_benchmarks/benches/read_filter.rs b/server_benchmarks/benches/read_filter.rs index c57c1742d6..e871151bf8 100644 --- a/server_benchmarks/benches/read_filter.rs +++ b/server_benchmarks/benches/read_filter.rs @@ -40,7 +40,7 @@ use server::db::Db; // In total there are 10K rows. The timespan of the points in the line // protocol is around 1m of wall-clock time. async fn setup_scenarios() -> Vec { - let raw = include_bytes!("../../tests/fixtures/lineproto/read_filter.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/read_filter.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut lp = String::new(); gz.read_to_string(&mut lp).unwrap(); diff --git a/server_benchmarks/benches/read_group.rs b/server_benchmarks/benches/read_group.rs index 2eb29af995..a44c01edb1 100644 --- a/server_benchmarks/benches/read_group.rs +++ b/server_benchmarks/benches/read_group.rs @@ -41,7 +41,7 @@ use server::db::Db; // In total there are 10K rows. The timespan of the points in the line // protocol is around 1m of wall-clock time. async fn setup_scenarios() -> Vec { - let raw = include_bytes!("../../tests/fixtures/lineproto/read_filter.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/read_filter.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut lp = String::new(); gz.read_to_string(&mut lp).unwrap(); diff --git a/server_benchmarks/benches/snapshot.rs b/server_benchmarks/benches/snapshot.rs index d971b05a1a..490d2205c5 100644 --- a/server_benchmarks/benches/snapshot.rs +++ b/server_benchmarks/benches/snapshot.rs @@ -12,7 +12,7 @@ fn snapshot_chunk(chunk: &MBChunk) { fn chunk(count: usize) -> MBChunk { let mut chunk: Option = None; - let raw = include_bytes!("../../tests/fixtures/lineproto/tag_values.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/tag_values.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut lp = String::new(); gz.read_to_string(&mut lp).unwrap(); diff --git a/server_benchmarks/benches/tag_values.rs b/server_benchmarks/benches/tag_values.rs index d7c43871f8..0b6d177551 100644 --- a/server_benchmarks/benches/tag_values.rs +++ b/server_benchmarks/benches/tag_values.rs @@ -38,7 +38,7 @@ use server::db::Db; // The timespan of the points in the line protocol is around 1m or wall-clock // time. async fn setup_scenarios() -> Vec { - let raw = include_bytes!("../../tests/fixtures/lineproto/tag_values.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/tag_values.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut lp = String::new(); gz.read_to_string(&mut lp).unwrap(); diff --git a/server_benchmarks/benches/write.rs b/server_benchmarks/benches/write.rs index 90d04f5e95..fc6441373e 100644 --- a/server_benchmarks/benches/write.rs +++ b/server_benchmarks/benches/write.rs @@ -33,7 +33,7 @@ fn write_chunk(count: usize, entries: &[Entry]) { } fn load_entries() -> Vec { - let raw = include_bytes!("../../tests/fixtures/lineproto/tag_values.lp.gz"); + let raw = include_bytes!("../../test_fixtures/lineproto/tag_values.lp.gz"); let mut gz = GzDecoder::new(&raw[..]); let mut lp = String::new(); gz.read_to_string(&mut lp).unwrap(); diff --git a/tests/fixtures/000000000000005-000000002.tsm.gz b/test_fixtures/000000000000005-000000002.tsm.gz similarity index 100% rename from tests/fixtures/000000000000005-000000002.tsm.gz rename to test_fixtures/000000000000005-000000002.tsm.gz diff --git a/tests/fixtures/000000000000462-000000002.tsm.gz b/test_fixtures/000000000000462-000000002.tsm.gz similarity index 100% rename from tests/fixtures/000000000000462-000000002.tsm.gz rename to test_fixtures/000000000000462-000000002.tsm.gz diff --git a/tests/fixtures/cpu_usage.tsm.gz b/test_fixtures/cpu_usage.tsm.gz similarity index 100% rename from tests/fixtures/cpu_usage.tsm.gz rename to test_fixtures/cpu_usage.tsm.gz diff --git a/tests/fixtures/lineproto/air_and_water.lp b/test_fixtures/lineproto/air_and_water.lp similarity index 100% rename from tests/fixtures/lineproto/air_and_water.lp rename to test_fixtures/lineproto/air_and_water.lp diff --git a/tests/fixtures/lineproto/metrics.lp b/test_fixtures/lineproto/metrics.lp similarity index 100% rename from tests/fixtures/lineproto/metrics.lp rename to test_fixtures/lineproto/metrics.lp diff --git a/tests/fixtures/lineproto/prometheus.lp b/test_fixtures/lineproto/prometheus.lp similarity index 100% rename from tests/fixtures/lineproto/prometheus.lp rename to test_fixtures/lineproto/prometheus.lp diff --git a/tests/fixtures/lineproto/read_filter.lp.gz b/test_fixtures/lineproto/read_filter.lp.gz similarity index 100% rename from tests/fixtures/lineproto/read_filter.lp.gz rename to test_fixtures/lineproto/read_filter.lp.gz diff --git a/tests/fixtures/lineproto/tag_values.lp.gz b/test_fixtures/lineproto/tag_values.lp.gz similarity index 100% rename from tests/fixtures/lineproto/tag_values.lp.gz rename to test_fixtures/lineproto/tag_values.lp.gz diff --git a/tests/fixtures/lineproto/temperature.lp b/test_fixtures/lineproto/temperature.lp similarity index 100% rename from tests/fixtures/lineproto/temperature.lp rename to test_fixtures/lineproto/temperature.lp diff --git a/tests/fixtures/merge-tsm/merge_a.tsm.gz b/test_fixtures/merge-tsm/merge_a.tsm.gz similarity index 100% rename from tests/fixtures/merge-tsm/merge_a.tsm.gz rename to test_fixtures/merge-tsm/merge_a.tsm.gz diff --git a/tests/fixtures/merge-tsm/merge_b.tsm.gz b/test_fixtures/merge-tsm/merge_b.tsm.gz similarity index 100% rename from tests/fixtures/merge-tsm/merge_b.tsm.gz rename to test_fixtures/merge-tsm/merge_b.tsm.gz diff --git a/tests/fixtures/parquet/temperature.parquet b/test_fixtures/parquet/temperature.parquet similarity index 100% rename from tests/fixtures/parquet/temperature.parquet rename to test_fixtures/parquet/temperature.parquet