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

Introduce the resource control client #648

Merged
merged 13 commits into from
Jan 20, 2023
Merged

Introduce the resource control client #648

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ee294f
Introduce the resource control client
JmPotato Jan 18, 2023
35b648c
Address the comments
JmPotato Jan 18, 2023
494bebd
Rename
JmPotato Jan 19, 2023
d4ffd3d
Update the go.mod
JmPotato Jan 19, 2023
88f7301
Merge the upstream
JmPotato Jan 19, 2023
320af65
Introduce the switch
JmPotato Jan 19, 2023
08694ef
Fix the check
JmPotato Jan 19, 2023
8553f26
Fix the test
JmPotato Jan 19, 2023
2a19c65
Export the switch
JmPotato Jan 19, 2023
319f6b9
Make the switch global
JmPotato Jan 19, 2023
ed6d507
Update the go.mod
JmPotato Jan 19, 2023
f24b731
Refine the code
JmPotato Jan 19, 2023
313152f
Simplify the code
JmPotato Jan 19, 2023
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
Prev Previous commit
Next Next commit
Refine the code 
Signed-off-by: JmPotato <ghzpotato@gmail.com>
  • Loading branch information
@JmPotato
JmPotato committed Jan 19, 2023
commit f24b7314ff70757bc3295f73879cbaec612721ff
6 changes: 3 additions & 3 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import (
"github.com/tikv/client-go/v2/internal/logutil"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/util"
"github.com/tikv/pd/pkg/mcs/resource_manager/client"
resourceControlClient "github.com/tikv/pd/pkg/mcs/resource_manager/client"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -79,7 +79,7 @@ type Config struct {
TxnScope string
EnableAsyncCommit bool
Enable1PC bool
ResourceControl client.RequestUnitConfig
ResourceControl resourceControlClient.RequestUnitConfig
}

// DefaultConfig returns the default configuration.
Expand All @@ -97,7 +97,7 @@ func DefaultConfig() Config {
TxnScope: "",
EnableAsyncCommit: false,
Enable1PC: false,
ResourceControl: *client.DefaultRequestUnitConfig(),
ResourceControl: *resourceControlClient.DefaultRequestUnitConfig(),
}
}

Expand Down