IGNITE-21367 IgniteH2Indexing transactional code removal

apache · Feb 28, 2024 · 8173ab0 · 8173ab0
1 parent 38d3359
commit 8173ab0
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 988 deletions.
diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -28,7 +28,6 @@
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
 import org.apache.ignite.internal.processors.odbc.jdbc.JdbcParameterMeta;
 import org.apache.ignite.internal.processors.query.running.RunningQueryManager;
@@ -153,38 +152,6 @@ public void registerCache(String cacheName, String schemaName, GridCacheContextI
      */
     public void unregisterCache(GridCacheContextInfo<?, ?> cacheInfo);
 
-    /**
-     *
-     * @param cctx Cache context.
-     * @param ids Involved cache ids.
-     * @param parts Partitions.
-     * @param schema Schema name.
-     * @param qry Query string.
-     * @param params Query parameters.
-     * @param flags Flags.
-     * @param pageSize Fetch page size.
-     * @param timeout Timeout.
-     * @param topVer Topology version.
-     * @param mvccSnapshot MVCC snapshot.
-     * @param cancel Query cancel object.
-     * @return Cursor over entries which are going to be changed.
-     * @throws IgniteCheckedException If failed.
-     */
-    public UpdateSourceIterator<?> executeUpdateOnDataNodeTransactional(
-        GridCacheContext<?, ?> cctx,
-        int[] ids,
-        int[] parts,
-        String schema,
-        String qry,
-        Object[] params,
-        int flags,
-        int pageSize,
-        int timeout,
-        AffinityTopologyVersion topVer,
-        MvccSnapshot mvccSnapshot,
-        GridQueryCancel cancel
-    ) throws IgniteCheckedException;
-
     /**
      * Jdbc parameters metadata of the specified query.
      *

diff --git a/...es/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/...es/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -87,7 +87,6 @@
 import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
 import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
 import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
 import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
@@ -2905,56 +2904,6 @@ private void checkxModuleEnabled() throws IgniteException {
         }
     }
 
-    /**
-     * Execute update on DHT node (i.e. when it is possible to execute and update on all nodes independently).
-     *
-     * @param cctx Cache context.
-     * @param cacheIds Involved cache ids.
-     * @param parts Partitions.
-     * @param schema Schema name.
-     * @param qry Query string.
-     * @param params Query parameters.
-     * @param flags Flags.
-     * @param pageSize Fetch page size.
-     * @param timeout Timeout.
-     * @param topVer Topology version.
-     * @param mvccSnapshot MVCC snapshot.
-     * @param cancel Query cancel object.
-     * @return Cursor over entries which are going to be changed.
-     * @throws IgniteCheckedException If failed.
-     */
-    public UpdateSourceIterator<?> executeUpdateOnDataNodeTransactional(
-        GridCacheContext<?, ?> cctx,
-        int[] cacheIds,
-        int[] parts,
-        String schema,
-        String qry,
-        Object[] params,
-        int flags,
-        int pageSize,
-        int timeout,
-        AffinityTopologyVersion topVer,
-        MvccSnapshot mvccSnapshot,
-        GridQueryCancel cancel
-    ) throws IgniteCheckedException {
-        checkxIndexingEnabled();
-
-        return idx.executeUpdateOnDataNodeTransactional(
-            cctx,
-            cacheIds,
-            parts,
-            schema,
-            qry,
-            params,
-            flags,
-            pageSize,
-            timeout,
-            topVer,
-            mvccSnapshot,
-            cancel
-        );
-    }
-
     /**
      * Query SQL fields.
      *

diff --git a/.../core/src/main/java/org/apache/ignite/internal/processors/query/UpdateSourceIterator.java b/.../core/src/main/java/org/apache/ignite/internal/processors/query/UpdateSourceIterator.java
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1649,7 +1649,6 @@ org.apache.ignite.internal.processors.query.QueryField
 org.apache.ignite.internal.processors.query.QueryIndexKey
 org.apache.ignite.internal.processors.query.QuerySchema
 org.apache.ignite.internal.processors.query.running.RunningQueryManager$1
-org.apache.ignite.internal.processors.query.UpdateSourceIterator
 org.apache.ignite.internal.processors.query.aware.IndexBuildStatusHolder$Status
 org.apache.ignite.internal.processors.query.aware.IndexRebuildCacheInfo
 org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest

diff --git a/...es/core/src/test/java/org/apache/ignite/internal/processors/query/DummyQueryIndexing.java b/...es/core/src/test/java/org/apache/ignite/internal/processors/query/DummyQueryIndexing.java
@@ -27,7 +27,6 @@
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheContextInfo;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
 import org.apache.ignite.internal.processors.odbc.jdbc.JdbcParameterMeta;
 import org.apache.ignite.internal.processors.query.running.RunningQueryManager;
@@ -123,24 +122,6 @@ public class DummyQueryIndexing implements GridQueryIndexing {
 
     }
 
-    /** {@inheritDoc} */
-    @Override public UpdateSourceIterator<?> executeUpdateOnDataNodeTransactional(
-        GridCacheContext<?, ?> cctx,
-        int[] ids,
-        int[] parts,
-        String schema,
-        String qry,
-        Object[] params,
-        int flags,
-        int pageSize,
-        int timeout,
-        AffinityTopologyVersion topVer,
-        MvccSnapshot mvccSnapshot,
-        GridQueryCancel cancel
-    ) throws IgniteCheckedException {
-        return null;
-    }
-
     /** {@inheritDoc} */
     @Override public List<JdbcParameterMeta> parameterMetaData(
         String schemaName,