Rename cql create db params, add db- prefix.

laodouya · laodouya · commit 9f43c3f57c95 · 2019-05-14T17:06:21.000+08:00
diff --git a/cmd/cql/internal/create.go b/cmd/cql/internal/create.go
@@ -43,12 +43,12 @@ var CmdCreate = &Command{
 Create command creates a CovenantSQL database by database meta params. The meta info must include
 node count.
 e.g.
-    cql create -node 2
+    cql create -db-node 2
 
 Since CovenantSQL is built on top of blockchains, you may want to wait for the transaction
 confirmation before the creation takes effect.
 e.g.
-    cql create -wait-tx-confirm -node 2
+    cql create -wait-tx-confirm -db-node 2
 `,
 	Flag:       flag.NewFlagSet("DB meta params", flag.ExitOnError),
 	CommonFlag: flag.NewFlagSet("Common params", flag.ExitOnError),
@@ -87,23 +87,23 @@ var targetMiners List
 var node32 uint
 
 func addCreateFlags(cmd *Command) {
-	cmd.Flag.Var(&targetMiners, "target-miners", "List of target miner addresses(separated by ',')")
-	cmd.Flag.UintVar(&node32, "node", 0, "Target node number")
-	cmd.Flag.Uint64Var(&meta.Space, "space", 0, "Minimum disk space requirement, 0 for none")
-	cmd.Flag.Uint64Var(&meta.Memory, "memory", 0, "Minimum memory requirement, 0 for none")
-	cmd.Flag.Float64Var(&meta.LoadAvgPerCPU, "load-avg-per-cpu", 0, "Minimum idle CPU requirement, 0 for none")
-	cmd.Flag.StringVar(&meta.EncryptionKey, "encrypt-key", "", "Encryption key for persistence data")
-	cmd.Flag.BoolVar(&meta.UseEventualConsistency, "eventual-consistency", false, "Use eventual consistency to sync among miner nodes")
-	cmd.Flag.Float64Var(&meta.ConsistencyLevel, "consistency-level", 0, "Consistency level, node*consistency_level is the node number to perform strong consistency")
-	cmd.Flag.IntVar(&meta.IsolationLevel, "isolation-level", 0, "Isolation level in a single node")
-	cmd.Flag.Uint64Var(&meta.GasPrice, "gas-price", 0, "customized gas price")
-	cmd.Flag.Uint64Var(&meta.AdvancePayment, "advance-payment", 0, "customized advance payment")
+	cmd.Flag.Var(&targetMiners, "db-target-miners", "List of target miner addresses(separated by ',')")
+	cmd.Flag.UintVar(&node32, "db-node", 0, "Target node number")
+	cmd.Flag.Uint64Var(&meta.Space, "db-space", 0, "Minimum disk space requirement, 0 for none")
+	cmd.Flag.Uint64Var(&meta.Memory, "db-memory", 0, "Minimum memory requirement, 0 for none")
+	cmd.Flag.Float64Var(&meta.LoadAvgPerCPU, "db-load-avg-per-cpu", 0, "Minimum idle CPU requirement, 0 for none")
+	cmd.Flag.StringVar(&meta.EncryptionKey, "db-encrypt-key", "", "Encryption key for persistence data")
+	cmd.Flag.BoolVar(&meta.UseEventualConsistency, "db-eventual-consistency", false, "Use eventual consistency to sync among miner nodes")
+	cmd.Flag.Float64Var(&meta.ConsistencyLevel, "db-consistency-level", 0, "Consistency level, node*consistency_level is the node number to perform strong consistency")
+	cmd.Flag.IntVar(&meta.IsolationLevel, "db-isolation-level", 0, "Isolation level in a single node")
+	cmd.Flag.Uint64Var(&meta.GasPrice, "db-gas-price", 0, "customized gas price")
+	cmd.Flag.Uint64Var(&meta.AdvancePayment, "db-advance-payment", 0, "customized advance payment")
 }
 
 func runCreate(cmd *Command, args []string) {
 	commonFlagsInit(cmd)
 
-	if len(args) > 1 {
+	if len(args) > 1 || len(args) == 0 {
 		ConsoleLog.Error("create params should set by specific param name like -node")
 		SetExitStatus(1)
 		printCommandHelp(cmd)
diff --git a/test/compatibility/specific_old.sh b/test/compatibility/specific_old.sh
@@ -63,7 +63,7 @@ if [[ $CLIENTBIN =~ "v0.5.0" ]]; then
         -command 'show tables;' -no-password | tee result.log
 else
     ${CLIENTBIN} wallet -config node_c/config.yaml
-    ${CLIENTBIN} create -config node_c/config.yaml -wait-tx-confirm -node 2
+    ${CLIENTBIN} create -config node_c/config.yaml -wait-tx-confirm -db-node 2
 
     #get dsn
     dsn=$(cat node_c/.dsn | tail -n1)
diff --git a/test/stable/scripts/start.sh b/test/stable/scripts/start.sh
@@ -50,7 +50,7 @@ case $role in
         docker cp covenantsql_bp_1:/app/cql ${RUNNING_DIR}
         sleep 3s
         ${RUNNING_DIR}/cql create -config ${RUNNING_DIR}/node_c/config.yaml \
-            -wait-tx-confirm -node 4 -advance-payment 2000000000
+            -wait-tx-confirm -db-node 4 -advance-payment 2000000000
         dsn=$(cat ${RUNNING_DIR}/node_c/.dsn | tail -n1)
 
         #Start client
diff --git a/test/testnet_client/run.sh b/test/testnet_client/run.sh
@@ -30,7 +30,7 @@ ${BIN}/cql transfer -config ${PROJECT_DIR}/conf/testnet/config.yaml -wait-tx-con
 ${BIN}/cql wallet
 
 # create database only in miner00 and miner01
-${BIN}/cql create -wait-tx-confirm -node 2 \
+${BIN}/cql create -wait-tx-confirm -db-node 2 \
     -target-miners 'ba0ba731c7a76ccef2c1170f42038f7e228dfb474ef0190dfe35d9a37911ed37,1a7b0959bbd0d0ec529278a61c0056c277bffe75b2646e1699b46b10a90210be'
 
 #get dsn
