[ignite] branch master updated: IGNITE-12275: SQL: Moved non-SELECT/DML commands processing to separate class. This closes #6071.
This is an automated email from the ASF dual-hosted git repository. vozerov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new 88fcc92 IGNITE-12275: SQL: Moved non-SELECT/DML commands processing to separate class. This closes #6071. 88fcc92 is described below commit 88fcc92243df12bff1d18742211062d5e1d7dee4 Author: devozerov AuthorDate: Sat Feb 9 18:02:37 2019 +0300 IGNITE-12275: SQL: Moved non-SELECT/DML commands processing to separate class. This closes #6071. --- ...tementsProcessor.java => CommandProcessor.java} | 323 .../processors/query/h2/CommandResult.java | 58 .../processors/query/h2/IgniteH2Indexing.java | 324 + .../processors/query/h2/ParsingResult.java | 45 ++- .../cache/index/H2DynamicTableSelfTest.java| 4 +- 5 files changed, 435 insertions(+), 319 deletions(-) diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java similarity index 72% rename from modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java rename to modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java index 84dfea2..8c52296 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.query.h2.ddl; +package org.apache.ignite.internal.processors.query.h2; import java.util.ArrayList; import java.util.Collections; @@ -28,28 +28,41 @@ import java.util.Set; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteCluster; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.cache.QueryIndexType; +import org.apache.ignite.cache.query.BulkLoadContextCursor; import org.apache.ignite.cache.query.FieldsQueryCursor; +import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.bulkload.BulkLoadAckClientParameters; +import org.apache.ignite.internal.processors.bulkload.BulkLoadCacheWriter; +import org.apache.ignite.internal.processors.bulkload.BulkLoadParser; +import org.apache.ignite.internal.processors.bulkload.BulkLoadProcessor; +import org.apache.ignite.internal.processors.bulkload.BulkLoadStreamerWriter; import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.QueryCursorImpl; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal; import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils; import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; +import org.apache.ignite.internal.processors.cache.query.SqlFieldsQueryEx; import org.apache.ignite.internal.processors.query.GridQueryProperty; import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor; import org.apache.ignite.internal.processors.query.IgniteSQLException; +import org.apache.ignite.internal.processors.query.NestedTxMode; import org.apache.ignite.internal.processors.query.QueryEntityEx; import org.apache.ignite.internal.processors.query.QueryField; import org.apache.ignite.internal.processors.query.QueryUtils; -import org.apache.ignite.internal.processors.query.h2.H2Utils; -import org.apache.ignite.internal.processors.query.h2.SchemaManager; +import org.apache.ignite.internal.processors.query.RunningQueryManager; +import org.apache.ignite.internal.processors.query.SqlClientContext; +import org.apache.ignite.internal.processors.query.h2.dml.DmlBulkLoadDataConverter; +import org.apache.ignite.internal.processors.query.h2.dml.UpdatePlan; +import org.apache.ignite.internal.processors.query.h2.dml.UpdatePlanBuilder; import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; import org.apache.ignite.internal.processors.query.h2.sql.GridSqlAlterTableAddColumn; import org.apache.ignite.internal.processors.query.h2.sql.GridSqlAlterTableDropColumn; @@ -58,20 +71,26 @@ import org.apache.ignite.internal.processors.query.h2.sql.GridSqlCreateIndex; import org.apache.ignite
[ignite] 01/02: Merge remote-tracking branch 'remotes/origin/master' into ignite-1090
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit f06e7eb9113209af0353123e295aaa9f0f7b3b94
Merge: 2da2ce1 208c53f
Author: sboikov
AuthorDate: Sat Feb 9 13:13:00 2019 +0300
Merge remote-tracking branch 'remotes/origin/master' into ignite-1090
.../managers/discovery/IgniteDiscoverySpi.java | 7 +
.../processors/cache/ClusterCachesInfo.java| 2 -
.../spi/communication/tcp/TcpCommunicationSpi.java | 10 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 6 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 356 ++--
.../ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 22 +-
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 11 +-
.../{TcpDiscoverySpiState.java => FutureTask.java} | 57 ++--
.../tcp/internal/TcpDiscoveryNodesRing.java| 33 +-
.../tcp/internal/TcpDiscoverySpiState.java | 5 +-
.../TcpDiscoveryDummyWakeupMessage.java} | 42 +--
.../tcp/messages/TcpDiscoveryHandshakeRequest.java | 23 +-
.../messages/TcpDiscoveryNodeFailedMessage.java| 10 +-
.../IgniteTcpCommunicationConnectOnInitTest.java | 89 +
.../tcp/TcpDiscoveryCoordinatorFailureTest.java| 366 +
.../TcpDiscoveryPendingMessageDeliveryTest.java| 2 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
.../cache/query/GridCacheTwoStepQuery.java | 183 +++
.../internal/processors/query/h2/H2Utils.java | 141
.../processors/query/h2/IgniteH2Indexing.java | 250 --
.../processors/query/h2/dml/UpdatePlanBuilder.java | 21 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 59 ++--
.../query/h2/twostep/GridReduceQueryExecutor.java | 34 +-
.../query/h2/twostep/ReduceQueryRun.java | 5 +-
.../spi/discovery/zk/ZookeeperDiscoverySpi.java| 6 +
.../spi/discovery/zk/internal/ZkClusterNodes.java | 17 +
.../zk/internal/ZookeeperDiscoveryImpl.java| 11 +
27 files changed, 1203 insertions(+), 567 deletions(-)
[ignite] 02/02: ignite-1090
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit f961c57325301e8bf9957ad3db5b39f4aba1c09b
Author: sboikov
AuthorDate: Sat Feb 9 13:16:02 2019 +0300
ignite-1090
---
.../java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index dc68d48..52523b1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -975,7 +975,7 @@ public final class GridCacheMvcc {
* as system invalidate and marks these candidates as owned and used.
*
* @param ver Version to salvage.
- * @param near {@code True} if remove near cache candidate.
+ * @param near {@code True} If salvage near cache candidate.
*/
public void salvageRemote(GridCacheVersion ver, boolean near) {
assert ver != null;
[ignite] branch ignite-1090 updated (2da2ce1 -> f961c57)
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a change to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 2da2ce1 Merge remote-tracking branch 'remotes/origin/master' into
ignite-1090
add 396d9c9 IGNITE-10395 Fixed 'Invalid node order' assertion - Fixes
#5835.
add 208c53f IGNITE-11223: SQL: Make two-step plan immutable. Note that
GridCacheSqlQuery is still mutable, what will be fixed separately. This closes
#6070.
new f06e7eb Merge remote-tracking branch 'remotes/origin/master' into
ignite-1090
new f961c57 ignite-1090
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../managers/discovery/IgniteDiscoverySpi.java | 7 +
.../processors/cache/ClusterCachesInfo.java| 2 -
.../internal/processors/cache/GridCacheMvcc.java | 2 +-
.../spi/communication/tcp/TcpCommunicationSpi.java | 10 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 6 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 356 ++--
.../ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 22 +-
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 11 +-
.../discovery/tcp/internal/FutureTask.java}| 26 +-
.../tcp/internal/TcpDiscoveryNodesRing.java| 33 +-
.../tcp/internal/TcpDiscoverySpiState.java | 5 +-
.../messages/TcpDiscoveryDummyWakeupMessage.java} | 17 +-
.../tcp/messages/TcpDiscoveryHandshakeRequest.java | 23 +-
.../messages/TcpDiscoveryNodeFailedMessage.java| 10 +-
.../IgniteTcpCommunicationConnectOnInitTest.java | 89 +
.../tcp/TcpDiscoveryCoordinatorFailureTest.java| 366 +
.../TcpDiscoveryPendingMessageDeliveryTest.java| 2 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
.../cache/query/GridCacheTwoStepQuery.java | 183 +++
.../internal/processors/query/h2/H2Utils.java | 141
.../processors/query/h2/IgniteH2Indexing.java | 250 --
.../processors/query/h2/dml/UpdatePlanBuilder.java | 21 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 59 ++--
.../query/h2/twostep/GridReduceQueryExecutor.java | 34 +-
.../query/h2/twostep/ReduceQueryRun.java | 5 +-
.../spi/discovery/zk/ZookeeperDiscoverySpi.java| 6 +
.../spi/discovery/zk/internal/ZkClusterNodes.java | 17 +
.../zk/internal/ZookeeperDiscoveryImpl.java| 11 +
28 files changed, 1189 insertions(+), 527 deletions(-)
copy
modules/core/src/main/java/org/apache/ignite/{internal/util/GridTimerTask.java
=> spi/discovery/tcp/internal/FutureTask.java} (65%)
copy
modules/{zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java
=>
core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java}
(73%)
create mode 100644
modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java
[ignite] branch master updated: IGNITE-11223: SQL: Make two-step plan immutable. Note that GridCacheSqlQuery is still mutable, what will be fixed separately. This closes #6070.
This is an automated email from the ASF dual-hosted git repository.
vozerov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 208c53f IGNITE-11223: SQL: Make two-step plan immutable. Note that
GridCacheSqlQuery is still mutable, what will be fixed separately. This closes
#6070.
208c53f is described below
commit 208c53f467797606cfd0b116bda3101cf3451d5b
Author: devozerov
AuthorDate: Sat Feb 9 11:19:55 2019 +0300
IGNITE-11223: SQL: Make two-step plan immutable. Note that
GridCacheSqlQuery is still mutable, what will be fixed separately. This closes
#6070.
---
.../cache/query/GridCacheTwoStepQuery.java | 183 ---
.../internal/processors/query/h2/H2Utils.java | 141
.../processors/query/h2/IgniteH2Indexing.java | 250 +
.../processors/query/h2/dml/UpdatePlanBuilder.java | 21 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 59 ++---
.../query/h2/twostep/GridReduceQueryExecutor.java | 34 ++-
.../query/h2/twostep/ReduceQueryRun.java | 5 +-
7 files changed, 317 insertions(+), 376 deletions(-)
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index cc5dd03..aad9cdd 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -17,12 +17,12 @@
package org.apache.ignite.internal.processors.cache.query;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.apache.ignite.internal.processors.query.QueryUtils;
import org.apache.ignite.internal.sql.optimizer.affinity.PartitionResult;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
@@ -30,48 +30,42 @@ import org.apache.ignite.internal.util.typedef.internal.S;
*/
public class GridCacheTwoStepQuery {
/** */
-public static final int DFLT_PAGE_SIZE = 1000;
-
-/** */
@GridToStringInclude
-private List mapQrys = new ArrayList<>();
+private final List mapQrys;
/** */
@GridToStringInclude
-private GridCacheSqlQuery rdc;
-
-/** */
-private int pageSize = DFLT_PAGE_SIZE;
+private final GridCacheSqlQuery rdc;
/** */
-private boolean explain;
+private final boolean explain;
/** */
-private String originalSql;
+private final String originalSql;
/** */
-private Set tbls;
+private final Set tbls;
/** */
-private boolean distributedJoins;
+private final boolean distributedJoins;
/** */
-private boolean skipMergeTbl;
+private final boolean skipMergeTbl;
/** */
-private List cacheIds;
+private final List cacheIds;
/** */
-private boolean local;
+private final boolean local;
/** */
-private PartitionResult derivedPartitions;
+private final PartitionResult derivedPartitions;
/** */
-private boolean mvccEnabled;
+private final boolean mvccEnabled;
/** {@code FOR UPDATE} flag. */
-private boolean forUpdate;
+private final boolean forUpdate;
/** Number of positional arguments in the sql. */
private final int paramsCnt;
@@ -80,19 +74,34 @@ public class GridCacheTwoStepQuery {
* @param originalSql Original query SQL.
* @param tbls Tables in query.
*/
-public GridCacheTwoStepQuery(String originalSql, int paramsCnt,
Set tbls) {
+public GridCacheTwoStepQuery(
+String originalSql,
+int paramsCnt,
+Set tbls,
+GridCacheSqlQuery rdc,
+List mapQrys,
+boolean skipMergeTbl,
+boolean explain,
+boolean distributedJoins,
+boolean forUpdate,
+PartitionResult derivedPartitions,
+List cacheIds,
+boolean mvccEnabled,
+boolean local
+) {
this.originalSql = originalSql;
this.paramsCnt = paramsCnt;
this.tbls = tbls;
-}
-
-/**
- * Specify if distributed joins are enabled for this query.
- *
- * @param distributedJoins Distributed joins enabled.
- */
-public void distributedJoins(boolean distributedJoins) {
+this.rdc = rdc;
+this.mapQrys = F.isEmpty(mapQrys) ? Collections.emptyList() : mapQrys;
+this.skipMergeTbl = skipMergeTbl;
+this.explain = explain;
this.distributedJoins = distributedJoins;
+this.forUpdate = forUpdate;
+this.derivedPartitions = derivedPartitions;
+
