Merge pull request #7891 from taosdata/hjxilinx-patch-1

[ts-218] fix the invalid write

src/util/src/tarray.c

@@ -111,15 +111,16 @@ void taosArrayRemoveBatch(SArray *pArray, const int32_t* pData, int32_t numOfEle
 
     i += 1;
   }
+  
+  assert(i == pData[numOfElems - 1] + 1 && i <= size);
 
-  assert(i == pData[numOfElems - 1] + 1);
-
-  int32_t dstIndex = pData[numOfElems - 1] - numOfElems + 1;
   int32_t srcIndex = pData[numOfElems - 1] + 1;
-
-  char* dst = TARRAY_GET_ELEM(pArray, dstIndex);
-  char* src = TARRAY_GET_ELEM(pArray, srcIndex);
-  memmove(dst, src, pArray->elemSize * (pArray->size - numOfElems));
+  int32_t dstIndex = pData[numOfElems - 1] - numOfElems + 1;
+  if (pArray->size - srcIndex > 0) {
+    char* dst = TARRAY_GET_ELEM(pArray, dstIndex);
+    char* src = TARRAY_GET_ELEM(pArray, srcIndex);
+    memmove(dst, src, pArray->elemSize * (pArray->size - srcIndex));
+  }
 
   pArray->size -= numOfElems;
 }

src/util/src/tcache.c

@@ -640,7 +640,7 @@ void doCleanupDataCache(SCacheObj *pCacheObj) {
 
   // todo memory leak if there are object with refcount greater than 0 in hash table?
   taosHashCleanup(pCacheObj->pHashTable);
-  taosTrashcanEmpty(pCacheObj, false);
+  taosTrashcanEmpty(pCacheObj, true);
 
   __cache_lock_destroy(pCacheObj);
   

tests/examples/C#/taosdemo/Dockerfile

+FROM tdengine/tdengine-beta:latest
+
+ENV DEBIAN_FRONTEND=noninteractive
+ARG MIRROR=archive.ubuntu.com
+RUN sed -Ei 's/\w+.ubuntu.com/'${MIRROR}'/' /etc/apt/sources.list && apt update && apt install mono-devel -y
+RUN apt-get install wget -y \
+  && wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+  && dpkg -i packages-microsoft-prod.deb \
+  && rm packages-microsoft-prod.deb \
+  && apt-get update && apt-get install -y dotnet-sdk-5.0
+COPY ./*.cs *.csproj /tmp/
+WORKDIR /tmp/
+RUN dotnet build -c Release && cp bin/Release/net5.0/taosdemo bin/Release/net5.0/taosdemo.* /usr/local/bin/ && rm -rf /tmp/*
+
+FROM tdengine/tdengine-beta:latest
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install wget -y \
+  && wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+  && dpkg -i packages-microsoft-prod.deb \
+  && rm packages-microsoft-prod.deb \
+  && apt-get update && apt-get install -y dotnet-runtime-5.0
+COPY --from=0 /usr/local/bin/taosdemo* /usr/local/bin/
+CMD ["/usr/local/bin/taosdemo"]

tests/examples/C#/taosdemo/README.md

+# C# Taosdemo
+
+## For Mono
+
 install build environment
-===
+
+```sh
 yum/apt install mono-complete
+```
 
-build C# version taosdemo
-===
+build C# version taosdemo.
+
+```sh
 mcs -out:taosdemo *.cs
+./taosdemo --help
+```
+
+## For DotNet
+
+install dotnet environment.
+
+```sh
+wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+  && dpkg -i packages-microsoft-prod.deb \
+  && rm packages-microsoft-prod.deb \
+  && apt-get update && apt-get install -y dotnet-sdk-5.0
+```
+
+Build DotNet version taosdemo.
+
+```sh
+dotnet build -c Release
+./bin/Release/net5.0/taosdemo --help
+```
+
+## Usage
 
-run C# version taosdemo
-===
+```
 Usage: mono taosdemo.exe [OPTION...]
 
         --help                   Show usage.
@@ -34,3 +62,4 @@ Usage: mono taosdemo.exe [OPTION...]
         -v                       Print verbose output
         -g                       Print debug output
         -y                       Skip read key for continous test, default is not skip
+```

tests/examples/C#/taosdemo/taosdemo.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+</Project>