From 27273faa24e4d573deac486a0fcf4c4843c07e99 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 10 Mar 2022 10:52:40 +0800
Subject: [PATCH] [TS-207]<fix>(query): fix java case for three

---
 .../jdbc/src/test/java/com/taosdata/jdbc/JsonTagTest.java   | 2 +-
 .../src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java   | 2 +-
 src/os/src/windows/wString.c                                | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/JsonTagTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/JsonTagTest.java
index 47d39b5e10..fe55cd6df7 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/JsonTagTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/JsonTagTest.java
@@ -1135,7 +1135,7 @@ public class JsonTagTest {
 
         }
         Assert.assertEquals(8, count);
-        Assert.assertEquals("\"femail\"", s);
+        Assert.assertEquals("\"收到货\"", s);
         close(resultSet);
     }
 
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java
index 666ac910e7..4709c85868 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ws/WSJsonTagTest.java
@@ -1146,7 +1146,7 @@ public class WSJsonTagTest {
 
         }
         Assert.assertEquals(8, count);
-        Assert.assertEquals("\"femail\"", s);
+        Assert.assertEquals("\"收到货\"", s);
         close(resultSet);
     }
 
diff --git a/src/os/src/windows/wString.c b/src/os/src/windows/wString.c
index 3dd44bb817..1d7cfd9af1 100644
--- a/src/os/src/windows/wString.c
+++ b/src/os/src/windows/wString.c
@@ -93,9 +93,9 @@ int32_t twcslen(const wchar_t *wcs) {
 }
 
 int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes) {
-  for (int32_t i = 0; i < bytes; i+=4) {
-    int32_t f1 = *(int32_t *)((char *)f1_ucs4 + i * 4);
-    int32_t f2 = *(int32_t *)((char *)f2_ucs4 + i * 4);
+  for (int32_t i = 0; i < bytes; i += TSDB_NCHAR_SIZE) {
+    int32_t f1 = *(int32_t *)((char *)f1_ucs4 + i);
+    int32_t f2 = *(int32_t *)((char *)f2_ucs4 + i);
 
     if ((f1 == 0 && f2 != 0) || (f1 != 0 && f2 == 0)) {
       return f1 - f2;
-- 
GitLab