[ignite] branch master updated: IGNITE-10965 Web console: Implemented indication for potentially long operation: 1. Disable button after starting potentially long operation. 2. Swap red line under app
This is an automated email from the ASF dual-hosted git repository.
akuznetsov 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 b0493d8 IGNITE-10965 Web console: Implemented indication for
potentially long operation: 1. Disable button after starting potentially long
operation. 2. Swap red line under app header with 'global-progress-line'
component to indicate running operation.
b0493d8 is described below
commit b0493d8de47de3f4679dbe1d11c79554b1ad41b8
Author: Ilya Borisov
AuthorDate: Fri Feb 8 10:18:33 2019 +0700
IGNITE-10965 Web console: Implemented indication for potentially long
operation:
1. Disable button after starting potentially long operation.
2. Swap red line under app header with 'global-progress-line' component
to indicate running operation.
Co-authored-by: Ilya Borisov
Co-authored-by: Alexander Kalinin
---
modules/web-console/frontend/app/app.js| 4 ++-
.../components/global-progress-line/component.ts | 28
.../components/global-progress-line/controller.ts | 39 ++
.../app/components/global-progress-line/index.ts | 24 +
.../app/components/global-progress-line/style.scss | 25 ++
.../template.pug | 14 +---
.../app/components/page-profile/controller.js | 13 +---
.../app/components/page-profile/template.pug | 4 ++-
.../app/components/page-signin/controller.ts | 10 +-
.../app/components/page-signin/template.pug| 3 ++
.../app/components/page-signup/controller.ts | 23 +
.../app/components/page-signup/template.pug| 3 ++
12 files changed, 163 insertions(+), 27 deletions(-)
diff --git a/modules/web-console/frontend/app/app.js
b/modules/web-console/frontend/app/app.js
index be4dc16..c54a832 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -147,6 +147,7 @@ import sidebar from './components/web-console-sidebar';
import permanentNotifications from './components/permanent-notifications';
import signupConfirmation from './components/page-signup-confirmation';
import noDataCmp from './components/no-data';
+import globalProgressBar from './components/global-progress-line';
import igniteServices from './services';
@@ -249,7 +250,8 @@ export default angular
permanentNotifications.name,
timedRedirection.name,
signupConfirmation.name,
-noDataCmp.name
+noDataCmp.name,
+globalProgressBar.name
])
.service('$exceptionHandler', $exceptionHandler)
// Directives.
diff --git
a/modules/web-console/frontend/app/components/global-progress-line/component.ts
b/modules/web-console/frontend/app/components/global-progress-line/component.ts
new file mode 100644
index 000..508bb93
--- /dev/null
+++
b/modules/web-console/frontend/app/components/global-progress-line/component.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+import controller from './controller';
+import template from './template.pug';
+import './style.scss';
+
+export default {
+template,
+controller,
+bindings: {
+isLoading: '<'
+}
+} as ng.IComponentOptions;
diff --git
a/modules/web-console/frontend/app/components/global-progress-line/controller.ts
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
new file mode 100644
index 000..ee33b2e
--- /dev/null
+++
b/modules/web-console/frontend/app/components/global-progress-line/controller.ts
@@ -0,0 +1,39 @@
+/*
+ * 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
svn commit: r1853159 - /ignite/site/trunk/community/resources.html
Author: dmagda Date: Thu Feb 7 21:19:20 2019 New Revision: 1853159 URL: http://svn.apache.org/viewvc?rev=1853159=rev Log: new committers Modified: ignite/site/trunk/community/resources.html Modified: ignite/site/trunk/community/resources.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/community/resources.html?rev=1853159=1853158=1853159=diff == --- ignite/site/trunk/community/resources.html (original) +++ ignite/site/trunk/community/resources.html Thu Feb 7 21:19:20 2019 @@ -172,6 +172,7 @@ under the License. Alexey PlehanovSberTech Andrey Gura*GridGain Andrey Novikov*GridGain +Andrew MashenkovGridGain Anton Vinogradov *SberTech Branko Äibej * Denis Magda **GridGain @@ -183,6 +184,7 @@ under the License. Igor RudyakRally Health Igor SapegoGridGain Igor SeliverstovGridGain +Ilya LantukhGridGain Ilya Sterin *ChronoTrack Irina Vasilinets *WhatsApp Ivan RakovGridGain
[ignite] 01/01: ignite-1090
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 7150b73e5757d03c3e41deae077bb4995b19fb47
Author: sboikov
AuthorDate: Thu Feb 7 20:27:15 2019 +0300
ignite-1090
---
.../org/apache/ignite/internal/processors/cache/GridCacheMvcc.java | 5 +++--
.../processors/cache/distributed/GridDistributedCacheEntry.java | 2 +-
.../internal/processors/cache/transactions/IgniteTxHandler.java | 6 --
.../ignite/internal/processors/cache/GridCacheTestEntryEx.java | 2 +-
.../near/GridCachePartitionedOptimisticTxNodeRestartTest.java | 6 --
.../cache/distributed/near/NearCacheMultithreadedUpdateTest.java| 2 +-
.../org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 2 ++
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 28cc8fb..dc68d48 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -975,8 +975,9 @@ public final class GridCacheMvcc {
* as system invalidate and marks these candidates as owned and used.
*
* @param ver Version to salvage.
+ * @param near {@code True} if remove near cache candidate.
*/
-public void salvageRemote(GridCacheVersion ver) {
+public void salvageRemote(GridCacheVersion ver, boolean near) {
assert ver != null;
GridCacheMvccCandidate cand = candidate(rmts, ver);
@@ -995,7 +996,7 @@ public final class GridCacheMvcc {
// Only Near and DHT remote candidates should be released.
assert !rmt.nearLocal();
-IgniteInternalTx tx = cctx.tm().tx(rmt.version());
+IgniteInternalTx tx = near ? cctx.tm().nearTx(rmt.version()) :
cctx.tm().tx(rmt.version());
if (tx != null) {
tx.systemInvalidate(true);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index 6dc021b..9b1d0ca 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -614,7 +614,7 @@ public class GridDistributedCacheEntry extends
GridCacheMapEntry {
}
if (sysInvalidate && baseVer != null)
-mvcc.salvageRemote(baseVer);
+mvcc.salvageRemote(baseVer, isNear());
owner = mvcc.doneRemote(lockVer,
maskNull(pendingVers),
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 2d31360..719bf04 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1413,8 +1413,10 @@ public class IgniteTxHandler {
try {
if (req.commit() || req.isSystemInvalidate()) {
tx.commitVersion(req.commitVersion());
-tx.invalidate(req.isInvalidate());
-tx.systemInvalidate(req.isSystemInvalidate());
+if (req.isInvalidate())
+tx.invalidate(true);
+if (req.isSystemInvalidate())
+tx.systemInvalidate(true);
tx.mvccSnapshot(req.mvccSnapshot());
// Complete remote candidates.
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index 9624bd8..1153a3d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -198,7 +198,7 @@ public class GridCacheTestEntryEx extends
GridMetadataAwareAdapter implements Gr
* @param baseVer Base version.
*/
void salvageRemote(GridCacheVersion baseVer) {
-mvcc.salvageRemote(baseVer);
+mvcc.salvageRemote(baseVer, false);
}
/**
diff --git
[ignite] branch ignite-1090 created (now 7150b73)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-1090 in repository https://gitbox.apache.org/repos/asf/ignite.git. at 7150b73 ignite-1090 This branch includes the following new commits: new 7150b73 ignite-1090 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 ignite-1090 deleted (was 1a1caab)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-1090 in repository https://gitbox.apache.org/repos/asf/ignite.git. was 1a1caab ignite-1090 This change permanently discards the following revisions: discard 1a1caab ignite-1090 discard cd6e9c0 ignite-1090
[ignite-teamcity-bot] 01/01: Java11 Experimental
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch java-11
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 30f56012a8628d00335ecf26bc728d024bd485fb
Author: Dmitriy Pavlov
AuthorDate: Thu Feb 7 18:09:32 2019 +0300
Java11 Experimental
---
ignite-tc-helper-web/build.gradle | 4 ++--
ignite-tc-helper-web/src/main/java/module-info.java | 8
jetty-launcher/build.gradle | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ignite-tc-helper-web/build.gradle
b/ignite-tc-helper-web/build.gradle
index 7c12c4f..029409b 100644
--- a/ignite-tc-helper-web/build.gradle
+++ b/ignite-tc-helper-web/build.gradle
@@ -18,8 +18,8 @@
apply plugin: 'java'
apply plugin: 'war'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = '11.0'
+targetCompatibility = '11.0'
repositories {
mavenCentral()
diff --git a/ignite-tc-helper-web/src/main/java/module-info.java
b/ignite-tc-helper-web/src/main/java/module-info.java
new file mode 100644
index 000..f088fd4
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module tcbot {
+// requires ignite.core;
+requires ignite.slf4j;
+requires ignite.direct.io;
+requires ignite.indexing;
+requires annotations;
+requires slf4j.api;
+}
\ No newline at end of file
diff --git a/jetty-launcher/build.gradle b/jetty-launcher/build.gradle
index 950979b..bf87db1 100644
--- a/jetty-launcher/build.gradle
+++ b/jetty-launcher/build.gradle
@@ -18,8 +18,8 @@
apply plugin: 'java'
apply plugin: 'application'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
+sourceCompatibility = '11.0'
+targetCompatibility = '11.0'
repositories {
mavenCentral()
[ignite-teamcity-bot] branch java-11 created (now 30f5601)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch java-11 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. at 30f5601 Java11 Experimental This branch includes the following new commits: new 30f5601 Java11 Experimental 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 ignite-11155 updated: IGNITE-11155 Missed JVM options comment was added for exception
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11155
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-11155 by this push:
new a75a035 IGNITE-11155 Missed JVM options comment was added for
exception
a75a035 is described below
commit a75a035298745ec68cc031f9cf15817c5b6a1396
Author: Dmitriy Pavlov
AuthorDate: Thu Feb 7 16:56:59 2019 +0300
IGNITE-11155 Missed JVM options comment was added for exception
---
.../ignite/internal/util/FeatureChecker.java | 36 ++
.../apache/ignite/internal/util/GridUnsafe.java| 9 +++---
2 files changed, 41 insertions(+), 4 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java
new file mode 100644
index 000..5952e57
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/FeatureChecker.java
@@ -0,0 +1,36 @@
+/*
+ * 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.util;
+
+/**
+ * Class extracted for fields from GridUnsafe to be absolutely independent
with current and future static block
+ * initialization prohect.
+ */
+public class FeatureChecker {
+/** Required Options to Run un Java 9, 10, 11. */
+public static final String JAVA_9_10_11_OPTIONS =
"--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED\n" +
+"--add-exports=java.base/sun.nio.ch=ALL-UNNAMED\n" +
+"--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED\n" +
+"--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED\n"
+
+
"--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED\n" +
+"--illegal-access=permit";
+
+/** Java version specific warning to be added in case access failed */
+public static final String JAVA_VER_SPECIFIC_WARN = "\nPlease make sure
options: " + JAVA_9_10_11_OPTIONS +
+"\nwere provided at JVM startup." +
+"\nSee
https://apacheignite.readme.io/docs/getting-started#section-running-ignite-with-java-9-10-11
for more info";
+}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
index f3593f0..f485218 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java
@@ -137,7 +137,8 @@ public abstract class GridUnsafe {
return buf;
}
catch (ReflectiveOperationException e) {
-throw new RuntimeException("JavaNioAccess#newDirectByteBuffer()
method is unavailable.", e);
+throw new RuntimeException("JavaNioAccess#newDirectByteBuffer()
method is unavailable."
++ FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
}
}
@@ -1452,8 +1453,7 @@ public abstract class GridUnsafe {
}
catch (ReflectiveOperationException e) {
throw new RuntimeException(pkgName + ".misc.JavaNioAccess class is
unavailable."
-+ "\nPlease make sure
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED was provided as JVM
option." +
-"\nSee
https://apacheignite.readme.io/docs/getting-started#section-running-ignite-with-java-9-10-11
for more info", e);
++ FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
}
}
@@ -1476,7 +1476,8 @@ public abstract class GridUnsafe {
return mtd;
}
catch (ReflectiveOperationException e) {
-throw new RuntimeException(miscPackage() +
".JavaNioAccess#newDirectByteBuffer() method is unavailable.", e);
+throw new RuntimeException(miscPackage() +
".JavaNioAccess#newDirectByteBuffer() method is unavailable."
++ FeatureChecker.JAVA_VER_SPECIFIC_WARN, e);
}
}
[ignite] branch master updated: IGNITE-11118: SQL: Type conversions for thin client partition pruning. This closes #6016.
This is an automated email from the ASF dual-hosted git repository.
vozerov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 3524eb9 IGNITE-8: SQL: Type conversions for thin client partition
pruning. This closes #6016.
3524eb9 is described below
commit 3524eb9d42bd865d28326c4f82070928c5e5fd75
Author: sanpwc
AuthorDate: Thu Feb 7 16:46:27 2019 +0300
IGNITE-8: SQL: Type conversions for thin client partition pruning. This
closes #6016.
---
.../sql/optimizer/affinity/PartitionAllNode.java | 2 +-
...onResolver.java => PartitionClientContext.java} | 19 +-
.../optimizer/affinity/PartitionCompositeNode.java | 27 +-
.../optimizer/affinity/PartitionConstantNode.java | 2 +-
.../optimizer/affinity/PartitionDataTypeUtils.java | 528 +
.../sql/optimizer/affinity/PartitionGroupNode.java | 13 +-
.../sql/optimizer/affinity/PartitionNode.java | 4 +-
.../sql/optimizer/affinity/PartitionNoneNode.java | 2 +-
.../optimizer/affinity/PartitionParameterNode.java | 36 +-
...onResolver.java => PartitionParameterType.java} | 45 +-
.../sql/optimizer/affinity/PartitionResolver.java | 1 +
.../optimizer/affinity/PartitionSingleNode.java| 14 +-
.../processors/query/h2/IgniteH2Indexing.java | 6 +-
.../query/h2/affinity/PartitionExtractor.java | 69 ++-
.../h2/twostep/SqlDataTypeConversionTest.java | 372 +++
.../IgniteBinaryCacheQueryTestSuite.java | 5 +-
16 files changed, 1079 insertions(+), 66 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionAllNode.java
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionAllNode.java
index c625089..cb9500d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionAllNode.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionAllNode.java
@@ -36,7 +36,7 @@ public class PartitionAllNode implements PartitionNode {
}
/** {@inheritDoc} */
-@Override public Collection apply(Object... args) {
+@Override public Collection apply(PartitionClientContext cliCtx,
Object... args) {
return null;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResolver.java
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionClientContext.java
similarity index 66%
copy from
modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResolver.java
copy to
modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionClientContext.java
index e606200..1d7594f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResolver.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionClientContext.java
@@ -14,23 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.ignite.internal.sql.optimizer.affinity;
-import org.apache.ignite.IgniteCheckedException;
+import org.jetbrains.annotations.Nullable;
/**
- * Partition resolver interface. Takes argument, data type and cache name,
returns partition.
+ * Client context. Passed to partition resolver on thin clients.
*/
-public interface PartitionResolver {
+public class PartitionClientContext {
/**
* Resolve partition.
*
* @param arg Argument.
- * @param dataType Data type.
+ * @param typ Type.
* @param cacheName Cache name.
- * @return Partition.
- * @throws IgniteCheckedException If failed.
+ * @return Partition or {@code null} if cannot be resolved.
*/
-int partition(Object arg, int dataType, String cacheName) throws
IgniteCheckedException;
+@Nullable public Integer partition(Object arg, @Nullable
PartitionParameterType typ, String cacheName) {
+PartitionDataTypeUtils.convert(arg, typ);
+
+// TODO: IGNITE-10308: Implement partition resolution logic.
+return null;
+}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionCompositeNode.java
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionCompositeNode.java
index d724cf8..1235e6a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionCompositeNode.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionCompositeNode.java
@@ -56,14 +56,21 @@ public class PartitionCompositeNode implements
PartitionNode {
}
/** {@inheritDoc} */
-@Override public Collection apply(Object... args) throws
[ignite] branch master updated: IGNITE-10604: MVCC: mvcc history can be missed during remove operation. This closes #5979.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 b5b9ffa IGNITE-10604: MVCC: mvcc history can be missed during remove
operation. This closes #5979.
b5b9ffa is described below
commit b5b9ffa6183f7f77b595e1232839fa4d3c5c5d59
Author: Andrey V. Mashenkov
AuthorDate: Thu Feb 7 16:30:40 2019 +0300
IGNITE-10604: MVCC: mvcc history can be missed during remove operation.
This closes #5979.
---
.../processors/cache/GridCacheMapEntry.java| 2 +
.../processors/cache/GridCacheMvccEntryInfo.java | 4 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 47 ++-
.../dht/GridDhtTxAbstractEnlistFuture.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java| 2 +-
.../internal/processors/cache/mvcc/MvccUtils.java | 50 +++-
.../cache/persistence/tree/io/DataPageIO.java | 54 --
.../cache/tree/mvcc/data/MvccDataRow.java | 48 +++
.../cache/tree/mvcc/data/MvccUpdateDataRow.java| 8 ++--
.../cache/tree/mvcc/search/MvccMaxSearchRow.java | 3 +-
.../CacheLateAffinityAssignmentTest.java | 2 -
.../cache/mvcc/CacheMvccTransactionsTest.java | 2 +-
.../cache/mvcc/CacheMvccSqlUpdateCountersTest.java | 12 -
13 files changed, 133 insertions(+), 103 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 4753e9f..e044a2d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -5606,6 +5606,8 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
updRes.invokeResult(res.invokeResult());
}
+updRes.newValue(res.newValue());
+
if (needOldVal && compareIgnoreOpCounter(res.resultVersion(),
mvccVer) != 0 &&
(res.resultType() == ResultType.PREV_NOT_NULL ||
res.resultType() == ResultType.REMOVED_NOT_NULL))
updRes.oldValue(res.oldValue());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccEntryInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccEntryInfo.java
index 027305d..b9589de 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccEntryInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccEntryInfo.java
@@ -65,7 +65,7 @@ public class GridCacheMvccEntryInfo extends
GridCacheEntryInfo implements MvccVe
/** {@inheritDoc} */
@Override public int newMvccOperationCounter() {
-return newMvccOpCntr & ~MVCC_OP_COUNTER_MASK;
+return newMvccOpCntr & MVCC_OP_COUNTER_MASK;
}
/** {@inheritDoc} */
@@ -85,7 +85,7 @@ public class GridCacheMvccEntryInfo extends
GridCacheEntryInfo implements MvccVe
/** {@inheritDoc} */
@Override public int mvccOperationCounter() {
-return mvccOpCntr & ~MVCC_OP_COUNTER_MASK;
+return mvccOpCntr & MVCC_OP_COUNTER_MASK;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 48d4682..209c9cf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -121,6 +121,7 @@ import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.INITIAL
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_COUNTER_NA;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_CRD_COUNTER_NA;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_HINTS_BIT_OFF;
+import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_KEY_ABSENT_BEFORE_OFF;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_MASK;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.MVCC_OP_COUNTER_NA;
import static
org.apache.ignite.internal.processors.cache.mvcc.MvccUtils.compare;
@@ -1443,7 +1444,7 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
private final ConcurrentMap cacheSizes = new
ConcurrentHashMap<>();
/** Mvcc remove
[ignite] branch master updated: IGNITE-10219: MVCC TX: Unmute tests. This closes #5964.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 5b8431e IGNITE-10219: MVCC TX: Unmute tests. This closes #5964.
5b8431e is described below
commit 5b8431eeaf75a24295c61c47f0762465e6883dd5
Author: Andrey V. Mashenkov
AuthorDate: Thu Feb 7 16:17:58 2019 +0300
IGNITE-10219: MVCC TX: Unmute tests. This closes #5964.
---
.../internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
index 89d9c0f..48f689c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
@@ -38,7 +38,6 @@ import
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -210,7 +209,6 @@ public class CacheMvccTxFailoverTest extends
GridCommonAbstractTest {
/**
* @throws Exception If fails.
*/
-@Ignore("https://issues.apache.org/jira/browse/IGNITE-10219;)
@Test
public void testLostRollbackOnBackup() throws Exception {
IgniteEx node = startGrid(0);
@@ -235,7 +233,7 @@ public class CacheMvccTxFailoverTest extends
GridCommonAbstractTest {
barrier.await();
}
catch (Exception e) {
-e.printStackTrace();
+
barrier.reset();
}
}
[ignite] branch master updated: IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes #6026.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 1396626 IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This
closes #6026.
1396626 is described below
commit 1396626ca0e8845108aa55caa3dc60fba3a2b998
Author: ipavlukhin
AuthorDate: Thu Feb 7 16:13:35 2019 +0300
IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes #6026.
Signed-off-by: Andrey V. Mashenkov
---
.../cache/CacheMvccTxFastFinishTest.java | 20 ---
.../processors/cache/CacheTxFastFinishTest.java| 40 --
2 files changed, 46 insertions(+), 14 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
index 52ea882..90eaa3d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
@@ -20,17 +20,19 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteTransactions;
+import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
-import org.junit.Ignore;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
/** */
-@Ignore("https://issues.apache.org/jira/browse/IGNITE-10444;)
public class CacheMvccTxFastFinishTest extends CacheTxFastFinishTest {
/** {@inheritDoc} */
@Override protected void fastFinishTx(Ignite ignite) {
+assert MvccFeatureChecker.forcedMvcc();
+
IgniteTransactions txs = ignite.transactions();
IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -44,7 +46,7 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.get(i);
-checkNormalTxFinish(tx, commit);
+checkNormalTxFinish(tx, commit, true);
}
}
@@ -52,9 +54,19 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.put(i, i);
-checkNormalTxFinish(tx, commit);
+checkNormalTxFinish(tx, commit, false);
}
}
}
}
+
+/** {@inheritDoc} */
+@Override protected void checkNormalCommittedTx(IgniteInternalTx tx,
boolean readOnly) {
+if (readOnly)
+assertNull(prepareFuture(tx));
+else
+assertNotNull(prepareFuture(tx));
+
+assertNotNull(finishFuture(tx));
+}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
index 94d272d..85e0991 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
@@ -28,6 +28,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFa
import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import
org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
@@ -37,6 +38,7 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static
org.apache.ignite.testframework.MvccFeatureChecker.Feature.NEAR_CACHE;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
@@ -86,6 +88,8 @@ public class CacheTxFastFinishTest extends
[ignite] branch master updated: Revert "IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes #6026."
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 97500ee Revert "IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed.
This closes #6026."
97500ee is described below
commit 97500ee9f37b8806bbfcba7510201a859ede
Author: Igor Seliverstov
AuthorDate: Thu Feb 7 16:12:07 2019 +0300
Revert "IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes
#6026."
This reverts commit ba48c3f1
---
.../cache/CacheMvccTxFastFinishTest.java | 18 ++
.../processors/cache/CacheTxFastFinishTest.java| 40 ++
2 files changed, 12 insertions(+), 46 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
index e70b6d4..52ea882 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
@@ -20,8 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteTransactions;
-import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
-import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.junit.Ignore;
@@ -33,8 +31,6 @@ import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
public class CacheMvccTxFastFinishTest extends CacheTxFastFinishTest {
/** {@inheritDoc} */
@Override protected void fastFinishTx(Ignite ignite) {
-assert MvccFeatureChecker.forcedMvcc();
-
IgniteTransactions txs = ignite.transactions();
IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -48,7 +44,7 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.get(i);
-checkNormalTxFinish(tx, commit, true);
+checkNormalTxFinish(tx, commit);
}
}
@@ -56,19 +52,9 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.put(i, i);
-checkNormalTxFinish(tx, commit, false);
+checkNormalTxFinish(tx, commit);
}
}
}
}
-
-/** {@inheritDoc} */
-@Override protected void checkNormalCommittedTx(IgniteInternalTx tx,
boolean readOnly) {
-if (readOnly)
-assertNull(prepareFuture(tx));
-else
-assertNotNull(prepareFuture(tx));
-
-assertNotNull(finishFuture(tx));
-}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
index 85e0991..94d272d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
@@ -28,7 +28,6 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFa
import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import
org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
@@ -38,7 +37,6 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static
org.apache.ignite.testframework.MvccFeatureChecker.Feature.NEAR_CACHE;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
@@ -88,8 +86,6 @@ public class CacheTxFastFinishTest extends
GridCommonAbstractTest {
*/
@Test
public void testFastFinishTxNearCache() throws Exception {
-
[ignite] branch ignite-11155 updated (5080ddb -> f2a4178)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch ignite-11155 in repository https://gitbox.apache.org/repos/asf/ignite.git. from 5080ddb IGNITE-11155 Set Maven-enforcer-plugin version to fix build add f15db08 IGNITE-7309 Throw NodeStoppingException if marshaling fails while node stopping - Fixes #3461. add ec48853 IGNITE-11030 Fix Pages List to preserve partition ID consistency. (#5915) add 2047b25 IGNITE-11039: [ML] Add parser for Spark Decision tree regression add 07a0a6a IGNITE-11029: Public API for edge-chasing deadlock detection configuration. This closes #5896. add 3653230 IGNITE-11121: MVCC TX: AssertionError in discovery manager on BLT change fixed. This closes #5963. add 552f6e4 IGNITE-10183: MVCC: IgniteClientReconnectCacheTest.testReconnectOperationInProgress fixed. This closes #5797. add cde31aa IGNITE-9903 Archived WAL segment size is reduced for case when SWITCH_SEGMENT_RECORD is present in the file add 751ab2a IGNITE-10487: SQL: Tests for DML with partition pruning. This closes #5837. add 1e0a7c2 IGNITE-11138: [ML] Predict from SQL add ba6c194 IGNITE-11040: [ML] Add parser for Spark Random forest regressor add 15a3bd9 IGNITE-11166 Web Console agent: Hostname verifier should be disable in case of trustAll flag enabled. (#6002) add bd49b14 IGNITE-11160: SQL: simplified row hierarchy. This closes #5990. add 8912ae9 IGNITE-11130 BackupPostProcessingClosure should not save initial value on a backup node when cache store is not configured. add bf49d56 IGNITE-9989: JDBC: Fixed metadata pattern handling for JDBCv2 driver. Moved metadata management code common to v2 and thin drivers to a single place. This closes #5716. add 3ef733e IGNITE-11123 Fix MvccFeatureChecker to throw assumption exception instead of failure. This closes #5992. add 9a2fb4c IGNITE-10793: [ML] Create comprehensive example for dataset generators add ef04782 IGNITE-10421: MVCC: Assertion in checkpointer thread fixed. This closes #5696. add a486278 IGNITE-11030 Test for for change "Fix Pages List to preserve partition ID consistency." add 9e47ee5 IGNITE-7265 add c71e7df IGNITE-11169: SQL: encapsulated distributed join information into separate context object to simplify (and possibly remove in future) GridH2QueryContext object. This closes #6005. add d7c717c IGNITE-11175 Add support for maven local xml config file - Fixes #5944. add 1fc82730 IGNITE-11168 .NET: Fix TxTimeoutOnPartitionMapExchange propagation add 1602cc7 IGNITE-9879 Web console: Refactored "Configuration" screen to module with lazy loading. add 63b9e16 IGNITE-11148: PartitionCountersNeighborcastFuture blocks partition map exchange. This closes #5998. add 2cae870 IGNITE-11137: [ML] IgniteModelStorage improvements for IgniteModel and SQL functionality add 5777035 IGNITE-10976: MVCC: Sql API methods should throw proper TransactionExceptions in case of tx failure. This closes #5870. add 1569177 IGNITE-11183 Fixed proxy in Web Console agent. (#6010) add 51accac IGNITE-10876 Parallel execution of affinity changes on coordinator - Fixes #5942. add 42b4d28 IGNITE-11023 Optimize discovery data bag processing in GridMarshallerMappingProcessor - Fixes #5887. add be9079d IGNITE-8894 Provide coordinator information in control.sh output - Fixes #5933. add 7b61c32 IGNITE-11185: SQL: moved index distributed join logic to H2TreeIndex. Minor changes to collocation model. This closes #6012. add 5b98080 IGNITE-11144: [ML] Create example for FeatureLabelExtractor add 59bb356 IGNITE-10927 Relieve JUnit3TestLegacySupport from inheriting deprecated junit.framework.Assert - Fixes #5866. add a7eb5cc IGNITE-11006: Enable problematic whitespace inspection check (#5951) add 693a6e88 IGNITE-11200: SQL: reworked GridH2QueryContext. Now it is not static and thread-local and shared operations are well-separated. This closes #6020. add 447b222 IGNITE-8841: MVCC TX: Read transactions remap when coordinator fails. This closes #5949. add f62d66e IGNITE-11104 Remove references to Java <8, Apache Ignite <2 - Fixes #5983. add 8cba313 IGNITE-11196 Set Maven-enforcer-plugin version to fix build. add 963e2c2 IGNITE-11041: [ML] Add parser for Spark Gradient-boosted tree regressor add 299f557 IGNITE-11202: SQL: Moved partition reservation logic out of GridMapQueryExecutor to allow for it's reuse in future. This closes #6023. add 98dc589 IGNITE-10538 Web Console: Implemented "no-data" component for handling missing Web agent and/or cluster. add 731f740 IGNITE-11180: SQL: Proper naming for map- and reduce- related classes. This closes #6008. add 4c0f0e7 IGNITE-11191: Fixing Hibernate dependencies for Java 11: JAXB API & implementation were provided, CORBA 3rd
[ignite] 01/01: Merge branch 'master' into ignite-11155
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-11155 in repository https://gitbox.apache.org/repos/asf/ignite.git commit f2a417830340eca62b4533cc5d87b1224b28be82 Merge: 5080ddb 937164e Author: Dmitriy Pavlov AuthorDate: Thu Feb 7 15:59:03 2019 +0300 Merge branch 'master' into ignite-11155 bin/control.bat| 46 +- bin/control.sh | 42 +- bin/ignitevisorcmd.bat | 48 +- bin/ignitevisorcmd.sh | 36 +- .../DecisionTreeRegressionFromSparkExample.java| 91 + .../modelparser/GBTRegressionFromSparkExample.java | 95 ++ .../RandomForestRegressionFromSparkExample.java| 91 + .../linear/LinearRegressionLSQRTrainerExample.java | 17 +- ...eeClassificationTrainerSQLInferenceExample.java | 163 +- ...onTreeClassificationTrainerSQLTableExample.java | 60 +- .../ParametricVectorGeneratorExample.java | 65 + .../util/generators/StandardGeneratorsExample.java | 75 + .../generators/VectorGeneratorFamilyExample.java | 65 + .../VectorGeneratorPrimitivesExample.java | 97 ++ .../examples/ml/util/generators/package-info.java | 22 + .../spark/serialized/dtreg/data/._SUCCESS.crc | Bin 0 -> 8 bytes ...-4bdd-8b1c-de87e11b3d1b-c000.snappy.parquet.crc | Bin 0 -> 68 bytes .../models/spark/serialized/dtreg/data/_SUCCESS|0 ...698b-4bdd-8b1c-de87e11b3d1b-c000.snappy.parquet | Bin 0 -> 7415 bytes .../spark/serialized/dtreg/metadata/._SUCCESS.crc | Bin 0 -> 8 bytes .../serialized/dtreg/metadata/.part-0.crc | Bin 0 -> 12 bytes .../spark/serialized/dtreg/metadata/_SUCCESS |0 .../spark/serialized/dtreg/metadata/part-0 |1 + .../spark/serialized/gbtreg/data/._SUCCESS.crc | Bin 0 -> 8 bytes ...-4944-b933-7897869a29d3-c000.snappy.parquet.crc | Bin 0 -> 688 bytes .../models/spark/serialized/gbtreg/data/_SUCCESS |0 ...888b-4944-b933-7897869a29d3-c000.snappy.parquet | Bin 0 -> 86992 bytes .../spark/serialized/gbtreg/metadata/._SUCCESS.crc | Bin 0 -> 8 bytes .../serialized/gbtreg/metadata/.part-0.crc | Bin 0 -> 12 bytes .../spark/serialized/gbtreg/metadata/_SUCCESS |0 .../spark/serialized/gbtreg/metadata/part-0|1 + .../serialized/gbtreg/treesMetadata/._SUCCESS.crc | Bin 0 -> 8 bytes ...-48b3-bad7-07c343405928-c000.snappy.parquet.crc | Bin 0 -> 80 bytes .../spark/serialized/gbtreg/treesMetadata/_SUCCESS |0 ...1326-48b3-bad7-07c343405928-c000.snappy.parquet | Bin 0 -> 8925 bytes .../spark/serialized/rfreg/data/._SUCCESS.crc | Bin 0 -> 8 bytes ...-4a77-823e-dfd32d1560eb-c000.snappy.parquet.crc | Bin 0 -> 968 bytes .../models/spark/serialized/rfreg/data/_SUCCESS|0 ...4b81-4a77-823e-dfd32d1560eb-c000.snappy.parquet | Bin 0 -> 122852 bytes .../spark/serialized/rfreg/metadata/._SUCCESS.crc | Bin 0 -> 8 bytes .../serialized/rfreg/metadata/.part-0.crc | Bin 0 -> 12 bytes .../spark/serialized/rfreg/metadata/_SUCCESS |0 .../spark/serialized/rfreg/metadata/part-0 |1 + .../serialized/rfreg/treesMetadata/._SUCCESS.crc | Bin 0 -> 8 bytes ...-4554-b496-ef7584098d6d-c000.snappy.parquet.crc | Bin 0 -> 56 bytes .../spark/serialized/rfreg/treesMetadata/_SUCCESS |0 ...0418-4554-b496-ef7584098d6d-c000.snappy.parquet | Bin 0 -> 5838 bytes idea/ignite_inspections_teamcity.xml |3 +- .../apache/ignite/tests/CassandraConfigTest.java |2 +- .../client/impl/ClientCacheFlagsCodecTest.java |2 +- .../client/integration/ClientAbstractSelfTest.java |2 +- .../apache/ignite/internal/jdbc2/JdbcBlobTest.java | 10 +- .../internal/jdbc2/JdbcMetadataSelfTest.java | 88 +- .../rest/RestMemcacheProtocolSelfTest.java |2 +- .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 26 +- ...dbcThinTransactionsAbstractComplexSelfTest.java |9 +- .../testframework/util/MavenUtils.java | 22 +- .../processors/compress/FileSystemUtilsTest.java |4 +- .../main/java/org/apache/ignite/IgniteCache.java |6 +- .../ignite/IgniteCacheRestartingException.java |1 - .../org/apache/ignite/IgniteSystemProperties.java | 18 - .../configuration/TransactionConfiguration.java| 58 +- .../ignite/internal/GridEventConsumeHandler.java |6 + .../ignite/internal/GridMessageListenHandler.java |6 + .../org/apache/ignite/internal/IgnitionEx.java | 50 - .../ignite/internal/MarshallerContextImpl.java |6 + .../internal/commandline/CommandHandler.java | 23 +- .../internal/commandline/GridConsoleAdapter.java |4 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java| 124 +- .../ignite/internal/jdbc2/JdbcConnection.java |4 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 289 +---
[ignite] branch master updated: IGNITE-10755: MVCC: Fix CQ registration in the middle of tx. This closes #5841.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 937164e IGNITE-10755: MVCC: Fix CQ registration in the middle of tx.
This closes #5841.
937164e is described below
commit 937164ea1a922ae32e54aa32b7356ef758599e87
Author: rkondakov
AuthorDate: Thu Feb 7 15:45:49 2019 +0300
IGNITE-10755: MVCC: Fix CQ registration in the middle of tx. This closes
#5841.
---
.../ignite/internal/GridEventConsumeHandler.java | 6 +
.../ignite/internal/GridMessageListenHandler.java | 6 +
.../processors/cache/CacheGroupContext.java| 73 --
.../processors/cache/GridCacheContext.java | 10 +
.../processors/cache/GridCacheMapEntry.java| 4 +-
.../dht/GridDhtTxAbstractEnlistFuture.java | 2 +-
.../processors/cache/mvcc/MvccCachingManager.java | 280 +
.../continuous/CacheContinuousQueryHandler.java| 58 -
.../continuous/CacheContinuousQueryListener.java | 7 +
.../continuous/CacheContinuousQueryManager.java| 38 +--
.../cache/transactions/IgniteTxHandler.java| 2 +-
.../IgniteTxImplicitSingleStateImpl.java | 12 +
.../transactions/IgniteTxRemoteStateAdapter.java | 15 +-
.../cache/transactions/IgniteTxState.java | 8 +
.../cache/transactions/IgniteTxStateImpl.java | 15 +-
.../processors/cache/transactions/TxCounters.java | 2 +-
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java| 3 +-
.../eviction/paged/PageEvictionMetricTest.java | 2 +-
.../PageEvictionPagesRecyclingAndReusingTest.java | 4 +-
.../eviction/paged/PageEvictionTouchOrderTest.java | 4 +-
.../PageEvictionWithRebalanceAbstractTest.java | 2 +-
...ntinuousQueryConcurrentPartitionUpdateTest.java | 5 +-
.../CacheContinuousQueryExecuteInPrimaryTest.java | 30 ++-
24 files changed, 411 insertions(+), 182 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 58d0d9a..e15cdd0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
@@ -142,6 +143,11 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
}
/** {@inheritDoc} */
+@Override public Map> updateCounters() {
+return Collections.emptyMap();
+}
+
+/** {@inheritDoc} */
@Override public RegisterStatus register(final UUID nodeId, final UUID
routineId, final GridKernalContext ctx)
throws IgniteCheckedException {
assert nodeId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
index c146eca..c6a2d05 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
@@ -132,6 +133,11 @@ public class GridMessageListenHandler implements
GridContinuousHandler {
}
/** {@inheritDoc} */
+@Override public Map> updateCounters() {
+return Collections.emptyMap();
+}
+
+/** {@inheritDoc} */
@Override public RegisterStatus register(UUID nodeId, UUID routineId,
final GridKernalContext ctx)
throws IgniteCheckedException {
ctx.io().addUserMessageListener(topic, pred);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 46de040..4cdcf3b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -25,6 +25,8 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import
[ignite] branch master updated: IGNITE-11219: SQL: Fixed affinity mapper resolution for CREATE TABLE templates. This closes #6046.
This is an automated email from the ASF dual-hosted git repository.
vozerov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 2a19e3f IGNITE-11219: SQL: Fixed affinity mapper resolution for
CREATE TABLE templates. This closes #6046.
2a19e3f is described below
commit 2a19e3f2789320b6b45dcd5fb91e82fd8bdcc1a1
Author: Max-Pudov
AuthorDate: Thu Feb 7 15:36:00 2019 +0300
IGNITE-11219: SQL: Fixed affinity mapper resolution for CREATE TABLE
templates. This closes #6046.
---
.../binary/CacheObjectBinaryProcessorImpl.java | 7 +-
.../processors/query/GridQueryProcessor.java | 3 +
.../internal/processors/query/QueryUtils.java | 12 ++
.../query/IgniteSqlCreateTableTemplateTest.java| 159 +
.../IgniteBinaryCacheQueryTestSuite2.java | 3 +
5 files changed, 178 insertions(+), 6 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 8ac9810..5e43dd3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -948,11 +948,6 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
AffinityKeyMapper cacheAffMapper = ccfg.getAffinityMapper();
-boolean customAffMapper =
-cacheAffMapper != null &&
-!(cacheAffMapper instanceof CacheDefaultBinaryAffinityKeyMapper) &&
-!(cacheAffMapper instanceof GridCacheDefaultAffinityKeyMapper);
-
AffinityKeyMapper dfltAffMapper = binaryEnabled ?
new
CacheDefaultBinaryAffinityKeyMapper(ccfg.getKeyConfiguration()) :
new GridCacheDefaultAffinityKeyMapper();
@@ -962,7 +957,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
return new CacheObjectContext(ctx,
ccfg.getName(),
dfltAffMapper,
-customAffMapper,
+QueryUtils.isCustomAffinityMapper(ccfg.getAffinityMapper()),
ccfg.isCopyOnRead(),
storeVal,
ctx.config().isPeerClassLoadingEnabled() && !isBinaryEnabled(ccfg),
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 94ad17d..e5f323d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1567,6 +1567,9 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
ccfg.setSqlEscapeAll(true);
ccfg.setQueryEntities(Collections.singleton(entity));
+if (!QueryUtils.isCustomAffinityMapper(ccfg.getAffinityMapper()))
+ccfg.setAffinityMapper(null);
+
if (affinityKey != null)
ccfg.setKeyConfiguration(new
CacheKeyConfiguration(entity.getKeyType(), affinityKey));
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
index 316cf4c..e15687e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
@@ -1396,6 +1396,18 @@ public class QueryUtils {
}
/**
+ * Checks whether affinity key mapper is custom or default.
+ *
+ * @param affinityKeyMapper Affinity key mapper.
+ * @return {@code true} if affinity key mapper is custom.
+ */
+public static boolean isCustomAffinityMapper(AffinityKeyMapper
affinityKeyMapper) {
+return affinityKeyMapper != null &&
+!(affinityKeyMapper instanceof
CacheDefaultBinaryAffinityKeyMapper) &&
+!(affinityKeyMapper instanceof
GridCacheDefaultAffinityKeyMapper);
+}
+
+/**
* Checks if given column can be removed from table using its {@link
QueryEntity}.
*
* @param entity Query entity.
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlCreateTableTemplateTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlCreateTableTemplateTest.java
new file mode 100644
index 000..a1b8b92
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlCreateTableTemplateTest.java
[ignite] branch master updated: IGNITE-7648 Fixed IGNITE_ENABLE_FORCIBLE_NODE_KILL system property - Fixes #3501.
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.git
The following commit(s) were added to refs/heads/master by this push:
new 26d141e IGNITE-7648 Fixed IGNITE_ENABLE_FORCIBLE_NODE_KILL system
property - Fixes #3501.
26d141e is described below
commit 26d141e4ca66f717db0771ab8fdc83e301875595
Author: Pavel Voronkin
AuthorDate: Thu Feb 7 15:17:07 2019 +0300
IGNITE-7648 Fixed IGNITE_ENABLE_FORCIBLE_NODE_KILL system property - Fixes
#3501.
Signed-off-by: Alexey Goncharuk
---
.../spi/ExponentialBackoffTimeoutStrategy.java | 138 +
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../org/apache/ignite/spi/TimeoutStrategy.java | 60
.../spi/communication/tcp/TcpCommunicationSpi.java | 322 ++---
.../tcp/messages/RecoveryLastReceivedMessage.java | 3 +
.../IgniteClientReconnectAbstractTest.java | 6 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 12 -
.../cache/IgniteCachePutAllRestartTest.java| 14 +-
.../CacheGetInsideLockChangingTopologyTest.java| 6 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 14 +-
.../IgniteBinaryMetadataUpdateNodeRestartTest.java | 11 +-
.../distributed/IgniteCacheGetRestartTest.java | 6 +-
.../IgniteCacheNearRestartRollbackSelfTest.java| 12 -
...WriteSynchronizationModesMultithreadedTest.java | 1 +
.../dht/IgniteCachePutRetryAbstractSelfTest.java | 6 +-
.../GridServiceProxyClientReconnectSelfTest.java | 4 +-
.../ServiceDeploymentOnClientDisconnectTest.java | 5 +-
.../spi/ExponentialBackoffTimeoutStrategyTest.java | 102 +++
.../IgniteTcpCommunicationHandshakeWaitTest.java | 16 +-
.../tcp/TcpCommunicationSpiDropNodesTest.java | 139 +++--
.../TcpCommunicationSpiFaultyClientSslTest.java| 38 +++
.../tcp/TcpCommunicationSpiFaultyClientTest.java | 76 -
.../tcp/TcpCommunicationSpiFreezingClientTest.java | 188
.../spi/discovery/tcp/IgniteClientConnectTest.java | 89 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 25 +-
.../IgniteSpiCommunicationSelfTestSuite.java | 6 +
.../IgniteSpiDiscoverySelfTestSuite.java | 3 +
.../ZookeeperDiscoveryClientDisconnectTest.java| 11 +
28 files changed, 966 insertions(+), 355 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java
b/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.java
new file mode 100644
index 000..41d34e5
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/spi/ExponentialBackoffTimeoutStrategy.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.spi;
+
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+/**
+ * Strategy which incorporates retriable network operation, handling of
totalTimeout logic.
+ * It increases startTimeout based on exponential backoff algorithm.
+ *
+ * If failure detection is enabled it relies on totalTimeout
+ * otherwise implements exponential backoff totalTimeout logic based on
startTimeout, maxTimeout and retryCnt.
+ */
+public class ExponentialBackoffTimeoutStrategy implements TimeoutStrategy {
+/** Default backoff coefficient to calculate next timeout based on backoff
strategy. */
+private static final double DLFT_BACKOFF_COEFF = 2.0;
+
+/** Max timeout of the next try, ms. */
+private final long maxTimeout;
+
+/** Total timeout, ms. */
+private final long totalTimeout;
+
+/** Timestamp of operation start to check totalTimeout. */
+private final long start;
+
+/** Current calculated timeout, ms. */
+private long currTimeout;
+
+/**
+ * Compute expected max backoff timeout based on initTimeout, maxTimeout
and reconCnt and backoff coefficient.
+ *
+ * @param initTimeout Initial timeout.
+ * @param maxTimeout Max Timeout per retry.
+ * @param reconCnt Reconnection count.
+ * @return Calculated total
[ignite] branch master updated: IGNITE-11153 Support Java 11 for control.sh & ignitevisorcmd.sh: remove odd --add-modules for java.xml.bind (#6017)
This is an automated email from the ASF dual-hosted git repository.
dpavlov 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 e70a3b4 IGNITE-11153 Support Java 11 for control.sh &
ignitevisorcmd.sh: remove odd --add-modules for java.xml.bind (#6017)
e70a3b4 is described below
commit e70a3b4dd973a9a8dc7a77c61900304fd5512e48
Author: Peter Ivanov
AuthorDate: Thu Feb 7 14:59:36 2019 +0300
IGNITE-11153 Support Java 11 for control.sh & ignitevisorcmd.sh: remove odd
--add-modules for java.xml.bind (#6017)
---
bin/control.bat| 46 ++
bin/control.sh | 42 --
bin/ignitevisorcmd.bat | 48 +++-
bin/ignitevisorcmd.sh | 36
4 files changed, 129 insertions(+), 43 deletions(-)
diff --git a/bin/control.bat b/bin/control.bat
index d6f9798..7756f12 100644
--- a/bin/control.bat
+++ b/bin/control.bat
@@ -49,10 +49,10 @@ for /f "tokens=* USEBACKQ" %%f in (`%cmd% -version 2^>^&1`)
do (
)
:LoopEscape
-set var=%var:~14%
-set var=%var:"=%
-for /f "tokens=1,2 delims=." %%a in ("%var%") do set MAJOR_JAVA_VER=%%a & set
MINOR_JAVA_VER=%%b
+for /f "tokens=1-3 delims= " %%a in ("%var%") do set JAVA_VER_STR=%%c
+set JAVA_VER_STR=%JAVA_VER_STR:"=%
+for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set
MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
if %MAJOR_JAVA_VER% == 1 set MAJOR_JAVA_VER=%MINOR_JAVA_VER%
if %MAJOR_JAVA_VER% LSS 8 (
@@ -60,14 +60,7 @@ if %MAJOR_JAVA_VER% LSS 8 (
echo The version of JAVA installed in %JAVA_HOME% is incorrect.
echo Please point JAVA_HOME variable to installation of JDK 1.8 or later.
echo You can also download latest JDK at http://java.com/download.
- goto error_finish
-)
-
-if %MAJOR_JAVA_VER% GTR 9 (
- echo %0, WARNING:
-echo The version of JAVA installed in %JAVA_HOME% was not tested with
Apache Ignite.
-echo Run it on your own risk or point JAVA_HOME variable to installation
of JDK 1.8 or JDK 9.
-echo You can also download latest JDK at http://java.com/download.
+goto error_finish
)
:: Check IGNITE_HOME.
@@ -220,7 +213,36 @@ if "%MAIN_CLASS%" == "" set
MAIN_CLASS=org.apache.ignite.internal.commandline.Co
::
:: Final JVM_OPTS for Java 9+ compatibility
::
-if %MAJOR_JAVA_VER% GEQ 9 set JVM_OPTS=--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-modules
java.xml.bind %JVM_OPTS%
+if %MAJOR_JAVA_VER% == 8 (
+set JVM_OPTS= ^
+-XX:+AggressiveOpts ^
+%JVM_OPTS%
+)
+
+if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 (
+set JVM_OPTS= ^
+-XX:+AggressiveOpts ^
+--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
^
+--illegal-access=permit ^
+--add-modules=java.transaction ^
+--add-modules=java.xml.bind ^
+%JVM_OPTS%
+)
+
+if %MAJOR_JAVA_VER% == 11 (
+set JVM_OPTS= ^
+--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
^
+--illegal-access=permit ^
+%JVM_OPTS%
+)
if "%INTERACTIVE%" == "1" (
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT%
%JMX_MON% ^
diff --git a/bin/control.sh b/bin/control.sh
index 7f84696..a883bc8 100755
--- a/bin/control.sh
+++ b/bin/control.sh
@@ -140,16 +140,38 @@ fi
# JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8787
${JVM_OPTS}"
#
-# Final JVM_OPTS for Java 9 compatibility
-#
-${JAVA_HOME}/bin/java -version 2>&1 | grep -qE 'java version "9.*"' && {
-JVM_OPTS="--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-modules java.xml.bind \
- ${JVM_OPTS}"
-} || true
+# Final JVM_OPTS for Java 9+ compatibility
+#
+javaMajorVersion "${JAVA_HOME}/bin/java"
+
+if [ $version -eq 8 ] ; then
+JVM_OPTS="\
+-XX:+AggressiveOpts \
+ ${JVM_OPTS}"
+
+elif [ $version -gt 8 ] && [ $version -lt 11 ];
[ignite] branch master updated: IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes #6026.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade 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 ba48c3f IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This
closes #6026.
ba48c3f is described below
commit ba48c3f1523db543447203c3e0f884e707ba66f7
Author: ipavlukhin
AuthorDate: Thu Feb 7 14:54:53 2019 +0300
IGNITE-10444: MVCC: CacheMvccTxFastFinishTest fixed. This closes #6026.
Signed-off-by: Andrey V. Mashenkov
---
.../cache/CacheMvccTxFastFinishTest.java | 18 --
.../processors/cache/CacheTxFastFinishTest.java| 40 --
2 files changed, 46 insertions(+), 12 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
index 52ea882..e70b6d4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMvccTxFastFinishTest.java
@@ -20,6 +20,8 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteTransactions;
+import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.junit.Ignore;
@@ -31,6 +33,8 @@ import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
public class CacheMvccTxFastFinishTest extends CacheTxFastFinishTest {
/** {@inheritDoc} */
@Override protected void fastFinishTx(Ignite ignite) {
+assert MvccFeatureChecker.forcedMvcc();
+
IgniteTransactions txs = ignite.transactions();
IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -44,7 +48,7 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.get(i);
-checkNormalTxFinish(tx, commit);
+checkNormalTxFinish(tx, commit, true);
}
}
@@ -52,9 +56,19 @@ public class CacheMvccTxFastFinishTest extends
CacheTxFastFinishTest {
try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.put(i, i);
-checkNormalTxFinish(tx, commit);
+checkNormalTxFinish(tx, commit, false);
}
}
}
}
+
+/** {@inheritDoc} */
+@Override protected void checkNormalCommittedTx(IgniteInternalTx tx,
boolean readOnly) {
+if (readOnly)
+assertNull(prepareFuture(tx));
+else
+assertNotNull(prepareFuture(tx));
+
+assertNotNull(finishFuture(tx));
+}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
index 94d272d..85e0991 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
@@ -28,6 +28,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFa
import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import
org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
@@ -37,6 +38,7 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static
org.apache.ignite.testframework.MvccFeatureChecker.Feature.NEAR_CACHE;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
@@ -86,6 +88,8 @@ public class CacheTxFastFinishTest extends
GridCommonAbstractTest {
*/
@Test
public void testFastFinishTxNearCache() throws Exception {
+
[ignite] branch master updated: IGNITE-9998 .NET: Add Partition Preload API implementation (#6011)
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 20a510b IGNITE-9998 .NET: Add Partition Preload API implementation
(#6011)
20a510b is described below
commit 20a510bff275c9fee92e501f687f74a7cee2092c
Author: Ivan Daschinskiy
AuthorDate: Thu Feb 7 11:18:45 2019 +0300
IGNITE-9998 .NET: Add Partition Preload API implementation (#6011)
---
.../processors/platform/cache/PlatformCache.java | 22 ++
.../ExpiryCacheHolderTest.cs | 15 +
.../Apache.Ignite.Core.Tests.csproj| 1 +
.../ApiParity/CacheParityTest.cs | 3 -
.../Cache/CacheTestAsyncWrapper.cs | 15 +
.../Cache/PartitionPreloadTest.cs | 304 +
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 43 +++
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 18 ++
.../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 7 +-
.../platforms/dotnet/Apache.Ignite.sln.DotSettings | 1 +
10 files changed, 424 insertions(+), 5 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 0a33e21..29f2e99 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -335,6 +335,15 @@ public class PlatformCache extends PlatformAbstractTarget {
/** */
public static final int OP_RESET_QUERY_METRICS = 86;
+/** */
+public static final int OP_PRELOAD_PARTITION = 87;
+
+/** */
+public static final int OP_PRELOAD_PARTITION_ASYNC = 88;
+
+/** */
+public static final int OP_LOCAL_PRELOAD_PARTITION = 89;
+
/** Underlying JCache in binary mode. */
private final IgniteCacheProxy cache;
@@ -760,6 +769,14 @@ public class PlatformCache extends PlatformAbstractTarget {
PlatformCacheExtension ext = extension(reader.readInt());
return ext.processInOutStreamLong(this, reader.readInt(),
reader, mem);
+
+case OP_PRELOAD_PARTITION_ASYNC:
+readAndListenFuture(reader,
cache.preloadPartitionAsync(reader.readInt()));
+
+return TRUE;
+
+case OP_LOCAL_PRELOAD_PARTITION:
+return cache.localPreloadPartition(reader.readInt()) ?
TRUE : FALSE;
}
}
catch (Exception e) {
@@ -1116,6 +1133,11 @@ public class PlatformCache extends
PlatformAbstractTarget {
cache.resetQueryMetrics();
return TRUE;
+
+case OP_PRELOAD_PARTITION:
+cache.preloadPartition((int)val);
+
+return TRUE;
}
return super.processInLongOutLong(type, val);
}
diff --git
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/ExpiryCacheHolderTest.cs
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/ExpiryCacheHolderTest.cs
index eb27977..a64fd34 100644
---
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/ExpiryCacheHolderTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/ExpiryCacheHolderTest.cs
@@ -525,6 +525,21 @@ namespace Apache.Ignite.AspNet.Tests
{
throw new NotImplementedException();
}
+
+public void PreloadPartition(int partition)
+{
+throw new NotImplementedException();
+}
+
+public Task PreloadPartitionAsync(int partition)
+{
+throw new NotImplementedException();
+}
+
+public bool LocalPreloadPartition(int partition)
+{
+throw new NotImplementedException();
+}
}
}
}
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 77b68ba..48063a7 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -114,6 +114,7 @@
+
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/CacheParityTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/CacheParityTest.cs
index d0a103f..edb656c5 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/CacheParityTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/CacheParityTest.cs
@@ -58,9 +58,6 @@ namespace
