Skip to content

Commit c9733f9

Browse files
starcat37starcat37
committed
refactor: change the name of variables and functions
1 parent b507673 commit c9733f9

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎pymysqlreplication/row_event.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,14 @@ def __read_binary_slice(self, binary, start, size, data_length):
478478
mask = ((1 << size) - 1)
479479
return binary & mask
480480

481-
def _categorize_none(self, column_data):
481+
def _get_none_sources(self, column_data):
482482
result = {}
483483
for column_name, value in column_data.items():
484484
if value is not None:
485485
continue
486486

487-
category = self.none_sources.get(column_name, "null")
488-
result[column_name] = category
487+
source = self.none_sources.get(column_name, "null")
488+
result[column_name] = source
489489
return result
490490

491491
def _dump(self):
@@ -527,7 +527,7 @@ def _fetch_one_row(self):
527527
row = {}
528528

529529
row["values"] = self._read_column_data(self.columns_present_bitmap)
530-
row["category_of_none"] = self._categorize_none(row["values"])
530+
row["none_sources"] = self._get_none_sources(row["values"])
531531

532532
return row
533533

@@ -538,7 +538,7 @@ def _dump(self):
538538
print("--")
539539
for key in row["values"]:
540540
print("*", key, ":", row["values"][key],
541-
"(%s)" % row["category_of_none"][key] if key in row["category_of_none"] else "")
541+
"(%s)" % row["none_sources"][key] if key in row["none_sources"] else "")
542542

