Skip to content

Commit ea919f8

Browse files
duckdblabs-botgithub-actions[bot]
authored andcommitted
Update vendored DuckDB sources to 5f0c38c5eb
1 parent 9ae5d43 commit ea919f8

File tree

6 files changed

+31
-6
lines changed

6 files changed

+31
-6
lines changed

src/duckdb/src/execution/operator/scan/physical_table_scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ bool PhysicalTableScan::Equals(const PhysicalOperator &other_p) const {
259259
return false;
260260
}
261261
auto &other = other_p.Cast<PhysicalTableScan>();
262-
if (function.function != other.function.function) {
262+
if (function != other.function) {
263263
return false;
264264
}
265265
if (column_ids != other.column_ids) {

src/duckdb/src/execution/physical_plan/plan_filter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ PhysicalOperator &PhysicalPlanGenerator::CreatePlan(LogicalFilter &op) {
1414
D_ASSERT(op.children.size() == 1);
1515
reference<PhysicalOperator> plan = CreatePlan(*op.children[0]);
1616
if (!op.expressions.empty()) {
17-
D_ASSERT(!plan.get().GetTypes().empty());
1817
// create a filter if there is anything to filter
1918
auto &filter = Make<PhysicalFilter>(plan.get().GetTypes(), std::move(op.expressions), op.estimated_cardinality);
2019
filter.children.push_back(plan);

src/duckdb/src/function/table/version/pragma_version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "2"
2+
#define DUCKDB_PATCH_VERSION "3-dev8"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.2"
11+
#define DUCKDB_VERSION "v1.4.3-dev8"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "68d7555f68"
14+
#define DUCKDB_SOURCE_ID "5f0c38c5eb"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/function/table_function.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,30 @@ TableFunction::TableFunction(const vector<LogicalType> &arguments, table_functio
3737
TableFunction::TableFunction() : TableFunction("", {}, nullptr, nullptr, nullptr, nullptr) {
3838
}
3939

40+
bool TableFunction::operator==(const TableFunction &rhs) const {
41+
return name == rhs.name && arguments == rhs.arguments && varargs == rhs.varargs && bind == rhs.bind &&
42+
bind_replace == rhs.bind_replace && bind_operator == rhs.bind_operator && init_global == rhs.init_global &&
43+
init_local == rhs.init_local && function == rhs.function && in_out_function == rhs.in_out_function &&
44+
in_out_function_final == rhs.in_out_function_final && statistics == rhs.statistics &&
45+
dependency == rhs.dependency && cardinality == rhs.cardinality &&
46+
pushdown_complex_filter == rhs.pushdown_complex_filter && pushdown_expression == rhs.pushdown_expression &&
47+
to_string == rhs.to_string && dynamic_to_string == rhs.dynamic_to_string &&
48+
table_scan_progress == rhs.table_scan_progress && get_partition_data == rhs.get_partition_data &&
49+
get_bind_info == rhs.get_bind_info && type_pushdown == rhs.type_pushdown &&
50+
get_multi_file_reader == rhs.get_multi_file_reader && supports_pushdown_type == rhs.supports_pushdown_type &&
51+
get_partition_info == rhs.get_partition_info && get_partition_stats == rhs.get_partition_stats &&
52+
get_virtual_columns == rhs.get_virtual_columns && get_row_id_columns == rhs.get_row_id_columns &&
53+
serialize == rhs.serialize && deserialize == rhs.deserialize &&
54+
verify_serialization == rhs.verify_serialization && projection_pushdown == rhs.projection_pushdown &&
55+
filter_pushdown == rhs.filter_pushdown && filter_prune == rhs.filter_prune &&
56+
sampling_pushdown == rhs.sampling_pushdown && late_materialization == rhs.late_materialization &&
57+
global_initialization == rhs.global_initialization;
58+
}
59+
60+
bool TableFunction::operator!=(const TableFunction &rhs) const {
61+
return !(*this == rhs);
62+
}
63+
4064
bool TableFunction::Equal(const TableFunction &rhs) const {
4165
// number of types
4266
if (this->arguments.size() != rhs.arguments.size()) {

src/duckdb/src/include/duckdb/function/table_function.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,8 @@ class TableFunction : public SimpleNamedParameterFunction { // NOLINT: work-arou
432432
TableFunctionInitialization global_initialization = TableFunctionInitialization::INITIALIZE_ON_EXECUTE;
433433

434434
DUCKDB_API bool Equal(const TableFunction &rhs) const;
435+
DUCKDB_API bool operator==(const TableFunction &rhs) const;
436+
DUCKDB_API bool operator!=(const TableFunction &rhs) const;
435437
};
436438

437439
} // namespace duckdb

src/duckdb/src/planner/binder/query_node/plan_select_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ unique_ptr<LogicalOperator> Binder::CreatePlan(BoundSelectNode &statement) {
3030
root = PlanFilter(std::move(statement.where_clause), std::move(root));
3131
}
3232

33-
if (!statement.aggregates.empty() || !statement.groups.group_expressions.empty()) {
33+
if (!statement.aggregates.empty() || !statement.groups.group_expressions.empty() || statement.having) {
3434
if (!statement.groups.group_expressions.empty()) {
3535
// visit the groups
3636
for (auto &group : statement.groups.group_expressions) {

0 commit comments

Comments
 (0)