Merge pull request #1678 from taosdata/feature/lihui

[TD-175]

src/client/src/tscSQLParser.c

@@ -1945,6 +1945,7 @@ static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SSQLToken
 
     if (strncasecmp(pSchema[i].name, pToken->z, pToken->n) == 0) {
       columnIndex = i;
+      break;
     }
   }
 

src/system/detail/src/vnodeQueryImpl.c

@@ -4021,7 +4021,7 @@ bool normalizedFirstQueryRange(bool dataInDisk, bool dataInCache, STableQuerySup
       }
       
       // needs the data before the begin timestamp of query time window
-      if (nextKey != pQuery->skey) {
+      if ((nextKey != pQuery->skey) && (!isPointInterpoQuery(pQuery))) {
         if (!pRuntimeEnv->hasTimeWindow) {
           pQuery->skey = nextKey;  // change the query skey
           pQuery->lastKey = pQuery->skey;

src/util/src/tnote.c

@@ -77,7 +77,7 @@ void taosUnLockNote(int fd, taosNoteInfo * pNote)
 
 void *taosThreadToOpenNewNote(void *param)
 {
-    char name[NOTE_FILE_NAME_LEN];
+    char name[NOTE_FILE_NAME_LEN + 16];
     taosNoteInfo * pNote = (taosNoteInfo *)param;
 
     pNote->taosNoteFlag ^= 1;
@@ -170,7 +170,7 @@ void taosGetNoteName(char *fn, taosNoteInfo * pNote)
 
 int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInfo * pNote)
 {
-    char name[NOTE_FILE_NAME_LEN] = "\0";
+    char name[NOTE_FILE_NAME_LEN + 16] = "\0";
     struct stat  notestat0, notestat1;
     int size;