From ac2ec6f71a18a2a79dc33369adc18157dc1a7897 Mon Sep 17 00:00:00 2001 From: Sayan Nandan Date: Thu, 27 Apr 2023 07:55:35 -0700 Subject: [PATCH] Move dc into data --- server/src/engine/core/index/key.rs | 2 +- server/src/engine/core/mod.rs | 2 -- server/src/engine/core/model/mod.rs | 7 ++++--- server/src/engine/core/tests/model/layer.rs | 2 +- server/src/engine/core/tests/space/alter.rs | 2 +- server/src/engine/core/tests/space/create.rs | 2 +- server/src/engine/{core/model => data}/cell.rs | 0 server/src/engine/data/md_dict.rs | 6 ++++-- server/src/engine/data/mod.rs | 1 + server/src/engine/data/tests/md_dict_tests.rs | 6 +++--- server/src/engine/ql/ast/mod.rs | 3 +-- server/src/engine/ql/dml/ins.rs | 2 +- server/src/engine/ql/tests.rs | 2 +- 13 files changed, 19 insertions(+), 18 deletions(-) rename server/src/engine/{core/model => data}/cell.rs (100%) diff --git a/server/src/engine/core/index/key.rs b/server/src/engine/core/index/key.rs index 2b42fabc..7037f405 100644 --- a/server/src/engine/core/index/key.rs +++ b/server/src/engine/core/index/key.rs @@ -28,8 +28,8 @@ use crate::{engine::data::spec::Dataspec1D, util::test_utils}; use { crate::engine::{ - core::model::cell::Datacell, data::{ + cell::Datacell, lit::LitIR, spec::DataspecMeta1D, tag::{DataTag, TagUnique}, diff --git a/server/src/engine/core/mod.rs b/server/src/engine/core/mod.rs index 29d2f965..57033691 100644 --- a/server/src/engine/core/mod.rs +++ b/server/src/engine/core/mod.rs @@ -41,8 +41,6 @@ use { }, parking_lot::RwLock, }; -// re-exports -pub use model::cell::Datacell; /// Use this for now since it substitutes for a file lock (and those syscalls are expensive), /// but something better is in the offing diff --git a/server/src/engine/core/model/mod.rs b/server/src/engine/core/model/mod.rs index 99c4c023..83cb0074 100644 --- a/server/src/engine/core/model/mod.rs +++ b/server/src/engine/core/model/mod.rs @@ -25,7 +25,6 @@ */ pub(super) mod alt; -pub mod cell; #[cfg(test)] use std::cell::RefCell; @@ -34,8 +33,10 @@ use super::util::EntityLocator; use { crate::engine::{ - core::model::cell::Datacell, - data::tag::{DataTag, FullTag, TagClass, TagSelector}, + data::{ + cell::Datacell, + tag::{DataTag, FullTag, TagClass, TagSelector}, + }, error::{DatabaseError, DatabaseResult}, idx::{IndexSTSeqCns, STIndex, STIndexSeq}, mem::VInline, diff --git a/server/src/engine/core/tests/model/layer.rs b/server/src/engine/core/tests/model/layer.rs index 626940fa..10ebf68f 100644 --- a/server/src/engine/core/tests/model/layer.rs +++ b/server/src/engine/core/tests/model/layer.rs @@ -80,7 +80,7 @@ mod layer_spec_validation { mod layer_data_validation { use { super::{layerview, layerview_nullable}, - crate::engine::core::model::{self, cell::Datacell}, + crate::engine::{core::model, data::cell::Datacell}, }; #[test] fn bool() { diff --git a/server/src/engine/core/tests/space/alter.rs b/server/src/engine/core/tests/space/alter.rs index 8c18f6ee..190d4fa8 100644 --- a/server/src/engine/core/tests/space/alter.rs +++ b/server/src/engine/core/tests/space/alter.rs @@ -26,10 +26,10 @@ use crate::engine::{ core::{ - model::cell::Datacell, space::{Space, SpaceMeta}, GlobalNS, }, + data::cell::Datacell, error::DatabaseError, }; diff --git a/server/src/engine/core/tests/space/create.rs b/server/src/engine/core/tests/space/create.rs index 0170add2..707a6305 100644 --- a/server/src/engine/core/tests/space/create.rs +++ b/server/src/engine/core/tests/space/create.rs @@ -26,10 +26,10 @@ use crate::engine::{ core::{ - model::cell::Datacell, space::{Space, SpaceMeta}, GlobalNS, }, + data::cell::Datacell, error::DatabaseError, }; diff --git a/server/src/engine/core/model/cell.rs b/server/src/engine/data/cell.rs similarity index 100% rename from server/src/engine/core/model/cell.rs rename to server/src/engine/data/cell.rs diff --git a/server/src/engine/data/md_dict.rs b/server/src/engine/data/md_dict.rs index dcff3aff..bb06af98 100644 --- a/server/src/engine/data/md_dict.rs +++ b/server/src/engine/data/md_dict.rs @@ -26,8 +26,10 @@ use { crate::engine::{ - core::Datacell, - data::lit::{Lit, LitIR}, + data::{ + cell::Datacell, + lit::{Lit, LitIR}, + }, idx::STIndex, }, std::collections::HashMap, diff --git a/server/src/engine/data/mod.rs b/server/src/engine/data/mod.rs index f58ba49a..499f6092 100644 --- a/server/src/engine/data/mod.rs +++ b/server/src/engine/data/mod.rs @@ -26,6 +26,7 @@ #[macro_use] mod macros; +pub mod cell; pub mod lit; pub mod md_dict; pub mod spec; diff --git a/server/src/engine/data/tests/md_dict_tests.rs b/server/src/engine/data/tests/md_dict_tests.rs index ffd07576..467cc862 100644 --- a/server/src/engine/data/tests/md_dict_tests.rs +++ b/server/src/engine/data/tests/md_dict_tests.rs @@ -24,9 +24,9 @@ * */ -use crate::engine::{ - core::Datacell, - data::md_dict::{self, DictEntryGeneric, DictGeneric, MetaDict, MetaDictEntry}, +use crate::engine::data::{ + cell::Datacell, + md_dict::{self, DictEntryGeneric, DictGeneric, MetaDict, MetaDictEntry}, }; #[test] diff --git a/server/src/engine/ql/ast/mod.rs b/server/src/engine/ql/ast/mod.rs index 296f33a2..9d27d045 100644 --- a/server/src/engine/ql/ast/mod.rs +++ b/server/src/engine/ql/ast/mod.rs @@ -36,8 +36,7 @@ use { }, crate::{ engine::{ - core::Datacell, - data::lit::LitIR, + data::{cell::Datacell, lit::LitIR}, error::{LangError, LangResult}, }, util::{compiler, MaybeInit}, diff --git a/server/src/engine/ql/dml/ins.rs b/server/src/engine/ql/dml/ins.rs index 8aa30097..0376e64f 100644 --- a/server/src/engine/ql/dml/ins.rs +++ b/server/src/engine/ql/dml/ins.rs @@ -27,7 +27,7 @@ use { crate::{ engine::{ - core::Datacell, + data::cell::Datacell, error::{LangError, LangResult}, ql::{ ast::{Entity, QueryData, State}, diff --git a/server/src/engine/ql/tests.rs b/server/src/engine/ql/tests.rs index 18bc3348..96310c80 100644 --- a/server/src/engine/ql/tests.rs +++ b/server/src/engine/ql/tests.rs @@ -27,7 +27,7 @@ use { super::lex::{InsecureLexer, SafeLexer, Symbol, Token}, crate::{ - engine::{core::Datacell, error::LexResult}, + engine::{data::cell::Datacell, error::LexResult}, util::test_utils, }, rand::{self, Rng},