fix: wrong shard id when drop non-exist table

apache · Sep 13, 2023 · c7a63d8 · c7a63d8
1 parent bb34836
commit c7a63d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/server/coordinator/factory_test.go b/server/coordinator/factory_test.go
@@ -78,8 +78,8 @@ func TestDropTable(t *testing.T) {
 	re := require.New(t)
 	ctx := context.Background()
 	f, m := setupFactory(t)
-	// Create normal table procedure.
-	p, err := f.CreateDropTableProcedure(ctx, coordinator.DropTableRequest{
+	// Drop normal table procedure.
+	_, err := f.CreateDropTableProcedure(ctx, coordinator.DropTableRequest{
 		ClusterMetadata: m,
 		ClusterSnapshot: m.GetClusterSnapshot(),
 		SourceReq: &metaservicepb.DropTableRequest{
@@ -91,9 +91,7 @@ func TestDropTable(t *testing.T) {
 		OnSucceeded: nil,
 		OnFailed:    nil,
 	})
-	re.NoError(err)
-	re.Equal(procedure.DropTable, p.Typ())
-	re.Equal(procedure.StateInit, string(p.State()))
+	re.Error(err)
 
 	// Create partition table procedure.
 	_, err = f.CreateDropTableProcedure(ctx, coordinator.DropTableRequest{

diff --git a/server/coordinator/procedure/ddl/droptable/drop_table.go b/server/coordinator/procedure/ddl/droptable/drop_table.go
@@ -170,7 +170,7 @@ func validateTable(params ProcedureParams) (storage.ShardID, error) {
 	}
 	if !exists {
 		log.Error("drop non-existing table", zap.String("schema", params.SourceReq.GetSchemaName()), zap.String("table", params.SourceReq.GetName()))
-		return 0, err
+		return 0, errors.WithMessagef(metadata.ErrTableNotFound, "The table to drop doesn't exists, schema:%s, table:%s", params.SourceReq.GetSchemaName(), params.SourceReq.GetName())
 	}
 
 	for _, shardView := range params.ClusterSnapshot.Topology.ShardViewsMapping {