这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Dec 10, 2021. It is now read-only.

Change CLI flags #12

Merged
merged 1 commit into from
Sep 8, 2018
Merged

Change CLI flags #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
595 changes: 505 additions & 90 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Versionfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.3.1
6 changes: 1 addition & 5 deletions cmd/blast/bulk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ import (

func bulk(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

batchSize := c.Int("batch-size")

prettyPrint := c.Bool("pretty-print")

updateRequestsBytes := []byte(c.Args().Get(0))
Expand All @@ -45,7 +41,7 @@ func bulk(c *cli.Context) {
}

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
29 changes: 4 additions & 25 deletions cmd/blast/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,19 @@ var (
Name: "start",
Usage: "Start a node",
Flags: []cli.Flag{
flNodeID,
flBindAddr,
flGRPCAddr,
flHTTPAddr,
flRaftNodeID,
flRaftDir,
flRaftSnapshotCount,
flRaftTimeout,
flStoreDir,
flIndexDir,
flIndexMapping,
flIndexMappingFile,
flIndexType,
flIndexKvstore,
flIndexKvconfig,
flPeerGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flLogLevel,
flLogFile,
flLogMaxSize,
Expand All @@ -57,8 +54,6 @@ var (
Usage: "Get a document",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
ArgsUsage: "[id]",
Expand All @@ -69,8 +64,6 @@ var (
Usage: "Put a document",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
ArgsUsage: "[id] [fields]",
Expand All @@ -81,8 +74,6 @@ var (
Usage: "Delete a document",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
ArgsUsage: "[id]",
Expand All @@ -93,8 +84,6 @@ var (
Usage: "Update documents in bulk",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
flBatchSize,
},
Expand All @@ -106,8 +95,6 @@ var (
Usage: "Search documents",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
ArgsUsage: "[search request]",
Expand All @@ -117,13 +104,11 @@ var (
Name: "join",
Usage: "Join a node to the cluster",
Flags: []cli.Flag{
flNodeID,
flRaftNodeID,
flBindAddr,
flGRPCAddr,
flHTTPAddr,
flPeerGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
Action: join,
Expand All @@ -132,11 +117,9 @@ var (
Name: "leave",
Usage: "Leave a node from the cluster",
Flags: []cli.Flag{
flNodeID,
flRaftNodeID,
flBindAddr,
flPeerGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
Action: leave,
Expand All @@ -146,8 +129,6 @@ var (
Usage: "Shows a list of peers in a cluster",
Flags: []cli.Flag{
flGRPCAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
Action: peers,
Expand All @@ -157,8 +138,6 @@ var (
Usage: "Create snapshot",
Flags: []cli.Flag{
flBindAddr,
flMaxSendMsgSize,
flMaxRecvMsgSize,
flPrettyPrint,
},
Action: snapshot,
Expand Down
5 changes: 1 addition & 4 deletions cmd/blast/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ import (

func delete(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

id := c.Args().Get(0)
Expand All @@ -42,7 +39,7 @@ func delete(c *cli.Context) {
}

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
51 changes: 18 additions & 33 deletions cmd/blast/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package main

import (
"math"
"os"

"github.com/blevesearch/bleve/index/store/boltdb"
"github.com/blevesearch/bleve/index/upsidedown"
"github.com/mosuka/blast/index/bleve"
"github.com/mosuka/blast/raft"
"github.com/mosuka/blast/store/boltdb"
"github.com/urfave/cli"
)

Expand All @@ -43,84 +43,69 @@ var (
EnvVar: "BLAST_HTTP_ADDR",
}

flNodeID = cli.StringFlag{
Name: "node-id",
Value: "node1",
flRaftNodeID = cli.StringFlag{
Name: "raft-node-id",
Value: raft.DefaultNodeID,
Usage: "Node ID",
EnvVar: "BLAST_NODE_ID",
}
flRaftDir = cli.StringFlag{
Name: "raft-dir",
Value: "./data/raft",
Value: raft.DefaultDir,
Usage: "Raft data directory",
EnvVar: "BLAST_RAFT_DIR",
}
flRaftSnapshotCount = cli.IntFlag{
Name: "raft-snapshot-count",
Value: 2,
Value: raft.DefaultSnapshotCount,
Usage: "Raft snapshot count",
EnvVar: "BLAST_RAFT_SNAPSHOT_COUNT",
}
flRaftTimeout = cli.StringFlag{
Name: "raft-timeout",
Value: "10s",
Value: raft.DefaultTimeout,
Usage: "Raft timeout",
EnvVar: "BLAST_RAFT_TIMEOUT",
}

flStoreDir = cli.StringFlag{
Name: "store-dir",
Value: "./data/store",
Value: boltdb.DefaultDir,
Usage: "Store data directory",
EnvVar: "BLAST_STORE_DIR",
}

flIndexDir = cli.StringFlag{
Name: "index-dir",
Value: "./data/index",
Value: bleve.DefaultDir,
Usage: "Index data directory",
EnvVar: "BLAST_INDEX_DIR",
}
flIndexMapping = cli.StringFlag{
Name: "index-mapping",
Usage: "Index mapping path",
EnvVar: "BLAST_INDEX_MAPPING",
flIndexMappingFile = cli.StringFlag{
Name: "index-mapping-file",
Value: bleve.DefaultIndexMappingFile,
Usage: "Index mapping file",
EnvVar: "BLAST_INDEX_MAPPING_FILE",
}
flIndexType = cli.StringFlag{
Name: "index-type",
Value: upsidedown.Name,
Value: bleve.DefaultIndexType,
Usage: "Index type",
EnvVar: "BLAST_INDEX_TYPE",
}
flIndexKvstore = cli.StringFlag{
Name: "index-kvstore",
Value: boltdb.Name,
Value: bleve.DefaultKvstore,
Usage: "Index Key-Value store",
EnvVar: "BLAST_INDEX_KVSTORE",
}
flIndexKvconfig = cli.StringFlag{
Name: "index-kvconfig",
Usage: "Index Key-Value config",
EnvVar: "BLAST_INDEX_KVCONFIG",
}

flPeerGRPCAddr = cli.StringFlag{
Name: "peer-grpc-addr",
Usage: "Peer gRPC address to connect on for join the cluster",
EnvVar: "BLAST_PEER_GRPC_ADDR",
}

flMaxSendMsgSize = cli.IntFlag{
Name: "max-send-msg-size",
Value: math.MaxInt32,
Usage: "Max size of send message via gRPC",
}
flMaxRecvMsgSize = cli.IntFlag{
Name: "max-recv-msg-size",
Value: math.MaxInt32,
Usage: "Max size of receive message via gRPC",
}

flLogLevel = cli.StringFlag{
Name: "log-level",
Value: "INFO",
Expand Down
5 changes: 1 addition & 4 deletions cmd/blast/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ import (

func get(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

id := c.Args().Get(0)
Expand All @@ -42,7 +39,7 @@ func get(c *cli.Context) {
}

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
6 changes: 1 addition & 5 deletions cmd/blast/join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,13 @@ func join(c *cli.Context) {
bindAddr := c.String("bind-addr")
grpcAddr := c.String("grpc-addr")
httpAddr := c.String("http-addr")

peerGRPCAddr := c.String("peer-grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

var err error

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(peerGRPCAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(peerGRPCAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
6 changes: 1 addition & 5 deletions cmd/blast/leave.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,13 @@ import (
func leave(c *cli.Context) {
nodeID := c.String("node-id")
bindAddr := c.String("bind-addr")

peerGRPCAddr := c.String("peer-grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

var err error

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(peerGRPCAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(peerGRPCAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
5 changes: 1 addition & 4 deletions cmd/blast/peers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ import (

func peers(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

var err error

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
5 changes: 1 addition & 4 deletions cmd/blast/put.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ import (

func put(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

id := c.Args().Get(0)
Expand All @@ -51,7 +48,7 @@ func put(c *cli.Context) {
}

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
5 changes: 1 addition & 4 deletions cmd/blast/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ import (

func search(c *cli.Context) {
grpcAddr := c.String("grpc-addr")
maxSendMsgSize := c.Int("max-send-msg-size")
maxRecvMsgSize := c.Int("max-recv-msg-size")

prettyPrint := c.Bool("pretty-print")

searchRequest := []byte(c.Args().Get(0))
Expand All @@ -42,7 +39,7 @@ func search(c *cli.Context) {
}

var grpcClient *client.GRPCClient
if grpcClient, err = client.NewGRPCClient(grpcAddr, maxSendMsgSize, maxRecvMsgSize); err != nil {
if grpcClient, err = client.NewGRPCClient(grpcAddr); err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
Expand Down
Loading