[ignite] branch master updated: IGNITE-13572 Don't skip filtering for caches with zero backups - Fixes #8439.

2020-12-02 Thread ilyak
This is an automated email from the ASF dual-hosted git repository.

ilyak 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 236bbb2  IGNITE-13572 Don't skip filtering for caches with zero 
backups - Fixes #8439.
236bbb2 is described below

commit 236bbb22bc3339d3d4b59b3bc3a56c2a0dcfdd98
Author: Konstantin Sirotkin 
AuthorDate: Wed Dec 2 11:54:56 2020 +0300

IGNITE-13572 Don't skip filtering for caches with zero backups - Fixes 
#8439.

Signed-off-by: Ilya Kasnacheev 
---
 .../spi/indexing/IndexingQueryFilterImpl.java  |   4 -
 .../DynamicEnableIndexingConcurrentSelfTest.java   |   9 +-
 .../cache/index/SqlPartitionEvictionTest.java  | 215 +
 .../IgniteBinaryCacheQueryTestSuite.java   |   4 +
 4 files changed, 222 insertions(+), 10 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilterImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilterImpl.java
index 0736632..c1e03cd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilterImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilterImpl.java
@@ -68,10 +68,6 @@ public class IndexingQueryFilterImpl implements 
IndexingQueryFilter {
 if (cache.context().isReplicated())
 return null;
 
-// No backups and explicit partitions -> nothing to filter.
-if (cache.configuration().getBackups() == 0 && parts == null)
-return null;
-
 return new IndexingQueryCacheFilter(cache.context().affinity(), parts, 
topVer,
 ctx.discovery().localNode());
 }
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicEnableIndexingConcurrentSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicEnableIndexingConcurrentSelfTest.java
index e28aed9..bdaa1ba 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicEnableIndexingConcurrentSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicEnableIndexingConcurrentSelfTest.java
@@ -226,8 +226,7 @@ public class DynamicEnableIndexingConcurrentSelfTest 
extends DynamicEnableIndexi
 ignitionStart(serverConfiguration(2), finishLatch);
 ignitionStart(serverConfiguration(3), finishLatch);
 
-// TODO: https://issues.apache.org/jira/browse/IGNITE-13572
-awaitPartitionMapExchange(true, true, null);
+awaitPartitionMapExchange();
 
 assertFalse(tblFut.isDone());
 
@@ -332,8 +331,7 @@ public class DynamicEnableIndexingConcurrentSelfTest 
extends DynamicEnableIndexi
 
 ignitionStart(serverConfiguration(4));
 
-// TODO: https://issues.apache.org/jira/browse/IGNITE-13572
-awaitPartitionMapExchange(true, true, null);
+awaitPartitionMapExchange();
 
 tblFut.get();
 
@@ -495,8 +493,7 @@ public class DynamicEnableIndexingConcurrentSelfTest 
extends DynamicEnableIndexi
 // Check that only one successful attempt.
 assertEquals(1, success.get());
 
