Test for duplicates, add a few tests of reorganize_partition

Author: jcjones

partitionmanager/cli.py

@@ -5,10 +5,11 @@
 import traceback
 
 from partitionmanager.table_append_partition import (
- get_partition_map,
+ format_sql_reorganize_partition_command,
  get_autoincrement,
+ get_partition_map,
+ parition_name_now,
  reorganize_partition,
- format_sql_reorganize_partition_command,
 )
 from partitionmanager.types import SqlInput, toSqlUrl
 from partitionmanager.sql import SubprocessDatabaseCommand, IntegratedDatabaseCommand
@@ -47,7 +48,9 @@ def partition_cmd(args):
 
  partitions = get_partition_map(dbcmd, table)
 
- filled_partition_id, partitions = reorganize_partition(partitions, ai)
+ filled_partition_id, partitions = reorganize_partition(
+ partitions, parition_name_now(), ai
+ )
 
  sql_cmd = format_sql_reorganize_partition_command(
  table, partition_to_alter=filled_partition_id, partition_list=partitions

partitionmanager/table_append_partition.py

@@ -1,4 +1,5 @@
 from partitionmanager.types import (
+ DuplicatePartitionException,
  MismatchedIdException,
  SqlInput,
  TableInformationException,
@@ -121,17 +122,20 @@ def parition_name_now():
  return datetime.now(tz=timezone.utc).strftime("p_%Y%m%d")
 
 
-def reorganize_partition(partition_list, auto_increment):
+def reorganize_partition(partition_list, new_partition_name, auto_increment):
  """
  From a partial partitions list (ending with a single value that indicates MAX VALUE),
  add a new partition at the auto_increment number.
  """
  last_value = partition_list.pop()
  if type(last_value) is not str:
  raise UnexpectedPartitionException(last_value)
+ if last_value == new_partition_name:
+ raise DuplicatePartitionException(last_value)
+
  reorganized_list = list()
  reorganized_list.append((last_value, f"({auto_increment})"))
- reorganized_list.append((parition_name_now(), "MAXVALUE"))
+ reorganized_list.append((new_partition_name, "MAXVALUE"))
  return last_value, reorganized_list
 
 

partitionmanager/table_append_partition_test.py

@@ -4,15 +4,18 @@
 import argparse
 from partitionmanager.types import (
  DatabaseCommand,
+ DuplicatePartitionException,
  TableInformationException,
  MismatchedIdException,
  SqlInput,
+ UnexpectedPartitionException,
 )
 from partitionmanager.table_append_partition import (
  parse_table_information_schema,
  parse_partition_map,
  get_autoincrement,
  get_partition_map,
+ reorganize_partition,
 )
 
 
@@ -174,5 +177,20 @@ def test_okay(self):
  SqlInput("zz-table")
 
 
+class TestReorganizePartitions(unittest.TestCase):
+ def test_list_without_final_entry(self):
+ with self.assertRaises(UnexpectedPartitionException):
+ reorganize_partition([("a", 1), ("b", 2)], "new", 3)
+
+ def test_reorganize_with_duplicate(self):
+ with self.assertRaises(DuplicatePartitionException):
+ reorganize_partition([("a", 1), "b"], "b", 3)
+
+ def test_reorganize(self):
+ last_value, reorg_list = reorganize_partition([("a", 1), "b"], "c", 2)
+ self.assertEqual(last_value, "b")
+ self.assertEqual(reorg_list, [("b", "(2)"), ("c", "MAXVALUE")])
+
+
 if __name__ == "__main__":
  unittest.main()

partitionmanager/types.py

@@ -46,6 +46,14 @@ class MismatchedIdException(Exception):
  pass
 
 
+class DuplicatePartitionException(Exception):
+ """
+ Raise if a partition being created already exists.
+ """
+
+ pass
+
+
 class UnexpectedPartitionException(Exception):
  """
  Raised when the partition map is unexpected.