Support SQL on data objects without PyReader

chdb-io · May 30, 2024 · ddb1db3 · ddb1db3
1 parent 8c0f656
commit ddb1db3
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 264 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -193,7 +193,7 @@ if (TARGET ch_contrib::jemalloc)
     target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::jemalloc)
 endif()
 
-target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::sparsehash ch_contrib::incbin)
+target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::sparsehash ch_contrib::incbin ch_contrib::icu)
 
 add_subdirectory(Access/Common)
 add_subdirectory(Common/ZooKeeper)
@@ -284,6 +284,7 @@ endforeach()
 set_source_files_properties(Storages/StoragePython.cpp PROPERTIES INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
 set_source_files_properties(Processors/Sources/PythonSource.cpp PROPERTIES INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
 set_source_files_properties(Columns/ColumnPyObject.cpp PROPERTIES INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
+set_source_files_properties(Common/PythonUtils.cpp PROPERTIES INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
 
 # get python version, something like python3.x
 execute_process(COMMAND python3 -c "import sys; print('python3.'+str(sys.version_info[1]))"
@@ -308,6 +309,9 @@ if (OS_LINUX)
         set_source_files_properties(Columns/ColumnPyObject.cpp PROPERTIES COMPILE_FLAGS
             "-w -idirafter /usr/include -include crypt.h"
         )
+        set_source_files_properties(Common/PythonUtils.cpp PROPERTIES COMPILE_FLAGS
+            "-w -idirafter /usr/include -include crypt.h"
+        )
     else()
         set_source_files_properties(Storages/StoragePython.cpp PROPERTIES COMPILE_FLAGS
             "-w"
@@ -318,6 +322,9 @@ if (OS_LINUX)
         set_source_files_properties(Columns/ColumnPyObject.cpp PROPERTIES COMPILE_FLAGS
             "-w"
         )
+        set_source_files_properties(Common/PythonUtils.cpp PROPERTIES COMPILE_FLAGS
+            "-w"
+        )
     endif()
 elseif (OS_DARWIN)
     set_source_files_properties(Storages/StoragePython.cpp PROPERTIES COMPILE_FLAGS 
@@ -329,6 +336,9 @@ elseif (OS_DARWIN)
     set_source_files_properties(Columns/ColumnPyObject.cpp PROPERTIES COMPILE_FLAGS 
         "-w"
     )
+    set_source_files_properties(Common/PythonUtils.cpp PROPERTIES COMPILE_FLAGS 
+        "-w"
+    )
 endif()
 
 set (all_modules dbms)