mosuka · mosuka · Nov 20, 2019 · Nov 20, 2019
diff --git a/docs/getting_started.html b/docs/getting_started.html
@@ -165,6 +165,36 @@ <h2><a class="header" href="#starting-in-standalone-mode-single-node-cluster" id
 [2019-11-11T09:28:26Z INFO  raft::raft]  received MsgRequestVoteResponse from 1 at term 2
 [2019-11-11T09:28:26Z INFO  raft::raft]  became leader at term 2
 </code></pre>
+<h2><a class="header" href="#getting-schema" id="getting-schema">Getting schema</a></h2>
+<p>You can confirm current schema with the following command:</p>
+<pre><code class="language-shellscript">./bin/bayard schema | jq .
+</code></pre>
+<p>You'll see the result in JSON format. The result of the above command is:</p>
+<pre><code class="language-json">[
+  {
+    &quot;name&quot;: &quot;id&quot;,
+    &quot;type&quot;: &quot;text&quot;,
+    &quot;options&quot;: {
+      &quot;indexing&quot;: {
+        &quot;record&quot;: &quot;basic&quot;,
+        &quot;tokenizer&quot;: &quot;raw&quot;
+      },
+      &quot;stored&quot;: true
+    }
+  },
+  {
+    &quot;name&quot;: &quot;text&quot;,
+    &quot;type&quot;: &quot;text&quot;,
+    &quot;options&quot;: {
+      &quot;indexing&quot;: {
+        &quot;record&quot;: &quot;position&quot;,
+        &quot;tokenizer&quot;: &quot;en_stem&quot;
+      },
+      &quot;stored&quot;: true
+    }
+  }
+]
+</code></pre>
 <h2><a class="header" href="#indexing-document" id="indexing-document">Indexing document</a></h2>
 <p>You can index documents with the following command:</p>
 <pre><code class="language-shellscript">./bin/bayard set 1 '{&quot;text&quot;:&quot;Tantivy is a full-text search engine library inspired by Apache Lucene and written in Rust.&quot;}'

diff --git a/docs/print.html b/docs/print.html
@@ -207,6 +207,36 @@ <h2><a class="header" href="#starting-in-standalone-mode-single-node-cluster" id
 [2019-11-11T09:28:26Z INFO  raft::raft]  received MsgRequestVoteResponse from 1 at term 2
 [2019-11-11T09:28:26Z INFO  raft::raft]  became leader at term 2
 </code></pre>
+<h2><a class="header" href="#getting-schema" id="getting-schema">Getting schema</a></h2>
+<p>You can confirm current schema with the following command:</p>
+<pre><code class="language-shellscript">./bin/bayard schema | jq .
+</code></pre>
+<p>You'll see the result in JSON format. The result of the above command is:</p>
+<pre><code class="language-json">[
+  {
+    &quot;name&quot;: &quot;id&quot;,
+    &quot;type&quot;: &quot;text&quot;,
+    &quot;options&quot;: {
+      &quot;indexing&quot;: {
+        &quot;record&quot;: &quot;basic&quot;,
+        &quot;tokenizer&quot;: &quot;raw&quot;
+      },
+      &quot;stored&quot;: true
+    }
+  },
+  {
+    &quot;name&quot;: &quot;text&quot;,
+    &quot;type&quot;: &quot;text&quot;,
+    &quot;options&quot;: {
+      &quot;indexing&quot;: {
+        &quot;record&quot;: &quot;position&quot;,
+        &quot;tokenizer&quot;: &quot;en_stem&quot;
+      },
+      &quot;stored&quot;: true
+    }
+  }
+]
+</code></pre>
 <h2><a class="header" href="#indexing-document" id="indexing-document">Indexing document</a></h2>
 <p>You can index documents with the following command:</p>
 <pre><code class="language-shellscript">./bin/bayard set 1 '{&quot;text&quot;:&quot;Tantivy is a full-text search engine library inspired by Apache Lucene and written in Rust.&quot;}'

diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/docs/searchindex.json b/docs/searchindex.json
diff --git a/docs_src/getting_started.md b/docs_src/getting_started.md
@@ -23,6 +23,43 @@ You'll see a startup message like following:
 [2019-11-11T09:28:26Z INFO  raft::raft]  became leader at term 2
 ```
 
+## Getting schema
+
+You can confirm current schema with the following command:
+
+```shell script
+./bin/bayard schema | jq .
+```
+
+You'll see the result in JSON format. The result of the above command is:
+
+```json
+[
+  {
+    "name": "id",
+    "type": "text",
+    "options": {
+      "indexing": {
+        "record": "basic",
+        "tokenizer": "raw"
+      },
+      "stored": true
+    }
+  },
+  {
+    "name": "text",
+    "type": "text",
+    "options": {
+      "indexing": {
+        "record": "position",
+        "tokenizer": "en_stem"
+      },
+      "stored": true
+    }
+  }
+]
+```
+
 ## Indexing document
 
 You can index documents with the following command:

diff --git a/proto/indexpb.proto b/proto/indexpb.proto
@@ -5,6 +5,12 @@ import "indexrpcpb.proto";
 import "eraftpb.proto";
 
 service Index {
+    rpc Raft (eraftpb.Message) returns (indexrpcpb.RaftDone) {
+    }
+    rpc RaftConfChange (indexrpcpb.ConfChangeReq) returns (indexrpcpb.RaftDone) {
+    }
+    rpc Peers (indexrpcpb.IndexReq) returns (indexrpcpb.PeersResp) {
+    }
     rpc Get (indexrpcpb.IndexReq) returns (indexrpcpb.GetResp) {
     }
     rpc Put (indexrpcpb.IndexReq) returns (indexrpcpb.PutResp) {
@@ -13,10 +19,6 @@ service Index {
     }
     rpc Search (indexrpcpb.IndexReq) returns (indexrpcpb.SearchResp) {
     }
-    rpc Raft (eraftpb.Message) returns (indexrpcpb.RaftDone) {
-    }
-    rpc RaftConfChange (indexrpcpb.ConfChangeReq) returns (indexrpcpb.RaftDone) {
-    }
-    rpc Peers (indexrpcpb.IndexReq) returns (indexrpcpb.PeersResp) {
+    rpc Schema (indexrpcpb.IndexReq) returns (indexrpcpb.SchemaResp) {
     }
 }
diff --git a/proto/indexrpcpb.proto b/proto/indexrpcpb.proto
@@ -14,9 +14,10 @@ enum ReqType {
     Put = 1;
     Delete = 2;
     Search = 3;
-    Join = 4;
-    Leave = 5;
-    Peers = 6;
+    Schema = 4;
+    Join = 5;
+    Leave = 6;
+    Peers = 7;
 }
 
 message IndexReq {
@@ -30,17 +31,6 @@ message IndexReq {
     string query = 8;
 }
 
-message ConfChangeReq {
-    eraftpb.ConfChange cc = 1;
-    string ip = 2;
-    uint32 port = 3;
-}
-
-message PeersResp {
-    string value = 1;
-    RespErr err = 2;
-}
-
 message GetResp {
     string value = 1;
     RespErr err = 2;
@@ -59,6 +49,22 @@ message SearchResp {
     RespErr err = 2;
 }
 
+message SchemaResp {
+    string value = 1;
+    RespErr err = 2;
+}
+
+message ConfChangeReq {
+    eraftpb.ConfChange cc = 1;
+    string ip = 2;
+    uint32 port = 3;
+}
+
+message PeersResp {
+    string value = 1;
+    RespErr err = 2;
+}
+
 message RaftDone {
     RespErr err = 1;
 }
diff --git a/src/client/client.rs b/src/client/client.rs
@@ -9,7 +9,7 @@ use raft::eraftpb::{ConfChange, ConfChangeType};
 use crate::proto::indexpb_grpc::IndexClient;
 use crate::proto::indexrpcpb::{
     ConfChangeReq, DeleteResp, GetResp, IndexReq, PeersResp, PutResp, RaftDone, ReqType, RespErr,
-    SearchResp,
+    SchemaResp, SearchResp,
 };
 
 pub fn create_client(addr: &str) -> IndexClient {
@@ -36,6 +36,87 @@ impl Clerk {
         }
     }
 
+    pub fn join(&mut self, id: u64, ip: &str, port: u16) {
+        let mut cc = ConfChange::new();
+        cc.set_id(id);
+        cc.set_node_id(id);
+        cc.set_change_type(ConfChangeType::AddNode);
+        let mut req = ConfChangeReq::new();
+        req.set_cc(cc);
+        req.set_ip(ip.to_string());
+        req.set_port(port as u32);
+
+        loop {
+            let reply = self.servers[self.leader_id]
+                .raft_conf_change(&req)
+                .unwrap_or_else(|e| {
+                    error!("{:?}", e);
+                    let mut resp = RaftDone::new();
+                    resp.set_err(RespErr::ErrWrongLeader);
+                    resp
+                });
+            match reply.err {
+                RespErr::OK => return,
+                RespErr::ErrWrongLeader => (),
+                RespErr::ErrNoKey => return,
+            }
+            self.leader_id = (self.leader_id + 1) % self.servers.len();
+            thread::sleep(Duration::from_millis(100));
+        }
+    }
+
+    pub fn leave(&mut self, id: u64) {
+        let mut cc = ConfChange::new();
+        cc.set_id(id);
+        cc.set_node_id(id);
+        cc.set_change_type(ConfChangeType::RemoveNode);
+        let mut req = ConfChangeReq::new();
+        req.set_cc(cc);
+
+        loop {
+            let reply = self.servers[self.leader_id]
+                .raft_conf_change(&req)
+                .unwrap_or_else(|e| {
+                    error!("{:?}", e);
+                    let mut resp = RaftDone::new();
+                    resp.set_err(RespErr::ErrWrongLeader);
+                    resp
+                });
+            match reply.err {
+                RespErr::OK => return,
+                RespErr::ErrWrongLeader => (),
+                RespErr::ErrNoKey => return,
+            }
+            self.leader_id = (self.leader_id + 1) % self.servers.len();
+            thread::sleep(Duration::from_millis(100));
+        }
+    }
+
+    pub fn peers(&mut self) -> String {
+        let mut req = IndexReq::new();
+        req.set_client_id(self.client_id);
+        req.set_req_type(ReqType::Peers);
+        req.set_seq(self.request_seq);
+        self.request_seq += 1;
+
+        loop {
+            let reply = self.servers[self.leader_id]
+                .peers(&req)
+                .unwrap_or_else(|_e| {
+                    let mut resp = PeersResp::new();
+                    resp.set_err(RespErr::ErrWrongLeader);
+                    resp
+                });
+            match reply.err {
+                RespErr::OK => return reply.value,
+                RespErr::ErrWrongLeader => (),
+                RespErr::ErrNoKey => return String::from(""),
+            }
+            self.leader_id = (self.leader_id + 1) % self.servers.len();
+            thread::sleep(Duration::from_millis(100));
+        }
+    }
+
     pub fn get(&mut self, key: &str) -> String {
         let mut req = IndexReq::new();
         req.set_client_id(self.client_id);
@@ -138,74 +219,18 @@ impl Clerk {
         }
     }
 
-    pub fn join(&mut self, id: u64, ip: &str, port: u16) {
-        let mut cc = ConfChange::new();
-        cc.set_id(id);
-        cc.set_node_id(id);
-        cc.set_change_type(ConfChangeType::AddNode);
-        let mut req = ConfChangeReq::new();
-        req.set_cc(cc);
-        req.set_ip(ip.to_string());
-        req.set_port(port as u32);
-
-        loop {
-            let reply = self.servers[self.leader_id]
-                .raft_conf_change(&req)
-                .unwrap_or_else(|e| {
-                    error!("{:?}", e);
-                    let mut resp = RaftDone::new();
-                    resp.set_err(RespErr::ErrWrongLeader);
-                    resp
-                });
-            match reply.err {
-                RespErr::OK => return,
-                RespErr::ErrWrongLeader => (),
-                RespErr::ErrNoKey => return,
-            }
-            self.leader_id = (self.leader_id + 1) % self.servers.len();
-            thread::sleep(Duration::from_millis(100));
-        }
-    }
-
-    pub fn leave(&mut self, id: u64) {
-        let mut cc = ConfChange::new();
-        cc.set_id(id);
-        cc.set_node_id(id);
-        cc.set_change_type(ConfChangeType::RemoveNode);
-        let mut req = ConfChangeReq::new();
-        req.set_cc(cc);
-
-        loop {
-            let reply = self.servers[self.leader_id]
-                .raft_conf_change(&req)
-                .unwrap_or_else(|e| {
-                    error!("{:?}", e);
-                    let mut resp = RaftDone::new();
-                    resp.set_err(RespErr::ErrWrongLeader);
-                    resp
-                });
-            match reply.err {
-                RespErr::OK => return,
-                RespErr::ErrWrongLeader => (),
-                RespErr::ErrNoKey => return,
-            }
-            self.leader_id = (self.leader_id + 1) % self.servers.len();
-            thread::sleep(Duration::from_millis(100));
-        }
-    }
-
-    pub fn peers(&mut self) -> String {
+    pub fn schema(&mut self) -> String {
         let mut req = IndexReq::new();
         req.set_client_id(self.client_id);
-        req.set_req_type(ReqType::Peers);
+        req.set_req_type(ReqType::Schema);
         req.set_seq(self.request_seq);
         self.request_seq += 1;
 
         loop {
             let reply = self.servers[self.leader_id]
-                .peers(&req)
+                .schema(&req)
                 .unwrap_or_else(|_e| {
-                    let mut resp = PeersResp::new();
+                    let mut resp = SchemaResp::new();
                     resp.set_err(RespErr::ErrWrongLeader);
                     resp
                 });

diff --git a/src/cmd.rs b/src/cmd.rs
@@ -2,6 +2,7 @@ pub mod delete;
 pub mod get;
 pub mod leave;
 pub mod peers;
+pub mod schema;
 pub mod search;
 pub mod serve;
 pub mod set;