From 973b77651676370cb7eb8fcc65bc80e50ffcfd08 Mon Sep 17 00:00:00 2001 From: Cabinfever_B Date: Tue, 19 Dec 2023 17:02:54 +0800 Subject: [PATCH] rename follower handle var Signed-off-by: Cabinfever_B --- client/client.go | 6 +++--- client/option.go | 20 ++++++++++---------- client/option_test.go | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/client/client.go b/client/client.go index 7053ed2be96..cb1d4dc4ec8 100644 --- a/client/client.go +++ b/client/client.go @@ -707,12 +707,12 @@ func (c *client) UpdateOption(option DynamicOption, value interface{}) error { return errors.New("[pd] invalid value type for EnableTSOFollowerProxy option, it should be bool") } c.option.setEnableTSOFollowerProxy(enable) - case EnableFollowerHandle: + case EnableFollowerHandleRegionRequest: enable, ok := value.(bool) if !ok { - return errors.New("[pd] invalid value type for EnableFollowerHandle option, it should be bool") + return errors.New("[pd] invalid value type for EnableFollowerHandleRegionRequest option, it should be bool") } - c.option.setEnableFollowerHandle(enable) + c.option.setEnableFollowerHandleRegionRequest(enable) default: return errors.New("[pd] unsupported client option") } diff --git a/client/option.go b/client/option.go index 2a6c285cfb7..d6b577ae9df 100644 --- a/client/option.go +++ b/client/option.go @@ -41,8 +41,8 @@ const ( // EnableTSOFollowerProxy is the TSO Follower Proxy option. // It is stored as bool. EnableTSOFollowerProxy - // EnableFollowerHandle is the follower handle option. - EnableFollowerHandle + // EnableFollowerHandleRegionRequest is the follower handle option for region request . + EnableFollowerHandleRegionRequest dynamicOptionCount ) @@ -75,7 +75,7 @@ func newOption() *option { co.dynamicOptions[MaxTSOBatchWaitInterval].Store(defaultMaxTSOBatchWaitInterval) co.dynamicOptions[EnableTSOFollowerProxy].Store(defaultEnableTSOFollowerProxy) - co.dynamicOptions[EnableFollowerHandle].Store(defaultEnableFollowerHandle) + co.dynamicOptions[EnableFollowerHandleRegionRequest].Store(defaultEnableFollowerHandle) return co } @@ -92,17 +92,17 @@ func (o *option) setMaxTSOBatchWaitInterval(interval time.Duration) error { return nil } -// setEnableFollowerHandle set the Follower Handle option. -func (o *option) setEnableFollowerHandle(enable bool) { - old := o.getEnableFollowerHandle() +// setEnableFollowerHandleRegionRequest set the Follower Handle option. +func (o *option) setEnableFollowerHandleRegionRequest(enable bool) { + old := o.isEnableFollowerHandleRegionRequest() if enable != old { - o.dynamicOptions[EnableFollowerHandle].Store(enable) + o.dynamicOptions[EnableFollowerHandleRegionRequest].Store(enable) } } -// getMaxTSOBatchWaitInterval gets the Follower Handle enable option. -func (o *option) getEnableFollowerHandle() bool { - return o.dynamicOptions[EnableFollowerHandle].Load().(bool) +// isEnableFollowerHandleRegionRequest gets the Follower Handle enable option. +func (o *option) isEnableFollowerHandleRegionRequest() bool { + return o.dynamicOptions[EnableFollowerHandleRegionRequest].Load().(bool) } // getMaxTSOBatchWaitInterval gets the max TSO batch wait interval option. diff --git a/client/option_test.go b/client/option_test.go index 1a8faf8fcd9..171da31f89f 100644 --- a/client/option_test.go +++ b/client/option_test.go @@ -28,7 +28,7 @@ func TestDynamicOptionChange(t *testing.T) { // Check the default value setting. re.Equal(defaultMaxTSOBatchWaitInterval, o.getMaxTSOBatchWaitInterval()) re.Equal(defaultEnableTSOFollowerProxy, o.getEnableTSOFollowerProxy()) - re.Equal(defaultEnableFollowerHandle, o.getEnableFollowerHandle()) + re.Equal(defaultEnableFollowerHandle, o.isEnableFollowerHandleRegionRequest()) // Check the invalid value setting. re.NotNil(o.setMaxTSOBatchWaitInterval(time.Second)) @@ -58,9 +58,9 @@ func TestDynamicOptionChange(t *testing.T) { o.setEnableTSOFollowerProxy(expectBool) expectBool = true - o.setEnableFollowerHandle(expectBool) - re.Equal(expectBool, o.getEnableFollowerHandle()) + o.setEnableFollowerHandleRegionRequest(expectBool) + re.Equal(expectBool, o.isEnableFollowerHandleRegionRequest()) expectBool = false - o.setEnableFollowerHandle(expectBool) - re.Equal(expectBool, o.getEnableFollowerHandle()) + o.setEnableFollowerHandleRegionRequest(expectBool) + re.Equal(expectBool, o.isEnableFollowerHandleRegionRequest()) }