From 62971c0c03d49b81ee77fcca4397b7038f49fd43 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Tue, 26 Nov 2019 17:03:51 +0800
Subject: [PATCH] [TBASE-1229]

---
 src/sdb/src/sdbEngine.c | 62 ++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/sdb/src/sdbEngine.c b/src/sdb/src/sdbEngine.c
index e0a61f91c5..adb3e48bc7 100644
--- a/src/sdb/src/sdbEngine.c
+++ b/src/sdb/src/sdbEngine.c
@@ -346,10 +346,16 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) {
   int        real_size = 0;
   /* char       action = SDB_TYPE_INSERT; */
 
-  if (pTable == NULL) return -1;
+  if (pTable == NULL) {
+    sdbError("sdb tables is null");
+    return -1;
+  }
 
   if ((pTable->keyType != SDB_KEYTYPE_AUTO) || *((int64_t *)row))
-    if (sdbGetRow(handle, row)) return -1;
+    if (sdbGetRow(handle, row)) {
+      sdbError("table:%s, failed to insert record", pTable->name);
+      return -1;
+    }
 
   total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
   SRowHead *rowHead = (SRowHead *)malloc(total_size);
@@ -408,24 +414,26 @@ int64_t sdbInsertRow(void *handle, void *row, int rowSize) {
     pTable->numOfRows++;
     switch (pTable->keyType) {
       case SDB_KEYTYPE_STRING:
-        sdbTrace(
-            "table:%s, a record is inserted:%s, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
-            pTable->name, (char *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
+        sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
+                pTable->name, (char *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
+        break;
+      case SDB_KEYTYPE_UINT32: //dnodes or mnodes
+        sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
+                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
         break;
-      case SDB_KEYTYPE_UINT32:
       case SDB_KEYTYPE_AUTO:
-        sdbTrace(
-            "table:%s, a record is inserted:%d, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
-            pTable->name, *(int32_t *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
+        sdbTrace("table:%s, a record is inserted:%d, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
+                pTable->name, *(int32_t *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
         break;
       default:
-        sdbTrace(
-            "table:%s, a record is inserted, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
-            pTable->name, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
+        sdbTrace("table:%s, a record is inserted, sdbVersion:%ld id:%ld rowSize:%d numOfRows:%d fileSize:%ld",
+                pTable->name, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
         break;
     }
 
     id = rowMeta.id;
+  } else {
+    sdbError("table:%s, failed to insert record", pTable->name);
   }
 
   tfree(rowHead);
@@ -509,15 +517,16 @@ int sdbDeleteRow(void *handle, void *row) {
     sdbAddIntoUpdateList(pTable, SDB_TYPE_DELETE, pMetaRow);
     switch (pTable->keyType) {
       case SDB_KEYTYPE_STRING:
-        sdbTrace(
-            "table:%s, a record is deleted:%s, sdbVersion:%ld id:%ld numOfRows:%d",
-            pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%ld id:%ld numOfRows:%d",
+                pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        break;
+      case SDB_KEYTYPE_UINT32:  //dnodes or mnodes
+        sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%ld id:%ld numOfRows:%d",
+                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
         break;
-      case SDB_KEYTYPE_UINT32:
       case SDB_KEYTYPE_AUTO:
-        sdbTrace(
-            "table:%s, a record is deleted:%d, sdbVersion:%ld id:%ld numOfRows:%d",
-            pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        sdbTrace("table:%s, a record is deleted:%d, sdbVersion:%ld id:%ld numOfRows:%d",
+                pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
         break;
       default:
         sdbTrace("table:%s, a record is deleted, sdbVersion:%ld id:%ld numOfRows:%d",
@@ -610,15 +619,16 @@ int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) {
 
     switch (pTable->keyType) {
       case SDB_KEYTYPE_STRING:
-        sdbTrace(
-            "table:%s, a record is updated:%s, sdbVersion:%ld id:%ld numOfRows:%d",
-            pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        sdbTrace("table:%s, a record is updated:%s, sdbVersion:%ld id:%ld numOfRows:%d",
+                pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        break;
+      case SDB_KEYTYPE_UINT32: //dnodes or mnodes
+        sdbTrace("table:%s, a record is updated:%d, sdbVersion:%ld id:%ld numOfRows:%d",
+                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
         break;
-      case SDB_KEYTYPE_UINT32:
       case SDB_KEYTYPE_AUTO:
-        sdbTrace(
-            "table:%s, a record is updated:%d, sdbVersion:%ld id:%ld numOfRows:%d",
-            pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
+        sdbTrace("table:%s, a record is updated:%d, sdbVersion:%ld id:%ld numOfRows:%d",
+                pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
         break;
       default:
         sdbTrace("table:%s, a record is updated, sdbVersion:%ld id:%ld numOfRows:%d", pTable->name, sdbVersion,
-- 
GitLab