Skip to content

Commit

Permalink
*: adjust partition to add more type partition radondb#491
Browse files Browse the repository at this point in the history
[summary]
adjust partition to add more type partition
[test case]
router/frm_test.go
[patch codecov]
100%
  • Loading branch information
andyli029 committed Sep 24, 2019
1 parent 3749f04 commit 82048a1
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/proxy/ddl.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,11 @@ func (spanner *Spanner) handleDDL(session *driver.Session, query string, node *s
checkEngine(ddl)

switch ddl.TableSpec.Options.Type {
case sqlparser.PartitionTableType, sqlparser.NormalTableType:
case sqlparser.PartitionTableHash, sqlparser.NormalTableType:
if shardKey, err = tryGetShardKey(ddl); err != nil {
return nil, err
}
tableType = router.TableTypePartition
tableType = router.TableTypePartitionHash
case sqlparser.GlobalTableType:
tableType = router.TableTypeGlobal
case sqlparser.SingleTableType:
Expand Down
8 changes: 6 additions & 2 deletions src/router/frm.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ import (
const (
TableTypeSingle = "single"
TableTypeGlobal = "global"
TableTypePartition = "partition"
TableTypeUnknow = "unknow"

// Table Partition by hash/list/range
TableTypePartitionHash = "hash"
TableTypePartitionList = "list"
TableTypePartitionRange = "range"
)

// writeTableFrmData used to write table's json schema to file.
Expand Down Expand Up @@ -217,7 +221,7 @@ func (r *Router) CreateTable(db, table, shardKey string, tableType string, backe
if tableConf, err = r.SingleUniform(table, backends); err != nil {
return err
}
case TableTypePartition:
case TableTypePartitionHash:
if tableConf, err = r.HashUniform(table, shardKey, backends); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion src/router/frm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestFrmTable(t *testing.T) {
// Add partition table.
{
backends := []string{"backend1", "backend2"}
err := router.CreateTable("test", "t3_partition", "shardkey1", TableTypePartition, backends, nil)
err := router.CreateTable("test", "t3_partition", "shardkey1", TableTypePartitionHash, backends, nil)
assert.Nil(t, err)
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/sql.y

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 82048a1

Please sign in to comment.