sql: prevent declarative-rules test churn when new versions are added #102127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #102126 Previously, adding new 23.2 version results in this test failure: ``` Failed === RUN TestDeclarativeRules/declarative_corpus_validation_standalone_command [debug declarative-print-rules 1.1 op] [debug declarative-print-rules 1000023.1-4 op] [debug declarative-print-rules 1000023.1-4 dep] declarative_print_rules_test.go:46: /home/roach/.cache/bazel/_bazel_roach/c5a4e7d36696d9cd970af2045211a7df/sandbox/processwrapper-sandbox/6812/execroot/com_github_cockroachdb_cockroach/bazel-out/k8-fastbuild/bin/pkg/cli/cli_test_/cli_test.runfiles/com_github_cockroachdb_cockroach/pkg/cli/testdata/declarative-rules/invalid_version:1: invalid_version [0 args] ----- ---- debug declarative-print-rules 1.1 op unsupported version number, the supported versions are: latest 1000022.2 declarative_print_rules_test.go:55: /home/roach/.cache/bazel/_bazel_roach/c5a4e7d36696d9cd970af2045211a7df/sandbox/processwrapper-sandbox/6812/execroot/com_github_cockroachdb_cockroach/bazel-out/k8-fastbuild/bin/pkg/cli/cli_test_/cli_test.runfiles/com_github_cockroachdb_cockroach/pkg/cli/testdata/declarative-rules/oprules:1: expected: debug declarative-print-rules 1000023.1-2 op rules ---- [] found: debug declarative-print-rules 1000023.1-4 op rules ---- [] --- FAIL: TestDeclarativeRules/declarative_corpus_validation_standalone_command (0.06s) ``` This change ignores the version string after the `-`. Release note: None
|
This change is |
fqazi
approved these changes
Apr 24, 2023
|
Tested in #101869 |
|
bors r=fqazi |
|
Build succeeded: |
craig bot
pushed a commit
that referenced
this pull request
Apr 26, 2023
97728: lease: Fixed a small if-condition for AcquireFreshestFromStore r=Xiang-Gu a=Xiang-Gu Previously, the condition is `if xx > 1` while it's enough to do `if xx > 0`. Epic: None 101869: sql: implement DESCENDING order PKs for row-level TTL r=rafiss a=ecwall Fixes #76912 Updates the schema change validation to allow TTL tables to have DESC PK columns. The functionality is version gated behind `V23_2TTLAllowDescPK`. Changes the TTL query bounds `WHERE` clause from this format: ``` AND (col1, col2) >= ($4, $5) AND (col1, col2) < ($2, $3) ``` to this format: ``` AND ( (col1 > $4) OR (col1 = $4 AND col2 >= $5) ) AND ( (col1 < $2) OR (col1 = $2 AND col2 < $3) ) ``` which allows for DESC order keys: ``` AND ( (col1 < $4) OR (col1 = $4 AND col2 <= $5) ) AND ( (col1 > $2) OR (col1 = $2 AND col2 > $3) ) ``` or mixed ASC/DESC order keys: ``` AND ( (col1 > $4) OR (col1 = $4 AND col2 <= $5) ) AND ( (col1 < $2) OR (col1 = $2 AND col2 > $3) ) ``` The `ORDER BY` clause also replaces implicit ascending ordering: ``` ORDER BY col1, col2 ``` with explicit ordering: ``` ORDER BY col1 ASC, col2 DESC ``` Release note (sql change): TTL supports DESC order primay key columns. Depends on ~#102030 ~#102127 102209: sqlstats: improve `GetPercentileValues` performance r=maryliag a=maryliag Previously, the function to Query the percentile values was also doing a flush of the stream. This was required because during Insights detector, everytime some data was added a query was done after, so a flush had to be done to guarantee precision. When making the usage of the same Query function for the `GetPercentileValues` it was still doing a flush, but that was not necessary, since there was no new data, and if there was the detector was going to take care of the flush. It could also be causing contention on the stream. Since there is no need for the flush when retrieving the info for sql stats, this commits updates the Query function to have an optional flush, that can be skipped on that case. Probably other improvements can be made on the existing path, but this PR focus on the performance degradations caused by the function `GetPercentileValues` and no behaviour change is made on other existing flows. Fixes #102208 Before <img width="1218" alt="current-total" src="https://user-images.githubusercontent.com/1017486/234451031-d37a85c0-b322-497b-8d0c-a8851a8cffe8.png"> After <img width="870" alt="op-flush-total" src="https://user-images.githubusercontent.com/1017486/234451041-5b9104a9-8663-4322-a2a2-f7a979bfa76b.png"> --- Before <img width="875" alt="current-pink" src="https://user-images.githubusercontent.com/1017486/234451225-0b552281-d162-4e64-9d37-80bec61e4810.png"> After <img width="871" alt="op-flush-pink" src="https://user-images.githubusercontent.com/1017486/234451243-6838cc19-aeaf-4f26-9a2f-7c391f6aba79.png"> --- Before <img width="868" alt="current" src="https://user-images.githubusercontent.com/1017486/234451261-a12736ec-baec-44ef-9004-884c136b484b.png"> After <img width="808" alt="op-flush" src="https://user-images.githubusercontent.com/1017486/234451278-85178109-65f5-4ad0-82a2-2ecb3e786103.png"> --- Before <img width="1613" alt="current-query" src="https://user-images.githubusercontent.com/1017486/234451301-e59241d8-a089-440b-9a23-3d36ba5413d7.png"> After <img width="924" alt="op-flush-query" src="https://user-images.githubusercontent.com/1017486/234451327-19d95775-0443-4f81-a4c7-d3a6c3253245.png"> Release note: None 102297: flowinfra: remove stale TODO r=yuzefovich a=yuzefovich I don't think the code movement proposed in the TODO makes sense anymore. Epic: None Release note: None Co-authored-by: Xiang Gu <[email protected]> Co-authored-by: Evan Wall <[email protected]> Co-authored-by: maryliag <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #102126
Previously, adding new 23.2 version results in this test failure:
This change ignores the version string after the
-.Release note: None