543543
class WriteRowsEvent(RowsEvent):
544544
"""This event is triggered when a row in database is added
@@ -557,7 +557,7 @@ def _fetch_one_row(self):
557557
row = {}
558558

559559
row["values"] = self._read_column_data(self.columns_present_bitmap)
560-
row["category_of_none"] = self._categorize_none(row["values"])
560+
row["none_sources"] = self._get_none_sources(row["values"])
561561

562562
return row
563563

@@ -568,7 +568,7 @@ def _dump(self):
568568
print("--")
569569
for key in row["values"]:
570570
print("*", key, ":", row["values"][key],
571-
"(%s)" % row["category_of_none"][key] if key in row["category_of_none"] else "")
571+
"(%s)" % row["none_sources"][key] if key in row["none_sources"] else "")
572572

573573

574574
class UpdateRowsEvent(RowsEvent):
@@ -596,9 +596,9 @@ def _fetch_one_row(self):
596596
row = {}
597597

598598
row["before_values"] = self._read_column_data(self.columns_present_bitmap)
599-
row['before_category_of_none'] = self._categorize_none(row["before_values"])
600-
row['after_values'] = self._read_column_data(self.columns_present_bitmap2)
601-
row['after_category_of_none'] = self._categorize_none(row["after_values"])
599+
row["before_none_source"] = self._get_none_sources(row["before_values"])
600+
row["after_values"] = self._read_column_data(self.columns_present_bitmap2)
601+
row["after_none_source"] = self._get_none_sources(row["after_values"])
602602
return row
603603

604604
def _dump(self):
@@ -608,15 +608,15 @@ def _dump(self):
608608
for row in self.rows:
609609
print("--")
610610
for key in row["before_values"]:
611-
if key in row["before_category_of_none"]:
611+
if key in row["before_none_source"]:
612612
before_value_info = "%s(%s)" % (row["before_values"][key],
613-
row["before_category_of_none"][key])
613+
row["before_none_source"][key])
614614
else:
615615
before_value_info = row["before_values"][key]
616616

617-
if key in row["after_category_of_none"]:
617+
if key in row["after_none_source"]:
618618
after_value_info = "%s(%s)" % (row["after_values"][key],
619-
row["after_category_of_none"][key])
619+
row["after_none_source"][key])
620620
else:
621621
after_value_info = row["after_values"][key]
622622

‎pymysqlreplication/tests/test_basic.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -574,13 +574,13 @@ def create_binlog_packet_wrapper(pkt):
574574
self.assertEqual(binlog_event.event._is_event_valid, True)
575575
self.assertNotEqual(wrong_event.event._is_event_valid, True)
576576

577-
def test_categorize_none(self):
577+
def test_get_none(self):
578578
self.stream.close()
579579
self.stream = BinLogStreamReader(
580580
self.database,
581581
server_id=1024,
582582
resume_stream=False,
583-
only_events = [WriteRowsEvent]
583+
only_events=[WriteRowsEvent]
584584
)
585585
query = "CREATE TABLE null_operation_update_example (col1 INT, col2 INT);"
586586
self.execute(query)
@@ -589,9 +589,9 @@ def test_categorize_none(self):
589589
self.execute("COMMIT")
590590
write_rows_event = self.stream.fetchone()
591591
self.assertIsInstance(write_rows_event, WriteRowsEvent)
592-
self.assertEqual(write_rows_event.rows[0]['category_of_none']['col1'], 'null')
592+
self.assertEqual(write_rows_event.rows[0]['none_sources']['col1'], 'null')
593593

594-
def test_categorize_none_invalid(self):
594+
def test_get_none_invalid(self):
595595
self.execute("SET SESSION SQL_MODE='ALLOW_INVALID_DATES'")
596596
self.execute("CREATE TABLE test_table (col0 INT, col1 VARCHAR(10), col2 DATETIME, col3 DATE, col4 SET('a', 'b', 'c'))")
597597
self.execute("INSERT INTO test_table VALUES (NULL, NULL, '0000-00-00 00:00:00', NULL, NULL)")
@@ -610,16 +610,16 @@ def test_categorize_none_invalid(self):
610610
else:
611611
self.assertEqual(event.event_type, UPDATE_ROWS_EVENT_V1)
612612
self.assertIsInstance(event, UpdateRowsEvent)
613-
self.assertEqual(event.rows[0]["before_category_of_none"]["col0"], 'null')
614-
self.assertEqual(event.rows[0]["before_category_of_none"]["col1"], 'null')
615-
self.assertEqual(event.rows[0]["before_category_of_none"]["col2"], 'out of datetime2 range')
616-
self.assertEqual(event.rows[0]["before_category_of_none"]["col3"], 'null')
617-
self.assertEqual(event.rows[0]["before_category_of_none"]["col4"], 'null')
618-
self.assertEqual(event.rows[0]["after_category_of_none"]["col0"], 'null')
619-
self.assertEqual(event.rows[0]["after_category_of_none"]["col1"], 'null')
620-
self.assertEqual(event.rows[0]["after_category_of_none"]["col2"], 'null')
621-
self.assertEqual(event.rows[0]["after_category_of_none"]["col3"], 'out of date range')
622-
self.assertEqual(event.rows[0]["after_category_of_none"]["col4"], 'empty set')
613+
self.assertEqual(event.rows[0]["before_none_source"]["col0"], 'null')
614+
self.assertEqual(event.rows[0]["before_none_source"]["col1"], 'null')
615+
self.assertEqual(event.rows[0]["before_none_source"]["col2"], 'out of datetime2 range')
616+
self.assertEqual(event.rows[0]["before_none_source"]["col3"], 'null')
617+
self.assertEqual(event.rows[0]["before_none_source"]["col4"], 'null')
618+
self.assertEqual(event.rows[0]["after_none_source"]["col0"], 'null')
619+
self.assertEqual(event.rows[0]["after_none_source"]["col1"], 'null')
620+
self.assertEqual(event.rows[0]["after_none_source"]["col2"], 'null')
621+
self.assertEqual(event.rows[0]["after_none_source"]["col3"], 'out of date range')
622+
self.assertEqual(event.rows[0]["after_none_source"]["col4"], 'empty set')
623623

624624

625625
class TestMultipleRowBinLogStreamReader(base.PyMySQLReplicationTestCase):

0 commit comments

Comments
 (0)