[ignite] branch master updated (f60771d -> f0d9b03)
This is an automated email from the ASF dual-hosted git repository. mmuzaf pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git. from f60771d IGNITE-13427 Fix Metastore view iteration on unmarshalleable keys (#8240) add f0d9b03 IGNITE-13420 Add assertion message to assert in CachedDeploymentInfo constructor (#8231) No new revisions were added by this update. Summary of changes: .../ignite/internal/processors/cache/GridCacheDeploymentManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[ignite] branch ignite-12248 updated (f54e7a5 -> 25e754c)
This is an automated email from the ASF dual-hosted git repository. gvvinblade pushed a change to branch ignite-12248 in repository https://gitbox.apache.org/repos/asf/ignite.git. from f54e7a5 minor improvements add 426866c IGNITE-13387 Update ignite-gce dependencies add baf8c67 IGNITE-12718 pyignite: added SSL keyfile password argument. (#7480) add 7b443b4 IGNITE-13308: CPP Thin client Transactions add 974f290 IGNITE-12364 Migrate JMS module to ignite-extensions - Fixes #8198. add 38025ee IGNITE-12809 Python thin client - Fix wrong order of the SQL query result (#8203) add 04ae61f IGNITE-13382 DurableBackgroundTask can abandon incomplete task - Fixes #8182. add cc04d07 IGNITE-13390 Fixed get_master_key_name command console output (#8209) add 74749b5 IGNITE-13296 .NET: Fix transaction disposal and finalization add e76ed03 IGNITE-13397 Fixed NPE in logSupplierDone. - Fixes #8214. add d2ece79 IGNITE-13265 Improved consistency for atomic cache WAL rebalancing. add 943dfa9 IGNITE-13377 Fixed flaky WalModeChangeAdvancedSelfTest. - Fixes #8173. add 258a755 IGNITE-13329 Run checkstyle on validate maven phase (#8120) add 466ee59 IGNITE-13402 Fixed AssertionError during expiration cache entries. Fixes #8215 add db3aad1 IGNITE-13361 Fix hang of sending communication messages - Fixes #8180. add 3049b3c IGNITE-13358 Improvements in partition clearing related parts. Fixes#8186 add 589efec IGNITE-13408 BinaryMetatadatView introduced (#8228) add ca01605 IGNITE-13409 MetastorageView and DistributedMetastorageView introduced. (#8225) add 98ca3eb IGNITE-13411 Optimize tracing with NoopTracingSpi - Fixes #8224. add fd50415 IGNITE-13380 Output IgniteSystemProperties via ignite.sh (#8207) add 0260ba0 IGNITE-13362 Add warmup stop command to control.sh - Fixes #8201. add 23cecab IGNITE-13414 JDBC Thin: Compatibility fix for 2.8-2.9 versions - Fixes #8227. add eff5393 IGNITE-13401 Java thin client: Fix unmarshalling failure when cache configuration message or binary type message start with byte 103 - Fixes #8216. add f60771d IGNITE-13427 Fix Metastore view iteration on unmarshalleable keys (#8240) new 382ffae Merge branch 'master' into ignite-12248 new 25e754c fix merge conflicts 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: .gitignore | 6 + assembly/libs/README.txt | 1 - checkstyle/checkstyle.xml | 7 +- .../jmh/misc/JmhTracingContextBenchmark.java | 112 modules/calcite/pom.xml| 2 +- .../internal/jdbc2/JdbcMetadataSelfTest.java | 4 +- .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 15 +- .../SystemViewRowAttributeWalkerGenerator.java | 4 + .../jdbc/JdbcThinCompatibilityTest.java| 197 ++ .../ignite/compatibility/jdbc/package-info.java} | 18 +- .../junits/IgniteCompatibilityAbstractTest.java| 87 +-- .../IgniteCompatibilityBasicTestSuite.java | 4 +- .../ignite/internal/commandline/Command.java | 31 + .../ignite/internal/commandline/CommandList.java | 5 +- .../ignite/internal/commandline/WarmUpCommand.java | 121 .../commandline/encryption/EncryptionCommand.java | 6 +- .../commandline/CommandHandlerParsingTest.java | 36 +- .../apache/ignite/util/GridCommandHandlerTest.java | 68 +- .../org/apache/ignite/IgniteSystemProperties.java | 571 + ...ateCounterMvccImpl.java => SystemProperty.java} | 37 +- .../java/org/apache/ignite/cache/CacheManager.java | 6 +- .../java/org/apache/ignite/cache/CacheMetrics.java | 2 +- .../configuration/DataStorageConfiguration.java| 6 +- .../ignite/configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/GridKernalGatewayImpl.java | 7 +- .../org/apache/ignite/internal/IgniteKernal.java | 20 +- .../ignite/internal/LongJVMPauseDetector.java | 15 +- .../binary/streams/BinaryMemoryAllocatorChunk.java | 6 +- .../internal/client/GridClientBeforeNodeStart.java | 66 ++ .../ignite/internal/client/GridClientFactory.java | 33 +- .../client/GridClientNodeStateBeforeStart.java}| 19 +- .../internal/client/impl/GridClientImpl.java | 190 -- .../impl/GridClientNodeStateBeforeStartImpl.java | 49 ++ .../impl/connection/GridClientConnection.java | 9 + .../connection/GridClientConnectionManager.java| 12 + .../GridClientConnectionManagerAdapter.java| 156 +++-- .../GridClientConnectionManagerOsImpl.java | 7 +- .../connection/GridClientNioTcpConnection.java | 8 +
[ignite] 01/02: Merge branch 'master' into ignite-12248
This is an automated email from the ASF dual-hosted git repository. gvvinblade pushed a commit to branch ignite-12248 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 382ffae939d73aa4d640ac2991b88dc9a0b8a70d Merge: f54e7a5 f60771d Author: Igor Seliverstov AuthorDate: Mon Sep 14 10:39:45 2020 +0300 Merge branch 'master' into ignite-12248 .gitignore | 6 + assembly/libs/README.txt | 1 - checkstyle/checkstyle.xml | 7 +- .../jmh/misc/JmhTracingContextBenchmark.java | 112 .../internal/jdbc2/JdbcMetadataSelfTest.java | 4 +- .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 15 +- .../SystemViewRowAttributeWalkerGenerator.java | 4 + .../jdbc/JdbcThinCompatibilityTest.java| 197 ++ .../ignite/compatibility/jdbc/package-info.java} | 18 +- .../junits/IgniteCompatibilityAbstractTest.java| 87 +-- .../IgniteCompatibilityBasicTestSuite.java | 4 +- .../ignite/internal/commandline/Command.java | 31 + .../ignite/internal/commandline/CommandList.java | 5 +- .../ignite/internal/commandline/WarmUpCommand.java | 121 .../commandline/encryption/EncryptionCommand.java | 6 +- .../commandline/CommandHandlerParsingTest.java | 36 +- .../apache/ignite/util/GridCommandHandlerTest.java | 68 +- .../org/apache/ignite/IgniteSystemProperties.java | 571 + ...ateCounterMvccImpl.java => SystemProperty.java} | 37 +- .../java/org/apache/ignite/cache/CacheManager.java | 6 +- .../java/org/apache/ignite/cache/CacheMetrics.java | 2 +- .../configuration/DataStorageConfiguration.java| 6 +- .../ignite/configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/GridKernalGatewayImpl.java | 7 +- .../org/apache/ignite/internal/IgniteKernal.java | 20 +- .../ignite/internal/LongJVMPauseDetector.java | 15 +- .../binary/streams/BinaryMemoryAllocatorChunk.java | 6 +- .../internal/client/GridClientBeforeNodeStart.java | 66 ++ .../ignite/internal/client/GridClientFactory.java | 33 +- .../client/GridClientNodeStateBeforeStart.java}| 19 +- .../internal/client/impl/GridClientImpl.java | 190 -- .../impl/GridClientNodeStateBeforeStartImpl.java | 49 ++ .../impl/connection/GridClientConnection.java | 9 + .../connection/GridClientConnectionManager.java| 12 + .../GridClientConnectionManagerAdapter.java| 156 +++-- .../GridClientConnectionManagerOsImpl.java | 7 +- .../connection/GridClientNioTcpConnection.java | 8 + .../client/router/impl/GridRouterClientImpl.java | 2 +- .../client/thin/ClientCacheAffinityMapping.java| 2 +- .../client/thin/ClientClusterGroupImpl.java| 23 +- .../internal/client/thin/ClientClusterImpl.java| 5 +- .../ignite/internal/client/thin/ClientUtils.java | 21 +- .../internal/client/thin/TcpClientChannel.java | 4 +- .../internal/client/thin/TcpIgniteClient.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 19 +- .../managers/discovery/GridDiscoveryManager.java | 7 +- .../walker/BinaryMetadataViewWalker.java | 56 ++ .../systemview/walker/MetastorageViewWalker.java} | 30 +- .../processors/affinity/AffinityAssignment.java| 5 +- .../affinity/GridAffinityAssignmentCache.java | 11 +- .../cache/CacheAffinitySharedManager.java | 6 +- .../processors/cache/CacheGroupContext.java| 12 +- .../processors/cache/CacheMetricsImpl.java | 37 +- .../internal/processors/cache/ExchangeContext.java | 4 +- .../processors/cache/GridCacheAdapter.java | 18 +- .../processors/cache/GridCacheConcurrentMap.java | 5 +- .../cache/GridCacheConcurrentMapImpl.java | 37 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheMapEntry.java| 12 +- .../processors/cache/GridCacheMvccManager.java | 7 +- .../cache/GridCachePartitionExchangeManager.java | 18 +- .../processors/cache/GridCacheProcessor.java | 11 +- .../cache/GridCacheSharedTtlCleanupManager.java| 11 + .../processors/cache/GridCacheTtlManager.java | 5 +- .../internal/processors/cache/GridCacheUtils.java | 5 +- .../processors/cache/GridNoStorageCacheMap.java| 6 +- .../cache/PartitionUpdateCounterMvccImpl.java | 5 + .../cache/PartitionUpdateCounterTrackingImpl.java | 7 +- .../internal/processors/cache/WalStateManager.java | 19 +- .../binary/CacheObjectBinaryProcessorImpl.java | 17 +- .../distributed/GridDistributedCacheEntry.java | 3 +- .../dht/GridCachePartitionedConcurrentMap.java | 8 +- .../dht/GridDhtTransactionalCacheAdapter.java | 3 +- .../dht/GridPartitionedSingleGetFuture.java| 4 +- .../distributed/dht/atomic/GridDhtAtomicCache.java | 11 +-
[ignite] 02/02: fix merge conflicts
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 25e754c2d51e03aafc063755b6cf44d097e9d7f3
Author: Igor Seliverstov
AuthorDate: Mon Sep 14 14:09:18 2020 +0300
fix merge conflicts
---
modules/calcite/pom.xml| 2 +-
.../org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java| 10 ++
.../internal/processors/odbc/jdbc/JdbcConnectionContext.java | 7 ---
.../ignite/internal/processors/query/h2/SchemaManager.java | 8 +++-
.../ignite/internal/processors/query/h2/opt/GridH2Table.java | 7 ---
5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index 469a1d8..d5eabe9 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -41,7 +41,7 @@
ignite-calcite
-2.9.0-SNAPSHOT
+2.10.0-SNAPSHOT
http://ignite.apache.org
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index fc44067..e70bbf2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -30,7 +30,9 @@ import java.util.Objects;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
+
import javax.cache.configuration.Factory;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.query.QueryCancelledException;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -97,11 +99,11 @@ public class JdbcThinTcpIo {
/** Version 2.9.0. Adds user attributes support. Adds features flags
support. */
private static final ClientListenerProtocolVersion VER_2_9_0 =
ClientListenerProtocolVersion.create(2, 9, 0);
-/** Version 2.9.0. */
-private static final ClientListenerProtocolVersion VER_2_9_0 =
ClientListenerProtocolVersion.create(2, 9, 0);
+/** Version 2.10.0. */
+private static final ClientListenerProtocolVersion VER_2_10_0 =
ClientListenerProtocolVersion.create(2, 10, 0);
/** Current version. */
-private static final ClientListenerProtocolVersion CURRENT_VER = VER_2_9_0;
+private static final ClientListenerProtocolVersion CURRENT_VER =
VER_2_10_0;
/** Initial output stream capacity for handshake. */
private static final int HANDSHAKE_MSG_SIZE = 13;
@@ -313,7 +315,7 @@ public class JdbcThinTcpIo {
writer.writeByteArray(ThinProtocolFeature.featuresAsBytes(enabledFeatures()));
}
-if (ver.compareTo(VER_2_9_0) >= 0)
+if (ver.compareTo(VER_2_10_0) >= 0)
writer.writeBoolean(connProps.isUseExperimentalQueryEngine());
if (!F.isEmpty(connProps.getUsername())) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index afa842d..02d0bcf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -21,6 +21,7 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
@@ -69,10 +70,10 @@ public class JdbcConnectionContext extends
ClientListenerAbstractConnectionConte
static final ClientListenerProtocolVersion VER_2_9_0 =
ClientListenerProtocolVersion.create(2, 9, 0);
/** Version 2.9.0: adds experimental query engine support */
-static final ClientListenerProtocolVersion VER_2_9_0 =
ClientListenerProtocolVersion.create(2, 9, 0);
+static final ClientListenerProtocolVersion VER_2_10_0 =
ClientListenerProtocolVersion.create(2, 10, 0);
/** Current version. */
-public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_9_0;
+public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_10_0;
/** Supported versions. */
private static final Set SUPPORTED_VERS =
new HashSet<>();
@@ -193,7 +194,7 @@ public class JdbcConnectionContext extends
ClientListenerAbstractConnectionConte
features = JdbcThinFeature.enumSet(cliFeatures);
}
-if (ver.compareTo(VER_2_9_0) >= 0)
+if (ver.compareTo(VER_2_10_0) >= 0)
useExperimentalQueryEngine = reader.readBoolean();
if (ver.compareTo(VER_2_5_0) >= 0) {
diff --git
[ignite] branch master updated (f0d9b03 -> 42260b8)
This is an automated email from the ASF dual-hosted git repository. mmuzaf pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git. from f0d9b03 IGNITE-13420 Add assertion message to assert in CachedDeploymentInfo constructor (#8231) add 42260b8 IGNITE-13126 Reduce continuous query buffers heap usage (#8028) No new revisions were added by this update. Summary of changes: .../ignite/internal/GridEventConsumeHandler.java | 5 - .../ignite/internal/GridMessageListenHandler.java | 5 - .../preloader/GridDhtPartitionsExchangeFuture.java | 2 +- .../continuous/CacheContinuousQueryEntry.java | 35 +++- .../CacheContinuousQueryEventBuffer.java | 205 +++-- .../continuous/CacheContinuousQueryHandler.java| 91 - .../continuous/CacheContinuousQueryListener.java | 4 +- .../continuous/CacheContinuousQueryManager.java| 6 +- .../CacheContinuousQueryPartitionRecovery.java | 2 +- .../continuous/GridContinuousHandler.java | 4 +- .../continuous/GridContinuousProcessor.java| 7 +- .../CacheContinuousQueryEventBufferTest.java | 12 +- 12 files changed, 152 insertions(+), 226 deletions(-)
[ignite] branch master updated: IGNITE-13403 Update JDBC metadata to match actual capabilities (#8217)
This is an automated email from the ASF dual-hosted git repository.
tledkov 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 513afe4 IGNITE-13403 Update JDBC metadata to match actual
capabilities (#8217)
513afe4 is described below
commit 513afe4dabbaa1c2853a76ff02e58f4a7db01076
Author: tledkov
AuthorDate: Mon Sep 14 15:13:27 2020 +0300
IGNITE-13403 Update JDBC metadata to match actual capabilities (#8217)
---
.../ignite/internal/jdbc2/JdbcMetadataSelfTest.java | 15 +++
.../org/apache/ignite/jdbc/JdbcMetadataSelfTest.java | 16
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 15 +++
.../ignite/internal/jdbc/JdbcDatabaseMetadata.java | 8
.../internal/jdbc/thin/JdbcThinDatabaseMetadata.java | 6 +++---
.../ignite/internal/jdbc2/JdbcDatabaseMetadata.java | 8
6 files changed, 57 insertions(+), 11 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index 9c21309..dce0689 100755
---
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -451,6 +451,21 @@ public class JdbcMetadataSelfTest extends
GridCommonAbstractTest {
}
/**
+ * Check JDBC support flags.
+ */
+@Test
+public void testCheckSupports() throws SQLException {
+try (Connection conn = DriverManager.getConnection(BASE_URL)) {
+DatabaseMetaData meta = conn.getMetaData();
+
+assertTrue(meta.supportsANSI92EntryLevelSQL());
+assertTrue(meta.supportsAlterTableWithAddColumn());
+assertTrue(meta.supportsAlterTableWithDropColumn());
+assertTrue(meta.nullPlusNonNullIsNull());
+}
+}
+
+/**
* Assert that specified ResultSet contains no rows.
*
* @param rs result set to check.
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 82acac9..7583aa7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -25,6 +25,7 @@ import java.sql.Date;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collection;
@@ -319,6 +320,21 @@ public class JdbcMetadataSelfTest extends
GridCommonAbstractTest {
}
/**
+ * Check JDBC support flags.
+ */
+@Test
+public void testCheckSupports() throws SQLException {
+try (Connection conn = DriverManager.getConnection(URL)) {
+DatabaseMetaData meta = conn.getMetaData();
+
+assertTrue(meta.supportsANSI92EntryLevelSQL());
+assertTrue(meta.supportsAlterTableWithAddColumn());
+assertTrue(meta.supportsAlterTableWithDropColumn());
+assertTrue(meta.nullPlusNonNullIsNull());
+}
+}
+
+/**
* Person.
*/
private static class Person implements Serializable {
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index a911a1c..3061b4a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -1370,6 +1370,21 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
+ * Check JDBC support flags.
+ */
+@Test
+public void testCheckSupports() throws SQLException {
+try (Connection conn = DriverManager.getConnection(URL)) {
+DatabaseMetaData meta = conn.getMetaData();
+
+assertTrue(meta.supportsANSI92EntryLevelSQL());
+assertTrue(meta.supportsAlterTableWithAddColumn());
+assertTrue(meta.supportsAlterTableWithDropColumn());
+assertTrue(meta.nullPlusNonNullIsNull());
+}
+}
+
+/**
* Person.
*/
private static class Person implements Serializable {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
index ad54258..a8b4650 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
+++
[ignite] branch ignite-12248 updated: fix exception handling on root node
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12248 by this push:
new 2f7e98a fix exception handling on root node
2f7e98a is described below
commit 2f7e98ae80a2e6bb4002fe2a2412507e8d67f958
Author: Igor Seliverstov
AuthorDate: Mon Sep 14 17:13:05 2020 +0300
fix exception handling on root node
---
.../query/calcite/exec/ExecutionServiceImpl.java | 2 +-
.../query/calcite/exec/rel/AbstractNode.java | 36 --
.../query/calcite/exec/rel/AggregateNode.java | 2 +-
.../exec/rel/CorrelatedNestedLoopJoinNode.java | 2 +-
.../query/calcite/exec/rel/FilterNode.java | 2 +-
.../processors/query/calcite/exec/rel/Inbox.java | 10 ++
.../query/calcite/exec/rel/ModifyNode.java | 2 +-
.../query/calcite/exec/rel/NestedLoopJoinNode.java | 26
.../processors/query/calcite/exec/rel/Node.java| 2 +-
.../processors/query/calcite/exec/rel/Outbox.java | 8 ++---
.../query/calcite/exec/rel/ProjectNode.java| 2 +-
.../query/calcite/exec/rel/RootNode.java | 8 ++---
.../query/calcite/exec/rel/ScanNode.java | 6 ++--
.../query/calcite/exec/rel/SortNode.java | 2 +-
.../query/calcite/exec/rel/UnionAllNode.java | 2 +-
15 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
index 99b0ea5..6a1966e 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
@@ -1028,7 +1028,7 @@ public class ExecutionServiceImpl extends
AbstractService implements Execut
running.remove(ctx.queryId());
// 2) close local fragment
-root.onClose();
+root.closeInternal();
// 3) close remote fragments
for (UUID nodeId : remotes) {
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
index c47321f..f021516 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
@@ -103,7 +103,7 @@ public abstract class AbstractNode implements
Node {
if (isClosed())
return;
-onClose();
+closeInternal();
if (!F.isEmpty(sources()))
sources().forEach(U::closeQuiet);
@@ -111,7 +111,7 @@ public abstract class AbstractNode implements
Node {
/** {@inheritDoc} */
@Override public void rewind() {
-onRewind();
+rewindInternal();
if (!F.isEmpty(sources()))
sources().forEach(Node::rewind);
@@ -122,36 +122,40 @@ public abstract class AbstractNode implements
Node {
this.downstream = downstream;
}
-/** */
-protected abstract void onRewind();
-
/**
* Processes given exception.
*
* @param e Exception.
*/
public void onError(Throwable e) {
-assert downstream() != null;
-
-if (e instanceof ExecutionCancelledException) {
+if (e instanceof ExecutionCancelledException)
U.warn(context().planningContext().logger(), "Execution is
cancelled.", e);
+else
+onErrorInternal(e);
+}
-return;
-}
+/** */
+protected void closeInternal() {
+closed = true;
+}
+
+/** */
+protected abstract void rewindInternal();
+
+/** */
+protected void onErrorInternal(Throwable e) {
+Downstream downstream = downstream();
+
+assert downstream != null;
try {
-downstream().onError(e);
+downstream.onError(e);
}
finally {
U.closeQuiet(this);
}
}
-/** */
-protected void onClose() {
-closed = true;
-}
-
/**
* @return {@code true} if the subtree is canceled.
*/
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AggregateNode.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AggregateNode.java
index 8d300b6..80911e0 100644
---
[ignite-teamcity-bot] branch master updated: Changed rule for detecting critical suite failure. Fixes #174
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 170c4c3 Changed rule for detecting critical suite failure. Fixes #174
170c4c3 is described below
commit 170c4c3ea113fc02ff5113408e3f240f5b721d0e
Author: sergeyuttsel
AuthorDate: Mon Sep 14 14:51:20 2020 +0300
Changed rule for detecting critical suite failure. Fixes #174
Signed-off-by: Slava Koptilin
---
.../org/apache/ignite/tcbot/engine/chain/ISuiteResults.java | 3 +++
.../org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java | 11 +--
.../apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java | 11 +--
.../org/apache/ignite/tcbot/engine/issue/EventTemplates.java | 4 ++--
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java
index 8ef62f1..b051eb5 100644
---
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java
+++
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java
@@ -42,6 +42,9 @@ interface ISuiteResults {
/** */
public boolean hasBuildMessageProblem();
+/** */
+public boolean hasProblemNonByFailedTest();
+
public String suiteId();
}
diff --git
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
index dd639f9..c784065 100644
---
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
+++
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
@@ -208,6 +208,10 @@ public class MultBuildRunCtx implements ISuiteResults {
return getExitCodeProblemsCount() > 0;
}
+public boolean hasProblemNonByFailedTest() {
+return
buildsStream().anyMatch(SingleBuildRunCtx::hasProblemNonByFailedTest);
+}
+
private long getExitCodeProblemsCount() {
return
buildsStream().filter(SingleBuildRunCtx::hasExitCodeProblem).count();
}
@@ -594,12 +598,7 @@ public class MultBuildRunCtx implements ISuiteResults {
}
public boolean hasCriticalProblem() {
-return hasJvmCrashProblem()
-|| hasTimeoutProblem()
-|| hasCompilationProblem()
-|| hasMetricProblem()
-|| hasExitCodeProblem()
-|| hasOomeProblem();
+return hasProblemNonByFailedTest();
}
public int totalTests() {
diff --git
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java
index 9252003..b1a8506 100644
---
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java
+++
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java
@@ -118,6 +118,10 @@ public class SingleBuildRunCtx implements ISuiteResults {
return getProblemsStream().anyMatch(p -> p.isExitCode(compactor));
}
+@Override public boolean hasProblemNonByFailedTest() {
+return getProblemsStream().anyMatch(p -> !p.isFailedTests(compactor));
+}
+
@Override public String suiteId() {
return compactor.getStringFromId(buildCompacted.buildTypeId());
}
@@ -325,12 +329,7 @@ public class SingleBuildRunCtx implements ISuiteResults {
}
public boolean hasSuiteIncompleteFailure() {
-return hasJvmCrashProblem()
-|| hasTimeoutProblem()
-|| hasOomeProblem()
-|| hasExitCodeProblem()
-|| hasCompilationProblem()
-|| hasMetricProblem();
+return hasProblemNonByFailedTest();
}
public int totalNotMutedTests() {
diff --git
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java
index 415f481..4a45b2a 100644
---
a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java
+++
b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java
@@ -39,8 +39,8 @@ public class EventTemplates {
);
public static final EventTemplate newCriticalFailure = new EventTemplate(
-new int[]{OK_OR_FAILURE, OK_OR_FAILURE, OK_OR_FAILURE,
OK_OR_FAILURE, OK_OR_FAILURE},
-new int[]{CRITICAL_FAILURE, CRITICAL_FAILURE, CRITICAL_FAILURE,
CRITICAL_FAILURE}
+new int[]{OK_OR_FAILURE},
+new int[]{CRITICAL_FAILURE, CRITICAL_FAILURE, CRITICAL_FAILURE}
);
public static final EventTemplate
