Skip to content

Commit

Permalink
vendor: Update vendored sources to duckdb/duckdb@8869b59 (#944)
Browse files Browse the repository at this point in the history
remove duplicate FastMem copies in binary (duckdb/duckdb#15470)

Co-authored-by: krlmlr <[email protected]>
  • Loading branch information
github-actions[bot] and krlmlr authored Jan 3, 2025
1 parent 150e4cc commit 43ee139
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "4-dev3939"
#define DUCKDB_PATCH_VERSION "4-dev3941"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 1
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.1.4-dev3939"
#define DUCKDB_VERSION "v1.1.4-dev3941"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "61d1e92f27"
#define DUCKDB_SOURCE_ID "8869b59d17"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
12 changes: 6 additions & 6 deletions src/duckdb/src/include/duckdb/common/fast_mem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
#include "duckdb/common/types.hpp"

template <size_t SIZE>
static inline void MemcpyFixed(void *dest, const void *src) {
inline void MemcpyFixed(void *dest, const void *src) {
memcpy(dest, src, SIZE);
}

template <size_t SIZE>
static inline int MemcmpFixed(const void *str1, const void *str2) {
inline int MemcmpFixed(const void *str1, const void *str2) {
return memcmp(str1, str2, SIZE);
}

template <size_t SIZE>
static inline void MemsetFixed(void *ptr, int value) {
inline void MemsetFixed(void *ptr, int value) {
memset(ptr, value, SIZE);
}

Expand All @@ -30,7 +30,7 @@ namespace duckdb {
//! This templated memcpy is significantly faster than std::memcpy,
//! but only when you are calling memcpy with a const size in a loop.
//! For instance `while (<cond>) { memcpy(<dest>, <src>, const_size); ... }`
static inline void FastMemcpy(void *dest, const void *src, const size_t size) {
inline void FastMemcpy(void *dest, const void *src, const size_t size) {
// LCOV_EXCL_START
switch (size) {
case 0:
Expand Down Expand Up @@ -556,7 +556,7 @@ static inline void FastMemcpy(void *dest, const void *src, const size_t size) {
//! This templated memcmp is significantly faster than std::memcmp,
//! but only when you are calling memcmp with a const size in a loop.
//! For instance `while (<cond>) { memcmp(<str1>, <str2>, const_size); ... }`
static inline int FastMemcmp(const void *str1, const void *str2, const size_t size) {
inline int FastMemcmp(const void *str1, const void *str2, const size_t size) {
// LCOV_EXCL_START
switch (size) {
case 0:
Expand Down Expand Up @@ -695,7 +695,7 @@ static inline int FastMemcmp(const void *str1, const void *str2, const size_t si
// LCOV_EXCL_STOP
}

static inline void FastMemset(void *ptr, int value, size_t size) {
inline void FastMemset(void *ptr, int value, size_t size) {
// LCOV_EXCL_START
switch (size) {
case 0:
Expand Down

0 comments on commit 43ee139

Please sign in to comment.