rename func String() to ConfigString()

toontong · toontong · commit a13fdc2422bb · 2014-08-20T11:20:11.000+08:00
diff --git a/client/db.go b/client/db.go
@@ -36,7 +36,7 @@ func (db *DB) Addr() string {
 	return db.addr
 }
 
-func (db *DB) String() string {
+func (db *DB) ConfigString() string {
 	return fmt.Sprintf("%s:%s@%s/%s?idleConns=%v&conns=%v",
 		db.user, db.password, db.addr, db.db, db.idleConns, db.conns.Len())
 }
diff --git a/proxy/conn_show.go b/proxy/conn_show.go
@@ -109,22 +109,16 @@ func (c *Conn) handleShowProxyConfig() (*Resultset, error) {
 	var names []string = []string{"Section", "Key", "Value"}
 	var rows [][]string
 	const (
-		Section = 0
-		Key     = 1
-		Value   = 2
-		Column  = 3
+		Column = 3
 	)
 
 	rows = append(rows, []string{"Global_Config", "Addr", c.server.cfg.Addr})
 	rows = append(rows, []string{"Global_Config", "User", c.server.cfg.User})
 	rows = append(rows, []string{"Global_Config", "Password", c.server.cfg.Password})
 	rows = append(rows, []string{"Global_Config", "LogLevel", c.server.cfg.LogLevel})
-
 	rows = append(rows, []string{"Global_Config", "Schemas_Count", fmt.Sprintf("%d", len(c.server.schemas))})
 	rows = append(rows, []string{"Global_Config", "Nodes_Count", fmt.Sprintf("%d", len(c.server.nodes))})
 
-	// var row []string = make([]string, Column)
-
 	for db, schema := range c.server.schemas {
 		rows = append(rows, []string{"Schemas", "DB", db})
 
@@ -135,14 +129,14 @@ func (c *Conn) handleShowProxyConfig() (*Resultset, error) {
 			var nodeSection = fmt.Sprintf("Schemas[%s]-Node[ %v ]", db, name)
 
 			if node.master != nil {
-				nodeRows = append(nodeRows, []string{nodeSection, "Master", node.master.String()})
+				nodeRows = append(nodeRows, []string{nodeSection, "Master", node.master.ConfigString()})
 			}
 			if node.masterBackup != nil {
-				nodeRows = append(nodeRows, []string{nodeSection, "Master_Backup", node.masterBackup.String()})
+				nodeRows = append(nodeRows, []string{nodeSection, "Master_Backup", node.masterBackup.ConfigString()})
 			}
 
 			if node.slave != nil {
-				nodeRows = append(nodeRows, []string{nodeSection, "Slave", node.slave.String()})
+				nodeRows = append(nodeRows, []string{nodeSection, "Slave", node.slave.ConfigString()})
 			}
 			nodeRows = append(nodeRows, []string{nodeSection, "Last_Master_Ping", fmt.Sprintf("%v", time.Unix(node.lastMasterPing, 0))})
 
@@ -152,7 +146,20 @@ func (c *Conn) handleShowProxyConfig() (*Resultset, error) {
 
 		}
 		rows = append(rows, []string{fmt.Sprintf("Schemas[%s]", db), "Nodes_List", strings.Join(nodeNames, ",")})
-		rows = append(rows, []string{fmt.Sprintf("Schemas[%s]", db), "Rule", schema.rule.String()})
+
+		var defaultRule = schema.rule.DefaultRule
+		if defaultRule.DB == db {
+			if defaultRule.DB == db {
+				rows = append(rows, []string{fmt.Sprintf("Schemas[%s]_Rule_Default", db),
+					"Default_Table", defaultRule.ConfigString()})
+			}
+		}
+		for tb, r := range schema.rule.Rules {
+			if r.DB == db {
+				rows = append(rows, []string{fmt.Sprintf("Schemas[%s]_Rule_Table", db),
+					fmt.Sprintf("Table[ %s ]", tb), r.ConfigString()})
+			}
+		}
 
 		for i := range nodeRows {
 			rows = append(rows, nodeRows[i])
diff --git a/router/router.go b/router/router.go
@@ -27,12 +27,17 @@ func (r *Rule) FindNodeIndex(key interface{}) int {
 }
 
 func (r *Rule) String() string {
-	return fmt.Sprintf("%s.%s(%s)?shard=%s", r.DB, r.Table, r.Key, r.Type)
+	return fmt.Sprintf("%s.%s?key=%v&shard=%s", r.DB, r.Table, r.Key, r.Type)
+}
+
+func (r *Rule) ConfigString() string {
+	return fmt.Sprintf("%s.%s?key=%v&shard=%s&nodes=%s",
+		r.DB, r.Table, r.Key, r.Type, strings.Join(r.Nodes, ", "))
 }
 
 type DBRules struct {
 	DB          string
-	Rules       map[string]*Rule
+	Rules       map[string]*Rule //key is <table name>
 	DefaultRule *Rule
 }
 
@@ -57,12 +62,7 @@ func (r *DBRules) GetRule(table string) *Rule {
 }
 
 func (r *DBRules) String() string {
-	var rules []string
-
-	for _, rule := range r.Rules {
-		rules = append(rules, rule.String())
-	}
-	return strings.Join(rules, "; ")
+	return r.DB
 }
 
 type Router struct {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (db *DB) Addr() string {`
`36`	`36`	`return db.addr`
`37`	`37`	`}`
`38`	`38`
`39`		`-func (db *DB) String() string {`
	`39`	`+func (db *DB) ConfigString() string {`
`40`	`40`	`return fmt.Sprintf("%s:%s@%s/%s?idleConns=%v&conns=%v",`
`41`	`41`	`db.user, db.password, db.addr, db.db, db.idleConns, db.conns.Len())`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,17 @@ func (r *Rule) FindNodeIndex(key interface{}) int {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func (r *Rule) String() string {`
`30`		`- return fmt.Sprintf("%s.%s(%s)?shard=%s", r.DB, r.Table, r.Key, r.Type)`
	`30`	`+ return fmt.Sprintf("%s.%s?key=%v&shard=%s", r.DB, r.Table, r.Key, r.Type)`
	`31`	`+}`
	`32`	`+`
	`33`	`+func (r *Rule) ConfigString() string {`
	`34`	`+ return fmt.Sprintf("%s.%s?key=%v&shard=%s&nodes=%s",`
	`35`	`+ r.DB, r.Table, r.Key, r.Type, strings.Join(r.Nodes, ", "))`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`type DBRules struct {`
`34`	`39`	`DB string`
`35`		`- Rules map[string]*Rule`
	`40`	`+ Rules map[string]*Rule //key is <table name>`
`36`	`41`	`DefaultRule *Rule`
`37`	`42`	`}`
`38`	`43`
`@@ -57,12 +62,7 @@ func (r DBRules) GetRule(table string) Rule {`
`57`	`62`	`}`
`58`	`63`
`59`	`64`	`func (r *DBRules) String() string {`
`60`		`- var rules []string`
`61`		`-`
`62`		`- for _, rule := range r.Rules {`
`63`		`- rules = append(rules, rule.String())`
`64`		`- }`
`65`		`- return strings.Join(rules, "; ")`
	`65`	`+ return r.DB`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`type Router struct {`