From 977589dee097d57ead87b96ab65e3c4a84ae7691 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 3 Nov 2020 20:34:35 +0800
Subject: [PATCH] compile err in windows

---
 src/os/inc/osWindows.h     |  1 -
 src/os/src/windows/wFile.c | 10 +++++-----
 src/query/src/qTsbuf.c     |  2 +-
 src/util/src/tkvstore.c    |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/os/inc/osWindows.h b/src/os/inc/osWindows.h
index d5037b60a4..36e30528bf 100644
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
@@ -136,7 +136,6 @@ typedef int (*__compar_fn_t)(const void *, const void *);
 #define in_addr_t unsigned long
 #define socklen_t int
 #define htobe64 htonll
-#define twrite write
 #define getpid _getpid
 
 struct tm *localtime_r(const time_t *timep, struct tm *result);
diff --git a/src/os/src/windows/wFile.c b/src/os/src/windows/wFile.c
index 87599d5e69..ddad3ac884 100644
--- a/src/os/src/windows/wFile.c
+++ b/src/os/src/windows/wFile.c
@@ -40,19 +40,19 @@ void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
 
 #define _SEND_FILE_STEP_ 1000
 
-int taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
+int64_t taosFSendFile(FILE *out_file, FILE *in_file, int64_t *offset, int64_t count) {
   fseek(in_file, (int32_t)(*offset), 0);
-  int writeLen = 0;
+  int64_t writeLen = 0;
   uint8_t buffer[_SEND_FILE_STEP_] = { 0 };
   
-  for (int len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
+  for (int64_t len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
     size_t rlen = fread(buffer, 1, _SEND_FILE_STEP_, in_file);
     if (rlen <= 0) {
       return writeLen;
     }
     else if (rlen < _SEND_FILE_STEP_) {
       fwrite(buffer, 1, rlen, out_file);
-      return (int)(writeLen + rlen);
+      return (int64_t)(writeLen + rlen);
     }
     else {
       fwrite(buffer, 1, _SEND_FILE_STEP_, in_file);
@@ -60,7 +60,7 @@ int taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t cou
     }
   }
 
-  int remain = count - writeLen;
+  int64_t remain = count - writeLen;
   if (remain > 0) {
     size_t rlen = fread(buffer, 1, remain, in_file);
     if (rlen <= 0) {
diff --git a/src/query/src/qTsbuf.c b/src/query/src/qTsbuf.c
index ad29cef5c2..529da78d9e 100644
--- a/src/query/src/qTsbuf.c
+++ b/src/query/src/qTsbuf.c
@@ -772,7 +772,7 @@ int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf) {
   int64_t offset = getDataStartOffset();
   int32_t size = (int32_t)pSrcBuf->fileSize - (int32_t)offset;
 
-  ssize_t rc = taosFSendFile(pDestBuf->f, pSrcBuf->f, &offset, size);
+  int64_t rc = taosFSendFile(pDestBuf->f, pSrcBuf->f, &offset, size);
   
   if (rc == -1) {
 //    tscError("failed to merge tsBuf from:%s to %s, reason:%s\n", pSrcBuf->path, pDestBuf->path, strerror(errno));
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index bca9eef42a..c5aa029416 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -535,7 +535,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
   ASSERT(pStore->info.size == TD_KVSTORE_HEADER_SIZE);
 
   while (true) {
-    ssize_t tsize = taosRead(pStore->fd, tbuf, sizeof(SKVRecord));
+    int64_t tsize = taosRead(pStore->fd, tbuf, sizeof(SKVRecord));
     if (tsize == 0) break;
     if (tsize < sizeof(SKVRecord)) {
       uError("failed to read %" PRIzu " bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord), pStore->fname,
-- 
GitLab