[release-18.0] VReplication TableStreamer: Only stream tables in tabl…

…estreamer (ignore views) (#14646) (#14649) Signed-off-by: Rohit Nayak <[email protected]> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com> Co-authored-by: Rohit Nayak <[email protected]>
vitessio · Nov 30, 2023 · e2b37f6 · e2b37f6
1 parent f004f79
commit e2b37f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/go/test/endtoend/vreplication/fk_config_test.go b/go/test/endtoend/vreplication/fk_config_test.go
@@ -20,6 +20,7 @@ var (
 	initialFKSchema = `
 create table parent(id int, name varchar(128), primary key(id)) engine=innodb;
 create table child(id int, parent_id int, name varchar(128), primary key(id), foreign key(parent_id) references parent(id) on delete cascade) engine=innodb;
+create view vparent as select * from parent;
 `
 	initialFKData = `
 insert into parent values(1, 'parent1'), (2, 'parent2');

diff --git a/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go b/go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go
@@ -27,6 +27,7 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/mysqlctl/tmutils"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/schema"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
@@ -109,12 +110,16 @@ func (ts *tableStreamer) Stream() error {
 		return err
 	}
 
-	rs, err := conn.ExecuteFetch("show tables", -1, true)
+	rs, err := conn.ExecuteFetch("show full tables", -1, true)
 	if err != nil {
 		return err
 	}
 	for _, row := range rs.Rows {
 		tableName := row[0].ToString()
+		tableType := row[1].ToString()
+		if tableType != tmutils.TableBaseTable {
+			continue
+		}
 		if schema2.IsInternalOperationTableName(tableName) {
 			log.Infof("Skipping internal table %s", tableName)
 			continue