support range shard table based on default value

DEBIAN/conffiles

@@ -0,0 +1 @@
+

DEBIAN/control

@@ -0,0 +1,4 @@
+Package: 
+Version: 
+Maintainer: 
+Description: UC DB Proxy Server.

DEBIAN/mkrootfs

@@ -0,0 +1,14 @@
+#!/bin/sh
+#make root file system for debian pakcage
+#EnvirmentVar: DEB_ROOTFS, DEB_CTRLDIR
+
+mkdir -p -m 755 "${DEB_ROOTFS}" || exit 1
+mkdir -p -m 755 "${DEB_ROOTFS}"/${UC_ROOT}/sbin || exit 2
+install -m 755 "bin/ucdbproxy" "${DEB_ROOTFS}"/${UC_ROOT}/sbin || exit 3
+mkdir -p -m 755 "${DEB_ROOTFS}/${UC_ROOT}/etc" || exit 4
+mkdir -p -m 755 "${DEB_ROOTFS}/${UC_ROOT}/etc/init.d" || exit 5
+mkdir -p -m 755 "${DEB_ROOTFS}/${UC_ROOT}/share" || exit 6
+install -m 644 "etc/ks.yaml" "${DEB_ROOTFS}/${UC_ROOT}/etc" || exit 7
+install -m 744 "ucdbproxy.sh" "${DEB_ROOTFS}/${UC_ROOT}/etc/init.d" || exit 8
+chown -R root:root "${DEB_ROOTFS}/${UC_ROOT}" || exit 9
+

DEBIAN/postinst

@@ -0,0 +1,2 @@
+#!/bin/sh
+

DEBIAN/postrm

@@ -0,0 +1,2 @@
+#!/bin/sh
+

DEBIAN/preinst

@@ -0,0 +1,2 @@
+#!/bin/sh
+

DEBIAN/prerm

@@ -0,0 +1,2 @@
+#!/bin/sh
+

Makefile

@@ -1,15 +1,13 @@
-all: build
+TOPDIR=../../../../../
+include ${TOPDIR}/build-scripts/Macros.mk
+
+DEB_PACKAGE=ucdbproxy
+DEB_VERSION=1.0.0.0
+#DEB_MAINTAINER=
+#DEB_DESCRIPTION=
+DEB_DEPENDS=
+
+include ${TOPDIR}/build-scripts/deb.mk
 
-build: kingshard
 
-kingshard:
-	go tool yacc -o ./sqlparser/sql.go ./sqlparser/sql.y
-	gofmt -w ./sqlparser/sql.go
-	@bash genver.sh
-	go build -o ./bin/kingshard ./cmd/kingshard
-clean:
-	@rm -rf bin
-	@rm -f ./sqlparser/y.output ./sqlparser/sql.go
 
-test:
-	go test ./go/... -race

Makefile.in

@@ -0,0 +1,15 @@
+all: build
+
+build: kingshard
+
+kingshard:
+	go tool yacc -o ./sqlparser/sql.go ./sqlparser/sql.y
+	gofmt -w ./sqlparser/sql.go
+	@bash genver.sh
+	go build -o ./bin/kingshard ./cmd/kingshard
+clean:
+	@rm -rf bin
+	@rm -f ./sqlparser/y.output ./sqlparser/sql.go
+
+test:
+	go test ./go/... -race

build.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+export GOBIN=/usr/local/go/bin
+export GOARCH=amd64
+export GOROOT=/usr/local/go
+export GOOS=linux
+
+source ./dev.sh
+
+go tool yacc -o ./sqlparser/sql.go ./sqlparser/sql.y
+gofmt -w ./sqlparser/sql.go
+source  genver.sh
+go build -o ./bin/ucdbproxy ./cmd/kingshard
+
+

cmd/kingshard/main.go

@@ -49,6 +49,28 @@ const banner string = `
              /____/
 `
 
+func writePID(cfg *config.Config) {
+	pidpath := cfg.PidPath
+	if pidpath == "" {
+		fmt.Println("WritePid failed, please confirm that the pidfile configuration item are correctly filed")
+		os.Exit(-1)
+	}
+
+	fp, err := os.Create(pidpath)
+	if err != nil {
+		fmt.Println("WritePID failed, create pidfile failed %s", err.Error())
+		os.Exit(-1)
+	}
+	defer fp.Close()
+
+	pid := os.Getpid()
+	_, err = fp.WriteString(fmt.Sprintf("%d", pid))
+	if err != nil {
+		fmt.Println("WritePID failed, %s", err.Error())
+		os.Exit(-1)
+	}
+}
+
 func main() {
 	fmt.Print(banner)
 	runtime.GOMAXPROCS(runtime.NumCPU())
@@ -117,6 +139,7 @@ func main() {
 		svr.Close()
 	}()
 
+	writePID(cfg)
 	svr.Run()
 }
 

config/config.go

@@ -23,6 +23,7 @@ import (
 
 //整个config文件对应的结构
 type Config struct {
+	PidPath     string       `yaml:"pidfile"`
 	Addr        string       `yaml:"addr"`
 	User        string       `yaml:"user"`
 	Password    string       `yaml:"password"`
@@ -66,6 +67,7 @@ type ShardConfig struct {
 	Nodes         []string `yaml:"nodes"`
 	Locations     []int    `yaml:"locations"`
 	Type          string   `yaml:"type"`
+	TableRowBase  int      `yaml:"table_row_base"`
 	TableRowLimit int      `yaml:"table_row_limit"`
 	DateRange     []string `yaml:"date_range"`
 }

dev.sh

@@ -8,11 +8,8 @@ if [[ "$VTTOP" == "${VTTOP/\/src\/github.com\/flike\/kingshard/}" ]]; then
 fi
 
 export GOTOP=$VTTOP
-
 function prepend_path()
 {
-  # $1 path variable
-  # $2 path to add
   if [ -d "$2" ] && [[ ":$1:" != *":$2:"* ]]; then
     echo "$2:$1"
   else
@@ -21,4 +18,3 @@ function prepend_path()
 }
 
 export GOPATH=$(prepend_path $GOPATH $VTROOT)
-

etc/ks.yaml

@@ -1,16 +1,18 @@
+pidfile : /uc/etc/ucdbproxy.pid
+
 # server listen addr
 addr : 0.0.0.0:9696
 
 # server user and password
-user :  kingshard
-password : kingshard
+user :  ucdbproxy
+password : ucdbproxy
 
 # if set log_path, the sql log will write into log_path/sql.log,the system log
 # will write into log_path/sys.log
 #log_path : /Users/flike/log
 
 # log level[debug|info|warn|error],default error
-log_level : debug
+log_level : info
 
 # if set log_sql(on|off) off,the sql log will not output
 log_sql: on
@@ -27,82 +29,47 @@ log_sql: on
 
 # the charset of kingshard, if you don't set this item
 # the default charset of kingshard is utf8.
-#proxy_charset: gbk
+proxy_charset: utf8mb4
 
 # node is an agenda for real remote mysql server.
 nodes :
 - 
     name : node1 
 
     # default max conns for mysql server
-    max_conns_limit : 32
+    max_conns_limit : 128
 
     # all mysql in a node must have the same user and password
-    user :  kingshard 
-    password : kingshard
+    user :  root 
+    password : quanshi
 
     # master represents a real mysql master server 
     master : 127.0.0.1:3306
 
     # slave represents a real mysql salve server,and the number after '@' is 
     # read load weight of this slave.
     #slave : 192.168.59.101:3307@2,192.168.59.101:3307@3
-    down_after_noalive : 32
-- 
-    name : node2 
-
-    # default max conns for mysql server
-    max_conns_limit : 32
-
-    # all mysql in a node must have the same user and password
-    user :  kingshard 
-    password : kingshard
-
-    # master represents a real mysql master server 
-    master : 192.168.59.103:3307
-
-    # slave represents a real mysql salve server 
-    slave : 
-
-    # down mysql after N seconds noalive
-    # 0 will no down
-    down_after_noalive: 32
+    #down_after_noalive : 32
 
 # schema defines sharding rules, the db is the sharding table database.
 schema :
-    db : kingshard
-    nodes: [node1,node2]
+    db : statusnet
+    nodes: [node1]
     default: node1      
     shard:
     -   
-        table: test_shard_hash
-        key: id
-        nodes: [node1, node2]
-        type: hash
-        locations: [4,4]
-
-    -   
-        table: test_shard_range
+        table: user_group
         key: id
         type: range
-        nodes: [node1, node2]
-        locations: [4,4]
+        nodes: [node1]
+        locations: [4]
+        table_row_base: 2000
         table_row_limit: 10000
     -
-        table: test_shard_year
-        key: ctime
-        type: date_year
-        nodes: [node1,node2]
-        date_range: [2015-2016,2017-2018]
-    -
-        table: test_shard_month
-        key: dtime
-        type: date_month
-        nodes: [node1,node2]
-        date_range: [201603-201605,201609-201612]
-    -
-        table: test_shard_day
-        key: mtime
-        type: date_day
-        nodes: [node1,node2]
-        date_range: [20160306-20160307,20160308-20160309]
+        table: group_member
+        key: group_id
+        type: range
+        nodes: [node1]
+        locations: [4]
+        table_row_base: 2000
+        table_row_limit: 10000

etc/unshard.yaml

@@ -1,3 +1,5 @@
+pidfile : /uc/etc/ucdbsql.pid
+
 # server listen addr
 addr : 0.0.0.0:9696
 

proxy/router/numkey.go

@@ -47,7 +47,7 @@ func (kr NumKeyRange) String() string {
 	return fmt.Sprintf("{Start: %d, End: %d}", kr.Start, kr.End)
 }
 
-func ParseNumSharding(Locations []int, TableRowLimit int) ([]NumKeyRange, error) {
+func ParseNumSharding(Locations []int, TableRowLimit int, TableRowBase int) ([]NumKeyRange, error) {
 	tableCount := 0
 	length := len(Locations)
 
@@ -57,8 +57,8 @@ func ParseNumSharding(Locations []int, TableRowLimit int) ([]NumKeyRange, error)
 
 	ranges := make([]NumKeyRange, tableCount)
 	for i := 0; i < tableCount; i++ {
-		ranges[i].Start = int64(i * TableRowLimit)
-		ranges[i].End = int64((i + 1) * TableRowLimit)
+		ranges[i].Start = int64(TableRowBase + i*TableRowLimit)
+		ranges[i].End = int64(TableRowBase + (i+1)*TableRowLimit)
 	}
 	return ranges, nil
 }

proxy/router/router.go

@@ -233,7 +233,7 @@ func parseShard(r *Rule, cfg *config.ShardConfig) error {
 	case HashRuleType:
 		r.Shard = &HashShard{ShardNum: len(r.TableToNode)}
 	case RangeRuleType:
-		rs, err := ParseNumSharding(cfg.Locations, cfg.TableRowLimit)
+		rs, err := ParseNumSharding(cfg.Locations, cfg.TableRowLimit, cfg.TableRowBase)
 		if err != nil {
 			return err
 		}
@@ -490,6 +490,7 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
 	var prefix string
 	//rewrite select expr
 	for _, expr := range node.SelectExprs {
+
 		switch v := expr.(type) {
 		case *sqlparser.StarExpr:
 			//for shardTable.*,need replace table into shardTable_xxxx.
@@ -535,6 +536,7 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
 			buf.Fprintf("%s%v", prefix, n)
 		}
 	}
+
 	buf.Fprintf(" from ")
 	switch v := (node.From[0]).(type) {
 	case *sqlparser.AliasedTableExpr:
@@ -570,7 +572,32 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
 				tableIndex,
 			)
 		}
-		buf.Fprintf(" %s %v", v.Join, v.RightExpr)
+
+		if ate_r, ok_r := (v.RightExpr).(*sqlparser.AliasedTableExpr); ok_r {
+			if len(ate_r.As) != 0 {
+				fmt.Fprintf(buf, " %s %s_%04d as %s",
+					sqlparser.AST_LEFT_JOIN,
+					sqlparser.String(ate_r.Expr),
+					tableIndex,
+					string(ate_r.As),
+				)
+			} else {
+				fmt.Fprintf(buf, " %s %s_%04d",
+					sqlparser.AST_LEFT_JOIN,
+					sqlparser.String(ate_r.Expr),
+					tableIndex,
+				)
+			}
+		} else {
+			fmt.Fprintf(buf, " %s %s_%04d",
+				sqlparser.AST_LEFT_JOIN,
+				sqlparser.String(v.RightExpr),
+				tableIndex,
+			)
+		}
+
+		//buf.Fprintf(" %s %v", v.Join, v.RightExpr)
+		//golog.Info("router", "sqlparser.JoinTableExpr and v.Join, v.RightExpr", buf.String(), 0)
 		if v.On != nil {
 			buf.Fprintf(" on %v", v.On)
 		}
@@ -580,6 +607,7 @@ func (r *Router) rewriteSelectSql(plan *Plan, node *sqlparser.Select, tableIndex
 			tableIndex,
 		)
 	}
+
 	//append other tables
 	prefix = ", "
 	for i := 1; i < len(node.From); i++ {

sqlparser/sql.go

@@ -1,9 +1,9 @@
-//line ./sqlparser/sql.y:20
+//line ./sqlparser/sql.y:19
 package sqlparser
 
 import __yyfmt__ "fmt"
 
-//line ./sqlparser/sql.y:20
+//line ./sqlparser/sql.y:21
 import "bytes"
 
 func SetParseTree(yylex interface{}, stmt Statement) {