Fixed "vttablet --help" to show correct command line flags

examples/local/env.sh

@@ -63,6 +63,7 @@ if [ "${TOPO}" = "zk2" ]; then
     mkdir -p $VTDATAROOT/tmp
 else
     echo "enter etcd2 env"
+<<<<<<< HEAD
 
     case $(uname) in
       Linux)  etcd_platform=linux;;
@@ -77,3 +78,23 @@ else
     mkdir -p "${VTDATAROOT}/tmp"
     mkdir -p "${VTDATAROOT}/etcd"
 fi
+=======
+>>>>>>> master
+
+    case $(uname) in
+      Linux)  etcd_platform=linux;;
+      Darwin) etcd_platform=darwin;;
+    esac
+
+<<<<<<< HEAD
+
+=======
+    ETCD_SERVER="localhost:2379"
+    ETCD_VERSION=$(cat "${VTROOT}/dist/etcd/.installed_version")
+    ETCD_BINDIR="${VTROOT}/dist/etcd/etcd-${ETCD_VERSION}-${etcd_platform}-amd64/"
+    TOPOLOGY_FLAGS="-topo_implementation etcd2 -topo_global_server_address $ETCD_SERVER -topo_global_root /vitess/global"
+
+    mkdir -p "${VTDATAROOT}/tmp"
+    mkdir -p "${VTDATAROOT}/etcd"
+fi
+>>>>>>> master

go/cmd/vtgate/plugin_auth_static.go

@@ -19,10 +19,10 @@ package main
 // This plugin imports staticauthserver to register the flat-file implementation of AuthServer.
 
 import (
-	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/mysql/staticauthserver"
 	"vitess.io/vitess/go/vt/vtgate"
 )
 
 func init() {
-	vtgate.RegisterPluginInitializer(func() { mysql.InitAuthServerStatic() })
+	vtgate.RegisterPluginInitializer(func() { staticauthserver.InitAuthServerStatic() })
 }

go/cmd/vtqueryserver/plugin_auth_static.go

@@ -19,10 +19,10 @@ package main
 // This plugin imports staticauthserver to register the flat-file implementation of AuthServer.
 
 import (
-	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/mysql/staticauthserver"
 	"vitess.io/vitess/go/vt/vtqueryserver"
 )
 
 func init() {
-	vtqueryserver.RegisterPluginInitializer(func() { mysql.InitAuthServerStatic() })
+	vtqueryserver.RegisterPluginInitializer(func() { staticauthserver.InitAuthServerStatic() })
 }

go/cmd/zk/zkcmd.go

@@ -32,7 +32,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/z-division/go-zookeeper/zk"
+	"github.com/samuel/go-zookeeper/zk"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/net/context"
 

go/mysql/auth_server.go

@@ -79,20 +79,20 @@ type AuthServer interface {
 	Negotiate(c *Conn, user string, remoteAddr net.Addr) (Getter, error)
 }
 
-// authServers is a registry of AuthServer implementations.
-var authServers = make(map[string]AuthServer)
+// AauthServers is a registry of AuthServer implementations.
+var AauthServers = make(map[string]AuthServer)
 
 // RegisterAuthServerImpl registers an implementations of AuthServer.
