Skip to content

[Backport] Fix QueryContext race condition #13281

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

Merged
kfaraz merged 1 commit into from
Oct 29, 2022
Merged

[Backport] Fix QueryContext race condition #13281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sql/src/main/java/org/apache/druid/sql/avatica/DruidConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public DruidJdbcStatement createStatement(SqlStatementFactory sqlStatementFactor
final DruidJdbcStatement statement = new DruidJdbcStatement(
connectionId,
statementId,
context,
context.copy(),
Copy link
Copy Markdown
Member

@xvrl xvrl Oct 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a comment might be useful here

sqlStatementFactory
);

Expand All @@ -109,7 +109,7 @@ public DruidJdbcStatement createStatement(SqlStatementFactory sqlStatementFactor

public DruidJdbcPreparedStatement createPreparedStatement(
SqlStatementFactory sqlStatementFactory,
SqlQueryPlus sqlRequest,
SqlQueryPlus sqlQueryPlus,
final long maxRowCount)
{
final int statementId = statementCounter.incrementAndGet();
Expand All @@ -127,7 +127,7 @@ public DruidJdbcPreparedStatement createPreparedStatement(

@SuppressWarnings("GuardedBy")
final PreparedStatement statement = sqlStatementFactory.preparedStatement(
sqlRequest.withContext(context)
sqlQueryPlus.withContext(context.copy())
Copy link
Copy Markdown
Member

@xvrl xvrl Oct 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

);
final DruidJdbcPreparedStatement jdbcStmt = new DruidJdbcPreparedStatement(
connectionId,
Expand Down