diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c
index 44d39392a2..6c537d7b98 100644
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
@@ -75,7 +75,7 @@ static void doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32
     double v = 0;
     GET_TYPED_DATA(v, double, pVar->nType, &pVar->d);
     colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
-  } else if (IS_SIGNED_NUMERIC_TYPE(pDst->info.type)) {
+  } else if (IS_SIGNED_NUMERIC_TYPE(pDst->info.type) || pDst->info.type == TSDB_DATA_TYPE_BOOL) {
     int64_t v = 0;
     GET_TYPED_DATA(v, int64_t, pVar->nType, &pVar->i);
     colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
@@ -85,7 +85,10 @@ static void doSetUserSpecifiedValue(SColumnInfoData* pDst, SVariant* pVar, int32
     colDataSetVal(pDst, rowIndex, (char*)&v, isNull);
   } else if (pDst->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
     colDataSetVal(pDst, rowIndex, (const char*)&currentKey, isNull);
-  } else {  // varchar/nchar data
+  } else if (pDst->info.type == TSDB_DATA_TYPE_NCHAR || pDst->info.type == TSDB_DATA_TYPE_VARCHAR ||
+             pDst->info.type == TSDB_DATA_TYPE_VARBINARY) {
+    colDataSetVal(pDst, rowIndex, pVar->pz, isNull);
+  } else {  // others data
     colDataSetNULL(pDst, rowIndex);
   }
 }
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index c6432092d3..9ae6ab8cc4 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -338,6 +338,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/hyperloglog.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py -R
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/fill.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/irate.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/irate.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/join.py
@@ -569,6 +570,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/arctan.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/fill.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/nestedQueryInterval.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/stablity.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/stablity_1.py -Q 2
@@ -698,6 +700,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/tsbsQuery.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/fill.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/case_when.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/blockSMA.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/projectionDesc.py -Q 3
@@ -794,6 +797,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/tsbsQuery.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py -Q 4
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/fill.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/case_when.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/insert_select.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/insert_select.py -R
diff --git a/tests/system-test/2-query/fill.py b/tests/system-test/2-query/fill.py
new file mode 100644
index 0000000000..f5cd2d5855
--- /dev/null
+++ b/tests/system-test/2-query/fill.py
@@ -0,0 +1,262 @@
+import taos
+import sys
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+
+
+class TDTestCase:
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        #tdSql.init(conn.cursor())
+        tdSql.init(conn.cursor(), logSql)  # output sql.txt file
+
+    def run(self):
+        dbname = "db"
+        tbname = "tb"
+
+        tdSql.prepare()
+
+        tdLog.printNoPrefix("==========step1:create table")
+
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{tbname}
+            (ts timestamp, c0 int, c1 bool, c2 varchar(100), c3 nchar(100), c4 varbinary(100))
+            '''
+        )
+
+        tdLog.printNoPrefix("==========step2:insert data")
+
+        tdSql.execute(f"use db")
+
+        tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:05', 5, true, 'varchar', 'nchar', 'varbinary')")
+        tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:10', 10, true, 'varchar', 'nchar', 'varbinary')")
+        tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:15', 15, NULL, NULL, NULL, NULL)")
+
+        tdLog.printNoPrefix("==========step3:fill data")
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, 'xx');")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 0, 9)
+        tdSql.checkData(1, 0, 5)
+        tdSql.checkData(2, 0, 10)
+        tdSql.checkData(3, 0, 15)
+        tdSql.checkData(4, 0, 9)
+        tdSql.checkData(0, 1, False)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, False)
+        tdSql.checkData(4, 1, False)
+
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, True);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, True)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, True)
+        tdSql.checkData(4, 1, True)
+
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, False);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, False)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, False)
+        tdSql.checkData(4, 1, False)
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, 'abc');")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, "abc")
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, "abc")
+        tdSql.checkData(4, 1, "abc")
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, '我是#$^中文');")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, '我是#$^中文')
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, "我是#$^中文")
+        tdSql.checkData(4, 1, "我是#$^中文")
+
+        tdSql.query(f"select avg(c0), last(c3) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, '我是#$^中文');")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, '我是#$^中文')
+        tdSql.checkData(1, 1, 'nchar')
+        tdSql.checkData(2, 1, 'nchar')
+        tdSql.checkData(3, 1, "我是#$^中文")
+        tdSql.checkData(4, 1, "我是#$^中文")
+
+        tdSql.query(f"select avg(c0), last(c4) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, '我是中文');")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, b'\xe6\x88\x91\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87')
+        tdSql.checkData(1, 1, b'varbinary')
+        tdSql.checkData(2, 1, b'varbinary')
+        tdSql.checkData(3, 1, b'\xe6\x88\x91\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87')
+        tdSql.checkData(4, 1, b'\xe6\x88\x91\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87')
+        
+        tdLog.printNoPrefix("==========step4:fill null")
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, NULL, NULL);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, 5)
+        tdSql.checkData(2, 0, 10)
+        tdSql.checkData(3, 0, 15)
+        tdSql.checkData(4, 0, None)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, NULL);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, NULL);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c3) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, NULL);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, 'nchar')
+        tdSql.checkData(2, 1, 'nchar')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c4) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(value, 9, NULL);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, b'varbinary')
+        tdSql.checkData(2, 1, b'varbinary')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdLog.printNoPrefix("==========step5:fill prev")
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(PREV);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, 5)
+        tdSql.checkData(2, 0, 10)
+        tdSql.checkData(3, 0, 15)
+        tdSql.checkData(4, 0, 15)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, True)
+        tdSql.checkData(4, 1, True)
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(PREV);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, 'varchar')
+        tdSql.checkData(4, 1, 'varchar')
+
+        tdSql.query(f"select avg(c0), last(c3) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(PREV);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, 'nchar')
+        tdSql.checkData(2, 1, 'nchar')
+        tdSql.checkData(3, 1, 'nchar')
+        tdSql.checkData(4, 1, 'nchar')
+
+        tdSql.query(f"select avg(c0), last(c4) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(PREV);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(1, 1, b'varbinary')
+        tdSql.checkData(2, 1, b'varbinary')
+        tdSql.checkData(3, 1, b'varbinary')
+        tdSql.checkData(4, 1, b'varbinary')
+
+        tdLog.printNoPrefix("==========step6:fill next")
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 0, 5)
+        tdSql.checkData(1, 0, 5)
+        tdSql.checkData(2, 0, 10)
+        tdSql.checkData(3, 0, 15)
+        tdSql.checkData(4, 0, None)
+        tdSql.checkData(0, 1, True)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, 'varchar')
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c3) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, 'nchar')
+        tdSql.checkData(1, 1, 'nchar')
+        tdSql.checkData(2, 1, 'nchar')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.query(f"select avg(c0), last(c4) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, b'varbinary')
+        tdSql.checkData(1, 1, b'varbinary')
+        tdSql.checkData(2, 1, b'varbinary')
+        tdSql.checkData(3, 1, None)
+        tdSql.checkData(4, 1, None)
+
+        tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:20', 15, False, '中文', '中文', '中文');")
+        tdLog.printNoPrefix("==========step6:fill next")
+        tdSql.query(f"select avg(c0), last(c1) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, True)
+        tdSql.checkData(1, 1, True)
+        tdSql.checkData(2, 1, True)
+        tdSql.checkData(3, 1, False)
+        tdSql.checkData(4, 1, False)
+
+        tdSql.query(f"select avg(c0), last(c2) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, 'varchar')
+        tdSql.checkData(1, 1, 'varchar')
+        tdSql.checkData(2, 1, 'varchar')
+        tdSql.checkData(3, 1, '中文')
+        tdSql.checkData(4, 1, '中文')
+
+        tdSql.query(f"select avg(c0), last(c3) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, 'nchar')
+        tdSql.checkData(1, 1, 'nchar')
+        tdSql.checkData(2, 1, 'nchar')
+        tdSql.checkData(3, 1, '中文')
+        tdSql.checkData(4, 1, '中文')
+
+        tdSql.query(f"select avg(c0), last(c4) from {dbname}.{tbname} where ts>='2020-02-01 00:00:00' and ts<='2020-02-01 00:00:20' interval(5s) fill(NEXT);")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 1, b'varbinary')
+        tdSql.checkData(1, 1, b'varbinary')
+        tdSql.checkData(2, 1, b'varbinary')
+        tdSql.checkData(3, 1, b'\xe4\xb8\xad\xe6\x96\x87')
+        tdSql.checkData(4, 1, b'\xe4\xb8\xad\xe6\x96\x87')
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index c2eb7bee2e..86d010209d 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -375,6 +375,22 @@ class TDTestCase:
         tdSql.checkData(11, 0, True)
         tdSql.checkData(12, 0, True)
 
+        tdSql.query(f"select interp(c6) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(value, false)")
+        tdSql.checkRows(13)
+        tdSql.checkData(0, 0, False)
+        tdSql.checkData(1, 0, True)
+        tdSql.checkData(2, 0, False)
+        tdSql.checkData(3, 0, False)
+        tdSql.checkData(4, 0, False)
+        tdSql.checkData(5, 0, False)
+        tdSql.checkData(6, 0, True)
+        tdSql.checkData(7, 0, False)
+        tdSql.checkData(8, 0, False)
+        tdSql.checkData(9, 0, False)
+        tdSql.checkData(10, 0, False)
+        tdSql.checkData(11, 0, True)
+        tdSql.checkData(12, 0, False)
+
         tdSql.query(f"select interp(c6) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(value, NULL)")
         tdSql.checkRows(13)
         tdSql.checkData(0, 0, None)
diff --git a/tests/system-test/2-query/limit.py b/tests/system-test/2-query/limit.py
index 4774602d69..fb5595a8be 100644
--- a/tests/system-test/2-query/limit.py
+++ b/tests/system-test/2-query/limit.py
@@ -291,8 +291,8 @@ class TDTestCase:
         tdSql.checkData(0, 7, 1)
         tdSql.checkData(0, 8, "binary5")
         tdSql.checkData(0, 9, "nchar5")
-        tdSql.checkData(1, 8, None)
-        tdSql.checkData(1, 9, None)
+        tdSql.checkData(1, 8, "-8")
+        tdSql.checkData(1, 9, "-9")
 
 
         limit = paraDict["rowsPerTbl"]
diff --git a/tests/system-test/runAllOne.sh b/tests/system-test/runAllOne.sh
index a870e36935..6d4c80c388 100644
--- a/tests/system-test/runAllOne.sh
+++ b/tests/system-test/runAllOne.sh
@@ -210,6 +210,7 @@ python3 ./test.py -f 2-query/hyperloglog.py -P
 python3 ./test.py -f 2-query/hyperloglog.py -P -R
 python3 ./test.py -f 2-query/interp.py -P
 python3 ./test.py -f 2-query/interp.py -P -R
+python3 ./test.py -f 2-query/fill.py -P
 python3 ./test.py -f 2-query/irate.py -P
 python3 ./test.py -f 2-query/irate.py -P -R
 python3 ./test.py -f 2-query/join.py -P
@@ -450,6 +451,7 @@ python3 ./test.py -f 2-query/arccos.py -P -Q 2
 python3 ./test.py -f 2-query/arctan.py -P -Q 2
 python3 ./test.py -f 2-query/query_cols_tags_and_or.py -P -Q 2
 python3 ./test.py -f 2-query/interp.py -P -Q 2
+python3 ./test.py -f 2-query/fill.py -P -Q 2
 python3 ./test.py -f 2-query/nestedQueryInterval.py -P -Q 2
 python3 ./test.py -f 2-query/stablity.py -P -Q 2
 python3 ./test.py -f 2-query/stablity_1.py -P -Q 2
@@ -579,6 +581,7 @@ python3 ./test.py -f 2-query/last_row.py -P -Q 3
 python3 ./test.py -f 2-query/tsbsQuery.py -P -Q 3
 python3 ./test.py -f 2-query/sml.py -P -Q 3
 python3 ./test.py -f 2-query/interp.py -P -Q 3
+python3 ./test.py -f 2-query/fill.py -P -Q 3
 python3 ./test.py -f 2-query/case_when.py -P -Q 3
 python3 ./test.py -f 2-query/blockSMA.py -P -Q 3
 python3 ./test.py -f 2-query/projectionDesc.py -P -Q 3
@@ -675,6 +678,7 @@ python3 ./test.py -f 2-query/last_row.py -P -Q 4
 python3 ./test.py -f 2-query/tsbsQuery.py -P -Q 4
 python3 ./test.py -f 2-query/sml.py -P -Q 4
 python3 ./test.py -f 2-query/interp.py -P -Q 4
+python3 ./test.py -f 2-query/fill.py -P -Q 4
 python3 ./test.py -f 2-query/case_when.py -P -Q 4
 python3 ./test.py -f 2-query/insert_select.py -P
 python3 ./test.py -f 2-query/insert_select.py -P -R
diff --git a/tests/system-test/win-test-file b/tests/system-test/win-test-file
index 443c27fd7e..3daf65b406 100644
--- a/tests/system-test/win-test-file
+++ b/tests/system-test/win-test-file
@@ -271,6 +271,7 @@ python3 ./test.py -f 2-query/hyperloglog.py
 python3 ./test.py -f 2-query/hyperloglog.py -R
 python3 ./test.py -f 2-query/interp.py
 python3 ./test.py -f 2-query/interp.py -R
+python3 ./test.py -f 2-query/fill.py
 python3 ./test.py -f 2-query/irate.py
 python3 ./test.py -f 2-query/irate.py -R
 python3 ./test.py -f 2-query/join.py
@@ -496,6 +497,7 @@ python3 ./test.py -f 2-query/arccos.py -Q 2
 python3 ./test.py -f 2-query/arctan.py -Q 2
 python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q 2
 python3 ./test.py -f 2-query/interp.py -Q 2
+python3 ./test.py -f 2-query/fill.py -Q 2
 python3 ./test.py -f 2-query/nestedQueryInterval.py -Q 2
 python3 ./test.py -f 2-query/stablity.py -Q 2
 python3 ./test.py -f 2-query/stablity_1.py -Q 2
@@ -624,6 +626,7 @@ python3 ./test.py -f 2-query/last_row.py -Q 3
 python3 ./test.py -f 2-query/tsbsQuery.py -Q 3
 python3 ./test.py -f 2-query/sml.py -Q 3
 python3 ./test.py -f 2-query/interp.py -Q 3
+python3 ./test.py -f 2-query/fill.py -Q 3
 python3 ./test.py -f 2-query/case_when.py -Q 3
 python3 ./test.py -f 2-query/blockSMA.py -Q 3
 python3 ./test.py -f 2-query/projectionDesc.py -Q 3
@@ -717,6 +720,7 @@ python3 ./test.py -f 2-query/last_row.py -Q 4
 python3 ./test.py -f 2-query/tsbsQuery.py -Q 4
 python3 ./test.py -f 2-query/sml.py -Q 4
 python3 ./test.py -f 2-query/interp.py -Q 4
+python3 ./test.py -f 2-query/fill.py -Q 4
 python3 ./test.py -f 2-query/case_when.py -Q 4
 python3 ./test.py -f 2-query/insert_select.py
 python3 ./test.py -f 2-query/insert_select.py -R