refactor: rename delorean_data_types crate to data_type (#407)

* refactor: rename delorean_data_types crate to data_type - #401

* fix: fmt

Cargo.lock

@@ -697,6 +697,19 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "data_types"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "crc32fast",
+ "delorean_generated_types",
+ "delorean_line_parser",
+ "flatbuffers",
+ "serde",
+ "snafu",
+]
+
 [[package]]
 name = "datafusion"
 version = "3.0.0-SNAPSHOT"
@@ -783,8 +796,8 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "bytes",
+ "data_types",
  "delorean_arrow",
- "delorean_data_types",
  "delorean_generated_types",
  "delorean_line_parser",
  "delorean_object_store",
@@ -797,19 +810,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "delorean_data_types"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "crc32fast",
- "delorean_generated_types",
- "delorean_line_parser",
- "flatbuffers",
- "serde",
- "snafu",
-]
-
 [[package]]
 name = "delorean_generated_types"
 version = "0.1.0"
@@ -912,8 +912,8 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "croaring",
+ "data_types",
  "delorean_arrow",
- "delorean_data_types",
  "delorean_line_parser",
  "delorean_test_helpers",
  "serde",
@@ -1005,8 +1005,8 @@ dependencies = [
  "async-trait",
  "chrono",
  "criterion",
+ "data_types",
  "delorean_arrow",
- "delorean_data_types",
  "delorean_generated_types",
  "delorean_line_parser",
  "delorean_storage",

Cargo.toml

@@ -9,7 +9,7 @@ default-run = "delorean"
 members = [
     "delorean_arrow",
     "delorean_cluster",
-    "delorean_data_types",
+    "data_types",
     "delorean_generated_types",
     "delorean_ingest",
     "delorean_line_parser",

data_types/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "delorean_data_types"
+name = "data_types"
 version = "0.1.0"
 authors = ["pauldix <paul@pauldix.net>"]
 edition = "2018"

delorean_cluster/Cargo.toml

@@ -11,7 +11,7 @@ snafu = "0.6"
 serde = "1.0"
 serde_json = "1.0"
 async-trait = "0.1"
-delorean_data_types = { path = "../delorean_data_types" }
+data_types = { path = "../data_types" }
 delorean_generated_types = { path = "../delorean_generated_types" }
 delorean_line_parser = { path = "../delorean_line_parser" }
 delorean_storage = { path = "../delorean_storage" }

delorean_cluster/src/lib.rs

@@ -71,11 +71,11 @@ use std::{
     },
 };
 
-use delorean_arrow::arrow::record_batch::RecordBatch;
-use delorean_data_types::{
+use data_types::{
     data::{lines_to_replicated_write, ReplicatedWrite},
     database_rules::{DatabaseRules, HostGroup, HostGroupId, MatchTables},
 };
+use delorean_arrow::arrow::record_batch::RecordBatch;
 use delorean_line_parser::ParsedLine;
 use delorean_object_store::ObjectStore;
 use delorean_storage::Database;
@@ -405,8 +405,8 @@ fn config_location(id: u32) -> String {
 mod tests {
     use super::*;
     use async_trait::async_trait;
+    use data_types::database_rules::{MatchTables, Matcher, Subscription};
     use delorean_arrow::arrow::{csv, util::string_writer::StringWriter};
-    use delorean_data_types::database_rules::{MatchTables, Matcher, Subscription};
     use delorean_line_parser::parse_lines;
     use delorean_object_store::{InMemory, ObjectStoreIntegration};
     use futures::TryStreamExt;

delorean_mem_qe/Cargo.toml

@@ -21,4 +21,4 @@ human_format = "1.0.3"
 
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = "0.3"

delorean_storage/Cargo.toml

@@ -17,5 +17,5 @@ croaring = "0.4.5"
 
 delorean_arrow = { path = "../delorean_arrow" }
 delorean_line_parser = { path = "../delorean_line_parser" }
-delorean_data_types = { path = "../delorean_data_types" }
-delorean_test_helpers = { path = "../delorean_test_helpers" }
+data_types = { path = "../data_types" }
+delorean_test_helpers = { path = "../delorean_test_helpers" }

delorean_storage/src/exec/fieldlist.rs

@@ -3,13 +3,13 @@
 //! pull them from RecordBatches
 use std::collections::BTreeMap;
 
+use data_types::TIME_COLUMN_NAME;
 use delorean_arrow::arrow::{
     self,
     array::Int64Array,
     datatypes::{DataType, SchemaRef},
     record_batch::RecordBatch,
 };
-use delorean_data_types::TIME_COLUMN_NAME;
 
 use snafu::{ensure, ResultExt, Snafu};
 

delorean_storage/src/exec/seriesset.rs

@@ -22,11 +22,11 @@ use std::sync::Arc;
 use arrow::{
     array::StringArray, datatypes::DataType, datatypes::SchemaRef, record_batch::RecordBatch,
 };
+use data_types::TIME_COLUMN_NAME;
 use delorean_arrow::{
     arrow::{self},
     datafusion::physical_plan::SendableRecordBatchStream,
 };
-use delorean_data_types::TIME_COLUMN_NAME;
 use snafu::{ResultExt, Snafu};
 use tokio::stream::StreamExt;
 use tokio::sync::mpsc::{self, error::SendError};

delorean_storage/src/lib.rs

@@ -7,8 +7,8 @@
 )]
 
 use async_trait::async_trait;
+use data_types::data::ReplicatedWrite;
 use delorean_arrow::{arrow::record_batch::RecordBatch, datafusion::logical_plan::Expr};
-use delorean_data_types::data::ReplicatedWrite;
 use delorean_line_parser::ParsedLine;
 use exec::{FieldListPlan, GroupedSeriesSetPlans, SeriesSetPlans, StringSetPlan};
 

delorean_storage/src/test.rs

@@ -12,7 +12,7 @@ use crate::{
     Database, DatabaseStore, Predicate, TimestampRange,
 };
 
-use delorean_data_types::data::ReplicatedWrite;
+use data_types::data::ReplicatedWrite;
 use delorean_line_parser::{parse_lines, ParsedLine};
 
 use async_trait::async_trait;

delorean_write_buffer/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 
 delorean_arrow = { path = "../delorean_arrow" }
-delorean_data_types = { path = "../delorean_data_types" }
+data_types = { path = "../data_types" }
 delorean_generated_types = { path = "../delorean_generated_types" }
 delorean_line_parser = { path = "../delorean_line_parser" }
 delorean_storage = { path = "../delorean_storage" }

delorean_write_buffer/src/column.rs

@@ -2,7 +2,7 @@ use delorean_generated_types::wal as wb;
 use snafu::Snafu;
 
 use crate::dictionary::Dictionary;
-use delorean_data_types::{data::type_description, partition_metadata::Statistics};
+use data_types::{data::type_description, partition_metadata::Statistics};
 
 #[derive(Debug, Snafu)]
 pub enum Error {

delorean_write_buffer/src/database.rs

@@ -20,6 +20,7 @@ use std::io::ErrorKind;
 use std::path::PathBuf;
 use std::sync::Arc;
 
+use data_types::data::{split_lines_into_write_entry_partitions, ReplicatedWrite};
 use delorean_arrow::{
     arrow,
     arrow::{datatypes::Schema as ArrowSchema, record_batch::RecordBatch},
@@ -32,7 +33,6 @@ use delorean_arrow::{
         datasource::MemTable, error::DataFusionError, execution::context::ExecutionContext,
     },
 };
-use delorean_data_types::data::{split_lines_into_write_entry_partitions, ReplicatedWrite};
 
 use crate::dictionary::Error as DictionaryError;
 use crate::partition::restore_partitions_from_wal;

delorean_write_buffer/src/partition.rs

@@ -3,7 +3,7 @@ use delorean_generated_types::wal as wb;
 use delorean_wal::{Entry as WalEntry, Result as WalResult};
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 
-use delorean_data_types::TIME_COLUMN_NAME;
+use data_types::TIME_COLUMN_NAME;
 use delorean_storage::TimestampRange;
 
 use crate::dictionary::Dictionary;

delorean_write_buffer/src/table.rs

@@ -14,7 +14,7 @@ use crate::{
     dictionary::{Dictionary, Error as DictionaryError},
     partition::Partition,
 };
-use delorean_data_types::TIME_COLUMN_NAME;
+use data_types::TIME_COLUMN_NAME;
 use snafu::{OptionExt, ResultExt, Snafu};
 
 use delorean_arrow::{
@@ -1074,7 +1074,7 @@ impl IntoExpr for str {
 #[cfg(test)]
 mod tests {
     use arrow::util::pretty::pretty_format_batches;
-    use delorean_data_types::data::split_lines_into_write_entry_partitions;
+    use data_types::data::split_lines_into_write_entry_partitions;
     use delorean_line_parser::{parse_lines, ParsedLine};
     use delorean_storage::exec::Executor;
     use delorean_test_helpers::str_vec_to_arc_vec;