update to 0.9.24-beta

bersler · Aug 31, 2021 · 109889e · 109889e
1 parent 3eb3288
commit 109889e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,8 @@
 - fixed typo bugs in example JSON files
 - display performance data also for online redo logs (trace2: 256)
 - fixed null values for mode "column": 1, 2
+- enhanced read error messages
+- updated README.md
 
 0.9.23-beta
 - hidden constraint value for nested tables

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Open Source Oracle database CDC written purely in C++. Reads transactions directly from database redo log files and streams in JSON or Protobuf format to:
 * Kafka
 * flat file
-* network stream (plan TCP/IP or ZeroMQ)
+* network stream (plain TCP/IP or ZeroMQ)
 
 Please mind that the code has 2 branches:
 1. master - branch with stable code - updated monthly
@@ -32,8 +32,8 @@ Compilation for Release:
 Step 3 is optional and required if you downloaded the files from GIT and timestamps of files may be changed.
 
 Running:
-1. cp sample/OpenLogReplicator.json.example OpenLogReplicator.json
-2. vi OpenLogReplicator.json
+1. cp config/OpenLogReplicator.example.json config/OpenLogReplicator.json
+2. vi config/OpenLogReplicator.json
 3. export LD_LIBRARY_PATH=/opt/instantclient_19_12:/opt/protobuf/lib:/opt/librdkafka/lib
 4. ./src/OpenLogReplicator
 

diff --git a/src/OutputBuffer.cpp b/src/OutputBuffer.cpp
@@ -1727,7 +1727,6 @@ namespace OpenLogReplicator {
                             if (object->columns[column]->numPk > 0)
                                 continue;
 
-                            cerr << "zero? " << dec << column << endl;
                             if (values[column][VALUE_AFTER] == nullptr || lengths[column][VALUE_AFTER] == 0) {
                                 valuesSet[base] &= ~mask;
                                 values[column][VALUE_AFTER] = nullptr;

diff --git a/src/Reader.cpp b/src/Reader.cpp
@@ -102,11 +102,14 @@ namespace OpenLogReplicator {
     uint64_t Reader::checkBlockHeader(uint8_t* buffer, typeBLK blockNumber, bool checkSum, bool showHint) {
         if (buffer[0] == 0 && buffer[1] == 0)
             return REDO_EMPTY;
+        if (shutdown)
+            return REDO_ERROR;
 
         if ((blockSize == 512 && buffer[1] != 0x22) ||
                 (blockSize == 1024 && buffer[1] != 0x22) ||
                 (blockSize == 4096 && buffer[1] != 0x82)) {
-            ERROR("invalid block size (found: " << dec << blockSize << ", header[1]: [0x" << setfill('0') << setw(2) << hex << (uint64_t)buffer[1] << "]): " << pathMapped);
+            ERROR("invalid block size (found: " << dec << blockSize << ", block: " << dec << blockNumber <<
+                    ", header[1]: 0x" << setfill('0') << setw(2) << hex << (uint64_t)buffer[1] << "): " << pathMapped);
             return REDO_ERROR;
         }
 
@@ -170,6 +173,9 @@ namespace OpenLogReplicator {
     }
 
     uint64_t Reader::reloadHeaderRead(void) {
+        if (shutdown)
+            return REDO_ERROR;
+
         int64_t bytes = redoRead(headerBuffer, 0, blockSize > 0 ? blockSize * 2: REDO_PAGE_SIZE_MAX * 2);
         if (bytes < 512) {
             ERROR("reading file: " << pathMapped << " - " << strerror(errno));