From ac6f6292fa4ea595076b5bb828b5d72960a97183 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 11:57:41 +0800
Subject: [PATCH] [td-225] handle file id overflow problem

---
 src/tsdb/src/tsdbRead.c                | 10 ++++-
 tests/examples/c/demo.c                | 53 ++++++++++++++++++++------
 tests/script/general/import/commit.sim |  3 +-
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index e468bfe1f8..08804f6ba1 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -365,8 +365,16 @@ static bool hasMoreDataInCache(STsdbQueryHandle* pHandle) {
 }
 
 static int32_t getFileIdFromKey(TSKEY key, int32_t daysPerFile) {
+  if (key == TSKEY_INITIAL_VAL) {
+    return INT32_MIN;
+  }
+  
   int64_t fid = (int64_t)(key / (daysPerFile * tsMsPerDay[0]));  // set the starting fileId
-  if (fid > INT32_MAX) {
+  if (fid < 0L && llabs(fid) > INT32_MAX) { // data value overflow for INT32
+    fid = INT32_MIN;
+  }
+  
+  if (fid > 0L && fid > INT32_MAX) {
     fid = INT32_MAX;
   }
   
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index 76bfa5949e..e27c73891f 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -16,11 +16,12 @@
 // TAOS standard API example. The same syntax as MySQL, but only a subet
 // to compile: gcc -o demo demo.c -ltaos
 
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <taos.h>  // TAOS header file
+#include <unistd.h>
 
 void taosMsleep(int mseconds);
 
@@ -49,19 +50,52 @@ static int32_t doQuery(TAOS* taos, const char* sql) {
   return 0;
 }
 
+void* oneLoader(void* param) {
+  TAOS* conn = (TAOS*) param;
+  
+  for(int32_t i = 0; i < 20000; ++i) {
+//    doQuery(conn, "show databases");
+    doQuery(conn, "use test");
+//    doQuery(conn, "describe t12");
+//    doQuery(conn, "show tables");
+//    doQuery(conn, "create table if not exists abc (ts timestamp, k int)");
+//    doQuery(conn, "select * from t12");
+  }
+  
+  return 0;
+}
+
+
+static __attribute__((unused)) void multiThreadTest(int32_t numOfThreads, void* conn) {
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  
+  pthread_t* threadId = malloc(sizeof(pthread_t)*numOfThreads);
+  
+  for (int i = 0; i < numOfThreads; ++i) {
+    pthread_create(&threadId[i], NULL, oneLoader, conn);
+  }
+  
+  for (int32_t i = 0; i < numOfThreads; ++i) {
+    pthread_join(threadId[i], NULL);
+  }
+  
+  pthread_attr_destroy(&thattr);
+}
+
 int main(int argc, char *argv[]) {
   TAOS *    taos;
   char      qstr[1024];
   TAOS_RES *result;
   
-  
   // connect to server
   if (argc < 2) {
     printf("please input server-ip \n");
     return 0;
   }
   
-  taos_options(TSDB_OPTION_CONFIGDIR, "~/sec/cfg");
+  taos_options(TSDB_OPTION_CONFIGDIR, "/home/lisa/Documents/workspace/TDinternal/community/sim/tsim/cfg");
   
   // init TAOS
   taos_init();
@@ -73,15 +107,12 @@ int main(int argc, char *argv[]) {
   }
   printf("success to connect to server\n");
   
-  doQuery(taos, "create database if not exists test");
-  doQuery(taos, "use test");
-  doQuery(taos, "select count(*) from m1 where ts>='2020-1-1 1:1:1' and ts<='2020-1-1 1:1:59' interval(500a) fill(value, 99)");
-  
-//  doQuery(taos, "create table t1(ts timestamp, k binary(12), f nchar(2))");
-//  for(int32_t i = 0; i< 100000; ++i) {
-//    doQuery(taos, "select m1.ts,m1.a from m1, m2 where m1.ts=m2.ts and m1.a=m2.b;");
-//    usleep(500000);
+//  multiThreadTest(1, taos);
+  doQuery(taos, "select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from lm2_db0.lm2_stb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10;");
+//  for(int32_t i = 0; i < 100000; ++i) {
+//    doQuery(taos, "insert into t1 values(now, 2)");
 //  }
+//  doQuery(taos, "create table t1(ts timestamp, k binary(12), f nchar(2))");
 
 //  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:1', 'abc')");
 //  doQuery(taos, "create table if not exists tm0 (ts timestamp, k int);");
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
index 498bb4f2e6..36d201e9ef 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -78,7 +78,8 @@ sleep 5000
 
 print ========= step4
 sql select * from ic2db.tb;
-if $rows != 13 then 
+if $rows != 13 then
+  print expect 13, actual:$rows
   return -1
 endi
 
-- 
GitLab