[ignite] branch master updated: IGNITE-13450 Add event fired before SQL query execution (#8252)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 21e5ba5 IGNITE-13450 Add event fired before SQL query execution
(#8252)
21e5ba5 is described below
commit 21e5ba57db948c0d522f2066e66650c46185e7f3
Author: Дмитрий Рябов
AuthorDate: Tue Nov 24 10:00:40 2020 +0300
IGNITE-13450 Add event fired before SQL query execution (#8252)
Co-authored-by: Nikolay
---
.../java/org/apache/ignite/events/EventType.java | 10 ++
.../ignite/events/SqlQueryExecutionEvent.java | 138 +
.../processors/query/h2/IgniteH2Indexing.java | 24 +++-
.../metric/SqlStatisticsUserQueriesFastTest.java | 1 +
.../metric/SqlStatisticsUserQueriesLongTest.java | 4 +-
.../internal/metric/UserQueriesTestBase.java | 58 -
.../cache/IgniteCacheAbstractQuerySelfTest.java| 71 +--
7 files changed, 287 insertions(+), 19 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index db1a88e..a51c25f 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -923,6 +923,16 @@ public interface EventType {
public static final int EVT_CLUSTER_SNAPSHOT_FAILED = 151;
/**
+ * Built-in event type: query execution.
+ *
+ * NOTE: all types in range from 1 to 1000 are reserved for
+ * internal Ignite events and should not be used by user-defined events.
+ *
+ * @see SqlQueryExecutionEvent
+ */
+public static final int EVT_SQL_QUERY_EXECUTION = 160;
+
+/**
* All cluster snapshot events. This array can be directly passed into
* {@link IgniteEvents#localListen(IgnitePredicate, int...)} method to
* subscribe to all cluster snapshot events.
diff --git
a/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
b/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
new file mode 100644
index 000..0541dd8
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
@@ -0,0 +1,138 @@
+/*
+ * 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.events;
+
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.events.EventType.EVT_SQL_QUERY_EXECUTION;
+
+/**
+ * Query execution event.
+ *
+ * Grid events are used for notification about what happens within the grid.
Note that by
+ * design Ignite keeps all events generated on the local node locally and it
provides
+ * APIs for performing a distributed queries across multiple nodes:
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate,
long, int...)} -
+ * asynchronously querying events occurred on the nodes specified,
including remote nodes.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * querying only local events stored on this local node.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * listening to local grid events (events from remote nodes not
included).
+ *
+ *
+ * User can also wait for events using method {@link
org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate,
int...)}.
+ * Events and Performance
+ * Note that by default all events in Ignite are enabled and therefore
generated and stored
+ * by whatever event storage SPI is configured. Ignite can and often does
generate thousands events per
[ignite-3] branch main updated: Initial Maven structure
This is an automated email from the ASF dual-hosted git repository. vkulichenko pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/main by this push: new f5062a6 Initial Maven structure f5062a6 is described below commit f5062a679403d2e7819e3a7faf564d42ea2ee010 Author: Valentin Kulichenko AuthorDate: Mon Nov 23 15:10:47 2020 -0800 Initial Maven structure --- .gitignore | 3 +++ pom.xml| 40 2 files changed, 43 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29..5231862 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea +*.iml +target diff --git a/pom.xml b/pom.xml new file mode 100644 index 000..9a8c2ed --- /dev/null +++ b/pom.xml @@ -0,0 +1,40 @@ + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + +org.apache +apache +16 + + +org.apache.ignite +apache-ignite +3.0.0-SNAPSHOT +pom + +Java-based middleware for in-memory processing of big data in a distributed environment. + + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt + + + + +1.8 +1.8 + + + + +org.junit.jupiter +junit-jupiter-engine +5.6.2 +test + + +
[ignite-3] branch main created (now 736d0d0)
This is an automated email from the ASF dual-hosted git repository. vkulichenko pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git. at 736d0d0 Ignite 3 initial commit This branch includes the following new commits: new 736d0d0 Ignite 3 initial commit 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-3] 01/01: Ignite 3 initial commit
This is an automated email from the ASF dual-hosted git repository. vkulichenko pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git commit 736d0d0f692e27ec45727665831400792b426e1c Author: Valentin Kulichenko AuthorDate: Mon Nov 23 13:46:02 2020 -0800 Ignite 3 initial commit --- .gitignore | 0 LICENSE| 251 + README.md | 1 + 3 files changed, 252 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..e69de29 diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..8ab6fe6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,251 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell,
[ignite-extensions] annotated tag ignite-mqtt-ext-1.0.0-rc1 created (now ce071fb)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-mqtt-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at ce071fb (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-mqtt-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-camel-ext-1.0.0-rc1 created (now 57ca12b)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-camel-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 57ca12b (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-camel-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-flume-ext-1.0.0-rc1 created (now aa2c59e)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flume-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at aa2c59e (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-flume-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-zeromq-ext-1.0.0-rc1 created (now 4a63143)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-zeromq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 4a63143 (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-zeromq-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-twitter-ext-1.0.0-rc1 created (now 9fa9446)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-twitter-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 9fa9446 (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-twitter-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-kafka-ext-1.0.0-rc1 created (now a4e6ad3)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-kafka-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at a4e6ad3 (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-kafka-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-storm-ext-1.0.0-rc1 created (now acd7ffd)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-storm-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at acd7ffd (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-storm-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-rocketmq-ext-1.0.0-rc1 created (now c04faf7)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-rocketmq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at c04faf7 (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-rocketmq-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-jms11-ext-1.0.0-rc1 created (now ed555c2)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-jms11-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at ed555c2 (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-jms11-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-flink-ext-1.0.0-rc1 created (now ebb68db)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flink-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at ebb68db (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-flink-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-pub-sub-ext-1.0.0-rc1 created (now 65d68ad)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-pub-sub-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 65d68ad (tag) tagging 3f45b3e32d617b652e08af614a90aad6b9ff945d (commit) by Alexey Goncharuk on Mon Nov 23 16:03:35 2020 +0300 - Log - Releasing ignite-pub-sub-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] branch streaming-all-ext-1.0.0 updated: IGNITE-13745 Streaming extensions release notes
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a commit to branch streaming-all-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git The following commit(s) were added to refs/heads/streaming-all-ext-1.0.0 by this push: new 3f45b3e IGNITE-13745 Streaming extensions release notes 3f45b3e is described below commit 3f45b3e32d617b652e08af614a90aad6b9ff945d Author: Alexey Goncharuk AuthorDate: Mon Nov 23 14:58:28 2020 +0300 IGNITE-13745 Streaming extensions release notes --- RELEASE_NOTES.txt | 16 1 file changed, 16 insertions(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index e691735..8451780 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,22 @@ Apache Ignite Extensions Release Notes === +Apache Ignite Streamer Extension Modules 1.0 +- +The following integrations were migrated the Apache Ignite Extensions repository: +* Camel integration extension +* Flink integration extension +* Flume integration extension +* JMS integration extension +* Kafka integration extension +* MQTT integration extension +* Pub/Sub integration extension +* RocketMQ integration extension +* Storm integration extension +* Twitter integration extension +* ZeroMQ integration extension + + Apache Ignite Spring Boot Modules 1.0 -
[ignite-extensions] branch master updated: IGNITE-13745 Streaming extensions release notes
This is an automated email from the ASF dual-hosted git repository. agoncharuk 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 74bc337 IGNITE-13745 Streaming extensions release notes 74bc337 is described below commit 74bc3371b2e6aeae7a02ffad18040a804e7e4242 Author: Alexey Goncharuk AuthorDate: Mon Nov 23 14:58:28 2020 +0300 IGNITE-13745 Streaming extensions release notes --- RELEASE_NOTES.txt | 16 1 file changed, 16 insertions(+) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index e691735..8451780 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,22 @@ Apache Ignite Extensions Release Notes === +Apache Ignite Streamer Extension Modules 1.0 +- +The following integrations were migrated the Apache Ignite Extensions repository: +* Camel integration extension +* Flink integration extension +* Flume integration extension +* JMS integration extension +* Kafka integration extension +* MQTT integration extension +* Pub/Sub integration extension +* RocketMQ integration extension +* Storm integration extension +* Twitter integration extension +* ZeroMQ integration extension + + Apache Ignite Spring Boot Modules 1.0 -
[ignite] branch master updated: IGNITE-13724 Fix checkstyle config for dymanic source directories in ignite-examples (#8482)
This is an automated email from the ASF dual-hosted git repository.
mmuzaf 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 c508f3b IGNITE-13724 Fix checkstyle config for dymanic source
directories in ignite-examples (#8482)
c508f3b is described below
commit c508f3b101d23760ff10cc664fb6de4cb4b5de8b
Author: Maxim Muzafarov
AuthorDate: Mon Nov 23 13:59:04 2020 +0300
IGNITE-13724 Fix checkstyle config for dymanic source directories in
ignite-examples (#8482)
---
examples/pom.xml | 35 ++
parent/pom.xml | 76 +++-
2 files changed, 82 insertions(+), 29 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 388a78a..08fe50a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -248,6 +248,16 @@
net.alchim31.maven
scala-maven-plugin
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+
+
+
${spark.folder}
+
${spark.test.folder}
+
+
+
@@ -279,6 +289,21 @@
${project.version}
+
+
+
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+
+
+
${lgpl.folder}
+
${lgpl.test.folder}
+
+
+
+
+
spark-2.4
@@ -321,6 +346,16 @@
net.alchim31.maven
scala-maven-plugin
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+
+
+
${spark.folder}
+
${spark.test.folder}
+
+
+
diff --git a/parent/pom.xml b/parent/pom.xml
index 4291bec..ab52dbb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,7 +107,7 @@
1.5.0
3.5.0
3.1.1
-8.35
+8.37
3.4.6
8.0.13
1.1.2
@@ -227,6 +227,35 @@
+org.apache.maven.plugins
+maven-checkstyle-plugin
+${maven.checkstyle.plugin.version}
+
+true
+
+
${project.build.sourceDirectory}
+
${project.build.testSourceDirectory}
+
+true
+true
+true
+true
+
${project.build.directory}/checkstyle-result.xml
+
../checkstyle/checkstyle.xml
+
../checkstyle/checkstyle-suppressions.xml
+
true
+**/generated/**/*
+
+
+
+com.puppycrawl.tools
+checkstyle
+${checkstyle.puppycrawl.version}
+
+
+
+
+
net.alchim31.maven
scala-maven-plugin
3.3.2
@@ -736,6 +765,20 @@
+
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+
+
+style
+
+check
+
+validate
+
+
+
@@ -747,34 +790,9 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-${maven.checkstyle.plugin.version}
-
-
-style
-
-check
-
-validate
-
-
[ignite] 02/02: Create key/value objects using default constructor.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 4fdc019a2dc2ecd4ab406260dc8b0ee2e015d631
Author: Andrew Mashenkov
AuthorDate: Mon Nov 23 13:38:16 2020 +0300
Create key/value objects using default constructor.
---
.../generator/JaninoSerializerGenerator.java | 30 +-
.../generator/MarshallerExprGenerator.java | 25 --
.../ignite/internal/util/IgniteUnsafeUtils.java| 11
.../apache/ignite/internal/util/ObjectFactory.java | 29 -
.../benchmarks/SerializerBenchmarkTest.java| 20 +++
.../schema/marshaller/JavaSerializerTest.java | 16 +++-
6 files changed, 66 insertions(+), 65 deletions(-)
diff --git
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/JaninoSerializerGenerator.java
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/JaninoSerializerGenerator.java
index def510a..654bf97 100644
---
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/JaninoSerializerGenerator.java
+++
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/JaninoSerializerGenerator.java
@@ -121,28 +121,34 @@ public class JaninoSerializerGenerator implements
SerializerFactory {
"org.apache.ignite.internal.schema.SchemaDescriptor",
"org.apache.ignite.internal.schema.Tuple",
"org.apache.ignite.internal.schema.TupleAssembler",
-"org.apache.ignite.internal.util.IgniteUnsafeUtils"
+"org.apache.ignite.internal.util.IgniteUnsafeUtils",
+"org.apache.ignite.internal.util.ObjectFactory"
);
+// Build field accessor generators.
+final MarshallerExprGenerator keyMarsh =
createObjectMarshaller(keyClass, "keyFactory", schema.keyColumns(), 0);
+final MarshallerExprGenerator valMarsh =
createObjectMarshaller(valClass, "valFactory", schema.valueColumns(),
schema.keyColumns().length());
+
// Create buffer.
final StringBuilder sb = new StringBuilder(INITIAL_BUFFER_SIZE);
// Append class fields desctiption.
sb.append("private final SchemaDescriptor schema;" + LF);
-sb.append("private final Class kClass;" + LF);
-sb.append("private final Class vClass;" + LF);
+
+if (!keyMarsh.isSimpleTypeMarshaller())
+sb.append("private final ObjectFactory keyFactory;" + LF);
+if (!valMarsh.isSimpleTypeMarshaller())
+sb.append("private final ObjectFactory valFactory;" + LF);
// Append constructor code.
sb.append(LF + "public ").append(className).append("(SchemaDescriptor
schema, Class kClass, Class vClass) {" + LF);
-sb.append(TAB + "this.kClass = kClass;" + LF);
-sb.append(TAB + "this.vClass = vClass;" + LF);
sb.append(TAB + "this.schema = schema; " + LF);
+if (!keyMarsh.isSimpleTypeMarshaller())
+sb.append(TAB + "keyFactory = new ObjectFactory(kClass);" + LF);
+if (!valMarsh.isSimpleTypeMarshaller())
+sb.append(TAB + "valFactory = new ObjectFactory(vClass);" + LF);
sb.append("}" + LF);
-// Build field accessor generators.
-final MarshallerExprGenerator keyMarsh =
createObjectMarshaller(keyClass, "kClass", schema.keyColumns(), 0);
-final MarshallerExprGenerator valMarsh =
createObjectMarshaller(valClass, "vClass", schema.valueColumns(),
schema.keyColumns().length());
-
// Generate and append helper-methods.
generateTupleFactoryMethod(sb, schema, keyMarsh, valMarsh);
@@ -158,14 +164,14 @@ public class JaninoSerializerGenerator implements
SerializerFactory {
* Creates marshal/unmarshall expressions generator for object.
*
* @param aClass Object class.
- * @param classExpr Instance class expression or {@code null} if not
aplicable.
+ * @param factoryRefExpr Factory reference expression.
* @param columns Columns that aClass mapped to.
* @param firstColIdx First column absolute index in schema.
* @return Marshal/unmarshall expression generator.
*/
private MarshallerExprGenerator createObjectMarshaller(
Class aClass,
-@Nullable String classExpr,
+@Nullable String factoryRefExpr,
Columns columns,
int firstColIdx
) {
@@ -189,7 +195,7 @@ public class JaninoSerializerGenerator implements
SerializerFactory {
throw new IllegalStateException(ex);
}
-return new MarshallerExprGenerator(classExpr, accessors);
+return new MarshallerExprGenerator(factoryRefExpr, accessors);
}
/**
diff --git
[ignite] 01/02: Minor.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 576878ff061d0ee8fff1efaf133963a7c7d3c0f4
Author: Andrew Mashenkov
AuthorDate: Sat Nov 21 02:37:02 2020 +0300
Minor.
---
.../schema/marshaller/SerializerFactory.java| 1 -
.../benchmarks/SerializerBenchmarkTest.java | 21 -
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializerFactory.java
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializerFactory.java
index 8fedf29..d9a8295 100644
---
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializerFactory.java
+++
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializerFactory.java
@@ -38,7 +38,6 @@ public interface SerializerFactory {
*/
public static SerializerFactory createJavaSerializerFactory() {
return new JavaSerializerFactory();
-
}
/**
diff --git
a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
index 2abe9d4..b29def3 100644
---
a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
+++
b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
@@ -17,7 +17,9 @@
package org.apache.ignite.internal.benchmarks;
+import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.schema.Column;
@@ -26,7 +28,6 @@ import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.marshaller.Serializer;
import org.apache.ignite.internal.schema.marshaller.SerializerFactory;
import org.apache.ignite.internal.util.Factory;
-import org.apache.ignite.internal.util.ObjectFactory;
import org.codehaus.commons.compiler.CompilerFactoryFactory;
import org.codehaus.commons.compiler.IClassBodyEvaluator;
import org.openjdk.jmh.annotations.Benchmark;
@@ -54,7 +55,7 @@ import static
org.apache.ignite.internal.schema.NativeType.LONG;
@State(Scope.Benchmark)
@Warmup(time = 10, iterations = 3, timeUnit = TimeUnit.SECONDS)
@Measurement(time = 10, iterations = 5, timeUnit = TimeUnit.SECONDS)
-@BenchmarkMode({Mode.Throughput, Mode.AverageTime, Mode.SingleShotTime})
+@BenchmarkMode({Mode.Throughput, Mode.AverageTime})
@OutputTimeUnit(TimeUnit.MICROSECONDS)
@Fork(1)
public class SerializerBenchmarkTest {
@@ -96,7 +97,18 @@ public class SerializerBenchmarkTest {
rnd = new Random(seed);
final Class valClass = createGeneratedObjectClass(fieldsCount,
Long.TYPE);
-objectFactory = new ObjectFactory<>(valClass);
+//objectFactory = new ObjectFactory<>(valClass);
+final Constructor constr = valClass.getDeclaredConstructor();
+objectFactory = new Factory() {
+@Override public Object create() {
+try {
+return constr.newInstance();
+}
+catch (InstantiationException | IllegalAccessException |
InvocationTargetException e) {
+throw new IllegalStateException("Failed to instantiate
class: " + valClass.getSimpleName(), e);
+}
+}
+};
Columns keyCols = new Columns(new Column("key", LONG, true));
Columns valCols = mapFieldsToColumns(valClass);
@@ -121,9 +133,8 @@ public class SerializerBenchmarkTest {
Object val = objectFactory.create();
byte[] bytes = serializer.serialize(key, val);
-// Try different order.
-Object restoredVal = serializer.deserializeValue(bytes);
Object restoredKey = serializer.deserializeKey(bytes);
+Object restoredVal = serializer.deserializeValue(bytes);
bh.consume(restoredVal);
bh.consume(restoredKey);
[ignite] branch ignite-13618 updated (23b1ceb -> 4fdc019)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-13618 in repository https://gitbox.apache.org/repos/asf/ignite.git. from 23b1ceb Fix styles. Add benchmarks. new 576878f Minor. new 4fdc019 Create key/value objects using default constructor. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../schema/marshaller/SerializerFactory.java | 1 - .../generator/JaninoSerializerGenerator.java | 30 +- .../generator/MarshallerExprGenerator.java | 25 -- .../ignite/internal/util/IgniteUnsafeUtils.java| 11 .../apache/ignite/internal/util/ObjectFactory.java | 29 - .../benchmarks/SerializerBenchmarkTest.java| 9 +++ .../schema/marshaller/JavaSerializerTest.java | 16 +++- 7 files changed, 66 insertions(+), 55 deletions(-)
[ignite-extensions] annotated tag ignite-zeromq-ext-1.0.0-rc1 deleted (was 13f8c9a)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-zeromq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-zeromq-ext-1.0.0-rc1 was deleted! *** tag was 13f8c9a The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-twitter-ext-1.0.0-rc1 deleted (was ac9f893)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-twitter-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-twitter-ext-1.0.0-rc1 was deleted! *** tag was ac9f893 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-storm-ext-1.0.0-rc1 deleted (was f84b0a1)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-storm-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-storm-ext-1.0.0-rc1 was deleted! *** tag was f84b0a1 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-rocketmq-ext-1.0.0-rc1 deleted (was 0066c9a)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-rocketmq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-rocketmq-ext-1.0.0-rc1 was deleted! *** tag was 0066c9a The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-pub-sub-ext-1.0.0-rc1 deleted (was 17c3e78)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-pub-sub-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-pub-sub-ext-1.0.0-rc1 was deleted! *** tag was 17c3e78 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-mqtt-ext-1.0.0-rc1 deleted (was 3c924da)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-mqtt-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-mqtt-ext-1.0.0-rc1 was deleted! *** tag was 3c924da The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-kafka-ext-1.0.0-rc1 deleted (was fcf9a79)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-kafka-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-kafka-ext-1.0.0-rc1 was deleted! *** tag was fcf9a79 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-jms11-ext-1.0.0-rc1 deleted (was 03e0ddc)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-jms11-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-jms11-ext-1.0.0-rc1 was deleted! *** tag was 03e0ddc The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-flume-ext-1.0.0-rc1 deleted (was ac95c28)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flume-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-flume-ext-1.0.0-rc1 was deleted! *** tag was ac95c28 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-camel-ext-1.0.0-rc1 deleted (was 429f400)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-camel-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-camel-ext-1.0.0-rc1 was deleted! *** tag was 429f400 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-flink-ext-1.0.0-rc1 deleted (was 3fcd4e5)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flink-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. *** WARNING: tag ignite-flink-ext-1.0.0-rc1 was deleted! *** tag was 3fcd4e5 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite-extensions] annotated tag ignite-mqtt-ext-1.0.0-rc1 created (now 3c924da)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-mqtt-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 3c924da (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-mqtt-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-rocketmq-ext-1.0.0-rc1 created (now 0066c9a)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-rocketmq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 0066c9a (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-rocketmq-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-kafka-ext-1.0.0-rc1 created (now fcf9a79)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-kafka-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at fcf9a79 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-kafka-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-twitter-ext-1.0.0-rc1 created (now ac9f893)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-twitter-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at ac9f893 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-twitter-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-pub-sub-ext-1.0.0-rc1 created (now 17c3e78)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-pub-sub-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 17c3e78 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-pub-sub-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-jms11-ext-1.0.0-rc1 created (now 03e0ddc)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-jms11-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 03e0ddc (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-jms11-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-storm-ext-1.0.0-rc1 created (now f84b0a1)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-storm-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at f84b0a1 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-storm-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-zeromq-ext-1.0.0-rc1 created (now 13f8c9a)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-zeromq-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 13f8c9a (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-zeromq-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-flume-ext-1.0.0-rc1 created (now ac95c28)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flume-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at ac95c28 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-flume-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-flink-ext-1.0.0-rc1 created (now 3fcd4e5)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-flink-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 3fcd4e5 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-flink-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] annotated tag ignite-camel-ext-1.0.0-rc1 created (now 429f400)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to annotated tag ignite-camel-ext-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 429f400 (tag) tagging 99e1c9ed82db3cdcf85c562f96a2811218d08a9e (commit) by Alexey Goncharuk on Mon Nov 23 13:18:29 2020 +0300 - Log - Releasing ignite-camel-ext-1.0.0-rc1 --- No new revisions were added by this update.
[ignite-extensions] branch streaming-all-ext-1.0.0 created (now 99e1c9e)
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a change to branch streaming-all-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git. at 99e1c9e Release streaming extensions v.1.0.0 This branch includes the following new commits: new 99e1c9e Release streaming extensions v.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-extensions] 01/01: Release streaming extensions v.1.0.0
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a commit to branch streaming-all-ext-1.0.0 in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git commit 99e1c9ed82db3cdcf85c562f96a2811218d08a9e Author: Alexey Goncharuk AuthorDate: Mon Nov 23 12:39:30 2020 +0300 Release streaming extensions v.1.0.0 --- modules/camel-ext/pom.xml| 2 +- modules/flink-ext/pom.xml| 2 +- modules/flume-ext/pom.xml| 2 +- modules/jms11-ext/pom.xml| 2 +- modules/kafka-ext/pom.xml| 2 +- modules/mqtt-ext/pom.xml | 2 +- modules/pub-sub-ext/pom.xml | 2 +- modules/rocketmq-ext/pom.xml | 2 +- modules/storm-ext/pom.xml| 2 +- modules/twitter-ext/pom.xml | 2 +- modules/zeromq-ext/pom.xml | 2 +- parent/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/camel-ext/pom.xml b/modules/camel-ext/pom.xml index 2ae77d5..7c1838e 100644 --- a/modules/camel-ext/pom.xml +++ b/modules/camel-ext/pom.xml @@ -31,7 +31,7 @@ ignite-camel-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/flink-ext/pom.xml b/modules/flink-ext/pom.xml index fe84ca5..24118f6 100644 --- a/modules/flink-ext/pom.xml +++ b/modules/flink-ext/pom.xml @@ -31,7 +31,7 @@ ignite-flink-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/flume-ext/pom.xml b/modules/flume-ext/pom.xml index f143321..cc820f4 100644 --- a/modules/flume-ext/pom.xml +++ b/modules/flume-ext/pom.xml @@ -31,7 +31,7 @@ ignite-flume-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/jms11-ext/pom.xml b/modules/jms11-ext/pom.xml index b9e6422..77209d4 100644 --- a/modules/jms11-ext/pom.xml +++ b/modules/jms11-ext/pom.xml @@ -31,7 +31,7 @@ ignite-jms11-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/kafka-ext/pom.xml b/modules/kafka-ext/pom.xml index 8f4d223..0c49d8f 100644 --- a/modules/kafka-ext/pom.xml +++ b/modules/kafka-ext/pom.xml @@ -32,7 +32,7 @@ ignite-kafka-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/mqtt-ext/pom.xml b/modules/mqtt-ext/pom.xml index ceb02b4..f83c6a7 100644 --- a/modules/mqtt-ext/pom.xml +++ b/modules/mqtt-ext/pom.xml @@ -31,7 +31,7 @@ ignite-mqtt-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/pub-sub-ext/pom.xml b/modules/pub-sub-ext/pom.xml index f420f53..9f22f24 100644 --- a/modules/pub-sub-ext/pom.xml +++ b/modules/pub-sub-ext/pom.xml @@ -33,7 +33,7 @@ ignite-pub-sub-ext -2.9.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/rocketmq-ext/pom.xml b/modules/rocketmq-ext/pom.xml index c17fe22..bb8ccdc 100644 --- a/modules/rocketmq-ext/pom.xml +++ b/modules/rocketmq-ext/pom.xml @@ -32,7 +32,7 @@ ignite-rocketmq-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/storm-ext/pom.xml b/modules/storm-ext/pom.xml index 097b686..6296b8d 100644 --- a/modules/storm-ext/pom.xml +++ b/modules/storm-ext/pom.xml @@ -31,7 +31,7 @@ ignite-storm-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/twitter-ext/pom.xml b/modules/twitter-ext/pom.xml index b419a12..f618aeb 100644 --- a/modules/twitter-ext/pom.xml +++ b/modules/twitter-ext/pom.xml @@ -31,7 +31,7 @@ ignite-twitter-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/modules/zeromq-ext/pom.xml b/modules/zeromq-ext/pom.xml index 0bceb1b..1658010 100644 --- a/modules/zeromq-ext/pom.xml +++ b/modules/zeromq-ext/pom.xml @@ -31,7 +31,7 @@ ignite-zeromq-ext -1.0.0-SNAPSHOT +1.0.0 http://ignite.apache.org diff --git a/parent/pom.xml b/parent/pom.xml index d4c69fa..851143e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -36,7 +36,7 @@ 1.8 1.8 -2.10.0-SNAPSHOT +2.9.0 apache-ignite UTF-8
[ignite] branch ignite-ducktape updated (dd071b4 -> aecf851)
This is an automated email from the ASF dual-hosted git repository. av pushed a change to branch ignite-ducktape in repository https://gitbox.apache.org/repos/asf/ignite.git. from dd071b4 Implement IntEnum enhancement (construct_from) for better support of parametrization. (#8476) add aecf851 IGNITE-13646 : Turn failure detection timeout into a parameter in discovery ducktape test. (#8411) No new revisions were added by this update. Summary of changes: .../ignitetest/services/utils/ignite_aware.py | 4 +- .../utils/ignite_configuration/__init__.py | 1 + .../services/utils/templates/ignite.xml.j2 | 4 ++ .../tests/ignitetest/tests/discovery_test.py | 53 +++--- 4 files changed, 33 insertions(+), 29 deletions(-)
[ignite] branch ignite-12248 updated: IGNITE-13717 additional test coverage for calcite engine, fix distribution trait (closes #8475, #8481)
This is an automated email from the ASF dual-hosted git repository.
tledkov pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12248 by this push:
new ae31145 IGNITE-13717 additional test coverage for calcite engine, fix
distribution trait (closes #8475, #8481)
ae31145 is described below
commit ae31145fa3af01b31960f60439deeda9f64bb389
Author: tledkov
AuthorDate: Mon Nov 23 11:22:36 2020 +0300
IGNITE-13717 additional test coverage for calcite engine, fix distribution
trait (closes #8475, #8481)
---
.../processors/query/calcite/prepare/Fragment.java | 5 +
.../query/calcite/prepare/QueryPlanCache.java | 6 +-
.../query/calcite/rel/IgniteExchange.java | 1 +
.../query/calcite/schema/SchemaHolderImpl.java | 1 +
.../query/calcite/trait/DistributionFunction.java | 35 ++-
.../query/calcite/trait/DistributionTrait.java | 2 +-
.../query/calcite/CalciteQueryProcessorTest.java | 298 ++---
7 files changed, 294 insertions(+), 54 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Fragment.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Fragment.java
index d832b68..5285df3 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Fragment.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Fragment.java
@@ -181,4 +181,9 @@ public class Fragment {
return root instanceof IgniteSender
&&
((IgniteSender)root).sourceDistribution().satisfies(IgniteDistributions.single());
}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return rootSer;
+}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryPlanCache.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryPlanCache.java
index 732830f..60c2fdd 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryPlanCache.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryPlanCache.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.query.calcite.prepare;
import java.util.List;
-
import org.apache.ignite.internal.processors.query.calcite.util.Service;
/**
@@ -32,4 +31,9 @@ public interface QueryPlanCache extends Service {
* @return Query plan.
*/
List queryPlan(PlanningContext ctx, CacheKey key,
QueryPlanFactory factory);
+
+/**
+ * Clear cache.
+ */
+void clear();
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteExchange.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteExchange.java
index 2ee7643..75dad60 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteExchange.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteExchange.java
@@ -48,6 +48,7 @@ public class IgniteExchange extends Exchange implements
IgniteRel {
super(cluster, traitSet, input, distribution);
}
+/** */
public IgniteExchange(RelInput input) {
super(changeTraits(input, IgniteConvention.INSTANCE));
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
index 8fe9c50..bac2f37 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/SchemaHolderImpl.java
@@ -74,6 +74,7 @@ public class SchemaHolderImpl extends AbstractService
implements SchemaHolder, S
/** */
private final int hash;
+/** */
public AffinityIdentity(AffinityFunction aff, int backups,
IgnitePredicate nodeFilter) {
affFuncCls = aff.getClass();
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionFunction.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionFunction.java
index 52cf5e9..5c3183f 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionFunction.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionFunction.java
@@ -39,7 +39,9 @@ public abstract class
