Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for #57598 (ROLLBACK should be no-op...) #60338

Merged
merged 10 commits into from Mar 19, 2024
Merged

fix for #57598 (ROLLBACK should be no-op...) #60338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e208907
fix for #57598 (ROLLBACK should be no-op...)
PapaToemmsn Feb 22, 2024
c68fd07
adjusted 01173_transaction_control_queries.sql to changed no transact…
PapaToemmsn Feb 23, 2024
6eafc21
Reveted 01173_transaction_control_queries.sql back to original state
PapaToemmsn Mar 13, 2024
723f860
COMMIT/ROLLBACK with no active transaction do not throw an exception …
PapaToemmsn Mar 13, 2024
36e5300
COMMIT/ROLLBACK with no active transaction do not throw an exception …
PapaToemmsn Mar 13, 2024
da3cb02
COMMIT/ROLLBACK with no active transaction do not throw an exception …
PapaToemmsn Mar 13, 2024
364fe95
fix style check errors
PapaToemmsn Mar 13, 2024
4f9702a
made 02989_mysql_transaction_test.sh executable
PapaToemmsn Mar 15, 2024
46a43fe
Merge branch 'ClickHouse:master' into test-transaction-fixes
PapaToemmsn Mar 18, 2024
fbc8a19
Merge branch 'ClickHouse:master' into test-transaction-fixes
PapaToemmsn Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/Interpreters/InterpreterTransactionControlQuery.cpp
View file
Open in desktop
Expand Up @@ -52,7 +52,12 @@ BlockIO InterpreterTransactionControlQuery::executeCommit(ContextMutablePtr sess
{
auto txn = session_context->getCurrentTransaction();
if (!txn)
throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
{
if (session_context->getClientInfo().interface == ClientInfo::Interface::MYSQL)
return {};
else
throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
}
if (txn->getState() != MergeTreeTransaction::RUNNING)
throw Exception(ErrorCodes::INVALID_TRANSACTION, "Transaction is not in RUNNING state");

Expand Down Expand Up @@ -111,7 +116,12 @@ BlockIO InterpreterTransactionControlQuery::executeRollback(ContextMutablePtr se
{
auto txn = session_context->getCurrentTransaction();
if (!txn)
throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
{
if (session_context->getClientInfo().interface == ClientInfo::Interface::MYSQL)
return {};
else
throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
}
if (txn->getState() == MergeTreeTransaction::COMMITTED)
throw Exception(ErrorCodes::LOGICAL_ERROR, "Transaction is in COMMITTED state");
if (txn->getState() == MergeTreeTransaction::COMMITTING)
Expand Down
2 changes: 2 additions & 0 deletions tests/queries/0_stateless/02989_mysql_transaction_test.reference
View file
Open in desktop
@@ -0,0 +1,2 @@
1
1
10 changes: 10 additions & 0 deletions tests/queries/0_stateless/02989_mysql_transaction_test.sh
View file
Open in desktop
@@ -0,0 +1,10 @@
#!/usr/bin/env bash
# Tags: no-fasttest
# Tag no-fasttest: requires mysql client

CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh

${MYSQL_CLIENT} --verbose --execute "COMMIT;" | grep -c "COMMIT"
${MYSQL_CLIENT} --verbose --execute "ROLLBACK;" | grep -c "ROLLBACK"