mosuka · mosuka · Apr 27, 2020 · Apr 27, 2020
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,3 @@
 .vscode
 .idea
 .DS_Store
-
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,51 +1,7 @@
-[package]
-name = "bayard"
-version = "0.6.0"
-authors = ["Minoru Osuka <minoru.osuka@gmail.com>"]
-edition = "2018"
-description = "Bayard is a full-text search and indexing server written in Rust."
-documentation = "https://bayard-search.github.io/bayard/"
-homepage = "https://github.com/bayard-search"
-repository = "https://github.com/bayard-search/bayard"
-readme = "README.md"
-keywords = ["search", "index", "server", "information", "retrieval"]
-categories = ["database"]
-license = "MIT"
-exclude = ["docs", "docs_src", "etc"]
-
-[lib]
-name = "bayard"
-
-[[bin]]
-name = "bayard"
-path = "src/main.rs"
-
-[dependencies]
-async-std = "1.4.0"
-bayard-client = "0.1.0"
-bayard-proto = "0.2.0"
-cang-jie = "0.7.0"
-clap = "2.33.0"
-crossbeam-channel = "0.4.0"
-ctrlc = { version = "3.1.3", features = ["termination"] }
-env_logger = "0.7.1"
-futures = "0.1.29"
-grpcio = { version = "0.4.7", features = [ "secure" ] }
-iron = "0.6.1"
-jieba-rs = "0.4.10"
-job_scheduler = "1.1.0"
-lindera-tantivy = "0.1.0"
-log = "0.4.8"
-logger = "0.4.0"
-num_cpus = "1.11.1"
-persistent = "0.4.0"
-prometheus = "0.7.0"
-protobuf = "2.10.1"
-raft = "0.4.3"
-rand = "0.7.2"
-router = "0.6.0"
-serde = { version = "1.0.104", features = ["derive"] }
-serde_json = "1.0.44"
-stringreader = "0.1.1"
-tantivy = "0.12.0"
-urlencoded = "0.6.0"
+[workspace]
+members = [
+    "bayard-server",
+    "bayard-client",
+    "bayard-rest",
+    "bayard",
+]
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.39.0
+ARG RUST_VERSION=1.42.0
 
 
 FROM rust:${RUST_VERSION}-slim-stretch AS builder
@@ -15,23 +15,25 @@ RUN set -ex \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Cache dependencies.
-COPY ./Cargo.toml ./Cargo.lock ./
-RUN mkdir -p src \
-    && echo "fn main() {}" > src/main.rs \
-    && touch src/lib.rs \
-    && cargo build --release
-
 COPY . ./
 RUN make build
 
 
 FROM debian:stretch-slim
 
-RUN mkdir -p /data
 WORKDIR /
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /data
+
 COPY --from=builder /repo/bin /usr/local/bin
 COPY --from=builder /repo/etc/* /etc/
-EXPOSE 5000
+
+EXPOSE 5000 7000
+
 ENTRYPOINT [ "bayard" ]
-CMD [ "serve" ]
+CMD [ "start" ]
diff --git a/Makefile b/Makefile
@@ -1,10 +1,9 @@
 BIN_DIR ?= $(CURDIR)/bin
 DOCS_DIR ?= $(CURDIR)/docs
-VERSION ?=
-
-ifeq ($(VERSION),)
-  VERSION = $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard") | .version')
-endif
+SERVER_VERSION ?= $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard-server") | .version')
+CLIENT_VERSION ?= $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard-client") | .version')
+REST_VERSION ?= $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard-rest") | .version')
+VERSION ?= $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard") | .version')
 
 .DEFAULT_GOAL := build
 
@@ -15,23 +14,45 @@ clean:
 format:
 	cargo fmt
 
-build:
+build: format
 	mkdir -p $(BIN_DIR)
 	cargo build --release
 	cp -p ./target/release/bayard $(BIN_DIR)
+	cp -p ./target/release/bayard-rest $(BIN_DIR)
 
 test:
 	cargo test
 
-build-docker:
+tag:
+	git tag v$(VERSION)
+	git push origin v$(VERSION)
+
+publish: format
+ifeq ($(shell cargo show --json bayard-server | jq -r '.versions[].num' | grep $(SERVER_VERSION)),)
+	(cd bayard-server && cargo package && cargo publish)
+	sleep 10
+endif
+ifeq ($(shell cargo show --json bayard-client | jq -r '.versions[].num' | grep $(CLIENT_VERSION)),)
+	(cd bayard-client && cargo package && cargo publish)
+	sleep 10
+endif
+ifeq ($(shell cargo show --json bayard-rest | jq -r '.versions[].num' | grep $(REST_VERSION)),)
+	(cd bayard-rest && cargo package && cargo publish)
+	sleep 10
+endif
+ifeq ($(shell cargo show --json bayard-client | jq -r '.versions[].num' | grep $(VERSION)),)
+	(cd bayard && cargo package && cargo publish)
+endif
+
+docker-build:
 	docker build -t bayardsearch/bayard:latest .
 	docker tag bayardsearch/bayard:latest bayardsearch/bayard:$(VERSION)
 
-push-docker:
+docker-push:
 	docker push bayardsearch/bayard:latest
 	docker push bayardsearch/bayard:$(VERSION)
 
-clean-docker:
+docker-clean:
 	docker rmi -f $(shell docker images --filter "dangling=true" -q --no-trunc)
 
 .PHONY: docs

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Join the chat at https://gitter.im/bayard-search/bayard](https://badges.gitter.im/bayard-search/bayard.svg)](https://gitter.im/bayard-search/bayard?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-Bayard is a full-text search and indexing server written in [Rust](https://www.rust-lang.org/) built on top of [Tantivy](https://github.com/tantivy-search/tantivy) that implements [The Raft Consensus Algorithm](https://raft.github.io/) ([raft-rs](https://github.com/tikv/raft-rs)) and [The gRPC](https://grpc.io/) ([grpc-rs](https://github.com/tikv/grpc-rs)).  
+Bayard is a full-text search and indexing server written in [Rust](https://www.rust-lang.org/) built on top of [Tantivy](https://github.com/tantivy-search/tantivy) that implements [Raft Consensus Algorithm](https://raft.github.io/) and [gRPC](https://grpc.io/).  
 Achieves consensus across all the nodes, ensures every change made to the system is made to a quorum of nodes.  
 Bayard makes easy for programmers to develop search applications with advanced features and high availability.
 

diff --git a/bayard-client/Cargo.toml b/bayard-client/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "bayard-client"
+version = "0.7.0"
+authors = ["Minoru Osuka <minoru.osuka@gmail.com>"]
+edition = "2018"
+description = "Client library for Bayard."
+documentation = "https://bayard-search.github.io/bayard/"
+homepage = "https://github.com/bayard-search"
+repository = "https://github.com/bayard-search/bayard/bayard-client"
+readme = "README.md"
+keywords = ["full-text", "search", "index", "client"]
+categories = ["database"]
+license = "MIT"
+
+[dependencies]
+bincode = "1.2.1"
+grpcio = { version = "0.4.7", features = [ "secure" ] }
+log = "0.4.8"
+protobuf = "2.14.0"
+raft = "0.4.3"
+rand = "0.7.2"
+serde_json = "1.0.44"
+
+bayard-proto = "0.7.0"
+bayard-server = { version = "0.7.0", path = "../bayard-server" }
diff --git a/bayard-client/README.md b/bayard-client/README.md
@@ -0,0 +1,8 @@
+# Bayard
+
+[![Join the chat at https://gitter.im/bayard-search/bayard](https://badges.gitter.im/bayard-search/bayard.svg)](https://gitter.im/bayard-search/bayard?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+Bayard is a full-text search and indexing server written in [Rust](https://www.rust-lang.org/) built on top of [Tantivy](https://github.com/tantivy-search/tantivy) that implements [Raft Consensus Algorithm](https://raft.github.io/) and [gRPC](https://grpc.io/).  
+Achieves consensus across all the nodes, ensures every change made to the system is made to a quorum of nodes.  
+Bayard makes easy for programmers to develop search applications with advanced features and high availability.