From 84fd45c3bbfc408421e396acfa4db9b83b543618 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Sun, 5 Jun 2022 14:18:40 +0800
Subject: [PATCH] feat: add sort/group logic for json

---
 source/libs/scalar/src/sclvector.c             |  5 ++---
 source/libs/scalar/test/scalar/scalarTests.cpp |  4 ++--
 tests/system-test/2-query/json_tag.py          | 12 ++++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index b931badab9..9b3a8261cc 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -393,7 +393,7 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in
 
   pOut->numOfRows = pIn->numOfRows;
   for (int32_t i = 0; i < pIn->numOfRows; ++i) {
-    if (colDataIsNull_s(pIn->columnData, i)) {
+    if (IS_HELPER_NULL(pIn->columnData, i)) {
       colDataAppendNULL(pOut->columnData, i);
       continue;
     }
@@ -402,8 +402,7 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in
     int32_t convertType = inType;
     if(inType == TSDB_DATA_TYPE_JSON){
       if(*data == TSDB_DATA_TYPE_NULL) {
-        colDataAppendNULL(pOut->columnData, i);
-        continue;
+        ASSERT(0);
       }
       else if(*data == TSDB_DATA_TYPE_NCHAR) {
         data += CHAR_BYTES;
diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp
index c71521535a..8a29462a2b 100644
--- a/source/libs/scalar/test/scalar/scalarTests.cpp
+++ b/source/libs/scalar/test/scalar/scalarTests.cpp
@@ -1227,7 +1227,7 @@ TEST(columnTest, json_column_logic_op) {
   printf("--------------------json null---------------------\n");
 
   key = "k3";   // (null is true) return NULL, so use DBL_MAX represent NULL
-  double eRes2[len+len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false};
+  double eRes2[len+len1] = {false, false, false, false, false, false, true, false, DBL_MAX, false, false, false, false};
   for(int i = 0; i < len; i++){
     makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes2[i], op[i]);
   }
@@ -1279,7 +1279,7 @@ TEST(columnTest, json_column_logic_op) {
   printf("---------------------json not exist--------------------\n");
 
   key = "k10";    // (NULL is true) return NULL, so use DBL_MAX represent NULL
-  double eRes10[len+len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false};
+  double eRes10[len+len1] = {false, false, false, false, false, false, true, false, DBL_MAX, false, false, false, false};
   for(int i = 0; i < len; i++){
     makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes10[i], op[i]);
   }
diff --git a/tests/system-test/2-query/json_tag.py b/tests/system-test/2-query/json_tag.py
index 33f35eabbe..5c38d4afb9 100644
--- a/tests/system-test/2-query/json_tag.py
+++ b/tests/system-test/2-query/json_tag.py
@@ -389,8 +389,8 @@ class TDTestCase:
         tdSql.checkData(2, 1, "11.000000000")
         tdSql.checkData(5, 0, 1)
         tdSql.checkData(5, 1, "false")
-        # tdSql.checkData(6, 0, 1)
-        # tdSql.checkData(6, 1, "null")
+        tdSql.checkData(6, 0, 1)
+        tdSql.checkData(6, 1, "null")
         tdSql.checkData(7, 0, 2)
         tdSql.checkData(7, 1, None)
 
@@ -409,7 +409,7 @@ class TDTestCase:
         tdSql.query("select stddev(dataint),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1'")
         tdSql.checkRows(8)
         tdSql.checkData(0, 0, 10)
-        # tdSql.checkData(0, 1, None)
+        tdSql.checkData(0, 1, None)
         tdSql.checkData(4, 0, 0)
         tdSql.checkData(4, 1, "5.000000000")
         tdSql.checkData(7, 0, 11)
@@ -424,10 +424,10 @@ class TDTestCase:
         # test top/bottom with group by json tag
         tdSql.query("select top(dataint,2),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1'")
         tdSql.checkRows(11)
+        tdSql.checkData(0, 0, 24)
+        tdSql.checkData(0, 1, None)
         tdSql.checkData(3, 0, 3)
         tdSql.checkData(3, 1, "false")
-        # tdSql.checkData(3, 0, 24)
-        # tdSql.checkData(3, 1, None)
         tdSql.checkData(10, 0, 23)
         tdSql.checkData(10, 1, '"femail"')
 
@@ -436,7 +436,7 @@ class TDTestCase:
         # tdSql.checkRows(2)
 
         # subquery with json tag
-        tdSql.query("select * from (select jtag, dataint from jsons1)")
+        tdSql.query("select * from (select jtag, dataint from jsons1) order by dataint")
         tdSql.checkRows(11)
         tdSql.checkData(1, 1, 1)
         tdSql.checkData(2, 0, '{"tag1":5,"tag2":"beijing"}')
-- 
GitLab