cherry pick pingcap#11706 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>
sre-bot · Apr 8, 2020 · dfd0d0a · dfd0d0a
1 parent a153f19
commit dfd0d0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/executor/analyze.go b/executor/analyze.go
@@ -687,7 +687,7 @@ func (e *AnalyzeFastExec) getNextSampleKey(bo *tikv.Backoffer, startKey kv.Key)
 		if err != nil {
 			return nil, err
 		}
-		if bytes.Compare(loc.StartKey, e.sampTasks[prefixLen].Location.EndKey) == 0 {
+		if bytes.Equal(loc.StartKey, e.sampTasks[prefixLen].Location.EndKey) {
 			startKey = loc.StartKey
 			break
 		}

diff --git a/executor/load_data.go b/executor/load_data.go
@@ -486,7 +486,11 @@ func (e *LoadDataInfo) getFieldsFromLine(line []byte) ([]field, error) {
 	for {
 		eol, f := reader.GetField()
 		f = f.escape()
+<<<<<<< HEAD
 		if string(f.str) == "NULL" && !f.enclosed {
+=======
+		if bytes.Equal(f.str, null) && !f.enclosed {
+>>>>>>> 3076e63... *: use bytes.Equal to check byte slice equivalent (#11706)
 			f.str = []byte{'N'}
 			f.maybeNull = true
 		}

diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
@@ -757,7 +757,7 @@ func (c *RegionCache) loadRegion(bo *Backoffer, key []byte, isEndKey bool) (*Reg
 		if len(meta.Peers) == 0 {
 			return nil, errors.New("receive Region with no peer")
 		}
-		if isEndKey && !searchPrev && bytes.Compare(meta.StartKey, key) == 0 && len(meta.StartKey) != 0 {
+		if isEndKey && !searchPrev && bytes.Equal(meta.StartKey, key) && len(meta.StartKey) != 0 {
 			searchPrev = true
 			continue
 		}