Skip to content

Commit

Permalink
Merge pull request ClickHouse#56867 from kitaisreal/planner-support-t…
Browse files Browse the repository at this point in the history
…ransactions

Planner support transactions
  • Loading branch information
KochetovNicolai committed Nov 20, 2023
2 parents 0eaf83b + b102c8e commit 2a59a68
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
16 changes: 7 additions & 9 deletions src/Planner/Planner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ namespace
void checkStoragesSupportTransactions(const PlannerContextPtr & planner_context)
{
const auto & query_context = planner_context->getQueryContext();
if (query_context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
if (!query_context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
return;

if (!query_context->getCurrentTransaction())
Expand All @@ -130,13 +130,11 @@ void checkStoragesSupportTransactions(const PlannerContextPtr & planner_context)
else if (auto * table_function_node = table_expression->as<TableFunctionNode>())
storage = table_function_node->getStorage();

if (storage->supportsTransactions())
continue;

throw Exception(ErrorCodes::NOT_IMPLEMENTED,
"Storage {} (table {}) does not support transactions",
storage->getName(),
storage->getStorageID().getNameForLogs());
if (storage && !storage->supportsTransactions())
throw Exception(ErrorCodes::NOT_IMPLEMENTED,
"Storage {} (table {}) does not support transactions",
storage->getName(),
storage->getStorageID().getNameForLogs());
}
}

Expand Down Expand Up @@ -1334,9 +1332,9 @@ void Planner::buildPlanForQueryNode()
query_node.getHaving() = {};
}

checkStoragesSupportTransactions(planner_context);
collectSets(query_tree, *planner_context);
collectTableExpressionData(query_tree, planner_context);
checkStoragesSupportTransactions(planner_context);

if (!select_query_options.only_analyze)
collectFiltersForAnalysis(query_tree, planner_context);
Expand Down
2 changes: 0 additions & 2 deletions tests/analyzer_tech_debt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
01064_incremental_streaming_from_2_src_with_feedback
01083_expressions_in_engine_arguments
01155_rename_move_materialized_view
01173_transaction_control_queries
01214_test_storage_merge_aliases_with_where
01244_optimize_distributed_group_by_sharding_key
01268_mv_scalars
Expand All @@ -26,7 +25,6 @@
02139_MV_with_scalar_subquery
02174_cte_scalar_cache_mv
02302_s3_file_pruning
02345_implicit_transaction
02352_grouby_shadows_arg
02354_annoy
02428_parameterized_view
Expand Down

0 comments on commit 2a59a68

Please sign in to comment.