Skip to content

sql: disable optimizer if force-lookup-joins flag set#26516

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:lookup-join-no-opt
Jun 7, 2018
Merged

sql: disable optimizer if force-lookup-joins flag set#26516
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:lookup-join-no-opt

Conversation

@RaduBerinde
Copy link
Copy Markdown
Member

The experimental flag to force lookup joins doesn't work with the
optimizer (it is disabled on opt-generated plans). To allow the flag
to still function for now, we disable the optimizer if the flag is
set.

Release note: None

The experimental flag to force lookup joins doesn't work with the
optimizer (it is disabled on opt-generated plans). To allow the flag
to still function for now, we disable the optimizer if the flag is
set.

Release note: None
@RaduBerinde RaduBerinde requested review from a team and andy-kimball June 7, 2018 17:21
@RaduBerinde RaduBerinde requested a review from a team as a code owner June 7, 2018 17:21
@RaduBerinde RaduBerinde requested a review from a team June 7, 2018 17:21
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@andy-kimball
Copy link
Copy Markdown
Contributor

:lgtm:


Review status: 0 of 2 files reviewed at latest revision, all discussions resolved, some commit checks pending.


Comments from Reviewable

@RaduBerinde
Copy link
Copy Markdown
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Jun 7, 2018
26479: kv: stop the heartbeat loop on rollback errors r=andreimatei a=andreimatei

A txn's heartbeat loop is generally stopped when, upon a successful
request, the response's txn is no longer PENDING. This was insufficient;
the loop should always be closed after an EndTransaction(commit=false),
regardless of whether it results in success or error.
The heartbeat loop happens to be currently closed by the context
cancelation that the db.Txn() API performs, but that is going away.

This fixes #26434 - TestTxnCoordSenderRetries had become flaky after #25541
because #25441 caused EndTransactions to be sent in some situations
where they weren't before. What's going on in that test is that a
subtest was leaking a heartbeat loop that was stopped after the subtest
finished; the EndTxn sent when the loop finally was being stopped was
interfering with a CommandFilter installed by a different subtest.
Before #25441, the first subtest was waiting for the heartbeat loop to
be done because of its own CommandFilter. However, with #25441, the
first subtest's CommandFilter was being satisfied by a different, newly
introduced EndTransaction.

Release note: None

26516: sql: disable optimizer if force-lookup-joins flag set r=RaduBerinde a=RaduBerinde

The experimental flag to force lookup joins doesn't work with the
optimizer (it is disabled on opt-generated plans). To allow the flag
to still function for now, we disable the optimizer if the flag is
set.

Release note: None

Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 7, 2018

Build succeeded

@craig craig bot merged commit 29a54cf into cockroachdb:master Jun 7, 2018
@RaduBerinde RaduBerinde deleted the lookup-join-no-opt branch June 7, 2018 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants