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

feature: Realize the interface of console: get global lock in the file mode #4293

Merged
merged 70 commits into from
Feb 8, 2022
Merged

feature: Realize the interface of console: get global lock in the file mode #4293

merged 70 commits into from
Feb 8, 2022

Conversation

miaoxueyu
Copy link
Contributor

@miaoxueyu miaoxueyu commented Jan 13, 2022 •
edited

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

get global lock in the file mode #4258

Ⅱ. Does this pull request fix one issue?

fixes #4258

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

miaoxueyu and others added 16 commits January 6, 2022 00:07
feature：Realize the interface of console: get global session in the f…
3ec36b3 
…ile mode
@miaoxueyu
Merge branch 'seata:develop' into develop
3f9a0a7
optimized
72bffac
Merge remote-tracking branch 'origin/develop' into develop
efdbd3f
@chiangcho
fix row size gt 1000 cause error in oracle (apache#4266)
90d92e5
optimized：add test case
9dd8870
@funky-eyes
Merge branch 'develop' into develop
7e89c2d
optimized：add githubId and modify param verification
ea79065
optimized
63f490c
@miaoxueyu
optimized: paging calculation logic
fc8bc2d
@miaoxueyu
optimized: paging calculation logic
689de59
@objcoding @miaoxueyu
bugfix: data remanence problems in lock and branch under specific cir…
5408aba 
…cumstances. (apache#4233)
@miaoxueyu
optimized: query global session in file mode for no sessions
789cff0
@miaoxueyu
Merge branch 'develop' into develop
f5690ac
@miaoxueyu
Merge branch 'develop' into develop
d5a3815
@miaoxueyu
feature: Realize the interface of console: get global lock in the fil…
88191ff 
…e mode apache#4258
@miaoxueyu miaoxueyu changed the title Global lock get global lock in the file mode Jan 13, 2022
@miaoxueyu
Copy link
Contributor Author

完成啦

@miaoxueyu miaoxueyu changed the title get global lock in the file mode feature： Realize the interface of console: get global lock in the file mode #4258 Jan 14, 2022
@lightClouds917
Copy link
Contributor

你这个有冲突没处理吧，很多不是你pr的代码都带进来了，处理一下

@miaoxueyu
Copy link
Contributor Author

你这个有冲突没处理吧，很多不是你pr的代码都带进来了，处理一下

您好，之前没有参与过开源社区，不是很懂。 请教一下：如果我提交了一个PR，在我开发的同时有人推送了工作，我需要去fetch rebase这些更改吗

@lgtm-com
Copy link

lgtm-com bot commented Jan 14, 2022

This pull request introduces 6 alerts when merging 97d537b into 88c1ca4 - view on LGTM.com

new alerts:

  • 6 for Query built from user-controlled sources

@lightClouds917
Copy link
Contributor

lightClouds917 commented Jan 14, 2022 •
edited

你这个有冲突没处理吧，很多不是你pr的代码都带进来了，处理一下

您好，之前没有参与过开源社区，不是很懂。 请教一下：如果我提交了一个PR，在我开发的同时有人推送了工作，我需要去fetch rebase这些更改吗

你从develop拉出xxx分支开发，xxx分支开发时，develop有新代码了，你xxx可以先提交一下，然后本地切换到develop，拉一下最新的，然后切到xxx分支，把develop merge到xxx就行了。
可以参考这篇文章：https://blog.csdn.net/weixin_39800144/article/details/98343124?ops_request_misc=%257B%2522request%255Fid%2522%253A%2522164216039316780265442287%2522%252C%2522scm%2522%253A%252220140713.130102334.pc%255Fblog.%2522%257D&request_id=164216039316780265442287&biz_id=0&utm_medium=distribute.pc_search_result.none-task-blog-2~blog~first_rank_ecpm_v1~rank_v31_ecpm-1-98343124.nonecase&utm_term=开源&spm=1018.2226.3001.4450

@funky-eyes funky-eyes added the type: feature Category issues or prs related to feature request. label Jan 24, 2022
@caohdgege
Copy link
Contributor

标题的 #4258 删掉

@miaoxueyu miaoxueyu changed the title feature: Realize the interface of console: get global lock in the file mode #4258 feature: Realize the interface of console: get global lock in the file mode Jan 25, 2022
funky-eyes
funky-eyes approved these changes Feb 4, 2022
View reviewed changes
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM @lightClouds917 PTAL

lightClouds917
lightClouds917 approved these changes Feb 8, 2022
View reviewed changes
Copy link
Contributor

@lightClouds917 lightClouds917 left a comment

Choose a reason for hiding this comment

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

LGTM

@lightClouds917 lightClouds917 merged commit 8274fc4 into apache:develop Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@funky-eyes funky-eyes funky-eyes approved these changes

@lightClouds917 lightClouds917 lightClouds917 approved these changes

Assignees
No one assigned
Labels
module/server server module type: feature Category issues or prs related to feature request.
Projects
None yet
Milestone
1.5.0 (1.5.1)
Development

Successfully merging this pull request may close these issues.

[Feature]: Realize the interface of console: get global lock in the file mode
10 participants
@miaoxueyu @lightClouds917 @codecov-commenter @caohdgege @funky-eyes @slievrly @chiangcho @objcoding @GoodBoyCoder @pengten