database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix bug that schema change on restored table will lose data (#489)

Browse Source 
In TabletInvertedIndex calss, The instance of TabletMeta in
'tabletMetaMap' and 'tabletMetaTable' should be same.
Otherwise when we change the schema hash info of TabletMeta
in 'tabletMetaMap', TabletMeta in 'tabletMetaTable' left
unchanged, which will cause inconsistency of meta.
This commit is contained in:
Mingyu Chen
2019-01-02 09:51:06 +08:00
committed by ZHAO Chun
parent ff7d3e5878
commit d1bdb55302
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fe/src/main/java/org/apache/doris/backup/RestoreJob.java
View File

@ -615,9 +615,9 @@ public class RestoreJob extends AbstractJob {
int schemaHash = localTbl.getSchemaHashByIndexId(restoredIdx.getId());
KeysType keysType = localTbl.getKeysType();
List<Column> columns = localTbl.getSchemaByIndexId(restoredIdx.getId());
TabletMeta tabletMeta = new TabletMeta(db.getId(), localTbl.getId(), restorePart.getId(),
restoredIdx.getId(), schemaHash);
for (Tablet restoreTablet : restoredIdx.getTablets()) {
TabletMeta tabletMeta = new TabletMeta(db.getId(), localTbl.getId(),
restorePart.getId(), restoredIdx.getId(), schemaHash);
Catalog.getCurrentInvertedIndex().addTablet(restoreTablet.getId(), tabletMeta);
for (Replica restoreReplica : restoreTablet.getReplicas()) {
Catalog.getCurrentInvertedIndex().addReplica(restoreTablet.getId(), restoreReplica);
@ -650,9 +650,9 @@ public class RestoreJob extends AbstractJob {
int schemaHash = restoreTbl.getSchemaHashByIndexId(index.getId());
KeysType keysType = restoreTbl.getKeysType();
List<Column> columns = restoreTbl.getSchemaByIndexId(index.getId());
TabletMeta tabletMeta = new TabletMeta(db.getId(), restoreTbl.getId(), restorePart.getId(),
index.getId(), schemaHash);
for (Tablet tablet : index.getTablets()) {
TabletMeta tabletMeta = new TabletMeta(db.getId(), restoreTbl.getId(),
restorePart.getId(), index.getId(), schemaHash);
Catalog.getCurrentInvertedIndex().addTablet(tablet.getId(), tabletMeta);
for (Replica replica : tablet.getReplicas()) {
Catalog.getCurrentInvertedIndex().addReplica(tablet.getId(), replica);
@ -926,9 +926,9 @@ public class RestoreJob extends AbstractJob {
// modify tablet inverted index
for (MaterializedIndex restoreIdx : restorePart.getMaterializedIndices()) {
int schemaHash = localTbl.getSchemaHashByIndexId(restoreIdx.getId());
TabletMeta tabletMeta = new TabletMeta(db.getId(), localTbl.getId(), restorePart.getId(),
restoreIdx.getId(), schemaHash);
for (Tablet restoreTablet : restoreIdx.getTablets()) {
TabletMeta tabletMeta = new TabletMeta(db.getId(), localTbl.getId(),
restorePart.getId(), restoreIdx.getId(), schemaHash);
Catalog.getCurrentInvertedIndex().addTablet(restoreTablet.getId(), tabletMeta);
for (Replica restoreReplica : restoreTablet.getReplicas()) {
Catalog.getCurrentInvertedIndex().addReplica(restoreTablet.getId(), restoreReplica);
@ -944,9 +944,9 @@ public class RestoreJob extends AbstractJob {
for (Partition restorePart : restoreTbl.getPartitions()) {
for (MaterializedIndex restoreIdx : restorePart.getMaterializedIndices()) {
int schemaHash = restoreTbl.getSchemaHashByIndexId(restoreIdx.getId());
TabletMeta tabletMeta = new TabletMeta(db.getId(), restoreTbl.getId(), restorePart.getId(),
restoreIdx.getId(), schemaHash);
for (Tablet restoreTablet : restoreIdx.getTablets()) {
TabletMeta tabletMeta = new TabletMeta(db.getId(), restoreTbl.getId(),
restorePart.getId(), restoreIdx.getId(), schemaHash);
Catalog.getCurrentInvertedIndex().addTablet(restoreTablet.getId(), tabletMeta);
for (Replica restoreReplica : restoreTablet.getReplicas()) {
Catalog.getCurrentInvertedIndex().addReplica(restoreTablet.getId(), restoreReplica);