executor, session: refine insert unsigned bigint autoIncreID

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/pingcap/check v0.0.0-20171206051426-1c287c953996
 	github.com/pingcap/errors v0.11.0
 	github.com/pingcap/goleveldb v0.0.0-20171020122428-b9ff6c35079e
-	github.com/pingcap/kvproto v0.0.0-20181028030329-855d2192cdc7
+	github.com/pingcap/kvproto v0.0.0-20181105061835-1b5d69cd1d26
 	github.com/pingcap/parser v0.0.0-20181112055336-6cb6cf66c6df
 	github.com/pingcap/pd v2.1.0-rc.4+incompatible
 	github.com/pingcap/tidb-tools v0.0.0-20181101090416-cfac1096162e

meta/autoid/autoid.go

@@ -137,13 +137,12 @@ func (alloc *allocator) Rebase(tableID, requiredBase int64, allocIDs bool) error
 		if allocIDs {
 			if alloc.isUnsigned {
 				uNewBase = mathutil.MaxUint64(uCurrentEnd, uRequiredBase)
-				uNewEnd = uNewBase + uint64(step)
+				uNewEnd = mathutil.MinUint64(math.MaxUint64-uint64(step), uNewBase) + uint64(step)
 			} else {
 				newBase = mathutil.MaxInt64(currentEnd, requiredBase)
-				newEnd = newBase + step
+				newEnd = mathutil.MinInt64(math.MaxInt64-step, newBase) + step
 			}
 		} else {
-
 			if !alloc.isUnsigned && currentEnd >= requiredBase {
 				newBase = currentEnd
 				newEnd = currentEnd
@@ -164,7 +163,6 @@ func (alloc *allocator) Rebase(tableID, requiredBase int64, allocIDs bool) error
 				uNewBase = uRequiredBase
 				uNewEnd = uRequiredBase
 			}
-
 		}
 		if !alloc.isUnsigned {
 			_, err1 = m.GenAutoTableID(alloc.dbID, tableID, newEnd-currentEnd)
@@ -177,7 +175,11 @@ func (alloc *allocator) Rebase(tableID, requiredBase int64, allocIDs bool) error
 	if err != nil {
 		return errors.Trace(err)
 	}
-	alloc.base, alloc.end = newBase, newEnd
+	if !alloc.isUnsigned {
+		alloc.base, alloc.end = newBase, newEnd
+	} else {
+		alloc.base, alloc.end = int64(uNewBase), int64(uNewEnd)
+	}
 	return nil
 }
 
@@ -198,21 +200,38 @@ func (alloc *allocator) Alloc(tableID int64) (int64, error) {
 			if err1 != nil {
 				return errors.Trace(err1)
 			}
-			newEnd, err1 = m.GenAutoTableID(alloc.dbID, tableID, step)
+			tmpStep := step
+			if alloc.isUnsigned {
+				tmpStep = int64(mathutil.MinUint64(math.MaxUint64-uint64(newBase), uint64(step)))
+			} else {
+				tmpStep = mathutil.MinInt64(math.MaxInt64-newBase, step)
+			}
+			newEnd, err1 = m.GenAutoTableID(alloc.dbID, tableID, tmpStep)
 			if err1 != nil {
 				return errors.Trace(err1)
 			}
 			return nil
 		})
 		metrics.AutoIDHistogram.WithLabelValues(metrics.TableAutoIDAlloc, metrics.RetLabel(err)).Observe(time.Since(startTime).Seconds())
 		if err != nil {
-			return 0, errors.Trace(err)
+			return 0, err
 		}
 		alloc.base, alloc.end = newBase, newEnd
 	}
+	log.Warning(uint64(alloc.base), uint64(alloc.end))
 
-	alloc.base++
-	log.Debugf("[kv] Alloc id %d, table ID:%d, from %p, database ID:%d", alloc.base, tableID, alloc, alloc.dbID)
+	if alloc.isUnsigned {
+		if uint64(alloc.base) == math.MaxUint64 {
+			return 0, ErrAutoincReadFailed
+		}
+		alloc.base = int64(uint64(alloc.base) + 1)
+		log.Debugf("[kv] Alloc id %d, table ID:%d, from %p, database ID:%d", uint64(alloc.base), tableID, alloc, alloc.dbID)
+	} else {
+		if alloc.base < alloc.end {
+			alloc.base++
+		}
+		log.Debugf("[kv] Alloc id %d, table ID:%d, from %p, database ID:%d", alloc.base, tableID, alloc, alloc.dbID)
+	}
 	return alloc.base, nil
 }
 

