go-mysqlstack: reshard add new tablename sqlparser radondb#436

andyli029 · Aug 9, 2019 · 5bc240f · 5bc240f
1 parent 0f78888
commit 5bc240f
Show file tree

Hide file tree

Showing 6 changed files with 461 additions and 462 deletions.
diff --git a/src/proxy/radon.go b/src/proxy/radon.go
@@ -52,8 +52,16 @@ func (spanner *Spanner) handleRadon(session *driver.Session, query string, node
 		if !snode.Table.Qualifier.IsEmpty() {
 			database = snode.Table.Qualifier.String()
 		}
-		log.Error("proxy.radon.unsupported: %s %s.%s", snode.Action, database, table)
-		err = sqldb.NewSQLErrorf(sqldb.ER_UNKNOWN_ERROR, "unsupported.query: %s %s.%s", snode.Action, database, table)
+
+		newTable := snode.NewName.Name.String()
+		newDatabase := session.Schema()
+		if !snode.NewName.Qualifier.IsEmpty() {
+			newDatabase = snode.NewName.Qualifier.String()
+		}
+
+		log.Error("proxy.radon.unsupported.%s: [%s.%s->%s.%s]", snode.Action, database, table, newDatabase, newTable)
+		err = sqldb.NewSQLErrorf(sqldb.ER_UNKNOWN_ERROR, "unsupported.query.%s: [%s.%s->%s.%s]", snode.Action,
+			database, table, newDatabase, newTable)
 	default:
 		log.Error("proxy.radon.unsupported[%s]", query)
 		err = sqldb.NewSQLErrorf(sqldb.ER_UNKNOWN_ERROR, "unsupported.query: %v", query)

diff --git a/src/proxy/radon_test.go b/src/proxy/radon_test.go
@@ -44,7 +44,7 @@ func TestErrorParams(t *testing.T) {
 	{
 		client, err := driver.NewConn("mock", "mock", address, "", "utf8")
 		assert.Nil(t, err)
-		query := "radon reshard db.tb"
+		query := "radon reshard db.tb to db2.t2"
 		_, err = client.FetchAll(query, -1)
 		assert.NotNil(t, err)
 	}

diff --git a/src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/ast.go b/src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/ast.go
diff --git a/src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/radon_test.go b/src/vendor/github.com/xelabs/go-mysqlstack/sqlparser/radon_test.go