Skip to content

Commit c20e925

Browse files
authored
Issue #6 - change redo api calls (#7)
1 parent 715b26f commit c20e925

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
lines changed

Python/Tasks/Redo/Add10KWithRedo.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,24 @@ def process_redo(engine):
4848

4949
print('\nStarting to process redo records...')
5050

51-
try:
52-
while True:
51+
while True:
52+
try:
5353
redo_record = bytearray()
54-
engine.processRedoRecord(redo_record)
54+
engine.getRedoRecord(redo_record)
5555
if not redo_record:
5656
break
57+
engine.process(redo_record.decode())
5758

5859
success_recs += 1
5960
if success_recs % 100 == 0:
6061
print(f'Processed {success_recs} redo records')
61-
except G2BadInputException as ex:
62-
mock_logger('ERROR', ex)
63-
except G2RetryableException as ex:
64-
mock_logger('WARN', ex)
65-
except (G2UnrecoverableException, G2Exception) as ex:
66-
mock_logger('CRITICAL', ex)
67-
raise
62+
except G2BadInputException as ex:
63+
mock_logger('ERROR', ex)
64+
except G2RetryableException as ex:
65+
mock_logger('WARN', ex)
66+
except (G2UnrecoverableException, G2Exception) as ex:
67+
mock_logger('CRITICAL', ex)
68+
raise
6869

6970
print(f'Successfully processed {success_recs} redo records')
7071

Python/Tasks/Redo/RedoContinuous.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,28 @@ def mock_logger(level, exception, error_rec=None):
1717
def process_redo(engine):
1818
success_recs = 0
1919

20-
try:
21-
while True:
20+
while True:
21+
try:
2222
redo_record = bytearray()
23-
engine.processRedoRecord(redo_record)
23+
engine.getRedoRecord(redo_record)
2424

2525
if not redo_record:
2626
print(f'No redo records to process, pausing for 30 seconds. Total processed {success_recs} . (CTRL-C to exit)...')
2727
time.sleep(30)
2828
continue
2929

30-
success_recs += 1
30+
engine.process(redo_record.decode())
3131

32+
success_recs += 1
3233
if success_recs % 100 == 0:
3334
print(f'Processed {success_recs} redo records')
34-
except G2BadInputException as ex:
35-
mock_logger('ERROR', ex)
36-
except G2RetryableException as ex:
37-
mock_logger('WARN', ex)
38-
except (G2UnrecoverableException, G2Exception) as ex:
39-
mock_logger('CRITICAL', ex)
40-
raise
35+
except G2BadInputException as ex:
36+
mock_logger('ERROR', ex)
37+
except G2RetryableException as ex:
38+
mock_logger('WARN', ex)
39+
except (G2UnrecoverableException, G2Exception) as ex:
40+
mock_logger('CRITICAL', ex)
41+
raise
4142

4243

4344
try:

Python/Tasks/Redo/RedoContinuousFutures.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ def mock_logger(level, exception, error_rec=None):
1717

1818
def process_redo(engine):
1919
redo_record = bytearray()
20-
engine.processRedoRecord(redo_record)
20+
engine.getRedoRecord(redo_record)
21+
if not redo_record:
22+
return None
23+
engine.process(redo_record.decode())
2124
return redo_record
2225

2326

@@ -81,7 +84,7 @@ def futures_redo(engine):
8184
if success_recs % 2000 == 0:
8285
engine_stats(engine)
8386
else:
84-
redo_paused = True if not redo_paused else redo_paused
87+
redo_paused = True
8588
finally:
8689
futures.pop(f)
8790

Python/Tasks/Redo/RedoWithInfoContinuous.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ def process_redo(engine, output_file):
2222
while True:
2323
redo_record = bytearray()
2424
with_info = bytearray()
25-
engine.processRedoRecordWithInfo(redo_record, with_info)
25+
engine.getRedoRecord(redo_record)
2626

2727
if not redo_record:
2828
print(f'No redo records to process, pausing for 30 seconds. Total processed {success_recs} . (CTRL-C to exit)...')
2929
time.sleep(30)
3030
continue
3131

32+
engine.processWithInfo(redo_record, with_info)
33+
3234
success_recs += 1
3335
out_file.write(with_info.decode() + '\n')
3436

Resources/Output/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)