Issue #6 - change redo api calls (#7)

Author: antaenc

Python/Tasks/Redo/Add10KWithRedo.py

@@ -48,23 +48,24 @@ def process_redo(engine):
 
     print('\nStarting to process redo records...')
 
-    try:
-        while True:
+    while True:
+        try:
             redo_record = bytearray()
-            engine.processRedoRecord(redo_record)
+            engine.getRedoRecord(redo_record)
             if not redo_record:
                 break
+            engine.process(redo_record.decode())
 
             success_recs += 1
             if success_recs % 100 == 0:
                 print(f'Processed {success_recs} redo records')
-    except G2BadInputException as ex:
-        mock_logger('ERROR', ex)
-    except G2RetryableException as ex:
-        mock_logger('WARN', ex)
-    except (G2UnrecoverableException, G2Exception) as ex:
-        mock_logger('CRITICAL', ex)
-        raise
+        except G2BadInputException as ex:
+            mock_logger('ERROR', ex)
+        except G2RetryableException as ex:
+            mock_logger('WARN', ex)
+        except (G2UnrecoverableException, G2Exception) as ex:
+            mock_logger('CRITICAL', ex)
+            raise
 
     print(f'Successfully processed {success_recs} redo records')
 

Python/Tasks/Redo/RedoContinuous.py

@@ -17,27 +17,28 @@ def mock_logger(level, exception, error_rec=None):
 def process_redo(engine):
     success_recs = 0
 
-    try:
-        while True:
+    while True:
+        try:
             redo_record = bytearray()
-            engine.processRedoRecord(redo_record)
+            engine.getRedoRecord(redo_record)
 
             if not redo_record:
                 print(f'No redo records to process, pausing for 30 seconds. Total processed {success_recs} . (CTRL-C to exit)...')
                 time.sleep(30)
                 continue
 
-            success_recs += 1
+            engine.process(redo_record.decode())
 
+            success_recs += 1
             if success_recs % 100 == 0:
                 print(f'Processed {success_recs} redo records')
-    except G2BadInputException as ex:
-        mock_logger('ERROR', ex)
-    except G2RetryableException as ex:
-        mock_logger('WARN', ex)
-    except (G2UnrecoverableException, G2Exception) as ex:
-        mock_logger('CRITICAL', ex)
-        raise
+        except G2BadInputException as ex:
+            mock_logger('ERROR', ex)
+        except G2RetryableException as ex:
+            mock_logger('WARN', ex)
+        except (G2UnrecoverableException, G2Exception) as ex:
+            mock_logger('CRITICAL', ex)
+            raise
 
 
 try:

Python/Tasks/Redo/RedoContinuousFutures.py

@@ -17,7 +17,10 @@ def mock_logger(level, exception, error_rec=None):
 
 def process_redo(engine):
     redo_record = bytearray()
-    engine.processRedoRecord(redo_record)
+    engine.getRedoRecord(redo_record)
+    if not redo_record:
+        return None
+    engine.process(redo_record.decode())
     return redo_record
 
 
@@ -81,7 +84,7 @@ def futures_redo(engine):
                         if success_recs % 2000 == 0:
                             engine_stats(engine)
                     else:
-                        redo_paused = True if not redo_paused else redo_paused
+                        redo_paused = True
                 finally:
                     futures.pop(f)
 

Python/Tasks/Redo/RedoWithInfoContinuous.py

@@ -22,13 +22,15 @@ def process_redo(engine, output_file):
             while True:
                 redo_record = bytearray()
                 with_info = bytearray()
-                engine.processRedoRecordWithInfo(redo_record, with_info)
+                engine.getRedoRecord(redo_record)
 
                 if not redo_record:
                     print(f'No redo records to process, pausing for 30 seconds. Total processed {success_recs} . (CTRL-C to exit)...')
                     time.sleep(30)
                     continue
 
+                engine.processWithInfo(redo_record, with_info)
+
                 success_recs += 1
                 out_file.write(with_info.decode() + '\n')
 

Resources/Output/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore