Replace random input generator (#357)

Replace data generator Sideeffects: * Remove CSV source (never used) * Remove select benchmark (not really useful and select is deprecated by AWS anyway) * Upgrade pkg to v3
minio · Jan 6, 2025 · 1038b62 · 1038b62
1 parent 47cec04
commit 1038b62
Show file tree

Hide file tree

Showing 48 changed files with 68 additions and 666 deletions.
diff --git a/api/api.go b/api/api.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/klauspost/compress/zstd"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/aggregate"
 	"github.com/minio/warp/pkg/bench"
 )

diff --git a/cli/analyze.go b/cli/analyze.go
@@ -32,7 +32,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/api"
 	"github.com/minio/warp/pkg/aggregate"
 	"github.com/minio/warp/pkg/bench"

diff --git a/cli/benchclient.go b/cli/benchclient.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 	"github.com/minio/websocket"
 )

diff --git a/cli/benchmark.go b/cli/benchmark.go
@@ -34,7 +34,7 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/madmin-go/v3"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/api"
 	"github.com/minio/warp/pkg/bench"
 )

diff --git a/cli/cli.go b/cli/cli.go
@@ -31,9 +31,9 @@ import (
 	"github.com/cheggaaa/pb"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
-	"github.com/minio/pkg/v2/trie"
-	"github.com/minio/pkg/v2/words"
+	"github.com/minio/pkg/v3/console"
+	"github.com/minio/pkg/v3/trie"
+	"github.com/minio/pkg/v3/words"
 	"github.com/minio/warp/pkg"
 	completeinstall "github.com/posener/complete/cmd/install"
 )
@@ -91,7 +91,6 @@ func init() {
 		deleteCmd,
 		listCmd,
 		statCmd,
-		selectCmd,
 		versionedCmd,
 		retentionCmd,
 		multipartCmd,

diff --git a/cli/client.go b/cli/client.go
@@ -38,9 +38,9 @@ import (
 	md5simd "github.com/minio/md5-simd"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/minio/pkg/v2/certs"
-	"github.com/minio/pkg/v2/console"
-	"github.com/minio/pkg/v2/ellipses"
+	"github.com/minio/pkg/v3/certs"
+	"github.com/minio/pkg/v3/console"
+	"github.com/minio/pkg/v3/ellipses"
 	"github.com/minio/warp/pkg"
 	"golang.org/x/net/http2"
 )

diff --git a/cli/clientmode.go b/cli/clientmode.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 )
 
 var clientFlags = []cli.Flag{}

diff --git a/cli/cmp.go b/cli/cmp.go
@@ -26,7 +26,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/delete.go b/cli/delete.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/fanout.go b/cli/fanout.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/flags.go b/cli/flags.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 	"github.com/minio/warp/pkg/generator"
 

diff --git a/cli/generator.go b/cli/generator.go
@@ -43,26 +43,6 @@ var genFlags = []cli.Flag{
 	},
 }
 
-func newGenSourceCSV(ctx *cli.Context) func() generator.Source {
-	prefixSize := 8
-	if ctx.Bool("noprefix") {
-		prefixSize = 0
-	}
-
-	g := generator.WithCSV().Size(25, 1000)
-
-	size, err := toSize(ctx.String("obj.size"))
-	fatalIf(probe.NewError(err), "Invalid obj.size specified")
-	src, err := generator.NewFn(g.Apply(),
-		generator.WithCustomPrefix(ctx.String("prefix")),
-		generator.WithPrefixSize(prefixSize),
-		generator.WithSize(int64(size)),
-		generator.WithRandomSize(ctx.Bool("obj.randsize")),
-	)
-	fatalIf(probe.NewError(err), "Unable to create data generator")
-	return src
-}
-
 // newGenSource returns a new generator
 func newGenSource(ctx *cli.Context, sizeField string) func() generator.Source {
 	prefixSize := 8
@@ -74,8 +54,6 @@ func newGenSource(ctx *cli.Context, sizeField string) func() generator.Source {
 	switch ctx.String("obj.generator") {
 	case "random":
 		g = generator.WithRandomData()
-	case "csv":
-		g = generator.WithCSV().Size(25, 1000)
 	default:
 		err := errors.New("unknown generator type:" + ctx.String("obj.generator"))
 		fatal(probe.NewError(err), "Invalid -generator parameter")

diff --git a/cli/get.go b/cli/get.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/list.go b/cli/list.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/merge.go b/cli/merge.go
@@ -26,7 +26,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/mixed.go b/cli/mixed.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/multipart.go b/cli/multipart.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/print.go b/cli/print.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/cheggaaa/pb"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 )
 
 // causeMessage container for golang error messages

diff --git a/cli/progress-bar.go b/cli/progress-bar.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/cheggaaa/pb"
 	"github.com/fatih/color"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 )
 
 // progress extender.

diff --git a/cli/put.go b/cli/put.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/retention.go b/cli/retention.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/rlimit.go b/cli/rlimit.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"runtime/debug"
 
-	"github.com/minio/pkg/v2/sys"
+	"github.com/minio/pkg/v3/sys"
 )
 
 func setMaxResources() (err error) {

diff --git a/cli/select.go b/cli/select.go
diff --git a/cli/snowball.go b/cli/snowball.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/stat.go b/cli/stat.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/versioned.go b/cli/versioned.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/zip.go b/cli/zip.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/minio/cli"
-	"github.com/minio/pkg/v2/console"
+	"github.com/minio/pkg/v3/console"
 	"github.com/minio/warp/pkg/bench"
 )