Skip to content

Commit 7c4dfff

Browse files
increase alter wait from 2 seconds to 6 (#59)
1 parent 6474c9f commit 7c4dfff

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

partitionmanager/cli_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_partition_cmd_noop(self):
8080
{
8181
"testtable_noop": {
8282
"sql": (
83-
"ALTER TABLE `testtable_noop` WAIT 2 REORGANIZE PARTITION "
83+
"ALTER TABLE `testtable_noop` WAIT 6 REORGANIZE PARTITION "
8484
"`p_20201204` INTO "
8585
"(PARTITION `p_20201112` VALUES LESS THAN (548), "
8686
"PARTITION `p_20201212` VALUES LESS THAN MAXVALUE);"
@@ -102,7 +102,7 @@ def test_partition_cmd_final(self):
102102
"testtable_commit": {
103103
"output": [],
104104
"sql": (
105-
"ALTER TABLE `testtable_commit` WAIT 2 REORGANIZE PARTITION "
105+
"ALTER TABLE `testtable_commit` WAIT 6 REORGANIZE PARTITION "
106106
"`p_20201204` INTO "
107107
"(PARTITION `p_20201112` VALUES LESS THAN (548), "
108108
"PARTITION `p_20201212` VALUES LESS THAN MAXVALUE);"
@@ -502,7 +502,7 @@ def test_migrate_cmd_in(self):
502502
+ "PARTITION BY RANGE (id) (",
503503
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
504504
");",
505-
"ALTER TABLE `partitioned_yesterday_new_20210421` WAIT 2 "
505+
"ALTER TABLE `partitioned_yesterday_new_20210421` WAIT 6 "
506506
+ "REORGANIZE PARTITION `p_assumed` INTO (PARTITION "
507507
+ "`p_20210421` VALUES LESS THAN (150), PARTITION "
508508
+ "`p_20210521` VALUES LESS THAN (300), PARTITION "
@@ -527,7 +527,7 @@ def test_migrate_cmd_in(self):
527527
"ALTER TABLE two_new_20210421 PARTITION BY RANGE (id) (",
528528
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
529529
");",
530-
"ALTER TABLE `two_new_20210421` WAIT 2 REORGANIZE PARTITION "
530+
"ALTER TABLE `two_new_20210421` WAIT 6 REORGANIZE PARTITION "
531531
+ "`p_assumed` INTO (PARTITION `p_20210421` VALUES "
532532
+ "LESS THAN (150), PARTITION `p_20210521` VALUES LESS "
533533
+ "THAN (375), PARTITION `p_20210620` VALUES LESS THAN "
@@ -587,7 +587,7 @@ def test_migrate_cmd_in_unpartitioned_with_override(self):
587587
"ALTER TABLE unpartitioned_new_20210421 PARTITION BY RANGE (id) (",
588588
"\tPARTITION p_assumed VALUES LESS THAN MAXVALUE",
589589
");",
590-
"ALTER TABLE `unpartitioned_new_20210421` WAIT 2 REORGANIZE "
590+
"ALTER TABLE `unpartitioned_new_20210421` WAIT 6 REORGANIZE "
591591
+ "PARTITION `p_assumed` INTO (PARTITION `p_20210421` "
592592
+ "VALUES LESS THAN (150), PARTITION `p_20210521` VALUES "
593593
+ "LESS THAN (300), PARTITION `p_20210620` VALUES LESS "

partitionmanager/migrate_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def test_read_state_info(self):
131131
"ALTER TABLE test_new_20210303 PARTITION BY RANGE (id) (",
132132
"\tPARTITION p_start VALUES LESS THAN MAXVALUE",
133133
");",
134-
"ALTER TABLE `test_new_20210303` WAIT 2 REORGANIZE PARTITION `p_start` "
134+
"ALTER TABLE `test_new_20210303` WAIT 6 REORGANIZE PARTITION `p_start` "
135135
+ "INTO (PARTITION `p_20210303` VALUES LESS THAN (156), "
136136
+ "PARTITION `p_20210402` VALUES LESS THAN (2406), PARTITION "
137137
+ "`p_20210502` VALUES LESS THAN MAXVALUE);",
@@ -187,7 +187,7 @@ def test_read_state_info_map_table(self):
187187
+ "COLUMNS (orderID, authzID) (",
188188
"\tPARTITION p_assumed VALUES LESS THAN (MAXVALUE, MAXVALUE)",
189189
");",
190-
"ALTER TABLE `map_table_new_20210303` WAIT 2 REORGANIZE PARTITION "
190+
"ALTER TABLE `map_table_new_20210303` WAIT 6 REORGANIZE PARTITION "
191191
+ "`p_assumed` INTO (PARTITION `p_20210303` VALUES LESS THAN "
192192
+ "(11, 22), PARTITION `p_20210402` VALUES LESS THAN "
193193
+ "(41, 82), PARTITION `p_20210502` VALUES LESS THAN "

partitionmanager/table_append_partition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ def generate_sql_reorganize_partition_commands(table, changes):
729729
partition_update = ", ".join(partition_strings)
730730

731731
alter_cmd = (
732-
f"ALTER TABLE `{table.name}` WAIT 2 "
732+
f"ALTER TABLE `{table.name}` WAIT 6 "
733733
f"REORGANIZE PARTITION `{modified_partition.old.name}` INTO ({partition_update});"
734734
)
735735

partitionmanager/table_append_partition_test.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ def test_plan_partition_changes_short_names(self):
669669
self.assertEqual(
670670
output,
671671
[
672-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_future` INTO "
672+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_future` INTO "
673673
"(PARTITION `p_20210201` VALUES LESS THAN (12960433003), "
674674
"PARTITION `p_20210208` VALUES LESS THAN MAXVALUE);"
675675
],
@@ -705,7 +705,7 @@ def test_plan_partition_changes_bespoke_names(self):
705705
self.assertEqual(
706706
output,
707707
[
708-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_future` INTO "
708+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_future` INTO "
709709
"(PARTITION `p_20210108` VALUES LESS THAN (170), "
710710
"PARTITION `p_20210115` VALUES LESS THAN MAXVALUE);"
711711
],
@@ -1007,7 +1007,7 @@ def testgenerate_sql_reorganize_partition_commands_single_change(self):
10071007
)
10081008
),
10091009
[
1010-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
1010+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
10111011
"(PARTITION `p_20210116` VALUES LESS THAN (542, 190));"
10121012
],
10131013
)
@@ -1028,9 +1028,9 @@ def testgenerate_sql_reorganize_partition_commands_two_changes(self):
10281028
)
10291029
),
10301030
[
1031-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210120` INTO "
1031+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210120` INTO "
10321032
"(PARTITION `p_20210214` VALUES LESS THAN (2000));",
1033-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
1033+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
10341034
"(PARTITION `p_20210116` VALUES LESS THAN (500));",
10351035
],
10361036
)
@@ -1052,7 +1052,7 @@ def testgenerate_sql_reorganize_partition_commands_new_partitions(self):
10521052
)
10531053
),
10541054
[
1055-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `p_20210102` INTO "
1055+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `p_20210102` INTO "
10561056
"(PARTITION `p_20210102` VALUES LESS THAN (200), "
10571057
"PARTITION `p_20210116` VALUES LESS THAN (542), "
10581058
"PARTITION `p_20210123` VALUES LESS THAN (662));"
@@ -1081,7 +1081,7 @@ def testgenerate_sql_reorganize_partition_commands_maintain_new_partition(self):
10811081
)
10821082
),
10831083
[
1084-
"ALTER TABLE `table` WAIT 2 REORGANIZE PARTITION `future` INTO "
1084+
"ALTER TABLE `table` WAIT 6 REORGANIZE PARTITION `future` INTO "
10851085
"(PARTITION `p_20210114` VALUES LESS THAN (800), "
10861086
"PARTITION `p_20210116` VALUES LESS THAN (1000), "
10871087
"PARTITION `p_20210123` VALUES LESS THAN (1200), "
@@ -1147,9 +1147,9 @@ def test_plan_andgenerate_sql_reorganize_partition_commands_with_future_partitio
11471147
self.assertEqual(
11481148
list(generate_sql_reorganize_partition_commands(Table("water"), planned)),
11491149
[
1150-
"ALTER TABLE `water` WAIT 2 REORGANIZE PARTITION `future` INTO "
1150+
"ALTER TABLE `water` WAIT 6 REORGANIZE PARTITION `future` INTO "
11511151
"(PARTITION `p_20210105` VALUES LESS THAN MAXVALUE);",
1152-
"ALTER TABLE `water` WAIT 2 REORGANIZE PARTITION `p_20210104` INTO "
1152+
"ALTER TABLE `water` WAIT 6 REORGANIZE PARTITION `p_20210104` INTO "
11531153
"(PARTITION `p_20210102` VALUES LESS THAN (200));",
11541154
],
11551155
)
@@ -1211,7 +1211,7 @@ def test_get_pending_sql_reorganize_partition_commands_with_changes(self):
12111211
self.assertEqual(
12121212
list(cmds),
12131213
[
1214-
"ALTER TABLE `plushies` WAIT 2 REORGANIZE PARTITION `future` INTO "
1214+
"ALTER TABLE `plushies` WAIT 6 REORGANIZE PARTITION `future` INTO "
12151215
"(PARTITION `p_20210104` VALUES LESS THAN (550), "
12161216
"PARTITION `p_20210111` VALUES LESS THAN (900), "
12171217
"PARTITION `p_20210118` VALUES LESS THAN MAXVALUE);"

0 commit comments

Comments
 (0)