Merge pull request #4 from furusax0621/refactor

Refactor

Author: furusax0621

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/icrowley/fake v0.0.0-20221112152111-d7b7e2276db2
 	github.com/kr/pretty v0.3.1
-	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )

go.sum

@@ -27,8 +27,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=

internal/getters/date.go

@@ -42,9 +42,7 @@ type RandomDateInRange struct {
 }
 
 func (r *RandomDateInRange) Value() interface{} {
-	rand.Seed(time.Now().UnixNano())
-	var randomSeconds int64
-	randomSeconds = rand.Int63n(oneYear) + rand.Int63n(100)
+	randomSeconds := rand.Int63n(oneYear) + rand.Int63n(100)
 	d := time.Now().Add(-1 * time.Duration(randomSeconds) * time.Second)
 	return d
 }

internal/getters/datetime.go

@@ -7,14 +7,14 @@ import (
 )
 
 type RandomDateTimeInRange struct {
+	name      string
 	min       string
 	max       string
 	allowNull bool
 }
 
 // Value returns a random time.Time in the range specified by the New method
 func (r *RandomDateTimeInRange) Value() interface{} {
-	rand.Seed(time.Now().UnixNano())
 	randomSeconds := rand.Int63n(oneYear)
 	d := time.Now().Add(-1 * time.Duration(randomSeconds) * time.Second)
 	return d
@@ -32,15 +32,15 @@ func (r *RandomDateTimeInRange) Quote() string {
 }
 
 // NewRandomDateTimeInRange returns a new random date in the specified range
-func NewRandomDateTimeInRange(name string, min, max string, allowNull bool) *RandomDateInRange {
+func NewRandomDateTimeInRange(name string, min, max string, allowNull bool) *RandomDateTimeInRange {
 	if min == "" {
 		t := time.Now().Add(-1 * time.Duration(oneYear) * time.Second)
-		min = t.Format("2006-01-02")
+		min = t.Format("2006-01-02 15:03:04")
 	}
-	return &RandomDateInRange{name, min, max, allowNull}
+	return &RandomDateTimeInRange{name, min, max, allowNull}
 }
 
 // NewRandomDateTime returns a new random datetime between Now() and Now() - 1 year
-func NewRandomDateTime(name string, allowNull bool) *RandomDateInRange {
-	return &RandomDateInRange{name, "", "", allowNull}
+func NewRandomDateTime(name string, allowNull bool) *RandomDateTimeInRange {
+	return &RandomDateTimeInRange{name, "", "", allowNull}
 }

internal/getters/getters.go

@@ -1,5 +1,10 @@
 package getters
 
+import (
+	"math/rand"
+	"time"
+)
+
 // All types defined here satisfy the Getter interface
 // type Getter interface {
 // 	   Value()  interface{}
@@ -12,3 +17,7 @@ const (
 	oneYear      = int64(60 * 60 * 24 * 365)
 	NULL         = "NULL"
 )
+
+func init() {
+	rand.Seed(time.Now().UnixMicro())
+}

main.go

@@ -18,8 +18,8 @@ import (
 	"github.com/gosuri/uiprogress"
 	"github.com/kr/pretty"
 
-	log "github.com/sirupsen/logrus"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	"github.com/sirupsen/logrus"
+	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 type cliOptions struct {
@@ -55,10 +55,7 @@ type mysqlOptions struct {
 }
 
 var (
-	opts *cliOptions
-
-	validFunctions = []string{"int", "string", "date", "date_in_range"}
-	maxValues      = map[string]int64{
+	maxValues = map[string]int64{
 		"tinyint":   0xF,
 		"smallint":  0xFF,
 		"mediumint": 0x7FFFF,
@@ -95,7 +92,7 @@ func main() {
 
 	opts, err := processCliParams()
 	if err != nil {
-		log.Fatal(err.Error())
+		logrus.Fatal(err.Error())
 	}
 
 	if *opts.Version {
@@ -134,36 +131,36 @@ func main() {
 
 	// SET TimeZone to UTC to avoid errors due to random dates & daylight saving valid values
 	if _, err = db.Exec(`SET @@session.time_zone = "+00:00"`); err != nil {
-		log.Printf("Cannot set time zone to UTC: %s\n", err)
+		logrus.Printf("Cannot set time zone to UTC: %s\n", err)
 		db.Close()
 		os.Exit(1)
 	}
 
 	table, err := tableparser.NewTable(db, *opts.Schema, *opts.TableName)
 	if err != nil {
-		log.Printf("cannot get table %s struct: %s", *opts.TableName, err)
+		logrus.Printf("cannot get table %s struct: %s", *opts.TableName, err)
 		db.Close()
 		os.Exit(1)
 	}
 
-	log.SetFormatter(&log.TextFormatter{FullTimestamp: true})
+	logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp: true})
 	if *opts.Debug {
-		log.SetLevel(log.DebugLevel)
+		logrus.SetLevel(logrus.DebugLevel)
 		*opts.NoProgress = true
 	}
-	log.Debug(pretty.Sprint(table))
+	logrus.Debug(pretty.Sprint(table))
 
 	if len(table.Triggers) > 0 {
-		log.Warnf("There are triggers on the %s table that might affect this process:", *opts.TableName)
+		logrus.Warnf("There are triggers on the %s table that might affect this process:", *opts.TableName)
 		for _, t := range table.Triggers {
-			log.Warnf("Trigger %q, %s %s", t.Trigger, t.Timing, t.Event)
-			log.Warnf("Statement: %s", t.Statement)
+			logrus.Warnf("Trigger %q, %s %s", t.Trigger, t.Timing, t.Event)
+			logrus.Warnf("Statement: %s", t.Statement)
 		}
 	}
 
 	if *opts.Rows < 1 {
 		db.Close() // golint:noerror
-		log.Warnf("Number of rows < 1. There is nothing to do. Exiting")
+		logrus.Warnf("Number of rows < 1. There is nothing to do. Exiting")
 		os.Exit(1)
 	}
 
@@ -183,7 +180,7 @@ func main() {
 	}
 
 	if !*opts.Print {
-		log.Info("Starting")
+		logrus.Info("Starting")
 	}
 
 	// Example: want 11 rows with bulksize 4:
@@ -198,7 +195,7 @@ func main() {
 	remainder := *opts.Rows - count**opts.BulkSize
 	semaphores := makeSemaphores(*opts.MaxThreads)
 	rowValues := makeValueFuncs(db, table.Fields, *opts.Samples)
-	log.Debugf("Must run %d bulk inserts having %d rows each", count, *opts.BulkSize)
+	logrus.Debugf("Must run %d bulk inserts having %d rows each", count, *opts.BulkSize)
 
 	runInsertFunc := runInsert
 	if *opts.Print {
@@ -220,14 +217,14 @@ func main() {
 
 	okCount, err := run(db, table, bar, semaphores, rowValues, count, *opts.BulkSize, runInsertFunc, newLineOnEachRow)
 	if err != nil {
-		log.Errorln(err)
+		logrus.Errorln(err)
 	}
 	var okrCount, okiCount int // remainder & individual inserts OK count
 	if remainder > 0 {
-		log.Debugf("Must run 1 extra bulk insert having %d rows, to complete %d rows", remainder, *opts.Rows)
+		logrus.Debugf("Must run 1 extra bulk insert having %d rows, to complete %d rows", remainder, *opts.Rows)
 		okrCount, err = run(db, table, bar, semaphores, rowValues, 1, remainder, runInsertFunc, newLineOnEachRow)
 		if err != nil {
-			log.Errorln(err)
+			logrus.Errorln(err)
 		}
 	}
 
@@ -236,12 +233,12 @@ func main() {
 	totalOkCount := okCount + okrCount
 	retries := 0
 	if totalOkCount < *opts.Rows {
-		log.Debugf("Running extra %d individual inserts (duplicated keys?)", *opts.Rows-totalOkCount)
+		logrus.Debugf("Running extra %d individual inserts (duplicated keys?)", *opts.Rows-totalOkCount)
 	}
 	for totalOkCount < *opts.Rows && retries < *opts.MaxRetries {
 		okiCount, err = run(db, table, bar, semaphores, rowValues, *opts.Rows-totalOkCount, 1, runInsertFunc, newLineOnEachRow)
 		if err != nil {
-			log.Errorf("Cannot run extra insert: %s", err)
+			logrus.Errorf("Cannot run extra insert: %s", err)
 		}
 
 		retries++
@@ -250,7 +247,7 @@ func main() {
 
 	time.Sleep(500 * time.Millisecond) // Let the progress bar to update
 	if !*opts.Print {
-		log.Printf("%d rows inserted", totalOkCount)
+		logrus.Printf("%d rows inserted", totalOkCount)
 	}
 	db.Close()
 }
@@ -370,7 +367,7 @@ func generateInsertStmt(table *tableparser.Table) string {
 func runInsert(db *sql.DB, insertQuery string, resultsChan chan int, sem chan bool, wg *sync.WaitGroup) {
 	result, err := db.Exec(insertQuery)
 	if err != nil {
-		log.Debugf("Cannot run insert: %s", err)
+		logrus.Debugf("Cannot run insert: %s", err)
 		resultsChan <- 0
 		sem <- true
 		wg.Done()
@@ -379,7 +376,7 @@ func runInsert(db *sql.DB, insertQuery string, resultsChan chan int, sem chan bo
 
 	rowsAffected, err := result.RowsAffected()
 	if err != nil {
-		log.Errorf("Cannot get rows affected after insert: %s", err)
+		logrus.Errorf("Cannot get rows affected after insert: %s", err)
 	}
 	resultsChan <- int(rowsAffected)
 	sem <- true
@@ -399,7 +396,7 @@ func makeValueFuncs(conn *sql.DB, fields []tableparser.Field, samples int64) ins
 				field.Constraint.ReferencedColumnName,
 				samples, field.DataType)
 			if err != nil {
-				log.Printf("cannot get samples for field %q: %s\n", field.ColumnName, err)
+				logrus.Printf("cannot get samples for field %q: %s\n", field.ColumnName, err)
 				continue
 			}
 			values = append(values, getters.NewRandomSample(field.ColumnName, samples, field.IsNullable))
@@ -435,7 +432,7 @@ func makeValueFuncs(conn *sql.DB, fields []tableparser.Field, samples int64) ins
 		case "binary", "varbinary":
 			values = append(values, getters.NewRandomBinary(field.ColumnName, field.CharacterMaximumLength.Int64, field.IsNullable))
 		default:
-			log.Printf("cannot get field type: %s: %s\n", field.ColumnName, field.DataType)
+			logrus.Printf("cannot get field type: %s: %s\n", field.ColumnName, field.DataType)
 		}
 	}
 

main_test.go

@@ -9,17 +9,17 @@ import (
 
 	"github.com/furusax0621/mysql_random_data_load/internal/getters"
 	"github.com/furusax0621/mysql_random_data_load/tableparser"
-	tu "github.com/furusax0621/mysql_random_data_load/testutils"
+	"github.com/furusax0621/mysql_random_data_load/testutils"
 )
 
 func TestGetSamples(t *testing.T) {
-	conn := tu.GetMySQLConnection(t)
+	conn := testutils.GetMySQLConnection(t)
 	var wantRows int64 = 100
 	samples, err := getSamples(conn, "sakila", "inventory", "inventory_id", wantRows, "int")
-	tu.Ok(t, err, "error getting samples")
+	testutils.Ok(t, err, "error getting samples")
 	_, ok := samples[0].(int64)
-	tu.Assert(t, ok, "Wrong data type.")
-	tu.Assert(t, int64(len(samples)) == wantRows,
+	testutils.Assert(t, ok, "Wrong data type.")
+	testutils.Assert(t, int64(len(samples)) == wantRows,
 		"Wrong number of samples. Have %d, want 100.", len(samples))
 }
 
@@ -64,18 +64,18 @@ func TestGenerateInsertData(t *testing.T) {
 	generateInsertData(wantRows, values, rowsChan)
 
 	wg.Wait()
-	tu.Assert(t, count == 3, "Invalid number of rows")
+	testutils.Assert(t, count == 3, "Invalid number of rows")
 }
 
 func TestGenerateInsertStmt(t *testing.T) {
 	var table *tableparser.Table
-	tu.LoadJson(t, "sakila.film.json", &table)
+	testutils.LoadJson(t, "sakila.film.json", &table)
 	want := "INSERT IGNORE INTO `sakila`.`film` " +
 		"(`title`,`description`,`release_year`,`language_id`," +
 		"`original_language_id`,`rental_duration`,`rental_rate`," +
 		"`length`,`replacement_cost`,`rating`,`special_features`," +
 		"`last_update`) VALUES "
 
 	query := generateInsertStmt(table)
-	tu.Equals(t, want, query)
+	testutils.Equals(t, want, query)
 }

tableparser/tableparser.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -172,7 +171,7 @@ func (t *Table) parse() error {
 
 	cols, err := rows.Columns()
 	if err != nil {
-		return errors.Wrap(err, "Cannot get column names")
+		return fmt.Errorf("cannot get column names: %w", err)
 	}
 
 	for rows.Next() {
@@ -297,7 +296,7 @@ func getIndexes(db *sql.DB, schema, tableName string) (map[string]Index, error)
 		}
 	}
 	if err := rows.Close(); err != nil {
-		return nil, errors.Wrap(err, "Cannot close query rows at getIndexes")
+		return nil, fmt.Errorf("cannot close query rows at getIndexes: %w", err)
 	}
 
 	return indexes, nil