vendor: update all dependencies

vendor/cloud.google.com/go/bigtable/cmd/cbt/cbt.go

@@ -48,6 +48,10 @@ var (
 	client              *bigtable.Client
 	adminClient         *bigtable.AdminClient
 	instanceAdminClient *bigtable.InstanceAdminClient
+
+	version      = "<unknown version>"
+	revision     = "<unknown revision>"
+	revisionDate = "<unknown revision date>"
 )
 
 func getCredentialOpts(opts []option.ClientOption) []option.ClientOption {
@@ -179,6 +183,8 @@ For convenience, values of the -project, -instance, -creds,
 	admin-endpoint = hostname:port
 	data-endpoint = hostname:port
 All values are optional, and all will be overridden by flags.
+
+cbt ` + version + ` ` + revision + ` ` + revisionDate + `
 `
 
 var commands = []struct {
@@ -202,10 +208,10 @@ var commands = []struct {
 		Required: cbtconfig.ProjectAndInstanceRequired,
 	},
 	{
-		Name:     "createtable",
-		Desc:     "Create a table",
-		do:       doCreateTable,
-		Usage:    "cbt createtable <table> [initial_splits...]\n" +
+		Name: "createtable",
+		Desc: "Create a table",
+		do:   doCreateTable,
+		Usage: "cbt createtable <table> [initial_splits...]\n" +
 			"  initial_splits=row		A row key to be used to initially split the table " +
 			"into multiple tablets. Can be repeated to create multiple splits.",
 		Required: cbtconfig.ProjectAndInstanceRequired,
@@ -307,6 +313,13 @@ var commands = []struct {
 			"  maxversions=<n>	Maximum number of versions to preserve",
 		Required: cbtconfig.ProjectAndInstanceRequired,
 	},
+	{
+		Name:     "version",
+		Desc:     "Print the current cbt version",
+		do:       doVersion,
+		Usage:    "cbt version",
+		Required: cbtconfig.NoneRequired,
+	},
 }
 
 func doCount(ctx context.Context, args ...string) {
@@ -561,6 +574,12 @@ func (b byColumn) Len() int           { return len(b) }
 func (b byColumn) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
 func (b byColumn) Less(i, j int) bool { return b[i].Column < b[j].Column }
 
+type byFamilyName []bigtable.FamilyInfo
+
+func (b byFamilyName) Len() int           { return len(b) }
+func (b byFamilyName) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
+func (b byFamilyName) Less(i, j int) bool { return b[i].Name < b[j].Name }
+
 func doLS(ctx context.Context, args ...string) {
 	switch len(args) {
 	default:
@@ -580,10 +599,14 @@ func doLS(ctx context.Context, args ...string) {
 		if err != nil {
 			log.Fatalf("Getting table info: %v", err)
 		}
-		sort.Strings(ti.Families)
-		for _, fam := range ti.Families {
-			fmt.Println(fam)
+		sort.Sort(byFamilyName(ti.FamilyInfos))
+		tw := tabwriter.NewWriter(os.Stdout, 10, 8, 4, '\t', 0)
+		fmt.Fprintf(tw, "Family Name\tGC Policy\n")
+		fmt.Fprintf(tw, "-----------\t---------\n")
+		for _, fam := range ti.FamilyInfos {
+			fmt.Fprintf(tw, "%s\t%s\n", fam.Name, fam.GCPolicy)
 		}
+		tw.Flush()
 	}
 }
 
@@ -787,3 +810,7 @@ var unitMap = map[string]time.Duration{
 	"h":  time.Hour,
 	"d":  24 * time.Hour,
 }
+
+func doVersion(ctx context.Context, args ...string) {
+	fmt.Printf("%s %s %s\n", version, revision, revisionDate)
+}

vendor/cloud.google.com/go/bigtable/cmd/loadtest/loadtest.go

@@ -26,6 +26,7 @@ import (
 	"log"
 	"math/rand"
 	"os"
+	"os/signal"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -38,7 +39,8 @@ import (
 )
 
 var (
-	runFor       = flag.Duration("run_for", 5*time.Second, "how long to run the load test for")
+	runFor = flag.Duration("run_for", 5*time.Second,
+		"how long to run the load test for; 0 to run forever until SIGTERM")
 	scratchTable = flag.String("scratch_table", "loadtest-scratch", "name of table to use; should not already exist")
 	csvOutput    = flag.String("csv_output", "",
 		"output path for statistics in .csv format. If this file already exists it will be overwritten.")
@@ -108,13 +110,23 @@ func main() {
 	// Upon a successful run, delete the table. Don't bother checking for errors.
 	defer adminClient.DeleteTable(context.Background(), *scratchTable)
 
+	// Also delete the table on SIGTERM.
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+	go func() {
+		s := <-c
+		log.Printf("Caught %v, cleaning scratch table.", s)
+		adminClient.DeleteTable(context.Background(), *scratchTable)
+		os.Exit(1)
+	}()
+
 	log.Printf("Starting load test... (run for %v)", *runFor)
 	tbl := client.Open(*scratchTable)
 	sem := make(chan int, *reqCount) // limit the number of requests happening at once
 	var reads, writes stats
 	stopTime := time.Now().Add(*runFor)
 	var wg sync.WaitGroup
-	for time.Now().Before(stopTime) {
+	for time.Now().Before(stopTime) || *runFor == 0 {
 		sem <- 1
 		wg.Add(1)
 		go func() {