-// TODO: https://issues.apache.org/jira/browse/IGNITE-13572
-awaitPartitionMapExchange(true, true, null);
+awaitPartitionMapExchange();
 
 for (Ignite g: G.allGrids()) {
 assertEquals(LARGE_NUM_ENTRIES, query(g, SELECT_ALL_QUERY).size());
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
new file mode 100644
index 000..baeade3
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
@@ -0,0 +1,215 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.index;
+
+import java.util.Arrays;
+import java.util.Collection

[ignite] branch master updated (236bbb2 -> edb736d)

2020-12-02 Thread av
This is an automated email from the ASF dual-hosted git repository.

av pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git.


from 236bbb2  IGNITE-13572 Don't skip filtering for caches with zero 
backups - Fixes #8439.
 add edb736d  IGNITE-13705 : Another node fails with failure of target 
node. (#8484)

No new revisions were added by this update.

Summary of changes:
 .../ignite/spi/discovery/tcp/ServerImpl.java   | 70 +-
 .../tcp/TcpDiscoveryNetworkIssuesTest.java | 45 ++
 2 files changed, 76 insertions(+), 39 deletions(-)



[ignite] branch ignite-ducktape updated (1546a76 -> cbfdf07)

2020-12-02 Thread av
This is an automated email from the ASF dual-hosted git repository.

av pushed a change to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git.


from 1546a76  IGNITE-13778: fix startup_timeout_sec on discovery_test.py 
(#8519)
 add 4d28cb5  IGNITE-13760 .NET: Fix NullPointerException in GetAffinity on 
client nodes
 add ea97f8a  IGNITE-13753 Fix non-thread-safe collection in 
JmxMetricExporterSpi - Fixes #8492.
 add 15a5da5  IGNITE-12951 Update documents for migrated extensions - Fixes 
#8488.
 add 743195f  IGNITE-13487 Move logging of delegated errors to debug level. 
(#8283)
 add 006c566  IGNITE-13765 Incorrect work of predicates (< and >) in where 
clause with compound primary key (closes #8510)
 add 2eaabd9  IGNITE-13756: Fix node crash if incorrect SQL query fails. 
(#8495)
 add f5dfac2  IGNITE-13716 Fixed an issue where control utility did not 
hide sensitive information. Fixes #8471
 add 236bbb2  IGNITE-13572 Don't skip filtering for caches with zero 
backups - Fixes #8439.
 add edb736d  IGNITE-13705 : Another node fails with failure of target 
node. (#8484)
 new cbfdf07  Merge remote-tracking branch 'origin/master' into 
ignite-ducktape

The 1 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:
 .../streaming/camel-streamer.adoc  |   6 +-
 .../streaming/flink-streamer.adoc  |   6 +-
 .../streaming/flume-sink.adoc  |   2 +-
 .../streaming/jms-streamer.adoc|   4 +-
 .../streaming/kafka-streamer.adoc  |   6 +-
 .../streaming/mqtt-streamer.adoc   |   2 +-
 .../streaming/rocketmq-streamer.adoc   |   6 +-
 .../streaming/storm-streamer.adoc  |   6 +-
 .../streaming/twitter-streamer.adoc|   6 +-
 .../streaming/zeromq-streamer.adoc |   4 +-
 .../jdbc/thin/JdbcThinComplexQuerySelfTest.java|  36 ++-
 .../internal/commandline/CommandHandler.java   |  33 ++-
 .../internal/commandline/CommonArgParser.java  |  15 ++
 .../GridCommandHandlerSslWithSecurityTest.java |  59 -
 .../internal/processors/job/GridJobWorker.java |  42 +--
 .../processors/platform/PlatformProcessorImpl.java |  12 +-
 .../platform/cache/affinity/PlatformAffinity.java  |  48 +---
 .../cache/affinity/PlatformAffinityManager.java|  78 ++
 .../internal/processors/task/GridTaskWorker.java   |  74 +++---
 .../ignite/spi/discovery/tcp/ServerImpl.java   |  70 +++--
 .../spi/indexing/IndexingQueryFilterImpl.java  |   4 -
 .../spi/metric/jmx/JmxMetricExporterSpi.java   |   9 +-
 .../tcp/TcpDiscoveryNetworkIssuesTest.java |  45 +++-
 .../ignite/spi/metric/jmx/DummyMBeanServer.java| 291 +
 .../spi/metric/jmx/JmxMetricExporterSpiTest.java   | 141 ++
 .../ignite/testsuites/IgniteSpiTestSuite.java  |   5 +-
 .../processors/query/h2/database/H2Tree.java   |  34 +++
 .../processors/query/h2/database/H2TreeIndex.java  |   3 +-
 .../processors/cache/index/BasicIndexTest.java |  15 ++
 .../DynamicEnableIndexingConcurrentSelfTest.java   |   9 +-
 .../cache/index/SqlPartitionEvictionTest.java  | 215 +++
 .../IgniteBinaryCacheQueryTestSuite.java   |   4 +
 .../Cache/Affinity/AffinityTest.cs |  56 ++--
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj   |   1 +
 .../Impl/Cache/CacheAffinityImpl.cs|  23 +-
 .../CacheAffinityManager.cs}   |  28 +-
 .../Impl/Cache/Platform/PlatformCache.cs   |  28 +-
 .../Impl/Cache/Platform/PlatformCacheManager.cs|  36 +--
 .../Apache.Ignite.Core/Impl/Client/IgniteClient.cs |   6 +
 .../Apache.Ignite.Core/Impl/IIgniteInternal.cs |   7 +
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs   |  47 ++--
 41 files changed, 1249 insertions(+), 273 deletions(-)
 create mode 100644 
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinityManager.java
 create mode 100644 
modules/core/src/test/java/org/apache/ignite/spi/metric/jmx/DummyMBeanServer.java
 create mode 100644 
modules/core/src/test/java/org/apache/ignite/spi/metric/jmx/JmxMetricExporterSpiTest.java
 create mode 100644 
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
 copy modules/platforms/dotnet/Apache.Ignite.Core/Impl/{Common/Listenable.cs => 
Cache/CacheAffinityManager.cs} (55%)



[ignite] 01/01: Merge remote-tracking branch 'origin/master' into ignite-ducktape

2020-12-02 Thread av
This is an automated email from the ASF dual-hosted git repository.

av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit cbfdf07fa9f4b881e39554122e781879c5b687cc
Merge: 1546a76 edb736d
Author: Anton Vinogradov 
AuthorDate: Wed Dec 2 12:16:31 2020 +0300

Merge remote-tracking branch 'origin/master' into ignite-ducktape

 .../streaming/camel-streamer.adoc  |   6 +-
 .../streaming/flink-streamer.adoc  |   6 +-
 .../streaming/flume-sink.adoc  |   2 +-
 .../streaming/jms-streamer.adoc|   4 +-
 .../streaming/kafka-streamer.adoc  |   6 +-
 .../streaming/mqtt-streamer.adoc   |   2 +-
 .../streaming/rocketmq-streamer.adoc   |   6 +-
 .../streaming/storm-streamer.adoc  |   6 +-
 .../streaming/twitter-streamer.adoc|   6 +-
 .../streaming/zeromq-streamer.adoc |   4 +-
 .../jdbc/thin/JdbcThinComplexQuerySelfTest.java|  36 ++-
 .../internal/commandline/CommandHandler.java   |  33 ++-
 .../internal/commandline/CommonArgParser.java  |  15 ++
 .../GridCommandHandlerSslWithSecurityTest.java |  59 -
 .../internal/processors/job/GridJobWorker.java |  42 +--
 .../processors/platform/PlatformProcessorImpl.java |  12 +-
 .../platform/cache/affinity/PlatformAffinity.java  |  48 +---
 .../cache/affinity/PlatformAffinityManager.java|  78 ++
 .../internal/processors/task/GridTaskWorker.java   |  74 +++---
 .../ignite/spi/discovery/tcp/ServerImpl.java   |  70 +++--
 .../spi/indexing/IndexingQueryFilterImpl.java  |   4 -
 .../spi/metric/jmx/JmxMetricExporterSpi.java   |   9 +-
 .../tcp/TcpDiscoveryNetworkIssuesTest.java |  45 +++-
 .../ignite/spi/metric/jmx/DummyMBeanServer.java| 291 +
 .../spi/metric/jmx/JmxMetricExporterSpiTest.java   | 141 ++
 .../ignite/testsuites/IgniteSpiTestSuite.java  |   5 +-
 .../processors/query/h2/database/H2Tree.java   |  34 +++
 .../processors/query/h2/database/H2TreeIndex.java  |   3 +-
 .../processors/cache/index/BasicIndexTest.java |  15 ++
 .../DynamicEnableIndexingConcurrentSelfTest.java   |   9 +-
 .../cache/index/SqlPartitionEvictionTest.java  | 215 +++
 .../IgniteBinaryCacheQueryTestSuite.java   |   4 +
 .../Cache/Affinity/AffinityTest.cs |  56 ++--
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj   |   1 +
 .../Impl/Cache/CacheAffinityImpl.cs|  23 +-
 .../Impl/Cache/CacheAffinityManager.cs |  53 
 .../Impl/Cache/Platform/PlatformCache.cs   |  28 +-
 .../Impl/Cache/Platform/PlatformCacheManager.cs|  36 +--
 .../Apache.Ignite.Core/Impl/Client/IgniteClient.cs |   6 +
 .../Apache.Ignite.Core/Impl/IIgniteInternal.cs |   7 +
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs   |  47 ++--
 41 files changed, 1284 insertions(+), 263 deletions(-)



[ignite] branch master updated: IGNITE-13388 Fix apache-ignite deb package dependency on JVM package - Fixes #8191.

2020-12-02 Thread ilyak
This is an automated email from the ASF dual-hosted git repository.

ilyak 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 dad79aa  IGNITE-13388 Fix apache-ignite deb package dependency on JVM 
package - Fixes #8191.
dad79aa is described below

commit dad79aa6ea741d1da6630035ff24dc714b4e7932
Author: Peter Ivanov 
AuthorDate: Wed Dec 2 14:11:59 2020 +0300

IGNITE-13388 Fix apache-ignite deb package dependency on JVM package - 
Fixes #8191.

Signed-off-by: Ilya Kasnacheev 
---
 packaging/deb/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/deb/control b/packaging/deb/control
index 40467c0..0c258f8 100644
--- a/packaging/deb/control
+++ b/packaging/deb/control
@@ -8,7 +8,7 @@ Package: apache-ignite
 Architecture: all
 Section: misc
 Priority: optional
-Depends: openjdk-8-jdk | oracle-java8-installer, systemd, passwd
+Depends: openjdk-8-jdk | openjdk-11-jdk | default-jdk | java-sdk, systemd, 
passwd
 Description: Apache Ignite In-Memory Computing, Database and Caching Platform
  Ignite™ is a memory-centric distributed database, caching, and processing
  platform for transactional, analytical, and streaming workloads, delivering



[ignite] branch master updated: IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty persistent region - Fixes #8506.

2020-12-02 Thread ilyak
This is an automated email from the ASF dual-hosted git repository.

ilyak 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 77b90b1  IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty 
persistent region - Fixes #8506.
77b90b1 is described below

commit 77b90b1431a8e3a611e44497729b271f8059d2dc
Author: Ilya Kasnacheev 
AuthorDate: Wed Dec 2 15:05:55 2020 +0300

IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty persistent 
region - Fixes #8506.

Signed-off-by: Ilya Kasnacheev 
---
 .../processors/cache/persistence/pagemem/PageMemoryImpl.java   | 4 ++--
 .../cache/persistence/db/IgnitePdsDataRegionMetricsTest.java   | 7 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index c6d4d87..b0b28be 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -1829,14 +1829,14 @@ public class PageMemoryImpl implements PageMemoryEx {
 
 /** {@inheritDoc} */
 @Override public int checkpointBufferPagesCount() {
-return checkpointPool.size();
+return checkpointPool == null ? 0 : checkpointPool.size();
 }
 
 /**
  * Number of used pages in checkpoint buffer.
  */
 public int checkpointBufferPagesSize() {
-return checkpointPool.pages();
+return checkpointPool == null ? 0 : checkpointPool.pages();
 }
 
 /**
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
index 3da0c18..63fea44 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
@@ -89,6 +89,13 @@ public class IgnitePdsDataRegionMetricsTest extends 
GridCommonAbstractTest {
 .setMaxSize(MAX_REGION_SIZE)
 .setPersistenceEnabled(true)
 .setMetricsEnabled(true))
+.setDataRegionConfigurations(
+new DataRegionConfiguration()
+.setName("EmptyRegion")
+.setInitialSize(INIT_REGION_SIZE)
+.setMaxSize(MAX_REGION_SIZE)
+.setPersistenceEnabled(true)
+.setMetricsEnabled(true))
 .setCheckpointFrequency(1000);
 
 cfg.setDataStorageConfiguration(memCfg);



[ignite] branch master updated: IGNITE-13640 Added runtime dependencies to opencensus module. Fixes #8406

2020-12-02 Thread sk0x50
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.git


The following commit(s) were added to refs/heads/master by this push:
 new 897dca9  IGNITE-13640 Added runtime dependencies to opencensus module. 
Fixes #8406
897dca9 is described below

commit 897dca9aae523d992b1b550ced8eb7d571badd03
Author: Alexander Lapin 
AuthorDate: Wed Dec 2 15:19:19 2020 +0300

IGNITE-13640 Added runtime dependencies to opencensus module. Fixes #8406

Signed-off-by: Slava Koptilin 
---
 modules/opencensus/pom.xml | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/modules/opencensus/pom.xml b/modules/opencensus/pom.xml
index 648c2bc..9a3503a 100644
--- a/modules/opencensus/pom.xml
+++ b/modules/opencensus/pom.xml
@@ -116,4 +116,27 @@
 test
 
 
+
+
+
+
+maven-dependency-plugin
+
+
+copy-libs
+package
+
+copy-dependencies
+
+
+
org.apache.ignite
+target/libs
+runtime
+false
+
+
+
+
+
+
 



[ignite-3] branch ignite-13748 updated (f3b19ce -> cee8369)

2020-12-02 Thread amashenkov
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-13748
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.


from f3b19ce  WIP.
 add cee8369  WIP. Schema interfaces added.

No new revisions were added by this update.

Summary of changes:
 .../{ => builder}/ColumnConfigurationBuilder.java  |  4 +--
 .../IndexColumnConfigurationBuilder.java   |  4 +--
 .../{ => builder}/IndexConfigurationBuilder.java   |  4 +--
 .../{ => builder}/KeyColumnCollectionBuilder.java  |  6 ++---
 .../KeyColumnConfigurationBuilder.java |  4 +--
 .../{ => builder}/SchemaConfigurationBuilder.java  |  4 +--
 .../ValueColumnCollectionBuilder.java  |  6 ++---
 .../ValueColumnConfigurationBuilder.java   |  4 +--
 .../main/java/org/apache/ignite/schema/Column.java | 15 +++
 .../org/apache/ignite/schema/ExpressionIndex.java  |  5 
 .../java/org/apache/ignite/schema/IndexColumn.java |  7 ++
 .../java/org/apache/ignite/schema/TableIndex.java  | 16 
 .../java/org/apache/ignite/schema/TableSchema.java | 20 +++
 .../ignite/schema/{ => builder}/SchemaBuilder.java |  2 +-
 .../schema/{ => builder}/SchemaColumnBuilder.java  |  4 ++-
 .../SchemaColumnCollectionBuilder.java |  2 +-
 .../schema/{ => builder}/SchemaIndexBuilder.java   |  2 +-
 .../{ => builder}/SchemaIndexColumnBuilder.java|  2 +-
 .../schema/{ => builder}/SchemaKeyBuilder.java |  2 +-
 .../{ => builder}/SchemaKeyColumnBuilder.java  |  2 +-
 .../schema/builder/SchemaModificationBuilder.java  | 25 +++
 .../schema/{ => builder}/SchemaValueBuilder.java   |  3 ++-
 .../{ => builder}/SchemaValueColumnBuilder.java|  2 +-
 .../internal/schema/SchemaConfigurationTest.java   | 29 +-
 24 files changed, 146 insertions(+), 28 deletions(-)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/ColumnConfigurationBuilder.java (89%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/IndexColumnConfigurationBuilder.java (88%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/IndexConfigurationBuilder.java (92%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/KeyColumnCollectionBuilder.java (87%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/KeyColumnConfigurationBuilder.java (87%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/SchemaConfigurationBuilder.java (96%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/ValueColumnCollectionBuilder.java (84%)
 rename modules/commons/src/main/java/org/apache/ignite/internal/schema/{ => 
builder}/ValueColumnConfigurationBuilder.java (82%)
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/Column.java
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/ExpressionIndex.java
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/IndexColumn.java
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/TableIndex.java
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/TableSchema.java
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaBuilder.java (90%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaColumnBuilder.java (72%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaColumnCollectionBuilder.java (72%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaIndexBuilder.java (84%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaIndexColumnBuilder.java (83%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaKeyBuilder.java (70%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaKeyColumnBuilder.java (80%)
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/builder/SchemaModificationBuilder.java
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaValueBuilder.java (54%)
 rename modules/commons/src/main/java/org/apache/ignite/schema/{ => 
builder}/SchemaValueColumnBuilder.java (75%)



[ignite-3] branch ignite-13748 updated (cee8369 -> 0df3dd8)

2020-12-02 Thread amashenkov
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-13748
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.


omit cee8369  WIP. Schema interfaces added.
 add 0df3dd8  WIP. Schema interfaces added.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (cee8369)
\
 N -- N -- N   refs/heads/ignite-13748 (0df3dd8)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../ignite/schema/builder/SchemaBuilder.java   |  4 +++-
 .../builder/SchemaColumnCollectionBuilder.java |  2 --
 .../ignite/schema/builder/SchemaKeyBuilder.java|  1 +
 .../schema/builder/SchemaModificationBuilder.java  |  2 --
 .../ignite/schema/builder/SchemaValueBuilder.java  |  2 +-
 .../builder/SchemaValueModificationBuilder.java|  7 ++
 .../internal/schema/SchemaConfigurationTest.java   | 26 --
 7 files changed, 12 insertions(+), 32 deletions(-)
 create mode 100644 
modules/commons/src/main/java/org/apache/ignite/schema/builder/SchemaValueModificationBuilder.java



[ignite-3] branch ignite-13748 updated (0df3dd8 -> 63aa22a)

2020-12-02 Thread amashenkov
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-13748
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.


 discard 0df3dd8  WIP. Schema interfaces added.
 add 63aa22a  WIP. Schema interfaces added.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0df3dd8)
\
 N -- N -- N   refs/heads/ignite-13748 (63aa22a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../ignite/internal/schema/builder/SchemaConfigurationBuilder.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)



[ignite] branch master updated: IGNITE-13520 Skip generating encryption keys on the client node. (#8317)

2020-12-02 Thread nizhikov
This is an automated email from the ASF dual-hosted git repository.

nizhikov 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 bd4fb3c  IGNITE-13520 Skip generating encryption keys on the client 
node. (#8317)
bd4fb3c is described below

commit bd4fb3c162e17601fa65d108d553937366bb1ea7
Author: Pavel Pereslegin 
AuthorDate: Wed Dec 2 15:54:13 2020 +0300

IGNITE-13520 Skip generating encryption keys on the client node. (#8317)
---
 .../managers/encryption/GridEncryptionManager.java |   2 +-
 .../processors/cache/ClusterCachesInfo.java|  18 +++-
 .../processors/cache/GridCacheProcessor.java   |   2 +-
 .../encryption/EncryptedCacheNodeJoinTest.java | 118 -
 .../src/test/config/enc/enc-cache-client.xml   |   2 +-
 5 files changed, 136 insertions(+), 6 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
index 3683313..2c31dcd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
@@ -501,7 +501,7 @@ public class GridEncryptionManager extends 
GridManagerAdapter imp
 
 /** {@inheritDoc} */
 @Override public void collectJoiningNodeData(DiscoveryDataBag dataBag) {
-if (dataBag.isJoiningNodeClient())
+if (ctx.clientNode())
 return;
 
 Set grpIds = grpKeys.groupIds();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 88a9fde..96ca007 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -1864,9 +1864,10 @@ public class ClusterCachesInfo {
 
 /**
  * @param data Joining node data.
+ * @param joiningNodeClient Joining node is client flag.
  * @return Message with error or null if everything was OK.
  */
-public String 
validateJoiningNodeData(DiscoveryDataBag.JoiningNodeDiscoveryData data) {
+public String 
validateJoiningNodeData(DiscoveryDataBag.JoiningNodeDiscoveryData data, boolean 
joiningNodeClient) {
 if (data.hasJoiningNodeData()) {
 Serializable joiningNodeData = data.joiningNodeData();
 
@@ -1874,6 +1875,7 @@ public class ClusterCachesInfo {
 CacheJoinNodeDiscoveryData joinData = 
(CacheJoinNodeDiscoveryData)joiningNodeData;
 
 Set problemCaches = null;
+Set encClientCaches = null;
 
 for (CacheJoinNodeDiscoveryData.CacheInfo cacheInfo : 
joinData.caches().values()) {
 CacheConfiguration cfg = 
cacheInfo.cacheData().config();
@@ -1895,6 +1897,12 @@ public class ClusterCachesInfo {
 
 problemCaches.add(cfg.getName());
 }
+else if (joiningNodeClient && 
cfg.isEncryptionEnabled()) {
+if (encClientCaches == null)
+encClientCaches = new HashSet<>();
+
+encClientCaches.add(cfg.getName());
+}
 }
 }
 
@@ -1903,6 +1911,14 @@ public class ClusterCachesInfo {
 "Joining node has caches with data which are not 
presented on cluster, " +
 "it could mean that they were already destroyed, 
to add the node to cluster - " +
 "remove directories with the caches[", "]"));
+
+if (!F.isEmpty(encClientCaches)) {
+return 
encClientCaches.stream().collect(Collectors.joining(", ",
+"Joining node has encrypted caches which are not 
presented on the cluster, " +
+"encrypted caches configured on client node cannot 
be started when such node joins " +
+"the cluster, these caches can be started manually 
(dynamically) after node joined" +
+"[caches=", "]"));
+}
 }
 }
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 01124fb..4a1aceb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/proces

[ignite] branch master updated: IGNITE-13793: Implement SQLRowCount for SELECT

2020-12-02 Thread isapego
This is an automated email from the ASF dual-hosted git repository.

isapego 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 652f37b  IGNITE-13793: Implement SQLRowCount for SELECT
652f37b is described below

commit 652f37b1709d6ef430eb490b179ecfae2f3d95dd
Author: Igor Sapego 
AuthorDate: Wed Dec 2 19:38:30 2020 +0300

IGNITE-13793: Implement SQLRowCount for SELECT

This closes #8525
---
 .../platforms/cpp/odbc-test/src/queries_test.cpp   | 38 --
 modules/platforms/cpp/odbc/src/cursor.cpp  |  7 ++--
 .../platforms/cpp/odbc/src/query/data_query.cpp|  6 +++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/modules/platforms/cpp/odbc-test/src/queries_test.cpp 
b/modules/platforms/cpp/odbc-test/src/queries_test.cpp
index 6cded84..60333ff 100644
--- a/modules/platforms/cpp/odbc-test/src/queries_test.cpp
+++ b/modules/platforms/cpp/odbc-test/src/queries_test.cpp
@@ -1629,7 +1629,7 @@ BOOST_AUTO_TEST_CASE(TestErrorMessage)
 
 BOOST_AUTO_TEST_CASE(TestAffectedRows)
 {
-Connect("DRIVER={Apache Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache");
+Connect("DRIVER={Apache 
Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache;PAGE_SIZE=1024");
 
 const int recordsNum = 100;
 
@@ -1670,7 +1670,41 @@ BOOST_AUTO_TEST_CASE(TestAffectedRows)
 if (!SQL_SUCCEEDED(ret))
 BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
 
-BOOST_CHECK_EQUAL(affected, 0);
+BOOST_CHECK_EQUAL(affected, 1024);
+}
+
+BOOST_AUTO_TEST_CASE(TestAffectedRowsOnSelect)
+{
+Connect("DRIVER={Apache 
Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache;PAGE_SIZE=123");
+
+const int recordsNum = 1000;
+
+// Inserting values.
+InsertTestStrings(recordsNum);
+
+// Just selecting everything to make sure everything is OK
+SQLCHAR selectReq[] = "SELECT _key, strField FROM TestType ORDER BY _key";
+
+SQLRETURN ret = SQLExecDirect(stmt, selectReq, sizeof(selectReq));
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+for (int i = 0; i < 200; ++i)
+{
+SQLLEN affected = -1;
+ret = SQLRowCount(stmt, &affected);
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+BOOST_CHECK_EQUAL(affected, 123);
+
+ret = SQLFetch(stmt);
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+}
 }
 
 BOOST_AUTO_TEST_CASE(TestMultipleSelects)
diff --git a/modules/platforms/cpp/odbc/src/cursor.cpp 
b/modules/platforms/cpp/odbc/src/cursor.cpp
index b41f5b1..cee18d8 100644
--- a/modules/platforms/cpp/odbc/src/cursor.cpp
+++ b/modules/platforms/cpp/odbc/src/cursor.cpp
@@ -21,8 +21,11 @@ namespace ignite
 {
 namespace odbc
 {
-Cursor::Cursor(int64_t queryId) : queryId(queryId), currentPage(),
-currentPagePos(0), currentRow()
+Cursor::Cursor(int64_t queryId) :
+queryId(queryId),
+currentPage(),
+currentPagePos(0),
+currentRow()
 {
 // No-op.
 }
diff --git a/modules/platforms/cpp/odbc/src/query/data_query.cpp 
b/modules/platforms/cpp/odbc/src/query/data_query.cpp
index a93e5a3..54723a1 100644
--- a/modules/platforms/cpp/odbc/src/query/data_query.cpp
+++ b/modules/platforms/cpp/odbc/src/query/data_query.cpp
@@ -189,7 +189,11 @@ namespace ignite
 int64_t DataQuery::AffectedRows() const
 {
 int64_t affected = rowsAffectedIdx < rowsAffected.size() ? 
rowsAffected[rowsAffectedIdx] : 0;
-return affected < 0 ? 0 : affected;
+
+if (affected >= 0)
+return affected;
+
+return connection.GetConfiguration().GetPageSize();
 }
 
 SqlResult::Type DataQuery::NextResultSet()



[ignite] branch master updated: IGNITE-13496 Java thin: make async API non-blocking with GridNioServer

2020-12-02 Thread ptupitsyn
This is an automated email from the ASF dual-hosted git repository.

ptupitsyn 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 338165a  IGNITE-13496 Java thin: make async API non-blocking with 
GridNioServer
338165a is described below

commit 338165afadd3b6979b4655ee2f03f3b9c2228236
Author: Pavel Tupitsyn 
AuthorDate: Wed Dec 2 19:39:25 2020 +0300

IGNITE-13496 Java thin: make async API non-blocking with GridNioServer

Refactor Java Thin Client to use GridNioServer in client mode:
* Client threads are never blocked
* Single worker thread is shared across all connections within 
`IgniteClient`

Benchmark results (i7-9700K, Ubuntu 20.04.1, JDK 1.8.0_275):

Before
Benchmark Mode  Cnt  Score  Error  Units
JmhThinClientCacheBenchmark.get  thrpt   10  65916.805 ± 2118.954  ops/s
JmhThinClientCacheBenchmark.put  thrpt   10  62304.444 ± 2521.371  ops/s

After
Benchmark Mode  Cnt  Score  Error  Units
JmhThinClientCacheBenchmark.get  thrpt   10  92501.557 ± 1380.384  ops/s
JmhThinClientCacheBenchmark.put  thrpt   10  82907.446 ± 7572.537  ops/s
---
 .../jmh/thin/JmhThinClientAbstractBenchmark.java   | 135 
 .../jmh/thin/JmhThinClientCacheBenchmark.java  |  81 +++
 .../streams/BinaryByteBufferInputStream.java   |  91 +--
 .../internal/client/thin/ClientComputeImpl.java|   7 +-
 .../internal/client/thin/ClientSslUtils.java   | 293 +
 .../internal/client/thin/NotificationListener.java |   4 +-
 .../internal/client/thin/PayloadInputChannel.java  |   8 +-
 .../internal/client/thin/ReliableChannel.java  |  63 +-
 .../internal/client/thin/TcpClientChannel.java | 679 +++--
 .../internal/client/thin/TcpIgniteClient.java  |  27 +-
 .../ClientConnection.java} |  25 +-
 .../thin/io/ClientConnectionMultiplexer.java   |  52 ++
 .../ClientConnectionStateHandler.java} |  19 +-
 .../client/thin/io/ClientMessageDecoder.java   |  92 +++
 .../ClientMessageHandler.java} |  19 +-
 .../io/gridnioserver/GridNioClientConnection.java  |  93 +++
 .../GridNioClientConnectionMultiplexer.java| 147 +
 .../io/gridnioserver/GridNioClientListener.java|  73 +++
 .../thin/io/gridnioserver/GridNioClientParser.java |  59 ++
 .../ignite/client/ConnectToStartingNodeTest.java   |  18 +-
 .../apache/ignite/client/SslParametersTest.java|   4 +-
 .../internal/client/thin/ReliableChannelTest.java  |   9 +-
 .../ThinClientAbstractPartitionAwarenessTest.java  |   9 +-
 ...lientPartitionAwarenessResourceReleaseTest.java |  14 +-
 24 files changed, 1228 insertions(+), 793 deletions(-)

diff --git 
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/thin/JmhThinClientAbstractBenchmark.java
 
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/thin/JmhThinClientAbstractBenchmark.java
new file mode 100644
index 000..6b6dc53
--- /dev/null
+++ 
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/thin/JmhThinClientAbstractBenchmark.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.benchmarks.jmh.thin;
+
+import java.util.stream.IntStream;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.client.ClientCache;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.benchmarks.jmh.JmhAbstractBenchmark;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+
+/**
+ * Base class for th

[ignite] branch master updated: IGNITE-13793: Implement SQLRowCount for SELECT

2020-12-02 Thread isapego
This is an automated email from the ASF dual-hosted git repository.

isapego 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 77c  IGNITE-13793: Implement SQLRowCount for SELECT
77c is described below

commit 77c2e9f92eab3b77fdce85a9ea50579b7122
Author: Igor Sapego 
AuthorDate: Wed Dec 2 19:38:30 2020 +0300

IGNITE-13793: Implement SQLRowCount for SELECT

This closes #8525
---
 .../platforms/cpp/odbc-test/src/queries_test.cpp   | 38 --
 modules/platforms/cpp/odbc/src/cursor.cpp  |  7 ++--
 .../platforms/cpp/odbc/src/query/data_query.cpp|  6 +++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/modules/platforms/cpp/odbc-test/src/queries_test.cpp 
b/modules/platforms/cpp/odbc-test/src/queries_test.cpp
index 6cded84..60333ff 100644
--- a/modules/platforms/cpp/odbc-test/src/queries_test.cpp
+++ b/modules/platforms/cpp/odbc-test/src/queries_test.cpp
@@ -1629,7 +1629,7 @@ BOOST_AUTO_TEST_CASE(TestErrorMessage)
 
 BOOST_AUTO_TEST_CASE(TestAffectedRows)
 {
-Connect("DRIVER={Apache Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache");
+Connect("DRIVER={Apache 
Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache;PAGE_SIZE=1024");
 
 const int recordsNum = 100;
 
@@ -1670,7 +1670,41 @@ BOOST_AUTO_TEST_CASE(TestAffectedRows)
 if (!SQL_SUCCEEDED(ret))
 BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
 
-BOOST_CHECK_EQUAL(affected, 0);
+BOOST_CHECK_EQUAL(affected, 1024);
+}
+
+BOOST_AUTO_TEST_CASE(TestAffectedRowsOnSelect)
+{
+Connect("DRIVER={Apache 
Ignite};ADDRESS=127.0.0.1:0;SCHEMA=cache;PAGE_SIZE=123");
+
+const int recordsNum = 1000;
+
+// Inserting values.
+InsertTestStrings(recordsNum);
+
+// Just selecting everything to make sure everything is OK
+SQLCHAR selectReq[] = "SELECT _key, strField FROM TestType ORDER BY _key";
+
+SQLRETURN ret = SQLExecDirect(stmt, selectReq, sizeof(selectReq));
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+for (int i = 0; i < 200; ++i)
+{
+SQLLEN affected = -1;
+ret = SQLRowCount(stmt, &affected);
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+
+BOOST_CHECK_EQUAL(affected, 123);
+
+ret = SQLFetch(stmt);
+
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+}
 }
 
 BOOST_AUTO_TEST_CASE(TestMultipleSelects)
diff --git a/modules/platforms/cpp/odbc/src/cursor.cpp 
b/modules/platforms/cpp/odbc/src/cursor.cpp
index b41f5b1..cee18d8 100644
--- a/modules/platforms/cpp/odbc/src/cursor.cpp
+++ b/modules/platforms/cpp/odbc/src/cursor.cpp
@@ -21,8 +21,11 @@ namespace ignite
 {
 namespace odbc
 {
-Cursor::Cursor(int64_t queryId) : queryId(queryId), currentPage(),
-currentPagePos(0), currentRow()
+Cursor::Cursor(int64_t queryId) :
+queryId(queryId),
+currentPage(),
+currentPagePos(0),
+currentRow()
 {
 // No-op.
 }
diff --git a/modules/platforms/cpp/odbc/src/query/data_query.cpp 
b/modules/platforms/cpp/odbc/src/query/data_query.cpp
index a93e5a3..54723a1 100644
--- a/modules/platforms/cpp/odbc/src/query/data_query.cpp
+++ b/modules/platforms/cpp/odbc/src/query/data_query.cpp
@@ -189,7 +189,11 @@ namespace ignite
 int64_t DataQuery::AffectedRows() const
 {
 int64_t affected = rowsAffectedIdx < rowsAffected.size() ? 
rowsAffected[rowsAffectedIdx] : 0;
-return affected < 0 ? 0 : affected;
+
+if (affected >= 0)
+return affected;
+
+return connection.GetConfiguration().GetPageSize();
 }
 
 SqlResult::Type DataQuery::NextResultSet()



[ignite] branch master updated: [IGNITE-13803] Fixed Scalar test failed due to incorrect Jackson dependency (#8529)

2020-12-02 Thread zaleslaw
This is an automated email from the ASF dual-hosted git repository.

zaleslaw 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 b4e46f3  [IGNITE-13803] Fixed Scalar test failed due to incorrect 
Jackson dependency (#8529)
b4e46f3 is described below

commit b4e46f3cbd482afc830c8ab06e6b15d6e23481a7
Author: Alexey Zinoviev 
AuthorDate: Wed Dec 2 19:58:52 2020 +0300

[IGNITE-13803] Fixed Scalar test failed due to incorrect Jackson dependency 
(#8529)

* [IGNITE-13803] Changed dependency

* [IGNITE-13803] Exclude dependency
---
 examples/pom.xml   |  6 ++
 modules/ml/pom.xml | 22 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 08fe50a..25a5b87 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -106,6 +106,12 @@
 org.apache.ignite
 ignite-ml
 ${project.version}
+
+
+com.fasterxml.jackson.core
+*
+
+
 
 
 
diff --git a/modules/ml/pom.xml b/modules/ml/pom.xml
index 37d9c10..ad9f8dc 100644
--- a/modules/ml/pom.xml
+++ b/modules/ml/pom.xml
@@ -161,29 +161,9 @@
 1.7.7
 
 
-javax.xml.bind
-jaxb-api
-2.3.0
-
-
-com.sun.xml.bind
-jaxb-core
-2.3.0
-
-
-com.sun.xml.bind
-jaxb-impl
-2.3.0
-
-
-javax.activation
-activation
-1.1.1
-
-
 com.fasterxml.jackson.core
 jackson-databind
-2.10.3
+${jackson.version}
 
 
 



[ignite] branch ignite-2.9.1 updated (fc22988 -> 02f3f69)

2020-12-02 Thread mmuzaf
This is an automated email from the ASF dual-hosted git repository.

mmuzaf pushed a change to branch ignite-2.9.1
in repository https://gitbox.apache.org/repos/asf/ignite.git.


from fc22988  IGNITE-13765 Incorrect work of predicates (< and >) in where 
clause with compound primary key (closes #8510)
 new 382d401  IGNITE-13553 Check type of the indexed fields added (#8330)
 new 9e578d8  IGNITE-12350: MVCC activated and causing memory leak (OOM) 
despite no mvccEnabled caches. This closes #8152
 new 102548a  IGNITE-13376 fix fields sequence at the PK (#8172)
 new 64b17bb  IGNITE-13280 fix improper index usage (#8067)
 new af6cb89  IGNITE-13379 Exception occur on SQL caches when client 
reconnect - Fixes #8178
 new 4d75a7d  IGNITE-13072 Synchronization problems when different 
classloaders are used for deployment of same class. - Fixes #7847.
 new 1eacfd6  IGNITE-13382 DurableBackgroundTask can abandon incomplete 
task - Fixes #8182.
 new 35dc1ae  IGNITE-13296 .NET: Fix transaction disposal and finalization
 new 17f47c2  IGNITE-13408 BinaryMetatadatView introduced (#8228)
 new 562733b  IGNITE-13409 MetastorageView and DistributedMetastorageView 
introduced. (#8225)
 new 8a007ba  IGNITE-13401 Java thin client: Fix unmarshalling failure when 
cache configuration message or binary type message start with byte 103 - Fixes 
#8216.
 new 33ce78e  IGNITE-13403 Update JDBC metadata to match actual 
capabilities (#8217)
 new ee064ba  IGNITE-13439 Printing detailed classpath slowdowns node 
initialization - Fixes #8246.
 new 083c959  IGNITE-13458 Added RebalancingPartitionsTotal metric. - Fixes 
#8254.
 new 278cbba  IGNITE-13484: Fixed ODBC example for several nodes. Added 
affinity key.
 new 4315c12  IGNITE-11312 Fix JDBC Driver properties for UI tools like 
DBeaver - Fixes #6900.
 new 6e20422  IGNITE-13491 Fix incorrect topology snapshot logger output 
about coordinator change. Fix remarks. - Fixes #8289.
 new 59bfe3f  IGNITE-13479 Control.sh script should use its own system 
variable for setting JVM options instead of JVM_OPTS - Fixes #8275.
 new 0958ab5  IGNITE-13495: fix ZookeeperDiscoveryImpl#getCoordinator() 
(#8313)
 new 7275d13  IGNITE-13304 Added javadocs for classes related to cache 
configuration enrichment. Fixes #8086
 new 3f13b99  IGNITE-13417 Fixed deserialization of CacheInterceptors on 
client nodes. Fixes #8230
 new e219b71  IGNITE-13540 Fix: exchange worker, waiting for new task from 
queue, considered as blocked. (#8324)
 new 909f172  IGNITE-13431 Fix NPE when PRIMITIVE strategy is used with 
BLOB value. (#8277)
 new 16c1688  IGNITE-13536 .NET: Document zombie child processes issue
 new a6e5f1e  IGNITE-13575 Fix invalid blocking thread reporting waiting on 
selector.select. Fix infinite loop while only one thread is registered in 
WorkersRegistry. (#8354)
 new caefd65  IGNITE-13563 .NET: Fix deserializing IBinaryObject containing 
an IBinaryObject field
 new e2d0742  IGNITE-13418 Fixed deadlock on multiple cache delete (#8229)
 new 6297b51  IGNITE-13569 disable archiving + walCompactionEnabled 
probably broke reading from wal on server restart - Fixes #8344.
 new 6df883a  IGNITE-13398 Avoid NPE when destroying the cache if there is 
a running service - Fixes #8376.
 new ac8dcc2  IGNITE-12794 Fix "Unexpected row key" assertion during scan 
query - Fixes #7541.
 new 0832093  IGNITE-13291 Add path validation to Ignite codebase. Remove 
unnecessary dependency to Apache Curator. (#8080)
 new 600d841  IGNITE-13577 Graceful node shutdown for Zookeeper Discovery 
SPI - Fixes #8371.
 new 47c276f1 IGNITE-13627 Metric registry remove not thread safe. (#8410)
 new 3c2a223  IGNITE-13665 When system worker is blocked, output its stack 
trace - Fixes #8442.
 new b664e1e  IGNITE-13719 Java thin client: Fix timeout on idle connection 
- Fixes #8480.
 new 0aebd00  IGNITE-13245 Rebalance future might hangs in no final state 
though all partitions are owned - Fixes #8025
 new 840e6ba  IGNITE-12320 Partial index rebuild fails in case indexed 
cache contains different datatypes - Fixes #8018
 new e6bb1c0  IGNITE-13251 Fixed deadlock between grid-timeout-worker and a 
thread opening a communication connection. Fixes #8033
 new 62efe7a  IGNITE-13235 Fix of deadlock in IgniteServiceProcessor. - 
Fixes #8009.
 new 7fa619b  IGNITE-13293 .NET: Fix enum serialization performance
 new 80da89b  IGNITE-13302 Fixed partition divergence in the system cache 
that may occur due to java thin client connecting. Fixes #8096
 new 25d3f35  IGNITE-13102 IgniteCache#isClosed() returns false on server 
node even if the cache had been closed before - Fixes #8087.
 new e99ba03  IGNITE-12806 Fixed incorret usage of Class.isAssignableFrom 
in SystemViewLocal and SystemViewMBean (#7592)
 new 487bce8  IGNITE-13402 Fixed AssertionError during expiration cache 
entries. F

[ignite] branch master updated: IGNITE-13742 INACTIVE mode is forced on nodes in Maintenance Mode - Fixes #8524.

2020-12-02 Thread sergeychugunov
This is an automated email from the ASF dual-hosted git repository.

sergeychugunov 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 50f43b4  IGNITE-13742 INACTIVE mode is forced on nodes in Maintenance 
Mode - Fixes #8524.
50f43b4 is described below

commit 50f43b48572ebd2cfd49578e425524bbd71f8a71
Author: ibessonov 
AuthorDate: Thu Dec 3 10:54:13 2020 +0300

IGNITE-13742 INACTIVE mode is forced on nodes in Maintenance Mode - Fixes 
#8524.

Signed-off-by: Sergey Chugunov 
---
 .../java/org/apache/ignite/internal/IgniteKernal.java   | 17 -
 .../processors/cluster/GridClusterStateProcessor.java   |  6 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 588ae7d..1bb3e6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1195,7 +1195,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 
 // Assign discovery manager to context before other processors 
start so they
 // are able to register custom event listener.
-GridManager discoMgr = new GridDiscoveryManager(ctx);
+GridDiscoveryManager discoMgr = new GridDiscoveryManager(ctx);
 
 ctx.add(discoMgr, false);
 
@@ -1210,10 +1210,25 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 startProcessor(mntcProcessor);
 
 if (mntcProcessor.isMaintenanceMode()) {
+if (log.isInfoEnabled()) {
+log.info(
+"Node is being started in maintenance mode. " +
+"Starting IsolatedDiscoverySpi instead of configured 
discovery SPI."
+);
+}
+
+cfg.setClusterStateOnStart(ClusterState.INACTIVE);
+
+if (log.isInfoEnabled())
+log.info("Overriding 'clusterStateOnStart' configuration 
to 'INACTIVE'.");
+
 ctx.config().setDiscoverySpi(new IsolatedDiscoverySpi());
 
 discoMgr = new GridDiscoveryManager(ctx);
 
+// Reinitialized discovery manager won't have a valid 
consistentId on creation.
+
discoMgr.consistentId(ctx.pdsFolderResolver().resolveFolders().consistentId());
+
 ctx.add(discoMgr, false);
 }
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index faacc71..01ded97 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -1049,6 +1049,12 @@ public class GridClusterStateProcessor extends 
GridProcessorAdapter implements I
 boolean forceChangeBaselineTopology,
 boolean isAutoAdjust
 ) {
+if (ctx.maintenanceRegistry().isMaintenanceMode()) {
+return new GridFinishedFuture<>(
+new IgniteCheckedException("Failed to " + prettyStr(state) + " 
(node is in maintenance mode).")
+);
+}
+
 BaselineTopology blt = (compatibilityMode && 
!forceChangeBaselineTopology) ?
 null :
 calculateNewBaselineTopology(state, baselineNodes, 
forceChangeBaselineTopology);