Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@53d00e5
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#13114 from flashmouse/trivial_list_value_logic_seq
  • Loading branch information
krlmlr committed Jul 23, 2024
1 parent d42c623 commit f1deae2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
11 changes: 5 additions & 6 deletions src/duckdb/src/core_functions/scalar/list/list_value.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,18 @@ static void TemplatedListValueFunctionFallback(DataChunk &args, Vector &result)
static void ListValueFunction(DataChunk &args, ExpressionState &state, Vector &result) {
D_ASSERT(result.GetType().id() == LogicalTypeId::LIST);
result.SetVectorType(VectorType::CONSTANT_VECTOR);
for (idx_t i = 0; i < args.ColumnCount(); i++) {
if (args.data[i].GetVectorType() != VectorType::CONSTANT_VECTOR) {
result.SetVectorType(VectorType::FLAT_VECTOR);
}
}
if (args.ColumnCount() == 0) {
// no columns - early out - result is a constant empty list
auto result_data = FlatVector::GetData<list_entry_t>(result);
result_data[0].length = 0;
result_data[0].offset = 0;
result.SetVectorType(VectorType::CONSTANT_VECTOR);
return;
}
for (idx_t i = 0; i < args.ColumnCount(); i++) {
if (args.data[i].GetVectorType() != VectorType::CONSTANT_VECTOR) {
result.SetVectorType(VectorType::FLAT_VECTOR);
}
}
auto &result_type = ListVector::GetEntry(result).GetType();
switch (result_type.InternalType()) {
case PhysicalType::BOOL:
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 "1-dev3270"
#define DUCKDB_PATCH_VERSION "1-dev3272"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 0
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.0.1-dev3270"
#define DUCKDB_VERSION "v1.0.1-dev3272"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "40e2fcd05a"
#define DUCKDB_SOURCE_ID "53d00e5048"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit f1deae2

Please sign in to comment.