Skip to content

IGNITE-27718 Fix ClassCastException in UPDATEs with table level hints #7715

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
solveme wants to merge 2 commits into
base: main
Choose a base branch
from
Open

IGNITE-27718 Fix ClassCastException in UPDATEs with table level hints #7715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af2cce6
IGNITE-27718 Fix ClassCastException in UPDATEs with table level hints
solveme Mar 5, 2026
f43e860
IGNITE-27718 Fix imports
solveme Mar 5, 2026
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
17 changes: 17 additions & 0 deletions ...est/java/org/apache/ignite/internal/sql/engine/datatypes/tests/BaseIndexDataTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.apache.ignite.internal.sql.engine.util.QueryChecker.containsIndexScan;
import static org.apache.ignite.internal.sql.engine.util.QueryChecker.containsIndexScanIgnoreBounds;
import static org.apache.ignite.internal.sql.engine.util.QueryChecker.containsTableScan;

import java.util.stream.Stream;
Expand Down Expand Up @@ -234,6 +235,22 @@ public void testIndexDynParam() {
.check();
}

/**
* Hint in update clause.
*/
@Test
public void testUpdateWithHint() {
checkQuery("UPDATE t /*+ FORCE_INDEX(t_test_key_idx) */ SET test_key = $0")
.matches(containsIndexScanIgnoreBounds("PUBLIC", "T", "T_TEST_KEY_IDX"))
.returnSomething()
.check();

checkQuery("UPDATE t /*+ FORCE_INDEX(t_test_key_idx) */ SET test_key = $2 WHERE test_key = $0")
.matches(containsIndexScanIgnoreBounds("PUBLIC", "T", "T_TEST_KEY_IDX"))
.returnSomething()
.check();
}

public Stream<TestTypeArguments<T>> compoundIndex() {
return TestTypeArguments.unary(testTypeSpec, dataSamples, values.get(0));
}
Expand Down
79 changes: 56 additions & 23 deletions ...ngine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteSqlValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.BiFunction;
import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.prepare.CalciteCatalogReader;
import org.apache.calcite.prepare.Prepare;
Expand Down Expand Up @@ -73,6 +74,7 @@
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.SqlOperatorTable;
import org.apache.calcite.sql.SqlSelect;
import org.apache.calcite.sql.SqlTableRef;
import org.apache.calcite.sql.SqlTypeNameSpec;
import org.apache.calcite.sql.SqlUnknownLiteral;
import org.apache.calcite.sql.SqlUpdate;
Expand Down Expand Up @@ -434,6 +436,19 @@ private IgniteTable getTableForModification(SqlIdentifier identifier) {
return getIgniteTableForModification(identifier, table);
}

private IgniteTable resolveIgniteTableForModification(SqlUpdate call, SqlValidatorTable table) {
SqlNode targetTable = call.getTargetTable();

if (targetTable instanceof SqlTableRef) {
SqlTableRef tableRef = (SqlTableRef) targetTable;
SqlIdentifier tableName = (SqlIdentifier) tableRef.getOperandList().get(0);

return getIgniteTableForModification(tableName, table);
}

return getIgniteTableForModification((SqlIdentifier) targetTable, table);
}

private IgniteTable getIgniteTableForModification(SqlIdentifier identifier, SqlValidatorTable table) {
IgniteDataSource dataSource = table.unwrap(IgniteDataSource.class);
assert dataSource != null;
Expand Down Expand Up @@ -586,36 +601,54 @@ protected RelDataType createTargetRowType(
/** {@inheritDoc} */
@Override
protected SqlSelect createSourceSelectForUpdate(SqlUpdate call) {
final SqlNodeList selectList = new SqlNodeList(SqlParserPos.ZERO);
final SqlIdentifier targetTable = (SqlIdentifier) call.getTargetTable();
return withResolvedTableIdentifier(call, (targetTable, hints) -> {
final SqlNodeList selectList = new SqlNodeList(SqlParserPos.ZERO);

IgniteTable igniteTable = getTableForModification(targetTable);
IgniteTable igniteTable = getTableForModification(targetTable);

SqlIdentifier alias = call.getAlias() != null ? call.getAlias() :
new SqlIdentifier(deriveAlias(targetTable, 0), SqlParserPos.ZERO);
SqlIdentifier alias = call.getAlias() != null ? call.getAlias() :
new SqlIdentifier(deriveAlias(targetTable, 0), SqlParserPos.ZERO);

igniteTable.rowTypeForUpdate((IgniteTypeFactory) typeFactory)
.getFieldNames().stream()
.map(name -> alias.plus(name, SqlParserPos.ZERO))
.forEach(selectList::add);
igniteTable.rowTypeForUpdate((IgniteTypeFactory) typeFactory)
.getFieldNames().stream()
.map(name -> alias.plus(name, SqlParserPos.ZERO))
.forEach(selectList::add);

int ordinal = 0;
// Force unique aliases to avoid a duplicate for Y with SET X=Y
for (SqlNode exp : call.getSourceExpressionList()) {
selectList.add(SqlValidatorUtil.addAlias(exp, SqlUtil.deriveAliasFromOrdinal(ordinal++)));
}
int ordinal = 0;
// Force unique aliases to avoid a duplicate for Y with SET X=Y
for (SqlNode exp : call.getSourceExpressionList()) {
selectList.add(SqlValidatorUtil.addAlias(exp, SqlUtil.deriveAliasFromOrdinal(ordinal++)));
}

SqlNode sourceTable = call.getTargetTable();
SqlNode sourceTable = call.getTargetTable();

if (call.getAlias() != null) {
sourceTable =
SqlValidatorUtil.addAlias(
sourceTable,
call.getAlias().getSimple());
if (call.getAlias() != null) {
sourceTable =
SqlValidatorUtil.addAlias(
sourceTable,
call.getAlias().getSimple());
}

return new SqlSelect(SqlParserPos.ZERO, null, selectList, sourceTable,
call.getCondition(), null, null, null, null, null, null, null, hints);
});
}

private static SqlSelect withResolvedTableIdentifier(
SqlUpdate call,
BiFunction<SqlIdentifier, @Nullable SqlNodeList, SqlSelect> mapper
) {
SqlNode targetTable = call.getTargetTable();

if (targetTable instanceof SqlTableRef) {
SqlTableRef tableRef = (SqlTableRef) targetTable;
SqlIdentifier tableName = (SqlIdentifier) tableRef.getOperandList().get(0);
SqlNodeList hints = (SqlNodeList) tableRef.getOperandList().get(1);

return mapper.apply(tableName, hints);
}

return new SqlSelect(SqlParserPos.ZERO, null, selectList, sourceTable,
call.getCondition(), null, null, null, null, null, null, null, null);
return mapper.apply((SqlIdentifier) targetTable, null);
}

/** {@inheritDoc} */
Expand Down Expand Up @@ -1172,7 +1205,7 @@ private void validateUpdateFields(SqlUpdate call) {

final SqlValidatorNamespace ns = validatedNamespace(call, unknownType);
final SqlValidatorTable table = table(ns);
IgniteTable igniteTable = getIgniteTableForModification((SqlIdentifier) call.getTargetTable(), table);
IgniteTable igniteTable = resolveIgniteTableForModification(call, table);

final RelDataType baseType = table.getRowType();
final RelOptTable relOptTable = relOptTable(ns);
Expand Down