-func RegisterAuthServerImpl(name string, authServer AuthServer) {
-	if _, ok := authServers[name]; ok {
+func RegisterAuthServerImpl(name string, AauthServer AuthServer) {
+	if _, ok := AauthServers[name]; ok {
 		log.Fatalf("AuthServer named %v already exists", name)
 	}
-	authServers[name] = authServer
+	AauthServers[name] = AauthServer
 }
 
 // GetAuthServer returns an AuthServer by name, or log.Exitf.
 func GetAuthServer(name string) AuthServer {
-	authServer, ok := authServers[name]
+	authServer, ok := AauthServers[name]
 	if !ok {
 		log.Exitf("no AuthServer name %v registered", name)
 	}
@@ -146,7 +146,7 @@ func ScramblePassword(salt, password []byte) []byte {
 	return scramble
 }
 
-func isPassScrambleMysqlNativePassword(reply, salt []byte, mysqlNativePassword string) bool {
+func IsPassScrambleMysqlNativePassword(reply, salt []byte, mysqlNativePassword string) bool {
 	/*
 		SERVER:  recv(reply)
 				 hash_stage1=xor(reply, sha1(salt,hash))

go/mysql/auth_server_clientcert.go

@@ -66,7 +66,7 @@ func (ascc *AuthServerClientCert) Negotiate(c *Conn, user string, remoteAddr net
 	}
 
 	return &StaticUserData{
-		username: commonName,
-		groups:   certs[0].DNSNames,
+		Username: commonName,
+		Groups:   certs[0].DNSNames,
 	}, nil
 }

go/mysql/client.go

@@ -104,7 +104,7 @@ func Connect(ctx context.Context, params *ConnParams) (*Conn, error) {
 		}
 
 		// Send the connection back, so the other side can close it.
-		c := newConn(conn)
+		c := NewConn(conn)
 		status <- connectResult{
 			c: c,
 		}
@@ -171,16 +171,16 @@ func Connect(ctx context.Context, params *ConnParams) (*Conn, error) {
 // Ping implements mysql ping command.
 func (c *Conn) Ping() error {
 	// This is a new command, need to reset the sequence.
-	c.sequence = 0
+	c.Sequence = 0
 
-	if err := c.writePacket([]byte{ComPing}); err != nil {
+	if err := c.WritePacket([]byte{ComPing}); err != nil {
 		return NewSQLError(CRServerGone, SSUnknownSQLState, "%v", err)
 	}
-	data, err := c.readEphemeralPacket()
+	data, err := c.ReadEphemeralPacket()
 	if err != nil {
 		return NewSQLError(CRServerLost, SSUnknownSQLState, "%v", err)
 	}
-	defer c.recycleReadPacket()
+	defer c.RecycleReadPacket()
 	switch data[0] {
 	case OKPacket:
 		return nil
@@ -339,7 +339,7 @@ func (c *Conn) clientHandshake(characterSet uint8, params *ConnParams) error {
 	// it now. This is what the 'mysql' client does.
 	if capabilities&CapabilityClientConnectWithDB == 0 && params.DbName != "" {
 		// Write the packet.
-		if err := c.writeComInitDB(params.DbName); err != nil {
+		if err := c.WriteComInitDB(params.DbName); err != nil {
 			return err
 		}
 
@@ -521,7 +521,7 @@ func (c *Conn) writeSSLRequest(capabilities uint32, characterSet uint8, params *
 		flags |= CapabilityClientConnectWithDB
 	}
 
-	data := c.startEphemeralPacket(length)
+	data := c.StartEphemeralPacket(length)
 	pos := 0
 
 	// Client capability flags.
@@ -534,7 +534,7 @@ func (c *Conn) writeSSLRequest(capabilities uint32, characterSet uint8, params *
 	_ = writeByte(data, pos, characterSet)
 
 	// And send it as is.
-	if err := c.writeEphemeralPacket(); err != nil {
+	if err := c.WriteEphemeralPacket(); err != nil {
 		return NewSQLError(CRServerLost, SSUnknownSQLState, "cannot send SSLRequest: %v", err)
 	}
 	return nil
@@ -584,7 +584,7 @@ func (c *Conn) writeHandshakeResponse41(capabilities uint32, scrambledPassword [
 		length++
 	}
 
-	data := c.startEphemeralPacket(length)
+	data := c.StartEphemeralPacket(length)
 	pos := 0
 
 	// Client capability flags.
@@ -626,7 +626,7 @@ func (c *Conn) writeHandshakeResponse41(capabilities uint32, scrambledPassword [
 		return NewSQLError(CRMalformedPacket, SSUnknownSQLState, "writeHandshakeResponse41: only packed %v bytes, out of %v allocated", pos, len(data))
 	}
 
-	if err := c.writeEphemeralPacket(); err != nil {
+	if err := c.WriteEphemeralPacket(); err != nil {
 		return NewSQLError(CRServerLost, SSUnknownSQLState, "cannot send HandshakeResponse41: %v", err)
 	}
 	return nil
@@ -646,12 +646,12 @@ func parseAuthSwitchRequest(data []byte) (string, []byte, error) {
 // Returns a SQLError.
 func (c *Conn) writeClearTextPassword(params *ConnParams) error {
 	length := len(params.Pass) + 1
-	data := c.startEphemeralPacket(length)
+	data := c.StartEphemeralPacket(length)
 	pos := 0
 	pos = writeNullString(data, pos, params.Pass)
 	// Sanity check.
 	if pos != len(data) {
 		return vterrors.Errorf(vtrpc.Code_INTERNAL, "error building ClearTextPassword packet: got %v bytes expected %v", pos, len(data))
 	}
-	return c.writeEphemeralPacket()
+	return c.WriteEphemeralPacket()
 }

go/mysql/client_test.go

@@ -63,7 +63,7 @@ func TestConnectTimeout(t *testing.T) {
 	if err != nil {
 		t.Fatalf("cannot listen: %v", err)
 	}
-	host, port := getHostPort(t, listener.Addr())
+	host, port := GetHostPort(t, listener.Addr())
 	params := &ConnParams{
 		Host: host,
 		Port: port,