meta/autoid/errors.go

@@ -0,0 +1,32 @@
+// Copyright 2018 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package autoid
+
+import (
+	"github.com/pingcap/parser/mysql"
+	"github.com/pingcap/parser/terror"
+)
+
+// Error instances.
+var (
+	ErrAutoincReadFailed = terror.ClassAutoid.New(mysql.ErrAutoincReadFailed, mysql.MySQLErrName[mysql.ErrAutoincReadFailed])
+)
+
+func init() {
+	// Map error codes to mysql error codes.
+	tableMySQLErrCodes := map[terror.ErrCode]uint16{
+		mysql.ErrAutoincReadFailed: mysql.ErrAutoincReadFailed,
+	}
+	terror.ErrClassToMySQLCodes[terror.ClassAutoid] = tableMySQLErrCodes
+}

meta/meta.go

@@ -154,7 +154,7 @@ func (m *Meta) parseTableID(key string) (int64, error) {
 	return n, errors.Trace(err)
 }
 
-// GenAutoTableIDIDKeyValue generate meta key by dbID, tableID and coresponding value by autoID.
+// GenAutoTableIDIDKeyValue generate meta key by dbID, tableID and corresponding value by autoID.
 func (m *Meta) GenAutoTableIDIDKeyValue(dbID, tableID, autoID int64) (key, value []byte) {
 	dbKey := m.dbKey(dbID)
 	autoTableIDKey := m.autoTableIDKey(tableID)

session/session_test.go

@@ -29,6 +29,7 @@ import (
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/executor"
 	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/meta/autoid"
 	plannercore "github.com/pingcap/tidb/planner/core"
 	"github.com/pingcap/tidb/privilege/privileges"
 	"github.com/pingcap/tidb/session"
@@ -705,12 +706,28 @@ func (s *testSessionSuite) TestAutoIncrementID(c *C) {
 	tk.MustQuery("select last_insert_id(20)").Check(testkit.Rows(fmt.Sprint(20)))
 	tk.MustQuery("select last_insert_id()").Check(testkit.Rows(fmt.Sprint(20)))
 
+	// Corner cases for unsigned bigint auto_increment Columns.
 	tk.MustExec("drop table if exists autoid")
 	tk.MustExec("create table autoid(`auto_inc_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,UNIQUE KEY `auto_inc_id` (`auto_inc_id`))")
 	tk.MustExec("insert into autoid values(9223372036854775808);")
 	tk.MustExec("insert into autoid values();")
 	tk.MustExec("insert into autoid values();")
 	tk.MustQuery("select * from autoid").Check(testkit.Rows("9223372036854775808", "9223372036854775810", "9223372036854775812"))
+	tk.MustExec("insert into autoid values(18446744073709551614);")
+	_, err := tk.Exec("insert into autoid values()")
+	c.Assert(terror.ErrorEqual(err, autoid.ErrAutoincReadFailed), IsTrue)
+	// FixMe: MySQL works fine with the this sql.
+	_, err = tk.Exec("insert into autoid values(18446744073709551615)")
+	c.Assert(terror.ErrorEqual(err, autoid.ErrAutoincReadFailed), IsTrue)
+
+	// Corner cases for signed bigint auto_increment Columns.
+	tk.MustExec("drop table if exists autoid")
+	tk.MustExec("create table autoid(`auto_inc_id` bigint(20) NOT NULL AUTO_INCREMENT,UNIQUE KEY `auto_inc_id` (`auto_inc_id`))")
+	tk.MustExec("insert into autoid values(9223372036854775806);")
+	tk.MustExec("insert into autoid values();")
+	tk.MustQuery("select * from autoid").Check(testkit.Rows("9223372036854775806", "9223372036854775807"))
+	_, err = tk.Exec("insert into autoid values();")
+	c.Assert(terror.ErrorEqual(err, kv.ErrKeyExists), IsTrue)
 }
 
 func (s *testSessionSuite) TestAutoIncrementWithRetry(c *C) {