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

[Bug](status) process error status on es_scroll_parser and compaction_action (#25745)

Browse Source 
process error status on es_scroll_parser and compaction_action
This commit is contained in:
Pxl
2023-10-24 15:51:01 +08:00
committed by GitHub
parent 9160834606
commit 2972daaed9
18 changed files with 94 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
View File

@ -34,7 +34,6 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.KeysType;
import org.apache.doris.catalog.MaterializedIndex;
import org.apache.doris.catalog.MaterializedIndex.IndexState;
import org.apache.doris.catalog.MaterializedIndexMeta;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.OlapTable.OlapTableState;
import org.apache.doris.catalog.Partition;
@ -52,7 +51,6 @@ import org.apache.doris.common.io.Text;
import org.apache.doris.common.util.DbUtil;
import org.apache.doris.common.util.SqlParserUtils;
import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.common.util.Util;
import org.apache.doris.persist.gson.GsonPostProcessable;
import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.qe.ConnectContext;
@ -75,7 +73,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.annotations.SerializedName;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -365,23 +362,6 @@ public class RollupJobV2 extends AlterJobV2 implements GsonPostProcessable {
Preconditions.checkState(rollupIndex.getState() == IndexState.SHADOW, rollupIndex.getState());
partition.createRollupIndex(rollupIndex);
}
StringBuilder debugString = new StringBuilder();
if (this.partitionIdToRollupIndex.isEmpty() == false) {
for (MaterializedIndex rollupIdx : partitionIdToRollupIndex.values()) {
debugString.append(rollupIdx.toString() + "\n");
}
}
Set<String> indexNames = Sets.newTreeSet(tbl.getIndexNameToId().keySet());
for (String indexName : indexNames) {
long indexId = tbl.getIndexNameToId().get(indexName);
MaterializedIndexMeta indexMeta = tbl.getIndexIdToMeta().get(indexId);
debugString.append(indexName);
debugString.append(Util.getSchemaSignatureString(indexMeta.getSchema()));
debugString.append(indexMeta.getShortKeyColumnCount());
debugString.append(indexMeta.getStorageType());
}
//now add some log for P0 test case, this debugString info could remove after.
LOG.info("addRollupIndexToCatalog partition end: {}, table:{} ", debugString.toString(), tbl.toString());
tbl.setIndexMeta(rollupIndexId, rollupIndexName, rollupSchema, 0 /* init schema version */,
rollupSchemaHash, rollupShortKeyColumnCount, TStorageType.COLUMN,

1
fe/fe-core/src/main/java/org/apache/doris/task/PushTask.java
View File

@ -140,7 +140,6 @@ public class PushTask extends AgentTask {
ArrayList<String> conditionValues = new ArrayList<String>();
SlotRef slotRef = (SlotRef) condition.getChild(0);
String columnName = new String(slotRef.getColumnName());
tCondition.setColumnName(columnName);
TColumn column = colNameToColDesc.get(slotRef.getColumnName());
if (column == null) {
columnName = CreateMaterializedViewStmt.mvColumnBuilder(columnName);