refactoring, can not run now

shenli · Jul 11, 2014 · 957a9ee · 957a9ee
1 parent 405cac9
commit 957a9ee
Show file tree

Hide file tree

Showing 39 changed files with 53 additions and 53 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -7,4 +7,4 @@ fi
 
 source ./dev.env
 
-go get github.com/siddontang/golib/log
+go get -u github.com/siddontang/go-log/log
diff --git a/cmd/mixer_server/main.go b/cmd/mixer_server/main.go
@@ -0,0 +1,15 @@
+package main
+
+import (
+	"flag"
+	"github.com/siddontang/mixer/server"
+)
+
+var config = flag.String("config", "/etc/mixer.json", "config directory")
+
+func main() {
+	flag.Parse()
+
+	s := server.NewServer(*config)
+	s.Start()
+}
diff --git a/dev.env b/dev.env
@@ -5,7 +5,7 @@ if [[ "$VTTOP" == "${VTTOP/\/src\/github.com\/siddontang\/mixer/}" ]]; then
   echo "WARNING: VTTOP($VTTOP) does not contain src/github.com/siddontang/mixer"
 fi
 
-export GOTOP=$VTTOP/go
+export GOTOP=$VTTOP
 
 function prepend_path()
 {

diff --git a/etc/proxy.json → etc/mixer.json b/etc/proxy.json → etc/mixer.json
diff --git a/go/cmd/mxproxy/main.go b/go/cmd/mxproxy/main.go
diff --git a/makefile b/makefile
@@ -1,11 +1,11 @@
 all: build  
 
 build:
-	go install ./go/...
+	go install ./...
 
 clean:
-	go clean -i ./go/...
+	go clean -i ./...
 
 test:
-	go test ./go/...
-	go test -race ./go/...
+	go test ./...
+	go test -race ./...
diff --git a/go/mysql/charset.go → mysql/charset.go b/go/mysql/charset.go → mysql/charset.go
diff --git a/go/mysql/conn.go → mysql/conn.go b/go/mysql/conn.go → mysql/conn.go
diff --git a/go/mysql/conn_test.go → mysql/conn_test.go b/go/mysql/conn_test.go → mysql/conn_test.go
diff --git a/go/mysql/const.go → mysql/const.go b/go/mysql/const.go → mysql/const.go
diff --git a/go/mysql/db.go → mysql/db.go b/go/mysql/db.go → mysql/db.go
diff --git a/go/mysql/errcode.go → mysql/errcode.go b/go/mysql/errcode.go → mysql/errcode.go
diff --git a/go/mysql/errname.go → mysql/errname.go b/go/mysql/errname.go → mysql/errname.go
diff --git a/go/mysql/error.go → mysql/error.go b/go/mysql/error.go → mysql/error.go
diff --git a/go/mysql/field.go → mysql/field.go b/go/mysql/field.go → mysql/field.go
diff --git a/go/mysql/packetio.go → mysql/packetio.go b/go/mysql/packetio.go → mysql/packetio.go
diff --git a/go/mysql/result.go → mysql/result.go b/go/mysql/result.go → mysql/result.go
diff --git a/go/mysql/resultset.go → mysql/resultset.go b/go/mysql/resultset.go → mysql/resultset.go
diff --git a/go/mysql/state.go → mysql/state.go b/go/mysql/state.go → mysql/state.go
diff --git a/go/mysql/stmt.go → mysql/stmt.go b/go/mysql/stmt.go → mysql/stmt.go
diff --git a/go/mysql/stmt_test.go → mysql/stmt_test.go b/go/mysql/stmt_test.go → mysql/stmt_test.go
diff --git a/go/mysql/util.go → mysql/util.go b/go/mysql/util.go → mysql/util.go
diff --git a/go/parser/keywords.go → parser/keywords.go b/go/parser/keywords.go → parser/keywords.go
diff --git a/go/parser/lexer.go → parser/lexer.go b/go/parser/lexer.go → parser/lexer.go
diff --git a/go/parser/lexer_test.go → parser/lexer_test.go b/go/parser/lexer_test.go → parser/lexer_test.go
diff --git a/go/parser/token.go → parser/token.go b/go/parser/token.go → parser/token.go
diff --git a/go/proxy/config.go → server/config.go b/go/proxy/config.go → server/config.go
@@ -1,4 +1,4 @@
-package proxy
+package server
 
 import (
 	"encoding/json"

diff --git a/go/proxy/config_test.go → server/config_test.go b/go/proxy/config_test.go → server/config_test.go
@@ -1,4 +1,4 @@
-package proxy
+package server
 
 import (
 	"testing"

diff --git a/go/proxy/conn.go → server/conn.go b/go/proxy/conn.go → server/conn.go
@@ -1,11 +1,11 @@
-package proxy
+package server
 
 import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/siddontang/golib/log"
-	. "github.com/siddontang/mixer/go/mysql"
+	"github.com/siddontang/go-log/log"
+	. "github.com/siddontang/mixer/mysql"
 	"net"
 	"runtime"
 	"sync"

diff --git a/go/proxy/conn_test.go → server/conn_test.go b/go/proxy/conn_test.go → server/conn_test.go
@@ -1,7 +1,7 @@
-package proxy
+package server
 
 import (
-	. "github.com/siddontang/mixer/go/mysql"
+	. "github.com/siddontang/mixer/mysql"
 	"testing"
 )
 

diff --git a/go/proxy/connquery.go → server/connquery.go b/go/proxy/connquery.go → server/connquery.go
@@ -1,11 +1,11 @@
-package proxy
+package server
 
 import (
 	"errors"
 	"fmt"
-	"github.com/siddontang/golib/log"
-	. "github.com/siddontang/mixer/go/mysql"
-	. "github.com/siddontang/mixer/go/parser"
+	"github.com/siddontang/go-log/log"
+	. "github.com/siddontang/mixer/mysql"
+	. "github.com/siddontang/mixer/parser"
 	"strings"
 )
 

diff --git a/go/proxy/connselect.go → server/connselect.go b/go/proxy/connselect.go → server/connselect.go
@@ -1,11 +1,11 @@
-package proxy
+package server
 
 import (
 	"errors"
 	"fmt"
-	"github.com/siddontang/golib/log"
-	. "github.com/siddontang/mixer/go/mysql"
-	. "github.com/siddontang/mixer/go/parser"
+	"github.com/siddontang/go-log/log"
+	. "github.com/siddontang/mixer/mysql"
+	. "github.com/siddontang/mixer/parser"
 	"strconv"
 	"strings"
 )

diff --git a/go/proxy/connset.go → server/connset.go b/go/proxy/connset.go → server/connset.go
@@ -1,9 +1,9 @@
-package proxy
+package server
 
 import (
 	"fmt"
-	. "github.com/siddontang/mixer/go/mysql"
-	. "github.com/siddontang/mixer/go/parser"
+	. "github.com/siddontang/mixer/mysql"
+	. "github.com/siddontang/mixer/parser"
 	"strconv"
 	"strings"
 )

diff --git a/go/proxy/connstmt.go → server/connstmt.go b/go/proxy/connstmt.go → server/connstmt.go
@@ -1,11 +1,11 @@
-package proxy
+package server
 
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/siddontang/golib/log"
-	. "github.com/siddontang/mixer/go/mysql"
-	. "github.com/siddontang/mixer/go/parser"
+	"github.com/siddontang/go-log/log"
+	. "github.com/siddontang/mixer/mysql"
+	. "github.com/siddontang/mixer/parser"
 	"math"
 	"strconv"
 )

diff --git a/go/proxy/connstmt_test.go → server/connstmt_test.go b/go/proxy/connstmt_test.go → server/connstmt_test.go
@@ -1,4 +1,4 @@
-package proxy
+package server
 
 import (
 	"testing"

diff --git a/go/proxy/node.go → server/node.go b/go/proxy/node.go → server/node.go
@@ -1,10 +1,10 @@
-package proxy
+package server
 
 import (
 	"container/list"
 	"fmt"
-	"github.com/siddontang/golib/log"
-	. "github.com/siddontang/mixer/go/mysql"
+	"github.com/siddontang/go-log/log"
+	. "github.com/siddontang/mixer/mysql"
 	"strings"
 	"sync"
 	"time"

diff --git a/go/proxy/schema.go → server/schema.go b/go/proxy/schema.go → server/schema.go
@@ -1,8 +1,8 @@
-package proxy
+package server
 
 import (
 	"fmt"
-	. "github.com/siddontang/mixer/go/parser"
+	. "github.com/siddontang/mixer/parser"
 )
 
 type schema struct {

diff --git a/go/proxy/server.go → server/server.go b/go/proxy/server.go → server/server.go
@@ -1,7 +1,7 @@
-package proxy
+package server
 
 import (
-	"github.com/siddontang/golib/log"
+	"github.com/siddontang/go-log/log"
 	"net"
 	"runtime"
 )

diff --git a/go/proxy/server_test.go → server/server_test.go b/go/proxy/server_test.go → server/server_test.go
@@ -1,7 +1,7 @@
-package proxy
+package server
 
 import (
-	. "github.com/siddontang/mixer/go/mysql"
+	. "github.com/siddontang/mixer/mysql"
 	"sync"
 	"testing"
 	"time"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ fi

		source ./dev.env

		go get github.com/siddontang/golib/log
		go get -u github.com/siddontang/go-log/log