Merge branch 'main' into fix/python-udf-refcount-leak

Author: evertlammerts

CMakeLists.txt

@@ -6,6 +6,7 @@ project(duckdb_py LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 # Set the library name
 set(DUCKDB_PYTHON_LIB_NAME "_duckdb")

_duckdb-stubs/__init__.pyi

@@ -461,7 +461,9 @@ class DuckDBPyRelation:
     def __getattr__(self, name: str) -> DuckDBPyRelation: ...
     def __getitem__(self, name: str) -> DuckDBPyRelation: ...
     def __len__(self) -> int: ...
-    def aggregate(self, aggr_expr: Expression | str, group_expr: Expression | str = "") -> DuckDBPyRelation: ...
+    def aggregate(
+        self, aggr_expr: Expression | str | list[Expression], group_expr: Expression | str = ""
+    ) -> DuckDBPyRelation: ...
     def any_value(
         self, column: str, groups: str = "", window_spec: str = "", projected_columns: str = ""
     ) -> DuckDBPyRelation: ...

cmake/duckdb_loader.cmake

@@ -114,25 +114,18 @@ function(_duckdb_validate_jemalloc_config)
     return()
   endif()
 
-  # jemalloc is only allowed in linux and osx debug builds
-  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(supported_os TRUE)
-  else()
-    set(supported_os FALSE)
-  endif()
-
-  # jemalloc is only allowed in debug builds
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND supported_os)
+  # jemalloc is only enabled on 64bit x86 linux builds
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8
+     AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
+     AND NOT BSD)
     set(jemalloc_allowed TRUE)
   else()
     set(jemalloc_allowed FALSE)
   endif()
 
   if(NOT jemalloc_allowed)
-    message(
-      WARNING
-        "jemalloc extension is only supported on Linux and OSX in Debug builds.\n"
-        "Removing jemalloc from extension list.")
+    message(WARNING "jemalloc extension is only supported on Linux.\n"
+                    "Removing jemalloc from extension list.")
     # Remove jemalloc from the extension list
     string(REPLACE "jemalloc" "" BUILD_EXTENSIONS_FILTERED
                    "${BUILD_EXTENSIONS}")
@@ -187,19 +180,17 @@ function(_duckdb_create_interface_target target_name)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_options(
       ${target_name}
-      INTERFACE
-        /wd4244 # suppress Conversion from 'type1' to 'type2', possible loss of
-                # data
-        /wd4267 # suppress Conversion from ‘size_t’ to ‘type’, possible loss of
-                # data
-        /wd4200 # suppress Nonstandard extension used: zero-sized array in
-                # struct/union
-        /wd26451
-        /wd26495 # suppress Code Analysis
-        /D_CRT_SECURE_NO_WARNINGS # suppress warnings about unsafe functions
-        /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # see
-                                               # https://github.com/duckdblabs/duckdb-internal/issues/5151
-        /utf-8 # treat source files as UTF-8 encoded
+      INTERFACE /wd4244 # suppress Conversion from 'type1' to 'type2', possible
+                        # loss of data
+                /wd4267 # suppress Conversion from ‘size_t’ to ‘type’, possible
+                        # loss of data
+                /wd4200 # suppress Nonstandard extension used: zero-sized array
+                        # in struct/union
+                /wd26451
+                /wd26495 # suppress Code Analysis
+                /D_CRT_SECURE_NO_WARNINGS # suppress warnings about unsafe
+                                          # functions
+                /utf-8 # treat source files as UTF-8 encoded
     )
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     target_compile_options(