ignite git commit: 1.5.0-b2-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/master 3fbf3e954 -> 9c27ecbdd 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/9c27ecbd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c27ecbd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c27ecbd Branch: refs/heads/master Commit: 9c27ecbddcf898e0bf209c5200a81df291763fd0 Parents: 3fbf3e9 Author: Ignite Teamcity Authored: Tue Dec 8 11:25:22 2015 +0300 Committer: Ignite Teamcity Committed: Tue Dec 8 11:25:22 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
ignite git commit: 1.5.0-b2-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.5 c07752203 -> 3b26859bd 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 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
[1/7] ignite git commit: IGNITE-2081 Fixed javadoc.
Repository: ignite Updated Branches: refs/heads/master 9c27ecbdd -> 49a0e6dab 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/master 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
[6/7] 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/master 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
[5/7] 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/master
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
+}
[2/7] 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/master
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);
}
///
[3/7] 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/master
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
---
[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'
Merge remote-tracking branch 'remotes/origin/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/49a0e6da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49a0e6da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49a0e6da Branch: refs/heads/master Commit: 49a0e6dab31cb64d361bf0539c5a99d05bd6e1d6 Parents: 9c27ecb 3b26859 Author: Anton Vinogradov Authored: Tue Dec 8 11:34:10 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 8 11:34:10 2015 +0300 -- .../configuration/CacheConfiguration.java | 34 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 51 +- .../cache/transactions/IgniteTxAdapter.java | 5 + .../cache/transactions/IgniteTxEntry.java | 8 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../IgniteCacheEntryProcessorCallTest.java | 497 +++ ...idCachePartitionedHitsAndMissesSelfTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 7 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + ...cheDuplicateEntityConfigurationSelfTest.java | 126 + .../IgniteCacheQuerySelfTestSuite.java | 4 + .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../apache/ignite/yarn/utils/package-info.java | 22 + 13 files changed, 754 insertions(+), 25 deletions(-) --
[4/7] 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/master
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.apache.ign
ignite git commit: IGNITE-843 JSHint fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 eb012e259 -> 3db025231
IGNITE-843 JSHint fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3db02523
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3db02523
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3db02523
Branch: refs/heads/ignite-843-rc2
Commit: 3db0252310b6eade3ea5347e78ac9e0ad11215d1
Parents: eb012e2
Author: Alexey Kuznetsov
Authored: Tue Dec 8 15:48:21 2015 +0700
Committer: Alexey Kuznetsov
Committed: Tue Dec 8 15:48:21 2015 +0700
--
.../main/js/app/directives/callout/callout-cel.directive.js| 6 +++---
.../src/main/js/app/directives/callout/callout.directive.js| 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db02523/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
--
diff --git
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
index a745d1a..dda785b 100644
---
a/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
+++
b/modules/control-center-web/src/main/js/app/directives/callout/callout-cel.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import template from './callout-cel.jade!'
+import template from './callout-cel.jade!';
export default ['igniteCalloutCel', [() => {
return {
@@ -27,5 +27,5 @@ export default ['igniteCalloutCel', [() => {
replace: true,
transclude: true,
require: '^igniteCallout'
- }
-}]]
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db02523/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
--
diff --git
a/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
b/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
index 32ec68e..f4dfba5 100644
---
a/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
+++
b/modules/control-center-web/src/main/js/app/directives/callout/callout.directive.js
@@ -23,5 +23,5 @@ export default ['igniteCallout', [() => {
template,
replace: true,
transclude: true
- }
-}]]
+ };
+}]];
ignite git commit: 1.5.1-b2-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.5.1 575f70d48 -> 250aa4f90 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/250aa4f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/250aa4f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/250aa4f9 Branch: refs/heads/ignite-1.5.1 Commit: 250aa4f905d3bff0eba60951f5df96bea1aebd2a Parents: 575f70d Author: Ignite Teamcity Authored: Tue Dec 8 12:40:47 2015 +0300 Committer: Ignite Teamcity Committed: Tue Dec 8 12:40:47 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 +- .../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 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml| 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml| 2 +- pom.xml | 2 +- 56 files changed, 63 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/250aa4f9/examples/pom.xml ---
ignite git commit: ignite-1.5 Fixed hang on client reconnect (should not do blocking calls from reconnect callback)
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 3b26859bd -> d57918378
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
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")
ignite git commit: ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 d57918378 -> 5cd0039a5
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
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
+}
[1/2] ignite git commit: ignite-1.5 - MessageCollection + marshalling issue test
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 5cd0039a5 -> c29274801
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
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/m
[2/2] 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 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
[15/16] ignite git commit: 1.5.1-b2-SNAPSHOT
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/250aa4f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/250aa4f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/250aa4f9 Branch: refs/heads/ignite-2093 Commit: 250aa4f905d3bff0eba60951f5df96bea1aebd2a Parents: 575f70d Author: Ignite Teamcity Authored: Tue Dec 8 12:40:47 2015 +0300 Committer: Ignite Teamcity Committed: Tue Dec 8 12:40:47 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 +- .../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 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml| 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml| 2 +- pom.xml | 2 +- 56 files changed, 63 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/250aa4f9/examples/pom.xml -- diff --git a/examples/pom.xml b/examp
[07/16] ignite git commit: Merge branch ignite-1.5 into ignite-1.5.1
Merge branch ignite-1.5 into ignite-1.5.1 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7dd0edd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7dd0edd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7dd0edd Branch: refs/heads/ignite-2093 Commit: c7dd0edd143018fd56005ec19a06681d985a89ec Parents: cb5bd7c 6260fc1 Author: Alexey Goncharuk Authored: Mon Nov 30 20:00:07 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Nov 30 20:00:07 2015 +0300 -- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 + .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java| 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 7 +- .../tcp/IgniteCacheSslStartStopSelfTest.java| 2 +- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 ++-- 14 files changed, 137 insertions(+), 82 deletions(-) --
[04/16] 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 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d678790 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d678790 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d678790 Branch: refs/heads/ignite-2093 Commit: 8d678790e91b78eb364f98d9811b7ec7bd0ef236 Parents: 180c459 346733f Author: Anton Vinogradov Authored: Mon Nov 30 14:26:57 2015 +0300 Committer: Anton Vinogradov Committed: Mon Nov 30 14:26:57 2015 +0300 -- .../ignite/stream/camel/package-info.java | 21 .../ignite/stream/camel/package-info.java | 21 .../ignite/stream/flume/package-info.java | 21 .../ignite/stream/flume/package-info.java | 21 .../ignite/stream/jms11/package-info.java | 21 .../ignite/stream/jms11/package-info.java | 21 .../ignite/stream/kafka/package-info.java | 21 .../ignite/stream/kafka/package-info.java | 21 .../apache/ignite/stream/mqtt/package-info.java | 21 .../apache/ignite/stream/mqtt/package-info.java | 21 .../ignite/stream/twitter/package-info.java | 21 .../ignite/stream/twitter/package-info.java | 21 12 files changed, 252 insertions(+) --
[08/16] ignite git commit: fixed version
fixed version
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f1d55cc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f1d55cc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f1d55cc
Branch: refs/heads/ignite-2093
Commit: 4f1d55cc658e2f72708b43affea264fc31809bbd
Parents: c7dd0ed
Author: Yakov Zhdanov
Authored: Mon Nov 30 23:12:51 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Nov 30 23:12:51 2015 +0300
--
.../Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++--
.../Properties/AssemblyInfo.cs | 12 ++--
.../Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.Core/Properties/AssemblyInfo.cs | 6 +++---
.../dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++--
.../Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++--
.../Properties/AssemblyInfo.cs | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f1d55cc/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 7fb4d61..9819cff 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("8fae8395-7e91-411a-a78f-44d6d3fed0fc")]
-[assembly: AssemblyVersion("1.5.1-EA")]
-[assembly: AssemblyFileVersion("1.5.1-EA")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f1d55cc/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index 8aab1c4..098f9b4 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -27,8 +27,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
@@ -38,12 +38,12 @@ using System.Runtime.InteropServices;
// Version information for an assembly consists of the following four values:
//
// Major Version
-// Minor Version
+// Minor Version
// Build Number
// Revision
//
-// You can specify all the values or you can default the Build and Revision
Numbers
+// You can specify all the values or you can default the Build and Revision
Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1-EA")]
-[assembly: AssemblyFileVersion("1.5.1-EA")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f1d55cc/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
--
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 36a80f4..f2af079 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")]
-[assembly: AssemblyVersion("1.5.1-EA")]
-[assembly: AssemblyFileVersion("1.5.1-EA")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f1d55cc/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
--
diff
[06/16] ignite git commit: 1.5.1-EA-SNAPSHOT
1.5.1-EA-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb5bd7c3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb5bd7c3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb5bd7c3 Branch: refs/heads/ignite-2093 Commit: cb5bd7c3f8c76742f9cadf36fe1069bac00aed7a Parents: e3d29d2 Author: Ignite Teamcity Authored: Mon Nov 30 19:15:34 2015 +0300 Committer: Ignite Teamcity Committed: Mon Nov 30 19:15:34 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/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 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml| 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml| 2 +- pom.xml
[02/16] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af8b1458 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af8b1458 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af8b1458 Branch: refs/heads/ignite-2093 Commit: af8b14589b84b5c1412c3936b9c2c0cfffb4bbc4 Parents: 4c014a4 923fea8 Author: AKuznetsov Authored: Sun Nov 29 20:46:46 2015 +0700 Committer: AKuznetsov Committed: Sun Nov 29 20:46:46 2015 +0700 -- .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +-- 1 file changed, 133 insertions(+), 55 deletions(-) --
[11/16] 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: 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/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/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-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a58c75fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a58c75fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a58c75fe Branch: refs/heads/ignite-2093 Commit: a58c75fe69e7521651dc64c81cf1f486c97efb6e Parents: 833c4f5 74f93b6 Author: Anton Vinogradov Authored: Tue Dec 1 16:18:12 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 16:18:12 2015 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 4 +-- .../CacheDefaultBinaryAffinityKeyMapper.java| 19 +++--- .../processors/cache/GridCacheAdapter.java | 8 + .../processors/cache/GridCacheContext.java | 37 .../GridCacheDefaultAffinityKeyMapper.java | 9 - .../processors/cache/GridCacheMapEntry.java | 6 +++- .../GridCachePartitionExchangeManager.java | 23 .../processors/cache/GridCachePreloader.java| 5 +++ .../cache/GridCachePreloaderAdapter.java| 7 +++- .../processors/cache/GridCacheProcessor.java| 14 +--- .../processors/cache/GridCacheProxyImpl.java| 12 +++ .../processors/cache/IgniteCacheProxy.java | 24 + .../processors/cache/IgniteInternalCache.java | 9 + .../dht/atomic/GridDhtAtomicCache.java | 4 +-- .../dht/preloader/GridDhtPartitionDemander.java | 32 ++--- .../dht/preloader/GridDhtPreloader.java | 27 ++ .../CacheObjectBinaryProcessorImpl.java | 7 +++- .../cache/transactions/IgniteTxHandler.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 10 +++--- .../CachePutEventListenerErrorSelfTest.java | 35 ++ .../cache/GridCacheClearSelfTest.java | 9 +++-- ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++-- .../cache/IgniteCacheAbstractTest.java | 3 ++ ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++-- ...ObjectsCacheDataStructuresSelfTestSuite.java | 4 +++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 4 +++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite2.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite3.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite4.java | 4 +++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 +++ .../IgnitePortableCacheTestSuite.java | 1 - 32 files changed, 271 insertions(+), 105 deletions(-) --
[13/16] 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: 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/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/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-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fdbfa5b6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fdbfa5b6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fdbfa5b6 Branch: refs/heads/ignite-2093 Commit: fdbfa5b6bd6eab1fc41644e73d8c545dbf85a13a Parents: 7e2dfa5 Author: Anton Vinogradov Authored: Tue Dec 1 18:31:36 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 18:31:36 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/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/
[16/16] ignite git commit: Merge branches 'ignite-1.5.1' and 'ignite-2093'
Merge branches 'ignite-1.5.1' and 'ignite-2093' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a1ee037 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a1ee037 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a1ee037 Branch: refs/heads/ignite-2093 Commit: 7a1ee0377c40d8e3ce3f4ea7e374dd9a9102eae5 Parents: ac9ee86 250aa4f Author: Alexey Kuznetsov Authored: Tue Dec 8 17:30:00 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Dec 8 17:30:00 2015 +0700 -- examples/pom.xml| 4 +- examples/schema-import/pom.xml | 4 +- modules/aop/pom.xml | 14 ++ modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 20 +++-- modules/camel/pom.xml | 13 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 30 ++--- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 18 +++- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 22 +- modules/hadoop/pom.xml | 4 +- modules/hibernate/pom.xml | 12 + modules/indexing/pom.xml| 24 ++ modules/jcl/pom.xml | 13 +- modules/jms11/pom.xml | 22 -- modules/jta/pom.xml | 19 +--- modules/kafka/pom.xml | 18 ++-- modules/log4j/pom.xml | 12 + modules/log4j2/pom.xml | 13 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 26 --- 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 | 36 --- modules/scalar-2.10/pom.xml | 11 + modules/scalar/pom.xml | 11 + modules/schedule/pom.xml| 27 +--- modules/schema-import/pom.xml | 4 +- modules/slf4j/pom.xml | 14 +- modules/spark-2.10/pom.xml | 4 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 32 ++ modules/ssh/pom.xml | 21 + modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 14 +- modules/urideploy/pom.xml | 19 ++-- modules/visor-console-2.10/pom.xml | 6 +-- modules/visor-console/pom.xml | 4 +- modules/visor-plugins/pom.xml | 6 +-- modules/web/pom.xml | 15 +-- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 16 +++ pom.xml | 46 ++-- 61 files changed, 151 insertions(+), 489 deletions(-) --
[03/16] ignite git commit: Corrected performance suggestions.
Corrected performance suggestions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/180c4596 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/180c4596 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/180c4596 Branch: refs/heads/ignite-2093 Commit: 180c45964c8eb2d4a1c2bb39cc70932c92b574fa Parents: af8b145 0b61333 Author: Alexey Goncharuk Authored: Sun Nov 29 17:13:53 2015 +0300 Committer: Alexey Goncharuk Committed: Sun Nov 29 17:13:53 2015 +0300 -- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[09/16] 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: 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 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8c6acc1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8c6acc1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8c6acc1 Branch: refs/heads/ignite-2093 Commit: f8c6acc1de966e31deb1dcf73754ef9ff9bc06f0 Parents: 4f1d55c 9830300 Author: Anton Vinogradov Authored: Tue Dec 1 11:25:37 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 11:25:37 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) --
[01/16] ignite git commit: 1.5.1-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-2093 ac9ee86dc -> 7a1ee0377 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c014a47 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c014a47 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c014a47 Branch: refs/heads/ignite-2093 Commit: 4c014a4705376fc2bbc600a59ca9b17e5a52723b Parents: 59f3726 Author: Ignite Teamcity Authored: Sat Nov 28 18:57:09 2015 +0300 Committer: Ignite Teamcity Committed: Sat Nov 28 18:57:09 2015 +0300 -- examples/pom.xml | 5 ++--- 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 | 5 ++--- 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| 4 ++-- modules/flume/pom.xml | 5 ++--- 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 | 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| 5 ++--- 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 | 6 ++ modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml
[10/16] ignite git commit: version fix
version fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/833c4f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/833c4f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/833c4f58 Branch: refs/heads/ignite-2093 Commit: 833c4f58ed1c8dec3966ee415a41bd087387d1ef Parents: f8c6acc Author: Anton Vinogradov Authored: Tue Dec 1 14:38:04 2015 +0300 Committer: Anton Vinogradov Committed: Tue Dec 1 14:38:04 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/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 | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml| 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/833c4f58/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index f66a747..7cfd442 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.5.1-EA-SNAPSHOT +1.5.1-EA1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/833c4f58/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index b2df155..01acf6b 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -35,7 +35,7 @@ ignite-schema-import-demo -1.5.1-EA-SNAPSHOT +1.5.1-EA1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/833c4f58/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index c11d5cd..f6cea45 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.5.1-EA-SNAPSHOT +1.5.1-EA1-SNAPSHOT http://ignite.apache.org http://git-wip-us.apache.org/repos/asf/ignite/blob/833c4f58/modules/apache-license-gen/pom.xml -
[14/16] ignite git commit: IGNITE-1695 - Fixed polymorphic writes.
IGNITE-1695 - Fixed polymorphic writes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/575f70d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/575f70d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/575f70d4
Branch: refs/heads/ignite-2093
Commit: 575f70d480a476224af58b88e2a033717413fd00
Parents: fdbfa5b
Author: Alexey Goncharuk
Authored: Tue Dec 1 18:41:14 2015 +0300
Committer: Alexey Goncharuk
Committed: Tue Dec 1 18:41:14 2015 +0300
--
.../internal/portable/BinaryFieldAccessor.java | 83 +++--
.../internal/portable/BinaryReaderExImpl.java | 11 ++
.../ignite/internal/util/IgniteUtils.java | 8 +
.../portable/BinaryMarshallerSelfTest.java | 186 ---
4 files changed, 249 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/575f70d4/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
index 0eda375..eece245 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.portable;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.internal.U;
import sun.misc.Unsafe;
import java.lang.reflect.Field;
@@ -74,8 +75,41 @@ public abstract class BinaryFieldAccessor {
case P_DOUBLE:
return new DoublePrimitiveAccessor(field, id);
+case BYTE:
+case BOOLEAN:
+case SHORT:
+case CHAR:
+case INT:
+case LONG:
+case FLOAT:
+case DOUBLE:
+case DECIMAL:
+case STRING:
+case UUID:
+case DATE:
+case TIMESTAMP:
+case BYTE_ARR:
+case SHORT_ARR:
+case INT_ARR:
+case LONG_ARR:
+case FLOAT_ARR:
+case DOUBLE_ARR:
+case CHAR_ARR:
+case BOOLEAN_ARR:
+case DECIMAL_ARR:
+case STRING_ARR:
+case UUID_ARR:
+case DATE_ARR:
+case TIMESTAMP_ARR:
+case ENUM_ARR:
+case OBJECT_ARR:
+case PORTABLE_OBJ:
+case PORTABLE:
+case EXTERNALIZABLE:
+return new DefaultFinalClassAccessor(field, id, mode, false);
+
default:
-return new DefaultAccessor(field, id, mode);
+return new DefaultFinalClassAccessor(field, id, mode,
!U.isFinal(field.getType()));
}
}
@@ -389,10 +423,13 @@ public abstract class BinaryFieldAccessor {
/**
* Default accessor.
*/
-private static class DefaultAccessor extends BinaryFieldAccessor {
+private static class DefaultFinalClassAccessor extends BinaryFieldAccessor
{
/** Target field. */
private final Field field;
+/** Dynamic accessor flag. */
+private final boolean dynamic;
+
/**
* Constructor.
*
@@ -400,12 +437,13 @@ public abstract class BinaryFieldAccessor {
* @param id Field ID.
* @param mode Mode.
*/
-public DefaultAccessor(Field field, int id, BinaryWriteMode mode) {
+DefaultFinalClassAccessor(Field field, int id, BinaryWriteMode mode,
boolean dynamic) {
super(id, mode);
assert field != null;
this.field = field;
+this.dynamic = dynamic;
}
/** {@inheritDoc} */
@@ -424,7 +462,7 @@ public abstract class BinaryFieldAccessor {
throw new BinaryObjectException("Failed to get value for
field: " + field, e);
}
-switch (mode) {
+switch (mode(val)) {
case BYTE:
writer.writeByteField((Byte) val);
@@ -609,6 +647,25 @@ public abstract class BinaryFieldAccessor {
/** {@inheritDoc} */
@Override public void read(Object obj, BinaryReaderExImpl reader)
throws BinaryObjectException {
+Object val = dynamic ? reader.readField(id) :
readFixedType(reader);
+
+try {
+if (val != null || !field.getType().isPrimitive())
+field.set(obj, val);
+}
+catch (IllegalAccessException e) {
+
[12/16] ignite git commit: fixed npe (cherry picked from commit 022cdaf)
fixed npe
(cherry picked from commit 022cdaf)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e2dfa50
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e2dfa50
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e2dfa50
Branch: refs/heads/ignite-2093
Commit: 7e2dfa504c5e95ff011d8a5c1f11a479ce826303
Parents: a58c75f
Author: Yakov Zhdanov
Authored: Tue Dec 1 16:36:59 2015 +0300
Committer: Yakov Zhdanov
Committed: Tue Dec 1 16:40:23 2015 +0300
--
.../cache/distributed/near/GridNearGetFuture.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7e2dfa50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 3f61b2f..9705569 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -264,11 +264,13 @@ public final class GridNearGetFuture extends
CacheDistributedGetFutureAdap
if (!success) {
GridCacheVersion obsolete = cctx.versions().next(topVer);
-for (GridNearCacheEntry reserved : savedEntries.values()) {
-reserved.releaseEviction();
+if (savedEntries != null) {
+for (GridNearCacheEntry reserved :
savedEntries.values()) {
+reserved.releaseEviction();
-if (reserved.markObsolete(obsolete))
-reserved.context().cache().removeEntry(reserved);
+if (reserved.markObsolete(obsolete))
+
reserved.context().cache().removeEntry(reserved);
+}
}
}
}
@@ -543,7 +545,7 @@ public final class GridNearGetFuture extends
CacheDistributedGetFutureAdap
}
else {
K key0 = (K)cctx.unwrapPortableIfNeeded(key,
!deserializePortable, false);
-V val0 = !skipVals ?
+V val0 = !skipVals ?
(V)cctx.unwrapPortableIfNeeded(v,
!deserializePortable, false) :
(V)Boolean.TRUE;
[05/16] 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 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3d29d2a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3d29d2a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3d29d2a Branch: refs/heads/ignite-2093 Commit: e3d29d2aaff50e5229aa3a51107f6fccce54e5e5 Parents: 8d67879 dc14ccc Author: Anton Vinogradov Authored: Mon Nov 30 14:39:25 2015 +0300 Committer: Anton Vinogradov Committed: Mon Nov 30 14:39:25 2015 +0300 -- .../ignite/cache/store/spring/package-info.java | 21 .../discovery/tcp/ipfinder/zk/package-info.java | 21 2 files changed, 42 insertions(+) --
ignite git commit: IGNITE-843: Reworked pom.xml generation - fixed version and add plugin support for repositories list.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 3db025231 -> 87a4e8d84
IGNITE-843: Reworked pom.xml generation - fixed version and add plugin support
for repositories list.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87a4e8d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87a4e8d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87a4e8d8
Branch: refs/heads/ignite-843-rc2
Commit: 87a4e8d84f10862ae02894c01264cb93a198c780
Parents: 3db0252
Author: Alexey Kuznetsov
Authored: Tue Dec 8 18:16:35 2015 +0700
Committer: Alexey Kuznetsov
Committed: Tue Dec 8 18:16:35 2015 +0700
--
.../src/main/js/controllers/common-module.js| 14 ++---
.../main/js/controllers/summary-controller.js | 2 +-
.../src/main/js/helpers/common-utils.js | 7 +++
.../main/js/helpers/generator/generator-pom.js | 21 +---
4 files changed, 29 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/common-module.js
b/modules/control-center-web/src/main/js/controllers/common-module.js
index fb96f24..1c4f242 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -750,17 +750,17 @@ consoleModule.service('$common', [
return true;
},
metadataForQueryConfigured: function (meta) {
-var isEmpty = !isDefined(meta) || (isEmptyArray(meta.fields)
-&& isEmptyArray(meta.aliases)
-&& isEmptyArray(meta.indexes));
+var isEmpty = !isDefined(meta) || (isEmptyArray(meta.fields) &&
+isEmptyArray(meta.aliases) &&
+isEmptyArray(meta.indexes));
return !isEmpty;
},
metadataForStoreConfigured: function (meta) {
-var isEmpty = !isDefined(meta) ||
(isEmptyString(meta.databaseSchema)
-&& isEmptyString(meta.databaseTable)
-&& isEmptyArray(meta.keyFields)
-&& isEmptyArray(meta.valueFields));
+var isEmpty = !isDefined(meta) ||
(isEmptyString(meta.databaseSchema) &&
+isEmptyString(meta.databaseTable) &&
+isEmptyArray(meta.keyFields) &&
+isEmptyArray(meta.valueFields));
return !isEmpty;
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/controllers/summary-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/summary-controller.js
b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index b1b1351..b5ca1f0 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -19,7 +19,7 @@
consoleModule.controller('summaryController', [
'$scope', '$http', '$common', '$loading', '$table',
function ($scope, $http, $common, $loading, $table) {
-var igniteVersion = '1.5.0';
+var igniteVersion = '1.5.0-b1';
$loading.start('loadingSummaryScreen');
$scope.panelExpanded = $common.panelExpanded;
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/helpers/common-utils.js
--
diff --git a/modules/control-center-web/src/main/js/helpers/common-utils.js
b/modules/control-center-web/src/main/js/helpers/common-utils.js
index dca450c..f1d46fa 100644
--- a/modules/control-center-web/src/main/js/helpers/common-utils.js
+++ b/modules/control-center-web/src/main/js/helpers/common-utils.js
@@ -26,6 +26,13 @@ $commonUtils.isDefined = function (v) {
return !(v === undefined || v === null);
};
+$commonUtils.isEmptyArray = function(arr) {
+if ($commonUtils.isDefined(arr))
+return arr.length === 0;
+
+return true;
+};
+
/**
* @param v Value to check.
* @returns {boolean} 'true' if value defined and not empty string.
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
--
diff --git
a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
b/modules/control-center-web/src/main/js/helpers/g
ignite git commit: Ignite-1.5 - Added missing serialVersionUID to fix the build.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 c29274801 -> 67ebd02c9
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
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;
[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
[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
[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 =
[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;
[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
+}
[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);
}
///
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())
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: 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();
[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);
[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
[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
[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
[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
[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
[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
[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[])' + + + + +
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/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
+}
[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
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;
}
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: 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-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-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
[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("-", "."));
}
}
[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/
[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
[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/
[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
+}
[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
[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
[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[])' + + + + + + + + + + + + +
[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.
[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(-) --
