Skip to content

Fix batch partial insert failure reporting #17925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Caideyipi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix batch partial insert failure reporting #17925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions ...java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.SemanticException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation;
import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
Expand Down Expand Up @@ -110,12 +109,45 @@ public List<ISchemaValidation> getSchemaValidationList() {
}

@Override
public void updateAfterSchemaValidation(MPPQueryContext context) {
for (InsertTabletStatement insertTabletStatement : insertTabletStatementList) {
if (!this.hasFailedMeasurements() && insertTabletStatement.hasFailedMeasurements()) {
this.failedMeasurementIndex2Info = insertTabletStatement.failedMeasurementIndex2Info;
}
}
public boolean hasFailedMeasurements() {
return insertTabletStatementList != null
&& insertTabletStatementList.stream().anyMatch(InsertBaseStatement::hasFailedMeasurements);
}

@Override
public int getFailedMeasurementNumber() {
return insertTabletStatementList == null
? 0
: insertTabletStatementList.stream()
.mapToInt(InsertBaseStatement::getFailedMeasurementNumber)
.sum();
}

@Override
public List<String> getFailedMeasurements() {
return insertTabletStatementList == null
? Collections.emptyList()
: insertTabletStatementList.stream()
.flatMap(statement -> statement.getFailedMeasurements().stream())
.collect(Collectors.toList());
}

@Override
public List<Exception> getFailedExceptions() {
return insertTabletStatementList == null
? Collections.emptyList()
: insertTabletStatementList.stream()
.flatMap(statement -> statement.getFailedExceptions().stream())
.collect(Collectors.toList());
}

@Override
public List<String> getFailedMessages() {
return insertTabletStatementList == null
? Collections.emptyList()
: insertTabletStatementList.stream()
.flatMap(statement -> statement.getFailedMessages().stream())
.collect(Collectors.toList());
}

@Override
Expand Down
46 changes: 43 additions & 3 deletions ...a/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.tsfile.utils.RamUsageEstimator;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -140,12 +141,51 @@ public List<ISchemaValidation> getSchemaValidationList() {
public void updateAfterSchemaValidation(MPPQueryContext context) throws QueryProcessException {
for (InsertRowStatement insertRowStatement : insertRowStatementList) {
insertRowStatement.updateAfterSchemaValidation(context);
if (!this.hasFailedMeasurements() && insertRowStatement.hasFailedMeasurements()) {
this.failedMeasurementIndex2Info = insertRowStatement.failedMeasurementIndex2Info;
}
}
}

@Override
public boolean hasFailedMeasurements() {
return insertRowStatementList != null
&& insertRowStatementList.stream().anyMatch(InsertBaseStatement::hasFailedMeasurements);
}

@Override
public int getFailedMeasurementNumber() {
return insertRowStatementList == null
? 0
: insertRowStatementList.stream()
.mapToInt(InsertBaseStatement::getFailedMeasurementNumber)
.sum();
}

@Override
public List<String> getFailedMeasurements() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedMeasurements().stream())
.collect(Collectors.toList());
}

@Override
public List<Exception> getFailedExceptions() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedExceptions().stream())
.collect(Collectors.toList());
}

@Override
public List<String> getFailedMessages() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedMessages().stream())
.collect(Collectors.toList());
}

@Override
protected boolean checkAndCastDataType(int columnIndex, TSDataType dataType) {
return false;
Expand Down
45 changes: 42 additions & 3 deletions ...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,51 @@ public List<ISchemaValidation> getSchemaValidationList() {
public void updateAfterSchemaValidation(MPPQueryContext context) throws QueryProcessException {
for (InsertRowStatement insertRowStatement : insertRowStatementList) {
insertRowStatement.updateAfterSchemaValidation(context);
if (!this.hasFailedMeasurements() && insertRowStatement.hasFailedMeasurements()) {
this.failedMeasurementIndex2Info = insertRowStatement.failedMeasurementIndex2Info;
}
}
}

@Override
public boolean hasFailedMeasurements() {
return insertRowStatementList != null
&& insertRowStatementList.stream().anyMatch(InsertBaseStatement::hasFailedMeasurements);
}

@Override
public int getFailedMeasurementNumber() {
return insertRowStatementList == null
? 0
: insertRowStatementList.stream()
.mapToInt(InsertBaseStatement::getFailedMeasurementNumber)
.sum();
}

@Override
public List<String> getFailedMeasurements() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedMeasurements().stream())
.collect(Collectors.toList());
}

