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.

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

planner: provide a unified interface to set and get user variables and types #37046

Merged
merged 8 commits into from
Aug 11, 2022

Conversation

fzzf678
Copy link
Contributor

@fzzf678 fzzf678 commented Aug 11, 2022

What problem does this PR solve?

Problem Summary:
For user defined variables,we don't have a unidfined interface to set and get. For code clarity and readability, we design some interface to manage these variables.
Issue Number: ref #36598

What is changed and how it works?

Provide some interface and modify the original use way

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 11, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Reminiscent
  • qw4990

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 11, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 11, 2022

@fzzf678 fzzf678 marked this pull request as ready for review August 11, 2022 08:07
@fzzf678 fzzf678 requested a review from a team as a code owner August 11, 2022 08:07
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 11, 2022
@fzzf678
Copy link
Contributor Author

fzzf678 commented Aug 11, 2022

/cc @qw4990 @Reminiscent

Comment on lines 600 to 602
userVarLock sync.RWMutex
userVarValues map[string]types.Datum
userVarTypes map[string]*types.FieldType
Copy link
Contributor

Choose a reason for hiding this comment

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

How about wrapping them as a unified structure:

strauct userVars {
    sync.RWMutex
    vars map[string]Datum
    types map[string]FT
} 

@@ -2047,16 +2083,14 @@ func (s *SessionVars) GetTemporaryTable(tblInfo *model.TableInfo) tableutil.Temp
// EncodeSessionStates saves session states into SessionStates.
func (s *SessionVars) EncodeSessionStates(ctx context.Context, sessionStates *sessionstates.SessionStates) (err error) {
// Encode user-defined variables.
s.UsersLock.RLock()
Copy link
Contributor

Choose a reason for hiding this comment

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

Should lock it here since the following operation is accessing the user-var map directly instead of using Getter/Setter.

@@ -1655,18 +1685,20 @@ func (s *SessionVars) GetParseParams() []parser.ParseParam {
func (s *SessionVars) SetUserVar(varName string, svalue string, collation string) {
Copy link
Contributor

Choose a reason for hiding this comment

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

How about renaming this function to SetStringUserVar(name, strVal, collation string)?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 11, 2022
@hawkingrei
Copy link
Member

/run-check_dev_2

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 11, 2022
@qw4990
Copy link
Contributor

qw4990 commented Aug 11, 2022

/run-check_dev_2

@fzzf678
Copy link
Contributor Author

fzzf678 commented Aug 11, 2022

/run-check_dev_2

@qw4990
Copy link
Contributor

qw4990 commented Aug 11, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: f5c57b6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 11, 2022
@qw4990
Copy link
Contributor

qw4990 commented Aug 11, 2022

/merge

1 similar comment
@qw4990
Copy link
Contributor

qw4990 commented Aug 11, 2022

/merge

@ti-chi-bot ti-chi-bot merged commit 7d8c45a into pingcap:master Aug 11, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 11, 2022

TiDB MergeCI notify

🔴 Bad News! [2] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 2, success 15, total 17 16 min Existing failure
idc-jenkins-ci-tidb/common-test 🔴 failed 1, success 10, total 11 13 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 32 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 51 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 22 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 52 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 27 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 14 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

morgo added a commit to morgo/tidb that referenced this pull request Aug 11, 2022
…verage

* upstream/master: (98 commits)
  planner: provide a unified interface to set and get user variables and types (pingcap#37046)
  *: fix check-2 to bazel (pingcap#37055)
  distsql: revert 37019 (pingcap#37048)
  planner: introduce new functions for the general statement in session interface (pingcap#37024)
  session: make BenchmarkCompileExecutePreparedStmt update to date (pingcap#36960)
  server: Change proxyprotocol to lazy mode (pingcap#36301)
  test: fix `TestDDLSchedulingMultiTimes` and `TestConcurrentDDLSwitch` timeout (pingcap#37043)
  makefile: add bazel realtikvtest (pingcap#37042)
  distsql: make analyze request SI (pingcap#37019)
  *: gofmt code for adapting go 1.19 (pingcap#36832)
  planner: fix data race in the TestInlineProjection4HashJoinIssue15316 (pingcap#37014)
  planner: introduce Session.CacheGeneralStmt for general plan cache (pingcap#37028)
  server: revise scheme code (pingcap#37021)
  planner: fix unstable test TestPushDownSelectionForMPP (pingcap#37038)
  executor: more precise memory tracking (pingcap#35785)
  executor: add privilege check for prepare stmt (pingcap#36933)
  *: optimize temptable.SessionSnapshotInterceptor (pingcap#36999)
  statistics: batch insert topn and buckets to storage to speed up loading stats (pingcap#36948)
  planner: remove keyword `prepared` in plan cache backend (pingcap#37023)
  util: fix unstable test TestCheckCN (pingcap#37016)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants