Merge branch 'develop' into 2.0

README.md

@@ -45,13 +45,15 @@ mkdir build && cd build
 cmake .. && cmake --build .
 ```
 
-if compiling on an ARM processor(aarch64 or aarch32), you need add one parameter:
+To compile on an ARM processor (aarch64 or aarch32), please add option CPUTYPE as below:
 
-```cmd
 aarch64:
+```cmd
 cmake .. -DCPUTYPE=aarch64 && cmake --build .
+```
 
 aarch32:
+```cmd
 cmake .. -DCPUTYPE=aarch32 && cmake --build .
 ```
 

packaging/deb/makedeb.sh

@@ -73,7 +73,7 @@ sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
 if [ "$verMode" == "cluster" ]; then
   debname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
 elif [ "$verMode" == "lite" ]; then
-  debname="TDengine-server-edge"-${tdengine_ver}-${osType}-${cpuType}
+  debname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
   echo "unknow verMode, nor cluster or lite"
   exit 1

packaging/rpm/makerpm.sh

@@ -66,7 +66,7 @@ cp_rpm_package ${pkg_dir}/RPMS
 if [ "$verMode" == "cluster" ]; then
   rpmname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
 elif [ "$verMode" == "lite" ]; then
-  rpmname="TDengine-server-edge"-${tdengine_ver}-${osType}-${cpuType}
+  rpmname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
   echo "unknow verMode, nor cluster or lite"
   exit 1

packaging/tools/makeclient.sh

@@ -111,7 +111,7 @@ cd ${release_dir}
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 elif [ "$verMode" == "lite" ]; then
-  pkg_name=${install_dir}-edge-${version}-${osType}-${cpuType}
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
   echo "unknow verMode, nor cluster or lite"
   exit 1

packaging/tools/makepkg.sh

@@ -111,7 +111,7 @@ cd ${release_dir}
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 elif [ "$verMode" == "lite" ]; then
-  pkg_name=${install_dir}-edge-${version}-${osType}-${cpuType}
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
   echo "unknow verMode, nor cluster or lite"
   exit 1

src/client/src/taos.def

@@ -24,8 +24,6 @@ taos_fetch_row_a
 taos_subscribe
 taos_consume
 taos_unsubscribe
-taos_subfields_count
-taos_fetch_subfields
 taos_open_stream
 taos_close_stream
 taos_fetch_block

src/client/src/tscFunctionImpl.c

@@ -3194,7 +3194,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     GET_RES_INFO(pCtx)->numOfRes += forwardStep;
 
     pCtx->aOutputBuf += forwardStep * pCtx->outputBytes;
-    pCtx->ptsOutputBuf += forwardStep * TSDB_KEYSIZE;
+    pCtx->ptsOutputBuf = (char*)pCtx->ptsOutputBuf + forwardStep * TSDB_KEYSIZE;
   }
 }
 

src/util/CMakeLists.txt

@@ -34,6 +34,7 @@ ELSEIF (TD_WINDOWS_64)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  LIST(APPEND SRC ./src/hash.c)
   LIST(APPEND SRC ./src/ihash.c)
   LIST(APPEND SRC ./src/lz4.c)
   LIST(APPEND SRC ./src/shash.c)
@@ -68,6 +69,7 @@ ELSEIF (TD_WINDOWS_64)
   TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32)
 ELSEIF(TD_DARWIN_64)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
+  LIST(APPEND SRC ./src/hash.c)
   LIST(APPEND SRC ./src/ihash.c)
   LIST(APPEND SRC ./src/lz4.c)
   LIST(APPEND SRC ./src/shash.c)

src/util/src/tglobalcfg.c

@@ -80,7 +80,12 @@ short tsNumOfVnodesPerCore = 8;
 short tsNumOfTotalVnodes = 0;
 short tsCheckHeaderFile = 0;
 
+#ifdef _TD_ARM_32_
+int tsSessionsPerVnode = 100;
+#else
 int tsSessionsPerVnode = 1000;
