From 0d2eb1bf0848bca00377a8ac5515f632c622dfa5 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Fri, 15 Nov 2019 18:44:00 +0800
Subject: [PATCH] [TBASE-1155]

---
 src/os/darwin/src/tdarwin.c   |  4 ----
 src/os/linux/src/tsystem.c    | 19 -------------------
 src/os/windows/src/twindows.c |  4 ----
 src/system/src/vnodeImport.c  |  3 ++-
 src/util/src/tutil.c          | 19 +++++++++++++++++++
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/os/darwin/src/tdarwin.c b/src/os/darwin/src/tdarwin.c
index 2f97c7c376..71e8a56466 100644
--- a/src/os/darwin/src/tdarwin.c
+++ b/src/os/darwin/src/tdarwin.c
@@ -243,10 +243,6 @@ int taosInitTimer(void (*callback)(int), int ms) {
   return setitimer(ITIMER_REAL, &tv, NULL);
 }
 
-char *taosCharsetReplace(char *charsetstr) {
-  return charsetstr;
-}
-
 void taosGetSystemTimezone() {
   // get and set default timezone
   SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
diff --git a/src/os/linux/src/tsystem.c b/src/os/linux/src/tsystem.c
index 0989f007b3..e1f771759a 100644
--- a/src/os/linux/src/tsystem.c
+++ b/src/os/linux/src/tsystem.c
@@ -210,25 +210,6 @@ void taosGetSystemTimezone() {
   pPrint("timezone not configured, set to system default:%s", tsTimezone);
 }
 
-typedef struct CharsetPair {
-  char *oldCharset;
-  char *newCharset;
-} CharsetPair;
-
-char *taosCharsetReplace(char *charsetstr) {
-  CharsetPair charsetRep[] = {
-      {"utf8", "UTF-8"}, {"936", "CP936"},
-  };
-
-  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
-    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
-      return strdup(charsetRep[i].newCharset);
-    }
-  }
-
-  return strdup(charsetstr);
-}
-
 /*
  * POSIX format locale string:
  * (Language Strings)_(Country/Region Strings).(code_page)
diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c
index 75bc8c2839..53563341c4 100644
--- a/src/os/windows/src/twindows.c
+++ b/src/os/windows/src/twindows.c
@@ -96,10 +96,6 @@ void __sync_val_restore_32(int32_t *ptr, int32_t newval) {
 
 void tsPrintOsInfo() {}
 
-char *taosCharsetReplace(char *charsetstr) {
-  return charsetstr;
-}
-
 void taosGetSystemTimezone() {
   // get and set default timezone
   SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
diff --git a/src/system/src/vnodeImport.c b/src/system/src/vnodeImport.c
index 9691206bf9..bfffc66aa5 100644
--- a/src/system/src/vnodeImport.c
+++ b/src/system/src/vnodeImport.c
@@ -546,6 +546,7 @@ int vnodeImportToCache(SImportInfo *pImport, char *payload, int rows) {
     return code;
   }
 
+  assert(rows);
   dTrace("vid:%d sid:%d id:%s, %d rows data will be imported to cache, firstKey:%ld lastKey:%ld",
       pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey);
 
@@ -781,7 +782,7 @@ int vnodeImportStartToCache(SImportInfo *pImport, char *payload, int rows) {
     pImport->importedRows = rows;
     code = vnodeImportToCache(pImport, payload, rows);
   } else {
-    dTrace("vid:%d sid:%d id:%s, data is already imported to cache", pObj->vnode, pObj->sid, pObj->meterId);
+    dTrace("vid:%d sid:%d id:%s, data is already imported to cache, firstKey:%lld", pObj->vnode, pObj->sid, pObj->meterId, pImport->firstKey);
   }
 
   return code;
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index cb93319900..0b407a848b 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -508,3 +508,22 @@ char *taosIpStr(int ipInt) {
   sprintf(ipStr, "0x%x:%d.%d.%d.%d", ipInt, ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, ipInt >> 24);
   return ipStr;
 }
+
+typedef struct CharsetPair {
+  char *oldCharset;
+  char *newCharset;
+} CharsetPair;
+
+char *taosCharsetReplace(char *charsetstr) {
+  CharsetPair charsetRep[] = {
+      { "utf8", "UTF-8" }, { "936", "CP936" },
+  };
+
+  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
+    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
+      return strdup(charsetRep[i].newCharset);
+    }
+  }
+
+  return strdup(charsetstr);
+}
\ No newline at end of file
-- 
GitLab