diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c index b1198e1cb2..8a2606c4c2 100644 --- a/source/os/src/osFile.c +++ b/source/os/src/osFile.c @@ -1403,7 +1403,7 @@ int64_t taosGetLineFile(TdFilePtr pFile, char **__restrict ptrBuf) { } (*ptrBuf)[totalBytesRead] = '\0'; - ret = (totalBytesRead > 0 ? totalBytesRead : -1); // -1 means EOF + ret = totalBytesRead; #else size_t len = 0; ret = getline(ptrBuf, &len, pFile->fp); diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 3eeb583c11..9047b0f3af 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -443,7 +443,6 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/InsertFuturets.py ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/insert_wide_column.py ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/insert_column_value.py -,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/insert_from_csv.py ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k_benchmark.py ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k.py ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/rowlength64k.py -R diff --git a/tests/system-test/1-insert/insert_from_csv.py b/tests/system-test/1-insert/insert_from_csv.py deleted file mode 100644 index 38f6a8b09d..0000000000 --- a/tests/system-test/1-insert/insert_from_csv.py +++ /dev/null @@ -1,47 +0,0 @@ -import taos -import sys -import datetime -import inspect -import random -from util.dnodes import TDDnode -from util.dnodes import tdDnodes - -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(), True) - - self.testcasePath = os.path.split(__file__)[0] - self.testcasePath = self.testcasePath.replace('\\', '//') - self.database = "test_insert_csv_db" - self.table = "test_insert_csv_tbl" - - def insert_from_csv(self): - tdSql.execute(f"drop database if exists {self.database}") - tdSql.execute(f"create database {self.database}") - tdSql.execute(f"use {self.database}") - tdSql.execute(f"create table {self.table} (ts timestamp, c1 nchar(16), c2 double, c3 int)") - tdSql.execute(f"insert into {self.table} file '{self.testcasePath}//test_insert_from_csv.csv'") - tdSql.query(f"select count(*) from {self.table}") - tdSql.checkData(0, 0, 5) - - def run(self): - tdSql.prepare() - - startTime_all = time.time() - self.insert_from_csv() - endTime_all = time.time() - print("total time %ds" % (endTime_all - startTime_all)) - - def stop(self): - tdSql.close() - tdLog.success("%s successfully executed" % __file__) - - -tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/system-test/1-insert/test_insert_from_csv.csv b/tests/system-test/1-insert/test_insert_from_csv.csv deleted file mode 100644 index 966af8c27a..0000000000 --- a/tests/system-test/1-insert/test_insert_from_csv.csv +++ /dev/null @@ -1,5 +0,0 @@ -'2024-12-13 09:30:00.050','ABCDEF68',24.774736842805263,200 -'2024-12-13 09:30:00.060','ABCDEF68',24.774736842805263,201 -'2024-12-13 09:30:00.080','ABCDEF68',24.774736842805263,202 -'2024-12-13 09:30:00.100','ABCDEF68',24.774736842805263,203 -'2024-12-13 09:30:00.110','ABCDEF68',24.774736842805263,204 diff --git a/tests/system-test/simpletest.bat b/tests/system-test/simpletest.bat index 5948c7fc80..a1f7273ad4 100644 --- a/tests/system-test/simpletest.bat +++ b/tests/system-test/simpletest.bat @@ -13,7 +13,6 @@ python3 .\test.py -f 0-others\cachemodel.py @REM python3 .\test.py -f 0-others\fsync.py python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py -python3 .\test.py -f 1-insert\insert_from_csv.py @REM python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py @REM python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py @REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py