diff --git a/Cargo.toml b/Cargo.toml index f9c43124..9f86a5de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,9 +70,6 @@ path = "query-sql" [dependencies.mentat_query_translator] path = "query-translator" -[dependencies.mentat_tx] -path = "tx" - [dependencies.mentat_tolstoy] path = "tolstoy" diff --git a/README.md b/README.md index 0acc6822..c25e2914 100644 --- a/README.md +++ b/README.md @@ -183,10 +183,6 @@ This crate defines the structs and enums that are the output of the query parser Similarly, this crate defines an abstract representation of a SQL query as understood by Mentat. This bridges between Mentat's types (_e.g._, `TypedValue`) and SQL concepts (`ColumnOrExpression`, `GroupBy`). It's produced by the algebrizer and consumed by the translator. -#### `mentat_tx` - -Mentat has two main inputs: reads (queries) and writes (transacts). Just as `mentat_query` defines the types produced by the query parser, `mentat_tx` defines the types produced by the tx parser. - ### Query processing #### `mentat_query_algebrizer` diff --git a/db/Cargo.toml b/db/Cargo.toml index 76b2d5c1..668da59b 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -27,9 +27,6 @@ path = "../core" [dependencies.mentat_sql] path = "../sql" -[dependencies.mentat_tx] -path = "../tx" - # Should be dev-dependencies. [dependencies.tabwriter] version = "1.0.3" diff --git a/db/src/bootstrap.rs b/db/src/bootstrap.rs index bc910d41..d133f26f 100644 --- a/db/src/bootstrap.rs +++ b/db/src/bootstrap.rs @@ -16,7 +16,7 @@ use edn::types::Value; use edn::symbols; use entids; use db::TypedSQLValue; -use mentat_tx::entities::Entity; +use edn::entities::Entity; use mentat_core::{ IdentMap, Schema, diff --git a/db/src/cache.rs b/db/src/cache.rs index 8a8a2c40..dad957bd 100644 --- a/db/src/cache.rs +++ b/db/src/cache.rs @@ -97,7 +97,7 @@ use mentat_sql::{ SQLQuery, }; -use mentat_tx::entities::{ +use edn::entities::{ OpType, }; diff --git a/db/src/db.rs b/db/src/db.rs index 17b74938..de2ea52d 100644 --- a/db/src/db.rs +++ b/db/src/db.rs @@ -1096,7 +1096,7 @@ mod tests { InternSet, }; use mentat_core::util::Either::*; - use mentat_tx::entities::{ + use edn::entities::{ OpType, TempId, }; diff --git a/db/src/debug.rs b/db/src/debug.rs index 70e9b1d2..a8e330b9 100644 --- a/db/src/debug.rs +++ b/db/src/debug.rs @@ -31,7 +31,9 @@ use mentat_core::{ TypedValue, ValueType, }; -use mentat_tx::entities::{Entid}; +use edn::entities::{ + Entid, +}; use schema::{ SchemaBuilding, }; diff --git a/db/src/errors.rs b/db/src/errors.rs index 7dfca817..d198081b 100644 --- a/db/src/errors.rs +++ b/db/src/errors.rs @@ -17,7 +17,7 @@ use std::collections::{ use rusqlite; -use mentat_tx::entities::{ +use edn::entities::{ TempId, }; use mentat_core::{ diff --git a/db/src/internal_types.rs b/db/src/internal_types.rs index 306cb04a..34f73d09 100644 --- a/db/src/internal_types.rs +++ b/db/src/internal_types.rs @@ -47,8 +47,8 @@ use types::{ TypedValue, ValueType, }; -use mentat_tx::entities; -use mentat_tx::entities::{ +use edn::entities; +use edn::entities::{ EntityPlace, OpType, TempId, diff --git a/db/src/lib.rs b/db/src/lib.rs index 57be7490..39ec8820 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -26,7 +26,6 @@ extern crate time; #[macro_use] extern crate edn; #[macro_use] extern crate mentat_core; extern crate mentat_sql; -extern crate mentat_tx; use std::iter::repeat; diff --git a/db/src/tx.rs b/db/src/tx.rs index 769f7d55..028e0652 100644 --- a/db/src/tx.rs +++ b/db/src/tx.rs @@ -103,8 +103,8 @@ use mentat_core::{ use mentat_core::intern_set::InternSet; -use mentat_tx::entities as entmod; -use mentat_tx::entities::{ +use edn::entities as entmod; +use edn::entities::{ AttributePlace, Entity, OpType, diff --git a/db/src/tx_observer.rs b/db/src/tx_observer.rs index 565a0736..10c49bb8 100644 --- a/db/src/tx_observer.rs +++ b/db/src/tx_observer.rs @@ -32,7 +32,7 @@ use mentat_core::{ TypedValue, }; -use mentat_tx::entities::{ +use edn::entities::{ OpType, }; diff --git a/db/src/types.rs b/db/src/types.rs index af5c7f9f..70ea4964 100644 --- a/db/src/types.rs +++ b/db/src/types.rs @@ -29,7 +29,7 @@ pub use self::mentat_core::{ ValueType, }; -use mentat_tx::entities::{ +use edn::entities::{ EntityPlace, TempId, }; diff --git a/db/src/upsert_resolution.rs b/db/src/upsert_resolution.rs index 7e748757..5f90821c 100644 --- a/db/src/upsert_resolution.rs +++ b/db/src/upsert_resolution.rs @@ -45,7 +45,7 @@ use mentat_core::{ Schema, TypedValue, }; -use mentat_tx::entities::OpType; +use edn::entities::OpType; use schema::SchemaBuilding; /// A "Simple upsert" that looks like [:db/add TEMPID a v], where a is :db.unique/identity. diff --git a/db/src/watcher.rs b/db/src/watcher.rs index 15d8b3b7..d646fbde 100644 --- a/db/src/watcher.rs +++ b/db/src/watcher.rs @@ -23,7 +23,7 @@ use mentat_core::{ TypedValue, }; -use mentat_tx::entities::{ +use edn::entities::{ OpType, }; diff --git a/src/entity_builder.rs b/src/entity_builder.rs index 13516cdc..263ed604 100644 --- a/src/entity_builder.rs +++ b/src/entity_builder.rs @@ -15,7 +15,7 @@ // The internal data format for transacting is required to encode the complexities of // processing that format: temporary IDs, lookup refs, input spans, etc. // -// See mentat_tx::entities::Entity and all of its child enums to see how complex this gets. +// See edn::entities::Entity and all of its child enums to see how complex this gets. // // A programmatic consumer doesn't want to build something that looks like: // @@ -75,7 +75,7 @@ use mentat_db::internal_types::{ TypedValueOr, }; -use mentat_tx::entities::{ +use edn::entities::{ OpType, TempId, }; diff --git a/src/lib.rs b/src/lib.rs index 77e4ec32..7d783ea8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,7 +30,6 @@ extern crate mentat_query_pull; extern crate mentat_query_translator; extern crate mentat_sql; extern crate mentat_tolstoy; -extern crate mentat_tx; pub use mentat_core::{ Attribute, diff --git a/tx/Cargo.toml b/tx/Cargo.toml deleted file mode 100644 index cb93106a..00000000 --- a/tx/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "mentat_tx" -version = "0.0.1" -workspace = ".." - -[dependencies] -[dependencies.edn] - path = "../edn" diff --git a/tx/README.md b/tx/README.md deleted file mode 100644 index fc8f6166..00000000 --- a/tx/README.md +++ /dev/null @@ -1 +0,0 @@ -This sub-crate implements the core types used by the transaction processor. diff --git a/tx/src/lib.rs b/tx/src/lib.rs deleted file mode 100644 index ad503e05..00000000 --- a/tx/src/lib.rs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2016 Mozilla -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -#[allow(unused_imports)] -#[macro_use] extern crate edn; -pub use edn::entities;