Skip to content

Increase alter wait from 2 seconds to 6 #59

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

Merged
merged 1 commit into from
Apr 4, 2023
Merged

Increase alter wait from 2 seconds to 6 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions partitionmanager/cli_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_partition_cmd_noop(self):
{
"testtable_noop": {
"sql": (
"ALTER TABLE `testtable_noop` WAIT 2 REORGANIZE PARTITION "
"ALTER TABLE `testtable_noop` WAIT 6 REORGANIZE PARTITION "
"`p_20201204` INTO "
"(PARTITION `p_20201112` VALUES LESS THAN (548), "
"PARTITION `p_20201212` VALUES LESS THAN MAXVALUE);"
Expand All @@ -102,7 +102,7 @@ def test_partition_cmd_final(self):
"testtable_commit": {
"output": [],
"sql": (
"ALTER TABLE `testtable_commit` WAIT 2 REORGANIZE PARTITION "
"ALTER TABLE `testtable_commit` WAIT 6 REORGANIZE PARTITION "
"`p_20201204` INTO "
"(PARTITION `p_20201112` VALUES LESS THAN (548), "
"PARTITION `p_20201212` VALUES LESS THAN MAXVALUE);"
Expand Down Expand Up @@ -502,7 +502,7 @@ def test_migrate_cmd_in(self):
+ "PARTITION BY RANGE (id) (",
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
");",
"ALTER TABLE `partitioned_yesterday_new_20210421` WAIT 2 "
"ALTER TABLE `partitioned_yesterday_new_20210421` WAIT 6 "
+ "REORGANIZE PARTITION `p_assumed` INTO (PARTITION "
+ "`p_20210421` VALUES LESS THAN (150), PARTITION "
+ "`p_20210521` VALUES LESS THAN (300), PARTITION "
Expand All @@ -527,7 +527,7 @@ def test_migrate_cmd_in(self):
"ALTER TABLE two_new_20210421 PARTITION BY RANGE (id) (",
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
");",
"ALTER TABLE `two_new_20210421` WAIT 2 REORGANIZE PARTITION "
"ALTER TABLE `two_new_20210421` WAIT 6 REORGANIZE PARTITION "
+ "`p_assumed` INTO (PARTITION `p_20210421` VALUES "
+ "LESS THAN (150), PARTITION `p_20210521` VALUES LESS "
+ "THAN (375), PARTITION `p_20210620` VALUES LESS THAN "
Expand Down Expand Up @@ -587,7 +587,7 @@ def test_migrate_cmd_in_unpartitioned_with_override(self):
"ALTER TABLE unpartitioned_new_20210421 PARTITION BY RANGE (id) (",
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
");",
"ALTER TABLE `unpartitioned_new_20210421` WAIT 2 REORGANIZE "
"ALTER TABLE `unpartitioned_new_20210421` WAIT 6 REORGANIZE "
+ "PARTITION `p_assumed` INTO (PARTITION `p_20210421` "
+ "VALUES LESS THAN (150), PARTITION `p_20210521` VALUES "
+ "LESS THAN (300), PARTITION `p_20210620` VALUES LESS "
Expand Down
4 changes: 2 additions & 2 deletions partitionmanager/migrate_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_read_state_info(self):
"ALTER TABLE test_new_20210303 PARTITION BY RANGE (id) (",
"\tPARTITION p_start VALUES LESS THAN MAXVALUE",
");",
"ALTER TABLE `test_new_20210303` WAIT 2 REORGANIZE PARTITION `p_start` "
"ALTER TABLE `test_new_20210303` WAIT 6 REORGANIZE PARTITION `p_start` "
+ "INTO (PARTITION `p_20210303` VALUES LESS THAN (156), "
+ "PARTITION `p_20210402` VALUES LESS THAN (2406), PARTITION "
+ "`p_20210502` VALUES LESS THAN MAXVALUE);",
Expand Down Expand Up @@ -187,7 +187,7 @@ def test_read_state_info_map_table(self):
+ "COLUMNS (orderID, authzID) (",
"\tPARTITION p_assumed VALUES LESS THAN (MAXVALUE, MAXVALUE)",
");",
"ALTER TABLE `map_table_new_20210303` WAIT 2 REORGANIZE PARTITION "
"ALTER TABLE `map_table_new_20210303` WAIT 6 REORGANIZE PARTITION "
+ "`p_assumed` INTO (PARTITION `p_20210303` VALUES LESS THAN "
+ "(11, 22), PARTITION `p_20210402` VALUES LESS THAN "
+ "(41, 82), PARTITION `p_20210502` VALUES LESS THAN "
Expand Down
2 changes: 1 addition & 1 deletion partitionmanager/table_append_partition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ def generate_sql_reorganize_partition_commands(table, changes):
partition_update = ", ".join(partition_strings)

alter_cmd = (
f"ALTER TABLE `{table.name}` WAIT 2 "
f"ALTER TABLE `{table.name}` WAIT 6 "
f"REORGANIZE PARTITION `{modified_partition.old.name}` INTO ({partition_update});"
)

Expand Down
20 changes: 10 additions & 10 deletions partitionmanager/table_append_partition_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ def test_plan_partition_changes_short_names(self):
self.assertEqual(
output,
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_future` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_future` INTO "
"(PARTITION `p_20210201` VALUES LESS THAN (12960433003), "
"PARTITION `p_20210208` VALUES LESS THAN MAXVALUE);"
],
Expand Down Expand Up @@ -705,7 +705,7 @@ def test_plan_partition_changes_bespoke_names(self):
self.assertEqual(
output,
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_future` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_future` INTO "
"(PARTITION `p_20210108` VALUES LESS THAN (170), "
"PARTITION `p_20210115` VALUES LESS THAN MAXVALUE);"
],
Expand Down Expand Up @@ -1007,7 +1007,7 @@ def testgenerate_sql_reorganize_partition_commands_single_change(self):
)
),
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
"(PARTITION `p_20210116` VALUES LESS THAN (542, 190));"
],
)
Expand All @@ -1028,9 +1028,9 @@ def testgenerate_sql_reorganize_partition_commands_two_changes(self):
)
),
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210120` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210120` INTO "
"(PARTITION `p_20210214` VALUES LESS THAN (2000));",
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
"(PARTITION `p_20210116` VALUES LESS THAN (500));",
],
)
Expand All @@ -1052,7 +1052,7 @@ def testgenerate_sql_reorganize_partition_commands_new_partitions(self):
)
),
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
"(PARTITION `p_20210102` VALUES LESS THAN (200), "
"PARTITION `p_20210116` VALUES LESS THAN (542), "
"PARTITION `p_20210123` VALUES LESS THAN (662));"
Expand Down Expand Up @@ -1081,7 +1081,7 @@ def testgenerate_sql_reorganize_partition_commands_maintain_new_partition(self):
)
),
[
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `future` INTO "
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `future` INTO "
"(PARTITION `p_20210114` VALUES LESS THAN (800), "
"PARTITION `p_20210116` VALUES LESS THAN (1000), "
"PARTITION `p_20210123` VALUES LESS THAN (1200), "
Expand Down Expand Up @@ -1147,9 +1147,9 @@ def test_plan_andgenerate_sql_reorganize_partition_commands_with_future_partitio
self.assertEqual(
list(generate_sql_reorganize_partition_commands(Table("water"), planned)),
[
"ALTER TABLE `water` WAIT 2 REORGANIZE PARTITION `future` INTO "
"ALTER TABLE `water` WAIT 6 REORGANIZE PARTITION `future` INTO "
"(PARTITION `p_20210105` VALUES LESS THAN MAXVALUE);",
"ALTER TABLE `water` WAIT 2 REORGANIZE PARTITION `p_20210104` INTO "
"ALTER TABLE `water` WAIT 6 REORGANIZE PARTITION `p_20210104` INTO "
"(PARTITION `p_20210102` VALUES LESS THAN (200));",
],
)
Expand Down Expand Up @@ -1211,7 +1211,7 @@ def test_get_pending_sql_reorganize_partition_commands_with_changes(self):
self.assertEqual(
list(cmds),
[
"ALTER TABLE `plushies` WAIT 2 REORGANIZE PARTITION `future` INTO "
"ALTER TABLE `plushies` WAIT 6 REORGANIZE PARTITION `future` INTO "
"(PARTITION `p_20210104` VALUES LESS THAN (550), "
"PARTITION `p_20210111` VALUES LESS THAN (900), "
"PARTITION `p_20210118` VALUES LESS THAN MAXVALUE);"
Expand Down