From 9df6c2449382ea5dd5d4ffead35bf092d84f44cf Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Thu, 5 Nov 2020 09:36:46 -0500 Subject: [PATCH] refactor: rename delorean_mem_qe --> mem_qe (#414) --- Cargo.lock | 34 +++++++++---------- Cargo.toml | 4 +-- {delorean_mem_qe => mem_qe}/Cargo.toml | 2 +- .../benches/encoding.rs | 4 +-- {delorean_mem_qe => mem_qe}/src/adapter.rs | 0 {delorean_mem_qe => mem_qe}/src/bin/main.rs | 10 +++--- {delorean_mem_qe => mem_qe}/src/column.rs | 0 {delorean_mem_qe => mem_qe}/src/encoding.rs | 0 {delorean_mem_qe => mem_qe}/src/lib.rs | 0 {delorean_mem_qe => mem_qe}/src/segment.rs | 0 {delorean_mem_qe => mem_qe}/src/sorter.rs | 0 11 files changed, 27 insertions(+), 27 deletions(-) rename {delorean_mem_qe => mem_qe}/Cargo.toml (94%) rename {delorean_mem_qe => mem_qe}/benches/encoding.rs (94%) rename {delorean_mem_qe => mem_qe}/src/adapter.rs (100%) rename {delorean_mem_qe => mem_qe}/src/bin/main.rs (98%) rename {delorean_mem_qe => mem_qe}/src/column.rs (100%) rename {delorean_mem_qe => mem_qe}/src/encoding.rs (100%) rename {delorean_mem_qe => mem_qe}/src/lib.rs (100%) rename {delorean_mem_qe => mem_qe}/src/segment.rs (100%) rename {delorean_mem_qe => mem_qe}/src/sorter.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index fff9d80835..79fd90fb84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -710,7 +710,6 @@ dependencies = [ "delorean_generated_types", "delorean_ingest", "delorean_line_parser", - "delorean_mem_qe", "delorean_segment_store", "delorean_storage", "delorean_test_helpers", @@ -725,6 +724,7 @@ dependencies = [ "hyper", "influxdb2_client", "libflate", + "mem_qe", "object_store", "packers", "predicates", @@ -813,22 +813,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "delorean_mem_qe" -version = "0.1.0" -dependencies = [ - "chrono", - "criterion", - "croaring", - "crossbeam", - "delorean_arrow", - "env_logger", - "human_format", - "packers", - "snafu", - "tracing", -] - [[package]] name = "delorean_segment_store" version = "0.1.0" @@ -1655,6 +1639,22 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +[[package]] +name = "mem_qe" +version = "0.1.0" +dependencies = [ + "chrono", + "criterion", + "croaring", + "crossbeam", + "delorean_arrow", + "env_logger", + "human_format", + "packers", + "snafu", + "tracing", +] + [[package]] name = "memchr" version = "2.3.3" diff --git a/Cargo.toml b/Cargo.toml index 7667bdc3b0..e9cfcdb142 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ members = [ "delorean_ingest", "delorean_line_parser", "object_store", - "delorean_mem_qe", + "mem_qe", "delorean_segment_store", "packers", "delorean_test_helpers", @@ -34,7 +34,7 @@ delorean_arrow = { path = "delorean_arrow" } delorean_generated_types = { path = "delorean_generated_types" } delorean_ingest = { path = "delorean_ingest" } delorean_line_parser = { path = "delorean_line_parser" } -delorean_mem_qe = { path = "delorean_mem_qe" } +mem_qe = { path = "mem_qe" } delorean_segment_store = { path = "delorean_segment_store" } packers = { path = "packers" } delorean_write_buffer = { path = "delorean_write_buffer" } diff --git a/delorean_mem_qe/Cargo.toml b/mem_qe/Cargo.toml similarity index 94% rename from delorean_mem_qe/Cargo.toml rename to mem_qe/Cargo.toml index ae23363ad4..fc167b5f71 100644 --- a/delorean_mem_qe/Cargo.toml +++ b/mem_qe/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "delorean_mem_qe" +name = "mem_qe" version = "0.1.0" authors = ["Edd Robinson "] edition = "2018" diff --git a/delorean_mem_qe/benches/encoding.rs b/mem_qe/benches/encoding.rs similarity index 94% rename from delorean_mem_qe/benches/encoding.rs rename to mem_qe/benches/encoding.rs index 34ad9108ee..db4116303d 100644 --- a/delorean_mem_qe/benches/encoding.rs +++ b/mem_qe/benches/encoding.rs @@ -21,7 +21,7 @@ fn benchmark_row_ids( let mut group = c.benchmark_group(benchmark_group_name); for &batch_size in batch_sizes { for &cardinality in cardinalities { - let mut input = delorean_mem_qe::encoding::DictionaryRLE::new(); + let mut input = mem_qe::encoding::DictionaryRLE::new(); let values = batch_size / cardinality; for i in 0..cardinality { input.push_additional(Some(i.to_string()), values as u64); @@ -63,7 +63,7 @@ fn benchmark_row_ids_roaring( let mut group = c.benchmark_group(benchmark_group_name); for &batch_size in batch_sizes { for &cardinality in cardinalities { - let mut input = delorean_mem_qe::encoding::DictionaryRLE::new(); + let mut input = mem_qe::encoding::DictionaryRLE::new(); let values = batch_size / cardinality; for i in 0..cardinality { input.push_additional(Some(i.to_string()), values as u64); diff --git a/delorean_mem_qe/src/adapter.rs b/mem_qe/src/adapter.rs similarity index 100% rename from delorean_mem_qe/src/adapter.rs rename to mem_qe/src/adapter.rs diff --git a/delorean_mem_qe/src/bin/main.rs b/mem_qe/src/bin/main.rs similarity index 98% rename from delorean_mem_qe/src/bin/main.rs rename to mem_qe/src/bin/main.rs index 5972e91129..69afb559bc 100644 --- a/delorean_mem_qe/src/bin/main.rs +++ b/mem_qe/src/bin/main.rs @@ -15,11 +15,11 @@ use tracing::debug; use delorean_arrow::arrow::record_batch::{RecordBatch, RecordBatchReader}; use delorean_arrow::arrow::{array, array::Array, datatypes, ipc}; use delorean_arrow::parquet::arrow::arrow_reader::ArrowReader; -use delorean_mem_qe::column; -use delorean_mem_qe::column::{AggregateType, Column}; -use delorean_mem_qe::segment::{ColumnType, GroupingStrategy, Schema, Segment}; -use delorean_mem_qe::Store; -// use delorean_mem_qe::{adapter::DeloreanQueryEngine, Store}; +use mem_qe::column; +use mem_qe::column::{AggregateType, Column}; +use mem_qe::segment::{ColumnType, GroupingStrategy, Schema, Segment}; +use mem_qe::Store; +// use mem_qe::{adapter::DeloreanQueryEngine, Store}; #[derive(Snafu, Debug, Clone, Copy, PartialEq)] pub enum Error {} diff --git a/delorean_mem_qe/src/column.rs b/mem_qe/src/column.rs similarity index 100% rename from delorean_mem_qe/src/column.rs rename to mem_qe/src/column.rs diff --git a/delorean_mem_qe/src/encoding.rs b/mem_qe/src/encoding.rs similarity index 100% rename from delorean_mem_qe/src/encoding.rs rename to mem_qe/src/encoding.rs diff --git a/delorean_mem_qe/src/lib.rs b/mem_qe/src/lib.rs similarity index 100% rename from delorean_mem_qe/src/lib.rs rename to mem_qe/src/lib.rs diff --git a/delorean_mem_qe/src/segment.rs b/mem_qe/src/segment.rs similarity index 100% rename from delorean_mem_qe/src/segment.rs rename to mem_qe/src/segment.rs diff --git a/delorean_mem_qe/src/sorter.rs b/mem_qe/src/sorter.rs similarity index 100% rename from delorean_mem_qe/src/sorter.rs rename to mem_qe/src/sorter.rs