IGNITE-25712 SQL: Fix key fields wrapping in index for tables created with DDL on existing cache

Author: alex-plekhanov

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java

@@ -336,11 +336,16 @@ public void onKernalStart(boolean checkConsistency) throws IgniteCheckedExceptio
                 CacheData cacheData = gridData.gridData.caches().get(locCfg.getName());
 
                 if (cacheData != null) {
-                    if (!Objects.equals(cacheData.sql(), locCacheInfo.sql())) {
-                        throw new IgniteCheckedException("Cache configuration mismatch (local cache was created " +
-                            "via " + (locCacheInfo.sql() ? "CREATE TABLE" : "Ignite API") + ", while remote cache " +
-                            "was created via " + (cacheData.sql() ? "CREATE TABLE" : "Ignite API") + "): " +
-                            locCacheInfo.cacheData().config().getName());
+                    if (cacheData.sql() != locCacheInfo.sql()) {
+                        // Local configuration entities can be upgraded from the cluster (added by dynamic CREATE TABLE),
+                        // in this case SQL flag is changed too.
+                        if (!cacheData.sql() || F.isEmpty(cacheData.schema().entities())
+                            || !F.isEmpty(locCacheInfo.cacheData().queryEntities())) {
+                            throw new IgniteCheckedException("Cache configuration mismatch (local cache was created " +
+                                "via " + (locCacheInfo.sql() ? "CREATE TABLE" : "Ignite API" ) + ", while remote cache " +
+                                "was created via " + (cacheData.sql() ? "CREATE TABLE" : "Ignite API" ) + "): " +
+                                locCacheInfo.cacheData().config().getName());
+                        }
                     }
 
                     if (checkConsistency) {

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java

@@ -32,6 +32,7 @@
 import org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation;
 import org.apache.ignite.internal.processors.query.schema.operation.SchemaAddQueryEntityOperation;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -368,6 +369,8 @@ public void schemaChangeFinish(SchemaFinishDiscoveryMessage msg) {
             schema.finish(msg);
 
             if (msg.operation() instanceof SchemaAddQueryEntityOperation) {
+                sql = true;
+
                 cacheCfg = GridCacheUtils.patchCacheConfiguration(cacheCfg,
                         (SchemaAddQueryEntityOperation)msg.operation());
             }
@@ -412,8 +415,12 @@ public boolean applySchemaPatch(QuerySchemaPatch patch) {
 
             if (res) {
                 for (SchemaAbstractOperation op: patch.getPatchOperations()) {
-                    if (op instanceof SchemaAddQueryEntityOperation)
+                    if (op instanceof SchemaAddQueryEntityOperation) {
+                        if (!F.isEmpty(((SchemaAddQueryEntityOperation)op).entities()))
+                            sql = true;
+
                         cacheCfg = GridCacheUtils.patchCacheConfiguration(cacheCfg, (SchemaAddQueryEntityOperation)op);
+                    }
                 }
             }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java

@@ -2196,7 +2196,7 @@ else if (op instanceof SchemaAddQueryEntityOperation) {
                     candRes = createQueryCandidates(op0.cacheName(), op0.schemaName(), cacheInfo, op0.entities(),
                     op0.isSqlEscape());
 
-                registerCache0(op0.cacheName(), op.schemaName(), cacheInfo, candRes.get1(), false);
+                registerCache0(op0.cacheName(), op.schemaName(), cacheInfo, candRes.get1(), true);
 
                 if (idxRebuildFutStorage.prepareRebuildIndexes(singleton(cacheInfo.cacheId()), null).isEmpty())
                     rebuildIndexesFromHash0(cacheInfo.cacheContext(), false, cancelTok);