From 21537697ca5c759b95cbae4e6cc052b8bfa204d3 Mon Sep 17 00:00:00 2001 From: Steven L Date: Tue, 26 Apr 2022 00:10:30 -0700 Subject: [PATCH] Minor makefile cleanup, gofmt (#4802) Just noticed these default-args being passed while running it myself, and I believe the CLI flag overrides the default + env var, so it's less flexible with explicit args and behaves the same. --- Makefile | 62 +++++++++---------- .../history/execution/mutable_state_mock.go | 1 + .../mutable_state_task_generator_mock.go | 1 + .../history/execution/state_builder_mock.go | 1 + 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index cfeceb36991..faa599669f7 100644 --- a/Makefile +++ b/Makefile @@ -550,34 +550,34 @@ install-schema: cadence-cassandra-tool ./cadence-cassandra-tool -k cadence_visibility update-schema -d ./schema/cassandra/visibility/versioned install-schema-mysql: cadence-sql-tool - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence update-schema -d ./schema/mysql/v57/cadence/versioned - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence_visibility - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence_visibility setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence_visibility update-schema -d ./schema/mysql/v57/visibility/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence + ./cadence-sql-tool --user root --pw cadence --db cadence setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence update-schema -d ./schema/mysql/v57/cadence/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence_visibility + ./cadence-sql-tool --user root --pw cadence --db cadence_visibility setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence_visibility update-schema -d ./schema/mysql/v57/visibility/versioned install-schema-multiple-mysql: cadence-sql-tool install-schema-es-v7 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence0 setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence0 update-schema -d ./schema/mysql/v57/cadence/versioned - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence1 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence1 setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence1 update-schema -d ./schema/mysql/v57/cadence/versioned - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence2 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence2 setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence2 update-schema -d ./schema/mysql/v57/cadence/versioned - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence create --db cadence3 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence3 setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 --user root --pw cadence --db cadence3 update-schema -d ./schema/mysql/v57/cadence/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence0 + ./cadence-sql-tool --user root --pw cadence --db cadence0 setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence0 update-schema -d ./schema/mysql/v57/cadence/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence1 + ./cadence-sql-tool --user root --pw cadence --db cadence1 setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence1 update-schema -d ./schema/mysql/v57/cadence/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence2 + ./cadence-sql-tool --user root --pw cadence --db cadence2 setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence2 update-schema -d ./schema/mysql/v57/cadence/versioned + ./cadence-sql-tool --user root --pw cadence create --db cadence3 + ./cadence-sql-tool --user root --pw cadence --db cadence3 setup-schema -v 0.0 + ./cadence-sql-tool --user root --pw cadence --db cadence3 update-schema -d ./schema/mysql/v57/cadence/versioned install-schema-postgres: cadence-sql-tool - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres create --db cadence - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres --db cadence setup -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres --db cadence update-schema -d ./schema/postgres/cadence/versioned - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres create --db cadence_visibility - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres --db cadence_visibility setup-schema -v 0.0 - ./cadence-sql-tool --ep 127.0.0.1 -p 5432 -u postgres -pw cadence --pl postgres --db cadence_visibility update-schema -d ./schema/postgres/visibility/versioned + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres create --db cadence + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres --db cadence setup -v 0.0 + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres --db cadence update-schema -d ./schema/postgres/cadence/versioned + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres create --db cadence_visibility + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres --db cadence_visibility setup-schema -v 0.0 + ./cadence-sql-tool -p 5432 -u postgres -pw cadence --pl postgres --db cadence_visibility update-schema -d ./schema/postgres/visibility/versioned install-schema-es-v7: export ES_SCHEMA_FILE=./schema/elasticsearch/v7/visibility/index_template.json @@ -622,25 +622,25 @@ install-schema-xdc: cadence-cassandra-tool ./cadence-cassandra-tool --ep 127.0.0.1 -k cadence_visibility_cluster2 setup-schema -v 0.0 ./cadence-cassandra-tool --ep 127.0.0.1 -k cadence_visibility_cluster2 update-schema -d ./schema/cassandra/visibility/versioned -start-xdc-cluster0: bins +start-xdc-cluster0: cadence-server ./cadence-server --zone xdc_cluster0 start -start-xdc-cluster1: bins +start-xdc-cluster1: cadence-server ./cadence-server --zone xdc_cluster1 start -start-xdc-cluster2: bins +start-xdc-cluster2: cadence-server ./cadence-server --zone xdc_cluster2 start -start-canary: bins +start-canary: cadence-canary ./cadence-canary start -start-bench: bins +start-bench: cadence-bench ./cadence-bench start -start-mysql: bins +start-mysql: cadence-server ./cadence-server --zone mysql start -start-postgres: bins +start-postgres: cadence-server ./cadence-server --zone postgres start # broken up into multiple += so I can interleave comments. diff --git a/service/history/execution/mutable_state_mock.go b/service/history/execution/mutable_state_mock.go index f295a94fd01..6c3806f6394 100644 --- a/service/history/execution/mutable_state_mock.go +++ b/service/history/execution/mutable_state_mock.go @@ -30,6 +30,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" + cache "github.com/uber/cadence/common/cache" definition "github.com/uber/cadence/common/definition" persistence "github.com/uber/cadence/common/persistence" diff --git a/service/history/execution/mutable_state_task_generator_mock.go b/service/history/execution/mutable_state_task_generator_mock.go index bb83799b489..f9758cb01e9 100644 --- a/service/history/execution/mutable_state_task_generator_mock.go +++ b/service/history/execution/mutable_state_task_generator_mock.go @@ -29,6 +29,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" + persistence "github.com/uber/cadence/common/persistence" types "github.com/uber/cadence/common/types" ) diff --git a/service/history/execution/state_builder_mock.go b/service/history/execution/state_builder_mock.go index dc73530abe0..5902fc4b32b 100644 --- a/service/history/execution/state_builder_mock.go +++ b/service/history/execution/state_builder_mock.go @@ -28,6 +28,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + types "github.com/uber/cadence/common/types" )