(ignite) branch ignite-11445 created (now a061fb31b70)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-11445 in repository https://gitbox.apache.org/repos/asf/ignite.git at a061fb31b70 IGNITE-22775 Switch back to apache repo No new revisions were added by this update.
(ignite) branch master updated: IGNITE-22763 [ducktests] Ignore test_cdc_start_stop for version before 2.17 (#11443)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 b21589358db IGNITE-22763 [ducktests] Ignore test_cdc_start_stop for
version before 2.17 (#11443)
b21589358db is described below
commit b21589358db45194111524ff24fa36c8d611c42a
Author: Sergey Korotkov
AuthorDate: Fri Jul 19 14:34:06 2024 +0700
IGNITE-22763 [ducktests] Ignore test_cdc_start_stop for version before 2.17
(#11443)
---
modules/ducktests/tests/docker/Dockerfile| 2 +-
modules/ducktests/tests/ignitetest/tests/cdc/cdc_test.py | 4 ++--
modules/ducktests/tests/ignitetest/utils/version.py | 6 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index b09e8d00b70..0b5ae552b4b 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/tests/docker/Dockerfile
@@ -49,7 +49,7 @@ ARG APACHE_MIRROR="https://apache-mirror.rbc.ru/pub/apache/;
ARG APACHE_ARCHIVE="https://archive.apache.org/dist/;
# Install binary test dependencies.
-RUN for v in "2.7.6" "2.15.0"; \
+RUN for v in "2.7.6" "2.16.0"; \
do cd /opt; \
curl -O $APACHE_ARCHIVE/ignite/$v/apache-ignite-$v-bin.zip;\
unzip apache-ignite-$v-bin.zip && mv /opt/apache-ignite-$v-bin
/opt/ignite-$v;\
diff --git a/modules/ducktests/tests/ignitetest/tests/cdc/cdc_test.py
b/modules/ducktests/tests/ignitetest/tests/cdc/cdc_test.py
index 4a1cc9b7381..56a0fe4bbe3 100644
--- a/modules/ducktests/tests/ignitetest/tests/cdc/cdc_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/cdc/cdc_test.py
@@ -25,7 +25,7 @@ from ignitetest.tests.client_test import check_topology
from ignitetest.utils import cluster, ignite_versions, ignore_if
from ignitetest.utils.bean import Bean
from ignitetest.utils.ignite_test import IgniteTest
-from ignitetest.utils.version import LATEST, IgniteVersion, DEV_BRANCH,
V_2_14_0
+from ignitetest.utils.version import LATEST, IgniteVersion, DEV_BRANCH,
V_2_16_0
class CdcTest(IgniteTest):
@@ -37,7 +37,7 @@ class CdcTest(IgniteTest):
@cluster(num_nodes=5)
@ignite_versions(str(DEV_BRANCH), str(LATEST))
-@ignore_if(lambda version, _: version <= V_2_14_0)
+@ignore_if(lambda version, _: version <= V_2_16_0)
@parametrize(num_nodes=5, wal_force_archive_timeout=100, pacing=10,
duration_sec=10)
def test_cdc_start_stop(self, ignite_version, num_nodes,
wal_force_archive_timeout, pacing, duration_sec):
"""
diff --git a/modules/ducktests/tests/ignitetest/utils/version.py
b/modules/ducktests/tests/ignitetest/utils/version.py
index df25dbca5fd..929d53e3729 100644
--- a/modules/ducktests/tests/ignitetest/utils/version.py
+++ b/modules/ducktests/tests/ignitetest/utils/version.py
@@ -112,7 +112,11 @@ LATEST_2_14 = V_2_14_0
V_2_15_0 = IgniteVersion("2.15.0")
LATEST_2_15 = V_2_15_0
+# 2.16.x versions
+V_2_16_0 = IgniteVersion("2.16.0")
+LATEST_2_16 = V_2_16_0
+
# if you updated the LATEST version
# please check DEV version in 'tests/ignitetest/__init__.py'
-LATEST = LATEST_2_15
+LATEST = LATEST_2_16
OLDEST = V_2_7_6
(ignite) branch master updated: IGNITE-21491 SQL Calcite: Fix assertion error for multiline statements in thin client (#11394)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 8dd17748482 IGNITE-21491 SQL Calcite: Fix assertion error for
multiline statements in thin client (#11394)
8dd17748482 is described below
commit 8dd17748482189db05aad6f1b107fb36c2bc883e
Author: Ivan Daschinskiy
AuthorDate: Tue Jun 18 13:34:26 2024 +0300
IGNITE-21491 SQL Calcite: Fix assertion error for multiline statements in
thin client (#11394)
---
.../query/calcite/CalciteQueryProcessor.java | 8 ++
.../query/calcite/thin/MultiLineQueryTest.java | 108 +
.../ignite/testsuites/IntegrationTestSuite.java| 2 +
.../processors/query/GridQueryProcessor.java | 6 +-
.../internal/processors/query/QueryProperties.java | 11 ++-
5 files changed, 133 insertions(+), 2 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
index c1f4f90aeeb..fd00f2dfa3b 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
@@ -65,6 +65,7 @@ import
org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.QueryContext;
import org.apache.ignite.internal.processors.query.QueryEngine;
import org.apache.ignite.internal.processors.query.QueryParserMetricsHolder;
+import org.apache.ignite.internal.processors.query.QueryProperties;
import org.apache.ignite.internal.processors.query.QueryUtils;
import
org.apache.ignite.internal.processors.query.calcite.exec.ArrayRowHandler;
import
org.apache.ignite.internal.processors.query.calcite.exec.ExchangeService;
@@ -500,8 +501,15 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
parserMetrics.countCacheMiss();
+QueryProperties qryProps = qryCtx != null ?
qryCtx.unwrap(QueryProperties.class) : null;
+
SqlNodeList qryList = Commons.parse(sql,
FRAMEWORK_CONFIG.getParserConfig());
+if (qryList.size() > 1 && qryProps != null &&
qryProps.isFailOnMultipleStmts()) {
+throw new IgniteSQLException("Multiple statements queries are not
supported.",
+IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
+}
+
List res = new ArrayList<>(qryList.size());
List> qrys = new ArrayList<>(qryList.size());
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/thin/MultiLineQueryTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/thin/MultiLineQueryTest.java
new file mode 100644
index 000..5af3d58e7fc
--- /dev/null
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/thin/MultiLineQueryTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.query.calcite.thin;
+
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.SqlConfiguration;
+import org.apache.ignite.indexing.IndexingQueryEngineConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.apache.ignite.testframewo
(ignite-extensions) branch master updated: IGNITE-22419 Remove unused version properties from pom.xml (#273)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 1aa52cff IGNITE-22419 Remove unused version properties from pom.xml
(#273)
1aa52cff is described below
commit 1aa52cfffb7f582eac1051f433a5a4d7f04cce76
Author: Semyon Zikunov <43781436+supermink...@users.noreply.github.com>
AuthorDate: Mon Jun 17 17:08:25 2024 +1000
IGNITE-22419 Remove unused version properties from pom.xml (#273)
---
modules/aws-ext/pom.xml| 6 --
modules/azure-ext/pom.xml | 4
modules/hibernate-ext/hibernate/pom.xml| 2 +-
modules/jms11-ext/pom.xml | 2 +-
modules/kafka-ext/pom.xml | 6 +-
modules/mqtt-ext/pom.xml | 4 ++--
modules/ssh-ext/pom.xml| 2 +-
modules/twitter-ext/pom.xml| 2 +-
modules/yarn-ext/pom.xml | 14 --
.../zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml| 2 +-
parent-internal/pom.xml| 2 ++
11 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/modules/aws-ext/pom.xml b/modules/aws-ext/pom.xml
index ac79f5ad..aa0367df 100644
--- a/modules/aws-ext/pom.xml
+++ b/modules/aws-ext/pom.xml
@@ -148,12 +148,6 @@
${httpclient.version}
-
-org.apache.httpcomponents
-httpcore
-${httpcore.version}
-
-
commons-codec
commons-codec
diff --git a/modules/azure-ext/pom.xml b/modules/azure-ext/pom.xml
index c5b056ba..5e1a3021 100644
--- a/modules/azure-ext/pom.xml
+++ b/modules/azure-ext/pom.xml
@@ -29,6 +29,10 @@
../../parent-internal/pom.xml
+
+4.1.101.Final
+
+
ignite-azure-ext
1.1.0-SNAPSHOT
https://ignite.apache.org
diff --git a/modules/hibernate-ext/hibernate/pom.xml
b/modules/hibernate-ext/hibernate/pom.xml
index 23fa31cd..0b562ac0 100644
--- a/modules/hibernate-ext/hibernate/pom.xml
+++ b/modules/hibernate-ext/hibernate/pom.xml
@@ -135,7 +135,7 @@
javax.xml.bind
jaxb-api
-${jaxb.api.version}
+2.1
test
diff --git a/modules/jms11-ext/pom.xml b/modules/jms11-ext/pom.xml
index 31adb0cb..fa3d0743 100644
--- a/modules/jms11-ext/pom.xml
+++ b/modules/jms11-ext/pom.xml
@@ -46,7 +46,7 @@
org.apache.geronimo.specs
geronimo-jms_1.1_spec
-${jms.spec.version}
+1.1.1
provided
diff --git a/modules/kafka-ext/pom.xml b/modules/kafka-ext/pom.xml
index 5aaacd3b..f550a291 100644
--- a/modules/kafka-ext/pom.xml
+++ b/modules/kafka-ext/pom.xml
@@ -31,6 +31,10 @@
../../parent-internal/pom.xml
+
+3.4.0
+
+
ignite-kafka-ext
1.0.0-SNAPSHOT
https://ignite.apache.org
@@ -148,7 +152,7 @@
org.easymock
easymock
-${easymock.version}
+3.4
test
diff --git a/modules/mqtt-ext/pom.xml b/modules/mqtt-ext/pom.xml
index 7577e9f1..0758d421 100644
--- a/modules/mqtt-ext/pom.xml
+++ b/modules/mqtt-ext/pom.xml
@@ -46,14 +46,14 @@
org.eclipse.paho
org.eclipse.paho.client.mqttv3
-${paho.version}
+1.0.2
provided
com.github.rholder
guava-retrying
-${guava.retrying.version}
+2.0.0
diff --git a/modules/ssh-ext/pom.xml b/modules/ssh-ext/pom.xml
index e17a70c8..ac32f8c9 100644
--- a/modules/ssh-ext/pom.xml
+++ b/modules/ssh-ext/pom.xml
@@ -45,7 +45,7 @@
com.jcraft
jsch
-${jsch.version}
+0.1.54
diff --git a/modules/twitter-ext/pom.xml b/modules/twitter-ext/pom.xml
index 7b27dc79..cd69bf6b 100644
--- a/modules/twitter-ext/pom.xml
+++ b/modules/twitter-ext/pom.xml
@@ -65,7 +65,7 @@
com.twitter
hbc-twitter4j
-${twitter.hbc.version}
+2.2.0
provided
diff --git a/modules/yarn-ext/pom.xml b/modules/yarn-ext/pom.xml
index 55ff4233..3cf32555 100644
--- a/modules/yarn-ext/pom.xml
+++ b/modules/yarn-ext/pom.xml
@@ -71,14 +71,6 @@
org.slf4j
slf4j-log4j12
-
-commons-beanutils
-commons-beanutils
-
-
-commons-beanutils
-c
(ignite) branch master updated: IGNITE-22419 Remove unused version properties from pom.xml (#11379)
This is an automated email from the ASF dual-hosted git repository. ivandasch 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 5d94e2e1da4 IGNITE-22419 Remove unused version properties from pom.xml (#11379) 5d94e2e1da4 is described below commit 5d94e2e1da4451ee2e4e8215f2b454f181460c6e Author: Semyon Zikunov <43781436+supermink...@users.noreply.github.com> AuthorDate: Mon Jun 17 17:08:08 2024 +1000 IGNITE-22419 Remove unused version properties from pom.xml (#11379) --- parent/pom.xml | 39 --- 1 file changed, 39 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1fe2f1731ff..2fa040dcffa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -66,15 +66,6 @@ false -5.12.0 -1.0_6 -4.2 -1.8.13_1 -1.8.13 -4.1.101.Final -1.69 - 1.9.2_1 -1.9.4 1.16.0 3.2.2 2.6 @@ -82,22 +73,11 @@ 1.4 2.2.5 5.2.0 -3.4 -1.0.6_1 -1.0.6 -2.0.0 32.1.2-jre -14.0.1 -16.0.1 1.62.2 1.4.197 -2.9.1 2.2 -4.5.13 -4.4.14 2.14.0 -2.1 -2.1.14 3.28.0-GA 1.0.0_1 1.1.0 @@ -106,16 +86,10 @@ 16.0.3 9.4.53.v20231009 1.13 -1.1.1 4.5.2 3.1.15 2.3.1-M1 -0.1.54_1 -0.1.54 -2.4_1 -2.4 r938 -3.4.0 2.22.0 7.4.0_1 8.11.2 @@ -128,26 +102,13 @@ 8.45 3.12.4 8.0.30 -1.1.2 -2.0.8_6 -1.0.2 42.6.0 -2.10.7 -2.10.7 -2.11.12 -2.2.6 1.7.33 -1.6.4 1.1.10.4 5.2.25.RELEASE -1.1.1 3.1.2 9.0.63 -2.2.0 - 2.2.0 -2.2.0 0.8.3 -0.5 3.8.3 1.5.5-5 0.31.1
(ignite-extensions) branch ignite-22419 created (now edf0b42d)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git at edf0b42d IGNITE-22419 Removed unused dependencies from ignite-extensions second iteration This branch includes the following new commits: new c6d428d4 IGNITE-22419 Removed unused dependencies from ignite-extensions new edf0b42d IGNITE-22419 Removed unused dependencies from ignite-extensions second iteration 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.
(ignite-extensions) 01/02: IGNITE-22419 Removed unused dependencies from ignite-extensions
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch ignite-22419
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
commit c6d428d4bb14a6bf413079d96ae47392b583de6f
Author: superminkfan
AuthorDate: Fri Jun 7 12:44:48 2024 +1000
IGNITE-22419 Removed unused dependencies from ignite-extensions
---
modules/aws-ext/pom.xml | 6 --
modules/yarn-ext/pom.xml | 14 --
2 files changed, 20 deletions(-)
diff --git a/modules/aws-ext/pom.xml b/modules/aws-ext/pom.xml
index ac79f5ad..aa0367df 100644
--- a/modules/aws-ext/pom.xml
+++ b/modules/aws-ext/pom.xml
@@ -148,12 +148,6 @@
${httpclient.version}
-
-org.apache.httpcomponents
-httpcore
-${httpcore.version}
-
-
commons-codec
commons-codec
diff --git a/modules/yarn-ext/pom.xml b/modules/yarn-ext/pom.xml
index 55ff4233..3cf32555 100644
--- a/modules/yarn-ext/pom.xml
+++ b/modules/yarn-ext/pom.xml
@@ -71,14 +71,6 @@
org.slf4j
slf4j-log4j12
-
-commons-beanutils
-commons-beanutils
-
-
-commons-beanutils
-commons-beanutils-core
-
commons-codec
commons-codec
@@ -103,12 +95,6 @@
commons-codec
${commons.codec.version}
-
-
-commons-beanutils
-commons-beanutils
-${commons.beanutils.version}
-
(ignite) 04/04: IGNITE-22419 Removed unused dependencies Fourth iteration
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite.git commit bbddb7ae097ed6302c1d9081aed85b51c03411fd Author: superminkfan AuthorDate: Mon Jun 10 14:27:23 2024 +1000 IGNITE-22419 Removed unused dependencies Fourth iteration --- parent/pom.xml | 13 - 1 file changed, 13 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4583c9251b0..2fa040dcffa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -66,7 +66,6 @@ false -4.1.101.Final 1.16.0 3.2.2 2.6 @@ -75,11 +74,8 @@ 2.2.5 5.2.0 32.1.2-jre -14.0.1 -16.0.1 1.62.2 1.4.197 -2.9.1 2.2 2.14.0 3.28.0-GA @@ -90,14 +86,10 @@ 16.0.3 9.4.53.v20231009 1.13 -1.1.1 4.5.2 3.1.15 2.3.1-M1 -0.1.54_1 -0.1.54 r938 -3.4.0 2.22.0 7.4.0_1 8.11.2 @@ -110,18 +102,13 @@ 8.45 3.12.4 8.0.30 -2.0.8_6 -1.0.2 42.6.0 1.7.33 -1.6.4 1.1.10.4 5.2.25.RELEASE -1.1.1 3.1.2 9.0.63 0.8.3 -0.5 3.8.3 1.5.5-5 0.31.1
(ignite) 01/04: IGNITE-22419 Removed unused dependencies
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite.git commit aaebaef3c9f83b1afeab8e16e90ce798a6a56efe Author: superminkfan AuthorDate: Fri Jun 7 12:34:50 2024 +1000 IGNITE-22419 Removed unused dependencies --- parent/pom.xml | 8 1 file changed, 8 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1fe2f1731ff..cfcad6a8a5c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -67,14 +67,10 @@ 5.12.0 -1.0_6 4.2 1.8.13_1 1.8.13 4.1.101.Final -1.69 - 1.9.2_1 -1.9.4 1.16.0 3.2.2 2.6 @@ -83,8 +79,6 @@ 2.2.5 5.2.0 3.4 -1.0.6_1 -1.0.6 2.0.0 32.1.2-jre 14.0.1 @@ -94,7 +88,6 @@ 2.9.1 2.2 4.5.13 -4.4.14 2.14.0 2.1 2.1.14 @@ -128,7 +121,6 @@ 8.45 3.12.4 8.0.30 -1.1.2 2.0.8_6 1.0.2 42.6.0
(ignite-extensions) 02/02: IGNITE-22419 Removed unused dependencies from ignite-extensions second iteration
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch ignite-22419
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
commit edf0b42d10d25ed41a0e00551be84e61a3cd4318
Author: superminkfan
AuthorDate: Tue Jun 11 12:33:53 2024 +1000
IGNITE-22419 Removed unused dependencies from ignite-extensions second
iteration
---
modules/azure-ext/pom.xml | 4
modules/hibernate-ext/hibernate/pom.xml | 2 +-
modules/jms11-ext/pom.xml | 2 +-
modules/kafka-ext/pom.xml | 6 +-
modules/mqtt-ext/pom.xml| 4 ++--
modules/ssh-ext/pom.xml | 2 +-
modules/twitter-ext/pom.xml | 2 +-
modules/zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml | 2 +-
parent-internal/pom.xml | 2 ++
9 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/modules/azure-ext/pom.xml b/modules/azure-ext/pom.xml
index c5b056ba..5e1a3021 100644
--- a/modules/azure-ext/pom.xml
+++ b/modules/azure-ext/pom.xml
@@ -29,6 +29,10 @@
../../parent-internal/pom.xml
+
+4.1.101.Final
+
+
ignite-azure-ext
1.1.0-SNAPSHOT
https://ignite.apache.org
diff --git a/modules/hibernate-ext/hibernate/pom.xml
b/modules/hibernate-ext/hibernate/pom.xml
index 23fa31cd..0b562ac0 100644
--- a/modules/hibernate-ext/hibernate/pom.xml
+++ b/modules/hibernate-ext/hibernate/pom.xml
@@ -135,7 +135,7 @@
javax.xml.bind
jaxb-api
-${jaxb.api.version}
+2.1
test
diff --git a/modules/jms11-ext/pom.xml b/modules/jms11-ext/pom.xml
index 31adb0cb..fa3d0743 100644
--- a/modules/jms11-ext/pom.xml
+++ b/modules/jms11-ext/pom.xml
@@ -46,7 +46,7 @@
org.apache.geronimo.specs
geronimo-jms_1.1_spec
-${jms.spec.version}
+1.1.1
provided
diff --git a/modules/kafka-ext/pom.xml b/modules/kafka-ext/pom.xml
index 5aaacd3b..f550a291 100644
--- a/modules/kafka-ext/pom.xml
+++ b/modules/kafka-ext/pom.xml
@@ -31,6 +31,10 @@
../../parent-internal/pom.xml
+
+3.4.0
+
+
ignite-kafka-ext
1.0.0-SNAPSHOT
https://ignite.apache.org
@@ -148,7 +152,7 @@
org.easymock
easymock
-${easymock.version}
+3.4
test
diff --git a/modules/mqtt-ext/pom.xml b/modules/mqtt-ext/pom.xml
index 7577e9f1..0758d421 100644
--- a/modules/mqtt-ext/pom.xml
+++ b/modules/mqtt-ext/pom.xml
@@ -46,14 +46,14 @@
org.eclipse.paho
org.eclipse.paho.client.mqttv3
-${paho.version}
+1.0.2
provided
com.github.rholder
guava-retrying
-${guava.retrying.version}
+2.0.0
diff --git a/modules/ssh-ext/pom.xml b/modules/ssh-ext/pom.xml
index e17a70c8..ac32f8c9 100644
--- a/modules/ssh-ext/pom.xml
+++ b/modules/ssh-ext/pom.xml
@@ -45,7 +45,7 @@
com.jcraft
jsch
-${jsch.version}
+0.1.54
diff --git a/modules/twitter-ext/pom.xml b/modules/twitter-ext/pom.xml
index 7b27dc79..cd69bf6b 100644
--- a/modules/twitter-ext/pom.xml
+++ b/modules/twitter-ext/pom.xml
@@ -65,7 +65,7 @@
com.twitter
hbc-twitter4j
-${twitter.hbc.version}
+2.2.0
provided
diff --git a/modules/zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml
b/modules/zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml
index 7f1029d1..970d064d 100644
--- a/modules/zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml
+++ b/modules/zookeeper-ip-finder-ext/zookeeper-ip-finder/pom.xml
@@ -71,7 +71,7 @@
com.google.guava
guava
-${guava16.version}
+16.0.1
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index 85ae94c1..9f485090 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -40,6 +40,8 @@
3.2.5
5.3.19
6.1.6
+5.12.0
+1.8.13
(ignite) 02/04: IGNITE-22419 Removed unused dependencies Second iteration
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite.git commit c831f5e8a585bcf8a5b776d8f142c4d8af2146b8 Author: superminkfan AuthorDate: Fri Jun 7 16:32:15 2024 +1000 IGNITE-22419 Removed unused dependencies Second iteration --- parent/pom.xml | 10 -- 1 file changed, 10 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index cfcad6a8a5c..9624887c19e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -67,7 +67,6 @@ 5.12.0 -4.2 1.8.13_1 1.8.13 4.1.101.Final @@ -105,8 +104,6 @@ 2.3.1-M1 0.1.54_1 0.1.54 -2.4_1 -2.4 r938 3.4.0 2.22.0 @@ -124,10 +121,6 @@ 2.0.8_6 1.0.2 42.6.0 -2.10.7 -2.10.7 -2.11.12 -2.2.6 1.7.33 1.6.4 1.1.10.4 @@ -135,9 +128,6 @@ 1.1.1 3.1.2 9.0.63 -2.2.0 - 2.2.0 -2.2.0 0.8.3 0.5 3.8.3
(ignite) branch ignite-22419 updated (3da3a4d32ef -> bbddb7ae097)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a change to branch ignite-22419
in repository https://gitbox.apache.org/repos/asf/ignite.git
omit 3da3a4d32ef IGNITE-22419 Removed unused dependencies Fourth iteration
omit e4af22043fa IGNITE-22419 Removed unused dependencies Third iteration
omit c2ad63b842f IGNITE-22419 Removed unused dependencies Second iteration
omit e7827a840ba IGNITE-22419 Removed unused dependencies
add 794a536737f IGNITE-22189 Add expiry policy info to CacheView - Fixes
#11357.
add b43ca988726 IGNITE-22439 SQL Calcite: Add test for duplicate keys
(#11380)
add faea3b29832 IGNITE-22449 Documentation: Add new Cache View column
(#11385)
add 42b3285bbbf IGNITE-22420 Fix expireTime setting for thin client
replication (#11376)
add 6721ab9d020 IGNITE-22464 Java thin client: Add events for client start
and stop - Fixes #11387.
new aaebaef3c9f IGNITE-22419 Removed unused dependencies
new c831f5e8a58 IGNITE-22419 Removed unused dependencies Second iteration
new 955bb251331 IGNITE-22419 Removed unused dependencies Third iteration
new bbddb7ae097 IGNITE-22419 Removed unused dependencies Fourth iteration
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 (3da3a4d32ef)
\
N -- N -- N refs/heads/ignite-22419 (bbddb7ae097)
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.
The 4 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:
docs/_docs/monitoring-metrics/system-views.adoc| 1 +
.../integration/TableDmlIntegrationTest.java | 14 ++
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 1 +
...ectionClosedEvent.java => ClientFailEvent.java} | 36 +++--
.../client/events/ClientLifecycleEvent.java} | 5 +-
...ener.java => ClientLifecycleEventListener.java} | 14 +-
.../ClientStartEvent.java} | 44 +++---
.../{ConnectionEvent.java => ClientStopEvent.java} | 22 +--
.../internal/client/thin/TcpIgniteClient.java | 56 ++-
.../systemview/walker/CacheViewWalker.java | 176 +++--
.../cache/IgniteCacheOffheapManager.java | 8 +
.../cache/IgniteCacheOffheapManagerImpl.java | 16 ++
.../cache/persistence/GridCacheOffheapManager.java | 33
.../cache/ClientCachePutAllConflictRequest.java| 8 +-
.../ignite/spi/systemview/view/CacheView.java | 80 +-
.../client/thin/DataReplicationOperationsTest.java | 51 +++---
.../IgniteClientLifecycleEventListenerTest.java| 94 +++
.../metric/SystemViewCacheExpiryPolicyTest.java| 114 +
.../ignite/internal/metric/SystemViewSelfTest.java | 110 +
.../ignite/testsuites/IgniteCacheTestSuite13.java | 2 +
.../org/apache/ignite/client/ClientTestSuite.java | 2 +
21 files changed, 708 insertions(+), 179 deletions(-)
copy
modules/core/src/main/java/org/apache/ignite/client/events/{ConnectionClosedEvent.java
=> ClientFailEvent.java} (60%)
copy
modules/core/src/{test/java/org/apache/ignite/internal/binary/test/GridBinaryTestClass2.java
=> main/java/org/apache/ignite/client/events/ClientLifecycleEvent.java} (85%)
copy
modules/core/src/main/java/org/apache/ignite/client/events/{RequestEventListener.java
=> ClientLifecycleEventListener.java} (73%)
copy
modules/core/src/main/java/org/apache/ignite/client/{ClientRetryPolicyContext.java
=> events/ClientStartEvent.java} (57%)
copy
modules/core/src/main/java/org/apache/ignite/client/events/{ConnectionEvent.java
=> ClientStopEvent.java} (67%)
create mode 100644
modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/IgniteClientLifecycleEventListenerTest.java
create mode 100644
modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewCacheExpiryPolicyTest.java
(ignite) 03/04: IGNITE-22419 Removed unused dependencies Third iteration
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 955bb251331d8103962155d5e13f2de8aa1b4a64 Author: superminkfan AuthorDate: Fri Jun 7 17:21:11 2024 +1000 IGNITE-22419 Removed unused dependencies Third iteration --- parent/pom.xml | 8 1 file changed, 8 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9624887c19e..4583c9251b0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -66,9 +66,6 @@ false -5.12.0 -1.8.13_1 -1.8.13 4.1.101.Final 1.16.0 3.2.2 @@ -77,8 +74,6 @@ 1.4 2.2.5 5.2.0 -3.4 -2.0.0 32.1.2-jre 14.0.1 16.0.1 @@ -86,10 +81,7 @@ 1.4.197 2.9.1 2.2 -4.5.13 2.14.0 -2.1 -2.1.14 3.28.0-GA 1.0.0_1 1.1.0
(ignite-extensions) branch master updated: IGNITE-19910 Add consumer poll timeout to kafka-cdc (#276)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 9b79fe66 IGNITE-19910 Add consumer poll timeout to kafka-cdc (#276)
9b79fe66 is described below
commit 9b79fe6611b8c9dd4f3d9c2323d4f547829e3270
Author: Ivan Daschinskiy
AuthorDate: Thu Jun 13 11:48:54 2024 +0300
IGNITE-19910 Add consumer poll timeout to kafka-cdc (#276)
---
.../kafka/AbstractKafkaToIgniteCdcStreamer.java| 2 ++
.../cdc/kafka/KafkaToIgniteCdcStreamerApplier.java | 8 -
.../KafkaToIgniteCdcStreamerConfiguration.java | 22 +
.../cdc/kafka/KafkaToIgniteMetadataUpdater.java| 6 +++-
.../ignite/cdc/kafka/KafkaToIgniteLoaderTest.java | 38 ++
.../kafka/KafkaToIgniteMetadataUpdaterTest.java| 2 ++
.../resources/loader/kafka-to-ignite-correct.xml | 5 +++
...ml => kafka-to-ignite-invalid-poll-timeout.xml} | 1 +
...=> kafka-to-ignite-invalid-request-timeout.xml} | 1 +
.../loader/thin/kafka-to-ignite-client-correct.xml | 5 +++
...afka-to-ignite-client-invalid-poll-timeout.xml} | 1 +
...a-to-ignite-client-invalid-request-timeout.xml} | 1 +
12 files changed, 90 insertions(+), 2 deletions(-)
diff --git
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/AbstractKafkaToIgniteCdcStreamer.java
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/AbstractKafkaToIgniteCdcStreamer.java
index 2df4d204..5e12cc43 100644
---
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/AbstractKafkaToIgniteCdcStreamer.java
+++
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/AbstractKafkaToIgniteCdcStreamer.java
@@ -96,6 +96,7 @@ abstract class AbstractKafkaToIgniteCdcStreamer implements
Runnable {
streamerCfg.getKafkaPartsTo() > streamerCfg.getKafkaPartsFrom(),
"The Kafka partitions upper bound must be greater than lower
bound.");
A.ensure(streamerCfg.getKafkaRequestTimeout() >= 0, "The Kafka request
timeout cannot be negative.");
+A.ensure(streamerCfg.getKafkaConsumerPollTimeout() >= 0, "The Kafka
consumer poll timeout cannot be negative.");
A.ensure(streamerCfg.getThreadCount() > 0, "Threads count value must
me greater than zero.");
A.ensure(
streamerCfg.getKafkaPartsTo() - streamerCfg.getKafkaPartsFrom() >=
streamerCfg.getThreadCount(),
@@ -175,6 +176,7 @@ abstract class AbstractKafkaToIgniteCdcStreamer implements
Runnable {
caches,
streamerCfg.getMaxBatchSize(),
streamerCfg.getKafkaRequestTimeout(),
+streamerCfg.getKafkaConsumerPollTimeout(),
metaUpdr,
stopped
);
diff --git
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerApplier.java
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerApplier.java
index ceb688e9..d113bba7 100644
---
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerApplier.java
+++
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerApplier.java
@@ -107,6 +107,9 @@ class KafkaToIgniteCdcStreamerApplier implements Runnable,
AutoCloseable {
/** The maximum time to complete Kafka related requests, in milliseconds.
*/
private final long kafkaReqTimeout;
+/** Consumer poll timeout in milliseconds. */
+private final long consumerPollTimeout;
+
/** Metadata updater. */
private final KafkaToIgniteMetadataUpdater metaUpdr;
@@ -132,6 +135,7 @@ class KafkaToIgniteCdcStreamerApplier implements Runnable,
AutoCloseable {
* @param caches Cache ids.
* @param maxBatchSize Maximum batch size.
* @param kafkaReqTimeout The maximum time to complete Kafka related
requests, in milliseconds.
+ * @param consumerPollTimeout Consumer poll timeout in milliseconds.
* @param metaUpdr Metadata updater.
* @param stopped Stopped flag.
*/
@@ -145,6 +149,7 @@ class KafkaToIgniteCdcStreamerApplier implements Runnable,
AutoCloseable {
Set caches,
int maxBatchSize,
long kafkaReqTimeout,
+long consumerPollTimeout,
KafkaToIgniteMetadataUpdater metaUpdr,
AtomicBoolean stopped
) {
@@ -155,6 +160,7 @@ class KafkaToIgniteCdcStreamerApplier implements Runnable,
AutoCloseable {
this.kafkaPartTo = kafkaPartTo;
this.caches = caches;
this.kafkaReqTimeout = kafkaReqTimeout;
+this.consumerPollTimeout = consumerPollTimeout;
this.metaUpdr = metaUpdr;
this.stopped = stopped;
this.log = log.getLogger(KafkaToIgniteCdcStreamerApplier.class);
@@ -213,7 +219,7 @@ class KafkaToIgniteCdcStreamerAppli
(ignite) branch ignite-22419 created (now 3da3a4d32ef)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-22419 in repository https://gitbox.apache.org/repos/asf/ignite.git at 3da3a4d32ef IGNITE-22419 Removed unused dependencies Fourth iteration No new revisions were added by this update.
(ignite-extensions) branch master updated: IGNITE-22450 fix test (#275)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new dfeea518 IGNITE-22450 fix test (#275)
dfeea518 is described below
commit dfeea5186c35a171206900939540b1b4f5639514
Author: Aleksandr Nikolaev <56360298+nao...@users.noreply.github.com>
AuthorDate: Mon Jun 10 18:50:34 2024 +0300
IGNITE-22450 fix test (#275)
Co-authored-by: Aleksandr Nikolaev
---
.../main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/ml-ext/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
b/modules/ml-ext/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
index b3b60b92..34c07f21 100644
---
a/modules/ml-ext/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
+++
b/modules/ml-ext/ml/src/main/java/org/apache/ignite/ml/inference/json/JacksonHelper.java
@@ -29,10 +29,10 @@ public class JacksonHelper {
/** */
public static void readAndValidateBasicJsonModelProperties(Path path,
ObjectMapper mapper, String className) throws IOException {
Map jsonAsMap = mapper.readValue(new
File(path.toAbsolutePath().toString()), LinkedHashMap.class);
-String formatVer = jsonAsMap.get("formatVer").toString();
+String formatVer = jsonAsMap.get("formatVersion").toString();
Long timestamp = (Long)jsonAsMap.get("timestamp");
String uid = jsonAsMap.get("uid").toString();
-String modelCls = jsonAsMap.get("modelCls").toString();
+String modelCls = jsonAsMap.get("modelClass").toString();
if (!modelCls.equals(className)) {
throw new IllegalArgumentException("You are trying to load " +
modelCls + " model to " + className);
(ignite) branch master updated: IGNITE-21223 Add xml example in WAL Records Compression section of Ignite documentation (#11289)
This is an automated email from the ASF dual-hosted git repository. ivandasch 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 8fb97ae33d6 IGNITE-21223 Add xml example in WAL Records Compression section of Ignite documentation (#11289) 8fb97ae33d6 is described below commit 8fb97ae33d6defdd7b55a90360537db31b16e544 Author: Andrey N AuthorDate: Fri Mar 29 21:45:55 2024 +0300 IGNITE-21223 Add xml example in WAL Records Compression section of Ignite documentation (#11289) --- docs/_docs/code-snippets/xml/wal-compress.xml | 35 ++ docs/_docs/persistence/native-persistence.adoc | 4 +++ 2 files changed, 39 insertions(+) diff --git a/docs/_docs/code-snippets/xml/wal-compress.xml b/docs/_docs/code-snippets/xml/wal-compress.xml new file mode 100644 index 000..41215f4e33b --- /dev/null +++ b/docs/_docs/code-snippets/xml/wal-compress.xml @@ -0,0 +1,35 @@ + + +http://www.springframework.org/schema/beans; xmlns:util="http://www.springframework.org/schema/util; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd;> + + + + + + + + + + + + + + + + + diff --git a/docs/_docs/persistence/native-persistence.adoc b/docs/_docs/persistence/native-persistence.adoc index 4d67c2cb4f4..18f8f677cd8 100644 --- a/docs/_docs/persistence/native-persistence.adoc +++ b/docs/_docs/persistence/native-persistence.adoc @@ -298,6 +298,10 @@ To enable it, set the compression algorithm and compression level in the data st [tabs] -- tab:XML[] +[source, xml] + +include::code-snippets/xml/wal-compress.xml[tags=ignite-config,indent=0] + tab:Java[] [source, java]
(ignite) branch master updated: IGNITE-21796 Update grpc-context version from 1.61.0 to 1.62.2 in opencensus module (#11286)
This is an automated email from the ASF dual-hosted git repository. ivandasch 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 4365f71e7e3 IGNITE-21796 Update grpc-context version from 1.61.0 to 1.62.2 in opencensus module (#11286) 4365f71e7e3 is described below commit 4365f71e7e38bab6bb4e066b00670cf505dbbfbe Author: Andrey N AuthorDate: Wed Mar 27 17:00:52 2024 +0300 IGNITE-21796 Update grpc-context version from 1.61.0 to 1.62.2 in opencensus module (#11286) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3c41a01d395..1fe2f1731ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -89,7 +89,7 @@ 32.1.2-jre 14.0.1 16.0.1 -1.61.0 +1.62.2 1.4.197 2.9.1 2.2
(ignite) branch master updated: IGNITE-21637 Fix integer overflow in page eviction trackers (#11261)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 e35f91f59ef IGNITE-21637 Fix integer overflow in page eviction
trackers (#11261)
e35f91f59ef is described below
commit e35f91f59efd0fc8721aedc7b9029664c80d1eff
Author: Ilya Shishkov
AuthorDate: Thu Mar 7 11:18:06 2024 +0300
IGNITE-21637 Fix integer overflow in page eviction trackers (#11261)
---
.../evict/Random2LruPageEvictionTracker.java | 20 ++--
.../evict/RandomLruPageEvictionTracker.java | 12 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/Random2LruPageEvictionTracker.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/Random2LruPageEvictionTracker.java
index 54afb346ac6..8561b9d5342 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/Random2LruPageEvictionTracker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/Random2LruPageEvictionTracker.java
@@ -69,9 +69,9 @@ public class Random2LruPageEvictionTracker extends
PageAbstractEvictionTracker {
/** {@inheritDoc} */
@Override public void start() throws IgniteException {
-trackingArrPtr = GridUnsafe.allocateMemory(trackingSize * 8l);
+trackingArrPtr = GridUnsafe.allocateMemory(trackingSize * 8L);
-GridUnsafe.zeroMemory(trackingArrPtr, trackingSize * 8l);
+GridUnsafe.zeroMemory(trackingArrPtr, trackingSize * 8L);
}
/** {@inheritDoc} */
@@ -92,15 +92,15 @@ public class Random2LruPageEvictionTracker extends
PageAbstractEvictionTracker {
do {
int trackingIdx = trackingIdx(pageIdx);
-int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8);
+int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8L);
-int secondTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8 + 4);
+int secondTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8L + 4);
if (firstTs <= secondTs)
-success = GridUnsafe.compareAndSwapInt(null, trackingArrPtr +
trackingIdx * 8, firstTs, (int)latestTs);
+success = GridUnsafe.compareAndSwapInt(null, trackingArrPtr +
trackingIdx * 8L, firstTs, (int)latestTs);
else {
success = GridUnsafe.compareAndSwapInt(
-null, trackingArrPtr + trackingIdx * 8 + 4, secondTs,
(int)latestTs);
+null, trackingArrPtr + trackingIdx * 8L + 4, secondTs,
(int)latestTs);
}
} while (!success);
}
@@ -123,9 +123,9 @@ public class Random2LruPageEvictionTracker extends
PageAbstractEvictionTracker {
while (dataPagesCnt < SAMPLE_SIZE) {
int trackingIdx = rnd.nextInt(trackingSize);
-int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8);
+int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8L);
-int secondTs = GridUnsafe.getIntVolatile(null, trackingArrPtr
+ trackingIdx * 8 + 4);
+int secondTs = GridUnsafe.getIntVolatile(null, trackingArrPtr
+ trackingIdx * 8L + 4);
int minTs = Math.min(firstTs, secondTs);
@@ -164,7 +164,7 @@ public class Random2LruPageEvictionTracker extends
PageAbstractEvictionTracker {
@Override protected boolean checkTouch(long pageId) {
int trackingIdx = trackingIdx(PageIdUtils.pageIndex(pageId));
-int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8);
+int firstTs = GridUnsafe.getIntVolatile(null, trackingArrPtr +
trackingIdx * 8L);
return firstTs != 0;
}
@@ -175,6 +175,6 @@ public class Random2LruPageEvictionTracker extends
PageAbstractEvictionTracker {
int trackingIdx = trackingIdx(pageIdx);
-GridUnsafe.putLongVolatile(null, trackingArrPtr + trackingIdx * 8, 0L);
+GridUnsafe.putLongVolatile(null, trackingArrPtr + trackingIdx * 8L,
0L);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/RandomLruPageEvictionTracker.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/RandomLruPageEvictionTracker.java
index e926a3386d6..ac57bd39236 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/RandomLruPageEvictionTracker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence
svn commit: r66899 - /dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/
Author: ivandasch Date: Sun Jan 28 16:12:28 2024 New Revision: 66899 Log: Remove released ignite-ml-ext 1.0.0 rc1 Removed: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/
svn commit: r66898 - in /release/ignite/ignite-extensions/ignite-ml-ext: ./ 1.0.0/ 1.0.0/ignite-ml-ext-src.zip 1.0.0/ignite-ml-ext-src.zip.asc 1.0.0/ignite-ml-ext-src.zip.sha512
Author: ivandasch Date: Sun Jan 28 16:08:15 2024 New Revision: 66898 Log: Release ignite-ml-ext 1.0.0 Added: release/ignite/ignite-extensions/ignite-ml-ext/ release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip (with props) release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.asc release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.sha512 Added: release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip == Binary file - no diff available. Propchange: release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip -- svn:mime-type = application/octet-stream Added: release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.asc == --- release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.asc (added) +++ release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.asc Sun Jan 28 16:08:15 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEQp2+GYvXhvv+3gqGCeVmL9Kw3WwFAmWunmUACgkQCeVmL9Kw +3WwOSA/9HYKKLojWXblbG8lzviAB+E6l2UpBCu/P6T4MkPpolUHyFfJSPnEhVooY +wH3UlsPN6/+skWJxvNOpgFlWrjnC+bnfX8gQ27IKiJyOWZd94CfBmmUTKGr5VxFd +Nuwj8mwvXeEbnxPKe9rwZ/cSFy5kFUhOiV+pQQACkeiSu2lUebyUaf7Ox4MKLXsi +VQh0Nj2lVgT6hRztqJnwlSvSbMCCs3w37yGuvOZB7/LbUldznp9GZg0M+tv3qaKU +VFIopMkM32EIH2/CcA4ezWlVLyrShS0C4BTA0HneaeIKTEc19cLgY5JfXaABJ77O +R11hPYqbXnzdydvS5EW6X2Sq94I4LUXeW7P6Mcbd6gidf0txL4VlSYi85dpD8vKX +m4FmQAwkEFZvyOPdGwjcAusrelYZ4GjWyjSAmc0AEXi6DoQv/cfs3ap94P7Mo3Qo +CDEVxEXsEyza2/Dx9/o3/5zWRbtcNmKUo6YM12ZR4VB+/2HRGZSnWcFAYX9ssEZw +OLG4EJt4E5CS010Z25cvPYyLEExY0YdrE6k/bUv/faNUbk8+hj6iWf0OflwbdR6n +SxNmElznvd9uxRqCPvrflctB+9LWNcc/2jWVA4Do3m73euxBiyZUCngnY38RFr9j +Yoh3a5QoK6s88nYJr4HlI7qHPJ6r6NvnLIwC8x4BwEhG7+fHtpM= +=vBQj +-END PGP SIGNATURE- Added: release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.sha512 == --- release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.sha512 (added) +++ release/ignite/ignite-extensions/ignite-ml-ext/1.0.0/ignite-ml-ext-src.zip.sha512 Sun Jan 28 16:08:15 2024 @@ -0,0 +1 @@ +3933ea37cc7fb8a190a4dfc081ec6159f42d99010af4409536f052200eb81c3723c17917136c776cc13a35b0394e0e8bb02cf576342a97584cb7ddd64163 ignite-ml-ext-src.zip \ No newline at end of file
(ignite-extensions) branch master updated: Update version of the released ignite-ml extension
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git The following commit(s) were added to refs/heads/master by this push: new 1854a17d Update version of the released ignite-ml extension 1854a17d is described below commit 1854a17d343405a49073369b3a007beda57b06a5 Author: Ivan Dashchinskiy AuthorDate: Mon Jan 22 19:11:55 2024 +0300 Update version of the released ignite-ml extension --- modules/ml-ext/examples/pom.xml | 4 ++-- modules/ml-ext/ml/RELEASE_NOTES.txt | 9 + modules/ml-ext/ml/catboost-model-parser/pom.xml | 2 +- modules/ml-ext/ml/extdata/p2p/pom.xml | 2 +- modules/ml-ext/ml/h2o-model-parser/pom.xml | 2 +- modules/ml-ext/ml/pom.xml | 2 +- modules/ml-ext/ml/spark-model-parser/pom.xml| 2 +- modules/ml-ext/ml/xgboost-model-parser/pom.xml | 2 +- modules/ml-ext/pom.xml | 2 +- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/ml-ext/examples/pom.xml b/modules/ml-ext/examples/pom.xml index 1fe5ddc6..9035d08d 100644 --- a/modules/ml-ext/examples/pom.xml +++ b/modules/ml-ext/examples/pom.xml @@ -28,12 +28,12 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../pom.xml ignite-ml-ext-examples -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT diff --git a/modules/ml-ext/ml/RELEASE_NOTES.txt b/modules/ml-ext/ml/RELEASE_NOTES.txt new file mode 100644 index ..31d1c317 --- /dev/null +++ b/modules/ml-ext/ml/RELEASE_NOTES.txt @@ -0,0 +1,9 @@ +Apache Ignite Extensions Release Notes +== + +Apache Ignite ML Module 1.0.0 + + +* Initial release of the Apache Ignite ML module. +* Dependencies updated. +* Fixed native BLAS integration, migrated to dev.ludovic.netlib. diff --git a/modules/ml-ext/ml/catboost-model-parser/pom.xml b/modules/ml-ext/ml/catboost-model-parser/pom.xml index 0ffdee69..dd90dbab 100644 --- a/modules/ml-ext/ml/catboost-model-parser/pom.xml +++ b/modules/ml-ext/ml/catboost-model-parser/pom.xml @@ -31,7 +31,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/ml-ext/ml/extdata/p2p/pom.xml b/modules/ml-ext/ml/extdata/p2p/pom.xml index 499dc15a..6f256e40 100644 --- a/modules/ml-ext/ml/extdata/p2p/pom.xml +++ b/modules/ml-ext/ml/extdata/p2p/pom.xml @@ -32,7 +32,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../../../pom.xml diff --git a/modules/ml-ext/ml/h2o-model-parser/pom.xml b/modules/ml-ext/ml/h2o-model-parser/pom.xml index 7d3142ec..f94bce3a 100644 --- a/modules/ml-ext/ml/h2o-model-parser/pom.xml +++ b/modules/ml-ext/ml/h2o-model-parser/pom.xml @@ -32,7 +32,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/ml-ext/ml/pom.xml b/modules/ml-ext/ml/pom.xml index 8b30bd78..8c087edd 100644 --- a/modules/ml-ext/ml/pom.xml +++ b/modules/ml-ext/ml/pom.xml @@ -29,7 +29,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../pom.xml diff --git a/modules/ml-ext/ml/spark-model-parser/pom.xml b/modules/ml-ext/ml/spark-model-parser/pom.xml index 4aac611e..ac5297ad 100644 --- a/modules/ml-ext/ml/spark-model-parser/pom.xml +++ b/modules/ml-ext/ml/spark-model-parser/pom.xml @@ -27,7 +27,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/ml-ext/ml/xgboost-model-parser/pom.xml b/modules/ml-ext/ml/xgboost-model-parser/pom.xml index 225d1b2c..e28b73e4 100644 --- a/modules/ml-ext/ml/xgboost-model-parser/pom.xml +++ b/modules/ml-ext/ml/xgboost-model-parser/pom.xml @@ -31,7 +31,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT ../../pom.xml diff --git a/modules/ml-ext/pom.xml b/modules/ml-ext/pom.xml index e965535d..89baf2a0 100644 --- a/modules/ml-ext/pom.xml +++ b/modules/ml-ext/pom.xml @@ -31,7 +31,7 @@ ignite-ml-parent-ext pom -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT 3.0.3
(ignite-extensions) annotated tag ignite-ml-ext-1.0.0 updated (88158d21 -> c4954c47)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to annotated tag ignite-ml-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git *** WARNING: tag ignite-ml-ext-1.0.0 was modified! *** from 88158d21 (commit) to c4954c47 (tag) tagging 88158d2137177cddafe7416fbc8e754b0341c877 (commit) by Ivan Dashchinskiy on Sun Jan 28 18:43:45 2024 +0300 - Log - ignite-ml-ext 1.0.0 --- No new revisions were added by this update. Summary of changes:
svn commit: r66748 - /dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/
Author: ivandasch Date: Mon Jan 22 17:01:58 2024 New Revision: 66748 Log: Removing redundant Release Removed: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/
svn commit: r66749 - in /dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1: ./ ignite-ml-ext-src.zip ignite-ml-ext-src.zip.asc ignite-ml-ext-src.zip.sha512
Author: ivandasch Date: Mon Jan 22 17:02:04 2024 New Revision: 66749 Log: A new RC ignite-ml-ext-1.0.0-rc1 added: Binaries and Sources Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip (with props) dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.sha512 Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip == Binary file - no diff available. Propchange: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc == --- dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc (added) +++ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc Mon Jan 22 17:02:04 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEQp2+GYvXhvv+3gqGCeVmL9Kw3WwFAmWunmUACgkQCeVmL9Kw +3WwOSA/9HYKKLojWXblbG8lzviAB+E6l2UpBCu/P6T4MkPpolUHyFfJSPnEhVooY +wH3UlsPN6/+skWJxvNOpgFlWrjnC+bnfX8gQ27IKiJyOWZd94CfBmmUTKGr5VxFd +Nuwj8mwvXeEbnxPKe9rwZ/cSFy5kFUhOiV+pQQACkeiSu2lUebyUaf7Ox4MKLXsi +VQh0Nj2lVgT6hRztqJnwlSvSbMCCs3w37yGuvOZB7/LbUldznp9GZg0M+tv3qaKU +VFIopMkM32EIH2/CcA4ezWlVLyrShS0C4BTA0HneaeIKTEc19cLgY5JfXaABJ77O +R11hPYqbXnzdydvS5EW6X2Sq94I4LUXeW7P6Mcbd6gidf0txL4VlSYi85dpD8vKX +m4FmQAwkEFZvyOPdGwjcAusrelYZ4GjWyjSAmc0AEXi6DoQv/cfs3ap94P7Mo3Qo +CDEVxEXsEyza2/Dx9/o3/5zWRbtcNmKUo6YM12ZR4VB+/2HRGZSnWcFAYX9ssEZw +OLG4EJt4E5CS010Z25cvPYyLEExY0YdrE6k/bUv/faNUbk8+hj6iWf0OflwbdR6n +SxNmElznvd9uxRqCPvrflctB+9LWNcc/2jWVA4Do3m73euxBiyZUCngnY38RFr9j +Yoh3a5QoK6s88nYJr4HlI7qHPJ6r6NvnLIwC8x4BwEhG7+fHtpM= +=vBQj +-END PGP SIGNATURE- Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.sha512 == --- dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.sha512 (added) +++ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.sha512 Mon Jan 22 17:02:04 2024 @@ -0,0 +1 @@ +3933ea37cc7fb8a190a4dfc081ec6159f42d99010af4409536f052200eb81c3723c17917136c776cc13a35b0394e0e8bb02cf576342a97584cb7ddd64163 ignite-ml-ext-src.zip \ No newline at end of file
svn commit: r66747 - in /dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1: ./ agaricus-gbm-mojo.zip agaricus-gbm-mojo.zip.asc gbm_prostate.zip gbm_prostate.zip.asc ignite-ml-ext-src.zip ignite-ml-
Author: ivandasch Date: Mon Jan 22 16:58:39 2024 New Revision: 66747 Log: A new RC ignite-ml-ext-1.0.0-rc1 added: Binaries and Sources Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip (with props) dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip.asc dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip (with props) dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip.asc dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip (with props) dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.sha512 Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip == Binary file - no diff available. Propchange: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip.asc == --- dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip.asc (added) +++ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/agaricus-gbm-mojo.zip.asc Mon Jan 22 16:58:39 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEQp2+GYvXhvv+3gqGCeVmL9Kw3WwFAmWunmcACgkQCeVmL9Kw +3WxcVw/8CGnHYt2uFwZjZZdbNo59QgCA/IGQAuBCRJ1xFgtw7CdOenepol5tbl7f +62OwnBHEQB9hAgHiNtfY2shrBhI5Tpd2r7va07PC2Y9YYngkg6j5MF93RfCrFryT +n0OggwO/3zsknZMCo2jqYt+eHwdlo4Yne8KtVnGQt+r9Xw4Z1aJ5JWM25s6NoTp7 +zfS47UF/FVBouLNlJoFo3aCieFetnFS2R/XyH6lYZYlWU78+ChJXudSIVWYFWDMp +tqmF3dHI+gRhfqGuUaEf6zGBwagCu/9OOME67oKfCRX/yYgU/dyCxnamWhswu0LW +YVMg5b4iyqiqiYW1Khz3bPbYgt/QBhHYqe/D83e/TXydWMCSd5Ivu3U8E0R9V8LL +PVZVNHg6g4N6NbwS+UmX8kDiDSzpBmoe1oCAegj8wjr3EnqJ90WwIdy2tL8aBTvJ +zxXswuKqsCWK58PnnvGyeBM/uCHOnREJcW5tubasaxoyNcD7Jsh42Qthpk9wvOYx +hbA7a9RFn2q8XsjJ3dRWzDLiLuQzEPeWvHcktYriXwGojMTV3IMkV4sL+Lm1buh4 +h9HCtRGyus3vBFTyXoLz3723RZQnXVc59+CbtdjL6YqHyXB6K6AWSR+/7f+kg6R8 +E1tMmqCegbTisu8OS3MRr9RrBw5EiMzT0aebWTCamNdP6Jf3VuU= +=hArC +-END PGP SIGNATURE- Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip == Binary file - no diff available. Propchange: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip.asc == --- dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip.asc (added) +++ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/gbm_prostate.zip.asc Mon Jan 22 16:58:39 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEQp2+GYvXhvv+3gqGCeVmL9Kw3WwFAmWunmgACgkQCeVmL9Kw +3WwnRg//VW8H/G0iRRV6+ZIMTs04V3cIVK2ZF9YrA9kVwBudsIhb+WLx/MeBVTMB +e71cI5GYIwUx+AmWInrp/vjgDvkNCGfnVzU9x4DnwJVm8YUCn6BNUrSicXiviEUP +I9iAMCRLSAw7tTTeBeSkO2O0GCbGWhJ6DogqRrfCJd+gfLMUh6Sqr2VxBjyrCUkn +oiS3GZFQco4o6NyPBjZonBfiBZlQMDFEZNJLyV17vhPmkLOUcRu5Jp6EPti4C7mG +VcSV+bHS7LVi6KMJrRku8EupstvymxduahHnjXwxcqMV3X2bBYLQM1AZ82JGv6M/ +ql5SVQAV9vSKMATTkOPEvrRVVxllhe3sGa1lKoUH/4abXxtzkXsq2Qw7PsDHx9Q+ +hKPTuyL/PLzKCCdDsW7/0Hknj8djKYNFQWS2HvFNeUHxU+mjx6fF0SlsXAQKyZeE +snTD4G+ujRIBlkfDhmAuoMyJixidcwJszzj5+uKHzdMm9MlO8e3I+rWZ+UWILmo6 +8jc6UoJpQ4jnNOs2egABJVGfNBFjdAnlzFZIeqj4Nks+XMJM9DZWhU5NuxSObEGq +XeE6vhvVyj/1fNUSAIbPYdBDn9vqOkObpId2yQH++ZdZH7xT4/jGGp9IEK+/bLSF +WVsBwGXjHCVD1W6Pr5ObYUDiLt2I7afRK+RymPV3fDnu2v3xpec= +=I6qg +-END PGP SIGNATURE- Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip == Binary file - no diff available. Propchange: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc == --- dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc (added) +++ dev/ignite/ignite-extensions/ignite-ml-ext-1.0.0-rc1/ignite-ml-ext-src.zip.asc Mon Jan 22 16:58:39 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEQp2+GYvXhvv+3gqGCeVmL9Kw3WwFAmWunmUACgkQCeVmL9Kw +3WwOSA
(ignite-extensions) branch release/ignite-ml-ext-1.0.0 updated: IGNITE-21329 Add release notes.
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch release/ignite-ml-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git The following commit(s) were added to refs/heads/release/ignite-ml-ext-1.0.0 by this push: new 88158d21 IGNITE-21329 Add release notes. 88158d21 is described below commit 88158d2137177cddafe7416fbc8e754b0341c877 Author: Ivan Dashchinskiy AuthorDate: Mon Jan 22 19:11:55 2024 +0300 IGNITE-21329 Add release notes. --- modules/ml-ext/ml/RELEASE_NOTES.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/modules/ml-ext/ml/RELEASE_NOTES.txt b/modules/ml-ext/ml/RELEASE_NOTES.txt new file mode 100644 index ..31d1c317 --- /dev/null +++ b/modules/ml-ext/ml/RELEASE_NOTES.txt @@ -0,0 +1,9 @@ +Apache Ignite Extensions Release Notes +== + +Apache Ignite ML Module 1.0.0 + + +* Initial release of the Apache Ignite ML module. +* Dependencies updated. +* Fixed native BLAS integration, migrated to dev.ludovic.netlib.
(ignite-extensions) tag ignite-ml-ext-1.0.0-rc1 deleted (was 141c42bd)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to tag ignite-ml-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git *** WARNING: tag ignite-ml-ext-1.0.0-rc1 was deleted! *** was 141c42bd IGNITE-21329 Release ignite-ml extension 1.0.0 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(ignite-extensions) 01/01: IGNITE-21329 Release ignite-ml extension 1.0.0
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch release/ignite-ml-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git commit 141c42bdbdbe7884f222c06a4ef2d87e703630bc Author: Ivan Dashchinskiy AuthorDate: Mon Jan 22 14:47:04 2024 +0300 IGNITE-21329 Release ignite-ml extension 1.0.0 --- modules/ml-ext/examples/pom.xml | 4 ++-- modules/ml-ext/ml/catboost-model-parser/pom.xml | 2 +- modules/ml-ext/ml/extdata/p2p/pom.xml | 2 +- modules/ml-ext/ml/h2o-model-parser/pom.xml | 2 +- modules/ml-ext/ml/pom.xml | 2 +- modules/ml-ext/ml/spark-model-parser/pom.xml| 2 +- modules/ml-ext/ml/xgboost-model-parser/pom.xml | 2 +- modules/ml-ext/pom.xml | 2 +- parent-internal/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/ml-ext/examples/pom.xml b/modules/ml-ext/examples/pom.xml index 1fe5ddc6..09a894c7 100644 --- a/modules/ml-ext/examples/pom.xml +++ b/modules/ml-ext/examples/pom.xml @@ -28,12 +28,12 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../pom.xml ignite-ml-ext-examples -1.0.0-SNAPSHOT +1.0.0 diff --git a/modules/ml-ext/ml/catboost-model-parser/pom.xml b/modules/ml-ext/ml/catboost-model-parser/pom.xml index 0ffdee69..a0911e9c 100644 --- a/modules/ml-ext/ml/catboost-model-parser/pom.xml +++ b/modules/ml-ext/ml/catboost-model-parser/pom.xml @@ -31,7 +31,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../../pom.xml diff --git a/modules/ml-ext/ml/extdata/p2p/pom.xml b/modules/ml-ext/ml/extdata/p2p/pom.xml index 499dc15a..80dbdecd 100644 --- a/modules/ml-ext/ml/extdata/p2p/pom.xml +++ b/modules/ml-ext/ml/extdata/p2p/pom.xml @@ -32,7 +32,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../../../pom.xml diff --git a/modules/ml-ext/ml/h2o-model-parser/pom.xml b/modules/ml-ext/ml/h2o-model-parser/pom.xml index 7d3142ec..c26f2188 100644 --- a/modules/ml-ext/ml/h2o-model-parser/pom.xml +++ b/modules/ml-ext/ml/h2o-model-parser/pom.xml @@ -32,7 +32,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../../pom.xml diff --git a/modules/ml-ext/ml/pom.xml b/modules/ml-ext/ml/pom.xml index 8b30bd78..f5aea9de 100644 --- a/modules/ml-ext/ml/pom.xml +++ b/modules/ml-ext/ml/pom.xml @@ -29,7 +29,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../pom.xml diff --git a/modules/ml-ext/ml/spark-model-parser/pom.xml b/modules/ml-ext/ml/spark-model-parser/pom.xml index 4aac611e..83f93d67 100644 --- a/modules/ml-ext/ml/spark-model-parser/pom.xml +++ b/modules/ml-ext/ml/spark-model-parser/pom.xml @@ -27,7 +27,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../../pom.xml diff --git a/modules/ml-ext/ml/xgboost-model-parser/pom.xml b/modules/ml-ext/ml/xgboost-model-parser/pom.xml index 225d1b2c..d1d65290 100644 --- a/modules/ml-ext/ml/xgboost-model-parser/pom.xml +++ b/modules/ml-ext/ml/xgboost-model-parser/pom.xml @@ -31,7 +31,7 @@ org.apache.ignite ignite-ml-parent-ext -1.0.0-SNAPSHOT +1.0.0 ../../pom.xml diff --git a/modules/ml-ext/pom.xml b/modules/ml-ext/pom.xml index e965535d..2f8c36ee 100644 --- a/modules/ml-ext/pom.xml +++ b/modules/ml-ext/pom.xml @@ -31,7 +31,7 @@ ignite-ml-parent-ext pom -1.0.0-SNAPSHOT +1.0.0 3.0.3 diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml index f00f5c7a..3321a12b 100644 --- a/parent-internal/pom.xml +++ b/parent-internal/pom.xml @@ -26,7 +26,7 @@ org.apache.ignite ignite-parent -2.17.0-SNAPSHOT +2.16.0
(ignite-extensions) branch release/ignite-ml-ext-1.0.0 created (now 141c42bd)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch release/ignite-ml-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git at 141c42bd IGNITE-21329 Release ignite-ml extension 1.0.0 This branch includes the following new commits: new 141c42bd IGNITE-21329 Release ignite-ml extension 1.0.0 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.
(ignite) branch master updated: IGNITE-20903 [ducktests] Support running on JDK 17 (#11059)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 04df1ff4a7c IGNITE-20903 [ducktests] Support running on JDK 17 (#11059)
04df1ff4a7c is described below
commit 04df1ff4a7cfe710415818e7f9d3e3af460b1c70
Author: Ivan Daschinskiy
AuthorDate: Thu Nov 23 12:18:15 2023 +0300
IGNITE-20903 [ducktests] Support running on JDK 17 (#11059)
---
modules/ducktests/tests/certs/functions.sh | 4 +-
modules/ducktests/tests/docker/Dockerfile | 12 +-
.../ducktests/tests/ignitetest/services/spark.py | 175 -
.../ignitetest/services/utils/ignite_aware.py | 4 +-
.../tests/ignitetest/services/utils/jmx_utils.py | 6 +-
.../tests/ignitetest/services/utils/jvm_utils.py | 41 +
.../ignitetest/tests/persistence_upgrade_test.py | 5 +
.../ducktests/tests/ignitetest/tests/smoke_test.py | 10 --
.../ducktests/tests/ignitetest/utils/version.py| 6 +-
9 files changed, 62 insertions(+), 201 deletions(-)
diff --git a/modules/ducktests/tests/certs/functions.sh
b/modules/ducktests/tests/certs/functions.sh
index 9a6235a85d1..0caef590632 100644
--- a/modules/ducktests/tests/certs/functions.sh
+++ b/modules/ducktests/tests/certs/functions.sh
@@ -29,7 +29,7 @@ function makeRoot() {
rm -f "${ALIAS}.pem"
keytool -genkeypair -keystore "${ALIAS}.jks" -alias "${ALIAS}" -dname
"${DNAME}" -ext bc:c -storepass "${PSWD}" \
- -keypass "${PSWD}" -storetype JKS -noprompt -v
+ -keypass "${PSWD}" -storetype JKS -keyalg RSA -noprompt -v
keytool -keystore "${ALIAS}.jks" -storepass "${PSWD}" -keypass "${PSWD}"
-alias "${ALIAS}" -exportcert \
-rfc -file "${ALIAS}.pem" -v
@@ -50,7 +50,7 @@ function makeCA() {
rm -f "${ALIAS}.pem"
keytool -genkeypair -keystore "${ALIAS}.jks" -alias "${ALIAS}" -dname
"${DNAME}" -ext bc:c -storepass "${PSWD}" \
- -keypass "${PSWD}" -storetype JKS -noprompt -v
+ -keypass "${PSWD}" -storetype JKS -keyalg RSA -noprompt -v
keytool -storepass "${PSWD}" -keypass "${PSWD}" -keystore "${ALIAS}.jks"
-certreq -alias "${ALIAS}" \
| keytool -storepass "${PSWD}" -keypass "${PSWD}" -keystore
"${ROOT}.jks" -gencert -alias "${ROOT}" \
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index 22007352f50..b09e8d00b70 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/tests/docker/Dockerfile
@@ -49,7 +49,7 @@ ARG APACHE_MIRROR="https://apache-mirror.rbc.ru/pub/apache/;
ARG APACHE_ARCHIVE="https://archive.apache.org/dist/;
# Install binary test dependencies.
-RUN for v in "2.7.6" "2.8.0" "2.8.1" "2.9.0" "2.9.1" "2.10.0" "2.11.0"
"2.11.1" "2.12.0" "2.13.0" "2.14.0"; \
+RUN for v in "2.7.6" "2.15.0"; \
do cd /opt; \
curl -O $APACHE_ARCHIVE/ignite/$v/apache-ignite-$v-bin.zip;\
unzip apache-ignite-$v-bin.zip && mv /opt/apache-ignite-$v-bin
/opt/ignite-$v;\
@@ -67,14 +67,6 @@ RUN cd /opt && curl -O
$APACHE_ARCHIVE/zookeeper/$ZOOKEEPER_NAME/$ZOOKEEPER_RELE
&& tar xvf $ZOOKEEPER_RELEASE_ARTIFACT && rm $ZOOKEEPER_RELEASE_ARTIFACT
RUN mv /opt/$ZOOKEEPER_RELEASE_NAME /opt/$ZOOKEEPER_NAME
-# Install spark
-ARG SPARK_VERSION="2.3.4"
-ARG SPARK_NAME="spark-$SPARK_VERSION"
-ARG SPARK_RELEASE_NAME="spark-$SPARK_VERSION-bin-hadoop2.7"
-
-RUN cd /opt && curl -O
$APACHE_ARCHIVE/spark/$SPARK_NAME/$SPARK_RELEASE_NAME.tgz && tar xvf
$SPARK_RELEASE_NAME.tgz && rm $SPARK_RELEASE_NAME.tgz
-RUN mv /opt/$SPARK_RELEASE_NAME /opt/$SPARK_NAME
-
# The version of Kibosh to use for testing.
# If you update this, also update vagrant/base.sh
ARG KIBOSH_VERSION="8841dd392e6fbf02986e2fb1f1ebf04df344b65a"
@@ -94,7 +86,7 @@ RUN cd /opt && curl -OL
https://github.com/jiaqi/jmxterm/releases/download/v$JMX
RUN useradd -ms /bin/bash ducker \
&& mkdir -p /home/ducker/ \
&& rsync -aiq /root/.ssh/ /home/ducker/.ssh \
-&& chown -R ducker /home/ducker/ /mnt/ /var/log/ \
+&& chown -R ducker /home/ducker/ /mnt/ /var/log/ /opt \
&& echo "LANG=C.UTF-8" >> /home/ducker/.ssh/environment \
&& echo "PATH=$(runuser -l ducker -c 'echo $PATH'):$JAVA_HOME/bin" >>
/home/ducker/.ssh/environment \
&& echo 'PATH=$PATH:
(ignite) branch ignite-2.16 updated: IGNITE-20759 Fix writing post-handshake message in NIO server (#11036)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-2.16 by this push:
new 363031c8fa5 IGNITE-20759 Fix writing post-handshake message in NIO
server (#11036)
363031c8fa5 is described below
commit 363031c8fa5ffdc805feac45086785dadc1f1cd9
Author: Ivan Daschinskiy
AuthorDate: Fri Nov 17 14:48:40 2023 +0300
IGNITE-20759 Fix writing post-handshake message in NIO server (#11036)
(cherry picked from commit d02626640e05772ca61faabe7f9c1718016bc264)
---
.../ignite/internal/util/nio/GridNioServer.java| 3 +-
.../internal/util/nio/ssl/BlockingSslHandler.java | 4 +-
.../tcp/internal/GridNioServerWrapper.java | 6 -
.../tcp/internal/TcpHandshakeExecutor.java | 367 -
.../tcp/GridTcpCommunicationSpiAbstractTest.java | 2 +-
.../tcp/TcpCommunicationHandshakeTimeoutTest.java | 3 +-
6 files changed, 224 insertions(+), 161 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 695eaed5228..fc23516c8af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1425,7 +1425,8 @@ public class GridNioServer {
try {
boolean writeFinished = writeSslSystem(ses, sockCh);
-if (!handshakeFinished) {
+// If post-handshake message is not written fully (possible on
JDK 17), we should retry.
+if (!handshakeFinished || !writeFinished) {
if (writeFinished)
stopPollingForWrite(key, ses);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
index 40ded3c314b..1da7c8ab62a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
@@ -85,8 +85,8 @@ public class BlockingSslHandler {
SocketChannel ch,
boolean directBuf,
ByteOrder order,
-IgniteLogger log)
-throws SSLException {
+IgniteLogger log
+) {
this.ch = ch;
this.log = log;
this.sslEngine = sslEngine;
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index 8302b1c9508..187b7fc3edb 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -1186,12 +1186,6 @@ public class GridNioServerWrapper {
try {
return tcpHandshakeExecutor.tcpHandshake(ch, rmtNodeId, sslMeta,
msg);
}
-catch (IOException e) {
-if (log.isDebugEnabled())
-log.debug("Failed to read from channel: " + e);
-
-throw new IgniteCheckedException("Failed to read from channel.",
e);
-}
finally {
if (!timeoutObject.cancel())
throw handshakeTimeoutException();
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
index cb5e256503e..387ceed0fdb 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.channels.SocketChannel;
import java.util.UUID;
+import javax.net.ssl.SSLException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.util.nio.ssl.BlockingSslHandler;
@@ -67,228 +68,296 @@ public class TcpHandshakeExecutor {
* @param ch Socket channel which using for handshake.
* @param rmtNodeId Expected remote node.
* @param sslMeta Required data for ssl.
- * @param msg Handshake message which should be send during handshake.
+ * @param msg Handshake message which should be sent during handshake.
* @return Handshake response from predefined variants from {@link
RecoveryLastReceivedMessa
(ignite) branch master updated: IGNITE-20759 Fix writing post-handshake message in NIO server (#11036)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 d02626640e0 IGNITE-20759 Fix writing post-handshake message in NIO
server (#11036)
d02626640e0 is described below
commit d02626640e05772ca61faabe7f9c1718016bc264
Author: Ivan Daschinskiy
AuthorDate: Fri Nov 17 14:48:40 2023 +0300
IGNITE-20759 Fix writing post-handshake message in NIO server (#11036)
---
.../ignite/internal/util/nio/GridNioServer.java| 3 +-
.../internal/util/nio/ssl/BlockingSslHandler.java | 4 +-
.../tcp/internal/GridNioServerWrapper.java | 6 -
.../tcp/internal/TcpHandshakeExecutor.java | 367 -
.../tcp/GridTcpCommunicationSpiAbstractTest.java | 2 +-
.../tcp/TcpCommunicationHandshakeTimeoutTest.java | 3 +-
6 files changed, 224 insertions(+), 161 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 695eaed5228..fc23516c8af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1425,7 +1425,8 @@ public class GridNioServer {
try {
boolean writeFinished = writeSslSystem(ses, sockCh);
-if (!handshakeFinished) {
+// If post-handshake message is not written fully (possible on
JDK 17), we should retry.
+if (!handshakeFinished || !writeFinished) {
if (writeFinished)
stopPollingForWrite(key, ses);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
index 40ded3c314b..1da7c8ab62a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java
@@ -85,8 +85,8 @@ public class BlockingSslHandler {
SocketChannel ch,
boolean directBuf,
ByteOrder order,
-IgniteLogger log)
-throws SSLException {
+IgniteLogger log
+) {
this.ch = ch;
this.log = log;
this.sslEngine = sslEngine;
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index 8302b1c9508..187b7fc3edb 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -1186,12 +1186,6 @@ public class GridNioServerWrapper {
try {
return tcpHandshakeExecutor.tcpHandshake(ch, rmtNodeId, sslMeta,
msg);
}
-catch (IOException e) {
-if (log.isDebugEnabled())
-log.debug("Failed to read from channel: " + e);
-
-throw new IgniteCheckedException("Failed to read from channel.",
e);
-}
finally {
if (!timeoutObject.cancel())
throw handshakeTimeoutException();
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
index cb5e256503e..387ceed0fdb 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.channels.SocketChannel;
import java.util.UUID;
+import javax.net.ssl.SSLException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.util.nio.ssl.BlockingSslHandler;
@@ -67,228 +68,296 @@ public class TcpHandshakeExecutor {
* @param ch Socket channel which using for handshake.
* @param rmtNodeId Expected remote node.
* @param sslMeta Required data for ssl.
- * @param msg Handshake message which should be send during handshake.
+ * @param msg Handshake message which should be sent during handshake.
* @return Handshake response from predefined variants from {@link
RecoveryLastReceivedMessage}.
- * @throws IgniteCheckedException If not related to IO exception happened.
- * @throws IO
(ignite) branch master updated: IGNITE-20719 [ducktests] Allow CDC tests work with opencensus HTTP metrics exporter (#11010)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 abdfc99cd2a IGNITE-20719 [ducktests] Allow CDC tests work with
opencensus HTTP metrics exporter (#11010)
abdfc99cd2a is described below
commit abdfc99cd2a9fc37879fb9cef82aea9e0437bac1
Author: Sergey Korotkov
AuthorDate: Fri Nov 3 17:20:41 2023 +0700
IGNITE-20719 [ducktests] Allow CDC tests work with opencensus HTTP metrics
exporter (#11010)
---
.../org/apache/ignite/internal/cdc/CdcMain.java| 5
.../ignitetest/services/utils/cdc/ignite_cdc.py| 27 ++
.../tests/ignitetest/services/utils/ignite_spec.py | 13 ---
.../ignitetest/services/utils/metrics/metrics.py | 7 --
.../services/utils/templates/ignite.xml.j2 | 2 ++
.../services/utils/templates/misc_macro.j2 | 6 -
.../templates/opencensus_metrics_beans_macro.j2| 2 +-
modules/ducktests/tests/ignitetest/utils/bean.py | 6 +++--
8 files changed, 54 insertions(+), 14 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
index 079b5ed72f6..84dc0a02dc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
@@ -367,6 +367,11 @@ public class CdcMain implements Runnable {
return cfg;
}
+
+/** {@inheritDoc} */
+@Override public String igniteInstanceName() {
+return config().getIgniteInstanceName();
+}
};
kctx.resource().setSpringContext(ctx);
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/cdc/ignite_cdc.py
b/modules/ducktests/tests/ignitetest/services/utils/cdc/ignite_cdc.py
index 034c464a566..481547dd2d0 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/cdc/ignite_cdc.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/cdc/ignite_cdc.py
@@ -17,7 +17,9 @@
"""
This module contains Ignite CDC utility (ignite-cdc.sh) wrapper.
"""
+import re
import signal
+from copy import deepcopy
from ignitetest.services.utils.ignite_spec import envs_to_exports
from ignitetest.services.utils.jvm_utils import JvmProcessMixin
@@ -28,7 +30,7 @@ class IgniteCdcUtility(JvmProcessMixin):
Ignite CDC utility (ignite-cdc.sh) wrapper.
"""
BASE_COMMAND = "ignite-cdc.sh"
-JAVA_CLASS = "org.apache.ignite.startup.cmdline.CdcCommandLineStartup"
+APP_SERVICE_CLASS =
"org.apache.ignite.startup.cmdline.CdcCommandLineStartup"
def __init__(self, cluster):
self.cluster = cluster
@@ -44,9 +46,10 @@ class IgniteCdcUtility(JvmProcessMixin):
raw_output = node.account.ssh_capture(
self.__form_cmd(f"{self.BASE_COMMAND} -v
{self.cluster.config_file}"))
-code, _ = self.__parse_output(raw_output)
+code, output = self.__parse_output(raw_output)
-self.logger.debug(f"{self.__service_node_id(node)}:
{self.BASE_COMMAND} finished with exit code: {code}")
+self.logger.debug(f"{self.__service_node_id(node)}:
{self.BASE_COMMAND} finished with exit code: {code}"
+ f"; output: {output}" if code != 0 else "")
self.logger.info(f"{self.cluster.service_id}: starting
{self.BASE_COMMAND} ...")
@@ -59,7 +62,7 @@ class IgniteCdcUtility(JvmProcessMixin):
def __stop(node):
self.logger.info(f"{self.__service_node_id(node)}: stopping
{self.BASE_COMMAND}")
-pids = self.pids(node, self.JAVA_CLASS)
+pids = self.pids(node, self.APP_SERVICE_CLASS)
for pid in pids:
node.account.signal(pid, signal.SIGKILL if force_stop else
signal.SIGTERM, allow_fail=False)
@@ -68,13 +71,27 @@ class IgniteCdcUtility(JvmProcessMixin):
self.cluster.exec_on_nodes_async(self.cluster.nodes, __stop)
+@property
+def nodes(self):
+return self.cluster.nodes
+
def __service_node_id(self, node):
return f"{self.cluster.service_id} node {self.cluster.idx(node)} on
{node.account.hostname}"
def __form_cmd(self, cmd):
envs = self.cluster.spec.envs()
-envs["CDC_JVM_OPTS"] = f"\"{' '.join(self.cluster.spec.jvm_opts)}\""
+jvm_opts = deepcopy(self.cluster.spec.jvm_opts)
+
+def replace_ports(opt):
+for port in ["opencensus.metrics.port",
"com.sun.management.jmxremote.port"]:
+opt = re.sub(f"-D{port}=(
(ignite) branch master updated: IGNITE-20711 Update Ignite dependency: Apache Commons Codec to 1.16.0 (#11009)
This is an automated email from the ASF dual-hosted git repository. ivandasch 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 a7bc3d26766 IGNITE-20711 Update Ignite dependency: Apache Commons Codec to 1.16.0 (#11009) a7bc3d26766 is described below commit a7bc3d2676638b7fefd8603667cd366a1234e654 Author: Aleksandr Nikolaev <56360298+nao...@users.noreply.github.com> AuthorDate: Mon Oct 30 13:58:32 2023 +0300 IGNITE-20711 Update Ignite dependency: Apache Commons Codec to 1.16.0 (#11009) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a53fb05a30b..8887e7b6810 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,7 +75,7 @@ 1.69 1.9.2_1 1.9.4 -1.15 +1.16.0 3.2.2 2.6 2.11.0
[ignite] branch master updated: IGNITE-20698 Fix compatibility tests on JDK 11 and 17 (#11006)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 040ca42779a IGNITE-20698 Fix compatibility tests on JDK 11 and 17
(#11006)
040ca42779a is described below
commit 040ca42779a7ecd5c9810d3b67d6a984d0055eeb
Author: Ivan Daschinskiy
AuthorDate: Thu Oct 26 17:34:22 2023 +0300
IGNITE-20698 Fix compatibility tests on JDK 11 and 17 (#11006)
---
bin/include/jvmdefaults.bat| 2 +
bin/include/jvmdefaults.sh | 2 +
.../ignite/jdbc/thin/JdbcThinErrorsSelfTest.java | 2 +-
.../apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java | 4 +-
.../compatibility/IgniteReleasedVersion.java | 18 +
.../clients/JavaThinCompatibilityTest.java | 12
.../clients/JdbcThinCompatibilityTest.java | 14
.../CompoundIndexCompatibilityTest.java| 2 +
.../persistence/FoldersReuseCompatibilityTest.java | 2 +
.../IgnitePKIndexesMigrationToUnwrapPkTest.java| 2 +
.../persistence/IndexTypesCompatibilityTest.java | 11 +++
.../InlineJavaObjectCompatibilityTest.java | 11 +++
.../persistence/MetaStorageCompatibilityTest.java | 2 +
...gratingToWalV2SerializerWithCompactionTest.java | 2 +
.../MoveBinaryMetadataCompatibility.java | 2 +
.../PersistenceBasicCompatibilityTest.java | 16 +
.../junits/IgniteCompatibilityAbstractTest.java| 9 ++-
.../testframework/junits/SkipTestIfIsJdkNewer.java | 33 +
.../junits/SkipTestIfJdkNewerRule.java | 43
.../util/CompatibilityTestsUtils.java | 18 ++---
.../ignite/internal/util/FeatureChecker.java | 3 +
.../internal/client/thin/ReliableChannelTest.java | 7 +-
...GridManagerMxBeanIllegalArgumentHandleTest.java | 82 ++
.../apache/ignite/testframework/GridTestUtils.java | 9 +++
modules/platforms/cpp/core/src/ignition.cpp| 2 +
.../Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs | 2 +
modules/tools/pom.xml | 6 ++
parent/pom.xml | 23 +-
28 files changed, 268 insertions(+), 73 deletions(-)
diff --git a/bin/include/jvmdefaults.bat b/bin/include/jvmdefaults.bat
index 13ebc69dfc7..896814ffa81 100644
--- a/bin/include/jvmdefaults.bat
+++ b/bin/include/jvmdefaults.bat
@@ -73,12 +73,14 @@ if %java_version% GEQ 15 (
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED ^
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED ^
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED ^
+--add-opens=java.base/sun.util.calendar=ALL-UNNAME ^
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED ^
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED ^
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ^
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED ^
--add-opens=java.base/java.io=ALL-UNNAMED ^
--add-opens=java.base/java.nio=ALL-UNNAMED ^
+--add-opens=java.base/java.net=ALL-UNNAMED ^
--add-opens=java.base/java.util=ALL-UNNAMED ^
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED ^
--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED ^
diff --git a/bin/include/jvmdefaults.sh b/bin/include/jvmdefaults.sh
index 962b10e4695..810b208e662 100644
--- a/bin/include/jvmdefaults.sh
+++ b/bin/include/jvmdefaults.sh
@@ -69,12 +69,14 @@ getJavaSpecificOpts() {
--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
+ --add-opens=java.base/sun.util.calendar=ALL-UNNAME \
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.nio=ALL-UNNAMED \
+ --add-opens=java.base/java.net=ALL-UNNAMED \
--add-opens=java.base/java.util=ALL-UNNAMED \
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED \
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
index c1677ddc4e9..89d2baa674e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinErrorsSelfTest.java
@@ -50,7
[ignite] branch master updated: IGNITE-20730 Fix IgniteLock cannot be acquired after release on JDK 17 (#11012)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 2c930ab4eb8 IGNITE-20730 Fix IgniteLock cannot be acquired after
release on JDK 17 (#11012)
2c930ab4eb8 is described below
commit 2c930ab4eb8336b9e2fa399521e8e5d4cc3f07c9
Author: Ivan Daschinskiy
AuthorDate: Wed Oct 25 22:23:46 2023 +0300
IGNITE-20730 Fix IgniteLock cannot be acquired after release on JDK 17
(#11012)
---
.../datastructures/GridCacheLockImpl.java | 3 ++
.../datastructures/IgniteLockAbstractSelfTest.java | 52 ++
2 files changed, 55 insertions(+)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
index 3881820381b..22999476c38 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java
@@ -607,6 +607,9 @@ public final class GridCacheLockImpl extends
AtomicDataStructureProxy nodes = val.getNodes();
if (!cancelled) {
+if
(sync.waitingThreads.contains(thread.getId()) && nodes.contains(thisNode))
+return true;
+
nodes.add(thisNode);
val.setChanged(false);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
index 1d31bacedb3..2d9a069f9e6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
@@ -28,11 +28,14 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -113,6 +116,55 @@ public abstract class IgniteLockAbstractSelfTest extends
IgniteAtomicsAbstractTe
checkFailover(false, true);
}
+/**
+ * Tests that {@link IgniteLock} can be acquired after release, especially
while running on JDK 17.
+ *
+ * @throws Exception If failed.
+ */
+@Test
+public void testFairLockIsAbleToBeAcquiredAfterRelease() throws Exception {
+List locks = IntStream.range(0, NODES_CNT)
+.mapToObj(i -> grid(i).reentrantLock("test", true, true, true))
+.collect(Collectors.toList());
+
+CountDownLatch lockEnterLatch = new CountDownLatch(NODES_CNT - 1);
+locks.get(0).lock();
+try {
+acquireLockInSeparateThreads(locks.subList(1, NODES_CNT),
lockEnterLatch);
+}
+finally {
+locks.get(0).unlock();
+}
+
+assertTrue(lockEnterLatch.await(GridTestUtils.DFLT_TEST_TIMEOUT,
TimeUnit.SECONDS));
+
+// Try to acquire the first lock in separate thread.
+lockEnterLatch = new CountDownLatch(1);
+acquireLockInSeparateThreads(locks.subList(0, 1), lockEnterLatch);
+assertTrue(lockEnterLatch.await(GridTestUtils.DFLT_TEST_TIMEOUT,
TimeUnit.SECONDS));
+}
+
+/** */
+private void acquireLockInSeparateThreads(List locks,
CountDownLatch lockEnterLatch) throws Exception {
+CountDownLatch startLatch = new CountDownLatch(locks.size());
+
+for (IgniteLock lock: locks) {
+GridTestUtils.runAsync(() -> {
+startLatch.countDown();
+
+lock.lock();
+try {
+lockEnterLatch.countDown();
+}
+finally {
+lock.unlock();
+}
+});
+}
+
+assertTrue(startLatch.await(GridTestUtils.DFLT_TEST_TIMEOUT,
TimeUnit.SECONDS));
+}
+
/**
* Implementation of ignite data structures internally uses special system
caches, need make sure
* that transaction on these system caches do not inte
[ignite] branch master updated: IGNITE-20679 Fix JdbcThinCacheToJdbcDataTypesCoverageTest#testSQLTimestampDataType for jdk11 and later. (#11000)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 4a956481215 IGNITE-20679 Fix
JdbcThinCacheToJdbcDataTypesCoverageTest#testSQLTimestampDataType for jdk11 and
later. (#11000)
4a956481215 is described below
commit 4a956481215eaedd5fa457a35853f3ef9a40578b
Author: Ivan Daschinskiy
AuthorDate: Thu Oct 19 12:02:26 2023 +0300
IGNITE-20679 Fix
JdbcThinCacheToJdbcDataTypesCoverageTest#testSQLTimestampDataType for jdk11 and
later. (#11000)
---
.../jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
index 02cbc0906bc..dc03826a939 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
@@ -32,6 +32,7 @@ import java.sql.Types;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -61,6 +62,7 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
/**
@@ -356,9 +358,9 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest
extends GridCacheDataTypes
@Test
public void testSQLTimestampDataType() throws Exception {
checkBasicCacheOperations(
-new Dated(Timestamp.valueOf(LocalDateTime.now()), "-MM-dd
HH:mm:ss.SSS"),
-new Dated(Timestamp.valueOf(LocalDateTime.now()), "-MM-dd
HH:mm:ss."),
-new Dated(Timestamp.valueOf(LocalDateTime.now()), "-MM-dd
HH:mm:ss.SS"));
+new
Dated(Timestamp.valueOf(LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS)),
"-MM-dd HH:mm:ss.SSS"),
+new
Dated(Timestamp.valueOf(LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS)),
"-MM-dd HH:mm:ss."),
+new
Dated(Timestamp.valueOf(LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS)),
"-MM-dd HH:mm:ss.SS"));
}
/**
[ignite] branch master updated: IGNITE-20689 [ducktests] Fix a flaky perf_stat_test (#11004)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 3d95f6f7ccd IGNITE-20689 [ducktests] Fix a flaky perf_stat_test (#11004)
3d95f6f7ccd is described below
commit 3d95f6f7ccd8c9e4f6567022dbd672d6b09a6478
Author: Sergey Korotkov
AuthorDate: Thu Oct 19 14:42:33 2023 +0700
IGNITE-20689 [ducktests] Fix a flaky perf_stat_test (#11004)
---
.../ducktests/tests/ignitetest/tests/control_utility/perf_stat_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/ducktests/tests/ignitetest/tests/control_utility/perf_stat_test.py
b/modules/ducktests/tests/ignitetest/tests/control_utility/perf_stat_test.py
index 94eb56de10c..3d579fdd664 100644
--- a/modules/ducktests/tests/ignitetest/tests/control_utility/perf_stat_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/control_utility/perf_stat_test.py
@@ -48,7 +48,7 @@ class PerfStatTest(IgniteTest):
params={
"cacheName": "test-cache",
"range": 200_000,
-"warmUpRange": 100_000,
+"warmUpRange": 10_000,
"transactional": False
}
)
[ignite] branch master updated: IGNITE-12455 SQL Calcite: Partition pruning (#10928)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 842885ede0b IGNITE-12455 SQL Calcite: Partition pruning (#10928)
842885ede0b is described below
commit 842885ede0b3e803e83815b759edd97bb803b58f
Author: Ivan Daschinskiy
AuthorDate: Tue Oct 17 20:48:00 2023 +0300
IGNITE-12455 SQL Calcite: Partition pruning (#10928)
---
.../query/calcite/exec/ExecutionServiceImpl.java | 8 +-
.../query/calcite/exec/PartitionExtractor.java | 249 +
.../calcite/exec/partition/PartitionAllNode.java | 46 ++
.../partition/PartitionLiteralNode.java} | 49 +-
.../partition/PartitionNode.java} | 37 +-
.../partition/PartitionNoneNode.java} | 38 +-
.../exec/partition/PartitionOperandNode.java | 104
.../exec/partition/PartitionParameterNode.java | 52 ++
.../exec/partition/PartitionPruningContext.java| 58 ++
.../partition/PartitionSingleNode.java}| 54 +-
.../query/calcite/metadata/ColocationGroup.java| 29 +-
.../query/calcite/metadata/FragmentMapping.java| 14 +-
.../calcite/metadata/IgniteMdFragmentMapping.java | 2 +-
.../calcite/prepare/AbstractMultiStepPlan.java | 55 +-
.../query/calcite/prepare/ExecutionPlan.java | 12 +-
.../query/calcite/prepare/MappingQueryContext.java | 64 ++-
.../query/calcite/prepare/MultiStepPlan.java | 3 +-
.../query/calcite/prepare/QueryTemplate.java | 8 +-
.../processors/query/calcite/util/Commons.java | 12 +-
.../integration/LocalQueryIntegrationTest.java | 2 +-
.../calcite/integration/PartitionPruneTest.java| 585 +
.../query/calcite/planner/AbstractPlannerTest.java | 15 +-
.../query/calcite/planner/PlannerTest.java | 2 +-
.../ignite/testsuites/IntegrationTestSuite.java| 4 +
24 files changed, 1343 insertions(+), 159 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 38667c7c25a..835c13ede19 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
@@ -560,9 +560,11 @@ public class ExecutionServiceImpl extends
AbstractService implements Execut
) {
qry.mapping();
-MappingQueryContext mapCtx = Commons.mapContext(locNodeId,
topologyVersion(), qry.context());
+Map qryParams =
Commons.parametersMap(qry.parameters());
-ExecutionPlan execPlan = plan.init(mappingSvc, mapCtx);
+MappingQueryContext mapCtx = Commons.mapContext(locNodeId,
topologyVersion(), qry.context(), qryParams);
+
+ExecutionPlan execPlan = plan.init(mappingSvc, partSvc, mapCtx);
List fragments = execPlan.fragments();
@@ -607,7 +609,7 @@ public class ExecutionServiceImpl extends
AbstractService implements Execut
qry.createMemoryTracker(memoryTracker, cfg.getQueryMemoryQuota()),
createIoTracker(locNodeId, qry.localQueryId()),
timeout,
-Commons.parametersMap(qry.parameters()));
+qryParams);
Node node = new LogicalRelImplementor<>(ectx, partitionService(),
mailboxRegistry(),
exchangeService(), failureProcessor()).go(fragment.root());
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/PartitionExtractor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/PartitionExtractor.java
new file mode 100644
index 000..a769e28cbb0
--- /dev/null
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/PartitionExtractor.java
@@ -0,0 +1,249 @@
+/*
+ * 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 th
[ignite] branch master updated: IGNITE-20532 Fix JavaNioAccess handling in JDK 14 and later. (#10969)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 d2af35b9320 IGNITE-20532 Fix JavaNioAccess handling in JDK 14 and
later. (#10969)
d2af35b9320 is described below
commit d2af35b9320b0acc227b61c4614b22debc554635
Author: Ivan Daschinskiy
AuthorDate: Tue Oct 3 18:14:40 2023 +0300
IGNITE-20532 Fix JavaNioAccess handling in JDK 14 and later. (#10969)
---
bin/include/jvmdefaults.bat| 16 +++-
bin/include/jvmdefaults.sh | 15 ++-
deliveries/docker/apache-ignite/run.sh | 1 +
.../ignite/internal/util/FeatureChecker.java | 2 +
.../apache/ignite/internal/util/GridUnsafe.java| 47 +-
modules/platforms/cpp/core/src/ignition.cpp| 1 +
.../Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs | 1 +
parent/pom.xml | 3 +-
8 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/bin/include/jvmdefaults.bat b/bin/include/jvmdefaults.bat
index e9002a41412..13ebc69dfc7 100644
--- a/bin/include/jvmdefaults.bat
+++ b/bin/include/jvmdefaults.bat
@@ -43,7 +43,7 @@ if %java_version% GEQ 9 if %java_version% LSS 11 (
%current_value%
)
-if %java_version% GEQ 11 if %java_version% LSS 15 (
+if %java_version% GEQ 11 if %java_version% LSS 14 (
set value= ^
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^
@@ -55,8 +55,22 @@ if %java_version% GEQ 11 if %java_version% LSS 15 (
%current_value%
)
+if %java_version% GEQ 14 if %java_version% LSS 15 (
+set value= ^
+--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^
+--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED ^
+--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED ^
+--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
^
+--add-opens=java.base/jdk.internal.access=ALL-UNNAMED ^
+--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED ^
+--illegal-access=permit ^
+%current_value%
+)
+
if %java_version% GEQ 15 (
set value= ^
+--add-opens=java.base/jdk.internal.access=ALL-UNNAMED ^
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED ^
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED ^
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED ^
diff --git a/bin/include/jvmdefaults.sh b/bin/include/jvmdefaults.sh
index f0d2519c5c0..962b10e4695 100644
--- a/bin/include/jvmdefaults.sh
+++ b/bin/include/jvmdefaults.sh
@@ -41,7 +41,7 @@ getJavaSpecificOpts() {
--add-modules=java.xml.bind \
${current_value}"
- elif [ "${version}" -ge 11 ] && [ "${version}" -lt 15 ]; then
+ elif [ "${version}" -ge 11 ] && [ "${version}" -lt 14 ]; then
value="\
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
@@ -52,8 +52,21 @@ getJavaSpecificOpts() {
--illegal-access=permit \
${current_value}"
+ elif [ "${version}" -ge 14 ] && [ "${version}" -lt 15 ]; then
+value="\
+--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
+--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
\
+
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
+--add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
+--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
\
+--illegal-access=permit \
+${current_value}"
+
elif [ "${version}" -ge 15 ] ; then
value="\
+ --add-opens=java.base/jdk.internal.access=ALL-UNNAMED \
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
diff --git a/deliveries/docker/apache-ignite/run.sh
b/deliveries/docker/apache-ignite/run.sh
index 7e88a36b21f..bacb588325c 100755
--- a/deliveries/docker/apache-ignite/run.sh
+++ b/deliveries/docker/apache-ignite/run.sh
@@ -98,6 +98,7 @@ elif [ "${version}" -ge 11 ] ; then
--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
+--add-opens=java.b
[ignite] branch master updated: IGNITE-20515 Fix MappedFile.map for JDK 14 and newer. (#10961)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 eeb5535fe33 IGNITE-20515 Fix MappedFile.map for JDK 14 and newer.
(#10961)
eeb5535fe33 is described below
commit eeb5535fe3323f85b4790b835010287a37f58551
Author: Ivan Daschinskiy
AuthorDate: Mon Oct 2 14:31:04 2023 +0300
IGNITE-20515 Fix MappedFile.map for JDK 14 and newer. (#10961)
---
.../ignite/internal/mem/file/MappedFile.java | 186 ++---
1 file changed, 163 insertions(+), 23 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
index 4b7552491c6..f264d87a315 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
@@ -19,26 +19,28 @@ package org.apache.ignite.internal.mem.file;
import java.io.Closeable;
import java.io.File;
+import java.io.FileDescriptor;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.mem.DirectMemoryRegion;
import org.apache.ignite.internal.mem.UnsafeChunk;
import org.apache.ignite.internal.util.typedef.internal.U;
import sun.nio.ch.FileChannelImpl;
+import static org.apache.ignite.internal.util.IgniteUtils.jdkVersion;
+import static org.apache.ignite.internal.util.IgniteUtils.majorJavaVersion;
+
/** */
public class MappedFile implements Closeable, DirectMemoryRegion {
-/** */
-private static final Method map0 =
U.findNonPublicMethod(FileChannelImpl.class, "map0", int.class, long.class,
long.class);
-
-/** */
-private static final Method unmap0 =
U.findNonPublicMethod(FileChannelImpl.class, "unmap0", long.class, long.class);
-
/** */
public static final int MAP_RW = 1;
+/** File memory mapper */
+private static final Mapper mapper = pickMapper();
+
/** */
private final RandomAccessFile file;
@@ -85,7 +87,7 @@ public class MappedFile implements Closeable,
DirectMemoryRegion {
/** {@inheritDoc} */
@Override public void close() throws IOException {
try {
-unmap(addr, size);
+mapper.unmap(addr, size);
}
finally {
file.close();
@@ -122,16 +124,7 @@ public class MappedFile implements Closeable,
DirectMemoryRegion {
* @throws IOException
*/
public static long map(RandomAccessFile f, int mode, long start, long
size) throws IOException {
-try {
-return (Long)map0.invoke(f.getChannel(), mode, start, size);
-}
-catch (IllegalAccessException e) {
-throw new IllegalStateException(e);
-}
-catch (InvocationTargetException e) {
-Throwable target = e.getTargetException();
-throw (target instanceof IOException) ? (IOException)target : new
IOException(target);
-}
+return mapper.map(f, mode, start, size);
}
/**
@@ -141,14 +134,161 @@ public class MappedFile implements Closeable,
DirectMemoryRegion {
* @param size Size of the mapped file.
*/
public static void unmap(long addr, long size) {
-try {
-unmap0.invoke(null, addr, size);
+mapper.unmap(addr, size);
+}
+
+/** */
+private static Mapper pickMapper() {
+int javaVersion = majorJavaVersion(jdkVersion());
+
+if (javaVersion >= 19)
+return new JDK19Mapper();
+
+if (javaVersion >= 14)
+return new JDK14Mapper();
+
+return new LegacyMapper();
+}
+
+/** */
+private interface Mapper {
+/** */
+long map(RandomAccessFile f, int mode, long start, long size) throws
IOException;
+
+/** */
+void unmap(long addr, long size);
+}
+
+/** */
+private static class LegacyMapper implements Mapper {
+/** */
+private static final Method map0 =
U.findNonPublicMethod(FileChannelImpl.class, "map0", int.class, long.class,
long.class);
+
+/** */
+private static final Method unmap0 =
U.findNonPublicMethod(FileChannelImpl.class, "unmap0", long.class, long.class);
+
+
+/** {@inheritDoc} */
+@Override public long map(RandomAccessFile f, int mode, long start,
long size) throws IOException {
+try {
+return (Long)map0.invoke(f.getChannel(), mode, start, size);
+}
+catch (IllegalAccessException e) {
+throw new IllegalStateException(e);
+}
+
[ignite] branch temp-fix-sonar-pr-run updated (8162c7c9327 -> 6242f49fef9)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch temp-fix-sonar-pr-run in repository https://gitbox.apache.org/repos/asf/ignite.git from 8162c7c9327 IGNITE-20466 Wip. add 6242f49fef9 IGNITE-20466 Wip. No new revisions were added by this update. Summary of changes: .github/workflows/sonar-pr-from-fork-manual.yml | 4 1 file changed, 4 deletions(-)
[ignite] branch temp-fix-sonar-pr-run updated (069d34fb97c -> 8162c7c9327)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch temp-fix-sonar-pr-run in repository https://gitbox.apache.org/repos/asf/ignite.git from 069d34fb97c IGNITE-20466 Wip. add 8162c7c9327 IGNITE-20466 Wip. No new revisions were added by this update. Summary of changes: .github/workflows/sonar-pr-from-fork-manual.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[ignite] branch temp-fix-sonar-pr-run updated (63ac1737287 -> 069d34fb97c)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a change to branch temp-fix-sonar-pr-run
in repository https://gitbox.apache.org/repos/asf/ignite.git
from 63ac1737287 IGNITE-20466 Wip.
add 069d34fb97c IGNITE-20466 Wip.
No new revisions were added by this update.
Summary of changes:
.../workflows/{sonar-pr-from-fork.yml => sonar-pr-from-fork-manual.yml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename .github/workflows/{sonar-pr-from-fork.yml =>
sonar-pr-from-fork-manual.yml} (98%)
[ignite] branch temp-fix-sonar-pr-run updated (0e02e90d03a -> 63ac1737287)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch temp-fix-sonar-pr-run in repository https://gitbox.apache.org/repos/asf/ignite.git from 0e02e90d03a IGNITE-20466 Wip. add 63ac1737287 IGNITE-20466 Wip. No new revisions were added by this update. Summary of changes: .github/workflows/sonar-pr-from-fork-ga.yml | 96 - .github/workflows/sonar-pr-from-fork.yml| 3 + 2 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 .github/workflows/sonar-pr-from-fork-ga.yml
[ignite] branch temp-fix-sonar-pr-run updated (9ad646a5c40 -> 0e02e90d03a)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a change to branch temp-fix-sonar-pr-run
in repository https://gitbox.apache.org/repos/asf/ignite.git
from 9ad646a5c40 IGNITE-20466 Add temporary solution to sonar problem,
allow to run check manually.
add 0e02e90d03a IGNITE-20466 Wip.
No new revisions were added by this update.
Summary of changes:
.github/workflows/{sonar-pr-from-fork.yml => sonar-pr-from-fork-ga.yml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
copy .github/workflows/{sonar-pr-from-fork.yml => sonar-pr-from-fork-ga.yml}
(98%)
[ignite] branch temp-fix-sonar-pr-run created (now 9ad646a5c40)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch temp-fix-sonar-pr-run in repository https://gitbox.apache.org/repos/asf/ignite.git at 9ad646a5c40 IGNITE-20466 Add temporary solution to sonar problem, allow to run check manually. This branch includes the following new commits: new 9ad646a5c40 IGNITE-20466 Add temporary solution to sonar problem, allow to run check manually. 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.
[ignite] 01/01: IGNITE-20466 Add temporary solution to sonar problem, allow to run check manually.
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch temp-fix-sonar-pr-run
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 9ad646a5c40bff41d7a709d8e4807d60e88cd1bc
Author: Ivan Dashchinskiy
AuthorDate: Fri Sep 29 16:03:09 2023 +0300
IGNITE-20466 Add temporary solution to sonar problem, allow to run check
manually.
---
.github/workflows/sonar-pr-from-fork.yml | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/sonar-pr-from-fork.yml
b/.github/workflows/sonar-pr-from-fork.yml
index f4309f68ce6..a80d418f98b 100644
--- a/.github/workflows/sonar-pr-from-fork.yml
+++ b/.github/workflows/sonar-pr-from-fork.yml
@@ -18,7 +18,12 @@
name: Sonar Quality Pull Request Analysis
# TODO IGNITE-20466 Investigate and fix the issue with running this workflow
on PRs from forks.
-on: pull_request
+on:
+ workflow_dispatch:
+inputs:
+ pull-request-id:
+description: 'Pull Request ID'
+required: true
permissions:
contents: read
@@ -35,7 +40,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "refs/pull/${{ github.event.number }}/merge"
+ ref: "refs/pull/${{ github.event.pull-request-id }}/merge"
fetch-depth: 0
- name: Set up JDK11
[ignite] branch master updated: IGNITE-20428 SQL Calcite: fix query freezes when partitions are set. (#10935)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 0080ae950ff IGNITE-20428 SQL Calcite: fix query freezes when
partitions are set. (#10935)
0080ae950ff is described below
commit 0080ae950ff735ddfdec2477589ab9b659427ded
Author: Ivan Daschinskiy
AuthorDate: Mon Sep 18 14:38:31 2023 +0300
IGNITE-20428 SQL Calcite: fix query freezes when partitions are set.
(#10935)
---
.../processors/query/calcite/RootQuery.java| 7 ++-
.../query/calcite/exec/ExecutionServiceImpl.java | 38
.../calcite/prepare/AbstractMultiStepPlan.java | 72 ++
.../query/calcite/prepare/ExecutionPlan.java | 49 ++-
.../query/calcite/prepare/MappingQueryContext.java | 13 +++-
.../query/calcite/prepare/MultiStepPlan.java | 24 +---
.../processors/query/calcite/util/Commons.java | 6 +-
.../QueryWithPartitionsIntegrationTest.java| 17 ++---
.../query/calcite/planner/PlannerTest.java | 11 ++--
9 files changed, 113 insertions(+), 124 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
index cd6290e9495..8a1f1c20555 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
@@ -46,8 +46,9 @@ import
org.apache.ignite.internal.processors.query.calcite.exec.ExecutionContext
import org.apache.ignite.internal.processors.query.calcite.exec.rel.Node;
import org.apache.ignite.internal.processors.query.calcite.exec.rel.RootNode;
import
org.apache.ignite.internal.processors.query.calcite.prepare.BaseQueryContext;
+import
org.apache.ignite.internal.processors.query.calcite.prepare.ExecutionPlan;
+import
org.apache.ignite.internal.processors.query.calcite.prepare.FieldsMetadata;
import org.apache.ignite.internal.processors.query.calcite.prepare.Fragment;
-import
org.apache.ignite.internal.processors.query.calcite.prepare.MultiStepPlan;
import
org.apache.ignite.internal.processors.query.calcite.prepare.PlanningContext;
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
import org.apache.ignite.internal.processors.query.running.TrackableQuery;
@@ -193,14 +194,14 @@ public class RootQuery extends Query
implements TrackableQuery {
/**
* Starts execution phase for the query and setup remote fragments.
*/
-public void run(ExecutionContext ctx, MultiStepPlan plan, Node
root) {
+public void run(ExecutionContext ctx, ExecutionPlan plan,
FieldsMetadata metadata, Node root) {
synchronized (mux) {
if (state == QueryState.CLOSED)
throw queryCanceledException();
planningTime = U.currentTimeMillis() - startTs;
-RootNode rootNode = new RootNode<>(ctx,
plan.fieldsMetadata().rowType(), this::tryClose);
+RootNode rootNode = new RootNode<>(ctx, metadata.rowType(),
this::tryClose);
rootNode.register(root);
addFragment(new
RunningFragment<>(F.first(plan.fragments()).root(), rootNode, ctx));
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 e7d1a594b9b..38667c7c25a 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
@@ -76,15 +76,14 @@ import
org.apache.ignite.internal.processors.query.calcite.message.MessageType;
import
org.apache.ignite.internal.processors.query.calcite.message.QueryStartRequest;
import
org.apache.ignite.internal.processors.query.calcite.message.QueryStartResponse;
import
org.apache.ignite.internal.processors.query.calcite.metadata.AffinityService;
-import
org.apache.ignite.internal.processors.query.calcite.metadata.ColocationMappingException;
import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription;
import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMapping;
-import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMappingException;
import
org.apache.ignite.internal.processors.query.calcite.metadata.MappingService;
import
org.apache.ignite.internal.processors.query.calcite.metadata.RemoteException;
import
org.apache.ignite.internal.processors.query.calcite.prepar
[ignite] branch master updated (bada97f3a1d -> 3b43aa17ce7)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from bada97f3a1d IGNITE-20407 Update dependency version of Snappy-java to 1.1.10.3 (#10930) add 3b43aa17ce7 IGNITE-20341 SQL Calcite: Upgrade calcite to 1.34.0 (#10919) No new revisions were added by this update. Summary of changes: docs/_docs/SQL/sql-calcite.adoc| 2 +- modules/calcite/pom.xml|13 +- modules/calcite/src/main/codegen/config.fmpp | 9 + .../query/calcite/exec/ExecutionServiceImpl.java | 2 +- .../query/calcite/exec/exp/RexImpTable.java| 290 +- .../query/calcite/prepare/FieldsMetadataImpl.java |24 +- .../calcite/prepare/IgniteConvertletTable.java | 5 +- .../query/calcite/prepare/IgnitePlanner.java | 116 +- .../query/calcite/prepare/PrepareServiceImpl.java |26 +- .../processors/query/calcite/prepare/Splitter.java |12 +- .../query/calcite/prepare/ValidationResult.java|22 +- .../calcite/sql/fun/IgniteStdSqlOperatorTable.java | 2 + .../calcite/sql/generated/IgniteSqlParserImpl.java | 22049 + .../generated/IgniteSqlParserImplConstants.java| 1336 +- .../generated/IgniteSqlParserImplTokenManager.java | 23683 ++- .../processors/query/calcite/util/TypeUtils.java |37 +- .../integration/MetadataIntegrationTest.java |31 +- .../calcite/integration/StdSqlOperatorsTest.java | 3 + 18 files changed, 24701 insertions(+), 22961 deletions(-)
[ignite] branch master updated: IGNITE-20253 SQL Calcite: Replace placeholder values from ModifyNode (backport of IGNITE-19096) (#10906)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 8f2bbede0ed IGNITE-20253 SQL Calcite: Replace placeholder values from
ModifyNode (backport of IGNITE-19096) (#10906)
8f2bbede0ed is described below
commit 8f2bbede0edb2a87502790fe8b09e547945e1937
Author: Ivan Daschinskiy
AuthorDate: Mon Aug 21 13:54:10 2023 +0300
IGNITE-20253 SQL Calcite: Replace placeholder values from ModifyNode
(backport of IGNITE-19096) (#10906)
Co-authored-by: zstan
---
.../query/calcite/exec/exp/RexImpTable.java| 7 +-
.../calcite/prepare/IgniteSqlToRelConvertor.java | 129 +
.../calcite/schema/CacheTableDescriptorImpl.java | 20 +---
.../integration/TableDmlIntegrationTest.java | 37 ++
4 files changed, 172 insertions(+), 21 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index 366dcc199e3..0ec1dfb6ba6 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -260,9 +260,6 @@ public class RexImpTable {
/** */
private final Map map = new HashMap<>();
-/** Placeholder for DEFAULT operator value. */
-public static final Object DEFAULT_VALUE_PLACEHOLDER = new Object();
-
/** */
RexImpTable() {
defineMethod(ROW, BuiltInMethod.ARRAY.method, NullPolicy.NONE);
@@ -2513,7 +2510,7 @@ public class RexImpTable {
private static class DefaultImplementor extends AbstractRexCallImplementor
{
/** */
DefaultImplementor() {
-super(NullPolicy.NONE, false);
+super(NullPolicy.NONE, true);
}
/** {@inheritDoc} */
@@ -2524,7 +2521,7 @@ public class RexImpTable {
/** {@inheritDoc} */
@Override Expression implementSafe(final RexToLixTranslator translator,
final RexCall call, final List argValueList) {
-return Expressions.field(null, RexImpTable.class,
"DEFAULT_VALUE_PLACEHOLDER");
+return Expressions.constant(null);
}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
index eda8011066e..d72729ab3a6 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
@@ -17,7 +17,9 @@
package org.apache.ignite.internal.processors.query.calcite.prepare;
+import java.util.ArrayDeque;
import java.util.ArrayList;
+import java.util.Deque;
import java.util.List;
import org.apache.calcite.plan.RelOptCluster;
import org.apache.calcite.plan.RelOptTable;
@@ -28,21 +30,28 @@ import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.logical.LogicalJoin;
import org.apache.calcite.rel.logical.LogicalProject;
import org.apache.calcite.rel.logical.LogicalTableModify;
+import org.apache.calcite.rel.logical.LogicalValues;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.rex.RexInputRef;
import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlCall;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlInsert;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlMerge;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlUpdate;
+import org.apache.calcite.sql.util.SqlShuttle;
import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
import org.apache.calcite.sql.validate.SqlValidatorUtil;
import org.apache.calcite.sql2rel.SqlRexConvertletTable;
import org.apache.calcite.sql2rel.SqlToRelConverter;
import org.apache.calcite.tools.RelBuilder;
+import org.apache.calcite.util.ControlFlowException;
+import org.apache.calcite.util.Pair;
+import org.apache.ignite.internal.processors.query.calcite.schema.IgniteTable;
import org.checkerframework.checker.nullness.qual.Nullable;
import static java.util.Objects.requireNonNull;
@@ -51,6 +60,12 @@ import static java.util.Objects.requireNonNull;
* Converts a SQL parse tree into a relational algebra operators.
*/
public class IgniteSqlToRelConvertor extends S
[ignite] branch master updated: IGNITE-19998 SQL Calcite: Add support of setting partitions in SqlFieldsQuery (#10870)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 6455bc3a7f9 IGNITE-19998 SQL Calcite: Add support of setting
partitions in SqlFieldsQuery (#10870)
6455bc3a7f9 is described below
commit 6455bc3a7f9d992eea4c85453561db7f307f8978
Author: Ivan Daschinskiy
AuthorDate: Sat Aug 5 01:59:40 2023 +0300
IGNITE-19998 SQL Calcite: Add support of setting partitions in
SqlFieldsQuery (#10870)
---
.../query/calcite/CalciteQueryProcessor.java | 1 +
.../processors/query/calcite/RootQuery.java| 4 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 16 +-
.../query/calcite/metadata/ColocationGroup.java| 59 +++--
.../query/calcite/metadata/FragmentMapping.java| 16 +-
.../query/calcite/prepare/BaseQueryContext.java| 33 ++-
.../processors/query/calcite/prepare/Fragment.java | 7 +-
.../QueryWithPartitionsIntegrationTest.java| 280 +
.../ignite/testsuites/IntegrationTestSuite.java| 2 +
9 files changed, 391 insertions(+), 27 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
index 1ffdb85a7d1..3a675e8882c 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
@@ -564,6 +564,7 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
params,
qryCtx,
fldsQry != null && fldsQry.isLocal(),
+fldsQry != null ? fldsQry.getPartitions() : null,
exchangeSvc,
(q, ex) -> qryReg.unregister(q.id(), ex),
log,
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
index 7bf9df35469..cd6290e9495 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/RootQuery.java
@@ -107,6 +107,7 @@ public class RootQuery extends Query implements
TrackableQuery {
Object[] params,
QueryContext qryCtx,
boolean isLocal,
+int[] parts,
ExchangeService exch,
BiConsumer, Throwable> unregister,
IgniteLogger log,
@@ -144,6 +145,7 @@ public class RootQuery extends Query implements
TrackableQuery {
.build()
)
.local(isLocal)
+.partitions(parts)
.logger(log)
.build();
}
@@ -157,7 +159,7 @@ public class RootQuery extends Query implements
TrackableQuery {
* @param schema new schema.
*/
public RootQuery childQuery(SchemaPlus schema) {
-return new RootQuery<>(sql, schema, params, QueryContext.of(cancel),
ctx.isLocal(), exch, unregister, log,
+return new RootQuery<>(sql, schema, params, QueryContext.of(cancel),
ctx.isLocal(), ctx.partitions(), exch, unregister, log,
plannerTimeout, totalTimeout);
}
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 0b5e4c48935..5472042b80a 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
@@ -75,8 +75,10 @@ import
org.apache.ignite.internal.processors.query.calcite.message.MessageType;
import
org.apache.ignite.internal.processors.query.calcite.message.QueryStartRequest;
import
org.apache.ignite.internal.processors.query.calcite.message.QueryStartResponse;
import
org.apache.ignite.internal.processors.query.calcite.metadata.AffinityService;
+import
org.apache.ignite.internal.processors.query.calcite.metadata.ColocationMappingException;
import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription;
import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMapping;
+import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMappingException;
import
org.apache.ignite.internal.processors.query.calcite.metada
[ignite] branch master updated: IGNITE-19729 [ducktests] Add calcite support and ability to run arbitrary control.sh subcommand, fix PID detection (#10857)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 83c75d88cd3 IGNITE-19729 [ducktests] Add calcite support and ability
to run arbitrary control.sh subcommand, fix PID detection (#10857)
83c75d88cd3 is described below
commit 83c75d88cd356966e66876a234ff24bc671068dc
Author: Sergey Korotkov
AuthorDate: Thu Jul 27 14:31:59 2023 +0700
IGNITE-19729 [ducktests] Add calcite support and ability to run arbitrary
control.sh subcommand, fix PID detection (#10857)
---
modules/ducktests/pom.xml| 5 +
.../ducktests/tests/ignitetest/services/utils/control_utility.py | 9 +
.../ignitetest/services/utils/ignite_configuration/__init__.py | 2 ++
modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py | 6 +-
modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py | 2 +-
.../services/utils/templates/ignite_configuration_macro.j2 | 6 ++
.../tests/ignitetest/services/utils/templates/misc_macro.j2 | 6 +-
7 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/modules/ducktests/pom.xml b/modules/ducktests/pom.xml
index 7855d62bf4a..e5756e74872 100644
--- a/modules/ducktests/pom.xml
+++ b/modules/ducktests/pom.xml
@@ -48,6 +48,11 @@
ignite-indexing
+
+${project.groupId}
+ignite-calcite
+
+
${project.groupId}
ignite-control-utility
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
index 7fd320d9488..1b1dd997cfd 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
@@ -260,6 +260,15 @@ class ControlUtility:
return "Enabled." in output
+def run(self, cmd, node=None):
+"""
+Run arbitrary control.sh subcommand.
+:param cmd: Command line parameters for the control.sh.
+:param node: Node to run the control.sh on.
+:return: Output of the commands as a string.
+"""
+return self.__run(cmd, node)
+
def __performance_statistics_cmd(self, sub_command):
return self.__run(f"--performance-statistics {sub_command}")
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
b/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
index d9158d46726..6f83f603e04 100644
---
a/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
+++
b/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
@@ -30,6 +30,7 @@ from
ignitetest.services.utils.ignite_configuration.binary_configuration import
from ignitetest.services.utils.ignite_configuration.transaction import
TransactionConfiguration
from ignitetest.services.utils.ssl.ssl_params import SslParams,
is_ssl_enabled, get_ssl_params, IGNITE_CLIENT_ALIAS, \
IGNITE_SERVER_ALIAS
+from ignitetest.utils.bean import Bean
from ignitetest.utils.version import IgniteVersion, DEV_BRANCH
@@ -72,6 +73,7 @@ class IgniteConfiguration(NamedTuple):
sql_schemas: list = []
auto_activation_enabled: bool = None
transaction_configuration: TransactionConfiguration = None
+sql_configuration: Bean = None
def prepare_ssl(self, test_globals, shared_root):
"""
diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
index 4356304d775..84e0126b6d4 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
@@ -24,6 +24,7 @@ import os
import subprocess
from abc import ABCMeta, abstractmethod
import re
+from copy import deepcopy
from itertools import chain
from ignitetest.services.utils import IgniteServiceType
@@ -209,7 +210,10 @@ class IgniteSpec(metaclass=ABCMeta):
"""
:return: modules set.
"""
-modules = self.service.modules or []
+if self.service.modules:
+modules = deepcopy(self.service.modules)
+else:
+modules = []
modules.append("log4j2")
modules.append("ducktests")
diff --git a/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
b/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
index 5aa5adafcd5..a1175712f4c 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/j
[ignite] branch master updated: IGNITE-19725 SQL Calcite: Implement local flag support (#10788)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 baccd5fb4fd IGNITE-19725 SQL Calcite: Implement local flag support
(#10788)
baccd5fb4fd is described below
commit baccd5fb4fd33fddb4bf881b48166e43563b6c59
Author: Ivan Daschinskiy
AuthorDate: Sun Jul 16 22:07:54 2023 +0300
IGNITE-19725 SQL Calcite: Implement local flag support (#10788)
---
.../query/calcite/CalciteQueryProcessor.java | 28 ++-
.../processors/query/calcite/RootQuery.java| 4 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 3 +-
.../query/calcite/metadata/ColocationGroup.java| 14 ++
.../query/calcite/metadata/FragmentMapping.java| 8 +
.../query/calcite/prepare/BaseQueryContext.java| 27 ++-
.../processors/query/calcite/prepare/Fragment.java | 8 +-
.../query/calcite/prepare/MappingQueryContext.java | 14 ++
.../query/calcite/rule/IndexCountRule.java | 13 +-
.../calcite/rule/LogicalScanConverterRule.java | 19 +-
.../processors/query/calcite/util/Commons.java | 7 +-
.../integration/AbstractBasicIntegrationTest.java | 10 +-
.../integration/LocalQueryIntegrationTest.java | 205 +
.../ignite/testsuites/IntegrationTestSuite.java| 2 +
14 files changed, 342 insertions(+), 20 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
index 6bc9cccf5fa..6f8d2f63e1f 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
@@ -51,6 +51,7 @@ import org.apache.calcite.tools.Frameworks;
import org.apache.ignite.SystemProperty;
import org.apache.ignite.cache.query.FieldsQueryCursor;
import org.apache.ignite.cache.query.QueryCancelledException;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.calcite.CalciteQueryEngineConfiguration;
import org.apache.ignite.configuration.QueryEngineConfiguration;
import org.apache.ignite.events.SqlQueryExecutionEvent;
@@ -431,11 +432,13 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
if (plan == null) {
AtomicBoolean miss = new AtomicBoolean();
-plan = queryPlanCache().queryPlan(new
CacheKey(schema.getName(), sql, null, params), () -> {
-miss.set(true);
+plan = queryPlanCache().queryPlan(
+new CacheKey(schema.getName(), sql,
contextKey(qryCtx), params),
+() -> {
+miss.set(true);
-return prepareSvc.prepareSingle(qryNode,
qry.planningContext());
-});
+return prepareSvc.prepareSingle(qryNode,
qry.planningContext());
+});
if (miss.get())
parserMetrics.countCacheMiss();
@@ -470,7 +473,7 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
assert schema != null : "Schema not found: " + schemaName;
-QueryPlan plan = queryPlanCache().queryPlan(new
CacheKey(schema.getName(), sql, null, params));
+QueryPlan plan = queryPlanCache().queryPlan(new
CacheKey(schema.getName(), sql, contextKey(qryCtx), params));
if (plan != null) {
parserMetrics.countCacheHit();
@@ -493,7 +496,7 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
if (qryList.size() == 1) {
plan0 = queryPlanCache().queryPlan(
// Use source SQL to avoid redundant parsing next time.
-new CacheKey(schema.getName(), sql, null, params),
+new CacheKey(schema.getName(), sql,
contextKey(qryCtx), params),
() -> prepareSvc.prepareSingle(sqlNode,
qry.planningContext())
);
}
@@ -524,6 +527,16 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
}
}
+/** */
+private Object contextKey(QueryContext qryCtx) {
+if (qryCtx == null)
+return null;
+
+SqlFieldsQuery sqlFieldsQry = qryCtx.unwrap(SqlFieldsQuery.class);
+
+return sqlFieldsQry != null ? sqlFieldsQry.isLocal() : null;
+}
+
/** */
private T processQuery(
@Nullable
[ignite] branch master updated (830af532e4e -> 705c22b9225)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from 830af532e4e IGNITE-19445 NPE during transaction recovery (#10728) add 705c22b9225 IGNITE-19554 [ducktests] Add more config params for communication and data storage (#10733) No new revisions were added by this update. Summary of changes: .../services/utils/ignite_configuration/communication.py | 4 +++- .../services/utils/ignite_configuration/data_storage.py | 8 +++- .../ignitetest/services/utils/templates/datastorage_macro.j2 | 4 ++-- .../ignitetest/services/utils/templates/transaction_macro.j2 | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-)
[ignite] branch master updated: IGNITE-19175 [ducktests] Add logging support to NONE service type (#10620)
This is an automated email from the ASF dual-hosted git repository. ivandasch 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 e2604672211 IGNITE-19175 [ducktests] Add logging support to NONE service type (#10620) e2604672211 is described below commit e26046722111d9d856d7e1b333a591d857e3e392 Author: Ivan Daschinskiy AuthorDate: Fri Mar 31 12:29:06 2023 +0300 IGNITE-19175 [ducktests] Add logging support to NONE service type (#10620) --- modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py index 78ed9db9535..4356304d775 100644 --- a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py +++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py @@ -131,16 +131,14 @@ class IgniteSpec(metaclass=ABCMeta): """ :return: config that service will use to start on a node """ -if self.service.config.service_type == IgniteServiceType.NONE: -return [] - config_templates = [(IgnitePathAware.IGNITE_LOG_CONFIG_NAME, IgniteLoggerConfigTemplate())] if self.service.config.service_type == IgniteServiceType.NODE: config_templates.append((IgnitePathAware.IGNITE_CONFIG_NAME, IgniteClientConfigTemplate() if self.service.config.client_mode else IgniteServerConfigTemplate())) -else: + +if self.service.config.service_type == IgniteServiceType.THIN_CLIENT: config_templates.append((IgnitePathAware.IGNITE_THIN_CLIENT_CONFIG_NAME, IgniteThinClientConfigTemplate())) return config_templates
[ignite] branch master updated: IGNITE-19117 [ducktests] Allow to disable the partition awareness in the thin client configuration (#10606)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 597acab9b46 IGNITE-19117 [ducktests] Allow to disable the partition
awareness in the thin client configuration (#10606)
597acab9b46 is described below
commit 597acab9b466dbd3ebe81afbfe92f30010ab8556
Author: Sergey Korotkov
AuthorDate: Mon Mar 27 15:37:35 2023 +0700
IGNITE-19117 [ducktests] Allow to disable the partition awareness in the
thin client configuration (#10606)
---
.../ignitetest/services/utils/templates/client_configuration_macro.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
b/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
index ce03ccb297a..1b7630caeba 100644
---
a/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
+++
b/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
@@ -40,7 +40,7 @@
{% endif %}
-{% if config.partition_awareness_enabled %}
+{% if config.partition_awareness_enabled != None %}
{% endif %}
[ignite] branch master updated: IGNITE-19064 Allow several server nodes and partition awareness option in thin client configuration (#10602)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 95d5262deba IGNITE-19064 Allow several server nodes and partition
awareness option in thin client configuration (#10602)
95d5262deba is described below
commit 95d5262deba981f2d917588fc48e45b908db3fe9
Author: Sergey Korotkov
AuthorDate: Mon Mar 20 14:39:10 2023 +0700
IGNITE-19064 Allow several server nodes and partition awareness option in
thin client configuration (#10602)
---
.../ignitetest/services/utils/ignite_configuration/__init__.py| 3 ++-
.../services/utils/templates/client_configuration_macro.j2| 8 +++-
modules/ducktests/tests/ignitetest/tests/auth_test.py | 2 +-
modules/ducktests/tests/ignitetest/tests/thin_client_test.py | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
b/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
index a9c84f4d295..d9158d46726 100644
---
a/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
+++
b/modules/ducktests/tests/ignitetest/services/utils/ignite_configuration/__init__.py
@@ -133,12 +133,13 @@ class IgniteThinClientConfiguration(NamedTuple):
"""
Thin client configuration.
"""
-addresses: str = None
+addresses: list = []
version: IgniteVersion = DEV_BRANCH
ssl_params: SslParams = None
username: str = None
password: str = None
ext_beans: list = []
+partition_awareness_enabled: bool = None
def prepare_ssl(self, test_globals, shared_root):
"""
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
b/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
index 7e034bfed9f..ce03ccb297a 100644
---
a/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
+++
b/modules/ducktests/tests/ignitetest/services/utils/templates/client_configuration_macro.j2
@@ -21,7 +21,9 @@
-{{ config.addresses }}
+{% for address in config.addresses %}
+{{ address }}
+{% endfor %}
@@ -37,5 +39,9 @@
{% endif %}
+
+{% if config.partition_awareness_enabled %}
+
+{% endif %}
{% endmacro %}
diff --git a/modules/ducktests/tests/ignitetest/tests/auth_test.py
b/modules/ducktests/tests/ignitetest/tests/auth_test.py
index 96a5d98815f..7cb61513080 100644
--- a/modules/ducktests/tests/ignitetest/tests/auth_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/auth_test.py
@@ -68,7 +68,7 @@ class AuthenticationTests(IgniteTest):
ControlUtility(cluster=servers, username=DEFAULT_AUTH_USERNAME,
password=DEFAULT_AUTH_PASSWORD).activate()
client_cfg = IgniteThinClientConfiguration(
-addresses=servers.nodes[0].account.hostname + ":" +
str(config.client_connector_configuration.port),
+addresses=[servers.nodes[0].account.hostname + ":" +
str(config.client_connector_configuration.port)],
version=IgniteVersion(ignite_version),
username=DEFAULT_AUTH_USERNAME,
password=DEFAULT_AUTH_PASSWORD)
diff --git a/modules/ducktests/tests/ignitetest/tests/thin_client_test.py
b/modules/ducktests/tests/ignitetest/tests/thin_client_test.py
index 47351e07d84..90b1b55dee4 100644
--- a/modules/ducktests/tests/ignitetest/tests/thin_client_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/thin_client_test.py
@@ -48,7 +48,7 @@ class ThinClientTest(IgniteTest):
ignite = IgniteService(self.test_context, server_config, 1)
-addresses = ignite.nodes[0].account.hostname + ":" +
str(server_config.client_connector_configuration.port)
+addresses = [ignite.nodes[0].account.hostname + ":" +
str(server_config.client_connector_configuration.port)]
thin_clients = IgniteApplicationService(self.test_context,
IgniteThinClientConfiguration(addresses=addresses,
[ignite] branch master updated: IGNITE-18976 Fix lost affinity key cache configuration after client reconnect (#10584)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 353be3261b6 IGNITE-18976 Fix lost affinity key cache configuration
after client reconnect (#10584)
353be3261b6 is described below
commit 353be3261b691562a3730342cd7e6ffd0de1ed5a
Author: Ivan Daschinskiy
AuthorDate: Fri Mar 10 18:37:00 2023 +0300
IGNITE-18976 Fix lost affinity key cache configuration after client
reconnect (#10584)
---
.../ignite/internal/binary/BinaryContext.java | 17 ++
...gurationWithAffinityKeyClientReconnectTest.java | 229 +
.../testsuites/IgniteBinaryObjectsTestSuite.java | 3 +
3 files changed, 249 insertions(+)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index d5b0ea2df22..348baf11eaf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -404,6 +404,13 @@ public class BinaryContext {
for (String clsName0 : classesInPackage(pkgName)) {
String affField = affFields.remove(clsName0);
+if (affField == null) {
+Class cls = U.classForName(clsName0, null);
+
+if (cls != null)
+affField = affinityFieldName(cls);
+}
+
descs.add(clsName0, mapper, serializer, identity,
affField,
typeCfg.isEnum(), typeCfg.getEnumValues(), true);
}
@@ -411,6 +418,13 @@ public class BinaryContext {
else {
String affField = affFields.remove(clsName);
+if (affField == null) {
+Class cls = U.classForName(clsName, null);
+
+if (cls != null)
+affField = affinityFieldName(cls);
+}
+
descs.add(clsName, mapper, serializer, identity, affField,
typeCfg.isEnum(), typeCfg.getEnumValues(), false);
}
@@ -653,7 +667,10 @@ public class BinaryContext {
BinarySerializer serializer = serializerForClass(cls);
+// Firstly check annotations, then check in cache key
configurations.
String affFieldName = affinityFieldName(cls);
+if (affFieldName == null)
+affFieldName = affKeyFieldNames.get(typeId);
return new BinaryClassDescriptor(this,
cls,
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryConfigurationWithAffinityKeyClientReconnectTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryConfigurationWithAffinityKeyClientReconnectTest.java
new file mode 100644
index 000..52690bda5fb
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryConfigurationWithAffinityKeyClientReconnectTest.java
@@ -0,0 +1,229 @@
+/*
+ * 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.binary;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
+import org.apache.ignite.cache.CacheKeyConfiguration;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteClientReconnectAbstractTest;
+import org.apache.ignite.internal.IgniteEx;
+i
[ignite] branch master updated: IGNITE-18993 ODBC: Fix handling of single quotes (#10593)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 ee5fe5694e2 IGNITE-18993 ODBC: Fix handling of single quotes (#10593)
ee5fe5694e2 is described below
commit ee5fe5694e2fd18a30227071330d1351b4d1f3c1
Author: Ivan Daschinskiy
AuthorDate: Fri Mar 10 14:09:47 2023 +0300
IGNITE-18993 ODBC: Fix handling of single quotes (#10593)
---
.../internal/processors/odbc/odbc/OdbcUtils.java | 2 +-
.../cpp/odbc-test/src/meta_queries_test.cpp| 32 --
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
index b86149b3250..571e7cc5644 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
@@ -54,7 +54,7 @@ public class OdbcUtils {
* @return String without leading and trailing quotation marks.
*/
public static String removeQuotationMarksIfNeeded(String str) {
-if (str != null && str.startsWith("\"") && str.endsWith("\""))
+if (str != null && ((str.startsWith("\"") && str.endsWith("\"")) ||
(str.startsWith("'") && str.endsWith("'"
return str.substring(1, str.length() - 1);
return str;
diff --git a/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
b/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
index 696c878d2b8..73026c86a53 100644
--- a/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
+++ b/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
@@ -733,28 +733,30 @@ BOOST_AUTO_TEST_CASE(TestDdlTablesMetaTableTypeList)
if (!SQL_SUCCEEDED(ret))
BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
-SQLCHAR empty[] = "";
-SQLCHAR table[] = "TestTable";
-SQLCHAR typeList[] = "TABLE,VIEW";
+SQLCHAR* typeLists[] = {(SQLCHAR*)"'TABLE'", (SQLCHAR*)"TABLE,VIEW"};
+for (size_t i = 0; i < sizeof(typeLists) / sizeof(*typeLists); ++i) {
+SQLCHAR empty[] = "";
+SQLCHAR table[] = "TestTable";
-ret = SQLTables(stmt, empty, SQL_NTS, empty, SQL_NTS, table, SQL_NTS,
typeList, SQL_NTS);
+ret = SQLTables(stmt, empty, SQL_NTS, empty, SQL_NTS, table, SQL_NTS,
typeLists[i], SQL_NTS);
-if (!SQL_SUCCEEDED(ret))
-BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
-ret = SQLFetch(stmt);
+ret = SQLFetch(stmt);
-if (!SQL_SUCCEEDED(ret))
-BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
+if (!SQL_SUCCEEDED(ret))
+BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
-CheckStringColumn(stmt, 1, "");
-CheckStringColumn(stmt, 2, "\"PUBLIC\"");
-CheckStringColumn(stmt, 3, "TESTTABLE");
-CheckStringColumn(stmt, 4, "TABLE");
+CheckStringColumn(stmt, 1, "");
+CheckStringColumn(stmt, 2, "\"PUBLIC\"");
+CheckStringColumn(stmt, 3, "TESTTABLE");
+CheckStringColumn(stmt, 4, "TABLE");
-ret = SQLFetch(stmt);
+ret = SQLFetch(stmt);
-BOOST_REQUIRE_EQUAL(ret, SQL_NO_DATA);
+BOOST_REQUIRE_EQUAL(ret, SQL_NO_DATA);
+}
}
BOOST_AUTO_TEST_CASE(TestDdlColumnsMeta)
[ignite] branch master updated (28048e234c3 -> 8cee01d1b9a)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from 28048e234c3 IGNITE-18546 Add confirmation for clear command (#10589) add 8cee01d1b9a IGNITE-18988 Add missing test dependencies to direct-io (#10592) No new revisions were added by this update. Summary of changes: modules/direct-io/pom.xml | 14 ++ 1 file changed, 14 insertions(+)
[ignite] branch master updated: IGNITE-18935 Fix late stopping of TTL workers during deactivation leads to corrupted PDS (#10570)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 6229b46c277 IGNITE-18935 Fix late stopping of TTL workers during
deactivation leads to corrupted PDS (#10570)
6229b46c277 is described below
commit 6229b46c277707743da4f5fce881450a8a6ca151
Author: Ivan Daschinskiy
AuthorDate: Tue Mar 7 11:03:29 2023 +0300
IGNITE-18935 Fix late stopping of TTL workers during deactivation leads to
corrupted PDS (#10570)
---
modules/compress/pom.xml | 7 +
.../processors/cache/GridCacheProcessor.java | 58 --
...IgnitePdsWithTtlExpirationOnDeactivateTest.java | 222 +
.../ignite/testsuites/IgnitePdsTestSuite.java | 2 +
4 files changed, 268 insertions(+), 21 deletions(-)
diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml
index f9c4db51f42..c07bb0b7f8a 100644
--- a/modules/compress/pom.xml
+++ b/modules/compress/pom.xml
@@ -131,6 +131,13 @@
${guava.version}
test
+
+
+org.apache.commons
+commons-lang3
+${commons.lang3.version}
+test
+
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 53b29937c6f..6cb8c84b5b0 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/processors/cache/GridCacheProcessor.java
@@ -2744,9 +2744,6 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
// Wait until all evictions are finished.
grpsToStop.forEach(t ->
sharedCtx.evict().onCacheGroupStopped(t.get1()));
-if (!exchActions.cacheStopRequests().isEmpty())
-removeOffheapListenerAfterCheckpoint(grpsToStop);
-
Map> cachesToStop =
exchActions.cacheStopRequests().stream()
.collect(groupingBy(action -> action.descriptor().groupId()));
@@ -2763,31 +2760,50 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
CacheGroupContext gctx = cacheGrps.get(groupId);
-if (gctx != null)
-gctx.preloader().pause();
+if (gctx != null) {
+final String msg = "Failed to wait for topology
update, cache group is stopping.";
-try {
-if (gctx != null) {
-final String msg = "Failed to wait for topology
update, cache group is stopping.";
+// If snapshot operation in progress we must throw
CacheStoppedException
+// for correct cache proxy restart. For more details
see
+// IgniteCacheProxy.cacheException()
+gctx.affinity().cancelFutures(new
CacheStoppedException(msg));
+}
-// If snapshot operation in progress we must throw
CacheStoppedException
-// for correct cache proxy restart. For more
details see
-// IgniteCacheProxy.cacheException()
-gctx.affinity().cancelFutures(new
CacheStoppedException(msg));
-}
+for (ExchangeActions.CacheActionData action :
cachesToStopByGrp.getValue()) {
+
context().tm().rollbackTransactionsForStoppingCache(action.descriptor().cacheId());
-for (ExchangeActions.CacheActionData action :
cachesToStopByGrp.getValue()) {
-
context().tm().rollbackTransactionsForStoppingCache(action.descriptor().cacheId());
+stopGateway(action.request());
-stopGateway(action.request());
+String cacheName = action.request().cacheName();
-String cacheName = action.request().cacheName();
+GridCacheAdapter cache = caches.get(cacheName);
-// TTL manager has to be unregistered before the
checkpointReadLock is acquired.
-GridCacheAdapter cache =
caches.get(cacheName);
+if (cache != null)
+cache.context().ttl().unregister();
+}
-if (cache != null)
-cache.context().ttl().unregister();
+return null;
+}
+);
+
+if (!exchAction
[ignite] branch master updated: IGNITE-18936 [ducktests] Fix parsing of the control.sh baseline command output and store JVM error file (#10575)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 1f238846c8b IGNITE-18936 [ducktests] Fix parsing of the control.sh
baseline command output and store JVM error file (#10575)
1f238846c8b is described below
commit 1f238846c8beb0d2d5a742eae85a55987313a99e
Author: Sergey Korotkov
AuthorDate: Fri Mar 3 15:17:11 2023 +0700
IGNITE-18936 [ducktests] Fix parsing of the control.sh baseline command
output and store JVM error file (#10575)
---
.../ducktests/tests/ignitetest/services/utils/control_utility.py | 6 +++---
modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py | 3 ++-
modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py | 9 +++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
index 10bcdee4adc..82eb2fcab96 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
@@ -365,9 +365,9 @@ class ControlUtility:
def __parse_cluster_state(output):
state_pattern = re.compile("Cluster state: (?P[^\\s]+)")
topology_pattern = re.compile("Current topology version:
(?P\\d+)")
-baseline_pattern =
re.compile("Consistent(Id|ID)=(?P[^\\s]+)"
-
"(,\\sA(ddress|DDRESS)=(?P[^\\s]+))?"
- ",\\sS(tate|TATE)=(?P[^\\s]+)"
+baseline_pattern =
re.compile("Consistent(Id|ID)=(?P[^\\s,]+)"
+
"(,\\sA(ddress|DDRESS)=(?P[^\\s,]+))?"
+ ",\\sS(tate|TATE)=(?P[^\\s,]+)"
"(,\\sOrder=(?P\\d+))?")
match = state_pattern.search(output)
diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
index b82551491dc..b75c0aed02f 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
@@ -97,7 +97,8 @@ class IgniteSpec(metaclass=ABCMeta):
Return a set of default JVM options.
"""
default_jvm_opts =
create_jvm_settings(gc_dump_path=os.path.join(self.service.log_dir, "gc.log"),
-
oom_path=os.path.join(self.service.log_dir, "out_of_mem.hprof"))
+
oom_path=os.path.join(self.service.log_dir, "out_of_mem.hprof"),
+
vm_error_path=os.path.join(self.service.log_dir, "hs_err_pid%p.log"))
default_jvm_opts = merge_jvm_settings(
default_jvm_opts, ["-DIGNITE_SUCCESS_FILE=" +
os.path.join(self.service.persistent_root, "success_file"),
diff --git a/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
b/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
index 0fccd871a75..5aa5adafcd5 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/jvm_utils.py
@@ -28,7 +28,7 @@ JVM_PARAMS_GENERIC = "-server -XX:+DisableExplicitGC
-XX:+AlwaysPreTouch " \
def create_jvm_settings(heap_size=DEFAULT_HEAP, gc_settings=JVM_PARAMS_GC_G1,
generic_params=JVM_PARAMS_GENERIC,
-gc_dump_path=None, oom_path=None):
+gc_dump_path=None, oom_path=None, vm_error_path=None):
"""
Provides settings string for JVM process.
param opts: JVM options to merge. Adds new or rewrites default values. Can
be list or string.
@@ -41,7 +41,12 @@ def create_jvm_settings(heap_size=DEFAULT_HEAP,
gc_settings=JVM_PARAMS_GC_G1, ge
if oom_path:
out_of_mem_dump = "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="
+ oom_path
-as_string = f"-Xmx{heap_size} -Xms{heap_size} {gc_settings} {gc_dump}
{out_of_mem_dump} {generic_params}".strip()
+vm_error_dump = ""
+if vm_error_path:
+vm_error_dump = "-XX:ErrorFile=" + vm_error_path
+
+as_string = f"-Xmx{heap_size} -Xms{heap_size} {gc_settings} {gc_dump} " \
+f"{out_of_mem_dump} {vm_error_dump} {generic_params}".strip()
return as_string.split()
[ignite-python-thin-client] branch master updated (b32131b -> 1e485b5)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git from b32131b IGNITE-18788 Fix firing query events only if debug level logger enabled. (#62) add d1213c2 Add release notes for 0.6.1 add 1e485b5 Update build scripts and README.md No new revisions were added by this update. Summary of changes: README.md | 12 ++-- RELEASE_NOTES.txt | 4 scripts/BuildWheels.ps1 | 2 +- scripts/build_wheels.sh | 2 +- scripts/create_distr.sh | 4 ++-- scripts/create_sdist.sh | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-)
[ignite] branch master updated: IGNITE-18849 Add LOB and BLOB fields support to CacheJdbcPojoStore (#10553)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 c569d8682c5 IGNITE-18849 Add LOB and BLOB fields support to
CacheJdbcPojoStore (#10553)
c569d8682c5 is described below
commit c569d8682c59ef33590e35088c67bbefc5618195
Author: Ilhom
AuthorDate: Wed Mar 1 11:16:59 2023 +0300
IGNITE-18849 Add LOB and BLOB fields support to CacheJdbcPojoStore (#10553)
---
.../cache/store/jdbc/CacheAbstractJdbcStore.java | 29 -
.../store/jdbc/JdbcTypesDefaultTransformer.java| 3 +
.../cache/store/jdbc/CacheJdbcPojoStoreTest.java | 138 -
.../apache/ignite/cache/store/jdbc/model/Logo.java | 138 +
.../ignite/cache/store/jdbc/model/LogoKey.java | 86 +
5 files changed, 392 insertions(+), 2 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index ac99dbf745a..26c9c725b92 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -18,6 +18,8 @@
package org.apache.ignite.cache.store.jdbc;
import java.sql.BatchUpdateException;
+import java.sql.Blob;
+import java.sql.Clob;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -1384,7 +1386,32 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
}
}
-stmt.setObject(idx, fieldVal);
+switch (field.getDatabaseFieldType()) {
+case Types.CLOB:
+if (fieldVal instanceof String) {
+Clob clob = stmt.getConnection().createClob();
+clob.setString(1, (String)fieldVal);
+stmt.setClob(idx, clob);
+}
+else {
+throw new CacheException("Failed to set statement
parameter name: " + field.getDatabaseFieldName() +
+", only String is allowed for CLOB field.");
+}
+break;
+case Types.BLOB:
+if (fieldVal instanceof byte[]) {
+Blob blob = stmt.getConnection().createBlob();
+blob.setBytes(1, (byte[])fieldVal);
+stmt.setBlob(idx, blob);
+}
+else {
+throw new CacheException("Failed to set statement
parameter name: " + field.getDatabaseFieldName() +
+", only byte[] is allowed for BLOB field.");
+}
+break;
+default:
+stmt.setObject(idx, fieldVal);
+}
}
else
stmt.setNull(idx, field.getDatabaseFieldType());
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
index 47e178854f4..3b5720c2e83 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcTypesDefaultTransformer.java
@@ -114,6 +114,9 @@ public class JdbcTypesDefaultTransformer implements
JdbcTypesTransformer {
return UUID.fromString((String)res);
}
+if (type == byte[].class)
+return rs.getBytes(colIdx);
+
if (type.isEnum()) {
if
(NUMERIC_TYPES.contains(rs.getMetaData().getColumnType(colIdx))) {
int ordinal = rs.getInt(colIdx);
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 00a12dbcd5a..a1b02a75126 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -19,8 +19,11 @@ package org.apache.ignite.cache.store.jdbc;
import java.io.ByteArrayInputStream;
import java.lang.reflect.Field;
+import java.sql.Blob;
+import java.sql.Clob;
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
imp
svn commit: r60163 - /release/ignite/pyignite/0.6.0/
Author: ivandasch Date: Fri Feb 17 15:11:28 2023 New Revision: 60163 Log: Archiving pyignite-0.6.0 Removed: release/ignite/pyignite/0.6.0/
svn commit: r60162 - /release/ignite/pyignite/0.6.1/
Author: ivandasch Date: Fri Feb 17 15:10:30 2023 New Revision: 60162 Log: Add pyignite-0.6.1 Added: release/ignite/pyignite/0.6.1/ release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-win_amd64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-win_amd64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp310-cp310-win_amd64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-win_amd64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-win_amd64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp311-cp311-win_amd64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-win_amd64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.asc release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.sha512 release/ignite/pyignite/0.6.1/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.1/pyignite-0.6.1
[ignite-python-thin-client] annotated tag 0.6.1 updated (0d86f44 -> 25be925)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to annotated tag 0.6.1 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git *** WARNING: tag 0.6.1 was modified! *** from 0d86f44 (commit) to 25be925 (tag) tagging 0d86f44e86270f4d578afbce41aa2d6c424d2615 (commit) replaces 0.6.0 by Ivan Daschinsky on Fri Feb 17 18:08:54 2023 +0300 - Log - 0.6.1 --- No new revisions were added by this update. Summary of changes:
svn commit: r60120 - /dev/ignite/pyignite/0.6.1-rc0/
Author: ivandasch Date: Wed Feb 15 08:08:59 2023 New Revision: 60120 Log: Add pyignite-0.6.1-rc0 signatures and chechsums Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-win_amd64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-win_amd64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-macosx_10_9_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-macosx_10_9_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_i686.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_i686.whl.sha512 dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_x86_64.whl.asc dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_x86_64
svn commit: r60109 - /dev/ignite/pyignite/0.6.1-rc0/
Author: ivandasch Date: Tue Feb 14 15:58:35 2023 New Revision: 60109 Log: Add pyignite-0.6.1-rc0 Added: dev/ignite/pyignite/0.6.1-rc0/ dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-macosx_10_9_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_i686.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-musllinux_1_1_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp311-cp311-win_amd64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-macosx_10_9_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_i686.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-musllinux_1_1_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp37-cp37m-win_amd64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-macosx_10_9_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_i686.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-musllinux_1_1_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp38-cp38-win_amd64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-macosx_10_9_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_i686.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-musllinux_1_1_x86_64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp39-cp39-win_amd64.whl (with props) dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1.zip (with props) Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl == Binary file - no diff available. Propchange: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-macosx_10_9_x86_64.whl -- svn:mime-type = application/octet-stream Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl == Binary file - no diff available. Propchange: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl -- svn:mime-type = application/octet-stream Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl == Binary file - no diff available. Propchange: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_i686.whl -- svn:mime-type = application/octet-stream Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl == Binary file - no diff available. Propchange: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-musllinux_1_1_x86_64.whl -- svn:mime-type = application/octet-stream Added: dev/ignite/pyignite/0.6.1-rc0/pyignite-0.6.1-cp310-cp310-win_amd64.whl == Binary file - no diff available. Propchange: dev
[ignite-python-thin-client] annotated tag 0.6.1.rc0 updated (0d86f44 -> b0ce094)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to annotated tag 0.6.1.rc0 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git *** WARNING: tag 0.6.1.rc0 was modified! *** from 0d86f44 (commit) to b0ce094 (tag) tagging 0d86f44e86270f4d578afbce41aa2d6c424d2615 (commit) replaces 0.6.0 by Ivan Daschinsky on Tue Feb 14 18:44:53 2023 +0300 - Log - 0.6.1.rc0 --- No new revisions were added by this update. Summary of changes:
[ignite-python-thin-client] branch pyignite-0.6.1 updated: Add release notes for 0.6.1
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch pyignite-0.6.1 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git The following commit(s) were added to refs/heads/pyignite-0.6.1 by this push: new 0d86f44 Add release notes for 0.6.1 0d86f44 is described below commit 0d86f44e86270f4d578afbce41aa2d6c424d2615 Author: Ivan Daschinsky AuthorDate: Tue Feb 14 18:43:16 2023 +0300 Add release notes for 0.6.1 --- RELEASE_NOTES.txt | 4 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 82c9f05..86448e9 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,10 @@ Apache Ignite python thin client +0.6.1 + +* Fixed query listener fires events only if debug logging level enabled. + 0.6.0 * Added support of python 3.11
[ignite-python-thin-client] 02/02: IGNITE-18788 Fix firing query events only if debug level logger enabled. (#62)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch pyignite-0.6.1
in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git
commit da37d86016f0aeee82a410a496a794d3884e534c
Author: Ivan Daschinskiy
AuthorDate: Tue Feb 14 13:27:20 2023 +0300
IGNITE-18788 Fix firing query events only if debug level logger enabled.
(#62)
(cherry picked from commit b32131b28bc83d96d60ec2f0090a5958fd87ed53)
---
.github/workflows/pr_check.yml | 4 ++--
pyignite/queries/query.py | 29 +++--
tests/common/test_query_listener.py | 12
tox.ini | 6 --
4 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
index 2330e1d..8ceefb7 100644
--- a/.github/workflows/pr_check.yml
+++ b/.github/workflows/pr_check.yml
@@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
-uses: actions/setup-python@v4
+uses: actions/setup-python@v4.3.0
with:
python-version: ${{ matrix.cfg.python}}
- name: Install Apache Ignite
@@ -54,7 +54,7 @@ jobs:
- name: Install tox
run: |
- pip install tox
+ pip install tox==3.28.0
- name: Run tests
run: |
diff --git a/pyignite/queries/query.py b/pyignite/queries/query.py
index c141b26..6ac16d8 100644
--- a/pyignite/queries/query.py
+++ b/pyignite/queries/query.py
@@ -247,26 +247,27 @@ class Query:
self.op_code,
_get_op_code_name(self.op_code))
def _on_query_finished(self, conn, result=None, err=None):
-if logger.isEnabledFor(logging.DEBUG):
-dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
-if result and result.status != 0:
-err = result.message
-if err:
+dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
+if result and result.status != 0:
+err = result.message
+if err:
+if logger.isEnabledFor(logging.DEBUG):
logger.debug("Failed to perform query(query_id=%d, op_type=%s,
host=%s, port=%d, node_id=%s) "
"in %d ms: %s", self.query_id,
_get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms, err)
-if self._enabled_query_listener(conn):
-self._event_listener(conn).publish_query_fail(conn.host,
conn.port, conn.uuid, self.query_id,
-
self.op_code, _get_op_code_name(self.op_code),
- dur_ms, err)
-else:
+if self._enabled_query_listener(conn):
+self._event_listener(conn).publish_query_fail(conn.host,
conn.port, conn.uuid, self.query_id,
+ self.op_code,
_get_op_code_name(self.op_code),
+ dur_ms, err)
+else:
+if logger.isEnabledFor(logging.DEBUG):
logger.debug("Finished query(query_id=%d, op_type=%s, host=%s,
port=%d, node_id=%s) "
"successfully in %d ms", self.query_id,
_get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms)
-if self._enabled_query_listener(conn):
-
self._event_listener(conn).publish_query_success(conn.host, conn.port,
conn.uuid, self.query_id,
-
self.op_code, _get_op_code_name(self.op_code),
- dur_ms)
+if self._enabled_query_listener(conn):
+self._event_listener(conn).publish_query_success(conn.host,
conn.port, conn.uuid, self.query_id,
+ self.op_code,
_get_op_code_name(self.op_code),
+ dur_ms)
class ConfigQuery(Query):
diff --git a/tests/common/test_query_listener.py
b/tests/common/test_query_listener.py
index 8310117..85d1550 100644
--- a/tests/common/test_query_listener.py
+++ b/tests/common/test_query_listener.py
@@ -36,6 +36,18 @@ class QueryRouteListener(QueryEventListener):
events.append(event)
+@pytest.fixture(autouse=True)
+def setup_logger():
+from pyignite.queries.query import logger
+
+try:
+# Disable logger in order to test events with disabled debug logging.
+logger.disabled = True
+yield logger
+finally:
+logger.disabled
[ignite-python-thin-client] branch pyignite-0.6.1 created (now da37d86)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch pyignite-0.6.1 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git at da37d86 IGNITE-18788 Fix firing query events only if debug level logger enabled. (#62) This branch includes the following new commits: new 66e1b4e Prepare 0.6.1 release new da37d86 IGNITE-18788 Fix firing query events only if debug level logger enabled. (#62) 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.
[ignite-python-thin-client] 01/02: Prepare 0.6.1 release
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch pyignite-0.6.1 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git commit 66e1b4e5cf68b8cb76670ae2a9c7c804bfcd8dec Author: Ivan Daschinsky AuthorDate: Tue Feb 14 13:32:26 2023 +0300 Prepare 0.6.1 release --- README.md| 2 +- pyignite/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e755498..0f63d9a 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ pip install pyignite To install a specific version: ```bash -pip install pyignite==0.6.0 +pip install pyignite==0.6.1 ``` ## Documentation diff --git a/pyignite/__init__.py b/pyignite/__init__.py index 9d55337..086d7e9 100644 --- a/pyignite/__init__.py +++ b/pyignite/__init__.py @@ -17,4 +17,4 @@ from pyignite.client import Client from pyignite.aio_client import AioClient from pyignite.binary import GenericObjectMeta -__version__ = '0.6.0' +__version__ = '0.6.1'
[ignite-python-thin-client] branch master updated: IGNITE-18788 Fix firing query events only if debug level logger enabled. (#62)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git
The following commit(s) were added to refs/heads/master by this push:
new b32131b IGNITE-18788 Fix firing query events only if debug level
logger enabled. (#62)
b32131b is described below
commit b32131b28bc83d96d60ec2f0090a5958fd87ed53
Author: Ivan Daschinskiy
AuthorDate: Tue Feb 14 13:27:20 2023 +0300
IGNITE-18788 Fix firing query events only if debug level logger enabled.
(#62)
---
.github/workflows/pr_check.yml | 4 ++--
pyignite/queries/query.py | 29 +++--
tests/common/test_query_listener.py | 12
tox.ini | 6 --
4 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
index 2330e1d..8ceefb7 100644
--- a/.github/workflows/pr_check.yml
+++ b/.github/workflows/pr_check.yml
@@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
-uses: actions/setup-python@v4
+uses: actions/setup-python@v4.3.0
with:
python-version: ${{ matrix.cfg.python}}
- name: Install Apache Ignite
@@ -54,7 +54,7 @@ jobs:
- name: Install tox
run: |
- pip install tox
+ pip install tox==3.28.0
- name: Run tests
run: |
diff --git a/pyignite/queries/query.py b/pyignite/queries/query.py
index c141b26..6ac16d8 100644
--- a/pyignite/queries/query.py
+++ b/pyignite/queries/query.py
@@ -247,26 +247,27 @@ class Query:
self.op_code,
_get_op_code_name(self.op_code))
def _on_query_finished(self, conn, result=None, err=None):
-if logger.isEnabledFor(logging.DEBUG):
-dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
-if result and result.status != 0:
-err = result.message
-if err:
+dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
+if result and result.status != 0:
+err = result.message
+if err:
+if logger.isEnabledFor(logging.DEBUG):
logger.debug("Failed to perform query(query_id=%d, op_type=%s,
host=%s, port=%d, node_id=%s) "
"in %d ms: %s", self.query_id,
_get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms, err)
-if self._enabled_query_listener(conn):
-self._event_listener(conn).publish_query_fail(conn.host,
conn.port, conn.uuid, self.query_id,
-
self.op_code, _get_op_code_name(self.op_code),
- dur_ms, err)
-else:
+if self._enabled_query_listener(conn):
+self._event_listener(conn).publish_query_fail(conn.host,
conn.port, conn.uuid, self.query_id,
+ self.op_code,
_get_op_code_name(self.op_code),
+ dur_ms, err)
+else:
+if logger.isEnabledFor(logging.DEBUG):
logger.debug("Finished query(query_id=%d, op_type=%s, host=%s,
port=%d, node_id=%s) "
"successfully in %d ms", self.query_id,
_get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms)
-if self._enabled_query_listener(conn):
-
self._event_listener(conn).publish_query_success(conn.host, conn.port,
conn.uuid, self.query_id,
-
self.op_code, _get_op_code_name(self.op_code),
- dur_ms)
+if self._enabled_query_listener(conn):
+self._event_listener(conn).publish_query_success(conn.host,
conn.port, conn.uuid, self.query_id,
+ self.op_code,
_get_op_code_name(self.op_code),
+ dur_ms)
class ConfigQuery(Query):
diff --git a/tests/common/test_query_listener.py
b/tests/common/test_query_listener.py
index 8310117..85d1550 100644
--- a/tests/common/test_query_listener.py
+++ b/tests/common/test_query_listener.py
@@ -36,6 +36,18 @@ class QueryRouteListener(QueryEventListener):
events.append(event)
+@pytest.fixture(autouse=True)
+def setup_logger():
+from pyignite.queries.query import logger
+
+try:
+# Disable logger in order to test events with disabled
[ignite] branch master updated: IGNITE-18615 Implement monitoring events in java thin client (#10501)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 1b537d444be IGNITE-18615 Implement monitoring events in java thin
client (#10501)
1b537d444be is described below
commit 1b537d444be5ae5c007c3fd677782a3b5a5274c3
Author: Ivan Daschinskiy
AuthorDate: Thu Feb 9 11:42:13 2023 +0300
IGNITE-18615 Implement monitoring events in java thin client (#10501)
---
.../events/ConnectionClosedEvent.java} | 37 +--
.../client/events/ConnectionDescription.java | 82 ++
.../events/ConnectionEvent.java} | 29 +--
.../events/ConnectionEventListener.java} | 40 +--
.../ignite/client/events/HandshakeFailEvent.java | 64 +
.../events/HandshakeStartEvent.java} | 27 +-
.../events/HandshakeSuccessEvent.java} | 38 +--
.../apache/ignite/client/events/RequestEvent.java | 79 ++
.../events/RequestEventListener.java} | 33 +--
.../ignite/client/events/RequestFailEvent.java | 70 ++
.../events/RequestStartEvent.java} | 30 +--
.../ignite/client/events/RequestSuccessEvent.java | 55
.../ignite/configuration/ClientConfiguration.java | 21 ++
.../monitoring/EventListenerDemultiplexer.java | 222
.../client/thin/ClientChannelConfiguration.java| 10 +
.../internal/client/thin/ClientOperation.java | 3 +
.../internal/client/thin/ProtocolContext.java | 17 ++
.../internal/client/thin/ProtocolVersion.java | 2 +-
.../internal/client/thin/TcpClientChannel.java | 279 ++---
.../internal/client/thin/io/ClientConnection.java | 15 ++
.../io/gridnioserver/GridNioClientConnection.java | 11 +
.../thin/io/gridnioserver/GridNioClientParser.java | 2 +-
.../org/apache/ignite/client/ReliabilityTest.java | 2 +-
.../client/thin/events/FakeIgniteServer.java | 261 +++
.../IgniteClientConnectionEventListenerTest.java | 233 +
.../IgniteClientRequestEventListenerTest.java | 155
.../org/apache/ignite/client/ClientTestSuite.java | 6 +-
27 files changed, 1613 insertions(+), 210 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/ClientConnection.java
b/modules/core/src/main/java/org/apache/ignite/client/events/ConnectionClosedEvent.java
similarity index 59%
copy from
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/ClientConnection.java
copy to
modules/core/src/main/java/org/apache/ignite/client/events/ConnectionClosedEvent.java
index a31302b5f26..7a6cb901c3a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/ClientConnection.java
+++
b/modules/core/src/main/java/org/apache/ignite/client/events/ConnectionClosedEvent.java
@@ -15,27 +15,34 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.client.thin.io;
+package org.apache.ignite.client.events;
-import java.nio.ByteBuffer;
-
-import org.apache.ignite.IgniteCheckedException;
import org.jetbrains.annotations.Nullable;
-/**
- * Client connection: abstracts away sending and receiving messages.
- */
-public interface ClientConnection extends AutoCloseable {
+/** */
+public class ConnectionClosedEvent extends ConnectionEvent {
+/** */
+private final Throwable throwable;
+
/**
- * Sends a message.
- *
- * @param msg Message buffer.
- * @param onDone Callback to be invoked when asynchronous send operation
completes.
+ * @param conn Connection description.
+ * @param throwable Throwable that caused the failure if any.
*/
-void send(ByteBuffer msg, @Nullable Runnable onDone) throws
IgniteCheckedException;
+public ConnectionClosedEvent(
+ConnectionDescription conn,
+Throwable throwable
+) {
+super(conn);
+
+this.throwable = throwable;
+}
/**
- * Closes the connection.
+ * Get a cause of the failure if any.
+ *
+ * @return A cause of the failure if any.
*/
-@Override void close();
+@Nullable public Throwable throwable() {
+return throwable;
+}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/client/events/ConnectionDescription.java
b/modules/core/src/main/java/org/apache/ignite/client/events/ConnectionDescription.java
new file mode 100644
index 000..672ba735f5b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/client/events/ConnectionDescription.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[ignite] branch master updated: IGNITE-18765 [ducktests] Use PEP 440 compatible version number for python module (#10530)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 ca60ad5abbd IGNITE-18765 [ducktests] Use PEP 440 compatible version
number for python module (#10530)
ca60ad5abbd is described below
commit ca60ad5abbd3f0b023fc5ce67650662c7a4c4dcc
Author: Sergey Korotkov
AuthorDate: Thu Feb 9 14:33:12 2023 +0700
IGNITE-18765 [ducktests] Use PEP 440 compatible version number for python
module (#10530)
---
modules/ducktests/tests/ignitetest/utils/version.py | 4 ++--
modules/ducktests/tests/setup.py| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/ducktests/tests/ignitetest/utils/version.py
b/modules/ducktests/tests/ignitetest/utils/version.py
index 4f15980b174..e886ba938bb 100644
--- a/modules/ducktests/tests/ignitetest/utils/version.py
+++ b/modules/ducktests/tests/ignitetest/utils/version.py
@@ -47,7 +47,7 @@ class IgniteVersion(LooseVersion):
self.project = self.DEFAULT_PROJECT if not match.group(1) else
match.group(1)
version = match.group(2)
-self.is_dev = (version.lower() == __version__.lower()) or version ==
self.DEV_VERSION
+self.is_dev = version == self.DEV_VERSION
if self.is_dev:
version = __version__ # we may also parse pom file to gain
correct version (in future)
@@ -71,7 +71,7 @@ class IgniteVersion(LooseVersion):
return "IgniteVersion ('%s')" % str(self)
-DEV_BRANCH = IgniteVersion(__version__)
+DEV_BRANCH = IgniteVersion("dev")
# 2.7.x versions
V_2_7_6 = IgniteVersion("2.7.6")
diff --git a/modules/ducktests/tests/setup.py b/modules/ducktests/tests/setup.py
index 5e4ac2f9846..06d87990776 100644
--- a/modules/ducktests/tests/setup.py
+++ b/modules/ducktests/tests/setup.py
@@ -23,7 +23,7 @@ with open('ignitetest/__init__.py', 'r') as fd:
# Note: when changing the version of ducktape, also revise
tests/docker/Dockerfile
setup(name="ignitetest",
- version=version,
+ version=version.replace("-SNAPSHOT", ".dev0"),
description="Apache Ignite System Tests",
author="Apache Ignite",
platforms=["any"],
[ignite] branch master updated: IGNITE-18387 [ducktests] Added basic test for the CDC (#10439)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 e0e2edd5b02 IGNITE-18387 [ducktests] Added basic test for the CDC
(#10439)
e0e2edd5b02 is described below
commit e0e2edd5b029701ffbc18d01709da86bcd45405f
Author: Sergey Korotkov
AuthorDate: Tue Jan 24 19:30:10 2023 +0700
IGNITE-18387 [ducktests] Added basic test for the CDC (#10439)
---
.../ducktest/tests/cdc/CountingCdcConsumer.java| 91
.../ignitetest/services/utils/cdc/__init__.py | 18 +++
.../ignitetest/services/utils/cdc/ignite_cdc.py| 86 +++
.../ignitetest/services/utils/ducktests_service.py | 2 +-
.../ignitetest/services/utils/ignite_aware.py | 20 +---
.../utils/ignite_configuration/__init__.py | 9 +-
.../utils/ignite_configuration/data_storage.py | 3 +
.../tests/ignitetest/services/utils/ignite_spec.py | 2 +
.../tests/ignitetest/services/utils/jmx_utils.py | 2 +-
.../tests/ignitetest/services/utils/jvm_utils.py | 17 +++
.../ignitetest/services/utils/templates/bean.j2| 22
...config.xml.j2 => client_configuration_macro.j2} | 7 +-
.../services/utils/templates/ignite.xml.j2 | 121 +
...ignite.xml.j2 => ignite_configuration_macro.j2} | 16 +--
.../services/utils/templates/misc_macro.j2 | 14 ++-
.../utils/templates/thin_client_config.xml.j2 | 28 ++---
.../tests/ignitetest/tests/cdc/__init__.py | 18 +++
.../tests/ignitetest/tests/cdc/cdc_test.py | 101 +
.../tests/control_utility/consistency_test.py | 2 +-
.../tests/ignitetest/tests/snapshot_test.py| 2 +-
modules/ducktests/tests/ignitetest/utils/bean.py | 10 ++
21 files changed, 408 insertions(+), 183 deletions(-)
diff --git
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/cdc/CountingCdcConsumer.java
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/cdc/CountingCdcConsumer.java
new file mode 100644
index 000..d6b173ae07a
--- /dev/null
+++
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/cdc/CountingCdcConsumer.java
@@ -0,0 +1,91 @@
+/*
+ * 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.ducktest.tests.cdc;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.cdc.CdcCacheEvent;
+import org.apache.ignite.cdc.CdcConsumer;
+import org.apache.ignite.cdc.CdcEvent;
+import org.apache.ignite.cdc.TypeMapping;
+import org.apache.ignite.internal.processors.metric.MetricRegistry;
+import org.apache.ignite.resources.LoggerResource;
+
+/**
+ * Simple CDC consumer.
+ *
+ * Just counts the total number of the objects consumed.
+ */
+public class CountingCdcConsumer implements CdcConsumer {
+/** Logger. */
+@LoggerResource
+protected IgniteLogger log;
+
+/** Total count of the object consumed. */
+private final AtomicLong objectsConsumed = new AtomicLong();
+
+/** {@inheritDoc} */
+@Override public void start(MetricRegistry mreg) {
+log.info("CountingCdcConsumer started");
+}
+
+/** {@inheritDoc} */
+@Override public boolean onEvents(Iterator events) {
+events.forEachRemaining(this::consume);
+
+return true;
+}
+
+/** {@inheritDoc} */
+@Override public void onTypes(Iterator types) {
+types.forEachRemaining(this::consume);
+}
+
+/** {@inheritDoc} */
+@Override public void onMappings(Iterator mappings) {
+mappings.forEachRemaining(this::consume);
+}
+
+/** {@inheritDoc} */
+@Override public void onCacheChange(Iterator cacheEvents) {
+cacheEvents.forEachRemaining(this::consume);
+}
+
+/** {@inheritDoc} */
+@Override public void onCacheDestroy(Iterator caches) {
+caches.forEachRemaining(this::consume);
+}
+
+/** {@inher
[ignite] branch master updated: IGNITE-18584 Enlarge compression buffer in order to provide sufficient space for compressors. (#10490)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 21ffc3e92ea IGNITE-18584 Enlarge compression buffer in order to
provide sufficient space for compressors. (#10490)
21ffc3e92ea is described below
commit 21ffc3e92ea4ea13ece8a3b45094185665e8cd69
Author: Ivan Daschinskiy
AuthorDate: Fri Jan 20 14:07:39 2023 +0300
IGNITE-18584 Enlarge compression buffer in order to provide sufficient
space for compressors. (#10490)
---
.../compress/CompressionProcessorImpl.java | 13 +-
.../compress/CompressionProcessorTest.java | 864 +++--
.../platforms/cpp/core/src/jni/os/linux/utils.cpp | 2 +-
.../platforms/cpp/core/src/jni/os/win/utils.cpp| 2 +-
4 files changed, 119 insertions(+), 762 deletions(-)
diff --git
a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
index 623ff50ee3d..d2e22caf702 100644
---
a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
+++
b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
@@ -50,8 +50,8 @@ public class CompressionProcessorImpl extends
CompressionProcessor {
/** Max page size. */
private final ThreadLocalByteBuffer compactBuf = new
ThreadLocalByteBuffer(MAX_PAGE_SIZE);
-/** A bit more than max page size. */
-private final ThreadLocalByteBuffer compressBuf = new
ThreadLocalByteBuffer(MAX_PAGE_SIZE + 1024);
+/** A bit more than max page size, extra space is required by compressors.
*/
+private final ThreadLocalByteBuffer compressBuf = new
ThreadLocalByteBuffer(maxCompressedBufferSize(MAX_PAGE_SIZE));
/**
* @param ctx Kernal context.
@@ -420,6 +420,15 @@ public class CompressionProcessorImpl extends
CompressionProcessor {
setCompressionInfo(page, DiskPageCompression.DISABLED, 0, 0);
}
+/** */
+private static int maxCompressedBufferSize(int baseSz) {
+int lz4Sz = Lz4.fastCompressor.maxCompressedLength(baseSz);
+int zstdSz = (int)Zstd.compressBound(baseSz);
+int snappySz = Snappy.maxCompressedLength(baseSz);
+
+return Math.max(Math.max(lz4Sz, zstdSz), snappySz);
+}
+
/** */
static class Lz4 {
/** */
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
index ff328e89bff..f499059a1fe 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java
@@ -42,7 +42,10 @@ import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.testframework.junits.GridTestKernalContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import static
org.apache.ignite.configuration.DataStorageConfiguration.MAX_PAGE_SIZE;
import static org.apache.ignite.configuration.DiskPageCompression.LZ4;
import static org.apache.ignite.configuration.DiskPageCompression.SKIP_GARBAGE;
import static org.apache.ignite.configuration.DiskPageCompression.SNAPPY;
@@ -50,741 +53,165 @@ import static
org.apache.ignite.configuration.DiskPageCompression.ZSTD;
import static
org.apache.ignite.internal.processors.compress.CompressionProcessor.LZ4_MAX_LEVEL;
import static
org.apache.ignite.internal.processors.compress.CompressionProcessor.LZ4_MIN_LEVEL;
import static
org.apache.ignite.internal.processors.compress.CompressionProcessor.UNCOMPRESSED_PAGE;
+import static
org.apache.ignite.internal.processors.compress.CompressionProcessor.ZSTD_DEFAULT_LEVEL;
import static
org.apache.ignite.internal.processors.compress.CompressionProcessor.ZSTD_MAX_LEVEL;
import static
org.apache.ignite.internal.processors.compress.CompressionProcessorImpl.allocateDirectBuffer;
-import static
org.apache.ignite.internal.processors.compress.CompressionProcessorTest.TestInnerIO.INNER_IO;
-import static
org.apache.ignite.internal.processors.compress.CompressionProcessorTest.TestLeafIO.LEAF_IO;
import static org.apache.ignite.internal.util.GridUnsafe.bufferAddress;
/**
*/
+@RunWith(Parameterized.class)
public class CompressionProcessorTest extends GridCommonAbstractTest {
/** */
-private static final int ITEM_SIZE = 6; // To fill the whole page.
-
-/** */
-private int blockSize
[ignite] branch master updated: IGNITE-18438 .NET: Fix marshalling of nested binarizable structures with different schemas. (#10484)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 66554a27e4b IGNITE-18438 .NET: Fix marshalling of nested binarizable
structures with different schemas. (#10484)
66554a27e4b is described below
commit 66554a27e4be0dab0cdab3f9b4a11b65ca8a0c4d
Author: Ivan Daschinskiy
AuthorDate: Wed Jan 18 21:42:42 2023 +0300
IGNITE-18438 .NET: Fix marshalling of nested binarizable structures with
different schemas. (#10484)
---
.../Binary/BinaryStructureTest.cs | 85 ++
.../Impl/Binary/Metadata/BinaryType.cs | 34 +++--
2 files changed, 96 insertions(+), 23 deletions(-)
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryStructureTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryStructureTest.cs
index af2536e1466..e761a57a114 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryStructureTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryStructureTest.cs
@@ -18,6 +18,7 @@
namespace Apache.Ignite.Core.Tests.Binary
{
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
@@ -211,6 +212,90 @@ namespace Apache.Ignite.Core.Tests.Binary
}, Environment.ProcessorCount, 5);
}
+
+///
+/// Test serializing nested binarizable objects with different schemas.
+///
+[Test]
+public void TestSerializeNestedStructureWithDifferentSchemas()
+{
+var marsh = new Marshaller(new BinaryConfiguration(typeof(Item)));
+
+var simple = new Item(new List { "f1", "f2" });
+var nested = new Item(new List { "f3" },
+new List {new Item(new List { "f1" })});
+
+var simpleMarsh = marsh.Marshal(simple);
+var nestedMarsh = marsh.Marshal(nested);
+
+Assert.AreEqual(new List {"f1", "f2"},
marsh.Unmarshal(simpleMarsh).FieldNames);
+Assert.IsEmpty(marsh.Unmarshal(simpleMarsh).Children);
+
+Assert.AreEqual(new List { "f3" },
marsh.Unmarshal(nestedMarsh).FieldNames);
+Assert.AreEqual(1,
marsh.Unmarshal(nestedMarsh).Children.Count);
+Assert.AreEqual(new List { "f1" },
marsh.Unmarshal(nestedMarsh).Children[0].FieldNames);
+
Assert.IsEmpty(marsh.Unmarshal(nestedMarsh).Children[0].Children);
+}
+}
+
+///
+/// A composite structure consisting of the specified fields and optional
children of the same
+/// type.
+///
+class Item : IBinarizable
+{
+private List _fieldNames;
+private List _children;
+
+public Item(List fieldNames, List children)
+{
+_fieldNames = fieldNames;
+_children = children;
+}
+
+public Item(List fieldNames)
+: this(fieldNames, new List())
+{
+}
+
+public List FieldNames
+{
+get { return _fieldNames; }
+}
+
+public List Children
+{
+get { return _children; }
+}
+
+public void WriteBinary(IBinaryWriter writer)
+{
+writer.WriteCollection(nameof(_children), _children);
+writer.WriteCollection(nameof(_fieldNames), _fieldNames);
+
+foreach (var name in _fieldNames)
+{
+writer.WriteString(name, name);
+}
+}
+
+public void ReadBinary(IBinaryReader reader)
+{
+_children = (List)reader.ReadCollection(
+nameof(_children),
+size => new List(size),
+(collection, obj) => ((List) collection).Add((Item)
obj));
+
+_fieldNames = (List)reader.ReadCollection(
+nameof(_fieldNames),
+size => new List(size),
+(collection, obj) => ((List) collection).Add((string)
obj));
+
+foreach (var name in _fieldNames)
+{
+Assert.AreEqual(name, reader.ReadString(name));
+}
+}
}
[SuppressMessage("ReSharper", "InconsistentNaming")]
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs
index 7d6629ee13e..f22cf0ab66e 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/BinaryType.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Metadata/Bi
[ignite] branch master updated (3864f18a72e -> 7d46e28cdbd)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from 3864f18a72e IGNITE-18515 CDC: add documentation about metadata replication (#10481) add 7d46e28cdbd IGNITE-18568 [ducktests] Add explicit filelock package dependency (#10486) No new revisions were added by this update. Summary of changes: modules/ducktests/tests/docker/requirements.txt | 1 + 1 file changed, 1 insertion(+)
[ignite] branch master updated: IGNITE-18494 Fix ignoring near cache configuration while starting cache not from affinity node (#10476)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 184564975f0 IGNITE-18494 Fix ignoring near cache configuration while
starting cache not from affinity node (#10476)
184564975f0 is described below
commit 184564975f06c795e5bc94f463c6eda0bef5f888
Author: Ivan Daschinskiy
AuthorDate: Thu Jan 12 23:53:24 2023 +0300
IGNITE-18494 Fix ignoring near cache configuration while starting cache not
from affinity node (#10476)
---
.../cache/DynamicCacheChangeRequest.java | 3 +
.../platform/cache/PlatformCacheManager.java | 2 +-
.../platform/callback/PlatformCallbackGateway.java | 7 +-
.../IgniteCacheP2pUnmarshallingNearErrorTest.java | 2 +-
.../near/GridCacheNearDynamicStartTest.java| 158 +
...om2LruNearEnabledPageEvictionMultinodeTest.java | 10 ++
...domLruNearEnabledPageEvictionMultinodeTest.java | 10 ++
.../ignite/testsuites/IgniteCacheTestSuite2.java | 2 +
.../Platform/PlatformCacheTopologyChangeTest.cs| 23 +--
.../Impl/Cache/Platform/PlatformCacheManager.cs| 17 ++-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 7 +-
11 files changed, 216 insertions(+), 25 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 399c2cd1c77..e0e6037a856 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -371,6 +371,9 @@ public class DynamicCacheChangeRequest implements
Serializable {
*/
public void startCacheConfiguration(CacheConfiguration startCfg) {
this.startCfg = startCfg;
+
+if (startCfg.getNearConfiguration() != null)
+nearCacheCfg = startCfg.getNearConfiguration();
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheManager.java
index bb2bf57426d..40dca144d46 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheManager.java
@@ -58,7 +58,7 @@ public class PlatformCacheManager implements GridCacheManager
{
GridCacheContext ctx = cctx;
if (ctx != null) {
-gate.onCacheStopped(cctx.cacheId());
+gate.onCacheStopped(cctx.cacheId(), cancel, destroy);
cctx = null;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index ff6cf733f9a..5d6e57d3fae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -1264,14 +1264,17 @@ public class PlatformCallbackGateway {
* Notifies about cache stop.
*
* @param cacheId Cache id.
+ * @param cancel Cancel flag.
+ * @param destroy Cache destroy flag.
*/
-public void onCacheStopped(int cacheId) {
+public void onCacheStopped(int cacheId, boolean cancel, boolean destroy) {
// Ignore cache stop during grid stop.
if (!tryEnter())
return;
try {
-PlatformCallbackUtils.inLongOutLong(envPtr,
PlatformCallbackOp.OnCacheStopped, cacheId);
+PlatformCallbackUtils.inLongLongLongObjectOutLong(envPtr,
PlatformCallbackOp.OnCacheStopped,
+cacheId, cancel ? 1L : 0L, destroy ? 1L : 0L, null);
}
finally {
leave();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
index c0bcc2e516d..19b9f0c6458 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
@@ -47,7 +47,7 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends
IgniteCacheP2pUnma
@Test
@Override public void
[ignite] 01/01: IGNITE-18494 Fix ignoring near cache configuration while starting cache not from affinity node.
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch ignite-18494
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 43280272bf20a6af0402066eae75a63e455d22e9
Author: Ivan Daschinsky
AuthorDate: Wed Jan 11 18:23:12 2023 +0300
IGNITE-18494 Fix ignoring near cache configuration while starting cache not
from affinity node.
---
.../cache/DynamicCacheChangeRequest.java | 3 +
.../near/GridCacheNearDynamicStartTest.java| 157 +
.../ignite/testsuites/IgniteCacheTestSuite2.java | 2 +
3 files changed, 162 insertions(+)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 399c2cd1c77..e0e6037a856 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -371,6 +371,9 @@ public class DynamicCacheChangeRequest implements
Serializable {
*/
public void startCacheConfiguration(CacheConfiguration startCfg) {
this.startCfg = startCfg;
+
+if (startCfg.getNearConfiguration() != null)
+nearCacheCfg = startCfg.getNearConfiguration();
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearDynamicStartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearDynamicStartTest.java
new file mode 100644
index 000..3f43e5710f9
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearDynamicStartTest.java
@@ -0,0 +1,157 @@
+/*
+ * 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.distributed.near;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * Tests that dynamically started caches with near configurations actually
start with near caches on all nodes:
+ * affinity, non-affinity and clients.
+ */
+@RunWith(Parameterized.class)
+public class GridCacheNearDynamicStartTest extends GridCommonAbstractTest {
+/** */
+private static final int SRV_CNT = 3;
+
+/** */
+private static final String CLIENT_ID = "client";
+
+/** */
+@Parameterized.Parameters(name = "nodeCacheStart = {0}, nodeNearCheck =
{1}")
+public static Iterable useBinaryArrays() {
+List params = new ArrayList<>();
+
+for (NODE_TYPE nodeStart: NODE_TYPE.values()) {
+for (NODE_TYPE nodeNearCheck: NODE_TYPE.values())
+params.add(new Object[]{ nodeStart, nodeNearCheck});
+}
+
+return params;
+}
+
+/** */
+@Parameterized.Parameter(0)
+public NODE_TYPE nodeStart;
+
+/** */
+@Parameterized.Parameter(1)
+public NODE_TYPE nodeCheck;
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+startGrids(SRV_CNT);
+startClientGrid(CLIENT_ID);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+IgniteEx ign = grid(0);
+
+ign.cacheNames().forEach(ign::destroyCache);
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfigurati
[ignite] branch ignite-18494 created (now 43280272bf2)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-18494 in repository https://gitbox.apache.org/repos/asf/ignite.git at 43280272bf2 IGNITE-18494 Fix ignoring near cache configuration while starting cache not from affinity node. This branch includes the following new commits: new 43280272bf2 IGNITE-18494 Fix ignoring near cache configuration while starting cache not from affinity node. 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.
[ignite] branch master updated: IGNITE-18199 Implement punching holes in snapshot restoration process. (#10468)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 c1c0b285fb9 IGNITE-18199 Implement punching holes in snapshot
restoration process. (#10468)
c1c0b285fb9 is described below
commit c1c0b285fb9562d3e221f8faca755c8f2f1c6a31
Author: Ivan Daschinskiy
AuthorDate: Mon Jan 9 16:56:38 2023 +0300
IGNITE-18199 Implement punching holes in snapshot restoration process.
(#10468)
---
.../snapshot/SnapshotCompressionBasicTest.java | 166 +
.../snapshot/IgniteSnapshotManager.java| 2 +-
.../snapshot/SnapshotRestoreProcess.java | 144 +++---
3 files changed, 260 insertions(+), 52 deletions(-)
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
index acfb53deb1a..cfe25bbeb29 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.persistence.snapshot;
import java.io.IOException;
+import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -41,6 +42,7 @@ import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.DiskPageCompression;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContextImpl;
@@ -63,6 +65,7 @@ import static
org.apache.ignite.configuration.IgniteConfiguration.DFLT_SNAPSHOT_
import static org.apache.ignite.events.EventType.EVTS_CLUSTER_SNAPSHOT;
import static
org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_FINISHED;
import static
org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_STARTED;
+import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
/** */
public class SnapshotCompressionBasicTest extends AbstractSnapshotSelfTest {
@@ -82,7 +85,10 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
protected static final long TIMEOUT = 30_000;
/** */
-private static final Map CACHES = new HashMap<>();
+protected static final Map CACHES = new HashMap<>();
+
+/** */
+public static final int DFLT_GRIDS_CNT = 3;
static {
CACHES.put("cache1", "group1");
@@ -92,7 +98,7 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
}
/** */
-private static final Set COMPRESSED_CACHES = new HashSet<>();
+protected static final Set COMPRESSED_CACHES = new HashSet<>();
static {
COMPRESSED_CACHES.add("cache1");
@@ -111,6 +117,7 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
IgniteConfiguration config =
super.getConfiguration(igniteInstanceName);
config.getDataStorageConfiguration().setPageSize(PAGE_SIZE);
+config.setWorkDirectory(workingDirectory(config).toString());
return config;
}
@@ -125,8 +132,12 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
/** {@inheritDoc} */
@Before
-@Override public void beforeTestSnapshot() {
+@Override public void beforeTestSnapshot() throws Exception {
+assertTrue(G.allGrids().isEmpty());
+
locEvts.clear();
+
+cleanPersistenceDir(true);
}
/** {@inheritDoc} */
@@ -135,29 +146,47 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
if (G.allGrids().isEmpty())
return;
-IgniteEx ig = grid(0);
-for (String cacheName : ig.cacheNames()) {
-IgniteCache cache = ig.cache(cacheName);
-
-cache.destroy();
-}
+stopAllGrids();
+}
+/** {@inheritDoc} */
+@Override public void afterTestsStopped() throws Exception {
stopAllGrids();
+
+cleanPersistenceDir();
}
/** */
@Test
public void testRestoreFullSnapshot() throws Exception {
-IgniteEx ignite = startGrids(3);
+testRestoreFullSnapshot(DFLT_GRIDS_CNT);
+}
+
+/** */
+@Test
+public void testR
[ignite] branch master updated: IGNITE-18460 [ducktests] Bump python packages and LATEST ignite versions (#10460)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 4ef3889eb8a IGNITE-18460 [ducktests] Bump python packages and LATEST
ignite versions (#10460)
4ef3889eb8a is described below
commit 4ef3889eb8a1171640526c64fc2d0592ada281e5
Author: Sergey Korotkov
AuthorDate: Wed Dec 28 19:33:11 2022 +0700
IGNITE-18460 [ducktests] Bump python packages and LATEST ignite versions
(#10460)
---
modules/ducktests/tests/docker/Dockerfile | 2 +-
modules/ducktests/tests/docker/requirements-dev.txt | 2 +-
modules/ducktests/tests/docker/requirements.txt | 2 +-
modules/ducktests/tests/ignitetest/utils/version.py | 6 +-
modules/ducktests/tests/setup.py| 4 ++--
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index c081432e143..22007352f50 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/tests/docker/Dockerfile
@@ -49,7 +49,7 @@ ARG APACHE_MIRROR="https://apache-mirror.rbc.ru/pub/apache/;
ARG APACHE_ARCHIVE="https://archive.apache.org/dist/;
# Install binary test dependencies.
-RUN for v in "2.7.6" "2.8.0" "2.8.1" "2.9.0" "2.9.1" "2.10.0" "2.11.0"
"2.11.1" "2.12.0" "2.13.0"; \
+RUN for v in "2.7.6" "2.8.0" "2.8.1" "2.9.0" "2.9.1" "2.10.0" "2.11.0"
"2.11.1" "2.12.0" "2.13.0" "2.14.0"; \
do cd /opt; \
curl -O $APACHE_ARCHIVE/ignite/$v/apache-ignite-$v-bin.zip;\
unzip apache-ignite-$v-bin.zip && mv /opt/apache-ignite-$v-bin
/opt/ignite-$v;\
diff --git a/modules/ducktests/tests/docker/requirements-dev.txt
b/modules/ducktests/tests/docker/requirements-dev.txt
index dbb5439398c..08626a4b106 100644
--- a/modules/ducktests/tests/docker/requirements-dev.txt
+++ b/modules/ducktests/tests/docker/requirements-dev.txt
@@ -14,5 +14,5 @@
# limitations under the License.
-r requirements.txt
-pytest==6.0.1
+pytest==6.2.5
flake8==3.8.3
diff --git a/modules/ducktests/tests/docker/requirements.txt
b/modules/ducktests/tests/docker/requirements.txt
index bfd01260009..deec8ffed59 100644
--- a/modules/ducktests/tests/docker/requirements.txt
+++ b/modules/ducktests/tests/docker/requirements.txt
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ducktape==0.8.2
+ducktape==0.11.1
diff --git a/modules/ducktests/tests/ignitetest/utils/version.py
b/modules/ducktests/tests/ignitetest/utils/version.py
index 92a10caceaa..4f15980b174 100644
--- a/modules/ducktests/tests/ignitetest/utils/version.py
+++ b/modules/ducktests/tests/ignitetest/utils/version.py
@@ -104,7 +104,11 @@ LATEST_2_12 = V_2_12_0
V_2_13_0 = IgniteVersion("2.13.0")
LATEST_2_13 = V_2_13_0
+# 2.14.x versions
+V_2_14_0 = IgniteVersion("2.14.0")
+LATEST_2_14 = V_2_14_0
+
# if you updated the LATEST version
# please check DEV version in 'tests/ignitetest/__init__.py'
-LATEST = LATEST_2_13
+LATEST = LATEST_2_14
OLDEST = V_2_7_6
diff --git a/modules/ducktests/tests/setup.py b/modules/ducktests/tests/setup.py
index efb5b039767..5e4ac2f9846 100644
--- a/modules/ducktests/tests/setup.py
+++ b/modules/ducktests/tests/setup.py
@@ -30,5 +30,5 @@ setup(name="ignitetest",
license="apache2.0",
packages=find_packages(exclude=["ignitetest.tests",
"ignitetest.tests.*"]),
include_package_data=True,
- install_requires=["ducktape==0.8.2"],
- tests_require=["pytest==6.0.1"])
+ install_requires=open('docker/requirements.txt').read(),
+ tests_require=["pytest==6.2.5"])
[ignite] branch master updated: IGNITE-18459 [ducktests] Run extra setup script on all docker nodes (#10461)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 23e55d3d205 IGNITE-18459 [ducktests] Run extra setup script on all
docker nodes (#10461)
23e55d3d205 is described below
commit 23e55d3d205e691955942d6a463732ad16cd26b9
Author: Sergey Korotkov
AuthorDate: Wed Dec 28 19:31:36 2022 +0700
IGNITE-18459 [ducktests] Run extra setup script on all docker nodes (#10461)
---
modules/ducktests/tests/docker/ducker-ignite | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/modules/ducktests/tests/docker/ducker-ignite
b/modules/ducktests/tests/docker/ducker-ignite
index 14d472c3d59..4b8b589c6f6 100755
--- a/modules/ducktests/tests/docker/ducker-ignite
+++ b/modules/ducktests/tests/docker/ducker-ignite
@@ -232,6 +232,14 @@ ask_yes_no() {
done
}
+# Wait for all the background jobs
+wait_jobs() {
+ for job in `jobs -p`
+ do
+wait $job
+ done
+}
+
# Build a docker image.
#
# $1: The docker build context
@@ -487,7 +495,11 @@ ducker_test() {
must_popd
if [[ -n "${DUCKTAPE_EXTRA_SETUP}" ]]; then
echo "executing extra ducktape setup with '${DUCKTAPE_EXTRA_SETUP}'"
-docker exec --user=root ducker01 bash -c "${DUCKTAPE_EXTRA_SETUP}"
+local nodes=$(echo_running_container_names)
+for node in ${nodes}; do
+ docker exec --user=root ${node} bash -c "${DUCKTAPE_EXTRA_SETUP}" &
+done
+wait_jobs
[[ $? -ne 0 ]] && die "failed to execute extra ducktape setup."
fi
cmd="cd /opt/ignite-dev && ducktape --cluster-file
/opt/ignite-dev/modules/ducktests/tests/docker/build/cluster.json $args"
[ignite] branch master updated: IGNITE-18198 Implement snapshots of caches with disk page compression. (#10430)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 8cfa8b046a1 IGNITE-18198 Implement snapshots of caches with disk page
compression. (#10430)
8cfa8b046a1 is described below
commit 8cfa8b046a1b4782ebca75a506247d4331f89e3c
Author: Ivan Daschinskiy
AuthorDate: Fri Dec 23 14:07:36 2022 +0300
IGNITE-18198 Implement snapshots of caches with disk page compression.
(#10430)
---
modules/compress/pom.xml | 14 +
.../compress/CompressionProcessorImpl.java | 34 ++
.../snapshot/SnapshotCompressionBasicTest.java | 385 +
.../DiskPageCompressionIntegrationTest.java| 2 +
.../testsuites/IgnitePdsCompressionTestSuite.java | 12 +
.../processors/cache/CacheCompressionManager.java | 102 --
.../processors/cache/CacheGroupContext.java| 15 +-
.../processors/cache/GridCacheContext.java | 14 -
.../processors/cache/GridCacheProcessor.java | 16 +-
.../CachePartitionDefragmentationManager.java | 3 +-
.../pagemem/PageReadWriteManagerImpl.java | 9 +-
.../snapshot/IgniteSnapshotManager.java| 47 ++-
.../persistence/snapshot/SnapshotFutureTask.java | 21 +-
.../persistence/snapshot/SnapshotMetadata.java | 35 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 67 +++-
.../snapshot/SnapshotRestoreProcess.java | 23 ++
.../wal/reader/StandaloneGridKernalContext.java| 26 +-
.../processors/cache/verify/IdleVerifyUtility.java | 23 ++
.../processors/compress/CompressionHandler.java| 130 +++
.../snapshot/AbstractSnapshotSelfTest.java | 20 +-
.../snapshot/IgniteClusterSnapshotCheckTest.java | 31 +-
.../snapshot/IgniteClusterSnapshotDeltaTest.java | 8 +-
.../snapshot/IgniteSnapshotManagerSelfTest.java| 5 +-
.../IgniteSnapshotWithMetastorageTest.java | 6 +-
.../loadtests/hashmap/GridCacheTestContext.java| 2 -
.../junits/multijvm/JavaVersionCommandParser.java | 4 +-
.../multijvm/JavaVersionCommandParserTest.java | 6 +
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 52 ++-
.../IgniteSnapshotWithIndexingTestSuite.java | 30 +-
29 files changed, 960 insertions(+), 182 deletions(-)
diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml
index 67ac1da1c0d..f9c4db51f42 100644
--- a/modules/compress/pom.xml
+++ b/modules/compress/pom.xml
@@ -117,6 +117,20 @@
${mockito.version}
test
+
+
+org.hamcrest
+hamcrest
+${hamcrest.version}
+test
+
+
+
+com.google.guava
+guava
+${guava.version}
+test
+
diff --git
a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
index 6d53e0ef016..623ff50ee3d 100644
---
a/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
+++
b/modules/compress/src/main/java/org/apache/ignite/internal/processors/compress/CompressionProcessorImpl.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.compress;
+import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Path;
@@ -29,12 +30,15 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.configuration.DiskPageCompression;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.pagemem.PageUtils;
+import
org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.CompactablePageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.xerial.snappy.Snappy;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
import static
org.apache.ignite.configuration.DataStorageConfiguration.MAX_PAGE_SIZE;
import static org.apache.ignite.configuration.DiskPageCompression.SKIP_GARBAGE;
import static org.apache.ignite.internal.util.GridUnsafe.NATIVE_BYTE_ORDER;
@@ -90,6 +94,8 @@ public class CompressionProcessorImpl extends
CompressionProcessor {
"must be at least 2 times larger than the underlying storage
block size (detected to be " + fsBlockSize +
" bytes at '" + storagePath + "') for page compression.");
}
+
+checkPunc
[ignite] branch master updated: IGNITE-18303 Calcite: Fix nanoseconds flakiness in LocalDateTimeSupportTest. Speed up this test. (#10413)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 ec7d4ed65df IGNITE-18303 Calcite: Fix nanoseconds flakiness in
LocalDateTimeSupportTest. Speed up this test. (#10413)
ec7d4ed65df is described below
commit ec7d4ed65df78e06ef8e9bcc90914d96124e88e0
Author: Ivan Daschinskiy
AuthorDate: Thu Dec 1 15:14:53 2022 +0300
IGNITE-18303 Calcite: Fix nanoseconds flakiness in
LocalDateTimeSupportTest. Speed up this test. (#10413)
---
.../integration/LocalDateTimeSupportTest.java | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/LocalDateTimeSupportTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/LocalDateTimeSupportTest.java
index 2b10ea90388..6bda9cf2075 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/LocalDateTimeSupportTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/LocalDateTimeSupportTest.java
@@ -23,15 +23,19 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.function.Function;
+import org.apache.ignite.Ignite;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.util.typedef.G;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -185,18 +189,14 @@ public class LocalDateTimeSupportTest extends
AbstractBasicIntegrationTest {
}
/** {@inheritDoc} */
-@Override public void beforeTest() throws Exception {
-if (!G.allGrids().isEmpty())
-return;
-
-startGrids(nodeCount());
+@Override protected void afterTest() throws Exception {
+super.afterTest();
-client = startClientGrid("client");
-}
+for (Ignite ig: G.allGrids()) {
+IgniteCacheObjectProcessor objProc =
((IgniteEx)ig).context().cacheObjects();
-/** {@inheritDoc} */
-@Override protected void afterTest() throws Exception {
-stopAllGrids();
+objProc.removeType(objProc.typeId(Data.class.getName()));
+}
}
/** */
@@ -249,9 +249,9 @@ public class LocalDateTimeSupportTest extends
AbstractBasicIntegrationTest {
LocalDateTime oldDateTime = LocalDateTime.of(1042, Month.APRIL, 1, 12,
45, 0);
LocalDate oldDate = LocalDate.of(1042, Month.APRIL, 1);
if (cls == LocalDateTime.class)
-return isOldDate ? oldDateTime : LocalDateTime.now();
+return isOldDate ? oldDateTime :
LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS);
else if (cls == LocalTime.class)
-return LocalTime.now();
+return LocalTime.now().truncatedTo(ChronoUnit.MILLIS);
else if (cls == LocalDate.class)
return isOldDate ? oldDate : LocalDate.now();
else if (cls == Date.class)
@@ -260,8 +260,10 @@ public class LocalDateTimeSupportTest extends
AbstractBasicIntegrationTest {
return isOldDate ? java.sql.Date.valueOf(oldDate) :
java.sql.Date.valueOf(LocalDate.now());
else if (cls == java.sql.Time.class)
return java.sql.Time.valueOf(LocalTime.now());
-else if (cls == java.sql.Timestamp.class)
-return isOldDate ? convertToTimestamp(oldDateTime) :
java.sql.Timestamp.valueOf(LocalDateTime.now());
+else if (cls == java.sql.Timestamp.class) {
+return isOldDate ? convertToTimestamp(oldDateTime)
+:
java.sql.Timestamp.valueOf(LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS));
+}
else
throw new IllegalStateException();
}
[ignite] branch master updated: IGNITE-17599 SQL Calcite: Support insertion of LocalDateTime, LocalDate and LocalTime (#10399)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 b7b53690410 IGNITE-17599 SQL Calcite: Support insertion of
LocalDateTime, LocalDate and LocalTime (#10399)
b7b53690410 is described below
commit b7b53690410ec72a23fbc28a31e08fd21f881e80
Author: Ivan Daschinskiy
AuthorDate: Tue Nov 29 21:11:32 2022 +0300
IGNITE-17599 SQL Calcite: Support insertion of LocalDateTime, LocalDate and
LocalTime (#10399)
* IGNITE-17599 SQL Calcite: Support insertion of LocalDateTime, LocalDate
and LocalTime
* Review fixes
* Add additional tests.
---
.../query/calcite/externalize/RelJsonReader.java | 3 +
.../query/calcite/type/IgniteTypeFactory.java | 11 +-
.../processors/query/calcite/util/TypeUtils.java | 50 +++-
.../integration/LocalDateTimeSupportTest.java | 288 +
.../ignite/testsuites/IntegrationTestSuite.java| 2 +
.../processors/query/GridQueryIndexing.java| 13 -
.../processors/query/QueryTypeDescriptorImpl.java | 11 +-
.../internal/processors/query/QueryUtils.java | 18 +-
.../processors/query/DummyQueryIndexing.java | 5 -
.../internal/processors/query/h2/H2Utils.java | 40 ---
.../processors/query/h2/IgniteH2Indexing.java | 17 --
.../h2/H2ColumnTypeConversionCheckSelfTest.java| 57
.../IgniteBinaryCacheQueryTestSuite3.java | 2 -
13 files changed, 369 insertions(+), 148 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java
index 522ec373125..d740af19174 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java
@@ -243,6 +243,9 @@ public class RelJsonReader {
/** {@inheritDoc} */
@Override public List getExpressionList(String tag) {
List jsonNodes = (List)jsonRel.get(tag);
+if (jsonNodes == null)
+return null;
+
List nodes = new ArrayList<>();
for (Object jsonNode : jsonNodes)
nodes.add(relJson.toRex(this, jsonNode));
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/type/IgniteTypeFactory.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/type/IgniteTypeFactory.java
index 94c9cd6f96a..d2ca9a6b3ca 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/type/IgniteTypeFactory.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/type/IgniteTypeFactory.java
@@ -23,6 +23,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.sql.Timestamp;
import java.time.Duration;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Period;
@@ -40,6 +41,7 @@ import org.apache.calcite.sql.SqlUtil;
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.calcite.sql.type.BasicSqlType;
import org.apache.calcite.sql.type.IntervalSqlType;
+import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.ignite.internal.util.typedef.F;
/**
@@ -265,6 +267,12 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl
{
return
createTypeWithNullability(createSqlIntervalType(INTERVAL_QUALIFIER_DAY_TIME),
true);
else if (clazz == Period.class)
return
createTypeWithNullability(createSqlIntervalType(INTERVAL_QUALIFIER_YEAR_MONTH),
true);
+else if (clazz == LocalDateTime.class)
+return
createTypeWithNullability(createSqlType(SqlTypeName.TIMESTAMP), true);
+else if (clazz == LocalDate.class)
+return
createTypeWithNullability(createSqlType(SqlTypeName.DATE), true);
+else if (clazz == LocalTime.class)
+return
createTypeWithNullability(createSqlType(SqlTypeName.TIME), true);
else {
RelDataType relType = createCustomType(clazz);
@@ -301,7 +309,8 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl {
/** {@inheritDoc} */
@Override public RelDataType createType(Type type) {
-if (type == Duration.class || type == Period.class)
+if (type == Duration.class || type == Period.class || type ==
LocalDateTime.class || type == LocalTime.class
+|| type == LocalDate.class)
return createJavaType((Class)type);
RelDa
svn commit: r58037 - /release/ignite/pyignite/0.5.2/
Author: ivandasch Date: Tue Nov 15 19:36:13 2022 New Revision: 58037 Log: Archiving release pyignite 0.5.2 Removed: release/ignite/pyignite/0.5.2/
[ignite-python-thin-client] branch master updated: Add release notes for 0.6.0
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git The following commit(s) were added to refs/heads/master by this push: new ae5ced4 Add release notes for 0.6.0 ae5ced4 is described below commit ae5ced415c0048187d5d0a68267f76e16069daf1 Author: Ivan Daschinsky AuthorDate: Tue Nov 15 19:46:10 2022 +0300 Add release notes for 0.6.0 --- README.md | 2 +- RELEASE_NOTES.txt | 9 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index de66c3f..e755498 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ There is an optional C extension to speedup some computational intensive tasks. - For building `wheels` for Windows, invoke script `.\scripts\BuildWheels.ps1` using PowerShell. Just make sure that your execution policy allows execution of scripts in your environment. - Ready wheels for `x86` and `x86-64` for different python versions (3.7, 3.8, 3.9, 3.10 and 3.11) will be + Ready wheels for `x86` and `x86-64` for different python versions (3.7, 3.8, 3.9 and 3.10) will be located in `distr` directory. ### Updating from older version diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index a67624a..82c9f05 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,15 @@ Apache Ignite python thin client +0.6.0 + +* Added support of python 3.11 +* Dropped support of python 3.6 +* Fixed non-intuitive automatically setting of flag use_ssl when the authentication is enabled. +* Added timeout support for cache operations in the async client. +* Fixed incorrect result setting of already completed futures in async connection implementation. +* Fixed examples and documentation. + 0.5.2 * Fixed incorrect partial read from socket in sync client
svn commit: r58035 - /dev/ignite/pyignite/0.6.0.rc1/
Author: ivandasch Date: Tue Nov 15 16:37:21 2022 New Revision: 58035 Log: Remove voting binaries for pyignite-0.6.0 RC1 Removed: dev/ignite/pyignite/0.6.0.rc1/
[ignite-python-thin-client] annotated tag 0.6.0 updated (995bda8 -> b762c91)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to annotated tag 0.6.0 in repository https://gitbox.apache.org/repos/asf/ignite-python-thin-client.git *** WARNING: tag 0.6.0 was modified! *** from 995bda8 (commit) to b762c91 (tag) tagging 995bda81780402116e89d76523949da88136f260 (commit) replaces 0.3.4 by Ivan Daschinsky on Tue Nov 15 19:35:16 2022 +0300 - Log - 0.6.0 --- No new revisions were added by this update. Summary of changes:
svn commit: r58034 - /release/ignite/pyignite/0.6.0/
Author: ivandasch Date: Tue Nov 15 16:34:15 2022 New Revision: 58034 Log: Release pyignite 0.6.0 Added: release/ignite/pyignite/0.6.0/ release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-win_amd64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-win_amd64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp310-cp310-win_amd64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-win_amd64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-win_amd64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp311-cp311-win_amd64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-macosx_10_9_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-macosx_10_9_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_i686.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_i686.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_i686.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_x86_64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-musllinux_1_1_x86_64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-win_amd64.whl (with props) release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-win_amd64.whl.asc release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp37-cp37m-win_amd64.whl.sha512 release/ignite/pyignite/0.6.0/pyignite-0.6.0-cp38-cp38-macosx_10_9_x86_64.whl (with props) release/ignite/pyignite/0.6.0/pyignite
[ignite] branch master updated: IGNITE-18154 Migrate PR checks to GitHub Actions (#10380)
This is an automated email from the ASF dual-hosted git repository.
ivandasch 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 b7656c8246d IGNITE-18154 Migrate PR checks to GitHub Actions (#10380)
b7656c8246d is described below
commit b7656c8246d0101f6ebdfc108f64bd39e6a4d67f
Author: Ivan Daschinskiy
AuthorDate: Tue Nov 15 13:53:12 2022 +0300
IGNITE-18154 Migrate PR checks to GitHub Actions (#10380)
---
.github/workflows/commit-check.yml | 106 +
.travis.yml| 92
2 files changed, 106 insertions(+), 92 deletions(-)
diff --git a/.github/workflows/commit-check.yml
b/.github/workflows/commit-check.yml
new file mode 100644
index 000..99dacd15f18
--- /dev/null
+++ b/.github/workflows/commit-check.yml
@@ -0,0 +1,106 @@
+# 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.
+
+name: Check code style and abandoned tests.
+on:
+ pull_request:
+ push:
+branches:
+ - master
+ - 'ignite-[0-9].[0-9]+.[0-9]+*'
+
+jobs:
+ check-java:
+runs-on: ubuntu-latest
+strategy:
+ fail-fast: false
+ matrix:
+java: [ '8', '11' ]
+name: Check java code on JDK ${{ matrix.java }}
+steps:
+ - uses: actions/checkout@v3
+
+ - name: Setup java
+uses: actions/setup-java@v3
+with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+
+ - name: Install prerequisites
+run: |
+ sudo apt-get update && sudo apt-get install libnuma-dev
+
+ - name: Set MAVEN_OPTS
+if: ${{ matrix.java == '11' }}
+run: |
+ echo MAVEN_OPTS='--illegal-access=permit
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
+
--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
+ -Djdk.tls.client.protocols=TLSv1.2' >> $GITHUB_ENV
+
+ - name: Run codestyle and licenses checks
+run: |
+ mvn test-compile
-Pall-java,licenses,lgpl,checkstyle,examples,all-scala,scala,check-licenses -B
-V
+
+ - name: Run abandoned tests checks.
+if: ${{ matrix.java == '8' }}
+run : |
+ mvn test -Pcheck-test-suites,all-java,all-scala,scala -B -V
+
+
+ check-dotnet:
+name: Сheck .NET code
+runs-on: ubuntu-latest
+steps:
+ - uses: actions/checkout@v3
+
+ - name: Setup .NET SDK
+uses: actions/setup-dotnet@v3
+with:
+ dotnet-version: '6.0.x'
+
+ - name: Run checks
+run: |
+ dotnet build modules/platforms/dotnet/Apache.Ignite.DotNetCore.sln
+
+
+ check-ducktape:
+name: Check ducktape on ${{ matrix.cfg.toxenv }}
+runs-on: ubuntu-latest
+strategy:
+ fail-fast: false
+ matrix:
+cfg:
+ - { python: "3.7", toxenv: "py37" }
+ - { python: "3.8", toxenv: "py38" }
+ - { python: "3.8", toxenv: "codestyle" }
+steps:
+ - uses: actions/checkout@v3
+
+ - name: Set up Python ${{ matrix.python-version }}
+uses: actions/setup-python@v4
+with:
+ python-version: ${{ matrix.cfg.python}}
+
+ - name: Install tox
+run: |
+ pip install tox
+
+ - name: Run tests
+run: |
+ cd modules/ducktests/tests
+ tox -e ${{ matrix.cfg.toxenv }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8d023c52af1..000
--- a/.travis.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
[ignite] branch ignite-18154 updated (6a188341c03 -> a47dcfcfcdb)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-18154 in repository https://gitbox.apache.org/repos/asf/ignite.git from 6a188341c03 IGNITE-18154 Migrate PR checks to GitHub Actions add a47dcfcfcdb IGNITE-18154 Review: fix formatting No new revisions were added by this update. Summary of changes: .github/workflows/commit-check.yml | 8 1 file changed, 8 insertions(+)
[ignite] branch ignite-18154 updated (2462619cef5 -> 6a188341c03)
This is an automated email from the ASF dual-hosted git repository. ivandasch pushed a change to branch ignite-18154 in repository https://gitbox.apache.org/repos/asf/ignite.git omit 2462619cef5 IGNITE-18154 Migrate PR checks to GitHub Actions add 6a188341c03 IGNITE-18154 Migrate PR checks to GitHub Actions 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 (2462619cef5) \ N -- N -- N refs/heads/ignite-18154 (6a188341c03) 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: .travis.yml | 92 - 1 file changed, 92 deletions(-) delete mode 100644 .travis.yml
