(missing from previous commit).

go/cmd/vtctl/plugin_gorpcvtgateconn.go

@@ -0,0 +1,11 @@
+// Copyright 2015, Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+// Imports and register the gorpc vtgateconn client
+
+import (
+	_ "github.com/youtube/vitess/go/vt/vtgate/gorpcvtgateconn"
+)

go/vt/vtctl/query.go

@@ -0,0 +1,100 @@
+// Copyright 2015, Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package vtctl
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"time"
+
+	"github.com/youtube/vitess/go/jscfg"
+	"github.com/youtube/vitess/go/vt/topo"
+	"github.com/youtube/vitess/go/vt/vtgate/vtgateconn"
+	"github.com/youtube/vitess/go/vt/wrangler"
+	"golang.org/x/net/context"
+)
+
+// This file contains the query command group for vtctl.
+
+const queriesGroundName = "Queries"
+
+func init() {
+	addCommandGroup(queriesGroundName)
+	addCommand(queriesGroundName, command{
+		"VtGateExecute",
+		commandVtGateExecute,
+		"-server <vtgate> [-bind_variables <JSON map>] [-connect_timeout <connect timeout>] [-tablet_type <tablet type>] <sql>",
+		"Executes the given SQL query with the provided bound variables aganst the vtgate server."})
+}
+
+type bindvars map[string]interface{}
+
+func (bv *bindvars) String() string {
+	b, err := json.Marshal(bv)
+	if err != nil {
+		return err.Error()
+	}
+	return string(b)
+}
+
+func (bv *bindvars) Set(s string) (err error) {
+	err = json.Unmarshal([]byte(s), &bv)
+	if err != nil {
+		return fmt.Errorf("error json-unmarshaling '%v': %v", s, err)
+	}
+	// json reads all numbers as float64
+	// So, we just ditch floats for bindvars
+	for k, v := range *bv {
+		if f, ok := v.(float64); ok {
+			if f > 0 {
+				(*bv)[k] = uint64(f)
+			} else {
+				(*bv)[k] = int64(f)
+			}
+		}
+	}
+	return nil
+}
+
+// For internal flag compatibility
+func (bv *bindvars) Get() interface{} {
+	return bv
+}
+
+func newBindvars(subFlags *flag.FlagSet) *bindvars {
+	var bv bindvars
+	subFlags.Var(&bv, "bind_variables", "bind variables as a json list")
+	return &bv
+}
+
+func commandVtGateExecute(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+	server := subFlags.String("server", "", "VtGate server to connect to")
+	bindVariables := newBindvars(subFlags)
+	connectTimeout := subFlags.Duration("connect_timeout", 30*time.Second, "Connection timeout for vtgate client")
+	tabletType := subFlags.String("tablet_type", "master", "tablet type to query")
+	if err := subFlags.Parse(args); err != nil {
+		return err
+	}
+	if subFlags.NArg() != 1 {
+		return fmt.Errorf("the <sql> argument is required for the VtGateExecute command")
+	}
+	t, err := parseTabletType(*tabletType, []topo.TabletType{topo.TYPE_MASTER, topo.TYPE_REPLICA, topo.TYPE_RDONLY})
+	if err != nil {
+		return err
+	}
+
+	vtgateConn, err := vtgateconn.Dial(ctx, *server, *connectTimeout)
+	if err != nil {
+		return fmt.Errorf("error connecting to vtgate '%v': %v", *server, err)
+	}
+	defer vtgateConn.Close()
+	qr, err := vtgateConn.Execute(ctx, subFlags.Arg(0), *bindVariables, t)
+	if err != nil {
+		return fmt.Errorf("Execute failed: %v", err)
+	}
+	wr.Logger().Printf("%v\n", jscfg.ToJSON(qr))
+	return nil
+}