mirror of
https://github.com/taosdata/TDengine
synced 2026-05-24 10:09:01 +00:00
984211f3b4
* Add GEOMETRY data type and make sql.c able to parse it. The GEMETRY works like BINARY so far. * add GEOMETRY type into gConvertTypes to fix some issues like DELETE calling * change some test cases to make sure no same timestamp is inserted, and add my smoketest.sh * Add a function MakePoint() and introduce a lib geometry * implement sql functions GeomFromText() and AsText() * Use GEOS *_r funcions instead for thread safety * Handle with TSDB_DATA_TYPE_GEOMETRY when INSERT geometry data by converting WKT. Add geosWrapper to wrap the basic GEOS functions for TDEngine. * refactor AsText and MakePoint functions to be like GeomFromText * Show WKT when print geometry data in screen Dump hex data when dump geometry data in a file * define TYPE_BYTES item for TSDB_DATA_TYPE_GEOMETRY, which casued some strange issues. * set number of decimals of WKT to 6 * Implement SQL function Intersects() * refactor geometry sql functions * Add geosErrMsgeHandler() to get the GEOS error detail * use threadlocal to instantiate SGeosContext call destroyGeosContext() only if the thread exists * remove SGeosContext *context param for all geometry functions since we use thread local one, so that all caller do not need to know the context. * Modify Intersects() to call PreparedIntersects() when one of param is a constant, which has higher performance. * rename prepareFn() to initCtxFn() to avoid confusion with PreparedFn * Add prefix "ST_" for all geometry functions * move getThreadLocalGeosCtx() and destroyThreadLocalGeosCtx() into util, so that all unit test tools can compile * Add unit test for geometry lib, only test MakePoint so far * refactor and enhance existing cases in geomFuncTest * implement NULL type and NULL value test for geomFuncTest * add test on geomFromText() * add unit test on AsText() in geomFuncTest * combine some makePointFunction test items * add intersectsFunctionTwoColumns test refactor on callGeomFromTextWrapper functions * enhance intersectsFunction test to add cases like input constant , NULL type, NULL value, or wrong content * add more cases into intersectsFunction test * Add basic test on geometry in system test * Add ST_GeomFromText and ST_AsText function test in system test on geometry * add ST_Intersects function test in system test on geometry * support to check expectedErrno in system test on geometry * adjust geomTest unit test and geometry system test * add geometry data type and functions in doc english version * implement touchesFunction() in geometry lib refactor geometry relation functions model * separate gemFuncTest into several src files * add unit test on touchesFunction * support sql function ST_Touches() add system test on ST_Touches * add docs for ST_Touches() * Add ST_Contains() * Add ST_Covers() * Add ST_Equals() * add swapAllowed param for geomRelationFunction() read geom2 earlier intead of at doGeosRelation() * Add ST_ContainsProperly() * build on windows * Merge from 3.0 to 3.0_geometry * change macro definition TSDB_DATA_TYPE_GEOMETRY as the last one for compatibility * change '\\NULL' to 'NULL' back in shellDumpFieldToFile() * add /usr/local/include into include directory * add /usr/local/inlcude and /usr/local/lib in cmake.platform for DARWIN
257 lines
12 KiB
Python
257 lines
12 KiB
Python
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())
|
|
|
|
# WKT strings to be input as GEOMETRY type
|
|
self.point = "POINT (3.000000 6.000000)"
|
|
self.lineString = "LINESTRING (1.000000 1.000000, 2.000000 2.000000, 5.000000 5.000000)"
|
|
self.polygon = "POLYGON ((3.000000 6.000000, 5.000000 6.000000, 5.000000 8.000000, 3.000000 8.000000, 3.000000 6.000000))"
|
|
|
|
# expected errno
|
|
self.errno_TSC_SQL_SYNTAX_ERROR = -2147483114;
|
|
self.errno_PAR_SYNTAX_ERROR = -2147473920
|
|
|
|
self.errno_FUNTION_PARA_NUM = -2147473407;
|
|
self.errno_FUNTION_PARA_TYPE = -2147473406;
|
|
self.errno_FUNTION_PARA_VALUE = -2147473405;
|
|
|
|
def prepare_data(self, dbname = "db"):
|
|
tdSql.execute(
|
|
f'''create table {dbname}.t1
|
|
(ts timestamp, c1 int, c2 float, c3 varchar(256), c4 geometry(512))
|
|
'''
|
|
)
|
|
tdSql.execute(
|
|
f'''create table {dbname}.stb1
|
|
(ts timestamp, c1 int, c2 float, c3 varchar(256), c4 geometry(512)) tags (t1 int)
|
|
'''
|
|
)
|
|
for i in range(2):
|
|
tdSql.execute(f'create table {dbname}.ct{i+1} using {dbname}.stb1 tags ( {i+1} )')
|
|
|
|
values = f'''
|
|
(now()-1s, 1, 1.1, '{self.point}', '{self.point}')
|
|
(now(), 2, 2.2, '{self.lineString}', '{self.lineString}')
|
|
(now()+1s, 3, 3.3, '{self.polygon}', '{self.polygon}')
|
|
(now()+2s, 4, 4.4, NULL, NULL)
|
|
'''
|
|
tdSql.execute(f"insert into {dbname}.t1 values{values}")
|
|
tdSql.execute(f"insert into {dbname}.ct1 values{values}")
|
|
tdSql.execute(f"insert into {dbname}.ct2 values{values}")
|
|
|
|
# the following errors would happen when casting a string to GEOMETRY by ST_GeomFromText(), but raise an error as syntax error
|
|
# wrong WTK
|
|
tdSql.error(f"insert into {dbname}.ct2 values(now(), 1, 1.1, NULL, 'POIN(1.0 1.5)')", self.errno_TSC_SQL_SYNTAX_ERROR)
|
|
# wrong WTK at all
|
|
tdSql.error(f"insert into {dbname}.ct2 values(now(), 1, 1.1, NULL, 'XXX')", self.errno_TSC_SQL_SYNTAX_ERROR)
|
|
# empty WTK
|
|
tdSql.error(f"insert into {dbname}.ct2 values(now(), 1, 1.1, NULL, '')", self.errno_TSC_SQL_SYNTAX_ERROR)
|
|
# wrong type
|
|
tdSql.error(f"insert into {dbname}.ct2 values(now(), 1, 1.1, NULL, 2)", self.errno_TSC_SQL_SYNTAX_ERROR)
|
|
|
|
def geomFromText_test(self, dbname = "db"):
|
|
# [ToDo] remove ST_AsText() calling in geomFromText_test once GEOMETRY type is supported in taos-connector-python
|
|
|
|
# column input, including NULL value
|
|
tdSql.query(f"select ST_AsText(ST_GeomFromText(c3)), ST_AsText(c4) from {dbname}.t1")
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkEqual(tdSql.queryResult[i][0], tdSql.queryResult[i][1])
|
|
|
|
# constant input
|
|
tdSql.query(f"select ST_AsText(ST_GeomFromText('{self.point}'))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], self.point)
|
|
|
|
# empty input
|
|
tdSql.query(f"select ST_AsText(ST_GeomFromText(''))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
# NULL input
|
|
tdSql.query(f"select ST_AsText(ST_GeomFromText(NULL))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
# wrong type input
|
|
tdSql.error(f"select ST_GeomFromText(2)", self.errno_FUNTION_PARA_TYPE)
|
|
tdSql.error(f"select ST_GeomFromText(c1) from {dbname}.t1", self.errno_FUNTION_PARA_TYPE)
|
|
|
|
# wrong number of params input
|
|
tdSql.error(f"select ST_GeomFromText()", self.errno_PAR_SYNTAX_ERROR)
|
|
tdSql.error(f"select ST_GeomFromText(c3, c3) from {dbname}.t1", self.errno_FUNTION_PARA_NUM)
|
|
|
|
# wrong param content input
|
|
# lack of the last letter of 'POINT'
|
|
tdSql.error(f"select ST_GeomFromText('POIN(1.0 1.5)')", self.errno_FUNTION_PARA_VALUE)
|
|
# redundant comma at the end
|
|
tdSql.error(f"select ST_GeomFromText('LINESTRING(1.0 1.0, 2.0 2.0, 5.0 5.0,)')", self.errno_FUNTION_PARA_VALUE)
|
|
# the first point and last one are not same
|
|
tdSql.error(f"select ST_GeomFromText('POLYGON((3.0 6.0, 5.0 6.0, 5.0 8.0, 3.0 8.0))')", self.errno_FUNTION_PARA_VALUE)
|
|
# wrong WTK at all
|
|
tdSql.error(f"select ST_GeomFromText('XXX')", self.errno_FUNTION_PARA_VALUE)
|
|
|
|
def asText_test(self, dbname = "db"):
|
|
# column input, including NULL value
|
|
tdSql.query(f"select c3, ST_AsText(c4) from {dbname}.ct1")
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkEqual(tdSql.queryResult[i][0], tdSql.queryResult[i][1])
|
|
|
|
# constant input
|
|
tdSql.query(f"select ST_AsText(c4) from {dbname}.ct1 where c1 = 1")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], self.point)
|
|
|
|
# empty input should NOT happen for GEOMETRY type
|
|
|
|
# NULL input
|
|
tdSql.query(f"select ST_AsText(NULL)")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
# wrong type input
|
|
tdSql.error(f"select ST_AsText('XXX')", self.errno_FUNTION_PARA_TYPE)
|
|
tdSql.error(f"select ST_AsText(c2) from {dbname}.ct1", self.errno_FUNTION_PARA_TYPE)
|
|
|
|
# wrong number of params input
|
|
tdSql.error(f"select ST_AsText() from {dbname}.ct1", self.errno_PAR_SYNTAX_ERROR)
|
|
tdSql.error(f"select ST_AsText(c4, c4) from {dbname}.ct1", self.errno_FUNTION_PARA_NUM)
|
|
|
|
# wrong param content input should NOT happen for GEOMETRY type
|
|
|
|
def geomRelationFunc_test(self, geomRelationFuncName, expectedResults, dbname = "db"):
|
|
# two columns input, including NULL value
|
|
tdSql.query(f"select {geomRelationFuncName}(ST_GeomFromText(c3), c4) from {dbname}.t1")
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkData(i, 0, expectedResults[0][i])
|
|
|
|
# constant and column input
|
|
tdSql.query(f"select {geomRelationFuncName}(ST_GeomFromText('{self.point}'), c4) from {dbname}.t1")
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkData(i, 0, expectedResults[1][i])
|
|
|
|
# column and constant input
|
|
tdSql.query(f"select {geomRelationFuncName}(c4, ST_GeomFromText('{self.point}')) from {dbname}.t1")
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkData(i, 0, expectedResults[2][i])
|
|
|
|
# two constants input
|
|
tdSql.query(f"select {geomRelationFuncName}(ST_GeomFromText('{self.point}'), ST_GeomFromText('{self.lineString}'))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], expectedResults[3])
|
|
|
|
tdSql.query(f"select {geomRelationFuncName}(ST_GeomFromText('{self.polygon}'), ST_GeomFromText('{self.point}'))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], expectedResults[4])
|
|
|
|
# NULL type input
|
|
tdSql.query(f"select {geomRelationFuncName}(NULL, ST_GeomFromText('{self.point}'))")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
tdSql.query(f"select {geomRelationFuncName}(ST_GeomFromText('{self.lineString}'), NULL)")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
tdSql.query(f"select {geomRelationFuncName}(NULL, NULL)")
|
|
tdSql.checkEqual(tdSql.queryResult[0][0], None)
|
|
|
|
# wrong type input
|
|
tdSql.error(f"select {geomRelationFuncName}(c1, c4) from {dbname}.t1", self.errno_FUNTION_PARA_TYPE)
|
|
tdSql.error(f"select {geomRelationFuncName}(c4, c2) from {dbname}.t1", self.errno_FUNTION_PARA_TYPE)
|
|
tdSql.error(f"select {geomRelationFuncName}(c4, 'XXX') from {dbname}.t1", self.errno_FUNTION_PARA_TYPE)
|
|
|
|
# wrong number of params input
|
|
tdSql.error(f"select {geomRelationFuncName}(c4) from {dbname}.t1", self.errno_FUNTION_PARA_NUM)
|
|
tdSql.error(f"select {geomRelationFuncName}(ST_GeomFromText(c3), c4, c4) from {dbname}.t1", self.errno_FUNTION_PARA_NUM)
|
|
|
|
# used in where clause
|
|
tdSql.query(f"select c3 from {dbname}.t1 where {geomRelationFuncName}(ST_GeomFromText('{self.point}'), c4)=true")
|
|
tdSql.checkEqual(tdSql.queryRows, expectedResults[5][0])
|
|
for i in range(tdSql.queryRows):
|
|
tdSql.checkData(i, 0, expectedResults[5][i+1])
|
|
|
|
def run(self):
|
|
tdSql.prepare()
|
|
|
|
tdLog.printNoPrefix("==========step1: create tables and insert data")
|
|
self.prepare_data()
|
|
|
|
tdLog.printNoPrefix("==========step2: ST_GeomFromText function test")
|
|
self.geomFromText_test()
|
|
|
|
tdLog.printNoPrefix("==========step3: ST_AsText function test")
|
|
self.asText_test()
|
|
|
|
tdLog.printNoPrefix("==========step4: ST_Intersects function test")
|
|
expectedResults = [
|
|
[True, True, True, None], # two columns
|
|
[True, False, True, None], # constant and column
|
|
[True, False, True, None], # column and constant
|
|
False, # two constants 1
|
|
True, # two constants 2
|
|
[2, self.point, self.polygon] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_Intersects', expectedResults)
|
|
|
|
tdLog.printNoPrefix("==========step5: ST_Equals function test")
|
|
expectedResults = [
|
|
[True, True, True, None], # two columns
|
|
[True, False, False, None], # constant and column
|
|
[True, False, False, None], # column and constant
|
|
False, # two constants 1
|
|
False, # two constants 2
|
|
[1, self.point] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_Equals', expectedResults)
|
|
|
|
tdLog.printNoPrefix("==========step6: ST_Touches function test")
|
|
expectedResults = [
|
|
[False, False, False, None], # two columns
|
|
[False, False, True, None], # constant and column
|
|
[False, False, True, None], # column and constant
|
|
False, # two constants 1
|
|
True, # two constants 2
|
|
[1, self.polygon] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_Touches', expectedResults)
|
|
|
|
tdLog.printNoPrefix("==========step7: ST_Covers function test")
|
|
expectedResults = [
|
|
[True, True, True, None], # two columns
|
|
[True, False, False, None], # constant and column
|
|
[True, False, True, None], # column and constant
|
|
False, # two constants 1
|
|
True, # two constants 2
|
|
[1, self.point] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_Covers', expectedResults)
|
|
|
|
tdLog.printNoPrefix("==========step8: ST_Contains function test")
|
|
expectedResults = [
|
|
[True, True, True, None], # two columns
|
|
[True, False, False, None], # constant and column
|
|
[True, False, False, None], # column and constant
|
|
False, # two constants 1
|
|
False, # two constants 2
|
|
[1, self.point] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_Contains', expectedResults)
|
|
|
|
tdLog.printNoPrefix("==========step9: ST_ContainsProperly function test")
|
|
expectedResults = [
|
|
[True, False, False, None], # two columns
|
|
[True, False, False, None], # constant and column
|
|
[True, False, False, None], # column and constant
|
|
False, # two constants 1
|
|
False, # two constants 2
|
|
[1, self.point] # in where clause
|
|
]
|
|
self.geomRelationFunc_test('ST_ContainsProperly', expectedResults)
|
|
|
|
def stop(self):
|
|
tdSql.close()
|
|
tdLog.success(f"{__file__} successfully executed")
|
|
|
|
tdCases.addLinux(__file__, TDTestCase())
|
|
tdCases.addWindows(__file__, TDTestCase())
|