ignite git commit: IGNITE-2033 Completed base refactoring - Fixes #306.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 da50f0c6c -> 539f819c3
IGNITE-2033 Completed base refactoring - Fixes #306.
Signed-off-by: Andrey
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/539f819c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/539f819c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/539f819c
Branch: refs/heads/ignite-843-rc2
Commit: 539f819c31f240607f4486b9a84f322f185c617f
Parents: da50f0c
Author: Dmitriyff
Authored: Wed Dec 9 14:56:03 2015 +0700
Committer: Andrey
Committed: Wed Dec 9 14:56:03 2015 +0700
--
.../src/main/js/app/data/os.json| 4 +
.../app/directives/loading/loading.directive.js | 27 ++
.../main/js/app/directives/loading/loading.jade | 18 ++
.../ui-ace-docker/ui-ace-docker.controller.js | 43 +++
.../ui-ace-docker/ui-ace-docker.directive.js| 37 +++
.../directives/ui-ace-docker/ui-ace-docker.jade | 35 +++
.../ui-ace-java/ui-ace-java.controller.js | 58
.../ui-ace-java/ui-ace-java.directive.js| 33 +++
.../app/directives/ui-ace-java/ui-ace-java.jade | 28 ++
.../ui-ace-pojos/ui-ace-pojos.controller.js | 89 ++
.../ui-ace-pojos/ui-ace-pojos.directive.js | 37 +++
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 33 +++
.../ui-ace-pom/ui-ace-pom.controller.js | 40 +++
.../ui-ace-pom/ui-ace-pom.directive.js | 32 ++
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 ++
.../ui-ace-xml/ui-ace-xml.controller.js | 38 +++
.../ui-ace-xml/ui-ace-xml.directive.js | 33 +++
.../app/directives/ui-ace-xml/ui-ace-xml.jade | 17 ++
.../js/app/filters/hasPojo/hasPojo.filter.js| 26 ++
.../control-center-web/src/main/js/app/index.js | 37 ++-
.../app/modules/states/configuration/index.js | 16 +-
.../configuration/summary/summary.controller.js | 133 +
.../configuration/summary/summary.resource.js | 41 +++
.../main/js/app/services/UiAceOnLoad/service.js | 36 +++
.../control-center-web/src/main/js/config.js| 1 +
.../main/js/controllers/summary-controller.js | 293 ---
.../src/main/js/gulpfile.js/tasks/copy.js | 4 +-
.../main/js/helpers/generator/generator-xml.js | 2 +-
.../control-center-web/src/main/js/package.json | 1 +
.../js/views/configuration/summary-tabs.jade| 2 +-
.../main/js/views/configuration/summary.jade| 134 +++--
31 files changed, 953 insertions(+), 392 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/data/os.json
--
diff --git a/modules/control-center-web/src/main/js/app/data/os.json
b/modules/control-center-web/src/main/js/app/data/os.json
new file mode 100644
index 000..5b67c37
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/data/os.json
@@ -0,0 +1,4 @@
+[
+ "debian:8",
+ "ubuntu:14.10"
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
--
diff --git
a/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
new file mode 100644
index 000..7cb3769
--- /dev/null
+++
b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
@@ -0,0 +1,27 @@
+/*
+ * 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 template from './loading.jade!';
+
+export default ['igniteLoading', [() => {
+ return {
+ restrict: 'E',
+ template,
+ replace: true,
+ transclude: true
+ }
+}]]
http://git-wip-us.apache.org/repos/asf/ignite/blob/539f819c/modules/control-center-web/src/main/js/app/directives/loading/loading.jade
---
ignite git commit: 1.5.1-b2-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.5.1 ebb4aa63b -> e450fbbd4 1.5.1-b2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e450fbbd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e450fbbd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e450fbbd Branch: refs/heads/ignite-1.5.1 Commit: e450fbbd40137c3f29c13982f3ebb89b8b3888a2 Parents: ebb4aa6 Author: Ignite Teamcity Authored: Wed Dec 9 10:42:52 2015 +0300 Committer: Ignite Teamcity Committed: Wed Dec 9 10:42:52 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml| 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml| 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml| 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac| 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac| 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml| 2 +- modules/slf4j/pom.xml| 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +- mo
[47/50] [abbrv] ignite git commit: Fix OSGi test.
Fix OSGi test.
(@ProbeBuilder applies to all test classes when run from a suite).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bdbe4068
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bdbe4068
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bdbe4068
Branch: refs/heads/ignite-1.5.1
Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9
Parents: 3baf4d1
Author: Raul Kripalani
Authored: Tue Dec 8 21:04:36 2015 +0100
Committer: Raul Kripalani
Committed: Tue Dec 8 21:04:36 2015 +0100
--
.../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
--
diff --git
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 9a2e92d..4f875ed 100644
---
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends
AbstractIgniteKarafTest {
*/
@ProbeBuilder
public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
-probe.setHeader(Constants.IMPORT_PACKAGE,
"*,org.apache.ignite.osgi.activators");
+probe.setHeader(Constants.IMPORT_PACKAGE,
"*,org.apache.ignite.osgi.activators;resolution:=\"optional\"");
return probe;
}
[44/50] [abbrv] ignite git commit: 2064 Issue url fix
2064 Issue url fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c30def8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c30def8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c30def8f
Branch: refs/heads/ignite-1.5.1
Commit: c30def8f049bddb4ec272528326f84bf90a1399b
Parents: 0e81a39
Author: Anton Vinogradov
Authored: Tue Dec 8 16:48:58 2015 +0300
Committer: Anton Vinogradov
Committed: Tue Dec 8 16:48:58 2015 +0300
--
.../internal/processors/cache/GridCacheDeploymentSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c30def8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index aa64959..bfa353b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -228,7 +228,7 @@ public class GridCacheDeploymentSelfTest extends
GridCommonAbstractTest {
Ignite g1 = startGrid(1);
if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
-fail("http://atlassian.gridgain.com/jira/browse/GG-10791";);
+fail("https://issues.apache.org/jira/browse/IGNITE-2106";);
Ignite g2 = startGrid(2);
[02/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b60c75c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b60c75c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b60c75c Branch: refs/heads/ignite-1.5.1 Commit: 9b60c75c62d2e352a4a65b7c5a0b17bc79499ba8 Parents: f770954 ae40e2d Author: sboikov Authored: Thu Dec 3 10:42:50 2015 +0300 Committer: sboikov Committed: Thu Dec 3 10:42:50 2015 +0300 -- .../org/apache/ignite/configuration/IgniteConfiguration.java| 4 ++-- .../cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) --
[28/50] [abbrv] ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache
IGNITE-2083 EntryProcessor is called twice on primary node in transactional
cache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a14d643
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a14d643
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a14d643
Branch: refs/heads/ignite-1.5.1
Commit: 9a14d6432932fc1a1fdf2ddd77dea920382efe8c
Parents: c10b112
Author: sboikov
Authored: Mon Dec 7 15:05:09 2015 +0300
Committer: sboikov
Committed: Mon Dec 7 15:05:09 2015 +0300
--
.../distributed/dht/GridDhtTxPrepareFuture.java | 51 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../IgniteCacheEntryProcessorCallTest.java | 497 +++
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 7 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
7 files changed, 558 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 9f1f8a1..3829e28 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -337,6 +337,13 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture,
Object[]> t : txEntry.entryProcessors()) {
-try {
-CacheInvokeEntry
invokeEntry = new CacheInvokeEntry<>(
-txEntry.context(), key, val,
txEntry.cached().version(), txEntry.keepBinary());
+ CacheInvokeEntry invokeEntry
= new CacheInvokeEntry<>(
+ txEntry.context(), key, val,
txEntry.cached().version(), txEntry.keepBinary());
+ try {
EntryProcessor
processor = t.get1();
procRes = processor.process(invokeEntry,
t.get2());
@@ -380,9 +389,27 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture(op,
op == NOOP ? null : val));
if (retVal) {
if (err != null || procRes != null)
@@ -1301,10 +1328,12 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture procVal =
entry.entryProcessorCalculatedValue();
+
+assert procVal != null : entry;
-entry.op(procVal == null ? DELETE : UPDATE);
-entry.value(procVal, true, false);
+entry.op(procVal.get1());
+entry.value(procVal.get2(), true, false);
entry.entryProcessors(null);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 3065ac2..53f4f56 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1233,6 +1233,11 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter
if (F.isEmpty(txEntry.entryProcessors()))
return F.t(txEntry.op(), txEntry.value());
else {
+T2 calcVal =
txEntry.entryProcessorCalculatedValue();
+
+if (calcVal != null)
+return calcVal;
+
boolean recordEvt =
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ);
CacheObject cacheVal = txEntry.hasValue() ? txEntry.value() :
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
-
[09/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a7ae644..4fd7156 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,15 +35,87 @@
fabric
-2.4.1
-1.5.2
-4.1.0.RELEASE
+
+
UTF-8
d
doxygen
git
-9.2.11.v20150529
+2.5.4
-XDenableSunApiLintControl
+
+
+5.12.0
+1.0_6
+4.2
+1.7.2_1
+1.7.2
+1.10.12_1
+1.10.29
+2.16.0
+
1.8.3_1
+1.8.3
+1.6
+3.2.1
+2.6
+2.2.5
+2.9.1
+1.0.6_1
+1.0.6
+1.6.0
+2.0.0
+18.0
+14.0.1
+16.0.1
+1.3.175
+2.4.1
+4.5.1
+4.4.3
+1.9.13
+1.0.0_1
+1.0.0
+9.2.11.v20150529
+1.1.1
+0.1.53_1
+0.1.53
+2.4_1
+2.4
+r938
+0.8.2.1_1
+0.8.2.0_1
+0.8.2.0
+0.8.2.1
+0.8.2.1
+4.0.2
+3.5.0_1
+3.5.0
+2.0.8_6
+5.0.0
+5.0.0
+1.0.2
+2.10.4
+2.10.4
+2.11.7
+1.7.7
+1.6.4
+1.5.2
+4.1.0.RELEASE
+
4.1.7.RELEASE_1
+8.0.23
+2.2.0
+
2.2.0
+2.2.0
+0.5
+3.4.6
+
+
+*
+{local-packages}
+
+
+false
+false
+
org.apache.ignite
@@ -182,6 +254,15 @@
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+true
+
+
+
org.apache.maven.plugins
maven-javadoc-plugin
@@ -402,6 +483,52 @@
+
+
+org.apache.felix
+maven-bundle-plugin
+${maven.bundle.plugin.version}
+true
+
+
+true
+
+
+jar
+war
+
+
+
${project.groupId}.${project.artifactId}
+${project.version}
+
${project.organization.name}
+
${project.description}
+${project.url}
+
+${osgi.import.package}
+
+
+${osgi.export.package}
+
+
+${osgi.private.package}
+
+
${osgi.embed.dependency}
+lib
+
${osgi.embed.transitive}
+<_failok>${osgi.fail.ok}
+<_invalidfilenames />
+
+
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+
@@ -625,6 +752,7 @@
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5f86648..993eab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,9 @@
modules/mqtt
modules/zookeeper
modules/camel
+modules/osgi-paxlogging
+modules/osgi-karaf
+modules/osgi
[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: benchmarks/cache-comparison/pom.xml benchmarks/filesystem/hadoop1/pom.xml benchmarks/filesystem/hadoop2/pom.xml benchmarks/mongo/pom.xml benchmarks/risk-analytics/pom.xml benchmarks/serialization/pom.xml benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs examples/pom.xml modules/clients/pom.xml modules/codegen/pom.xml modules/compatibility/pom.xml modules/core/pom.xml modules/core/src/main/resources/gridgain.properties modules/diagnostic/pom.xml modules/dr-demo/pom.xml modules/license-gen/pom.xml modules/mongo-sniffer/pom.xml modules/mongo-visor/pom.xml modules/mongo/pom.xml modules/platforms/cpp/core-test/configure.ac modules/platforms/cpp/core/configure.ac modules/platforms/cpp/examples/configure.ac modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs modules/tools/pom.xml modules/visor-console/pom.xml modules/visor-demo/pom.xml modules/visor-tester-plugin/pom.xml modules/visor-tester/pom.xml modules/visor/pom.xml modules/yardstick/dotnet/Properties/AssemblyInfo.cs modules/yardstick/pom.xml parent/pom.xml pilots/chronotrack/pom.xml pilots/ctb/pom.xml pilots/dsi/pom.xml pilots/ionic/pom.xml pilots/sb/pom.xml pilots/sony/pom.xml pilots/wellsfargo/pom.xml pilots/worldpay/pom.xml pom.xml Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: examples/pom.xml examples/schema-import/pom.xml modules/aop/pom.xml modules/apache-license-gen/pom.xml modules/aws/pom.xml modules/camel/pom.xml modules/clients/pom.xml modules/cloud/pom.xml modules/codegen/pom.xml modules/core/pom.xml modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java modules/core/src/main/resources/ignite.properties modules/extdata/p2p/pom.xml modules/extdata/uri/modules/uri-dependency/pom.xml modules/extdata/uri/pom.xml modules/flume/pom.xml modules/gce/pom.xml modules/geospatial/pom.xml modules/hadoop/pom.xml modules/hibernate/pom.xml modules/indexing/pom.xml modules/jcl/pom.xml modules/jms11/pom.xml modules/jta/pom.xml modules/kafka/pom.xml modules/log4j/pom.xml modules/log4j2/pom.xml modules/mesos/pom.xml modules/mqtt/pom.xml modules/platforms/cpp/common/configure.ac modules/platforms/cpp/core-test/configure.ac modules/platforms/cpp/core/configure.ac modules/platforms/cpp/examples/configure.ac modules/platforms/cpp/ignite/configure.ac modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs modules/rest-http/pom.xml modules/scalar-2.10/pom.xml modules/scalar/pom.xml modules/schedule/pom.xml modules/schema-import/pom.xml modules/slf4j/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/spring/pom.xml modules/ssh/pom.xml modules/tools/pom.xml modules/twitter/pom.xml modules/urideploy/pom.xml modules/visor-console-2.10/pom.xml modules/visor-console/pom.xml modules/visor-plugins/pom.xml modules/web/pom.xml modules/yardstick/pom.xml modules/yarn/pom.xml modules/zookeeper/pom.xml pom.xml Project: http://git
[10/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/modules/osgi/licenses/apache-2.0.txt -- diff --git a/modules/osgi/licenses/apache-2.0.txt b/modules/osgi/licenses/apache-2.0.txt new file mode 100644 index 000..d645695 --- /dev/null +++ b/modules/osgi/licenses/apache-2.0.txt @@ -0,0 +1,202 @@ + + 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, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) wa
[14/50] [abbrv] ignite git commit: ignite-2008 Call removeExplicitNodeLocks before waiting for partitionReleaseFuture.
ignite-2008 Call removeExplicitNodeLocks before waiting for
partitionReleaseFuture.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/baab3d2b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/baab3d2b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/baab3d2b
Branch: refs/heads/ignite-1.5.1
Commit: baab3d2b6e047f32f33f1174474683096f2eb373
Parents: 171e9b1
Author: sboikov
Authored: Fri Dec 4 09:04:00 2015 +0300
Committer: sboikov
Committed: Fri Dec 4 09:04:00 2015 +0300
--
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 9 -
.../distributed/dht/GridCacheTxNodeFailureSelfTest.java | 2 ++
.../distributed/dht/GridNearCacheTxNodeFailureSelfTest.java | 4
.../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 2 ++
4 files changed, 8 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index f7e6acc..31bfa79 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -754,6 +754,9 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapter locksFut =
cctx.mvcc().finishLocks(exchId.topologyVersion());
dumpedObjects = 0;
@@ -1015,9 +1015,8 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index fe0b84e..78e7672 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -295,6 +295,8 @@ public class GridCacheTxNodeFailureSelfTest extends
GridCommonAbstractTest {
// Check that thread successfully finished.
fut.get();
+awaitPartitionMapExchange();
+
// Check there are no hanging transactions.
assertEquals(0,
((IgniteEx)ignite(0)).context().cache().context().tm().idMapSize());
assertEquals(0,
((IgniteEx)ignite(2)).context().cache().context().tm().idMapSize());
http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
index ca23646..5735182 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNearCacheTxNodeFailureSelfTest.java
@@ -28,8 +28,4 @@ public class GridNearCacheTxNodeFailureSelfTest extends
GridCacheTxNodeFailureSe
@Override protected CacheConfiguration cacheConfiguration(String gridName)
{
return super.cacheConfiguration(gridName).setNearConfiguration(new
NearCacheConfiguration());
}
-
-@Override public void testPrimaryNodeFailureBackupCommitImplicit(){
-fail("https://issues.apache.org/jira/browse/IGNITE-1611";);
-}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baab3d2b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
--
diff --git
a/modules/core/s
[42/50] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/568f910f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/568f910f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/568f910f
Branch: refs/heads/ignite-1.5.1
Commit: 568f910f11472e6ab533c3f1cef6f197456e006f
Parents: efe632b
Author: Pavel Tupitsyn
Authored: Tue Dec 8 16:35:51 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Dec 8 16:35:51 2015 +0300
--
.../Apache.Ignite.Core.csproj | 1 +
.../Apache.Ignite.Core/Impl/NativeMethods.cs| 10 -
.../Impl/Unmanaged/IgniteJniNativeMethods.cs| 358 +
.../Impl/Unmanaged/UnmanagedUtils.cs| 788 +++
modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++-
5 files changed, 798 insertions(+), 681 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 2c7d787..831130c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -297,6 +297,7 @@
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
internal static extern IntPtr LoadLibrary(string path);
-
-///
-/// Get procedure address with WinAPI.
-///
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
new file mode 100644
index 000..860e703
--- /dev/null
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -0,0 +1,358 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+using System.Runtime.InteropServices;
+using System.Security;
+
+///
+/// Ignite JNI native methods.
+///
+[SuppressUnmanagedCodeSecurity]
+internal unsafe static class IgniteJniNativeMethods
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate")]
+public static extern int Reallocate(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
+long dataPtr);
+
+[DllImport(IgniteUtils.File
[07/50] [abbrv] ignite git commit: Hotfix IGNITE-2079
Hotfix IGNITE-2079
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc0131da
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc0131da
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc0131da
Branch: refs/heads/ignite-1.5.1
Commit: dc0131da6582fb0f0d1ff25c62eb7462e5f460af
Parents: 86ec37e
Author: Anton Vinogradov
Authored: Thu Dec 3 16:52:26 2015 +0300
Committer: Anton Vinogradov
Committed: Thu Dec 3 16:52:26 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/dc0131da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index b06526e..9a391e5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -562,7 +562,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
default:
throw new IgniteCheckedException("Failed to send response to
node. Unsupported direct type [message="
-+ msg + "]");
++ msg + "]", msg.classError());
}
}
[29/50] [abbrv] ignite git commit: IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.
IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebddcb18
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebddcb18
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebddcb18
Branch: refs/heads/ignite-1.5.1
Commit: ebddcb187231c08bcf53a7c567f10064393a8e60
Parents: 9a14d64
Author: Alexey Goncharuk
Authored: Mon Dec 7 20:11:48 2015 +0300
Committer: Alexey Goncharuk
Committed: Mon Dec 7 20:11:48 2015 +0300
--
.../configuration/CacheConfiguration.java | 34 -
...cheDuplicateEntityConfigurationSelfTest.java | 126 +++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
3 files changed, 159 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 034d20d..af3530a 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1872,7 +1872,20 @@ public class CacheConfiguration extends
MutableConfiguration {
TypeDescriptor desc = processKeyAndValueClasses(keyCls, valCls);
-qryEntities.add(convert(desc));
+QueryEntity converted = convert(desc);
+
+boolean dup = false;
+
+for (QueryEntity entity : qryEntities) {
+if (F.eq(entity.getValueType(), converted.getValueType())) {
+dup = true;
+
+break;
+}
+}
+
+if (!dup)
+qryEntities.add(converted);
}
return this;
@@ -1968,10 +1981,21 @@ public class CacheConfiguration extends
MutableConfiguration {
public CacheConfiguration setQueryEntities(Collection
qryEntities) {
if (this.qryEntities == null)
this.qryEntities = new ArrayList<>(qryEntities);
-else if (indexedTypes != null)
-this.qryEntities.addAll(qryEntities);
-else
-throw new CacheException("Query entities can be set only once.");
+
+for (QueryEntity entity : qryEntities) {
+boolean found = false;
+
+for (QueryEntity existing : this.qryEntities) {
+if (F.eq(entity.getValueType(), existing.getValueType())) {
+found = true;
+
+break;
+}
+}
+
+if (!found)
+this.qryEntities.add(entity);
+}
return this;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
new file mode 100644
index 000..8311213
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apac
[19/50] [abbrv] ignite git commit: Javadoc hotfix
Javadoc hotfix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a109ebd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a109ebd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a109ebd Branch: refs/heads/ignite-1.5.1 Commit: 6a109ebd4c637b3ec6e298ae8cf785c422abebc1 Parents: d5fa3c1 Author: Anton Vinogradov Authored: Fri Dec 4 13:42:25 2015 +0300 Committer: Anton Vinogradov Committed: Fri Dec 4 13:42:25 2015 +0300 -- parent/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6a109ebd/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4fd7156..68ba62b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -428,6 +428,10 @@ Spark Integration org.apache.ignite.spark.examples.java + +OSGi integration +org.apache.ignite.osgi* +
[01/50] [abbrv] ignite git commit: ignite-2008 Added test reproducing issue.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.1 250aa4f90 -> ebb4aa63b
ignite-2008 Added test reproducing issue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7709543
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7709543
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7709543
Branch: refs/heads/ignite-1.5.1
Commit: f7709543c7e6652dc276e38629f2f1d1315fa84e
Parents: e7298ad
Author: sboikov
Authored: Thu Dec 3 10:42:15 2015 +0300
Committer: sboikov
Committed: Thu Dec 3 10:42:15 2015 +0300
--
.../CacheLockReleaseNodeLeaveTest.java | 51
1 file changed, 51 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7709543/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
index 956aaef..e84fd3f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
@@ -29,9 +29,12 @@ import
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
/**
*
@@ -107,4 +110,52 @@ public class CacheLockReleaseNodeLeaveTest extends
GridCommonAbstractTest {
fut2.get(5, SECONDS);
}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTxLockRelease() throws Exception {
+startGrids(2);
+
+final Ignite ignite0 = ignite(0);
+final Ignite ignite1 = ignite(1);
+
+final Integer key = primaryKey(ignite1.cache(null));
+
+IgniteInternalFuture fut1 = GridTestUtils.runAsync(new
Callable() {
+@Override public Void call() throws Exception {
+Transaction tx = ignite0.transactions().txStart(PESSIMISTIC,
REPEATABLE_READ);
+
+ignite0.cache(null).get(key);
+
+return null;
+}
+}, "lock-thread1");
+
+fut1.get();
+
+IgniteInternalFuture fut2 = GridTestUtils.runAsync(new
Callable() {
+@Override public Void call() throws Exception {
+try (Transaction tx =
ignite1.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
+log.info("Start tx lock.");
+
+ignite1.cache(null).get(key);
+
+log.info("Tx locked key.");
+
+tx.commit();
+}
+
+return null;
+}
+}, "lock-thread2");
+
+U.sleep(1000);
+
+log.info("Stop node.");
+
+ignite0.close();
+
+fut2.get(5, SECONDS);
+}
}
[46/50] [abbrv] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.
ignite-1.5 Cache map refactoring. This closes #279.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3baf4d16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3baf4d16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3baf4d16
Branch: refs/heads/ignite-1.5.1
Commit: 3baf4d163c6edafa7367ece7901ad1efe695a8d4
Parents: c30def8
Author: sboikov
Authored: Tue Dec 8 17:30:14 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 17:30:14 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 65 +-
.../cache/GridCacheConcurrentMap.java | 734 +--
.../processors/cache/GridCacheMapEntry.java | 44 +-
.../cache/GridCacheMapEntryFactory.java | 13 +-
.../distributed/GridDistributedCacheEntry.java | 14 +-
.../distributed/dht/GridDhtCacheAdapter.java| 13 +-
.../distributed/dht/GridDhtCacheEntry.java | 14 +-
.../dht/GridDhtOffHeapCacheEntry.java | 15 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 23 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 16 +-
.../atomic/GridDhtAtomicOffHeapCacheEntry.java | 15 +-
.../dht/colocated/GridDhtColocatedCache.java| 13 +-
.../colocated/GridDhtColocatedCacheEntry.java | 14 +-
.../GridDhtColocatedOffHeapCacheEntry.java | 15 +-
.../colocated/GridDhtDetachedCacheEntry.java| 4 +-
.../distributed/near/GridNearCacheAdapter.java | 8 +-
.../distributed/near/GridNearCacheEntry.java| 16 +-
.../near/GridNearOffHeapCacheEntry.java | 15 +-
.../processors/cache/local/GridLocalCache.java | 8 +-
.../cache/local/GridLocalCacheEntry.java| 15 +-
.../local/atomic/GridLocalAtomicCache.java | 8 +-
.../ignite/internal/util/IgniteUtils.java | 18 +-
.../cache/GridCacheAlwaysEvictionPolicy.java| 2 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 11 -
.../loadtests/hashmap/GridHashMapLoadTest.java | 4 +-
26 files changed, 357 insertions(+), 764 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f96954e..034640f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -925,25 +925,60 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache t =
map.putEntryIfObsoleteOrAbsent(topVer, key, null, create);
+GridCacheMapEntry cur = map.getEntry(key);
-GridCacheEntryEx cur = t.get1();
-GridCacheEntryEx created = t.get2();
-GridCacheEntryEx doomed = t.get3();
+if (cur == null || cur.obsolete()) {
+GridTriple t = map.putEntryIfObsoleteOrAbsent(
+topVer,
+key,
+null,
+create);
-if (doomed != null &&
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
-// Event notification.
-ctx.events().addEvent(doomed.partition(), doomed.key(), locNodeId,
(IgniteUuid)null, null,
-EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null,
null, null, true);
+cur = t.get1();
-if (created != null) {
-// Event notification.
-if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
-ctx.events().addEvent(created.partition(), created.key(),
locNodeId, (IgniteUuid)null, null,
-EVT_CACHE_ENTRY_CREATED, null, false, null, false, null,
null, null, true);
+GridCacheEntryEx created = t.get2();
+GridCacheEntryEx doomed = t.get3();
-if (touch)
-ctx.evicts().touch(cur, topVer);
+if (doomed != null &&
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
+// Event notification.
+ctx.events().addEvent(doomed.partition(),
+doomed.key(),
+locNodeId,
+(IgniteUuid)null,
+null,
+EVT_CACHE_ENTRY_DESTROYED,
+null,
+false,
+null,
+false,
+null,
+null,
+null,
+true);
+
+if (created != null) {
+// Event notifica
[15/50] [abbrv] ignite git commit: IGNITE-1947 More info about why query was not found in error message.
IGNITE-1947 More info about why query was not found in error message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6f6f407
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6f6f407
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6f6f407
Branch: refs/heads/ignite-1.5.1
Commit: e6f6f407ef4f0c3555fd80fe5ba328739d94e3f0
Parents: baab3d2
Author: Alexey Kuznetsov
Authored: Fri Dec 4 15:14:49 2015 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 4 15:14:49 2015 +0700
--
.../processors/rest/handlers/query/QueryCommandHandler.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e6f6f407/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
index bb929a4..0c44077 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
@@ -443,14 +443,16 @@ public class QueryCommandHandler extends
GridRestCommandHandlerAdapter {
if (qryCurIt == null)
return new GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Failed to find query with ID: " + req.queryId());
+"Failed to find query with ID: " + req.queryId() + ".
" +
+"Possible reasons: wrong query ID, no more data to
fetch from query, query was closed by timeout" +
+" or node where query was executed is not found.");
qryCurIt.lock();
try {
if (qryCurIt.timestamp() == -1)
return new
GridRestResponse(GridRestResponse.STATUS_FAILED,
-"Query is closed by timeout. Restart query with
ID: " + req.queryId());
+"Query with ID: " + req.queryId() + " was closed
by timeout");
qryCurIt.timestamp(U.currentTimeMillis());
[39/50] [abbrv] ignite git commit: Fixed race in IgniteTransactionalWriteInvokeBenchmark test.
Fixed race in IgniteTransactionalWriteInvokeBenchmark test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a340034
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a340034
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a340034
Branch: refs/heads/ignite-1.5.1
Commit: 3a340034056f5da0ca00ed88e128b59cc28381d2
Parents: efe632b
Author: ashutak
Authored: Tue Dec 8 16:02:36 2015 +0300
Committer: ashutak
Committed: Tue Dec 8 16:02:36 2015 +0300
--
.../config/benchmark-failover.properties| 2 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
2 files changed, 33 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/config/benchmark-failover.properties
--
diff --git a/modules/yardstick/config/benchmark-failover.properties
b/modules/yardstick/config/benchmark-failover.properties
index 7ed464c..352e2d4 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -60,7 +60,7 @@ RESTART_SERVERS=true
SERVER_HOSTS=localhost,localhost
# Comma-separated list of the hosts to run BenchmarkDrivers on.
-DRIVER_HOSTS=localhost
+DRIVER_HOSTS=localhost,localhost
# Remote username.
# REMOTE_USER=
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 35befad..67044a1 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -25,9 +25,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.affinity.Affinity;
@@ -58,29 +60,49 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
/** */
private static final Long INITIAL_VALUE = 1L;
+/** */
+public static final int TIMEOUT_SEC = 20 * 60;
+
/** {@inheritDoc} */
@Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
super.setUp(cfg);
assert args.keysCount() > 0 : "Count of keys: " + args.keysCount();
-println(cfg, "Populating data...");
+IgniteCountDownLatch latch =
ignite().countDownLatch("DATA-POPULATED-LATCH-" + cacheName(), 1, true, true);
+
+if (cfg.memberId() == 0) {
+println(cfg, "Populating data for cache: " + cacheName());
-long start = System.nanoTime();
+long start = System.nanoTime();
-try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
+}
}
+
+println(cfg, "Finished populating data in " + ((System.nanoTime()
- start) / 1_000_000)
++ " ms. for cache: " + cacheName());
+
+latch.countDown();
}
+else {
+println(cfg, "Waiting for populating data in cache b
[33/50] [abbrv] ignite git commit: ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException
ignite-1692 Changed test initialization logic to remove race confition that
caused ClusterTopologyServerNotFoundException
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cd0039a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cd0039a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cd0039a
Branch: refs/heads/ignite-1.5.1
Commit: 5cd0039a535b4c2ea7434d4b085c9e18f28c930d
Parents: d579183
Author: sboikov
Authored: Tue Dec 8 13:12:24 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 13:12:24 2015 +0300
--
.../DataStreamProcessorSelfTest.java| 25
1 file changed, 15 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5cd0039a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 65dd690..9fedc35 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -206,14 +206,17 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
@SuppressWarnings("ErrorNotRethrown")
private void checkDataStreamer() throws Exception {
try {
-Ignite g1 = startGrid(1);
-
useCache = true;
-Ignite g2 = startGrid(2);
+Ignite igniteWithCache = startGrid(2);
+
startGrid(3);
-final IgniteDataStreamer ldr =
g1.dataStreamer(null);
+useCache = false;
+
+Ignite igniteWithoutCache = startGrid(1);
+
+final IgniteDataStreamer ldr =
igniteWithoutCache.dataStreamer(null);
ldr.receiver(DataStreamerCacheUpdaters.batchedSorted());
@@ -255,7 +258,7 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
assertEquals(total, s2 + s3);
-final IgniteDataStreamer rmvLdr =
g2.dataStreamer(null);
+final IgniteDataStreamer rmvLdr =
igniteWithCache.dataStreamer(null);
rmvLdr.receiver(DataStreamerCacheUpdaters.batchedSorted());
@@ -443,15 +446,17 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
// Start all required nodes.
int idx = 1;
-for (int i = 0; i < nodesCntNoCache; i++)
-startGrid(idx++);
-
useCache = true;
for (int i = 0; i < nodesCntCache; i++)
startGrid(idx++);
-Ignite g1 = grid(1);
+useCache = false;
+
+for (int i = 0; i < nodesCntNoCache; i++)
+startGrid(idx++);
+
+Ignite g1 = grid(idx - 1);
// Get and configure loader.
final IgniteDataStreamer ldr =
g1.dataStreamer(null);
@@ -1019,4 +1024,4 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
}
}
}
-}
\ No newline at end of file
+}
[16/50] [abbrv] ignite git commit: IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.
IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292.
Signed-off-by: Andrey
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11d668b2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11d668b2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11d668b2
Branch: refs/heads/ignite-1.5.1
Commit: 11d668b2f77b12e7dc9bbc8ebdbfeb5e2ddad716
Parents: e6f6f40
Author: Andrey
Authored: Fri Dec 4 15:52:14 2015 +0700
Committer: Andrey
Committed: Fri Dec 4 15:52:14 2015 +0700
--
.../org/apache/ignite/schema/ui/SchemaImportApp.java | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/11d668b2/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 495c316..6f9e05b 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.net.URL;
import java.net.URLClassLoader;
import java.sql.Connection;
@@ -1738,6 +1739,19 @@ public class SchemaImportApp extends Application {
catch (Exception ignore) {
// No-op.
}
+
+// Workaround for JDK 7/JavaFX 2 application on Mac OSX El Capitan.
+try {
+Class fontFinderCls =
Class.forName("com.sun.t2k.MacFontFinder");
+
+Field psNameToPathMap =
fontFinderCls.getDeclaredField("psNameToPathMap");
+
+psNameToPathMap.setAccessible(true);
+psNameToPathMap.set(null, new HashMap());
+}
+catch (Exception ignore) {
+// No-op.
+}
}
launch(args);
[23/50] [abbrv] ignite git commit: Printing "Failed to register marshalled class" warning in the versbose mode only
Printing "Failed to register marshalled class" warning in the versbose mode only
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8033bc46
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8033bc46
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8033bc46
Branch: refs/heads/ignite-1.5.1
Commit: 8033bc46df9087971e72187ff75557749cee3f7b
Parents: 3d585d5
Author: Denis Magda
Authored: Sun Dec 6 11:38:17 2015 +0300
Committer: Denis Magda
Committed: Sun Dec 6 11:38:17 2015 +0300
--
.../org/apache/ignite/internal/MarshallerContextImpl.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8033bc46/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 5c9b54f..276cdc3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -123,10 +123,9 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
}
catch (CachePartialUpdateCheckedException |
GridCacheTryPutFailedException e) {
if (++failedCnt > 10) {
-String msg = "Failed to register marshalled class for more
than 10 times in a row " +
-"(may affect performance).";
-
-U.quietAndWarn(log, msg, msg);
+if (log.isQuiet())
+U.quiet(false, "Failed to register marshalled class for
more than 10 times in a row " +
+"(may affect performance).");
failedCnt = 0;
}
[48/50] [abbrv] ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis
ignite-2030 Fixed issue with JAVA_HOME containing parenthesis
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69047243
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69047243
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69047243
Branch: refs/heads/ignite-1.5.1
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov
Committed: Wed Dec 9 09:27:23 2015 +0300
--
bin/ignite.bat| 5 +++--
bin/include/parseargs.bat | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 43cc58b..97c2e45 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -20,6 +20,7 @@
::
@echo off
+Setlocal EnableDelayedExpansion
if "%OS%" == "Windows_NT" setlocal
@@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 (
:: Process 'restart'.
::
set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP%
org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
-for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set
RANDOM_NUMBER=%%i
+for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set
RANDOM_NUMBER=%%i
set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
@@ -132,7 +133,7 @@ set
RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
:: This is executed if -nojmx is not specified
::
if not "%NO_JMX%" == "1" (
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP%
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP%
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
set JMX_PORT=%%A
)
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat
--
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index c4b35d2..86e5766 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -40,7 +40,7 @@
:: in other scripts to parse common command lines parameters.
set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP%
org.apache.ignite.startup.cmdline.CommandLineTransformer %*
-for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set
reformattedArgs=%%i
+for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set
reformattedArgs=%%i
for %%i in (%reformattedArgs%) do (
if "%%i" == "CommandLineTransformerError" exit /b 1
[32/50] [abbrv] ignite git commit: ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from reconnect callback)
ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from
reconnect callback)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5791837
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5791837
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5791837
Branch: refs/heads/ignite-1.5.1
Commit: d5791837890a70e1777b86aab281245701afe1eb
Parents: 3b26859
Author: sboikov
Authored: Tue Dec 8 12:42:25 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 12:42:25 2015 +0300
--
.../apache/ignite/internal/GridComponent.java | 3 +-
.../ignite/internal/GridPluginComponent.java| 4 +-
.../apache/ignite/internal/IgniteKernal.java| 18 +++-
.../internal/managers/GridManagerAdapter.java | 5 +-
.../deployment/GridDeploymentManager.java | 5 +-
.../processors/GridProcessorAdapter.java| 5 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../processors/cache/GridCacheProcessor.java| 26 +-
.../datastructures/DataStructuresProcessor.java | 4 +-
.../IgniteClientReconnectAbstractTest.java | 95 +---
.../IgniteClientReconnectAtomicsTest.java | 57
.../IgniteClientReconnectCacheTest.java | 5 +-
.../IgniteClientReconnectCollectionsTest.java | 51 +++
13 files changed, 254 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 6078c5d..0e234cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -131,6 +131,7 @@ public interface GridComponent {
*
* @param clusterRestarted Cluster restarted flag.
* @throws IgniteCheckedException If failed.
+ * @return Future to wait before completing reconnect future.
*/
-public void onReconnected(boolean clusterRestarted) throws
IgniteCheckedException;
+@Nullable public IgniteInternalFuture onReconnected(boolean
clusterRestarted) throws IgniteCheckedException;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index ac2a3a7..89dc243 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -70,8 +70,8 @@ public class GridPluginComponent implements GridComponent {
}
/** {@inheritDoc} */
-@Override public void onReconnected(boolean clusterRestarted) {
-// No-op.
+@Override public IgniteInternalFuture onReconnected(boolean
clusterRestarted) {
+return null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 87ccf93..ab62c13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -136,6 +136,7 @@ import
org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
import org.apache.ignite.internal.processors.task.GridTaskProcessor;
import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
import org.apache.ignite.internal.util.GridTimerTask;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
@@ -3083,16 +3084,27 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
/**
* @param clusterRestarted {@code True} if all cluster nodes restarted
while client was disconnected.
*/
+@SuppressWarnings("unchecked")
public void onReconnected(final boolean clusterRestarted) {
Throwable err =
[04/50] [abbrv] ignite git commit: IGNITE-2074 Platforms C++ files have 1.5.0-EA version
IGNITE-2074 Platforms C++ files have 1.5.0-EA version Signed-off-by: Anton Vinogradov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86ec37e5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86ec37e5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86ec37e5 Branch: refs/heads/ignite-1.5.1 Commit: 86ec37e5e7bb6302ebff35fecb5576206adc1e1a Parents: ad9e4db Author: Pavel Tupitsyn Authored: Thu Dec 3 12:45:29 2015 +0300 Committer: Anton Vinogradov Committed: Thu Dec 3 14:48:00 2015 +0300 -- pom.xml | 41 + 1 file changed, 29 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/86ec37e5/pom.xml -- diff --git a/pom.xml b/pom.xml index 109dc94..5f86648 100644 --- a/pom.xml +++ b/pom.xml @@ -774,20 +774,37 @@
[43/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e81a397 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e81a397 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e81a397 Branch: refs/heads/ignite-1.5.1 Commit: 0e81a3973cccfe6d912e073cd9f44db5a5c46d79 Parents: 568f910 3a34003 Author: vozerov-gridgain Authored: Tue Dec 8 16:36:12 2015 +0300 Committer: vozerov-gridgain Committed: Tue Dec 8 16:36:12 2015 +0300 -- .../config/benchmark-failover.properties| 2 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++- 2 files changed, 33 insertions(+), 11 deletions(-) --
[35/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2927480 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2927480 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2927480 Branch: refs/heads/ignite-1.5.1 Commit: c292748013acfcbf6b3752183a34bb26de16c1f4 Parents: 322a85a 5cd0039 Author: S.Vladykin Authored: Tue Dec 8 13:18:30 2015 +0300 Committer: S.Vladykin Committed: Tue Dec 8 13:18:30 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/GridComponent.java | 3 +- .../ignite/internal/GridPluginComponent.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 18 +++- .../internal/managers/GridManagerAdapter.java | 5 +- .../deployment/GridDeploymentManager.java | 5 +- .../processors/GridProcessorAdapter.java| 5 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheProcessor.java| 26 +- .../datastructures/DataStructuresProcessor.java | 4 +- .../core/src/main/resources/ignite.properties | 2 +- .../IgniteClientReconnectAbstractTest.java | 95 +--- .../IgniteClientReconnectAtomicsTest.java | 57 .../IgniteClientReconnectCacheTest.java | 5 +- .../IgniteClientReconnectCollectionsTest.java | 51 +++ .../DataStreamProcessorSelfTest.java| 25 +++--- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 5 +- modules/osgi-paxlogging/pom.xml | 6 +- modules/osgi/pom.xml| 5 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml
[26/50] [abbrv] ignite git commit: IGNITE-2081 Fixed javadoc.
IGNITE-2081 Fixed javadoc. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34596c63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34596c63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34596c63 Branch: refs/heads/ignite-1.5.1 Commit: 34596c63c883af696daebcd6a24bee2ef55e7e2c Parents: 11b4262 Author: nikolay_tikhonov Authored: Mon Dec 7 13:29:40 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Dec 7 13:29:40 2015 +0300 -- .../apache/ignite/yarn/utils/package-info.java | 22 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/34596c63/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java -- diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java new file mode 100644 index 000..a73c390 --- /dev/null +++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ + +/** + * + * Utility and helper classes. + */ +package org.apache.ignite.yarn.utils; \ No newline at end of file
[25/50] [abbrv] ignite git commit: 2064 Test hotfix
2064 Test hotfix
Signed-off-by: Anton Vinogradov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11b42629
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11b42629
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11b42629
Branch: refs/heads/ignite-1.5.1
Commit: 11b426297cffcb98b6dd374cfc88184b2b04246f
Parents: 233231d
Author: Anton Vinogradov
Authored: Fri Dec 4 19:34:46 2015 +0300
Committer: Anton Vinogradov
Committed: Mon Dec 7 13:08:39 2015 +0300
--
.../cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java | 6 +-
.../apache/ignite/testframework/config/GridTestProperties.java | 3 +++
.../ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index 0873d2d..35ee6cc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -45,7 +46,10 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest
extends GridCommonA
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
/** Entry processor */
-protected static String TEST_ENT_PROCESSOR =
"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
+protected static String TEST_ENT_PROCESSOR =
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME)
!= null ?
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) :
+"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
/** Test value. */
protected static String TEST_VALUE =
"org.apache.ignite.tests.p2p.CacheDeploymentTestValue";
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 1ea8c38..491f38f 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -72,6 +72,9 @@ public final class GridTestProperties {
/** */
public static final String MARSH_CLASS_NAME = "marshaller.class";
+/** */
+public static final String ENTRY_PROCESSOR_CLASS_NAME =
"entry.processor.class";
+
/** Binary marshaller compact footers property. */
public static final String BINARY_COMPACT_FOOTERS =
"binary.marshaller.compact.footers";
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
index 2778c97..3d25645 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
@@ -31,6 +31,8 @@ public class IgniteBinaryObjectsCacheTestSuite3 {
*/
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME,
BinaryMa
[34/50] [abbrv] ignite git commit: ignite-1.5 - MessageCollection + marshalling issue test
ignite-1.5 - MessageCollection + marshalling issue test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/322a85a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/322a85a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/322a85a3
Branch: refs/heads/ignite-1.5.1
Commit: 322a85a359e0fc2c56f5c3aa38fc48a92e553289
Parents: c077522
Author: S.Vladykin
Authored: Tue Dec 8 13:17:36 2015 +0300
Committer: S.Vladykin
Committed: Tue Dec 8 13:17:36 2015 +0300
--
.../ignite/codegen/MessageCodeGenerator.java| 6 +-
.../communication/GridIoMessageFactory.java | 8 +-
.../internal/util/GridMessageCollection.java| 157 +++
.../internal/util/UUIDCollectionMessage.java| 42 -
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +
.../ignite/util/GridMessageCollectionTest.java | 105 +
6 files changed, 314 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 8733bb3..587ad06 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -43,9 +43,6 @@ import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
-import
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
-import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -170,8 +167,9 @@ public class MessageCodeGenerator {
//gen.generateAll(true);
-gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+//gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+//gen.generateAndWrite(GridMessageCollection.class);
//gen.generateAndWrite(DataStreamerEntry.class);
//gen.generateAndWrite(GridDistributedLockRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index c9b8e27..b0ef3f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -125,6 +125,7 @@ import
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRe
import
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse;
import org.apache.ignite.internal.util.GridByteArrayList;
import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.GridMessageCollection;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -720,7 +721,12 @@ public class GridIoMessageFactory implements
MessageFactory {
break;
-// [-3..119] - this
+case 124:
+msg = new GridMessageCollection<>();
+
+break;
+
+// [-3..119] [124] - this
// [120..123] - DR
// [-4..-22] - SQL
default:
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
new file mode 100644
index 000..09a5e96
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
[40/50] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.FxCop -- diff --git a/modules/platforms/dotnet/Apache.Ignite.FxCop b/modules/platforms/dotnet/Apache.Ignite.FxCop index 5c7f7f1..0df73c5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.FxCop +++ b/modules/platforms/dotnet/Apache.Ignite.FxCop @@ -107,11 +107,329 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + 'IBinaryReader.GetRawReader()' + + + + + + + + + + + + + 'IBinaryWriter.GetRawWriter()' + + + + + + + + + + + + + 'IIgniteBinary.GetBinaryTypes()' + + + + + + + + + + + + + + + + + 'value' + + + + + + + + + + + + + + + + + 'ComputeJobAdapter.GetArgument (int)' + 'IndexOutOfRangeException' + + + + + + + + + + + + + + + + + 'IEvents.GetEnabledEvents()' + + + + + + + + + + + + + + + + + 'IgniteUtils' + + + + + + + + + + + + + + + + + 'string.Format(string, object)' + 'BinaryReader.Deserialize ()' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + 'string.Format(string, object, object)' + 'BinaryReader.IsNotNullHeader(byte)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + + + + + 'string.Format(string, object, object, object)' + 'Marshaller.AddType(Type, int, string, bool, bool, IBinaryNameMapper, IBinaryIdMapper, IBinarySerializer, string)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + + + + + + + + + 'Classpath.AppendHomeClasspath(string, bool, StringBuilder)' + 'string.EndsWith(string)' + 'string.EndsWith(string, StringComparison)' + + + + + + + + + 'Classpath.CreateClasspath(string, IgniteConfiguration, bool)' + 'string.EndsWith(string)' + 'string.EndsWith(string, StringComparison)' + + + + + + + + + + + + + 'Future .OnNullResult()' + 'Exception' + + + + + + + + + + + + + 'string.Format(string, object)' + 'IgniteHome.Resolve(IgniteConfiguration)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + 'string.Format(string, object, object)' + 'IgniteHome.Resolve(IgniteConfiguration)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + + + + +
[31/50] [abbrv] ignite git commit: 1.5.0-b2-SNAPSHOT
1.5.0-b2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b26859b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b26859b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b26859b Branch: refs/heads/ignite-1.5.1 Commit: 3b26859bd64b7ddbc9d0b8094663887784b4f2cf Parents: c077522 Author: Ignite Teamcity Authored: Tue Dec 8 11:32:26 2015 +0300 Committer: Ignite Teamcity Committed: Tue Dec 8 11:32:26 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 5 ++--- modules/osgi-paxlogging/pom.xml| 6 ++ modules/osgi/pom.xml | 5 ++--- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac| 2 +- modules/platforms/cpp/examples/configure.ac| 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml| 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml
[20/50] [abbrv] ignite git commit: IGNITE-2041 Fixed JDBC cache store example. Reworked from deprecated code to new API and refactored code, made it more simple. Fixed bug in store in case of cache co
IGNITE-2041 Fixed JDBC cache store example.
Reworked from deprecated code to new API and refactored code, made it more
simple.
Fixed bug in store in case of cache configured keepBinaryInStore(true).
Added one more auto cache store example: CacheBinaryAutoStoreExample.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92ef7c7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92ef7c7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92ef7c7c
Branch: refs/heads/ignite-1.5.1
Commit: 92ef7c7ce8229130762b64082cc9455579a05247
Parents: 6a109eb
Author: Alexey Kuznetsov
Authored: Fri Dec 4 17:57:57 2015 +0700
Committer: Alexey Kuznetsov
Committed: Fri Dec 4 17:57:57 2015 +0700
--
examples/config/example-default.xml | 7 +
.../store/auto/CacheBinaryAutoStoreExample.java | 158 +++
.../datagrid/store/auto/package-info.java | 22 +++
.../store/auto/CacheAutoStoreExample.java | 93 +--
.../auto/CacheAutoStoreLoadDataExample.java | 85 --
.../datagrid/store/auto/CacheConfig.java| 81 --
.../datagrid/store/auto/DbH2ServerStartup.java | 79 --
.../ignite/examples/util/DbH2ServerStartup.java | 79 ++
.../ignite/examples/util/package-info.java | 22 +++
.../store/jdbc/CacheAbstractJdbcStore.java | 12 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java| 9 ++
11 files changed, 390 insertions(+), 257 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/examples/config/example-default.xml
--
diff --git a/examples/config/example-default.xml
b/examples/config/example-default.xml
index e6c359d..6bd6f16 100644
--- a/examples/config/example-default.xml
+++ b/examples/config/example-default.xml
@@ -28,6 +28,13 @@
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd";>
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/92ef7c7c/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
new file mode 100644
index 000..9df9f79
--- /dev/null
+++
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
@@ -0,0 +1,158 @@
+/*
+ * 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.examples.binary.datagrid.store.auto;
+
+import java.sql.Types;
+import java.util.UUID;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
+import org.apache.ignite.cache.store.jdbc.JdbcType;
+import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
+import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.examples.ExampleNodeStartup;
+import org.apache.ignite.examples.util.DbH2ServerStartup;
+import org.apache.ignite.examples.model.Person;
+import org.apache.ignite.transactions.Transaction;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ * Demonstrates usage of cache with underlying persistent store configured.
+ *
+ * This example uses {@link CacheJdbcPojoStore} as a persistent store.
+ *
+ * To start the example, you should:
+ *
+ * Start H2 database TCP server using {@link DbH2S
[37/50] [abbrv] ignite git commit: IGNITE-2064 More test fixes
IGNITE-2064 More test fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ca163bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ca163bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ca163bd
Branch: refs/heads/ignite-1.5.1
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov
Committed: Tue Dec 8 15:46:10 2015 +0300
--
.../GridCacheConditionalDeploymentSelfTest.java | 20
.../cache/GridCacheDeploymentSelfTest.java | 11 ---
2 files changed, 20 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.CO;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest
extends GridCommonAbstractTe
public void testAddedDeploymentInfo2() throws Exception {
GridCacheContext ctx = cacheContext();
-assertTrue(ctx.deploymentEnabled());
+if (grid(0).configuration().getMarshaller() instanceof
BinaryMarshaller)
+assertFalse(ctx.deploymentEnabled());
+else {
+assertTrue(ctx.deploymentEnabled());
-GridCacheIoManager ioMgr = cacheIoManager();
+GridCacheIoManager ioMgr = cacheIoManager();
-TestMessage msg = new TestMessage();
+TestMessage msg = new TestMessage();
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
-msg.addDepInfo = false;
+msg.addDepInfo = false;
-IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg,
grid(1).cluster().localNode().id());
+IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg,
grid(1).cluster().localNode().id());
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
+}
}
protected GridCacheContext cacheContext() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DeploymentMode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends
GridCommonAbstractTest {
}
assertEquals(0, g1.cache(null).localSize());
-assertEquals(0, g2.cache(null).localSize());
+
+assertEquals(g2.configuration().getMarshaller() instanceof
BinaryM
[03/50] [abbrv] ignite git commit: ignite-1027 Fixed early rebalance sync future completion.
ignite-1027 Fixed early rebalance sync future completion.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad9e4db5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad9e4db5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad9e4db5
Branch: refs/heads/ignite-1.5.1
Commit: ad9e4db5b87b064d13db4f9251c25efd535fb9e8
Parents: 9b60c75
Author: sboikov
Authored: Thu Dec 3 10:45:30 2015 +0300
Committer: sboikov
Committed: Thu Dec 3 10:45:30 2015 +0300
--
.../GridCachePartitionExchangeManager.java | 17 ++--
.../processors/cache/GridCachePreloader.java| 11 ++-
.../dht/preloader/GridDhtPartitionDemander.java | 41
.../dht/preloader/GridDhtPreloader.java | 4 +-
.../preloader/GridDhtPreloaderAssignments.java | 19 +++-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 +---
...cingDelayedPartitionMapExchangeSelfTest.java | 9 +-
.../GridCacheRebalancingAsyncSelfTest.java | 3 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 98
.../GridCacheRebalancingSyncSelfTest.java | 55 +--
...eRebalancingUnmarshallingFailedSelfTest.java | 6 +-
.../testsuites/IgniteCacheTestSuite3.java | 2 +
12 files changed, 223 insertions(+), 79 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ad9e4db5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index b13a5af..a0f7f93 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1399,8 +1399,10 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
waitList.add(cctx.cacheContext(cId).name());
}
-Callable r =
cacheCtx.preloader().addAssignments(
-assignsMap.get(cacheId), forcePreload,
waitList, cnt);
+Callable r =
cacheCtx.preloader().addAssignments(assignsMap.get(cacheId),
+forcePreload,
+waitList,
+cnt);
if (r != null) {
U.log(log, "Cache rebalancing scheduled:
[cache=" + cacheCtx.name() +
@@ -1425,7 +1427,7 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
"[top=" + exchFut.topologyVersion() + ",
evt=" + exchFut.discoveryEvent().name() +
", node=" +
exchFut.discoveryEvent().eventNode().id() + ']');
-if (marshR != null)
+if (marshR != null) {
try {
marshR.call(); //Marshaller cache
rebalancing launches in sync way.
}
@@ -1435,6 +1437,7 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
continue;
}
+}
final GridFutureAdapter fut = new
GridFutureAdapter();
@@ -1463,17 +1466,19 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
fut.onDone();
}
}
-}, /*system pool*/ true);
+}, /*system pool*/true);
}
-else
+else {
U.log(log, "Skipping rebalancing (obsolete
exchange ID) " +
"[top=" + exchFut.topologyVersion() + ",
evt=" + exchFut.discoveryEvent().name() +
", node=" +
exchFut.discoveryEvent().eventNode().id() + ']');
+}
}
-else
+else {
U.log(log, "Skipping rebalancing (nothing
scheduled) " +
"[top=" + exchFut.topologyVer
[41/50] [abbrv] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9a49fae..56a184d 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -19,10 +19,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
{
using System;
using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.InteropServices;
using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Common;
+
+using JNI = IgniteJniNativeMethods;
///
/// Unmanaged utility classes.
@@ -32,544 +32,27 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
/** Interop factory ID for .Net. */
private const int InteropFactoryId = 1;
-#region PROCEDURE NAMES
-
-private const string ProcReallocate = "IgniteReallocate";
-
-private const string ProcIgnitionStart = "IgniteIgnitionStart";
-private const string ProcIgnitionStop = "IgniteIgnitionStop";
-private const string ProcIgnitionStopAll = "IgniteIgnitionStopAll";
-
-private const string ProcProcessorReleaseStart =
"IgniteProcessorReleaseStart";
-private const string ProcProcessorProjection =
"IgniteProcessorProjection";
-private const string ProcProcessorCache = "IgniteProcessorCache";
-private const string ProcProcessorGetOrCreateCache =
"IgniteProcessorGetOrCreateCache";
-private const string ProcProcessorCreateCache =
"IgniteProcessorCreateCache";
-private const string ProcProcessorAffinity = "IgniteProcessorAffinity";
-private const string ProcProcessorDataStreamer =
"IgniteProcessorDataStreamer";
-private const string ProcProcessorTransactions =
"IgniteProcessorTransactions";
-private const string ProcProcessorCompute = "IgniteProcessorCompute";
-private const string ProcProcessorMessage = "IgniteProcessorMessage";
-private const string ProcProcessorEvents = "IgniteProcessorEvents";
-private const string ProcProcessorServices = "IgniteProcessorServices";
-private const string ProcProcessorExtensions =
"IgniteProcessorExtensions";
-private const string ProcProcessorAtomicLong =
"IgniteProcessorAtomicLong";
-
-private const string ProcTargetInStreamOutLong =
"IgniteTargetInStreamOutLong";
-private const string ProcTargetInStreamOutStream =
"IgniteTargetInStreamOutStream";
-private const string ProcTargetInStreamOutObject =
"IgniteTargetInStreamOutObject";
-private const string ProcTargetInObjectStreamOutStream =
"IgniteTargetInObjectStreamOutStream";
-private const string ProcTargetOutLong = "IgniteTargetOutLong";
-private const string ProcTargetOutStream = "IgniteTargetOutStream";
-private const string ProcTargetOutObject = "IgniteTargetOutObject";
-private const string ProcTargetListenFut = "IgniteTargetListenFuture";
-private const string ProcTargetListenFutForOp =
"IgniteTargetListenFutureForOperation";
-
-private const string ProcAffinityParts = "IgniteAffinityPartitions";
-
-private const string ProcCacheWithSkipStore =
"IgniteCacheWithSkipStore";
-private const string ProcCacheWithNoRetries =
"IgniteCacheWithNoRetries";
-private const string ProcCacheWithExpiryPolicy =
"IgniteCacheWithExpiryPolicy";
-private const string ProcCacheWithAsync = "IgniteCacheWithAsync";
-private const string ProcCacheWithKeepBinary =
"IgniteCacheWithKeepPortable";
-private const string ProcCacheClear = "IgniteCacheClear";
-private const string ProcCacheRemoveAll = "IgniteCacheRemoveAll";
-private const string ProcCacheOutOpQueryCursor =
"IgniteCacheOutOpQueryCursor";
-private const string ProcCacheOutOpContinuousQuery =
"IgniteCacheOutOpContinuousQuery";
-private const string ProcCacheIterator = "IgniteCacheIterator";
-private const string ProcCacheLocalIterator =
"IgniteCacheLocalIterator";
-private const string ProcCacheEnterLock = "IgniteCacheEnterLock";
-private const string ProcCacheExitLock = "IgniteCacheExitLock";
-private const string ProcCacheTryEnterLock = "IgniteCacheTryEnterLock";
-private const string ProcCacheCloseLock = "IgniteCacheCloseLock";
-private const string ProcCacheRebalance = "IgniteCacheRebalance";
-private const string ProcCacheSize = "IgniteCacheSize";
-
-private const string ProcCacheStoreCallbackInvoke =
"IgniteCacheStoreCallbackInvoke";
-
-private const string
[08/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5beed16e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5beed16e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5beed16e Branch: refs/heads/ignite-1.5.1 Commit: 5beed16e3af924e367dffec841d39d09d326d110 Parents: dc0131d 50f6c01 Author: Anton Vinogradov Authored: Thu Dec 3 16:54:50 2015 +0300 Committer: Anton Vinogradov Committed: Thu Dec 3 16:54:50 2015 +0300 -- .../internal/portable/BinaryReaderExImpl.java | 2 +- .../internal/portable/PortableContext.java | 34 +- .../processors/cache/GridCacheContext.java | 30 ++ .../CacheDataStructuresManager.java | 31 +- .../dht/atomic/GridDhtAtomicCache.java | 20 +- .../CacheObjectBinaryProcessorImpl.java | 8 + .../cache/query/GridCacheQueryManager.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../datastructures/CollocatedQueueItemKey.java | 75 .../datastructures/CollocatedSetItemKey.java| 87 + .../datastructures/DataStructuresProcessor.java | 7 +- .../GridAtomicCacheQueueImpl.java | 8 +- .../datastructures/GridCacheQueueAdapter.java | 30 +- .../datastructures/GridCacheQueueItemKey.java | 9 +- .../datastructures/GridCacheSetImpl.java| 37 +- .../datastructures/GridCacheSetItemKey.java | 21 +- .../GridTransactionalCacheQueueImpl.java| 2 +- .../processors/datastructures/QueueItemKey.java | 27 ++ .../processors/datastructures/SetItemKey.java | 36 ++ .../cache/IgniteCacheInvokeAbstractTest.java| 369 ++- ...eAbstractDataStructuresFailoverSelfTest.java | 7 +- .../GridCacheQueueApiSelfAbstractTest.java | 18 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- .../GridCachePartitionedQueueApiSelfTest.java | 5 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../IgnitePartitionedQueueNoBackupsTest.java| 92 + .../GridCacheReplicatedQueueApiSelfTest.java| 5 + .../GridCacheWriteBehindStoreAbstractTest.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 + 29 files changed, 778 insertions(+), 218 deletions(-) --
[18/50] [abbrv] ignite git commit: Javadoc hotfix
Javadoc hotfix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5fa3c1b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5fa3c1b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5fa3c1b
Branch: refs/heads/ignite-1.5.1
Commit: d5fa3c1b69cfa336e70087dded9ddfa099000235
Parents: e5de23e
Author: Anton Vinogradov
Authored: Fri Dec 4 13:24:59 2015 +0300
Committer: Anton Vinogradov
Committed: Fri Dec 4 13:24:59 2015 +0300
--
.../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5fa3c1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index ced0d10..998f7a2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -359,7 +359,7 @@ public class GridDhtPartitionDemander {
* @param fut Future.
* @param assigns Assignments.
* @throws IgniteCheckedException If failed.
- * @return
+ * @return Partitions were requested.
*/
private boolean requestPartitions(
RebalanceFuture fut,
[36/50] [abbrv] ignite git commit: Ignite-1.5 - Added missing serialVersionUID to fix the build.
Ignite-1.5 - Added missing serialVersionUID to fix the build.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67ebd02c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67ebd02c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67ebd02c
Branch: refs/heads/ignite-1.5.1
Commit: 67ebd02c9a58ef2d835e55e4aa6efdcec6d53b8c
Parents: c292748
Author: Alexey Goncharuk
Authored: Tue Dec 8 15:09:10 2015 +0300
Committer: Alexey Goncharuk
Committed: Tue Dec 8 15:09:10 2015 +0300
--
.../org/apache/ignite/internal/util/GridMessageCollection.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/67ebd02c/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
index 09a5e96..6044bbe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
@@ -34,6 +34,9 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public final class GridMessageCollection implements Message
{
/** */
+private static final long serialVersionUID = 0L;
+
+/** */
@GridDirectCollection(Message.class)
private Collection msgs;
[17/50] [abbrv] ignite git commit: Fixed IgniteTransactionalWriteInvokeBenchmark
Fixed IgniteTransactionalWriteInvokeBenchmark
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5de23e9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5de23e9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5de23e9
Branch: refs/heads/ignite-1.5.1
Commit: e5de23e9b61acc435ead4e70be9970a307906dbb
Parents: 11d668b
Author: ashutak
Authored: Fri Dec 4 12:11:15 2015 +0300
Committer: ashutak
Committed: Fri Dec 4 12:11:15 2015 +0300
--
.../IgniteTransactionalWriteInvokeBenchmark.java| 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5de23e9/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 9f9b5f7..35befad 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -68,17 +68,15 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
long start = System.nanoTime();
-if (cfg.memberId() == 0) {
-try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
-}
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
}
}
[27/50] [abbrv] ignite git commit: IGNITE-2090 .Net: EventsTest.TestSerialization fails
IGNITE-2090 .Net: EventsTest.TestSerialization fails
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c10b112a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c10b112a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c10b112a
Branch: refs/heads/ignite-1.5.1
Commit: c10b112ad0693035d6bb2b1c782fe09f11aaded4
Parents: 34596c6
Author: Pavel Tupitsyn
Authored: Mon Dec 7 13:42:17 2015 +0300
Committer: Pavel Tupitsyn
Committed: Mon Dec 7 13:42:17 2015 +0300
--
modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c10b112a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
index 9f22355..a538cb4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
@@ -568,7 +568,8 @@ namespace Apache.Ignite.Core.Tests
Assert.AreEqual(EventType.SwapSpaceCleared, evt.Type);
Assert.IsNotNullOrEmpty(evt.Name);
Assert.AreNotEqual(Guid.Empty, evt.Id.GlobalId);
-Assert.IsTrue((evt.Timestamp - DateTime.Now).TotalSeconds < 10);
+Assert.IsTrue(Math.Abs((evt.Timestamp -
DateTime.UtcNow).TotalSeconds) < 20,
+"Invalid event timestamp: '{0}', current time: '{1}'",
evt.Timestamp, DateTime.Now);
}
///
[38/50] [abbrv] ignite git commit: IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value types.
IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value
types.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efe632b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efe632b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efe632b1
Branch: refs/heads/ignite-1.5.1
Commit: efe632b18e760f699bedee906050f66eabadb077
Parents: 8ca163b
Author: Pavel Tupitsyn
Authored: Tue Dec 8 15:59:23 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Dec 8 15:59:23 2015 +0300
--
.../Binary/BinarySelfTest.cs| 67
.../Impl/Binary/BinaryReflectiveActions.cs | 4 +-
.../Impl/Common/DelegateConverter.cs| 15 +++--
3 files changed, 78 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 88328ec..9232665 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -1028,6 +1028,20 @@ namespace Apache.Ignite.Core.Tests.Binary
CheckObject(marsh, new OuterObjectType(), new InnerObjectType());
}
+[Test]
+public void TestStructsReflective()
+{
+var marsh = new Marshaller(new BinaryConfiguration
+{
+TypeConfigurations = new[] {new BinaryTypeConfiguration(typeof
(ReflectiveStruct))}
+});
+
+var obj = new ReflectiveStruct(15, 28.8);
+var res = marsh.Unmarshal(marsh.Marshal(obj));
+
+Assert.AreEqual(res, obj);
+}
+
/**
* Test handles.
*/
@@ -2228,5 +2242,58 @@ namespace Apache.Ignite.Core.Tests.Binary
return Foo;
}
}
+
+private struct ReflectiveStruct : IEquatable
+{
+private readonly int _x;
+private readonly double _y;
+
+public ReflectiveStruct(int x, double y)
+{
+_x = x;
+_y = y;
+}
+
+public int X
+{
+get { return _x; }
+}
+
+public double Y
+{
+get { return _y; }
+}
+
+public bool Equals(ReflectiveStruct other)
+{
+return _x == other._x && _y.Equals(other._y);
+}
+
+public override bool Equals(object obj)
+{
+if (ReferenceEquals(null, obj))
+return false;
+
+return obj is ReflectiveStruct && Equals((ReflectiveStruct)
obj);
+}
+
+public override int GetHashCode()
+{
+unchecked
+{
+return (_x*397) ^ _y.GetHashCode();
+}
+}
+
+public static bool operator ==(ReflectiveStruct left,
ReflectiveStruct right)
+{
+return left.Equals(right);
+}
+
+public static bool operator !=(ReflectiveStruct left,
ReflectiveStruct right)
+{
+return !left.Equals(right);
+}
+}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
index b229898..15509fc 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
@@ -398,9 +398,7 @@ namespace Apache.Ignite.Core.Impl.Binary
// Assign field value
var targetParam = Expression.Parameter(typeof(object));
-var targetParamConverted = Expression.Convert(targetParam,
field.DeclaringType);
-var assignExpr =
Expression.Call(DelegateConverter.GetWriteFieldMethod(field),
targetParamConverted,
-readExpr);
+var assignExpr =
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), targetParam,
readExpr);
// Compile and return
return Expression.Lambda(assignExpr,
targetParam, readerParam).Compil
[05/50] [abbrv] ignite git commit: ignite-2042 Added special queue/set key classes to make collocation work with BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.
http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index c44455f..519d3c1 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -65,6 +65,7 @@ import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest;
import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
+import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
import
org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;
import
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest;
import
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest;
@@ -165,6 +166,8 @@ public class IgniteCacheDataStructuresSelfTestSuite extends
TestSuite {
suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class));
suite.addTest(new
TestSuite(IgniteClientDiscoveryDataStructuresTest.class));
+suite.addTest(new
TestSuite(IgnitePartitionedQueueNoBackupsTest.class));
+
return suite;
}
}
\ No newline at end of file
[21/50] [abbrv] ignite git commit: ignite-1.5 - release notes
ignite-1.5 - release notes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23ead500 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23ead500 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23ead500 Branch: refs/heads/ignite-1.5.1 Commit: 23ead500762095300417759a30c08cd76daf210d Parents: 92ef7c7 Author: Yakov Zhdanov Authored: Fri Dec 4 17:28:50 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Dec 4 17:28:50 2015 +0300 -- RELEASE_NOTES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/23ead500/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index f7f48fa..243ec18 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -11,6 +11,7 @@ Apache Ignite In-Memory Data Fabric 1.5 * Added MQTT Streamer. * Added Twitter Streamer. * Added Ignite Sink (integration with Apache Flume). +* Fixed optimistic serializable transactions: implemented "deadlock-free" locking algorithm. * Fixed failover for continuous queries. * Fixed compilation and runtime errors under OpenJDK and IBM JDK. * Fixed Integer.size limitation for cache.
[13/50] [abbrv] ignite git commit: Fixed failover tests for binary marshaller
Fixed failover tests for binary marshaller
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/171e9b17
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/171e9b17
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/171e9b17
Branch: refs/heads/ignite-1.5.1
Commit: 171e9b172564bcaafd54532abbce3b16c7ffbc65
Parents: 4ba911f
Author: ashutak
Authored: Thu Dec 3 18:15:40 2015 +0300
Committer: ashutak
Committed: Thu Dec 3 18:15:40 2015 +0300
--
.../failover/IgniteTransactionalInvokeRetryBenchmark.java | 4 ++--
.../failover/IgniteTransactionalWriteInvokeBenchmark.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/171e9b17/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
index 16b0959..b5a08da 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java
@@ -169,7 +169,7 @@ public class IgniteTransactionalInvokeRetryBenchmark
extends IgniteFailoverAbstr
if (ex != null)
throw ex;
-asyncCache.invoke(key, new IncrementCacheEntryProcessor());
+asyncCache.invoke(key, new
IncrementInvokeRetryCacheEntryProcessor());
asyncCache.future().get(args.cacheOperationTimeoutMillis());
AtomicLong prevVal = map.putIfAbsent(key, new AtomicLong(0));
@@ -195,7 +195,7 @@ public class IgniteTransactionalInvokeRetryBenchmark
extends IgniteFailoverAbstr
/**
*/
-private static class IncrementCacheEntryProcessor implements
CacheEntryProcessor {
+private static class IncrementInvokeRetryCacheEntryProcessor implements
CacheEntryProcessor {
/** */
private static final long serialVersionUID = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/171e9b17/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index a52ea78..9f9b5f7 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -123,7 +123,7 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
Set values = new HashSet<>(map.values());
if (values.size() != 1)
-throw new IgniteConsistencyException("Found
different values for keys [map="+map+"]");
+throw new IgniteConsistencyException("Found
different values for keys [map=" + map + "]");
break;
case 1: // Invoke scenario.
@@ -137,7 +137,7 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
asyncCache.future().get(timeout);
for (String key : keys) {
-asyncCache.invoke(key, new
IncrementCacheEntryProcessor(), cacheName());
+asyncCache.invoke(key, new
IncrementWriteInvokeCacheEntryProcessor(), cacheName());
Object o = asyncCache.future().get(timeout);
if (o != null)
@@ -165,7 +165,7 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
/**
*/
-private static class IncrementCacheEntryProcessor implements
CacheEntryProcessor {
+private static class IncrementWriteInvokeCacheEntryProcessor implements
CacheEntryProcessor {
/** */
private static final long serialVersionUID = 0;
[24/50] [abbrv] ignite git commit: ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.
ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/233231de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/233231de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/233231de
Branch: refs/heads/ignite-1.5.1
Commit: 233231de53e0d2c7d91244f7d65a13ecd515d8ce
Parents: 8033bc4
Author: sboikov
Authored: Mon Dec 7 10:40:19 2015 +0300
Committer: sboikov
Committed: Mon Dec 7 10:40:19 2015 +0300
--
.../yardstick/cache/IgnitePutTxBenchmark.java | 26 +---
1 file changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/233231de/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 9c3389f..15b7cd6 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -18,8 +18,11 @@
package org.apache.ignite.yardstick.cache;
import java.util.Map;
+import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
import org.apache.ignite.yardstick.cache.model.SampleValue;
import org.yardstickframework.BenchmarkConfiguration;
@@ -27,20 +30,35 @@ import org.yardstickframework.BenchmarkConfiguration;
* Ignite benchmark that performs transactional put operations.
*/
public class IgnitePutTxBenchmark extends
IgniteCacheAbstractBenchmark {
+/** */
+private IgniteTransactions txs;
+
+/** */
+private Callable clo;
+
/** {@inheritDoc} */
@Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
super.setUp(cfg);
if (!IgniteSystemProperties.getBoolean("SKIP_MAP_CHECK"))
ignite().compute().broadcast(new WaitMapExchangeFinishCallable());
+
+txs = ignite().transactions();
+
+clo = new Callable() {
+@Override public Void call() throws Exception {
+int key = nextRandom(args.range());
+
+cache.put(key, new SampleValue(key));
+
+return null;
+}
+};
}
/** {@inheritDoc} */
@Override public boolean test(Map ctx) throws Exception {
-int key = nextRandom(args.range());
-
-// Implicit transaction is used.
-cache.put(key, new SampleValue(key));
+IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(),
args.txIsolation(), clo);
return true;
}
[11/50] [abbrv] ignite git commit: IGNITE-1270 Implement basic support for OSGi.
IGNITE-1270 Implement basic support for OSGi.
* OSGi manifests for most modules.
* Apache Karaf features file to facilitate deployment (along with dependencies).
* Make Ignite classloading OSGi-friendly and support different strategies.
* Several integration tests with Pax Exam.
* POM restructuring to promote 3rd party dep versions to build params.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96e08027
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96e08027
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96e08027
Branch: refs/heads/ignite-1.5.1
Commit: 96e0802775fe94e9ba77fab147129142b809e432
Parents: 5beed16
Author: Raul Kripalani
Authored: Thu Dec 3 14:44:12 2015 +
Committer: Raul Kripalani
Committed: Thu Dec 3 14:44:12 2015 +
--
examples/pom.xml| 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 12 +-
modules/aws/pom.xml | 18 +-
modules/camel/pom.xml | 11 +-
modules/core/pom.xml| 28 +-
modules/flume/pom.xml | 16 +-
modules/geospatial/pom.xml | 20 ++
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 10 +-
modules/indexing/pom.xml| 22 +-
modules/jcl/pom.xml | 11 +
modules/jms11/pom.xml | 20 +-
modules/jta/pom.xml | 17 +
modules/kafka/pom.xml | 16 +-
modules/log4j/pom.xml | 10 +
modules/log4j2/pom.xml | 11 +
modules/mqtt/pom.xml| 24 +-
modules/osgi-karaf/README.txt | 18 +
modules/osgi-karaf/licenses/apache-2.0.txt | 202
modules/osgi-karaf/pom.xml | 85 +
.../osgi-karaf/src/main/resources/features.xml | 327 +++
modules/osgi-paxlogging/README.txt | 12 +
modules/osgi-paxlogging/licenses/apache-2.0.txt | 202
modules/osgi-paxlogging/pom.xml | 70
modules/osgi/README.txt | 65
modules/osgi/licenses/apache-2.0.txt| 202
modules/osgi/pom.xml| 171 ++
.../IgniteAbstractOsgiContextActivator.java | 238 ++
.../org/apache/ignite/osgi/IgniteOsgiUtils.java | 69
.../BundleDelegatingClassLoader.java| 147 +
.../classloaders/ContainerSweepClassLoader.java | 134
.../OsgiClassLoadingStrategyType.java | 29 ++
.../ignite/osgi/AbstractIgniteKarafTest.java| 109 +++
.../IgniteKarafFeaturesInstallationTest.java| 100 ++
.../ignite/osgi/IgniteOsgiServiceTest.java | 131
.../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 ++
.../activators/BasicIgniteTestActivator.java| 76 +
.../ignite/osgi/activators/TestOsgiFlags.java | 53 +++
.../osgi/activators/TestOsgiFlagsImpl.java | 83 +
modules/rest-http/pom.xml | 34 +-
modules/scalar-2.10/pom.xml | 9 +-
modules/scalar/pom.xml | 9 +-
modules/schedule/pom.xml| 25 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 12 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spring/pom.xml | 30 +-
modules/ssh/pom.xml | 19 +-
modules/twitter/pom.xml | 12 +-
modules/urideploy/pom.xml | 17 +-
modules/visor-console-2.10/pom.xml | 4 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 4 +-
modules/web/pom.xml | 13 +-
modules/zookeeper/pom.xml | 14 +-
parent/pom.xml | 136 +++-
pom.xml | 3 +
58 files changed, 3079 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e08027/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index e7cd059..33c4f51 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,7 +34,7 @@
javax.cache
cache-api
-1.0.0
+${javax.cache.version}
http://git-wip-us.apache.org/repos/asf/ignite/blob/
[30/50] [abbrv] ignite git commit: HashMap's offset retrieval in HashSet class definition for legacy IBM JRE
HashMap's offset retrieval in HashSet class definition for legacy IBM JRE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0775220
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0775220
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0775220
Branch: refs/heads/ignite-1.5.1
Commit: c077522038d050aac35ce034cc86d9af7959ebd5
Parents: ebddcb1
Author: Denis Magda
Authored: Mon Dec 7 20:52:00 2015 +0300
Committer: Denis Magda
Committed: Mon Dec 7 20:52:00 2015 +0300
--
.../optimized/OptimizedMarshallerUtils.java | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c0775220/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index 4d6afe6..da92b90 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -155,12 +155,22 @@ class OptimizedMarshallerUtils {
static final JdkMarshaller JDK_MARSH = new JdkMarshaller();
static {
+long mapOff;
+
try {
-HASH_SET_MAP_OFF =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+mapOff =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
}
catch (NoSuchFieldException e) {
-throw new IgniteException("Initialization failure.", e);
+try {
+// Workaround for legacy IBM JRE.
+mapOff =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("backingMap"));
+}
+catch (NoSuchFieldException e2) {
+throw new IgniteException("Initialization failure.", e2);
+}
}
+
+HASH_SET_MAP_OFF = mapOff;
}
/**
@@ -537,4 +547,4 @@ class OptimizedMarshallerUtils {
static void setObject(Object obj, long off, Object val) {
UNSAFE.putObject(obj, off, val);
}
-}
\ No newline at end of file
+}
[22/50] [abbrv] ignite git commit: IGNITE-2041 Fixed typo.
IGNITE-2041 Fixed typo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d585d5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d585d5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d585d5a
Branch: refs/heads/ignite-1.5.1
Commit: 3d585d5a5d3ccc5c3071d7547a19cf055bd9ce83
Parents: 23ead50
Author: AKuznetsov
Authored: Sat Dec 5 16:57:53 2015 +0700
Committer: AKuznetsov
Committed: Sat Dec 5 16:57:53 2015 +0700
--
.../binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java| 2 +-
.../ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d585d5a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
index 9df9f79..63d947c 100644
---
a/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/binary/datagrid/store/auto/CacheBinaryAutoStoreExample.java
@@ -138,7 +138,7 @@ public class CacheBinaryAutoStoreExample {
cache.clear();
System.out.println(">>>
--");
-System.out.println(">>> Load data to cache from DB with cusom
SQL...");
+System.out.println(">>> Load data to cache from DB with custom
SQL...");
// Load cache on all data nodes with custom SQL statement.
cache.loadCache(null, "java.lang.Long", "select * from PERSON
where id <= 3");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d585d5a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
index a262c38..5498e57 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/auto/CacheAutoStoreExample.java
@@ -143,7 +143,7 @@ public class CacheAutoStoreExample {
cache.clear();
System.out.println(">>>
--");
-System.out.println(">>> Load data to cache from DB with cusom
SQL...");
+System.out.println(">>> Load data to cache from DB with custom
SQL...");
// Load cache on all data nodes with custom SQL statement.
cache.loadCache(null, "java.lang.Long", "select * from PERSON
where id <= 3");
[45/50] [abbrv] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 1f494c0..5bb6794 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -220,8 +220,6 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
Thread.sleep(1000);
jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
}
/**
@@ -315,8 +313,6 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
Thread.sleep(1000);
jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
}
/**
@@ -352,14 +348,7 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
System.gc();
c.get(100);
-
-if (local().map.iteratorMapSize() == 0)
-break;
-else
-U.sleep(500);
}
-
-assertEquals(0, local().map.iteratorMapSize());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index a41f6c8..b459dde 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -81,7 +81,7 @@ public class GridHashMapLoadTest extends
GridCommonAbstractTest {
Integer val = i++;
map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key),
-key.hashCode(), ctx.toCacheObject(val), null, 1) {
+key.hashCode(), ctx.toCacheObject(val)) {
@Override public boolean tmLock(IgniteInternalTx tx,
long timeout,
@Nullable GridCacheVersion serOrder,
@@ -103,4 +103,4 @@ public class GridHashMapLoadTest extends
GridCommonAbstractTest {
info("Inserted objects: " + i / 2);
}
}
-}
\ No newline at end of file
+}
[06/50] [abbrv] ignite git commit: ignite-2042 Added special queue/set key classes to make collocation work with BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.
ignite-2042 Added special queue/set key classes to make collocation work with
BinaryMarshaller. Also fixed issue with 'invoke' result with binary marshaller.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50f6c013
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50f6c013
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50f6c013
Branch: refs/heads/ignite-1.5.1
Commit: 50f6c0131fd761f6231e7c2632a010c093000e70
Parents: 86ec37e
Author: sboikov
Authored: Thu Dec 3 16:50:00 2015 +0300
Committer: sboikov
Committed: Thu Dec 3 16:50:00 2015 +0300
--
.../internal/portable/BinaryReaderExImpl.java | 2 +-
.../internal/portable/PortableContext.java | 34 +-
.../processors/cache/GridCacheContext.java | 30 ++
.../CacheDataStructuresManager.java | 31 +-
.../dht/atomic/GridDhtAtomicCache.java | 20 +-
.../CacheObjectBinaryProcessorImpl.java | 8 +
.../cache/query/GridCacheQueryManager.java | 12 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +-
.../datastructures/CollocatedQueueItemKey.java | 75
.../datastructures/CollocatedSetItemKey.java| 87 +
.../datastructures/DataStructuresProcessor.java | 7 +-
.../GridAtomicCacheQueueImpl.java | 8 +-
.../datastructures/GridCacheQueueAdapter.java | 30 +-
.../datastructures/GridCacheQueueItemKey.java | 9 +-
.../datastructures/GridCacheSetImpl.java| 37 +-
.../datastructures/GridCacheSetItemKey.java | 21 +-
.../GridTransactionalCacheQueueImpl.java| 2 +-
.../processors/datastructures/QueueItemKey.java | 27 ++
.../processors/datastructures/SetItemKey.java | 36 ++
.../cache/IgniteCacheInvokeAbstractTest.java| 369 ++-
...eAbstractDataStructuresFailoverSelfTest.java | 7 +-
.../GridCacheQueueApiSelfAbstractTest.java | 18 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../GridCachePartitionedQueueApiSelfTest.java | 5 +
...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +-
.../IgnitePartitionedQueueNoBackupsTest.java| 92 +
.../GridCacheReplicatedQueueApiSelfTest.java| 5 +
.../GridCacheWriteBehindStoreAbstractTest.java | 2 +-
.../IgniteCacheDataStructuresSelfTestSuite.java | 3 +
29 files changed, 778 insertions(+), 218 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index ddbf6ba..91b67f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -246,7 +246,7 @@ public class BinaryReaderExImpl implements BinaryReader,
BinaryRawReaderEx, Bina
dataStart = start + DFLT_HDR_LEN;
}
-idMapper = userType ? ctx.userTypeIdMapper(typeId) : null;
+idMapper = userType ? ctx.userTypeIdMapper(typeId) :
BinaryInternalIdMapper.defaultInstance();
schema = PortableUtils.hasSchema(flags) ? getOrCreateSchema() :
null;
}
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/50f6c013/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 1482df9..fd6c41d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -66,6 +66,8 @@ import org.apache.ignite.binary.BinarySerializer;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.IgnitionEx;
import
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl;
+import
org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey;
+import
org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.lang.GridMapEntry;
import org.apache.ignite.internal.util.typedef.F;
@@ -233,7 +235,8 @@ public class PortableContext implements Externalizable {
/**
* @param marsh Portable marshaller.
- * @throws org.apache.igni
[12/50] [abbrv] ignite git commit: IGNITE-1270 Update version number of OSGi modules to 1.5.0-b1-SNAPSHOT. Adjust test that assumed major.minor.micro to take into account qualifier.
IGNITE-1270 Update version number of OSGi modules to 1.5.0-b1-SNAPSHOT.
Adjust test that assumed major.minor.micro to take into account qualifier.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ba911f0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ba911f0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ba911f0
Branch: refs/heads/ignite-1.5.1
Commit: 4ba911f0a4dfbfffd8bef019dcbaa284c5d98bf3
Parents: 96e0802
Author: Raul Kripalani
Authored: Thu Dec 3 14:46:23 2015 +
Committer: Raul Kripalani
Committed: Thu Dec 3 15:00:58 2015 +
--
modules/osgi-karaf/pom.xml| 3 +--
modules/osgi-paxlogging/pom.xml | 3 +--
modules/osgi/pom.xml | 2 +-
.../apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-karaf/pom.xml
--
diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml
index f1ac66b..e1f53e2 100644
--- a/modules/osgi-karaf/pom.xml
+++ b/modules/osgi-karaf/pom.xml
@@ -31,9 +31,8 @@
../../parent
-org.apache.ignite
ignite-osgi-karaf
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
pom
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi-paxlogging/pom.xml
--
diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml
index bd9e18e..15a5e0c 100644
--- a/modules/osgi-paxlogging/pom.xml
+++ b/modules/osgi-paxlogging/pom.xml
@@ -32,9 +32,8 @@
../../parent
-org.apache.ignite
ignite-osgi-paxlogging
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
jar
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/pom.xml
--
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index d6d46bf..47c7928 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -32,7 +32,7 @@
ignite-osgi
-1.5.0-SNAPSHOT
+1.5.0-b1-SNAPSHOT
http://ignite.apache.org
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ba911f0/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
--
diff --git
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index c0eb06b..112a607 100644
---
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -87,7 +87,7 @@ public class IgniteKarafFeaturesInstallationTest extends
AbstractIgniteKarafTest
f.getName(), installed));
assertTrue(installed);
-assertEquals(PROJECT_VERSION.replaceAll("-", "."), f.getVersion());
+assertEquals(PROJECT_VERSION.replaceAll("-", "."),
f.getVersion().replaceAll("-", "."));
}
}
[49/50] [abbrv] ignite git commit: ignite-10 Fix ignite instance [de]serialization
ignite-10 Fix ignite instance [de]serialization
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0adee3ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0adee3ae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0adee3ae
Branch: refs/heads/ignite-1.5.1
Commit: 0adee3ae09a86334375b521871539b086215ba92
Parents: 6904724
Author: sboikov
Authored: Wed Dec 9 09:56:53 2015 +0300
Committer: sboikov
Committed: Wed Dec 9 09:56:53 2015 +0300
--
.../messaging/MessagingPingPongExample.java | 4 --
.../examples/MessagingExamplesSelfTest.java | 2 -
.../main/java/org/apache/ignite/Ignition.java | 16 +++
.../store/jdbc/CacheAbstractJdbcStore.java | 5 +--
.../configuration/CacheConfiguration.java | 1 -
.../configuration/IgniteConfiguration.java | 2 -
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 39 +
.../ignite/internal/MarshallerContextImpl.java | 23 +-
.../managers/communication/GridIoManager.java | 3 +-
.../internal/portable/BinaryFieldAccessor.java | 9 ++--
.../internal/portable/BinaryReaderExImpl.java | 19
.../internal/portable/BinaryWriterExImpl.java | 19
.../internal/portable/PortableContext.java | 12 ++---
.../CacheDefaultBinaryAffinityKeyMapper.java| 2 +-
.../processors/cache/GridCacheProcessor.java| 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 2 +-
.../CacheObjectBinaryProcessorImpl.java | 41 +
.../cache/query/GridCacheQueryManager.java | 46 ++--
.../util/nio/GridNioBackPressureControl.java| 14 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 10 ++---
.../communication/tcp/TcpCommunicationSpi.java | 6 +--
.../org/apache/ignite/thread/IgniteThread.java | 43 ++
.../ignite/thread/IgniteThreadPoolExecutor.java | 37 ++--
.../portable/BinaryMarshallerSelfTest.java | 2 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 -
.../marshaller/GridMarshallerAbstractTest.java | 32 +-
.../testframework/junits/GridAbstractTest.java | 9 ++--
.../junits/IgniteTestResources.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../IgnitePortableCacheTestSuite.java | 3 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 5 +++
.../ignite/osgi/AbstractIgniteKarafTest.java| 2 -
.../ignite/internal/GridFactorySelfTest.java| 29
.../GridSpringBeanSerializationSelfTest.java| 2 +
37 files changed, 252 insertions(+), 205 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index a2ba227..8571f66 100644
---
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Demonstrates simple message exchange between local and remote nodes.
@@ -65,9 +64,6 @@ public class MessagingPingPongExample {
// Set up remote player.
ignite.message(nodeB).remoteListen(null, new
IgniteBiPredicate() {
-@IgniteInstanceResource
-private Ignite ignite;
-
@Override public boolean apply(UUID nodeId, String rcvMsg) {
System.out.println("Received message [msg=" + rcvMsg + ",
sender=" + nodeId + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
--
diff --git
a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index c77e4b6..e15159d 100644
---
a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
+++
b/examples/src/test/java8/org/
ignite git commit: ignite-10 Fix ignite instance [de]serialization
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 69047243b -> 0adee3ae0
ignite-10 Fix ignite instance [de]serialization
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0adee3ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0adee3ae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0adee3ae
Branch: refs/heads/ignite-1.5
Commit: 0adee3ae09a86334375b521871539b086215ba92
Parents: 6904724
Author: sboikov
Authored: Wed Dec 9 09:56:53 2015 +0300
Committer: sboikov
Committed: Wed Dec 9 09:56:53 2015 +0300
--
.../messaging/MessagingPingPongExample.java | 4 --
.../examples/MessagingExamplesSelfTest.java | 2 -
.../main/java/org/apache/ignite/Ignition.java | 16 +++
.../store/jdbc/CacheAbstractJdbcStore.java | 5 +--
.../configuration/CacheConfiguration.java | 1 -
.../configuration/IgniteConfiguration.java | 2 -
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 39 +
.../ignite/internal/MarshallerContextImpl.java | 23 +-
.../managers/communication/GridIoManager.java | 3 +-
.../internal/portable/BinaryFieldAccessor.java | 9 ++--
.../internal/portable/BinaryReaderExImpl.java | 19
.../internal/portable/BinaryWriterExImpl.java | 19
.../internal/portable/PortableContext.java | 12 ++---
.../CacheDefaultBinaryAffinityKeyMapper.java| 2 +-
.../processors/cache/GridCacheProcessor.java| 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 2 +-
.../CacheObjectBinaryProcessorImpl.java | 41 +
.../cache/query/GridCacheQueryManager.java | 46 ++--
.../util/nio/GridNioBackPressureControl.java| 14 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 10 ++---
.../communication/tcp/TcpCommunicationSpi.java | 6 +--
.../org/apache/ignite/thread/IgniteThread.java | 43 ++
.../ignite/thread/IgniteThreadPoolExecutor.java | 37 ++--
.../portable/BinaryMarshallerSelfTest.java | 2 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 -
.../marshaller/GridMarshallerAbstractTest.java | 32 +-
.../testframework/junits/GridAbstractTest.java | 9 ++--
.../junits/IgniteTestResources.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../IgnitePortableCacheTestSuite.java | 3 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 5 +++
.../ignite/osgi/AbstractIgniteKarafTest.java| 2 -
.../ignite/internal/GridFactorySelfTest.java| 29
.../GridSpringBeanSerializationSelfTest.java| 2 +
37 files changed, 252 insertions(+), 205 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index a2ba227..8571f66 100644
---
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.ExamplesUtils;
import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.resources.IgniteInstanceResource;
/**
* Demonstrates simple message exchange between local and remote nodes.
@@ -65,9 +64,6 @@ public class MessagingPingPongExample {
// Set up remote player.
ignite.message(nodeB).remoteListen(null, new
IgniteBiPredicate() {
-@IgniteInstanceResource
-private Ignite ignite;
-
@Override public boolean apply(UUID nodeId, String rcvMsg) {
System.out.println("Received message [msg=" + rcvMsg + ",
sender=" + nodeId + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/0adee3ae/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
--
diff --git
a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java
index c77e4b6..e15159d 100644
---
a/examples/src/test/java8/org/apache/igni
ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 bdbe4068b -> 69047243b
ignite-2030 Fixed issue with JAVA_HOME containing parenthesis
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69047243
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69047243
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69047243
Branch: refs/heads/ignite-1.5
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov
Committed: Wed Dec 9 09:27:23 2015 +0300
--
bin/ignite.bat| 5 +++--
bin/include/parseargs.bat | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 43cc58b..97c2e45 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -20,6 +20,7 @@
::
@echo off
+Setlocal EnableDelayedExpansion
if "%OS%" == "Windows_NT" setlocal
@@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 (
:: Process 'restart'.
::
set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP%
org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
-for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set
RANDOM_NUMBER=%%i
+for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set
RANDOM_NUMBER=%%i
set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
@@ -132,7 +133,7 @@ set
RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
:: This is executed if -nojmx is not specified
::
if not "%NO_JMX%" == "1" (
-for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP%
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
+for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP%
org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do (
set JMX_PORT=%%A
)
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat
--
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index c4b35d2..86e5766 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -40,7 +40,7 @@
:: in other scripts to parse common command lines parameters.
set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP%
org.apache.ignite.startup.cmdline.CommandLineTransformer %*
-for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set
reformattedArgs=%%i
+for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set
reformattedArgs=%%i
for %%i in (%reformattedArgs%) do (
if "%%i" == "CommandLineTransformerError" exit /b 1
ignite git commit: IGNITE-843 Migrate from ag-grid to ui-grid.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 4c36b82a8 -> da50f0c6c
IGNITE-843 Migrate from ag-grid to ui-grid.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da50f0c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da50f0c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da50f0c6
Branch: refs/heads/ignite-843-rc2
Commit: da50f0c6cb3ce1e46ff63eafddd46a5a65f08a05
Parents: 4c36b82
Author: Andrey
Authored: Wed Dec 9 12:09:41 2015 +0700
Committer: Andrey
Committed: Wed Dec 9 12:10:29 2015 +0700
--
.../control-center-web/src/main/js/app/index.js | 5 +-
.../control-center-web/src/main/js/config.js| 19 ++-
.../main/js/controllers/caches-controller.js| 14 +-
.../main/js/controllers/clusters-controller.js | 16 ++-
.../src/main/js/controllers/common-module.js| 129 +--
.../main/js/controllers/metadata-controller.js | 14 +-
.../src/main/js/controllers/sql-controller.js | 73 ++-
.../src/main/js/gulpfile.js/index.js| 5 +-
.../src/main/js/gulpfile.js/tasks/connect.js| 1 +
.../src/main/js/gulpfile.js/tasks/copy.js | 11 +-
.../src/main/js/gulpfile.js/tasks/jade.js | 12 +-
.../control-center-web/src/main/js/package.json | 20 ++-
.../src/main/js/public/stylesheets/style.scss | 122 ++
.../src/main/js/views/configuration/caches.jade | 2 +-
.../main/js/views/configuration/clusters.jade | 2 +-
.../src/main/js/views/configuration/igfs.jade | 2 +-
.../js/views/configuration/metadata-load.jade | 8 +-
.../main/js/views/configuration/metadata.jade | 4 +-
.../main/js/views/configuration/summary.jade| 2 +-
.../src/main/js/views/includes/controls.jade| 6 +-
.../src/main/js/views/sql/sql.jade | 4 +-
21 files changed, 163 insertions(+), 308 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/da50f0c6/modules/control-center-web/src/main/js/app/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/index.js
b/modules/control-center-web/src/main/js/app/index.js
index 1305fa3..4174425 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -19,6 +19,7 @@ import jQuery from 'jquery'
import _ from 'lodash'
import ace from 'ace'
import angular from 'angular';
+import pdfMake from 'pdfmake';
import 'angular-ui-router'
import 'angular-strap'
@@ -27,7 +28,7 @@ import 'angular-tree-control'
import 'angular-smart-table'
import 'angular-animate'
import 'angular-sanitize'
-import 'angular-ag-grid'
+import 'angular-ui-grid'
import 'angular-loading'
import 'angular-drag-and-drop-lists'
import 'angular-nvd3'
@@ -42,7 +43,7 @@ import 'public/stylesheets/style.css!'
import 'nvd3/build/nv.d3.css!'
import 'angular-tree-control/css/tree-control-attribute.css!'
import 'angular-tree-control/css/tree-control.css!'
-import 'angular-ag-grid/dist/ag-grid.css!'
+import 'angular-ui-grid/ui-grid.css!'
import 'angular-loading/angular-loading.css!'
import 'angular-motion/dist/angular-motion.css!'
http://git-wip-us.apache.org/repos/asf/ignite/blob/da50f0c6/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js
b/modules/control-center-web/src/main/js/config.js
index fec475b..5f11590 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -24,12 +24,13 @@ System.config({
"angular-grid": "github:ceolter/ag-grid@2.3.5",
"angular-loading": "github:darthwade/angular-loading@0.1.4",
"angular-motion": "github:mgcrea/angular-motion@0.4.3",
-"angular-nvd3": "github:krispo/angular-nvd3@1.0.4",
+"angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
"angular-sanitize": "github:angular/bower-angular-sanitize@1.4.8",
"angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.5",
"angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
"angular-tree-control": "github:wix/angular-tree-control@0.2.22",
"angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
+"angular-ui-grid": "github:angular-ui/bower-ui-grid@3.0.7",
"angular-ui-router": "github:angular-ui/ui-router@0.2.15",
"babel": "npm:babel-core@5.8.34",
"babel-runtime": "npm:babel-runtime@5.8.34",
@@ -40,12 +41,13 @@ System.config({
"core-js": "npm:core-js@1.2.6",
"css": "github:systemjs/plugin-css@0.1.20",
"file-saver": "github:eligrey/FileSaver.js@master",
-"font-awesome": "npm:font-awesome@4.4.0",
+"font-awesome": "npm:font-awesome@4.5.0",
ignite git commit: IGNITE-843 Minor fixes of caches metadata watch.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 87a4e8d84 -> 4c36b82a8
IGNITE-843 Minor fixes of caches metadata watch.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c36b82a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c36b82a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c36b82a
Branch: refs/heads/ignite-843-rc2
Commit: 4c36b82a8d472242a497b43e3090a6c9ec739c32
Parents: 87a4e8d
Author: Alexey Kuznetsov
Authored: Wed Dec 9 10:43:12 2015 +0700
Committer: Alexey Kuznetsov
Committed: Wed Dec 9 10:43:12 2015 +0700
--
.../main/js/controllers/caches-controller.js| 66 ++--
1 file changed, 34 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c36b82a/modules/control-center-web/src/main/js/controllers/caches-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/caches-controller.js
b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 8429071..161f197 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -135,15 +135,15 @@ consoleModule.controller('cachesController', [
var memoryMode = backupItem.memoryMode;
-var onHeapTired = memoryMode == 'ONHEAP_TIERED';
-var offHeapTired = memoryMode == 'OFFHEAP_TIERED';
+var onHeapTired = memoryMode === 'ONHEAP_TIERED';
+var offHeapTired = memoryMode === 'OFFHEAP_TIERED';
var offHeapMaxMemory = backupItem.offHeapMaxMemory;
-if (model == 'offHeapMaxMemory' && offHeapTired)
+if (model === 'offHeapMaxMemory' && offHeapTired)
return true;
-if (model == 'evictionPolicy.kind' && onHeapTired)
+if (model === 'evictionPolicy.kind' && onHeapTired)
return backupItem.swapEnabled ||
($common.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0);
}
@@ -166,9 +166,9 @@ consoleModule.controller('cachesController', [
if ($common.isDefined(model)) {
model.forEach(function (val, ix) {
-if (ix != index && val.split('=')[0] == key)
+if (ix !== index && val.split('=')[0] === key)
exist = true;
-})
+});
}
if (exist)
@@ -186,7 +186,7 @@ consoleModule.controller('cachesController', [
var idx = _.indexOf(model, fx);
// Found duplicate.
-if (idx >= 0 && idx != index)
+if (idx >= 0 && idx !== index)
return showPopoverMessage(null, null,
$table.tableFieldId(index, 'SqlFx'), 'SQL function with such class name already
exists!');
}
}
@@ -207,11 +207,11 @@ consoleModule.controller('cachesController', [
if ($common.isDefined(model)) {
var idx = _.findIndex(model, function (pair) {
-return pair.keyClass == pairValue.key &&
pair.valueClass == pairValue.value;
+return pair.keyClass === pairValue.key &&
pair.valueClass === pairValue.value;
});
// Found duplicate.
-if (idx >= 0 && idx != index)
+if (idx >= 0 && idx !== index)
return showPopoverMessage(null, null,
$table.tableFieldId(index, 'ValueIndexedType'), 'Indexed type with such key and
value classes already exists!');
}
@@ -244,7 +244,7 @@ consoleModule.controller('cachesController', [
$scope.caches = data.caches;
$scope.clusters = data.clusters;
$scope.metadatas =
_.sortBy(_.map(validFilter(data.metadatas, true, false), function (meta) {
-return {value: meta._id, label: meta.valueType, kind:
meta.kind, meta: meta}
+return {value: meta._id, label: meta.valueType, kind:
meta.kind, meta: meta};
}), 'label');
// Load page descriptor.
@@ -324,28 +324,30 @@ consoleModule.controller('cachesController', [
}
}, true);
-$scope.$watch('ba
ignite git commit: Fix OSGi test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 3baf4d163 -> bdbe4068b
Fix OSGi test.
(@ProbeBuilder applies to all test classes when run from a suite).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bdbe4068
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bdbe4068
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bdbe4068
Branch: refs/heads/ignite-1.5
Commit: bdbe4068b3851f7a412935acb3e36860cd08efa9
Parents: 3baf4d1
Author: Raul Kripalani
Authored: Tue Dec 8 21:04:36 2015 +0100
Committer: Raul Kripalani
Committed: Tue Dec 8 21:04:36 2015 +0100
--
.../test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdbe4068/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
--
diff --git
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 9a2e92d..4f875ed 100644
---
a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++
b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -93,7 +93,7 @@ public class IgniteOsgiServiceTest extends
AbstractIgniteKarafTest {
*/
@ProbeBuilder
public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
-probe.setHeader(Constants.IMPORT_PACKAGE,
"*,org.apache.ignite.osgi.activators");
+probe.setHeader(Constants.IMPORT_PACKAGE,
"*,org.apache.ignite.osgi.activators;resolution:=\"optional\"");
return probe;
}
[2/2] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.
ignite-1.5 Cache map refactoring. This closes #279.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3baf4d16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3baf4d16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3baf4d16
Branch: refs/heads/ignite-1.5
Commit: 3baf4d163c6edafa7367ece7901ad1efe695a8d4
Parents: c30def8
Author: sboikov
Authored: Tue Dec 8 17:30:14 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 17:30:14 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 65 +-
.../cache/GridCacheConcurrentMap.java | 734 +--
.../processors/cache/GridCacheMapEntry.java | 44 +-
.../cache/GridCacheMapEntryFactory.java | 13 +-
.../distributed/GridDistributedCacheEntry.java | 14 +-
.../distributed/dht/GridDhtCacheAdapter.java| 13 +-
.../distributed/dht/GridDhtCacheEntry.java | 14 +-
.../dht/GridDhtOffHeapCacheEntry.java | 15 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 23 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 16 +-
.../atomic/GridDhtAtomicOffHeapCacheEntry.java | 15 +-
.../dht/colocated/GridDhtColocatedCache.java| 13 +-
.../colocated/GridDhtColocatedCacheEntry.java | 14 +-
.../GridDhtColocatedOffHeapCacheEntry.java | 15 +-
.../colocated/GridDhtDetachedCacheEntry.java| 4 +-
.../distributed/near/GridNearCacheAdapter.java | 8 +-
.../distributed/near/GridNearCacheEntry.java| 16 +-
.../near/GridNearOffHeapCacheEntry.java | 15 +-
.../processors/cache/local/GridLocalCache.java | 8 +-
.../cache/local/GridLocalCacheEntry.java| 15 +-
.../local/atomic/GridLocalAtomicCache.java | 8 +-
.../ignite/internal/util/IgniteUtils.java | 18 +-
.../cache/GridCacheAlwaysEvictionPolicy.java| 2 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 11 -
.../loadtests/hashmap/GridHashMapLoadTest.java | 4 +-
26 files changed, 357 insertions(+), 764 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f96954e..034640f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -925,25 +925,60 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache t =
map.putEntryIfObsoleteOrAbsent(topVer, key, null, create);
+GridCacheMapEntry cur = map.getEntry(key);
-GridCacheEntryEx cur = t.get1();
-GridCacheEntryEx created = t.get2();
-GridCacheEntryEx doomed = t.get3();
+if (cur == null || cur.obsolete()) {
+GridTriple t = map.putEntryIfObsoleteOrAbsent(
+topVer,
+key,
+null,
+create);
-if (doomed != null &&
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
-// Event notification.
-ctx.events().addEvent(doomed.partition(), doomed.key(), locNodeId,
(IgniteUuid)null, null,
-EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null,
null, null, true);
+cur = t.get1();
-if (created != null) {
-// Event notification.
-if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
-ctx.events().addEvent(created.partition(), created.key(),
locNodeId, (IgniteUuid)null, null,
-EVT_CACHE_ENTRY_CREATED, null, false, null, false, null,
null, null, true);
+GridCacheEntryEx created = t.get2();
+GridCacheEntryEx doomed = t.get3();
-if (touch)
-ctx.evicts().touch(cur, topVer);
+if (doomed != null &&
ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
+// Event notification.
+ctx.events().addEvent(doomed.partition(),
+doomed.key(),
+locNodeId,
+(IgniteUuid)null,
+null,
+EVT_CACHE_ENTRY_DESTROYED,
+null,
+false,
+null,
+false,
+null,
+null,
+null,
+true);
+
+if (created != null) {
+// Event notificati
[1/2] ignite git commit: ignite-1.5 Cache map refactoring. This closes #279.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 c30def8f0 -> 3baf4d163
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
index 1f494c0..5bb6794 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -220,8 +220,6 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
Thread.sleep(1000);
jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
}
/**
@@ -315,8 +313,6 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
Thread.sleep(1000);
jcache().get(rand.nextInt(cnt));
-
-assertEquals(0, local().map.iteratorMapSize());
}
/**
@@ -352,14 +348,7 @@ public class GridCacheConcurrentMapSelfTest extends
GridCommonAbstractTest {
System.gc();
c.get(100);
-
-if (local().map.iteratorMapSize() == 0)
-break;
-else
-U.sleep(500);
}
-
-assertEquals(0, local().map.iteratorMapSize());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index a41f6c8..b459dde 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -81,7 +81,7 @@ public class GridHashMapLoadTest extends
GridCommonAbstractTest {
Integer val = i++;
map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key),
-key.hashCode(), ctx.toCacheObject(val), null, 1) {
+key.hashCode(), ctx.toCacheObject(val)) {
@Override public boolean tmLock(IgniteInternalTx tx,
long timeout,
@Nullable GridCacheVersion serOrder,
@@ -103,4 +103,4 @@ public class GridHashMapLoadTest extends
GridCommonAbstractTest {
info("Inserted objects: " + i / 2);
}
}
-}
\ No newline at end of file
+}
ignite git commit: 2064 Issue url fix
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 0e81a3973 -> c30def8f0
2064 Issue url fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c30def8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c30def8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c30def8f
Branch: refs/heads/ignite-1.5
Commit: c30def8f049bddb4ec272528326f84bf90a1399b
Parents: 0e81a39
Author: Anton Vinogradov
Authored: Tue Dec 8 16:48:58 2015 +0300
Committer: Anton Vinogradov
Committed: Tue Dec 8 16:48:58 2015 +0300
--
.../internal/processors/cache/GridCacheDeploymentSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c30def8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index aa64959..bfa353b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -228,7 +228,7 @@ public class GridCacheDeploymentSelfTest extends
GridCommonAbstractTest {
Ignite g1 = startGrid(1);
if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
-fail("http://atlassian.gridgain.com/jira/browse/GG-10791";);
+fail("https://issues.apache.org/jira/browse/IGNITE-2106";);
Ignite g2 = startGrid(2);
[1/4] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
Repository: ignite Updated Branches: refs/heads/ignite-1.5 3a3400340 -> 0e81a3973 http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.FxCop -- diff --git a/modules/platforms/dotnet/Apache.Ignite.FxCop b/modules/platforms/dotnet/Apache.Ignite.FxCop index 5c7f7f1..0df73c5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.FxCop +++ b/modules/platforms/dotnet/Apache.Ignite.FxCop @@ -107,11 +107,329 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + 'IBinaryReader.GetRawReader()' + + + + + + + + + + + + + 'IBinaryWriter.GetRawWriter()' + + + + + + + + + + + + + 'IIgniteBinary.GetBinaryTypes()' + + + + + + + + + + + + + + + + + 'value' + + + + + + + + + + + + + + + + + 'ComputeJobAdapter.GetArgument (int)' + 'IndexOutOfRangeException' + + + + + + + + + + + + + + + + + 'IEvents.GetEnabledEvents()' + + + + + + + + + + + + + + + + + 'IgniteUtils' + + + + + + + + + + + + + + + + + 'string.Format(string, object)' + 'BinaryReader.Deserialize ()' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + 'string.Format(string, object, object)' + 'BinaryReader.IsNotNullHeader(byte)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + + + + + 'string.Format(string, object, object, object)' + 'Marshaller.AddType(Type, int, string, bool, bool, IBinaryNameMapper, IBinaryIdMapper, IBinarySerializer, string)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + + + + + + + + + + + + + 'Classpath.AppendHomeClasspath(string, bool, StringBuilder)' + 'string.EndsWith(string)' + 'string.EndsWith(string, StringComparison)' + + + + + + + + + 'Classpath.CreateClasspath(string, IgniteConfiguration, bool)' + 'string.EndsWith(string)' + 'string.EndsWith(string, StringComparison)' + + + + + + + + + + + + + 'Future .OnNullResult()' + 'Exception' + + + + + + + + + + + + + 'string.Format(string, object)' + 'IgniteHome.Resolve(IgniteConfiguration)' + 'string.Format(IFormatProvider, string, params object[])' + + + + + 'string.Format(string, object, object)' + 'IgniteHome.Resolve(IgniteConfiguration)' + 'string.Format(IFormatProvider, string, params object[])' + + + + +
[3/4] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/568f910f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/568f910f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/568f910f
Branch: refs/heads/ignite-1.5
Commit: 568f910f11472e6ab533c3f1cef6f197456e006f
Parents: efe632b
Author: Pavel Tupitsyn
Authored: Tue Dec 8 16:35:51 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Dec 8 16:35:51 2015 +0300
--
.../Apache.Ignite.Core.csproj | 1 +
.../Apache.Ignite.Core/Impl/NativeMethods.cs| 10 -
.../Impl/Unmanaged/IgniteJniNativeMethods.cs| 358 +
.../Impl/Unmanaged/UnmanagedUtils.cs| 788 +++
modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++-
5 files changed, 798 insertions(+), 681 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 2c7d787..831130c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -297,6 +297,7 @@
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
internal static extern IntPtr LoadLibrary(string path);
-
-///
-/// Get procedure address with WinAPI.
-///
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
new file mode 100644
index 000..860e703
--- /dev/null
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -0,0 +1,358 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+using System.Runtime.InteropServices;
+using System.Security;
+
+///
+/// Ignite JNI native methods.
+///
+[SuppressUnmanagedCodeSecurity]
+internal unsafe static class IgniteJniNativeMethods
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate")]
+public static extern int Reallocate(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
+long dataPtr);
+
+[DllImport(IgniteUtils.FileIg
[4/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e81a397 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e81a397 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e81a397 Branch: refs/heads/ignite-1.5 Commit: 0e81a3973cccfe6d912e073cd9f44db5a5c46d79 Parents: 568f910 3a34003 Author: vozerov-gridgain Authored: Tue Dec 8 16:36:12 2015 +0300 Committer: vozerov-gridgain Committed: Tue Dec 8 16:36:12 2015 +0300 -- .../config/benchmark-failover.properties| 2 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++- 2 files changed, 33 insertions(+), 11 deletions(-) --
[2/4] ignite git commit: IGNITE-1694 : .NET: Use DllImport instead of delegates in P/Invoke.
http://git-wip-us.apache.org/repos/asf/ignite/blob/568f910f/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9a49fae..56a184d 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -19,10 +19,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
{
using System;
using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.InteropServices;
using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Common;
+
+using JNI = IgniteJniNativeMethods;
///
/// Unmanaged utility classes.
@@ -32,544 +32,27 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
/** Interop factory ID for .Net. */
private const int InteropFactoryId = 1;
-#region PROCEDURE NAMES
-
-private const string ProcReallocate = "IgniteReallocate";
-
-private const string ProcIgnitionStart = "IgniteIgnitionStart";
-private const string ProcIgnitionStop = "IgniteIgnitionStop";
-private const string ProcIgnitionStopAll = "IgniteIgnitionStopAll";
-
-private const string ProcProcessorReleaseStart =
"IgniteProcessorReleaseStart";
-private const string ProcProcessorProjection =
"IgniteProcessorProjection";
-private const string ProcProcessorCache = "IgniteProcessorCache";
-private const string ProcProcessorGetOrCreateCache =
"IgniteProcessorGetOrCreateCache";
-private const string ProcProcessorCreateCache =
"IgniteProcessorCreateCache";
-private const string ProcProcessorAffinity = "IgniteProcessorAffinity";
-private const string ProcProcessorDataStreamer =
"IgniteProcessorDataStreamer";
-private const string ProcProcessorTransactions =
"IgniteProcessorTransactions";
-private const string ProcProcessorCompute = "IgniteProcessorCompute";
-private const string ProcProcessorMessage = "IgniteProcessorMessage";
-private const string ProcProcessorEvents = "IgniteProcessorEvents";
-private const string ProcProcessorServices = "IgniteProcessorServices";
-private const string ProcProcessorExtensions =
"IgniteProcessorExtensions";
-private const string ProcProcessorAtomicLong =
"IgniteProcessorAtomicLong";
-
-private const string ProcTargetInStreamOutLong =
"IgniteTargetInStreamOutLong";
-private const string ProcTargetInStreamOutStream =
"IgniteTargetInStreamOutStream";
-private const string ProcTargetInStreamOutObject =
"IgniteTargetInStreamOutObject";
-private const string ProcTargetInObjectStreamOutStream =
"IgniteTargetInObjectStreamOutStream";
-private const string ProcTargetOutLong = "IgniteTargetOutLong";
-private const string ProcTargetOutStream = "IgniteTargetOutStream";
-private const string ProcTargetOutObject = "IgniteTargetOutObject";
-private const string ProcTargetListenFut = "IgniteTargetListenFuture";
-private const string ProcTargetListenFutForOp =
"IgniteTargetListenFutureForOperation";
-
-private const string ProcAffinityParts = "IgniteAffinityPartitions";
-
-private const string ProcCacheWithSkipStore =
"IgniteCacheWithSkipStore";
-private const string ProcCacheWithNoRetries =
"IgniteCacheWithNoRetries";
-private const string ProcCacheWithExpiryPolicy =
"IgniteCacheWithExpiryPolicy";
-private const string ProcCacheWithAsync = "IgniteCacheWithAsync";
-private const string ProcCacheWithKeepBinary =
"IgniteCacheWithKeepPortable";
-private const string ProcCacheClear = "IgniteCacheClear";
-private const string ProcCacheRemoveAll = "IgniteCacheRemoveAll";
-private const string ProcCacheOutOpQueryCursor =
"IgniteCacheOutOpQueryCursor";
-private const string ProcCacheOutOpContinuousQuery =
"IgniteCacheOutOpContinuousQuery";
-private const string ProcCacheIterator = "IgniteCacheIterator";
-private const string ProcCacheLocalIterator =
"IgniteCacheLocalIterator";
-private const string ProcCacheEnterLock = "IgniteCacheEnterLock";
-private const string ProcCacheExitLock = "IgniteCacheExitLock";
-private const string ProcCacheTryEnterLock = "IgniteCacheTryEnterLock";
-private const string ProcCacheCloseLock = "IgniteCacheCloseLock";
-private const string ProcCacheRebalance = "IgniteCacheRebalance";
-private const string ProcCacheSize = "IgniteCacheSize";
-
-private const string ProcCacheStoreCallbackInvoke =
"IgniteCacheStoreCallbackInvoke";
-
-private const string
[18/19] ignite git commit: Merge branch 'ignite-1694' of https://github.com/ptupitsyn/ignite into ignite-1694
Merge branch 'ignite-1694' of https://github.com/ptupitsyn/ignite into ignite-1694 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3490e52f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3490e52f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3490e52f Branch: refs/heads/ignite-1694 Commit: 3490e52f59e8e1f3f4d590d8cbf904cf7be05846 Parents: efe632b c9e3719 Author: vozerov-gridgain Authored: Tue Dec 8 16:01:41 2015 +0300 Committer: vozerov-gridgain Committed: Tue Dec 8 16:01:41 2015 +0300 -- .../Apache.Ignite.Core.csproj | 1 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 464 +++ .../Impl/Unmanaged/UnmanagedUtils.cs| 786 +++ modules/platforms/dotnet/Apache.Ignite.FxCop| 322 +++- 4 files changed, 904 insertions(+), 669 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3490e52f/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj --
[09/19] ignite git commit: Fix naming style
Fix naming style
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a6f448c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a6f448c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a6f448c
Branch: refs/heads/ignite-1694
Commit: 8a6f448ced8b28aafc7d543cfb215f0d8e94ba83
Parents: 97cfccc
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:26:06 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:26:06 2015 +0300
--
.../Impl/Unmanaged/IgniteJni.cs | 168 +--
.../Impl/Unmanaged/UnmanagedUtils.cs| 168 +--
2 files changed, 168 insertions(+), 168 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a6f448c/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
index 2991baf..b01f210 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
@@ -26,107 +26,107 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
{
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern int REALLOCATE(long memPtr, int cap);
+public static extern int Reallocate(long memPtr, int cap);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* IGNITION_START(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
long dataPtr);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStop", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern bool IGNITION_STOP(void* ctx, sbyte* gridName,
bool cancel);
+public static extern bool IgnitionStop(void* ctx, sbyte* gridName,
bool cancel);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStopAll", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void IGNITION_STOP_ALL(void* ctx, bool cancel);
+public static extern void IgnitionStopAll(void* ctx, bool cancel);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorReleaseStart", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void PROCESSOR_RELEASE_START(void* ctx, void*
obj);
+public static extern void ProcessorReleaseStart(void* ctx, void* obj);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorProjection", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* PROCESSOR_PROJECTION(void* ctx, void* obj);
+public static extern void* ProcessorProjection(void* ctx, void* obj);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorCache", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* PROCESSOR_CACHE(void* ctx, void* obj,
sbyte* name);
+public static extern void* ProcessorCache(void* ctx, void* obj, sbyte*
name);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorCreateCache", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* PROCESSOR_CREATE_CACHE(void* ctx, void*
obj, sbyte* name);
+public static extern void* ProcessorCreateCache(void* ctx, void* obj,
sbyte* name);
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorGetOrCreateCache",
SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping =
false, ThrowOnUnmappableChar = true)]
-public static extern void* PROCESSOR_GET_OR_CREATE_CACHE(void* ctx,
void* obj, sbyte* name);
+public static extern void* ProcessorGetOrCreateCache(void* ctx, void*
obj, sbyte* name);
[DllImport(IgniteUtils.FileIgnite
[03/19] ignite git commit: Delegates done
Delegates done Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5aa5fcb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5aa5fcb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5aa5fcb5 Branch: refs/heads/ignite-1694 Commit: 5aa5fcb5767aa6118fcbdc03c0352af05955d7b7 Parents: e429050 Author: Pavel Tupitsyn Authored: Wed Nov 11 18:01:30 2015 +0300 Committer: Pavel Tupitsyn Committed: Wed Nov 11 18:01:30 2015 +0300 -- .../Impl/Unmanaged/UnmanagedUtils.cs| 311 +++ 1 file changed, 311 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5aa5fcb5/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs index f0b3f4c..8e1eec5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs @@ -34,109 +34,420 @@ namespace Apache.Ignite.Core.Impl.Unmanaged // ReSharper disable InconsistentNaming +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteReallocate", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern int REALLOCATE(long memPtr, int cap); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStart", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* IGNITION_START(void* ctx, sbyte* cfgPath, sbyte* gridName, int factoryId, long dataPtr); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStop", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern bool IGNITION_STOP(void* ctx, sbyte* gridName, bool cancel); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStopAll", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void IGNITION_STOP_ALL(void* ctx, bool cancel); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorReleaseStart", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void PROCESSOR_RELEASE_START(void* ctx, void* obj); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorProjection", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_PROJECTION(void* ctx, void* obj); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorCache", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_CACHE(void* ctx, void* obj, sbyte* name); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorCreateCache", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_CREATE_CACHE(void* ctx, void* obj, sbyte* name); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorGetOrCreateCache", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_GET_OR_CREATE_CACHE(void* ctx, void* obj, sbyte* name); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorAffinity", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_AFFINITY(void* ctx, void* obj, sbyte* name); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorDataStreamer", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_DATA_STREAMER(void* ctx, void* obj, sbyte* name, bool keepBinary); + +[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorTransactions", SetLastError = true, +CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] private static extern void* PROCESSOR_TRANSACTIONS(void* c
[06/19] ignite git commit: Reformatting
Reformatting Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ad92dfe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ad92dfe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ad92dfe Branch: refs/heads/ignite-1694 Commit: 6ad92dfe76903e4ddd62ef7d5b4e489a3dd00c7d Parents: d63261a Author: Pavel Tupitsyn Authored: Wed Nov 11 18:09:18 2015 +0300 Committer: Pavel Tupitsyn Committed: Wed Nov 11 18:09:18 2015 +0300 -- .../Impl/Unmanaged/UnmanagedUtils.cs| 946 ++- 1 file changed, 474 insertions(+), 472 deletions(-) --
[19/19] ignite git commit: IGNITE-1694: Simplification and optimization.
IGNITE-1694: Simplification and optimization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d79c2b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d79c2b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d79c2b6
Branch: refs/heads/ignite-1694
Commit: 4d79c2b65cf9742717a4438972ff88d9813921a0
Parents: 3490e52
Author: vozerov-gridgain
Authored: Tue Dec 8 16:14:43 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Dec 8 16:14:43 2015 +0300
--
.../Apache.Ignite.Core/Impl/NativeMethods.cs| 10 -
.../Impl/Unmanaged/IgniteJniNativeMethods.cs| 317 +++
.../Impl/Unmanaged/UnmanagedUtils.cs| 2 -
3 files changed, 107 insertions(+), 222 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4d79c2b6/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
index 6e25e7e..eb3ba97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/NativeMethods.cs
@@ -33,15 +33,5 @@ namespace Apache.Ignite.Core.Impl
[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
internal static extern IntPtr LoadLibrary(string path);
-
-///
-/// Get procedure address with WinAPI.
-///
-/// DLL pointer.
-/// Procedure name.
-/// Procedure address.
-[DllImport("kernel32.dll", SetLastError = true, CharSet =
CharSet.Ansi, BestFitMapping = false,
-ThrowOnUnmappableChar = true)]
-internal static extern IntPtr GetProcAddress(IntPtr ptr, string name);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4d79c2b6/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
index 7a2f606..3189503 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -26,439 +26,336 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
[SuppressUnmanagedCodeSecurity]
internal unsafe static class IgniteJniNativeMethods
{
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate")]
public static extern int Reallocate(long memPtr, int cap);
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart")]
+public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
long dataPtr);
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStop", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStop")]
[return: MarshalAs(UnmanagedType.U1)]
public static extern bool IgnitionStop(void* ctx, sbyte* gridName,
[MarshalAs(UnmanagedType.U1)] bool cancel);
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStopAll", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStopAll")]
public static extern void IgnitionStopAll(void* ctx,
[MarshalAs(UnmanagedType.U1)] bool cancel);
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorReleaseStart", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorReleaseStart")]
[05/19] ignite git commit: Reformatting
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ad92dfe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs index dd5769b..557468e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs @@ -32,429 +32,432 @@ namespace Apache.Ignite.Core.Impl.Unmanaged /** Interop factory ID for .Net. */ private const int InteropFactoryId = 1; -#region DELEGATE MEMBERS - -// ReSharper disable InconsistentNaming - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteReallocate", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern int REALLOCATE(long memPtr, int cap); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStart", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* IGNITION_START(void* ctx, sbyte* cfgPath, sbyte* gridName, int factoryId, long dataPtr); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStop", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern bool IGNITION_STOP(void* ctx, sbyte* gridName, bool cancel); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStopAll", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void IGNITION_STOP_ALL(void* ctx, bool cancel); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorReleaseStart", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void PROCESSOR_RELEASE_START(void* ctx, void* obj); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorProjection", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_PROJECTION(void* ctx, void* obj); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorCache", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_CACHE(void* ctx, void* obj, sbyte* name); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorCreateCache", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_CREATE_CACHE(void* ctx, void* obj, sbyte* name); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorGetOrCreateCache", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_GET_OR_CREATE_CACHE(void* ctx, void* obj, sbyte* name); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorAffinity", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_AFFINITY(void* ctx, void* obj, sbyte* name); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorDataStreamer", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_DATA_STREAMER(void* ctx, void* obj, sbyte* name, bool keepBinary); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorTransactions", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_TRANSACTIONS(void* ctx, void* obj); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorCompute", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_COMPUTE(void* ctx, void* obj, void* prj); - -[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorMessage", SetLastError = true, -CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -private static extern void* PROCESSOR_MESSAGE(void* ctx, void* obj, void* prj); - -[DllImport(IgniteUtils.F
[01/19] ignite git commit: first draft
Repository: ignite
Updated Branches:
refs/heads/ignite-1694 [created] 4d79c2b65
first draft
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7966a36a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7966a36a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7966a36a
Branch: refs/heads/ignite-1694
Commit: 7966a36aa604adc0df0afa310856295a06e9de1c
Parents: 894057e
Author: Pavel Tupitsyn
Authored: Wed Nov 11 16:22:57 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 16:22:57 2015 +0300
--
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7966a36a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 9a49fae..63ba30a 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -312,6 +312,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
private static readonly ProcessorDataStreamerDelegate
PROCESSOR_DATA_STREAMER;
private static readonly ProcessorTransactionsDelegate
PROCESSOR_TRANSACTIONS;
private static readonly ProcessorComputeDelegate PROCESSOR_COMPUTE;
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorCompute")]
+private static extern void* PROCESSOR_COMPUTE2(void* ctx, void* obj,
void* prj);
+
private static readonly ProcessorMessageDelegate PROCESSOR_MESSAGE;
private static readonly ProcessorEventsDelegate PROCESSOR_EVENTS;
private static readonly ProcessorServicesDelegate PROCESSOR_SERVICES;
@@ -719,7 +723,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
internal static IUnmanagedTarget ProcessorCompute(IUnmanagedTarget
target, IUnmanagedTarget prj)
{
-void* res = PROCESSOR_COMPUTE(target.Context, target.Target,
prj.Target);
+void* res = PROCESSOR_COMPUTE2(target.Context, target.Target,
prj.Target);
return target.ChangeTarget(res);
}
[07/19] ignite git commit: Extract to a separate class
Extract to a separate class
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4348b334
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4348b334
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4348b334
Branch: refs/heads/ignite-1694
Commit: 4348b334760fce4c7998ed098df1cda5d77ff9fd
Parents: 6ad92df
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:14:21 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:14:21 2015 +0300
--
.../Apache.Ignite.Core.csproj | 1 +
.../Impl/Unmanaged/IgniteJni.cs | 450 +++
.../Impl/Unmanaged/UnmanagedUtils.cs| 427 --
3 files changed, 451 insertions(+), 427 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4348b334/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index d7db33e..fff4842 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -294,6 +294,7 @@
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/4348b334/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
new file mode 100644
index 000..2991baf
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
@@ -0,0 +1,450 @@
+/*
+ * 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.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+using System.Runtime.InteropServices;
+
+///
+/// Ignite JNI methods.
+///
+internal unsafe static class IgniteJni
+{
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern int REALLOCATE(long memPtr, int cap);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern void* IGNITION_START(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
+long dataPtr);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStop", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern bool IGNITION_STOP(void* ctx, sbyte* gridName,
bool cancel);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStopAll", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern void IGNITION_STOP_ALL(void* ctx, bool cancel);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorReleaseStart", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern void PROCESSOR_RELEASE_START(void* ctx, void*
obj);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorProjection", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
+public static extern void* PROCESSOR_PROJECTION(void* ctx, void* obj);
+
+[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorCache", SetLastError = true,
+CharSet = CharSet.Ansi, BestFitMapping = fa
[08/19] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97cfccc0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97cfccc0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97cfccc0
Branch: refs/heads/ignite-1694
Commit: 97cfccc0906ba2c2ddf40f1f0ea66de4d9baba26
Parents: 4348b33
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:15:53 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:15:53 2015 +0300
--
.../Impl/Unmanaged/UnmanagedUtils.cs| 210 ++-
1 file changed, 106 insertions(+), 104 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/97cfccc0/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 4af5f89..9425df3 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -23,6 +23,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
using System.Security;
using Apache.Ignite.Core.Common;
+using JNI = IgniteJni;
+
///
/// Unmanaged utility classes.
///
@@ -70,7 +72,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res = IgniteJni.IGNITION_START(ctx.NativeContext,
cfgPath0, gridName0, InteropFactoryId,
+void* res = JNI.IGNITION_START(ctx.NativeContext,
cfgPath0, gridName0, InteropFactoryId,
mem.SynchronizeOutput());
return new UnmanagedTarget(ctx, res);
@@ -89,7 +91,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-return IgniteJni.IGNITION_STOP(ctx, gridName0, cancel);
+return JNI.IGNITION_STOP(ctx, gridName0, cancel);
}
finally
{
@@ -99,17 +101,17 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
internal static void IgnitionStopAll(void* ctx, bool cancel)
{
-IgniteJni.IGNITION_STOP_ALL(ctx, cancel);
+JNI.IGNITION_STOP_ALL(ctx, cancel);
}
internal static void ProcessorReleaseStart(IUnmanagedTarget target)
{
-IgniteJni.PROCESSOR_RELEASE_START(target.Context, target.Target);
+JNI.PROCESSOR_RELEASE_START(target.Context, target.Target);
}
internal static IUnmanagedTarget ProcessorProjection(IUnmanagedTarget
target)
{
-void* res = IgniteJni.PROCESSOR_PROJECTION(target.Context,
target.Target);
+void* res = JNI.PROCESSOR_PROJECTION(target.Context,
target.Target);
return target.ChangeTarget(res);
}
@@ -120,7 +122,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res = IgniteJni.PROCESSOR_CACHE(target.Context,
target.Target, name0);
+void* res = JNI.PROCESSOR_CACHE(target.Context, target.Target,
name0);
return target.ChangeTarget(res);
}
@@ -136,7 +138,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res = IgniteJni.PROCESSOR_CREATE_CACHE(target.Context,
target.Target, name0);
+void* res = JNI.PROCESSOR_CREATE_CACHE(target.Context,
target.Target, name0);
return target.ChangeTarget(res);
}
@@ -152,7 +154,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res =
IgniteJni.PROCESSOR_GET_OR_CREATE_CACHE(target.Context, target.Target, name0);
+void* res = JNI.PROCESSOR_GET_OR_CREATE_CACHE(target.Context,
target.Target, name0);
return target.ChangeTarget(res);
}
@@ -168,7 +170,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res = IgniteJni.PROCESSOR_AFFINITY(target.Context,
target.Target, name0);
+void* res = JNI.PROCESSOR_AFFINITY(target.Context,
target.Target, name0);
return target.ChangeTarget(res);
}
@@ -184,7 +186,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
try
{
-void* res = IgniteJni.PROCESSOR_DATA_STREAMER(target.Context,
target.Target, name0, keepBinary);
+void* res = JNI.PROCESSOR_DATA_STREAMER(target.Context,
target.Target, name0, keepBinary);
return target.ChangeTarget(res);
}
@@ -196,42 +1
[04/19] ignite git commit: SuppressUnmanagedCodeSecurity
SuppressUnmanagedCodeSecurity
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d63261a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d63261a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d63261a7
Branch: refs/heads/ignite-1694
Commit: d63261a79eea6999849024e369b68cb15d35f4ab
Parents: 5aa5fcb
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:02:34 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:02:34 2015 +0300
--
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d63261a7/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 8e1eec5..dd5769b 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -20,11 +20,13 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
+using System.Security;
using Apache.Ignite.Core.Common;
///
/// Unmanaged utility classes.
///
+[SuppressUnmanagedCodeSecurity]
internal static unsafe class UnmanagedUtils
{
/** Interop factory ID for .Net. */
[10/19] ignite git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b4eefdb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b4eefdb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b4eefdb
Branch: refs/heads/ignite-1694
Commit: 4b4eefdb87f70db72115baaef662167b305dbf7a
Parents: 8a6f448
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:33:35 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:33:35 2015 +0300
--
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs | 2 ++
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs| 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b4eefdb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
index b01f210..af473e4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
@@ -18,10 +18,12 @@
namespace Apache.Ignite.Core.Impl.Unmanaged
{
using System.Runtime.InteropServices;
+using System.Security;
///
/// Ignite JNI methods.
///
+[SuppressUnmanagedCodeSecurity]
internal unsafe static class IgniteJni
{
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b4eefdb/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 288dc30..ca06ef0 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -20,7 +20,6 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-using System.Security;
using Apache.Ignite.Core.Common;
using JNI = IgniteJni;
@@ -28,7 +27,6 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
///
/// Unmanaged utility classes.
///
-[SuppressUnmanagedCodeSecurity]
internal static unsafe class UnmanagedUtils
{
/** Interop factory ID for .Net. */
@@ -38,7 +36,6 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
/// Initializer.
///
[SuppressMessage("Microsoft.Design",
"CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
-[SuppressMessage("Microsoft.Performance",
"CA1810:InitializeReferenceTypeStaticFieldsInline")]
static UnmanagedUtils()
{
var path =
IgniteUtils.UnpackEmbeddedResource(IgniteUtils.FileIgniteJniDll);
[14/19] ignite git commit: Fixing MarshalAs
Fixing MarshalAs Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/503bbde8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/503bbde8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/503bbde8 Branch: refs/heads/ignite-1694 Commit: 503bbde8736e83e2c5fbba97277dfc1d984b6087 Parents: 09e79b0 Author: Pavel Tupitsyn Authored: Thu Nov 12 11:50:52 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Nov 12 11:50:52 2015 +0300 -- .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 8 + modules/platforms/dotnet/Apache.Ignite.FxCop| 543 ++- 2 files changed, 549 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/503bbde8/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs index a63230b..9996d3e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs @@ -39,6 +39,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStop", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool IgnitionStop(void* ctx, sbyte* gridName, bool cancel); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStopAll", SetLastError = true, @@ -199,6 +200,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteCacheTryEnterLock", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool CacheTryEnterLock(void* ctx, void* obj, long id, long timeout); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteCacheCloseLock", SetLastError = true, @@ -243,6 +245,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteDataStreamerAllowOverwriteGet", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool DataStreamerAllowOverwriteGet(void* ctx, void* obj); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteDataStreamerAllowOverwriteSet", @@ -251,6 +254,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteDataStreamerSkipStoreGet", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool DataStreamerSkipStoreGet(void* ctx, void* obj); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteDataStreamerSkipStoreSet", @@ -356,6 +360,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteTransactionsSetRollbackOnly", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool TxSetRollbackOnly(void* ctx, void* target, long id); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteTransactionsResetMetrics", @@ -388,6 +393,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteEventsStopLocalListen", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool EventsStopLocalListen(void* ctx, void* obj, long hnd); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteEventsLocalListen", SetLastError = true, @@ -396,6 +402,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteEventsIsEnabled", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] +[return: MarshalAs(UnmanagedType.U1)] public static extern bool EventsIsEnabled(void* ctx, void* obj, int type); [DllImp
[17/19] ignite git commit: wip
wip Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9e37195 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9e37195 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9e37195 Branch: refs/heads/ignite-1694 Commit: c9e37195a17522dbb59c2c3f6cdd25f50ac886c3 Parents: 036be93 Author: Pavel Tupitsyn Authored: Thu Nov 12 11:53:45 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Nov 12 11:53:45 2015 +0300 -- modules/platforms/dotnet/Apache.Ignite.FxCop | 221 -- 1 file changed, 221 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c9e37195/modules/platforms/dotnet/Apache.Ignite.FxCop -- diff --git a/modules/platforms/dotnet/Apache.Ignite.FxCop b/modules/platforms/dotnet/Apache.Ignite.FxCop index fddb1c8..0df73c5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.FxCop +++ b/modules/platforms/dotnet/Apache.Ignite.FxCop @@ -386,220 +386,6 @@ - - - - - - - 'IgniteJniNativeMethods.AtomicLongIsClosed(void*, void*)' - - - - - - - - - 'loc' - 'IgniteJniNativeMethods.CacheSize(void*, void*, int, bool)' - - - - - - - - - 'IgniteJniNativeMethods.CacheTryEnterLock(void*, void*, long, long)' - - - - - - - - - 'IgniteJniNativeMethods.CreateContext(void*, int, void*)' - ->'IgniteJniNativeMethods.CreateContext(void*, int, void*)' ->'UnmanagedUtils.CreateContext(void*, int, void*)' ->'IgniteManager.CreateJvm(IgniteConfiguration, UnmanagedCallbacks)' ->'IgniteManager.CreateJvmContext(IgniteConfiguration, UnmanagedCallbacks)' ->'Ignition.Start(IgniteConfiguration)' - - - - - - - - - 'IgniteJniNativeMethods.DataStreamerAllowOverwriteGet(void*, void*)' - - - - - - - - - 'val' - 'IgniteJniNativeMethods.DataStreamerAllowOverwriteSet(void*, void*, bool)' - - - - - - - - - 'IgniteJniNativeMethods.DataStreamerSkipStoreGet(void*, void*)' - - - - - - - - - 'val' - 'IgniteJniNativeMethods.DataStreamerSkipStoreSet(void*, void*, bool)' - - - - - - - - - 'IgniteJniNativeMethods.DestroyJvm(void*)' - ->'IgniteJniNativeMethods.DestroyJvm(void*)' ->'UnmanagedUtils.DestroyJvm(void*)' ->'IgniteManager.DestroyJvm()' - - - - - - - - - 'IgniteJniNativeMethods.EventsIsEnabled(void*, void*, int)' - - - - - - - - - 'IgniteJniNativeMethods.EventsStopLocalListen(void*, void*, long)' - - - - - - - - - 'IgniteJniNativeMethods.HandlersSize()' - ->'IgniteJniNativeMethods.HandlersSize()' ->'UnmanagedUtils.HandlersSize()' ->'UnmanagedCallbacks.UnmanagedCallbacks()' ->'Ignition.Start(IgniteConfiguration)' - - - - - - - - - 'IgniteJniNativeMethods.IgnitionStart(void*, sbyte*, sbyte*, int, long)' - ->'IgniteJniNativeMethods.IgnitionStart(void*, sbyte*, sbyte*, int, long)' ->'UnmanagedUtils.IgnitionStart(UnmanagedContext, string, string, bool)' ->'Ignition.Start(IgniteConfiguration)' - - - - - - - - - 'cancel' - 'IgniteJniNativeMethods.IgnitionStop(void*, sbyte*, bool)' - - - 'IgniteJniNativeMethods.IgnitionStop(void*, sby
[11/19] ignite git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/adcd0439
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/adcd0439
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/adcd0439
Branch: refs/heads/ignite-1694
Commit: adcd04391a3a94f353055fbd4b7f2a27643349fe
Parents: 4b4eefd
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:41:49 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:41:49 2015 +0300
--
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/adcd0439/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index ca06ef0..c618c1d 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -43,8 +43,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
var ptr = NativeMethods.LoadLibrary(path);
if (ptr == IntPtr.Zero)
-throw new IgniteException("Failed to load " +
IgniteUtils.FileIgniteJniDll + ": " + Marshal.GetLastWin32Error());
-
+throw new IgniteException(string.Format("Failed to load {0}:
{1}",
+IgniteUtils.FileIgniteJniDll,
Marshal.GetLastWin32Error()));
}
///
[02/19] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4290506
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4290506
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4290506
Branch: refs/heads/ignite-1694
Commit: e4290506e38a0e47077fb6aa7af6a0744340ec5c
Parents: 7966a36
Author: Pavel Tupitsyn
Authored: Wed Nov 11 17:49:10 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 17:49:10 2015 +0300
--
.../Impl/Unmanaged/UnmanagedUtils.cs| 655 +++
1 file changed, 108 insertions(+), 547 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4290506/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
index 63ba30a..f0b3f4c 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs
@@ -19,10 +19,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
{
using System;
using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.InteropServices;
using Apache.Ignite.Core.Common;
-using Apache.Ignite.Core.Impl.Common;
///
/// Unmanaged utility classes.
@@ -32,409 +30,119 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
/** Interop factory ID for .Net. */
private const int InteropFactoryId = 1;
-#region PROCEDURE NAMES
-
-private const string ProcReallocate = "IgniteReallocate";
-
-private const string ProcIgnitionStart = "IgniteIgnitionStart";
-private const string ProcIgnitionStop = "IgniteIgnitionStop";
-private const string ProcIgnitionStopAll = "IgniteIgnitionStopAll";
-
-private const string ProcProcessorReleaseStart =
"IgniteProcessorReleaseStart";
-private const string ProcProcessorProjection =
"IgniteProcessorProjection";
-private const string ProcProcessorCache = "IgniteProcessorCache";
-private const string ProcProcessorGetOrCreateCache =
"IgniteProcessorGetOrCreateCache";
-private const string ProcProcessorCreateCache =
"IgniteProcessorCreateCache";
-private const string ProcProcessorAffinity = "IgniteProcessorAffinity";
-private const string ProcProcessorDataStreamer =
"IgniteProcessorDataStreamer";
-private const string ProcProcessorTransactions =
"IgniteProcessorTransactions";
-private const string ProcProcessorCompute = "IgniteProcessorCompute";
-private const string ProcProcessorMessage = "IgniteProcessorMessage";
-private const string ProcProcessorEvents = "IgniteProcessorEvents";
-private const string ProcProcessorServices = "IgniteProcessorServices";
-private const string ProcProcessorExtensions =
"IgniteProcessorExtensions";
-private const string ProcProcessorAtomicLong =
"IgniteProcessorAtomicLong";
-
-private const string ProcTargetInStreamOutLong =
"IgniteTargetInStreamOutLong";
-private const string ProcTargetInStreamOutStream =
"IgniteTargetInStreamOutStream";
-private const string ProcTargetInStreamOutObject =
"IgniteTargetInStreamOutObject";
-private const string ProcTargetInObjectStreamOutStream =
"IgniteTargetInObjectStreamOutStream";
-private const string ProcTargetOutLong = "IgniteTargetOutLong";
-private const string ProcTargetOutStream = "IgniteTargetOutStream";
-private const string ProcTargetOutObject = "IgniteTargetOutObject";
-private const string ProcTargetListenFut = "IgniteTargetListenFuture";
-private const string ProcTargetListenFutForOp =
"IgniteTargetListenFutureForOperation";
-
-private const string ProcAffinityParts = "IgniteAffinityPartitions";
-
-private const string ProcCacheWithSkipStore =
"IgniteCacheWithSkipStore";
-private const string ProcCacheWithNoRetries =
"IgniteCacheWithNoRetries";
-private const string ProcCacheWithExpiryPolicy =
"IgniteCacheWithExpiryPolicy";
-private const string ProcCacheWithAsync = "IgniteCacheWithAsync";
-private const string ProcCacheWithKeepBinary =
"IgniteCacheWithKeepPortable";
-private const string ProcCacheClear = "IgniteCacheClear";
-private const string ProcCacheRemoveAll = "IgniteCacheRemoveAll";
-private const string ProcCacheOutOpQueryCursor =
"IgniteCacheOutOpQueryCursor";
-private const string ProcCacheOutOpContinuousQuery =
"IgniteCacheOutOpContinuousQuery";
[13/19] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09e79b0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09e79b0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09e79b0d
Branch: refs/heads/ignite-1694
Commit: 09e79b0d6024e6325ee010bf3e81f02ef5760e43
Parents: 039f38f
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:51:10 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:51:10 2015 +0300
--
.../Apache.Ignite.Core.csproj | 2 +-
.../Impl/Unmanaged/IgniteJni.cs | 454 ---
.../Impl/Unmanaged/IgniteJniNativeMethods.cs| 454 +++
.../Impl/Unmanaged/UnmanagedUtils.cs| 2 +-
4 files changed, 456 insertions(+), 456 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/09e79b0d/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index fff4842..8cce9b1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -294,7 +294,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/09e79b0d/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
deleted file mode 100644
index 4bd27ba..000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this 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.
- */
-
-namespace Apache.Ignite.Core.Impl.Unmanaged
-{
-using System.Runtime.InteropServices;
-using System.Security;
-
-///
-/// Ignite JNI methods.
-///
-[SuppressUnmanagedCodeSecurity]
-internal unsafe static class IgniteJni
-{
-// TODO: Fix FxCop
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern int Reallocate(long memPtr, int cap);
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStart", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* IgnitionStart(void* ctx, sbyte* cfgPath,
sbyte* gridName, int factoryId,
-long dataPtr);
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStop", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern bool IgnitionStop(void* ctx, sbyte* gridName,
bool cancel);
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteIgnitionStopAll", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void IgnitionStopAll(void* ctx, bool cancel);
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorReleaseStart", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void ProcessorReleaseStart(void* ctx, void* obj);
-
-[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteProcessorProjection", SetLastError = true,
-CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
-public static extern void* ProcessorProjection(void* ctx, void* obj);
-
-[DllImport(IgniteUtils.
[15/19] ignite git commit: MarshalAs fixed for all booleans
MarshalAs fixed for all booleans Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/36ce8b2c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36ce8b2c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/36ce8b2c Branch: refs/heads/ignite-1694 Commit: 36ce8b2c405d8e24ba8a9f4e1f84705a4f3ab108 Parents: 503bbde Author: Pavel Tupitsyn Authored: Thu Nov 12 11:53:09 2015 +0300 Committer: Pavel Tupitsyn Committed: Thu Nov 12 11:53:09 2015 +0300 -- .../Impl/Unmanaged/IgniteJniNativeMethods.cs| 20 1 file changed, 12 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/36ce8b2c/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs index 9996d3e..cce832b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs @@ -40,11 +40,11 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStop", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] [return: MarshalAs(UnmanagedType.U1)] -public static extern bool IgnitionStop(void* ctx, sbyte* gridName, bool cancel); +public static extern bool IgnitionStop(void* ctx, sbyte* gridName, [MarshalAs(UnmanagedType.U1)] bool cancel); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteIgnitionStopAll", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -public static extern void IgnitionStopAll(void* ctx, bool cancel); +public static extern void IgnitionStopAll(void* ctx, [MarshalAs(UnmanagedType.U1)] bool cancel); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorReleaseStart", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] @@ -72,7 +72,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorDataStreamer", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -public static extern void* ProcessorDataStreamer(void* ctx, void* obj, sbyte* name, bool keepBinary); +public static extern void* ProcessorDataStreamer(void* ctx, void* obj, sbyte* name, +[MarshalAs(UnmanagedType.U1)] bool keepBinary); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorTransactions", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] @@ -101,7 +102,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteProcessorAtomicLong", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] public static extern void* ProcessorAtomicLong(void* ctx, void* obj, sbyte* name, long initVal, -bool create); +[MarshalAs(UnmanagedType.U1)] bool create); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteTargetInStreamOutLong", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] @@ -213,7 +214,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteCacheSize", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -public static extern int CacheSize(void* ctx, void* obj, int peekModes, bool loc); +public static extern int CacheSize(void* ctx, void* obj, int peekModes, [MarshalAs(UnmanagedType.U1)] bool loc); [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteCacheStoreCallbackInvoke", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] @@ -250,7 +251,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint = "IgniteDataStreamerAllowOverwriteSet", SetLastError = true, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true)] -public static extern void DataStreamerAllowOverwrit
[12/19] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/039f38fa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/039f38fa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/039f38fa
Branch: refs/heads/ignite-1694
Commit: 039f38faf17e124f49ab65fc4b2db681485d2da6
Parents: adcd043
Author: Pavel Tupitsyn
Authored: Wed Nov 11 18:45:52 2015 +0300
Committer: Pavel Tupitsyn
Committed: Wed Nov 11 18:45:52 2015 +0300
--
.../dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/039f38fa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
index af473e4..4bd27ba 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJni.cs
@@ -26,6 +26,8 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
[SuppressUnmanagedCodeSecurity]
internal unsafe static class IgniteJni
{
+// TODO: Fix FxCop
+
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
public static extern int Reallocate(long memPtr, int cap);
[16/19] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/036be936
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/036be936
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/036be936
Branch: refs/heads/ignite-1694
Commit: 036be936078377a0469d2c6d4a6c255da4e5b2be
Parents: 36ce8b2
Author: Pavel Tupitsyn
Authored: Thu Nov 12 11:53:16 2015 +0300
Committer: Pavel Tupitsyn
Committed: Thu Nov 12 11:53:16 2015 +0300
--
.../Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs| 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/036be936/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
index cce832b..7a2f606 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/IgniteJniNativeMethods.cs
@@ -26,8 +26,6 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
[SuppressUnmanagedCodeSecurity]
internal unsafe static class IgniteJniNativeMethods
{
-// TODO: Fix FxCop
-
[DllImport(IgniteUtils.FileIgniteJniDll, EntryPoint =
"IgniteReallocate", SetLastError = true,
CharSet = CharSet.Ansi, BestFitMapping = false,
ThrowOnUnmappableChar = true)]
public static extern int Reallocate(long memPtr, int cap);
ignite git commit: Fixed race in IgniteTransactionalWriteInvokeBenchmark test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 efe632b18 -> 3a3400340
Fixed race in IgniteTransactionalWriteInvokeBenchmark test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a340034
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a340034
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a340034
Branch: refs/heads/ignite-1.5
Commit: 3a340034056f5da0ca00ed88e128b59cc28381d2
Parents: efe632b
Author: ashutak
Authored: Tue Dec 8 16:02:36 2015 +0300
Committer: ashutak
Committed: Tue Dec 8 16:02:36 2015 +0300
--
.../config/benchmark-failover.properties| 2 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 42 +++-
2 files changed, 33 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/config/benchmark-failover.properties
--
diff --git a/modules/yardstick/config/benchmark-failover.properties
b/modules/yardstick/config/benchmark-failover.properties
index 7ed464c..352e2d4 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -60,7 +60,7 @@ RESTART_SERVERS=true
SERVER_HOSTS=localhost,localhost
# Comma-separated list of the hosts to run BenchmarkDrivers on.
-DRIVER_HOSTS=localhost
+DRIVER_HOSTS=localhost,localhost
# Remote username.
# REMOTE_USER=
http://git-wip-us.apache.org/repos/asf/ignite/blob/3a340034/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
index 35befad..67044a1 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java
@@ -25,9 +25,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCountDownLatch;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.affinity.Affinity;
@@ -58,29 +60,49 @@ public class IgniteTransactionalWriteInvokeBenchmark
extends IgniteFailoverAbstr
/** */
private static final Long INITIAL_VALUE = 1L;
+/** */
+public static final int TIMEOUT_SEC = 20 * 60;
+
/** {@inheritDoc} */
@Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
super.setUp(cfg);
assert args.keysCount() > 0 : "Count of keys: " + args.keysCount();
-println(cfg, "Populating data...");
+IgniteCountDownLatch latch =
ignite().countDownLatch("DATA-POPULATED-LATCH-" + cacheName(), 1, true, true);
+
+if (cfg.memberId() == 0) {
+println(cfg, "Populating data for cache: " + cacheName());
-long start = System.nanoTime();
+long start = System.nanoTime();
-try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
-for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
-dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
+try (IgniteDataStreamer dataLdr =
ignite().dataStreamer(cacheName())) {
+for (int k = 0; k < args.range() &&
!Thread.currentThread().isInterrupted(); k++) {
+dataLdr.addData("key-" + k + "-master", INITIAL_VALUE);
-for (int i = 0; i < args.keysCount(); i++)
-dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
+for (int i = 0; i < args.keysCount(); i++)
+dataLdr.addData("key-" + k + "-" + i, INITIAL_VALUE);
-if (k % 10 == 0)
-println(cfg, "Populated accounts: " + k);
+if (k % 10 == 0)
+println(cfg, "Populated accounts: " + k);
+}
}
+
+println(cfg, "Finished populating data in " + ((System.nanoTime()
- start) / 1_000_000)
++ " ms. for cache: " + cacheName());
+
+latch.countDown();
ignite git commit: IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value types.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 8ca163bd0 -> efe632b18
IGNITE-2026: .NET: Fixed stack overflow caused by incorrect unboxing of value
types.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/efe632b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/efe632b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/efe632b1
Branch: refs/heads/ignite-1.5
Commit: efe632b18e760f699bedee906050f66eabadb077
Parents: 8ca163b
Author: Pavel Tupitsyn
Authored: Tue Dec 8 15:59:23 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Dec 8 15:59:23 2015 +0300
--
.../Binary/BinarySelfTest.cs| 67
.../Impl/Binary/BinaryReflectiveActions.cs | 4 +-
.../Impl/Common/DelegateConverter.cs| 15 +++--
3 files changed, 78 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
index 88328ec..9232665 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinarySelfTest.cs
@@ -1028,6 +1028,20 @@ namespace Apache.Ignite.Core.Tests.Binary
CheckObject(marsh, new OuterObjectType(), new InnerObjectType());
}
+[Test]
+public void TestStructsReflective()
+{
+var marsh = new Marshaller(new BinaryConfiguration
+{
+TypeConfigurations = new[] {new BinaryTypeConfiguration(typeof
(ReflectiveStruct))}
+});
+
+var obj = new ReflectiveStruct(15, 28.8);
+var res = marsh.Unmarshal(marsh.Marshal(obj));
+
+Assert.AreEqual(res, obj);
+}
+
/**
* Test handles.
*/
@@ -2228,5 +2242,58 @@ namespace Apache.Ignite.Core.Tests.Binary
return Foo;
}
}
+
+private struct ReflectiveStruct : IEquatable
+{
+private readonly int _x;
+private readonly double _y;
+
+public ReflectiveStruct(int x, double y)
+{
+_x = x;
+_y = y;
+}
+
+public int X
+{
+get { return _x; }
+}
+
+public double Y
+{
+get { return _y; }
+}
+
+public bool Equals(ReflectiveStruct other)
+{
+return _x == other._x && _y.Equals(other._y);
+}
+
+public override bool Equals(object obj)
+{
+if (ReferenceEquals(null, obj))
+return false;
+
+return obj is ReflectiveStruct && Equals((ReflectiveStruct)
obj);
+}
+
+public override int GetHashCode()
+{
+unchecked
+{
+return (_x*397) ^ _y.GetHashCode();
+}
+}
+
+public static bool operator ==(ReflectiveStruct left,
ReflectiveStruct right)
+{
+return left.Equals(right);
+}
+
+public static bool operator !=(ReflectiveStruct left,
ReflectiveStruct right)
+{
+return !left.Equals(right);
+}
+}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/efe632b1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
index b229898..15509fc 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReflectiveActions.cs
@@ -398,9 +398,7 @@ namespace Apache.Ignite.Core.Impl.Binary
// Assign field value
var targetParam = Expression.Parameter(typeof(object));
-var targetParamConverted = Expression.Convert(targetParam,
field.DeclaringType);
-var assignExpr =
Expression.Call(DelegateConverter.GetWriteFieldMethod(field),
targetParamConverted,
-readExpr);
+var assignExpr =
Expression.Call(DelegateConverter.GetWriteFieldMethod(field), targetParam,
readExpr);
// Compile and return
ignite git commit: IGNITE-2064 More test fixes
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 67ebd02c9 -> 8ca163bd0
IGNITE-2064 More test fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ca163bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ca163bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ca163bd
Branch: refs/heads/ignite-1.5
Commit: 8ca163bd0f06cc832df126733dbbe50cea35c2ac
Parents: 67ebd02
Author: Anton Vinogradov
Authored: Tue Dec 8 15:46:10 2015 +0300
Committer: Anton Vinogradov
Committed: Tue Dec 8 15:46:10 2015 +0300
--
.../GridCacheConditionalDeploymentSelfTest.java | 20
.../cache/GridCacheDeploymentSelfTest.java | 11 ---
2 files changed, 20 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index c03eb08..4098225 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.CO;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -139,19 +139,23 @@ public class GridCacheConditionalDeploymentSelfTest
extends GridCommonAbstractTe
public void testAddedDeploymentInfo2() throws Exception {
GridCacheContext ctx = cacheContext();
-assertTrue(ctx.deploymentEnabled());
+if (grid(0).configuration().getMarshaller() instanceof
BinaryMarshaller)
+assertFalse(ctx.deploymentEnabled());
+else {
+assertTrue(ctx.deploymentEnabled());
-GridCacheIoManager ioMgr = cacheIoManager();
+GridCacheIoManager ioMgr = cacheIoManager();
-TestMessage msg = new TestMessage();
+TestMessage msg = new TestMessage();
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
-msg.addDepInfo = false;
+msg.addDepInfo = false;
-IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg,
grid(1).cluster().localNode().id());
+IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg,
grid(1).cluster().localNode().id());
-assertNull(msg.deployInfo());
+assertNull(msg.deployInfo());
+}
}
protected GridCacheContext cacheContext() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8ca163bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e18520d..aa64959 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DeploymentMode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.portable.BinaryMarshaller;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -207,7 +208,9 @@ public class GridCacheDeploymentSelfTest extends
GridCommonAbstractTest {
}
assertEquals(0, g1.cache(null).localSize());
-assertEquals(0, g2.cache(null).localSize())
[10/14] ignite git commit: ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException
ignite-1692 Changed test initialization logic to remove race confition that
caused ClusterTopologyServerNotFoundException
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cd0039a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cd0039a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cd0039a
Branch: refs/heads/ignite-1537
Commit: 5cd0039a535b4c2ea7434d4b085c9e18f28c930d
Parents: d579183
Author: sboikov
Authored: Tue Dec 8 13:12:24 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 13:12:24 2015 +0300
--
.../DataStreamProcessorSelfTest.java| 25
1 file changed, 15 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5cd0039a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 65dd690..9fedc35 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -206,14 +206,17 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
@SuppressWarnings("ErrorNotRethrown")
private void checkDataStreamer() throws Exception {
try {
-Ignite g1 = startGrid(1);
-
useCache = true;
-Ignite g2 = startGrid(2);
+Ignite igniteWithCache = startGrid(2);
+
startGrid(3);
-final IgniteDataStreamer ldr =
g1.dataStreamer(null);
+useCache = false;
+
+Ignite igniteWithoutCache = startGrid(1);
+
+final IgniteDataStreamer ldr =
igniteWithoutCache.dataStreamer(null);
ldr.receiver(DataStreamerCacheUpdaters.batchedSorted());
@@ -255,7 +258,7 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
assertEquals(total, s2 + s3);
-final IgniteDataStreamer rmvLdr =
g2.dataStreamer(null);
+final IgniteDataStreamer rmvLdr =
igniteWithCache.dataStreamer(null);
rmvLdr.receiver(DataStreamerCacheUpdaters.batchedSorted());
@@ -443,15 +446,17 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
// Start all required nodes.
int idx = 1;
-for (int i = 0; i < nodesCntNoCache; i++)
-startGrid(idx++);
-
useCache = true;
for (int i = 0; i < nodesCntCache; i++)
startGrid(idx++);
-Ignite g1 = grid(1);
+useCache = false;
+
+for (int i = 0; i < nodesCntNoCache; i++)
+startGrid(idx++);
+
+Ignite g1 = grid(idx - 1);
// Get and configure loader.
final IgniteDataStreamer ldr =
g1.dataStreamer(null);
@@ -1019,4 +1024,4 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
}
}
}
-}
\ No newline at end of file
+}
[05/14] ignite git commit: IGNITE-2083 EntryProcessor is called twice on primary node in transactional cache
IGNITE-2083 EntryProcessor is called twice on primary node in transactional
cache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a14d643
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a14d643
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a14d643
Branch: refs/heads/ignite-1537
Commit: 9a14d6432932fc1a1fdf2ddd77dea920382efe8c
Parents: c10b112
Author: sboikov
Authored: Mon Dec 7 15:05:09 2015 +0300
Committer: sboikov
Committed: Mon Dec 7 15:05:09 2015 +0300
--
.../distributed/dht/GridDhtTxPrepareFuture.java | 51 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../IgniteCacheEntryProcessorCallTest.java | 497 +++
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 7 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
7 files changed, 558 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 9f1f8a1..3829e28 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -337,6 +337,13 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture,
Object[]> t : txEntry.entryProcessors()) {
-try {
-CacheInvokeEntry
invokeEntry = new CacheInvokeEntry<>(
-txEntry.context(), key, val,
txEntry.cached().version(), txEntry.keepBinary());
+ CacheInvokeEntry invokeEntry
= new CacheInvokeEntry<>(
+ txEntry.context(), key, val,
txEntry.cached().version(), txEntry.keepBinary());
+ try {
EntryProcessor
processor = t.get1();
procRes = processor.process(invokeEntry,
t.get2());
@@ -380,9 +389,27 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture(op,
op == NOOP ? null : val));
if (retVal) {
if (err != null || procRes != null)
@@ -1301,10 +1328,12 @@ public final class GridDhtTxPrepareFuture extends
GridCompoundFuture procVal =
entry.entryProcessorCalculatedValue();
+
+assert procVal != null : entry;
-entry.op(procVal == null ? DELETE : UPDATE);
-entry.value(procVal, true, false);
+entry.op(procVal.get1());
+entry.value(procVal.get2(), true, false);
entry.entryProcessors(null);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 3065ac2..53f4f56 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1233,6 +1233,11 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter
if (F.isEmpty(txEntry.entryProcessors()))
return F.t(txEntry.op(), txEntry.value());
else {
+T2 calcVal =
txEntry.entryProcessorCalculatedValue();
+
+if (calcVal != null)
+return calcVal;
+
boolean recordEvt =
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ);
CacheObject cacheVal = txEntry.hasValue() ? txEntry.value() :
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a14d643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
--
[04/14] ignite git commit: IGNITE-2090 .Net: EventsTest.TestSerialization fails
IGNITE-2090 .Net: EventsTest.TestSerialization fails
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c10b112a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c10b112a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c10b112a
Branch: refs/heads/ignite-1537
Commit: c10b112ad0693035d6bb2b1c782fe09f11aaded4
Parents: 34596c6
Author: Pavel Tupitsyn
Authored: Mon Dec 7 13:42:17 2015 +0300
Committer: Pavel Tupitsyn
Committed: Mon Dec 7 13:42:17 2015 +0300
--
modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c10b112a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
index 9f22355..a538cb4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/EventsTest.cs
@@ -568,7 +568,8 @@ namespace Apache.Ignite.Core.Tests
Assert.AreEqual(EventType.SwapSpaceCleared, evt.Type);
Assert.IsNotNullOrEmpty(evt.Name);
Assert.AreNotEqual(Guid.Empty, evt.Id.GlobalId);
-Assert.IsTrue((evt.Timestamp - DateTime.Now).TotalSeconds < 10);
+Assert.IsTrue(Math.Abs((evt.Timestamp -
DateTime.UtcNow).TotalSeconds) < 20,
+"Invalid event timestamp: '{0}', current time: '{1}'",
evt.Timestamp, DateTime.Now);
}
///
[13/14] ignite git commit: Ignite-1.5 - Added missing serialVersionUID to fix the build.
Ignite-1.5 - Added missing serialVersionUID to fix the build.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67ebd02c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67ebd02c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67ebd02c
Branch: refs/heads/ignite-1537
Commit: 67ebd02c9a58ef2d835e55e4aa6efdcec6d53b8c
Parents: c292748
Author: Alexey Goncharuk
Authored: Tue Dec 8 15:09:10 2015 +0300
Committer: Alexey Goncharuk
Committed: Tue Dec 8 15:09:10 2015 +0300
--
.../org/apache/ignite/internal/util/GridMessageCollection.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/67ebd02c/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
index 09a5e96..6044bbe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
@@ -34,6 +34,9 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public final class GridMessageCollection implements Message
{
/** */
+private static final long serialVersionUID = 0L;
+
+/** */
@GridDirectCollection(Message.class)
private Collection msgs;
[11/14] ignite git commit: ignite-1.5 - MessageCollection + marshalling issue test
ignite-1.5 - MessageCollection + marshalling issue test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/322a85a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/322a85a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/322a85a3
Branch: refs/heads/ignite-1537
Commit: 322a85a359e0fc2c56f5c3aa38fc48a92e553289
Parents: c077522
Author: S.Vladykin
Authored: Tue Dec 8 13:17:36 2015 +0300
Committer: S.Vladykin
Committed: Tue Dec 8 13:17:36 2015 +0300
--
.../ignite/codegen/MessageCodeGenerator.java| 6 +-
.../communication/GridIoMessageFactory.java | 8 +-
.../internal/util/GridMessageCollection.java| 157 +++
.../internal/util/UUIDCollectionMessage.java| 42 -
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +
.../ignite/util/GridMessageCollectionTest.java | 105 +
6 files changed, 314 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 8733bb3..587ad06 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -43,9 +43,6 @@ import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
-import
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
-import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -170,8 +167,9 @@ public class MessageCodeGenerator {
//gen.generateAll(true);
-gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+//gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+//gen.generateAndWrite(GridMessageCollection.class);
//gen.generateAndWrite(DataStreamerEntry.class);
//gen.generateAndWrite(GridDistributedLockRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index c9b8e27..b0ef3f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -125,6 +125,7 @@ import
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRe
import
org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse;
import org.apache.ignite.internal.util.GridByteArrayList;
import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.GridMessageCollection;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -720,7 +721,12 @@ public class GridIoMessageFactory implements
MessageFactory {
break;
-// [-3..119] - this
+case 124:
+msg = new GridMessageCollection<>();
+
+break;
+
+// [-3..119] [124] - this
// [120..123] - DR
// [-4..-22] - SQL
default:
http://git-wip-us.apache.org/repos/asf/ignite/blob/322a85a3/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
new file mode 100644
index 000..09a5e96
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
[09/14] ignite git commit: ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from reconnect callback)
ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from
reconnect callback)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5791837
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5791837
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5791837
Branch: refs/heads/ignite-1537
Commit: d5791837890a70e1777b86aab281245701afe1eb
Parents: 3b26859
Author: sboikov
Authored: Tue Dec 8 12:42:25 2015 +0300
Committer: sboikov
Committed: Tue Dec 8 12:42:25 2015 +0300
--
.../apache/ignite/internal/GridComponent.java | 3 +-
.../ignite/internal/GridPluginComponent.java| 4 +-
.../apache/ignite/internal/IgniteKernal.java| 18 +++-
.../internal/managers/GridManagerAdapter.java | 5 +-
.../deployment/GridDeploymentManager.java | 5 +-
.../processors/GridProcessorAdapter.java| 5 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../processors/cache/GridCacheProcessor.java| 26 +-
.../datastructures/DataStructuresProcessor.java | 4 +-
.../IgniteClientReconnectAbstractTest.java | 95 +---
.../IgniteClientReconnectAtomicsTest.java | 57
.../IgniteClientReconnectCacheTest.java | 5 +-
.../IgniteClientReconnectCollectionsTest.java | 51 +++
13 files changed, 254 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 6078c5d..0e234cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -131,6 +131,7 @@ public interface GridComponent {
*
* @param clusterRestarted Cluster restarted flag.
* @throws IgniteCheckedException If failed.
+ * @return Future to wait before completing reconnect future.
*/
-public void onReconnected(boolean clusterRestarted) throws
IgniteCheckedException;
+@Nullable public IgniteInternalFuture onReconnected(boolean
clusterRestarted) throws IgniteCheckedException;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index ac2a3a7..89dc243 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -70,8 +70,8 @@ public class GridPluginComponent implements GridComponent {
}
/** {@inheritDoc} */
-@Override public void onReconnected(boolean clusterRestarted) {
-// No-op.
+@Override public IgniteInternalFuture onReconnected(boolean
clusterRestarted) {
+return null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5791837/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 87ccf93..ab62c13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -136,6 +136,7 @@ import
org.apache.ignite.internal.processors.session.GridTaskSessionProcessor;
import org.apache.ignite.internal.processors.task.GridTaskProcessor;
import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
import org.apache.ignite.internal.util.GridTimerTask;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
@@ -3083,16 +3084,27 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
/**
* @param clusterRestarted {@code True} if all cluster nodes restarted
while client was disconnected.
*/
+@SuppressWarnings("unchecked")
public void onReconnected(final boolean clusterRestarted) {
Throwable err =
[07/14] ignite git commit: HashMap's offset retrieval in HashSet class definition for legacy IBM JRE
HashMap's offset retrieval in HashSet class definition for legacy IBM JRE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0775220
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0775220
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0775220
Branch: refs/heads/ignite-1537
Commit: c077522038d050aac35ce034cc86d9af7959ebd5
Parents: ebddcb1
Author: Denis Magda
Authored: Mon Dec 7 20:52:00 2015 +0300
Committer: Denis Magda
Committed: Mon Dec 7 20:52:00 2015 +0300
--
.../optimized/OptimizedMarshallerUtils.java | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c0775220/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
index 4d6afe6..da92b90 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java
@@ -155,12 +155,22 @@ class OptimizedMarshallerUtils {
static final JdkMarshaller JDK_MARSH = new JdkMarshaller();
static {
+long mapOff;
+
try {
-HASH_SET_MAP_OFF =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+mapOff =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
}
catch (NoSuchFieldException e) {
-throw new IgniteException("Initialization failure.", e);
+try {
+// Workaround for legacy IBM JRE.
+mapOff =
UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("backingMap"));
+}
+catch (NoSuchFieldException e2) {
+throw new IgniteException("Initialization failure.", e2);
+}
}
+
+HASH_SET_MAP_OFF = mapOff;
}
/**
@@ -537,4 +547,4 @@ class OptimizedMarshallerUtils {
static void setObject(Object obj, long off, Object val) {
UNSAFE.putObject(obj, off, val);
}
-}
\ No newline at end of file
+}
[14/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63f00fb4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63f00fb4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63f00fb4 Branch: refs/heads/ignite-1537 Commit: 63f00fb483412232c6758c4ef6f09edbd5a3148c Parents: 6f38064 67ebd02 Author: sboikov Authored: Tue Dec 8 15:28:02 2015 +0300 Committer: sboikov Committed: Tue Dec 8 15:28:02 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java| 6 +- modules/core/pom.xml| 2 +- .../configuration/CacheConfiguration.java | 34 +++- .../communication/GridIoMessageFactory.java | 8 +- .../internal/util/GridMessageCollection.java| 160 +++ .../internal/util/UUIDCollectionMessage.java| 42 - .../optimized/OptimizedMarshallerUtils.java | 16 +- .../core/src/main/resources/ignite.properties | 2 +- ...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +- .../DataStreamProcessorSelfTest.java| 25 +-- .../config/GridTestProperties.java | 3 + .../IgniteBinaryObjectsCacheTestSuite3.java | 2 + .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../ignite/util/GridMessageCollectionTest.java | 105 modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 5 +- modules/osgi-paxlogging/pom.xml | 6 +- modules/osgi/pom.xml| 5 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml
[01/14] ignite git commit: ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 6f3806479 -> 63f00fb48
ignite-1.5 Added tx mdoe configuration for IgnitePutTxBenchmark.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/233231de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/233231de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/233231de
Branch: refs/heads/ignite-1537
Commit: 233231de53e0d2c7d91244f7d65a13ecd515d8ce
Parents: 8033bc4
Author: sboikov
Authored: Mon Dec 7 10:40:19 2015 +0300
Committer: sboikov
Committed: Mon Dec 7 10:40:19 2015 +0300
--
.../yardstick/cache/IgnitePutTxBenchmark.java | 26 +---
1 file changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/233231de/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 9c3389f..15b7cd6 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -18,8 +18,11 @@
package org.apache.ignite.yardstick.cache;
import java.util.Map;
+import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
import org.apache.ignite.yardstick.cache.model.SampleValue;
import org.yardstickframework.BenchmarkConfiguration;
@@ -27,20 +30,35 @@ import org.yardstickframework.BenchmarkConfiguration;
* Ignite benchmark that performs transactional put operations.
*/
public class IgnitePutTxBenchmark extends
IgniteCacheAbstractBenchmark {
+/** */
+private IgniteTransactions txs;
+
+/** */
+private Callable clo;
+
/** {@inheritDoc} */
@Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
super.setUp(cfg);
if (!IgniteSystemProperties.getBoolean("SKIP_MAP_CHECK"))
ignite().compute().broadcast(new WaitMapExchangeFinishCallable());
+
+txs = ignite().transactions();
+
+clo = new Callable() {
+@Override public Void call() throws Exception {
+int key = nextRandom(args.range());
+
+cache.put(key, new SampleValue(key));
+
+return null;
+}
+};
}
/** {@inheritDoc} */
@Override public boolean test(Map ctx) throws Exception {
-int key = nextRandom(args.range());
-
-// Implicit transaction is used.
-cache.put(key, new SampleValue(key));
+IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(),
args.txIsolation(), clo);
return true;
}
[03/14] ignite git commit: IGNITE-2081 Fixed javadoc.
IGNITE-2081 Fixed javadoc. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34596c63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34596c63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34596c63 Branch: refs/heads/ignite-1537 Commit: 34596c63c883af696daebcd6a24bee2ef55e7e2c Parents: 11b4262 Author: nikolay_tikhonov Authored: Mon Dec 7 13:29:40 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Dec 7 13:29:40 2015 +0300 -- .../apache/ignite/yarn/utils/package-info.java | 22 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/34596c63/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java -- diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java new file mode 100644 index 000..a73c390 --- /dev/null +++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/utils/package-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ + +/** + * + * Utility and helper classes. + */ +package org.apache.ignite.yarn.utils; \ No newline at end of file
[02/14] ignite git commit: 2064 Test hotfix
2064 Test hotfix
Signed-off-by: Anton Vinogradov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11b42629
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11b42629
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11b42629
Branch: refs/heads/ignite-1537
Commit: 11b426297cffcb98b6dd374cfc88184b2b04246f
Parents: 233231d
Author: Anton Vinogradov
Authored: Fri Dec 4 19:34:46 2015 +0300
Committer: Anton Vinogradov
Committed: Mon Dec 7 13:08:39 2015 +0300
--
.../cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java | 6 +-
.../apache/ignite/testframework/config/GridTestProperties.java | 3 +++
.../ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
index 0873d2d..35ee6cc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicEntryProcessorDeploymentSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -45,7 +46,10 @@ public class GridCacheAtomicEntryProcessorDeploymentSelfTest
extends GridCommonA
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
/** Entry processor */
-protected static String TEST_ENT_PROCESSOR =
"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
+protected static String TEST_ENT_PROCESSOR =
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME)
!= null ?
+
GridTestProperties.getProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME) :
+"org.apache.ignite.tests.p2p.CacheDeploymentEntryProcessor";
/** Test value. */
protected static String TEST_VALUE =
"org.apache.ignite.tests.p2p.CacheDeploymentTestValue";
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 1ea8c38..491f38f 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -72,6 +72,9 @@ public final class GridTestProperties {
/** */
public static final String MARSH_CLASS_NAME = "marshaller.class";
+/** */
+public static final String ENTRY_PROCESSOR_CLASS_NAME =
"entry.processor.class";
+
/** Binary marshaller compact footers property. */
public static final String BINARY_COMPACT_FOOTERS =
"binary.marshaller.compact.footers";
http://git-wip-us.apache.org/repos/asf/ignite/blob/11b42629/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
index 2778c97..3d25645 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
@@ -31,6 +31,8 @@ public class IgniteBinaryObjectsCacheTestSuite3 {
*/
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME,
BinaryMar
[12/14] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2927480 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2927480 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2927480 Branch: refs/heads/ignite-1537 Commit: c292748013acfcbf6b3752183a34bb26de16c1f4 Parents: 322a85a 5cd0039 Author: S.Vladykin Authored: Tue Dec 8 13:18:30 2015 +0300 Committer: S.Vladykin Committed: Tue Dec 8 13:18:30 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../apache/ignite/internal/GridComponent.java | 3 +- .../ignite/internal/GridPluginComponent.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 18 +++- .../internal/managers/GridManagerAdapter.java | 5 +- .../deployment/GridDeploymentManager.java | 5 +- .../processors/GridProcessorAdapter.java| 5 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheProcessor.java| 26 +- .../datastructures/DataStructuresProcessor.java | 4 +- .../core/src/main/resources/ignite.properties | 2 +- .../IgniteClientReconnectAbstractTest.java | 95 +--- .../IgniteClientReconnectAtomicsTest.java | 57 .../IgniteClientReconnectCacheTest.java | 5 +- .../IgniteClientReconnectCollectionsTest.java | 51 +++ .../DataStreamProcessorSelfTest.java| 25 +++--- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 2 +- modules/osgi-karaf/pom.xml | 5 +- modules/osgi-paxlogging/pom.xml | 6 +- modules/osgi/pom.xml| 5 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac| 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml
[08/14] ignite git commit: 1.5.0-b2-SNAPSHOT
1.5.0-b2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b26859b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b26859b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b26859b Branch: refs/heads/ignite-1537 Commit: 3b26859bd64b7ddbc9d0b8094663887784b4f2cf Parents: c077522 Author: Ignite Teamcity Authored: Tue Dec 8 11:32:26 2015 +0300 Committer: Ignite Teamcity Committed: Tue Dec 8 11:32:26 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 5 ++--- modules/osgi-paxlogging/pom.xml| 6 ++ modules/osgi/pom.xml | 5 ++--- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac| 2 +- modules/platforms/cpp/examples/configure.ac| 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml| 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml
[06/14] ignite git commit: IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.
IGNITE-2050 - Fixed duplicate query types in configuration. - Fixes #291.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebddcb18
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebddcb18
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebddcb18
Branch: refs/heads/ignite-1537
Commit: ebddcb187231c08bcf53a7c567f10064393a8e60
Parents: 9a14d64
Author: Alexey Goncharuk
Authored: Mon Dec 7 20:11:48 2015 +0300
Committer: Alexey Goncharuk
Committed: Mon Dec 7 20:11:48 2015 +0300
--
.../configuration/CacheConfiguration.java | 34 -
...cheDuplicateEntityConfigurationSelfTest.java | 126 +++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
3 files changed, 159 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 034d20d..af3530a 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1872,7 +1872,20 @@ public class CacheConfiguration extends
MutableConfiguration {
TypeDescriptor desc = processKeyAndValueClasses(keyCls, valCls);
-qryEntities.add(convert(desc));
+QueryEntity converted = convert(desc);
+
+boolean dup = false;
+
+for (QueryEntity entity : qryEntities) {
+if (F.eq(entity.getValueType(), converted.getValueType())) {
+dup = true;
+
+break;
+}
+}
+
+if (!dup)
+qryEntities.add(converted);
}
return this;
@@ -1968,10 +1981,21 @@ public class CacheConfiguration extends
MutableConfiguration {
public CacheConfiguration setQueryEntities(Collection
qryEntities) {
if (this.qryEntities == null)
this.qryEntities = new ArrayList<>(qryEntities);
-else if (indexedTypes != null)
-this.qryEntities.addAll(qryEntities);
-else
-throw new CacheException("Query entities can be set only once.");
+
+for (QueryEntity entity : qryEntities) {
+boolean found = false;
+
+for (QueryEntity existing : this.qryEntities) {
+if (F.eq(entity.getValueType(), existing.getValueType())) {
+found = true;
+
+break;
+}
+}
+
+if (!found)
+this.qryEntities.add(entity);
+}
return this;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebddcb18/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
new file mode 100644
index 000..8311213
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apach
