Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing vtorc naming convention - database #8698

Merged
merged 8 commits into from
Sep 4, 2021
Merged

Fixing vtorc naming convention - database #8698

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f00654a
renamed slave to replica in some of the database fields
GuptaManan100 Aug 26, 2021
3870f2a
renamed slave to replica in remaining database fields
GuptaManan100 Aug 26, 2021
50b15d6
renamed master to primary in base tables
GuptaManan100 Aug 27, 2021
5051d24
renamed master to primary in patches
GuptaManan100 Aug 27, 2021
cae775b
renamed master to primary in query aliases for tables
GuptaManan100 Aug 27, 2021
edf3df8
Merge remote-tracking branch 'upstream/main' into naming-vtorc-backend
GuptaManan100 Aug 27, 2021
e6cf15c
resolve difference between primary and source
GuptaManan100 Sep 1, 2021
b38a1f6
change seconds_behind_source to replication_lag_seconds
GuptaManan100 Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions go/vt/orchestrator/db/generate_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ var generateSQLBase = []string{
version varchar(128) CHARACTER SET ascii NOT NULL,
binlog_format varchar(16) CHARACTER SET ascii NOT NULL,
log_bin tinyint(3) unsigned NOT NULL,
log_slave_updates tinyint(3) unsigned NOT NULL,
log_replica_updates tinyint(3) unsigned NOT NULL,
binary_log_file varchar(128) CHARACTER SET ascii NOT NULL,
binary_log_pos bigint(20) unsigned NOT NULL,
master_host varchar(128) CHARACTER SET ascii NOT NULL,
master_port smallint(5) unsigned NOT NULL,
slave_sql_running tinyint(3) unsigned NOT NULL,
slave_io_running tinyint(3) unsigned NOT NULL,
master_log_file varchar(128) CHARACTER SET ascii NOT NULL,
read_master_log_pos bigint(20) unsigned NOT NULL,
relay_master_log_file varchar(128) CHARACTER SET ascii NOT NULL,
exec_master_log_pos bigint(20) unsigned NOT NULL,
seconds_behind_master bigint(20) unsigned DEFAULT NULL,
slave_lag_seconds bigint(20) unsigned DEFAULT NULL,
num_slave_hosts int(10) unsigned NOT NULL,
slave_hosts text CHARACTER SET ascii NOT NULL,
source_host varchar(128) CHARACTER SET ascii NOT NULL,
source_port smallint(5) unsigned NOT NULL,
replica_sql_running tinyint(3) unsigned NOT NULL,
replica_io_running tinyint(3) unsigned NOT NULL,
source_log_file varchar(128) CHARACTER SET ascii NOT NULL,
read_source_log_pos bigint(20) unsigned NOT NULL,
relay_source_log_file varchar(128) CHARACTER SET ascii NOT NULL,
exec_source_log_pos bigint(20) unsigned NOT NULL,
seconds_behind_source bigint(20) unsigned DEFAULT NULL,
replica_lag_seconds bigint(20) unsigned DEFAULT NULL,
num_replica_hosts int(10) unsigned NOT NULL,
replica_hosts text CHARACTER SET ascii NOT NULL,
cluster_name varchar(128) CHARACTER SET ascii NOT NULL,
PRIMARY KEY (hostname,port)
) ENGINE=InnoDB DEFAULT CHARSET=ascii
Expand Down Expand Up @@ -375,8 +375,8 @@ var generateSQLBase = []string{
snapshot_unix_timestamp INT UNSIGNED NOT NULL,
hostname varchar(128) CHARACTER SET ascii NOT NULL,
port smallint(5) unsigned NOT NULL,
master_host varchar(128) CHARACTER SET ascii NOT NULL,
master_port smallint(5) unsigned NOT NULL,
source_host varchar(128) CHARACTER SET ascii NOT NULL,
source_port smallint(5) unsigned NOT NULL,
cluster_name tinytext CHARACTER SET ascii NOT NULL,
PRIMARY KEY (snapshot_unix_timestamp, hostname, port)
) ENGINE=InnoDB DEFAULT CHARSET=ascii
Expand Down Expand Up @@ -426,8 +426,8 @@ var generateSQLBase = []string{
analysis varchar(128) NOT NULL,
cluster_name varchar(128) NOT NULL,
cluster_alias varchar(128) NOT NULL,
count_affected_slaves int unsigned NOT NULL,
slave_hosts text NOT NULL,
count_affected_replicas int unsigned NOT NULL,
replica_hosts text NOT NULL,
PRIMARY KEY (detection_id)
) ENGINE=InnoDB DEFAULT CHARSET=ascii
`,
Expand Down Expand Up @@ -494,37 +494,37 @@ var generateSQLBase = []string{
CREATE INDEX domain_name_idx_cluster_domain_name ON cluster_domain_name (domain_name(32))
`,
`
CREATE TABLE IF NOT EXISTS master_position_equivalence (
CREATE TABLE IF NOT EXISTS primary_position_equivalence (
equivalence_id bigint unsigned not null auto_increment,
master1_hostname varchar(128) CHARACTER SET ascii NOT NULL,
master1_port smallint(5) unsigned NOT NULL,
master1_binary_log_file varchar(128) CHARACTER SET ascii NOT NULL,
master1_binary_log_pos bigint(20) unsigned NOT NULL,
master2_hostname varchar(128) CHARACTER SET ascii NOT NULL,
master2_port smallint(5) unsigned NOT NULL,
master2_binary_log_file varchar(128) CHARACTER SET ascii NOT NULL,
master2_binary_log_pos bigint(20) unsigned NOT NULL,
primary1_hostname varchar(128) CHARACTER SET ascii NOT NULL,
primary1_port smallint(5) unsigned NOT NULL,
primary1_binary_log_file varchar(128) CHARACTER SET ascii NOT NULL,
primary1_binary_log_pos bigint(20) unsigned NOT NULL,
primary2_hostname varchar(128) CHARACTER SET ascii NOT NULL,
primary2_port smallint(5) unsigned NOT NULL,
primary2_binary_log_file varchar(128) CHARACTER SET ascii NOT NULL,
primary2_binary_log_pos bigint(20) unsigned NOT NULL,
last_suggested TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (equivalence_id)
) ENGINE=InnoDB DEFAULT CHARSET=ascii
`,
`
DROP INDEX equivalence_uidx ON master_position_equivalence
DROP INDEX equivalence_uidx ON primary_position_equivalence
`,
`
CREATE UNIQUE INDEX equivalence_uidx_master_position_equivalence ON master_position_equivalence (master1_hostname, master1_port, master1_binary_log_file, master1_binary_log_pos, master2_hostname, master2_port)
CREATE UNIQUE INDEX equivalence_uidx_primary_position_equivalence ON primary_position_equivalence (primary1_hostname, primary1_port, primary1_binary_log_file, primary1_binary_log_pos, primary2_hostname, primary2_port)
`,
`
DROP INDEX master2_idx ON master_position_equivalence
DROP INDEX primary2_idx ON primary_position_equivalence
`,
`
CREATE INDEX master2_idx_master_position_equivalence ON master_position_equivalence (master2_hostname, master2_port, master2_binary_log_file, master2_binary_log_pos)
CREATE INDEX primary2_idx_primary_position_equivalence ON primary_position_equivalence (primary2_hostname, primary2_port, primary2_binary_log_file, primary2_binary_log_pos)
`,
`
DROP INDEX last_suggested_idx ON master_position_equivalence
DROP INDEX last_suggested_idx ON primary_position_equivalence
`,
`
CREATE INDEX last_suggested_idx_master_position_equivalence ON master_position_equivalence (last_suggested)
CREATE INDEX last_suggested_idx_primary_position_equivalence ON primary_position_equivalence (last_suggested)
`,
`
CREATE TABLE IF NOT EXISTS async_request (
Expand Down Expand Up @@ -859,7 +859,7 @@ var generateSQLBase = []string{
shard varchar(128) CHARACTER SET ascii NOT NULL,
cell varchar(128) CHARACTER SET ascii NOT NULL,
tablet_type smallint(5) NOT NULL,
master_timestamp timestamp NOT NULL,
primary_timestamp timestamp NOT NULL,
info varchar(512) CHARACTER SET ascii NOT NULL,
PRIMARY KEY (hostname, port)
) ENGINE=InnoDB DEFAULT CHARSET=ascii
Expand Down
48 changes: 24 additions & 24 deletions go/vt/orchestrator/db/generate_patches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN last_sql_error TEXT NOT NULL AFTER exec_master_log_pos
ADD COLUMN last_sql_error TEXT NOT NULL AFTER exec_source_log_pos
`,
`
ALTER TABLE
Expand All @@ -37,7 +37,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN oracle_gtid TINYINT UNSIGNED NOT NULL AFTER slave_io_running
ADD COLUMN oracle_gtid TINYINT UNSIGNED NOT NULL AFTER replica_io_running
`,
`
ALTER TABLE
Expand All @@ -47,20 +47,20 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN relay_log_file varchar(128) CHARACTER SET ascii NOT NULL AFTER exec_master_log_pos
ADD COLUMN relay_log_file varchar(128) CHARACTER SET ascii NOT NULL AFTER exec_source_log_pos
`,
`
ALTER TABLE
database_instance
ADD COLUMN relay_log_pos bigint unsigned NOT NULL AFTER relay_log_file
`,
`
DROP INDEX master_host_port_idx ON database_instance
DROP INDEX source_host_port_idx ON database_instance
`,
`
ALTER TABLE
database_instance
ADD INDEX master_host_port_idx_database_instance (master_host, master_port)
ADD INDEX source_host_port_idx_database_instance (source_host, source_port)
`,
`
ALTER TABLE
Expand All @@ -75,7 +75,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN has_replication_filters TINYINT UNSIGNED NOT NULL AFTER slave_io_running
ADD COLUMN has_replication_filters TINYINT UNSIGNED NOT NULL AFTER replica_io_running
`,
`
ALTER TABLE
Expand Down Expand Up @@ -105,7 +105,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN is_co_master TINYINT UNSIGNED NOT NULL AFTER replication_depth
ADD COLUMN is_co_primary TINYINT UNSIGNED NOT NULL AFTER replication_depth
`,
`
ALTER TABLE
Expand All @@ -115,7 +115,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN sql_delay INT UNSIGNED NOT NULL AFTER slave_lag_seconds
ADD COLUMN sql_delay INT UNSIGNED NOT NULL AFTER replica_lag_seconds
`,
`
ALTER TABLE
Expand All @@ -135,12 +135,12 @@ var generateSQLPatches = []string{
`
ALTER TABLE
topology_recovery
ADD COLUMN count_affected_slaves int unsigned NOT NULL
ADD COLUMN count_affected_replicas int unsigned NOT NULL
`,
`
ALTER TABLE
topology_recovery
ADD COLUMN slave_hosts text CHARACTER SET ascii NOT NULL
ADD COLUMN replica_hosts text CHARACTER SET ascii NOT NULL
`,
`
ALTER TABLE hostname_unresolve
Expand Down Expand Up @@ -222,17 +222,17 @@ var generateSQLPatches = []string{
`
ALTER TABLE
topology_recovery
ADD COLUMN participating_instances text CHARACTER SET ascii NOT NULL after slave_hosts
ADD COLUMN participating_instances text CHARACTER SET ascii NOT NULL after replica_hosts
`,
`
ALTER TABLE
topology_recovery
ADD COLUMN lost_slaves text CHARACTER SET ascii NOT NULL after participating_instances
ADD COLUMN lost_replicas text CHARACTER SET ascii NOT NULL after participating_instances
`,
`
ALTER TABLE
topology_recovery
ADD COLUMN all_errors text CHARACTER SET ascii NOT NULL after lost_slaves
ADD COLUMN all_errors text CHARACTER SET ascii NOT NULL after lost_replicas
`,
`
ALTER TABLE audit
Expand Down Expand Up @@ -288,7 +288,7 @@ var generateSQLPatches = []string{
MODIFY last_suggested timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
`,
`
ALTER TABLE master_position_equivalence /* sqlite3-skip */
ALTER TABLE primary_position_equivalence /* sqlite3-skip */
MODIFY last_suggested timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
`,
`
Expand Down Expand Up @@ -493,7 +493,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_master_enabled TINYINT UNSIGNED NOT NULL
ADD COLUMN semi_sync_primary_enabled TINYINT UNSIGNED NOT NULL
`,
`
ALTER TABLE
Expand All @@ -513,7 +513,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN master_uuid varchar(64) CHARACTER SET ascii NOT NULL AFTER oracle_gtid
ADD COLUMN source_uuid varchar(64) CHARACTER SET ascii NOT NULL AFTER oracle_gtid
`,
`
ALTER TABLE
Expand All @@ -523,12 +523,12 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN ancestry_uuid text CHARACTER SET ascii NOT NULL AFTER master_uuid
ADD COLUMN ancestry_uuid text CHARACTER SET ascii NOT NULL AFTER source_uuid
`,
`
ALTER TABLE
database_instance
ADD COLUMN replication_sql_thread_state tinyint signed not null default 0 AFTER slave_io_running
ADD COLUMN replication_sql_thread_state tinyint signed not null default 0 AFTER replica_io_running
`,
`
ALTER TABLE
Expand All @@ -549,27 +549,27 @@ var generateSQLPatches = []string{
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_master_timeout INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_master_enabled
ADD COLUMN semi_sync_primary_timeout INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_primary_enabled
`,
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_master_wait_for_slave_count INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_master_timeout
ADD COLUMN semi_sync_primary_wait_for_replica_count INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_primary_timeout
`,
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_master_status TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_master_wait_for_slave_count
ADD COLUMN semi_sync_primary_status TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_primary_wait_for_replica_count
`,
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_replica_status TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_master_status
ADD COLUMN semi_sync_replica_status TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_primary_status
`,
`
ALTER TABLE
database_instance
ADD COLUMN semi_sync_master_clients INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_master_status
ADD COLUMN semi_sync_primary_clients INT UNSIGNED NOT NULL DEFAULT 0 AFTER semi_sync_primary_status
`,
`
ALTER TABLE
Expand All @@ -579,7 +579,7 @@ var generateSQLPatches = []string{
`
ALTER TABLE /* sqlite3-skip */
database_instance
MODIFY semi_sync_master_timeout BIGINT UNSIGNED NOT NULL DEFAULT 0
MODIFY semi_sync_primary_timeout BIGINT UNSIGNED NOT NULL DEFAULT 0
`,
// Fields related to Replication Group the instance belongs to
`
Expand Down
24 changes: 12 additions & 12 deletions go/vt/orchestrator/external/golib/sqlutils/sqlite_dialect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestToSqlite3AlterTable(t *testing.T) {
statement := `
ALTER TABLE
database_instance
ADD COLUMN sql_delay INT UNSIGNED NOT NULL AFTER slave_lag_seconds
ADD COLUMN sql_delay INT UNSIGNED NOT NULL AFTER replica_lag_seconds
`
result := stripSpaces(ToSqlite3Dialect(statement))
test.S(t).ExpectEquals(result, stripSpaces(`
Expand All @@ -97,13 +97,13 @@ func TestToSqlite3AlterTable(t *testing.T) {
statement := `
ALTER TABLE
database_instance
ADD INDEX master_host_port_idx (master_host, master_port)
ADD INDEX source_host_port_idx (source_host, source_port)
`
result := stripSpaces(ToSqlite3Dialect(statement))
test.S(t).ExpectEquals(result, stripSpaces(`
create index
master_host_port_idx_database_instance
on database_instance (master_host, master_port)
source_host_port_idx_database_instance
on database_instance (source_host, source_port)
`))
}
{
Expand All @@ -126,14 +126,14 @@ func TestCreateIndex(t *testing.T) {
{
statement := `
create index
master_host_port_idx_database_instance
on database_instance (master_host(128), master_port)
source_host_port_idx_database_instance
on database_instance (source_host(128), source_port)
`
result := stripSpaces(ToSqlite3Dialect(statement))
test.S(t).ExpectEquals(result, stripSpaces(`
create index
master_host_port_idx_database_instance
on database_instance (master_host, master_port)
source_host_port_idx_database_instance
on database_instance (source_host, source_port)
`))
}
}
Expand Down Expand Up @@ -205,14 +205,14 @@ func TestToSqlite3GeneralConversions(t *testing.T) {
test.S(t).ExpectEquals(result, "select datetime(some_table.some_column, printf('+%d minute', ?))")
}
{
statement := "AND master_instance.last_attempted_check <= master_instance.last_seen + interval ? minute"
statement := "AND primary_instance.last_attempted_check <= primary_instance.last_seen + interval ? minute"
result := ToSqlite3Dialect(statement)
test.S(t).ExpectEquals(result, "AND master_instance.last_attempted_check <= datetime(master_instance.last_seen, printf('+%d minute', ?))")
test.S(t).ExpectEquals(result, "AND primary_instance.last_attempted_check <= datetime(primary_instance.last_seen, printf('+%d minute', ?))")
}
{
statement := "select concat(master_instance.port, '') as port"
statement := "select concat(primary_instance.port, '') as port"
result := ToSqlite3Dialect(statement)
test.S(t).ExpectEquals(result, "select (master_instance.port || '') as port")
test.S(t).ExpectEquals(result, "select (primary_instance.port || '') as port")
}
{
statement := "select concat( 'abc' , 'def') as s"
Expand Down
Loading