Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/version.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by rconfigure.py, do not edit by hand
# DuckDB version information

duckdb_version <- "1.4.2-dev183"
duckdb_version <- "1.4.2-dev189"

# Function to get DuckDB version without establishing a connection
get_duckdb_version <- function() {
Expand Down
6 changes: 4 additions & 2 deletions src/duckdb/src/common/adbc/adbc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,8 @@ static int get_schema(struct ArrowArrayStream *stream, struct ArrowSchema *out)
auto count = duckdb_column_count(&result_wrapper->result);
std::vector<duckdb_logical_type> types(count);

std::vector<std::string> owned_names(count);
std::vector<std::string> owned_names;
owned_names.reserve(count);
duckdb::vector<const char *> names(count);
for (idx_t i = 0; i < count; i++) {
types[i] = duckdb_column_logical_type(&result_wrapper->result, i);
Expand Down Expand Up @@ -793,7 +794,8 @@ AdbcStatusCode StatementGetParameterSchema(struct AdbcStatement *statement, stru
count = 1;
}
std::vector<duckdb_logical_type> types(count);
std::vector<std::string> owned_names(count);
std::vector<std::string> owned_names;
owned_names.reserve(count);
duckdb::vector<const char *> names(count);

for (idx_t i = 0; i < count; i++) {
Expand Down
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 "2-dev183"
#define DUCKDB_PATCH_VERSION "2-dev189"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 4
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.4.2-dev183"
#define DUCKDB_VERSION "v1.4.2-dev189"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "1cba2e741b"
#define DUCKDB_SOURCE_ID "8169d4f15c"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/duckdb/src/storage/table/column_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,10 @@ void ColumnData::InitializeAppend(ColumnAppendState &state) {
void ColumnData::AppendData(BaseStatistics &append_stats, ColumnAppendState &state, UnifiedVectorFormat &vdata,
idx_t append_count) {
idx_t offset = 0;
this->count += append_count;
while (true) {
// append the data from the vector
idx_t copied_elements = state.current->Append(state, vdata, offset, append_count);
this->count += copied_elements;
append_stats.Merge(state.current->stats.statistics);
if (copied_elements == append_count) {
// finished copying everything
Expand Down