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
166 lines
4.6 KiB
CMake
166 lines
4.6 KiB
CMake
aux_source_directory(src FUNCTION_SRC)
|
|
aux_source_directory(src/detail FUNCTION_SRC_DETAIL)
|
|
list(REMOVE_ITEM FUNCTION_SRC src/udfd.c)
|
|
add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL})
|
|
target_include_directories(
|
|
function
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/contrib/libuv/include"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
|
|
SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
|
|
ELSE ()
|
|
SET(LINK_JEMALLOC "")
|
|
ENDIF ()
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(function jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
function
|
|
PRIVATE os
|
|
PRIVATE util
|
|
PRIVATE common
|
|
PRIVATE nodes
|
|
PRIVATE qcom
|
|
PRIVATE scalar
|
|
PRIVATE geometry
|
|
PRIVATE transport
|
|
PRIVATE stream ${LINK_JEMALLOC}
|
|
PUBLIC uv_a
|
|
)
|
|
|
|
add_executable(runUdf test/runUdf.c)
|
|
target_include_directories(
|
|
runUdf
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/contrib/libuv/include"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/include/os"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(runUdf jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
runUdf
|
|
PUBLIC uv_a
|
|
PRIVATE os util common nodes function ${LINK_JEMALLOC}
|
|
)
|
|
|
|
add_library(udf1 STATIC MODULE test/udf1.c)
|
|
target_include_directories(
|
|
udf1
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/include/os"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(udf1 jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
udf1 PUBLIC os ${LINK_JEMALLOC})
|
|
|
|
|
|
add_library(udf1_dup STATIC MODULE test/udf1_dup.c)
|
|
target_include_directories(
|
|
udf1_dup
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/include/os"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(udf1_dup jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
udf1_dup PUBLIC os ${LINK_JEMALLOC})
|
|
|
|
add_library(udf2 STATIC MODULE test/udf2.c)
|
|
target_include_directories(
|
|
udf2
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/include/os"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(udf2 jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
udf2 PUBLIC os ${LINK_JEMALLOC}
|
|
)
|
|
|
|
add_library(udf2_dup STATIC MODULE test/udf2_dup.c)
|
|
target_include_directories(
|
|
udf2_dup
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
"${TD_SOURCE_DIR}/include/os"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(udf2_dup jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
udf2_dup PUBLIC os ${LINK_JEMALLOC}
|
|
)
|
|
|
|
#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
|
|
add_executable(udfd src/udfd.c)
|
|
target_include_directories(
|
|
udfd
|
|
PUBLIC
|
|
"${TD_SOURCE_DIR}/include/libs/function"
|
|
"${TD_SOURCE_DIR}/contrib/libuv/include"
|
|
"${TD_SOURCE_DIR}/include/util"
|
|
"${TD_SOURCE_DIR}/include/common"
|
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
|
"${TD_SOURCE_DIR}/include/client"
|
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
|
)
|
|
|
|
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
ADD_DEPENDENCIES(udfd jemalloc)
|
|
ENDIF ()
|
|
|
|
target_link_libraries(
|
|
udfd
|
|
PUBLIC uv_a
|
|
PRIVATE os util common nodes function ${LINK_JEMALLOC}
|
|
)
|
|
|