*: remove unnecessary db arg.

satchel9 · Oct 30, 2015 · 3278e88 · 3278e88
1 parent a6f1465
commit 3278e88
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/infoschema/infoschema.go b/infoschema/infoschema.go
@@ -218,7 +218,7 @@ func (h *Handle) Set(newInfo []*model.DBInfo, schemaMetaVersion int64) {
 		info.schemaNameToID[di.Name.L] = di.ID
 		for _, t := range di.Tables {
 			alloc := autoid.NewAllocator(h.store, di.ID)
-			info.tables[t.ID] = table.TableFromMeta(di.Name.L, alloc, t)
+			info.tables[t.ID] = table.TableFromMeta(alloc, t)
 			tname := tableName{di.Name.L, t.Name.L}
 			info.tableNameToID[tname] = t.ID
 			for _, c := range t.Columns {

diff --git a/plan/plans/from_test.go b/plan/plans/from_test.go
@@ -95,7 +95,7 @@ func (p *testFromSuit) SetUpSuite(c *C) {
 			},
 		},
 	}
-	p.tbl = tables.NewTable(1, "t", "test", p.cols, &simpleAllocator{})
+	p.tbl = tables.NewTable(1, "t", p.cols, &simpleAllocator{})
 	variable.BindSessionVars(p)
 
 	var i int64

diff --git a/plan/plans/index_test.go b/plan/plans/index_test.go
@@ -72,7 +72,7 @@ func (p *testIndexSuit) SetUpSuite(c *C) {
 			},
 		},
 	}
-	p.tbl = tables.NewTable(2, "t2", "test", p.cols, &simpleAllocator{})
+	p.tbl = tables.NewTable(2, "t2", p.cols, &simpleAllocator{})
 
 	idxCol := &column.IndexedCol{
 		IndexInfo: model.IndexInfo{

diff --git a/table/table.go b/table/table.go
@@ -111,7 +111,7 @@ type Table interface {
 
 // TableFromMeta builds a table.Table from *model.TableInfo.
 // Currently, it is assigned to tables.TableFromMeta in tidb package's init function.
-var TableFromMeta func(schema string, alloc autoid.Allocator, tblInfo *model.TableInfo) Table
+var TableFromMeta func(alloc autoid.Allocator, tblInfo *model.TableInfo) Table
 
 // Ident is the table identifier composed of schema name and table name.
 // TODO: Move out

diff --git a/table/tables/tables.go b/table/tables/tables.go
@@ -51,8 +51,8 @@ type Table struct {
 }
 
 // TableFromMeta creates a Table instance from model.TableInfo.
-func TableFromMeta(dbname string, alloc autoid.Allocator, tblInfo *model.TableInfo) table.Table {
-	t := NewTable(tblInfo.ID, tblInfo.Name.O, dbname, nil, alloc)
+func TableFromMeta(alloc autoid.Allocator, tblInfo *model.TableInfo) table.Table {
+	t := NewTable(tblInfo.ID, tblInfo.Name.O, nil, alloc)
 
 	for _, colInfo := range tblInfo.Columns {
 		c := column.Col{ColumnInfo: *colInfo}
@@ -71,7 +71,7 @@ func TableFromMeta(dbname string, alloc autoid.Allocator, tblInfo *model.TableIn
 }
 
 // NewTable constructs a Table instance.
-func NewTable(tableID int64, tableName string, dbName string, cols []*column.Col, alloc autoid.Allocator) *Table {
+func NewTable(tableID int64, tableName string, cols []*column.Col, alloc autoid.Allocator) *Table {
 	name := model.NewCIStr(tableName)
 	t := &Table{
 		ID:           tableID,