@Override
public List<Exception> getFailedExceptions() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedExceptions().stream())
.collect(Collectors.toList());
}

@Override
public List<String> getFailedMessages() {
return insertRowStatementList == null
? Collections.emptyList()
: insertRowStatementList.stream()
.flatMap(statement -> statement.getFailedMessages().stream())
.collect(Collectors.toList());
}

@Override
protected boolean checkAndCastDataType(int columnIndex, TSDataType dataType) {
return false;
Expand Down
52 changes: 52 additions & 0 deletions ...org/apache/iotdb/db/queryengine/plan/statement/crud/InsertStatementPartialInsertTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,58 @@ public void testDeviceMeasurementMapSkipsMissingTabletColumns() throws Exception
Assert.assertEquals("s1", result.get(statement.getDevicePath()).get(0).left);
}

@Test
public void testInsertRowsStatementAggregatesFailedMeasurements() throws Exception {
final InsertRowStatement statement1 = createInsertRowStatement();
final InsertRowStatement statement2 = createInsertRowStatement();
statement1.markFailedMeasurement(0, new RuntimeException("failed1"));
statement2.markFailedMeasurement(1, new RuntimeException("failed2"));

final InsertRowsStatement rowsStatement = new InsertRowsStatement();
rowsStatement.setInsertRowStatementList(Arrays.asList(statement1, statement2));

Assert.assertTrue(rowsStatement.hasFailedMeasurements());
Assert.assertEquals(2, rowsStatement.getFailedMeasurementNumber());
Assert.assertEquals(Arrays.asList("s1", "s2"), rowsStatement.getFailedMeasurements());
Assert.assertEquals(Arrays.asList("failed1", "failed2"), rowsStatement.getFailedMessages());
}

@Test
public void testInsertRowsOfOneDeviceStatementAggregatesFailedMeasurements() throws Exception {
final InsertRowStatement statement1 = createInsertRowStatement();
final InsertRowStatement statement2 = createInsertRowStatement();
statement1.markFailedMeasurement(0, new RuntimeException("failed1"));
statement2.markFailedMeasurement(1, new RuntimeException("failed2"));

final InsertRowsOfOneDeviceStatement rowsOfOneDeviceStatement =
new InsertRowsOfOneDeviceStatement();
rowsOfOneDeviceStatement.setInsertRowStatementList(Arrays.asList(statement1, statement2));

Assert.assertTrue(rowsOfOneDeviceStatement.hasFailedMeasurements());
Assert.assertEquals(2, rowsOfOneDeviceStatement.getFailedMeasurementNumber());
Assert.assertEquals(
Arrays.asList("s1", "s2"), rowsOfOneDeviceStatement.getFailedMeasurements());
Assert.assertEquals(
Arrays.asList("failed1", "failed2"), rowsOfOneDeviceStatement.getFailedMessages());
}

@Test
public void testInsertMultiTabletsStatementAggregatesFailedMeasurements() throws Exception {
final InsertTabletStatement statement1 = createInsertTabletStatement();
final InsertTabletStatement statement2 = createInsertTabletStatement();
statement1.markFailedMeasurement(0, new RuntimeException("failed1"));
statement2.markFailedMeasurement(1, new RuntimeException("failed2"));

final InsertMultiTabletsStatement multiTabletsStatement = new InsertMultiTabletsStatement();
multiTabletsStatement.setInsertTabletStatementList(Arrays.asList(statement1, statement2));

Assert.assertTrue(multiTabletsStatement.hasFailedMeasurements());
Assert.assertEquals(2, multiTabletsStatement.getFailedMeasurementNumber());
Assert.assertEquals(Arrays.asList("s1", "s2"), multiTabletsStatement.getFailedMeasurements());
Assert.assertEquals(
Arrays.asList("failed1", "failed2"), multiTabletsStatement.getFailedMessages());
}

private static InsertRowStatement createInsertRowStatement() throws Exception {
final InsertRowStatement statement = new InsertRowStatement();
statement.setDevicePath(new PartialPath("root.sg.d1"));
Expand Down
Loading