Move server into separate package

Author: comnik

Cargo.toml

@@ -7,6 +7,8 @@ edition = "2018"
 
 description = "A reactive query engine built on Differential Dataflow."
 
+documentation = "https://docs.rs/declarative-dataflow"
+homepage = "https://github.com/comnik/declarative-dataflow"
 repository = "https://github.com/comnik/declarative-dataflow.git"
 keywords = ["differential", "dataflow",  "datalog", "graphql", "query"]
 license = "MIT"
@@ -15,32 +17,22 @@ license = "MIT"
 jemallocator = "0.1.8"
 timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", features = ["bincode"] }
 differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow" }
-abomonation = "0.7"
-abomonation_derive = "0.3"
 serde = "1"
 serde_derive = "1"
-serde_json = "1"
-rmp-serde = "0.13.7"
-mio = "0.6.16"
-mio-extras = "2.0.5"
-slab = "0.4.1"
-ws = { git = "https://github.com/comnik/ws-rs" }
 log = "0.4"
 env_logger = "0.5.6"
-getopts = "0.2.18"
 num-rational = { version = "0.2", features = ["std", "serde"] }
 timely_sort = "0.1.6"
+
+serde_json = { version = "1", optional = true }
 csv = { version = "1", optional = true }
 chrono = { version = "0.4", optional = true }
 
 [features]
-blocking = []
 real-time = []
 set-semantics = []
 csv-source = ["csv", "chrono"]
-
-[[bin]]
-name = "server"
+json-source = ["serde_json", "chrono"]
 
 [profile.release]
 opt-level = 3

README.md

@@ -56,9 +56,10 @@ for Q1 2019.
 ## Build / Run
 
 Assuming an up-to-date Rust environment, the server can be built and
-run via
+run from within the [server/](server/) sub-directory:
 
-    cargo run --release --bin server -- <timely args> -- <server args>
+    cd server/
+    cargo run --release -- <timely args> -- <server args>
 
 The server executable accepts two sets of arguments separated by `--`,
 one for [configuring timely

server/.gitignore

@@ -0,0 +1 @@
+target/

server/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+
+name = "declarative-server"
+version = "0.1.0"
+authors = ["Nikolas Göbel <[email protected]>", "Frank McSherry <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+jemallocator = "0.1.8"
+timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", features = ["bincode"] }
+differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow" }
+declarative-dataflow = { path = "../" }
+serde = "1"
+serde_derive = "1"
+serde_json = "1"
+rmp-serde = "0.13.7"
+mio = "0.6.16"
+mio-extras = "2.0.5"
+slab = "0.4.1"
+ws = { git = "https://github.com/comnik/ws-rs", rev = "fdf5a291b8962de802e1745963a4c4575d76cecf" }
+log = "0.4"
+env_logger = "0.5.6"
+getopts = "0.2.18"
+
+[features]
+blocking = []
+real-time = ["declarative-dataflow/real-time"]
+csv-source = ["declarative-dataflow/csv-source"]
+json-source = ["declarative-dataflow/json-source"]
+
+[profile.release]
+opt-level = 3
+debug = true
+debug-assertions = false
+rpath = false
+lto = false
+codegen-units = 4

src/bin/server.rs server/src/main.rssrc/bin/server.rs renamed to server/src/main.rs

@@ -4,8 +4,6 @@ static ALLOCATOR: jemallocator::Jemalloc = jemallocator::Jemalloc;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
-extern crate abomonation_derive;
-#[macro_use]
 extern crate log;
 
 use std::collections::{HashSet, VecDeque};

src/lib.rs

@@ -6,15 +6,10 @@
 
 #![forbid(missing_docs)]
 
-extern crate differential_dataflow;
-extern crate timely;
-extern crate timely_sort;
 #[macro_use]
 extern crate log;
-extern crate abomonation;
 #[macro_use]
 extern crate serde_derive;
-extern crate num_rational;
 
 pub mod binding;
 pub mod domain;

src/sources/csv_file.rs

@@ -7,7 +7,7 @@ use std::time::{Duration, Instant};
 use timely::dataflow::operators::generic::builder_rc::OperatorBuilder;
 use timely::dataflow::{Scope, Stream};
 
-use chrono::DateTime;
+// use chrono::DateTime;
 
 use crate::server::scheduler::Scheduler;
 use crate::sources::Sourceable;