Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@cc067e6 (#507)
Browse files Browse the repository at this point in the history
delay the rewrite of a large IN-clause into a MarkJoin on remote Filter-Scans (duckdb/duckdb#14266)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and krlmlr authored Oct 17, 2024
1 parent f576b45 commit ab3e7c8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 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 "2-dev199"
#define DUCKDB_PATCH_VERSION "2-dev204"
#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.2-dev199"
#define DUCKDB_VERSION "v1.1.2-dev204"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "d2dfc60906"
#define DUCKDB_SOURCE_ID "cc067e6b7d"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
7 changes: 7 additions & 0 deletions src/duckdb/src/optimizer/in_clause_rewriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@
#include "duckdb/planner/expression/bound_operator_expression.hpp"
#include "duckdb/planner/operator/logical_column_data_get.hpp"
#include "duckdb/planner/operator/logical_comparison_join.hpp"
#include "duckdb/planner/operator/logical_get.hpp"
#include "duckdb/execution/expression_executor.hpp"

namespace duckdb {

unique_ptr<LogicalOperator> InClauseRewriter::Rewrite(unique_ptr<LogicalOperator> op) {
if (op->children.size() == 1) {
if (op->children[0]->type == LogicalOperatorType::LOGICAL_GET) {
auto &get = op->children[0]->Cast<LogicalGet>();
if (get.function.to_string && get.function.to_string(get.bind_data.get()) == "REMOTE") {
return op;
}
}
root = std::move(op->children[0]);
VisitOperatorExpressions(*op);
op->children[0] = std::move(root);
Expand Down

0 comments on commit ab3e7c8

Please sign in to comment.