+#endif
+
 int tsCacheBlockSize = 16384;  // 256 columns
 int tsAverageCacheBlocks = TSDB_DEFAULT_AVG_BLOCKS;
 /**

src/util/src/ttime.c

@@ -24,7 +24,43 @@
 #include "ttime.h"
 #include "tutil.h"
 
+/*
+ * mktime64 - Converts date to seconds.
+ * Converts Gregorian date to seconds since 1970-01-01 00:00:00.
+ * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
+ * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
+ *
+ * [For the Julian calendar (which was used in Russia before 1917,
+ * Britain & colonies before 1752, anywhere else before 1582,
+ * and is still in use by some communities) leave out the
+ * -year/100+year/400 terms, and add 10.]
+ *
+ * This algorithm was first published by Gauss (I think).
+ *
+ * A leap second can be indicated by calling this function with sec as
+ * 60 (allowable under ISO 8601).  The leap second is treated the same
+ * as the following second since they don't exist in UNIX time.
+ *
+ * An encoding of midnight at the end of the day as 24:00:00 - ie. midnight
+ * tomorrow - (allowable under ISO 8601) is supported.
+ */
+int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
+		const unsigned int day, const unsigned int hour,
+		const unsigned int min, const unsigned int sec)
+{
+	unsigned int mon = mon0, year = year0;
+
+	/* 1..12 -> 11,12,1..10 */
+	if (0 >= (int) (mon -= 2)) {
+		mon += 12;	/* Puts Feb last since it has leap day */
+		year -= 1;
+	}
 
+  int64_t res = (((((int64_t) (year/4 - year/100 + year/400 + 367*mon/12 + day) +
+		  year*365 - 719499)*24 + hour)*60 + min)*60 + sec);
+
+	return (res + timezone);
+}
 // ==== mktime() kernel code =================//
 static int64_t m_deltaUtc = 0;
 void deltaToUtcInitOnce() {  
@@ -293,7 +329,8 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
 
   /* mktime will be affected by TZ, set by using taos_options */
   //int64_t seconds = mktime(&tm);
-  int64_t seconds = (int64_t)user_mktime(&tm);
+  //int64_t seconds = (int64_t)user_mktime(&tm);
+  int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
   
   int64_t fraction = 0;
 

src/util/src/ttypes.c

@@ -976,11 +976,21 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) {
       break;
     }
     case TSDB_DATA_TYPE_FLOAT: {
+      #ifdef _TD_ARM_32_
+      float fv = GET_FLOAT_VAL(src);
+      SET_FLOAT_VAL_ALIGN(val, &fv);
+      #else
       *((float *)val) = GET_FLOAT_VAL(src);
+      #endif
       break;
     };
     case TSDB_DATA_TYPE_DOUBLE: {
+      #ifdef _TD_ARM_32_
+      double dv = GET_DOUBLE_VAL(src);
+      SET_DOUBLE_VAL_ALIGN(val, &dv);
+      #else
       *((double *)val) = GET_DOUBLE_VAL(src);
+      #endif
       break;
     };
     case TSDB_DATA_TYPE_TIMESTAMP:

src/util/src/version.c

-char version[64] = "1.6.5.3";
+char version[64] = "1.6.5.4";
 char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "700305490a82228ec1b0244afb838bdbb9de9793";
-char gitinfoOfInternal[128] = "";
-char buildinfo[512] = "Built by  at 2020-01-17 13:22";
+char gitinfo[128] = "3264067e97300c84caa61ac909d548c9ca56de6b";
+char gitinfoOfInternal[128] = "da88f4a2474737d1f9c76adcf0ff7fd0975e7342";
+char buildinfo[512] = "Built by root at 2020-02-05 14:38";
 
-void libtaos_edge_1_6_5_1_Linux_x64() {};
+void libtaos_1_6_5_4_Linux_x64() {};