ignite git commit: ignite-1124-debug
Repository: ignite
Updated Branches:
refs/heads/ignite-1124-debug a9ae0f92a - 610cc88fd
ignite-1124-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/610cc88f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/610cc88f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/610cc88f
Branch: refs/heads/ignite-1124-debug
Commit: 610cc88fd561b21df3795a6fd4e3ce9cccfc4012
Parents: a9ae0f9
Author: sboikov sboi...@gridgain.com
Authored: Mon Aug 24 15:05:02 2015 +0300
Committer: sboikov sboi...@gridgain.com
Committed: Mon Aug 24 15:05:02 2015 +0300
--
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java| 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/610cc88f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 24e0e75..d0c410c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -161,6 +161,9 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapterObject
@GridToStringInclude
private volatile AffinityTopologyVersion waitTopVer;
+@GridToStringInclude
+private volatile boolean waitingForTopChange;
+
/**
* @param cctx Cache context.
* @param cache Cache instance.
@@ -641,8 +644,12 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapterObject
}
else {
if (waitTopFut) {
+waitingForTopChange = true;
+
fut.listen(new
CI1IgniteInternalFutureAffinityTopologyVersion() {
@Override public void
apply(IgniteInternalFutureAffinityTopologyVersion t) {
+waitingForTopChange = false;
+
cctx.kernalContext().closure().runLocalSafe(new
Runnable() {
@Override public void run() {
mapOnTopology(keys, remap, oldNodeId);
ignite git commit: IGNITE-1286 headers
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 6475e5324 - d6d27fba4
IGNITE-1286 headers
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6d27fba
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6d27fba
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6d27fba
Branch: refs/heads/ignite-1286
Commit: d6d27fba42a086ef05e6c39c8b20614aa1c21915
Parents: 6475e53
Author: ptupitsyn ptupit...@gridgain.com
Authored: Mon Aug 24 15:19:25 2015 +0300
Committer: ptupitsyn ptupit...@gridgain.com
Committed: Mon Aug 24 15:19:25 2015 +0300
--
.../dotnet/Apache.Ignite.Core/GridFactory.cs | 19 ++-
.../Apache.Ignite.Core.Tests/GridFactoryTest.cs | 19 ++-
.../Properties/AssemblyInfo.cs | 19 ++-
.../Apache.Ignite.Core.Tests/TestRunner.cs | 19 ++-
4 files changed, 72 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d27fba/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
--
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
index dd85747..20fdb69 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
@@ -1,4 +1,21 @@
-namespace Apache.Ignite.Core
+/*
+ * 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
{
public class GridFactory
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d27fba/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs
--
diff --git
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs
index ab935fd..3188deb 100644
---
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs
+++
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs
@@ -1,4 +1,21 @@
-namespace Apache.Ignite.Core.Tests
+/*
+ * 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.Tests
{
using NUnit.Framework;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d27fba/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
--
diff --git
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 85009ad..d8073ac 100644
---
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,21 @@
-using System.Reflection;
+/*
+ * 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
[1/2] ignite git commit: Improved test to check data consistency.
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 9faa9927b - 811cd8a6a
Improved test to check data consistency.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4df0716d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4df0716d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4df0716d
Branch: refs/heads/ignite-1286
Commit: 4df0716dec4265e8abaf7b67aefb5d798f2fe8b4
Parents: 4b818ae
Author: sboikov sboi...@gridgain.com
Authored: Mon Aug 24 14:23:11 2015 +0300
Committer: sboikov sboi...@gridgain.com
Committed: Mon Aug 24 14:23:11 2015 +0300
--
.../near/IgniteCacheNearOnlyTxTest.java | 82 +---
1 file changed, 54 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4df0716d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
index 88e7f03..c79f742 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -78,18 +79,31 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
ignite1.createNearCache(null, new NearCacheConfiguration());
-GridTestUtils.runMultiThreadedAsync(new CallableObject() {
-@Override public Object call() throws Exception {
-IgniteCache cache = ignite1.cache(null);
+final Integer key = 1;
-int key = 1;
+final AtomicInteger idx = new AtomicInteger();
-for (int i = 0; i 100; i++)
-cache.put(key, 1);
+IgniteCacheInteger, Integer cache0 = ignite(0).cache(null);
+IgniteCacheInteger, Integer cache1 = ignite1.cache(null);
-return null;
-}
-}, 5, put-thread);
+for (int i = 0; i 5; i++) {
+log.info(Iteration: + i);
+
+GridTestUtils.runMultiThreadedAsync(new CallableObject() {
+@Override public Object call() throws Exception {
+int val = idx.getAndIncrement();
+
+IgniteCacheInteger, Integer cache = ignite1.cache(null);
+
+for (int i = 0; i 100; i++)
+cache.put(key, val);
+
+return null;
+}
+}, 5, put-thread);
+
+assertEquals(cache0.localPeek(key), cache1.localPeek(key));
+}
}
/**
@@ -107,6 +121,7 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
}
/**
+ * @param optimistic If {@code true} uses optimistic transaction.
* @throws Exception If failed.
*/
private void txMultithreaded(final boolean optimistic) throws Exception {
@@ -116,27 +131,40 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
ignite1.createNearCache(null, new NearCacheConfiguration());
-GridTestUtils.runMultiThreaded(new CallableObject() {
-@Override public Object call() throws Exception {
-IgniteCache cache = ignite1.cache(null);
+final AtomicInteger idx = new AtomicInteger();
-int key = 1;
+final Integer key = 1;
-IgniteTransactions txs = ignite1.transactions();
+IgniteCacheInteger, Integer cache0 = ignite(0).cache(null);
+IgniteCacheInteger, Integer cache1 = ignite1.cache(null);
-for (int i = 0; i 100; i++) {
-try (Transaction tx = txs.txStart(optimistic ? OPTIMISTIC
: PESSIMISTIC, REPEATABLE_READ)) {
-cache.get(key);
+for (int i = 0; i 5; i++) {
+log.info(Iteration: + i);
-cache.put(key, 1);
+GridTestUtils.runMultiThreaded(new CallableObject() {
+@Override public Object call() throws Exception {
+IgniteCacheInteger, Integer cache = ignite1.cache(null);
-
[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1286
Merge remote-tracking branch 'remotes/origin/master' into ignite-1286 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/811cd8a6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/811cd8a6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/811cd8a6 Branch: refs/heads/ignite-1286 Commit: 811cd8a6a1c96dd7166f8fa3a39e8fddae0a9aa5 Parents: 9faa992 4df0716 Author: ptupitsyn ptupit...@gridgain.com Authored: Mon Aug 24 15:15:45 2015 +0300 Committer: ptupitsyn ptupit...@gridgain.com Committed: Mon Aug 24 15:15:45 2015 +0300 -- .../near/IgniteCacheNearOnlyTxTest.java | 82 +--- 1 file changed, 54 insertions(+), 28 deletions(-) --
ignite git commit: IGNITE-1286 review
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 d6d27fba4 - 9b55689cf
IGNITE-1286 review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b55689c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b55689c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b55689c
Branch: refs/heads/ignite-1286
Commit: 9b55689cff7c2fc0ba93f81f6454636ec674742f
Parents: d6d27fb
Author: ptupitsyn ptupit...@gridgain.com
Authored: Mon Aug 24 16:41:11 2015 +0300
Committer: ptupitsyn ptupit...@gridgain.com
Committed: Mon Aug 24 16:41:11 2015 +0300
--
.../Apache.Ignite.Core.csproj | 2 +-
.../dotnet/Apache.Ignite.Core/GridFactory.cs| 23 ---
.../Properties/AssemblyInfo.cs | 40 ++--
.../Apache.Ignite.Core.Tests.csproj | 2 +-
.../Apache.Ignite.Core.Tests/GridFactoryTest.cs | 30 ---
.../Properties/AssemblyInfo.cs | 21 +-
.../Apache.Ignite.Core.Tests/TestRunner.cs | 4 +-
7 files changed, 26 insertions(+), 96 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 32fd659..71e022f 100644
---
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -38,7 +38,7 @@
Reference Include=System.Xml /
/ItemGroup
ItemGroup
-Compile Include=GridFactory.cs /
+Compile Include=Ignition.cs /
Compile Include=Properties\AssemblyInfo.cs /
/ItemGroup
Import Project=$(MSBuildToolsPath)\Microsoft.CSharp.targets /
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
--
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
deleted file mode 100644
index 20fdb69..000
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
+++ /dev/null
@@ -1,23 +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
-{
-public class GridFactory
-{
-}
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
--
diff --git
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 92e4b93..7432673 100644
---
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -1,9 +1,23 @@
-using System.Reflection;
+/*
+ * 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.
+ */
ignite git commit: IGNITE-1286 cleanup
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 811cd8a6a - 6475e5324
IGNITE-1286 cleanup
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6475e532
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6475e532
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6475e532
Branch: refs/heads/ignite-1286
Commit: 6475e5324e57cf786ada10b8cbc878b2df7ffafd
Parents: 811cd8a
Author: ptupitsyn ptupit...@gridgain.com
Authored: Mon Aug 24 15:17:36 2015 +0300
Committer: ptupitsyn ptupit...@gridgain.com
Committed: Mon Aug 24 15:17:36 2015 +0300
--
.../Apache.Ignite.Core/Apache.Ignite.Core.csproj | 17 -
modules/platform/src/main/dotnet/Apache.Ignite.sln | 6 --
.../Apache.Ignite.Core.Tests.csproj| 17 -
3 files changed, 4 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/6475e532/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 93a1823..32fd659 100644
---
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -12,23 +12,6 @@
TargetFrameworkVersionv4.0/TargetFrameworkVersion
FileAlignment512/FileAlignment
/PropertyGroup
- PropertyGroup Condition= '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
-DebugSymbolstrue/DebugSymbols
-DebugTypefull/DebugType
-Optimizefalse/Optimize
-OutputPathbin\Debug\/OutputPath
-DefineConstantsDEBUG;TRACE/DefineConstants
-ErrorReportprompt/ErrorReport
-WarningLevel4/WarningLevel
- /PropertyGroup
- PropertyGroup Condition= '$(Configuration)|$(Platform)' ==
'Release|AnyCPU'
-DebugTypepdbonly/DebugType
-Optimizetrue/Optimize
-OutputPathbin\Release\/OutputPath
-DefineConstantsTRACE/DefineConstants
-ErrorReportprompt/ErrorReport
-WarningLevel4/WarningLevel
- /PropertyGroup
PropertyGroup Condition='$(Configuration)|$(Platform)' == 'Debug|x64'
PlatformTargetx64/PlatformTarget
OutputPathbin\x64\Debug\/OutputPath
http://git-wip-us.apache.org/repos/asf/ignite/blob/6475e532/modules/platform/src/main/dotnet/Apache.Ignite.sln
--
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.sln
b/modules/platform/src/main/dotnet/Apache.Ignite.sln
index dc6eb08..44d4be0 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.sln
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.sln
@@ -27,8 +27,10 @@ Global
{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x64.Build.0 =
Debug|x64
{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.ActiveCfg =
Debug|x86
{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.Build.0 =
Debug|x86
- {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.ActiveCfg =
Release|Any CPU
- {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg =
Release|Any CPU
+ {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.ActiveCfg =
Release|x64
+ {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.Build.0 =
Release|x64
+ {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg =
Release|x86
+ {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.Build.0 =
Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
http://git-wip-us.apache.org/repos/asf/ignite/blob/6475e532/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
--
diff --git
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 08efac5..d6e1421 100644
---
a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++
b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -12,23 +12,6 @@
TargetFrameworkVersionv4.0/TargetFrameworkVersion
FileAlignment512/FileAlignment
/PropertyGroup
- PropertyGroup Condition= '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
-DebugSymbolstrue/DebugSymbols
-DebugTypefull/DebugType
-Optimizefalse/Optimize
-OutputPathbin\Debug\/OutputPath
-DefineConstantsDEBUG;TRACE/DefineConstants
-
ignite git commit: IGNITE-1286 review
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 10cb07928 - de76c5c84
IGNITE-1286 review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de76c5c8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de76c5c8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de76c5c8
Branch: refs/heads/ignite-1286
Commit: de76c5c84d9687667eec364705d6ba60aef15c4c
Parents: 10cb079
Author: ptupitsyn ptupit...@gridgain.com
Authored: Mon Aug 24 17:12:08 2015 +0300
Committer: ptupitsyn ptupit...@gridgain.com
Committed: Mon Aug 24 17:12:08 2015 +0300
--
modules/platform/src/main/dotnet/Apache.Ignite.sln | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/de76c5c8/modules/platform/src/main/dotnet/Apache.Ignite.sln
--
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.sln
b/modules/platform/src/main/dotnet/Apache.Ignite.sln
index 918358e..91bd2b6 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.sln
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) = Apache.Ignite.Core,
Apache.Ignite.Core\Apache.Ignite.Core.csproj,
{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}
EndProject
Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
Apache.Ignite.Core.Tests,
..\..\test\dotnet\Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj,
{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}
ignite git commit: IGNITE-843 WIP preview.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 7aae0ee85 - f15f8bd8c
IGNITE-843 WIP preview.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f15f8bd8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f15f8bd8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f15f8bd8
Branch: refs/heads/ignite-843
Commit: f15f8bd8ce51d2a134602ab338042d113f229a38
Parents: 7aae0ee
Author: AKuznetsov akuznet...@gridgain.com
Authored: Mon Aug 24 23:46:15 2015 +0700
Committer: AKuznetsov akuznet...@gridgain.com
Committed: Mon Aug 24 23:46:15 2015 +0700
--
.../main/js/controllers/clusters-controller.js | 10 +
.../src/main/js/controllers/common-module.js| 204 ++-
.../src/main/js/views/includes/controls.jade| 2 +-
3 files changed, 212 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/f15f8bd8/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index ac6b347..2c7d016 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -187,6 +187,16 @@ controlCenterModule.controller('clustersController',
['$scope', '$http', '$commo
$scope.preview.general =
$code.xmlClusterGeneral(val).join('');
$scope.preview.atomics =
$code.xmlClusterAtomics(val).join('');
+$scope.preview.communication =
$code.xmlClusterCommunication(val).join('');
+$scope.preview.deployment =
$code.xmlClusterDeployment(val).join('');
+$scope.preview.events =
$code.xmlClusterEvents(val).join('');
+$scope.preview.marshaller =
$code.xmlClusterMarshaller(val).join('');
+$scope.preview.metrics =
$code.xmlClusterMetrics(val).join('');
+$scope.preview.p2p = $code.xmlClusterP2P(val).join('');
+$scope.preview.swap =
$code.xmlClusterSwap(val).join('');
+$scope.preview.time =
$code.xmlClusterTime(val).join('');
+$scope.preview.pools =
$code.xmlClusterPools(val).join('');
+$scope.preview.transactions =
$code.xmlClusterTransactions(val).join('');
}
}, true);
})
http://git-wip-us.apache.org/repos/asf/ignite/blob/f15f8bd8/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 85bdc3e..be4a6a2 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
@@ -1072,7 +1072,7 @@ controlCenterModule.service('$code', ['$common', function
($common) {
var val = obj[propName];
if ($common.isDefined(val))
-addElement(res, 'property', 'name', propName, 'value',
generatorCommon.javaBuildInClass(val));
+addElement(res, 'property', 'name', propName, 'value',
$common.javaBuildInClass(val));
return val;
}
@@ -1107,13 +1107,48 @@ controlCenterModule.service('$code', ['$common',
function ($common) {
this.fields = fields;
}
-atomicConfiguration = new
ClassDescriptor('org.apache.ignite.configuration.AtomicConfiguration', {
+var atomicConfiguration = new
ClassDescriptor('org.apache.ignite.configuration.AtomicConfiguration', {
backups: null,
cacheMode: {type: 'enum', enumClass: 'CacheMode'},
atomicSequenceReserveSize: null
});
-knownClasses = {
+var evictionPolicies = {
+'LRU': new
ClassDescriptor('org.apache.ignite.cache.eviction.lru.LruEvictionPolicy',
+{batchSize: null, maxMemorySize: null, maxSize: null}),
+'RND': new
ClassDescriptor('org.apache.ignite.cache.eviction.random.RandomEvictionPolicy',
{maxSize: null}),
+'FIFO': new
ClassDescriptor('org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy',
+{batchSize: null, maxMemorySize: null, maxSize: null}),
+'SORTED': new
ClassDescriptor('org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicy',
+{batchSize: null, maxMemorySize: null, maxSize: null})
+};
+
+var marshallers = {
+
ignite git commit: master - Fixed RAT excludes.
Repository: ignite Updated Branches: refs/heads/master ff666ca63 - 321b78a75 master - Fixed RAT excludes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/321b78a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/321b78a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/321b78a7 Branch: refs/heads/master Commit: 321b78a758450a5bf45d3fdeca42e88edca549c4 Parents: ff666ca Author: Alexey Goncharuk agoncha...@gridgain.com Authored: Mon Aug 24 12:19:15 2015 -0700 Committer: Alexey Goncharuk agoncha...@gridgain.com Committed: Mon Aug 24 12:19:15 2015 -0700 -- parent/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/321b78a7/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index efa6494..49aa36f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -725,6 +725,10 @@ excludeipc/shmem/igniteshmem/.deps/*/exclude!--tmp files-- excludeipc/shmem/igniteshmem/libigniteshmem.la/exclude!--tmp (not under VCS)-- excludeipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo/exclude!--tmp (not under VCS)-- +!--platform-- + excludesrc/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj/exclude + excludesrc/main/dotnet/Apache.Ignite.sln/exclude + excludesrc/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj/exclude /excludes /configuration /execution
[09/10] ignite git commit: master - Fixed RAT excludes.
master - Fixed RAT excludes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/321b78a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/321b78a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/321b78a7 Branch: refs/heads/ignite-1281 Commit: 321b78a758450a5bf45d3fdeca42e88edca549c4 Parents: ff666ca Author: Alexey Goncharuk agoncha...@gridgain.com Authored: Mon Aug 24 12:19:15 2015 -0700 Committer: Alexey Goncharuk agoncha...@gridgain.com Committed: Mon Aug 24 12:19:15 2015 -0700 -- parent/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/321b78a7/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index efa6494..49aa36f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -725,6 +725,10 @@ excludeipc/shmem/igniteshmem/.deps/*/exclude!--tmp files-- excludeipc/shmem/igniteshmem/libigniteshmem.la/exclude!--tmp (not under VCS)-- excludeipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo/exclude!--tmp (not under VCS)-- +!--platform-- + excludesrc/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj/exclude + excludesrc/main/dotnet/Apache.Ignite.sln/exclude + excludesrc/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj/exclude /excludes /configuration /execution
[02/10] ignite git commit: IGNITE-1283: Creating infrastructure for platforms module.
IGNITE-1283: Creating infrastructure for platforms module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aaf43758
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aaf43758
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aaf43758
Branch: refs/heads/ignite-1281
Commit: aaf43758caa68a80a31b9cce653e1da04887
Parents: 1327340
Author: vozerov-gridgain voze...@gridgain.com
Authored: Mon Aug 24 11:20:11 2015 +0300
Committer: vozerov-gridgain voze...@gridgain.com
Committed: Mon Aug 24 11:20:11 2015 +0300
--
.../configuration/IgniteConfiguration.java | 22 +++
.../configuration/PlatformConfiguration.java| 25 +++
.../internal/GridEventConsumeHandler.java | 14 +-
.../interop/InteropAwareEventFilter.java| 37
.../internal/interop/InteropBootstrap.java | 35
.../interop/InteropBootstrapFactory.java| 39
.../internal/interop/InteropException.java | 71 ---
.../internal/interop/InteropIgnition.java | 186 ---
.../interop/InteropLocalEventListener.java | 28 ---
.../interop/InteropNoCallbackException.java | 50 -
.../internal/interop/InteropProcessor.java | 39
.../eventstorage/GridEventStorageManager.java | 10 +-
.../platform/PlatformAwareEventFilter.java | 37
.../platform/PlatformLocalEventListener.java| 28 +++
modules/platform/pom.xml| 65 +++
.../ignite/internal/platform/Platform.java | 39
.../internal/platform/PlatformBootstrap.java| 35
.../platform/PlatformBootstrapFactory.java | 37
.../internal/platform/PlatformException.java| 71 +++
.../internal/platform/PlatformIgnition.java | 186 +++
.../platform/PlatformNoCallbackException.java | 50 +
pom.xml | 1 +
22 files changed, 608 insertions(+), 497 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/aaf43758/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index b670398..1fa1de4 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -416,6 +416,9 @@ public class IgniteConfiguration {
/** SSL connection factory. */
private FactorySSLContext sslCtxFactory;
+/** Platform configuration. */
+private PlatformConfiguration platformCfg;
+
/**
* Creates valid grid configuration with all default values.
*/
@@ -490,6 +493,7 @@ public class IgniteConfiguration {
p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude();
p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize();
p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize();
+platformCfg = cfg.getPlatformConfiguration();
pluginCfgs = cfg.getPluginConfigurations();
pubPoolSize = cfg.getPublicThreadPoolSize();
segChkFreq = cfg.getSegmentCheckFrequency();
@@ -2371,6 +2375,24 @@ public class IgniteConfiguration {
return this;
}
+/**
+ * Gets platform configuration.
+ *
+ * @return Platform configuration.
+ */
+public PlatformConfiguration getPlatformConfiguration() {
+return platformCfg;
+}
+
+/**
+ * Sets platform configuration.
+ *
+ * @param platformCfg Platform configuration.
+ */
+public void setPlatformConfiguration(PlatformConfiguration platformCfg) {
+this.platformCfg = platformCfg;
+}
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgniteConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/aaf43758/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
new file mode 100644
index 000..14d5e1d
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/PlatformConfiguration.java
@@ -0,0 +1,25 @@
+/*
+ * 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
[1/2] ignite git commit: IGNITE-1284: Added callback utility classes.
Repository: ignite
Updated Branches:
refs/heads/master b4e67240f - 30fc46623
IGNITE-1284: Added callback utility classes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c51c569
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c51c569
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c51c569
Branch: refs/heads/master
Commit: 2c51c56919bc5c0f61e4c96ebf4a47a4aa804986
Parents: aaf4375
Author: vozerov-gridgain voze...@gridgain.com
Authored: Mon Aug 24 12:02:34 2015 +0300
Committer: vozerov-gridgain voze...@gridgain.com
Committed: Mon Aug 24 12:02:34 2015 +0300
--
.../internal/platform/PlatformIgnition.java | 4 +-
.../callback/PlatformCallbackGateway.java | 869 +++
.../callback/PlatformCallbackUtils.java | 468 ++
3 files changed, 1339 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c51c569/modules/platform/src/main/java/org/apache/ignite/internal/platform/PlatformIgnition.java
--
diff --git
a/modules/platform/src/main/java/org/apache/ignite/internal/platform/PlatformIgnition.java
b/modules/platform/src/main/java/org/apache/ignite/internal/platform/PlatformIgnition.java
index 293d79d..685cded 100644
---
a/modules/platform/src/main/java/org/apache/ignite/internal/platform/PlatformIgnition.java
+++
b/modules/platform/src/main/java/org/apache/ignite/internal/platform/PlatformIgnition.java
@@ -1,5 +1,3 @@
-package org.apache.ignite.internal.platform;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,6 +15,8 @@ package org.apache.ignite.internal.platform;
* limitations under the License.
*/
+package org.apache.ignite.internal.platform;
+
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c51c569/modules/platform/src/main/java/org/apache/ignite/internal/platform/callback/PlatformCallbackGateway.java
--
diff --git
a/modules/platform/src/main/java/org/apache/ignite/internal/platform/callback/PlatformCallbackGateway.java
b/modules/platform/src/main/java/org/apache/ignite/internal/platform/callback/PlatformCallbackGateway.java
new file mode 100644
index 000..d565c00
--- /dev/null
+++
b/modules/platform/src/main/java/org/apache/ignite/internal/platform/callback/PlatformCallbackGateway.java
@@ -0,0 +1,869 @@
+/*
+ * 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.platform.callback;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.*;
+
+/**
+ * Gateway to all platform-dependent callbacks. Implementers might extend this
class and provide additional callbacks.
+ */
+@SuppressWarnings({FieldCanBeLocal, UnusedDeclaration})
+public class PlatformCallbackGateway {
+/** Environment pointer. */
+protected final long envPtr;
+
+/** Lock. */
+private final GridSpinReadWriteLock lock = new GridSpinReadWriteLock();
+
+/**
+ * Native gateway.
+ *
+ * @param envPtr Environment pointer.
+ */
+public PlatformCallbackGateway(long envPtr) {
+this.envPtr = envPtr;
+}
+
+/**
+ * Get environment pointer.
+ *
+ * @return Environment pointer.
+ */
+public long environmentPointer() {
+return envPtr;
+}
+
+/**
+ * Create cache store.
+ *
+ * @param memPtr Memory pointer.
+ * @return Pointer.
+ */
+public long cacheStoreCreate(long memPtr) {
+enter();
+
+try {
+return PlatformCallbackUtils.cacheStoreCreate(envPtr, memPtr);
+}
+finally {
+leave();
+}
+}
+
+/**
+ * @param objPtr Object pointer.
+ * @param memPtr Memory pointer.
+ * @param cb Callback.
+ * @return
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1284 [deleted] 7db0ef733
ignite git commit: IGNITE-843 WIP on preview.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 a174e8eaa - 5e559928b
IGNITE-843 WIP on preview.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e559928
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e559928
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e559928
Branch: refs/heads/ignite-843
Commit: 5e559928b72f0c09a766c20a41c29d00431e29b5
Parents: a174e8e
Author: Alexey Kuznetsov akuznet...@apache.org
Authored: Mon Aug 24 18:22:23 2015 +0700
Committer: Alexey Kuznetsov akuznet...@apache.org
Committed: Mon Aug 24 18:22:23 2015 +0700
--
.../main/js/controllers/clusters-controller.js | 15 ++
.../src/main/js/public/stylesheets/style.scss | 9 ++
.../src/main/js/views/includes/controls.jade| 29
3 files changed, 42 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e559928/modules/control-center-web/src/main/js/controllers/clusters-controller.js
--
diff --git
a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 3ed69f3..292ec40 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -66,6 +66,21 @@ controlCenterModule.controller('clustersController',
['$scope', '$http', '$commo
}
}
+$scope.aceInit = function (editor) {
+editor.setReadOnly(true);
+editor.setOption(highlightActiveLine, false);
+
+var renderer = editor.renderer;
+
+renderer.setHighlightGutterLine(false);
+renderer.setShowPrintMargin(false);
+renderer.setOption('fontSize', '14px');
+
+editor.setTheme('ace/theme/chrome');
+};
+
+$scope.preview = 'bean
class=org.apache.ignite.configuration.IgniteConfiguration/bean';
+
$scope.cacheModes = $common.mkOptions(['LOCAL', 'REPLICATED',
'PARTITIONED']);
$scope.deploymentModes = $common.mkOptions(['PRIVATE', 'ISOLATED',
'SHARED', 'CONTINUOUS']);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e559928/modules/control-center-web/src/main/js/public/stylesheets/style.scss
--
diff --git
a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 4de127d..eff77d2 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -764,6 +764,11 @@ button .caret, .btn .caret {
.theme-line .panel-body {
padding: 10px 20px;
+
+[class*=col-] {
+padding-left: 0 !important;
+padding-right: 0 !important;
+}
}
.theme-line .main-content a.customize {
@@ -1447,6 +1452,10 @@ a {
}
}
+.ace-preview {
+
+}
+
.loading-indicator {
box-sizing: border-box;
-webkit-box-sizing: border-box;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e559928/modules/control-center-web/src/main/js/views/includes/controls.jade
--
diff --git
a/modules/control-center-web/src/main/js/views/includes/controls.jade
b/modules/control-center-web/src/main/js/views/includes/controls.jade
index f932f27..642e836 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -86,7 +86,7 @@ mixin table-pair-edit(prefix, keyPlaceholder, valPlaceholder,
keyJavaBuildInType
input.form-control(id=valFocusId type='text' ng-model=valModel
placeholder=valPlaceholder on-enter=btnVisibleAndSave on-escape='tableReset()')
mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder,
valPlaceholder, keyJavaBuildInTypes, valueJavaBuildInTypes)
-.col-sm-7.group
+.col-sm-12.group
.group-legend
label #{header}
+group-tip('field.tip')
@@ -246,7 +246,7 @@ mixin table-group-item-edit(prefix, index)
button.form-control(id=direction ng-model=directionModel bs-select
bs-options='item.value as item.label for item in {{sortDirections}}'
on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0')
mixin form-row(dataSource)
-+form-row-custom(['col-xs-3 col-sm-2 col-md-2'], ['col-xs-6 col-sm-5
col-md-5'], dataSource)
++form-row-custom(['col-xs-4 col-sm-4 col-md-4'], ['col-xs-8 col-sm-8
col-md-8'], dataSource)
mixin form-row-custom(lblClasses,
ignite git commit: Improved test to check data consistency.
Repository: ignite
Updated Branches:
refs/heads/master 4b818ae3e - 4df0716de
Improved test to check data consistency.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4df0716d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4df0716d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4df0716d
Branch: refs/heads/master
Commit: 4df0716dec4265e8abaf7b67aefb5d798f2fe8b4
Parents: 4b818ae
Author: sboikov sboi...@gridgain.com
Authored: Mon Aug 24 14:23:11 2015 +0300
Committer: sboikov sboi...@gridgain.com
Committed: Mon Aug 24 14:23:11 2015 +0300
--
.../near/IgniteCacheNearOnlyTxTest.java | 82 +---
1 file changed, 54 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4df0716d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
index 88e7f03..c79f742 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -78,18 +79,31 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
ignite1.createNearCache(null, new NearCacheConfiguration());
-GridTestUtils.runMultiThreadedAsync(new CallableObject() {
-@Override public Object call() throws Exception {
-IgniteCache cache = ignite1.cache(null);
+final Integer key = 1;
-int key = 1;
+final AtomicInteger idx = new AtomicInteger();
-for (int i = 0; i 100; i++)
-cache.put(key, 1);
+IgniteCacheInteger, Integer cache0 = ignite(0).cache(null);
+IgniteCacheInteger, Integer cache1 = ignite1.cache(null);
-return null;
-}
-}, 5, put-thread);
+for (int i = 0; i 5; i++) {
+log.info(Iteration: + i);
+
+GridTestUtils.runMultiThreadedAsync(new CallableObject() {
+@Override public Object call() throws Exception {
+int val = idx.getAndIncrement();
+
+IgniteCacheInteger, Integer cache = ignite1.cache(null);
+
+for (int i = 0; i 100; i++)
+cache.put(key, val);
+
+return null;
+}
+}, 5, put-thread);
+
+assertEquals(cache0.localPeek(key), cache1.localPeek(key));
+}
}
/**
@@ -107,6 +121,7 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
}
/**
+ * @param optimistic If {@code true} uses optimistic transaction.
* @throws Exception If failed.
*/
private void txMultithreaded(final boolean optimistic) throws Exception {
@@ -116,27 +131,40 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
ignite1.createNearCache(null, new NearCacheConfiguration());
-GridTestUtils.runMultiThreaded(new CallableObject() {
-@Override public Object call() throws Exception {
-IgniteCache cache = ignite1.cache(null);
+final AtomicInteger idx = new AtomicInteger();
-int key = 1;
+final Integer key = 1;
-IgniteTransactions txs = ignite1.transactions();
+IgniteCacheInteger, Integer cache0 = ignite(0).cache(null);
+IgniteCacheInteger, Integer cache1 = ignite1.cache(null);
-for (int i = 0; i 100; i++) {
-try (Transaction tx = txs.txStart(optimistic ? OPTIMISTIC
: PESSIMISTIC, REPEATABLE_READ)) {
-cache.get(key);
+for (int i = 0; i 5; i++) {
+log.info(Iteration: + i);
-cache.put(key, 1);
+GridTestUtils.runMultiThreaded(new CallableObject() {
+@Override public Object call() throws Exception {
+IgniteCacheInteger, Integer cache = ignite1.cache(null);
-tx.commit();
+
ignite git commit: IGNITE-1286 Platforms .Net: Create solution and empty projects core, test, test-runner
Repository: ignite
Updated Branches:
refs/heads/ignite-1286 [created] 472366cea
IGNITE-1286 Platforms .Net: Create solution and empty projects core, test,
test-runner
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/472366ce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/472366ce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/472366ce
Branch: refs/heads/ignite-1286
Commit: 472366cea9cc61de8a4f7b536eb097b2fccefc78
Parents: 4b818ae
Author: ptupitsyn ptupit...@gridgain.com
Authored: Mon Aug 24 14:51:17 2015 +0300
Committer: ptupitsyn ptupit...@gridgain.com
Committed: Mon Aug 24 14:51:17 2015 +0300
--
.../Apache.Ignite.Core.csproj | 69
.../dotnet/Apache.Ignite.Core/GridFactory.cs| 6 ++
.../Properties/AssemblyInfo.cs | 35 ++
.../platform/src/main/dotnet/Apache.Ignite.sln | 28
4 files changed, 138 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/472366ce/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git
a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
new file mode 100644
index 000..93a1823
--- /dev/null
+++
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -0,0 +1,69 @@
+?xml version=1.0 encoding=utf-8?
+Project ToolsVersion=12.0 DefaultTargets=Build
xmlns=http://schemas.microsoft.com/developer/msbuild/2003;
+ Import
Project=$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props
Condition=Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')
/
+ PropertyGroup
+Configuration Condition= '$(Configuration)' == '' Debug/Configuration
+Platform Condition= '$(Platform)' == '' AnyCPU/Platform
+ProjectGuid{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}/ProjectGuid
+OutputTypeLibrary/OutputType
+AppDesignerFolderProperties/AppDesignerFolder
+RootNamespaceApache.Ignite.Core/RootNamespace
+AssemblyNameApache.Ignite.Core/AssemblyName
+TargetFrameworkVersionv4.0/TargetFrameworkVersion
+FileAlignment512/FileAlignment
+ /PropertyGroup
+ PropertyGroup Condition= '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
+DebugSymbolstrue/DebugSymbols
+DebugTypefull/DebugType
+Optimizefalse/Optimize
+OutputPathbin\Debug\/OutputPath
+DefineConstantsDEBUG;TRACE/DefineConstants
+ErrorReportprompt/ErrorReport
+WarningLevel4/WarningLevel
+ /PropertyGroup
+ PropertyGroup Condition= '$(Configuration)|$(Platform)' ==
'Release|AnyCPU'
+DebugTypepdbonly/DebugType
+Optimizetrue/Optimize
+OutputPathbin\Release\/OutputPath
+DefineConstantsTRACE/DefineConstants
+ErrorReportprompt/ErrorReport
+WarningLevel4/WarningLevel
+ /PropertyGroup
+ PropertyGroup Condition='$(Configuration)|$(Platform)' == 'Debug|x64'
+PlatformTargetx64/PlatformTarget
+OutputPathbin\x64\Debug\/OutputPath
+ /PropertyGroup
+ PropertyGroup Condition='$(Configuration)|$(Platform)' == 'Release|x64'
+PlatformTargetx64/PlatformTarget
+OutputPathbin\x64\Release\/OutputPath
+ /PropertyGroup
+ PropertyGroup Condition='$(Configuration)|$(Platform)' == 'Debug|x86'
+PlatformTargetx86/PlatformTarget
+OutputPathbin\x86\Debug\/OutputPath
+ /PropertyGroup
+ PropertyGroup Condition='$(Configuration)|$(Platform)' == 'Release|x86'
+PlatformTargetx86/PlatformTarget
+OutputPathbin\x86\Release\/OutputPath
+ /PropertyGroup
+ ItemGroup
+Reference Include=System /
+Reference Include=System.Core /
+Reference Include=System.Xml.Linq /
+Reference Include=System.Data.DataSetExtensions /
+Reference Include=Microsoft.CSharp /
+Reference Include=System.Data /
+Reference Include=System.Xml /
+ /ItemGroup
+ ItemGroup
+Compile Include=GridFactory.cs /
+Compile Include=Properties\AssemblyInfo.cs /
+ /ItemGroup
+ Import Project=$(MSBuildToolsPath)\Microsoft.CSharp.targets /
+ !-- To modify your build process, add your task inside one of the targets
below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ Target Name=BeforeBuild
+ /Target
+ Target Name=AfterBuild
+ /Target
+ --
+/Project
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/472366ce/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
--
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
b/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs
[4/4] ignite git commit: IGNITE-1281 - Fixed afterMessageRead() for hierarchical classes.
IGNITE-1281 - Fixed afterMessageRead() for hierarchical classes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86e3b27f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86e3b27f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86e3b27f Branch: refs/heads/ignite-1281 Commit: 86e3b27f3a2ccd5747176c7d20fade960a928a08 Parents: 37538fc Author: Alexey Goncharuk agoncha...@gridgain.com Authored: Mon Aug 24 14:47:35 2015 -0700 Committer: Alexey Goncharuk agoncha...@gridgain.com Committed: Mon Aug 24 14:47:35 2015 -0700 -- .../apache/ignite/codegen/MessageCodeGenerator.java| 13 +++-- .../apache/ignite/internal/GridJobCancelRequest.java | 2 +- .../apache/ignite/internal/GridJobExecuteRequest.java | 2 +- .../apache/ignite/internal/GridJobExecuteResponse.java | 2 +- .../apache/ignite/internal/GridJobSiblingsRequest.java | 2 +- .../ignite/internal/GridJobSiblingsResponse.java | 2 +- .../apache/ignite/internal/GridTaskCancelRequest.java | 2 +- .../apache/ignite/internal/GridTaskSessionRequest.java | 2 +- .../managers/checkpoint/GridCheckpointRequest.java | 2 +- .../internal/managers/communication/GridIoMessage.java | 2 +- .../managers/communication/GridIoUserMessage.java | 2 +- .../managers/deployment/GridDeploymentInfoBean.java| 2 +- .../managers/deployment/GridDeploymentRequest.java | 2 +- .../managers/deployment/GridDeploymentResponse.java| 2 +- .../managers/eventstorage/GridEventStorageMessage.java | 2 +- .../processors/affinity/AffinityTopologyVersion.java | 2 +- .../processors/cache/CacheEntryInfoCollection.java | 2 +- .../processors/cache/CacheEntryPredicateAdapter.java | 2 +- .../cache/CacheEntryPredicateContainsValue.java| 2 +- .../cache/CacheEntrySerializablePredicate.java | 2 +- .../internal/processors/cache/CacheEvictionEntry.java | 2 +- .../processors/cache/CacheInvokeDirectResult.java | 2 +- .../internal/processors/cache/CacheObjectAdapter.java | 2 +- .../processors/cache/CacheObjectByteArrayImpl.java | 2 +- .../internal/processors/cache/GridCacheEntryInfo.java | 2 +- .../processors/cache/GridCacheEvictionRequest.java | 2 +- .../processors/cache/GridCacheEvictionResponse.java| 2 +- .../internal/processors/cache/GridCacheMessage.java| 2 +- .../internal/processors/cache/GridCacheReturn.java | 2 +- .../cache/distributed/GridCacheTtlUpdateRequest.java | 2 +- .../cache/distributed/GridCacheTxRecoveryRequest.java | 2 +- .../cache/distributed/GridCacheTxRecoveryResponse.java | 2 +- .../cache/distributed/GridDistributedBaseMessage.java | 2 +- .../cache/distributed/GridDistributedLockRequest.java | 2 +- .../cache/distributed/GridDistributedLockResponse.java | 2 +- .../distributed/GridDistributedTxFinishRequest.java| 2 +- .../distributed/GridDistributedTxFinishResponse.java | 2 +- .../distributed/GridDistributedTxPrepareRequest.java | 2 +- .../distributed/GridDistributedTxPrepareResponse.java | 2 +- .../distributed/GridDistributedUnlockRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentResponse.java | 2 +- .../cache/distributed/dht/GridDhtLockRequest.java | 6 ++ .../cache/distributed/dht/GridDhtLockResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishRequest.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxPrepareRequest.java | 2 +- .../distributed/dht/GridDhtTxPrepareResponse.java | 2 +- .../cache/distributed/dht/GridDhtUnlockRequest.java| 2 +- .../atomic/GridDhtAtomicDeferredUpdateResponse.java| 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java| 2 +- .../dht/atomic/GridNearAtomicUpdateRequest.java| 2 +- .../dht/atomic/GridNearAtomicUpdateResponse.java | 2 +- .../dht/preloader/GridDhtForceKeysRequest.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java| 2 +- .../dht/preloader/GridDhtPartitionDemandMessage.java | 2 +- .../dht/preloader/GridDhtPartitionExchangeId.java | 2 +- .../dht/preloader/GridDhtPartitionSupplyMessage.java | 2 +- .../preloader/GridDhtPartitionsAbstractMessage.java| 2 +- .../dht/preloader/GridDhtPartitionsFullMessage.java| 2 +- .../dht/preloader/GridDhtPartitionsSingleMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsSingleRequest.java | 2 +- .../cache/distributed/near/CacheVersionedValue.java| 2 +- .../cache/distributed/near/GridNearGetRequest.java | 2 +- .../cache/distributed/near/GridNearGetResponse.java| 2 +- .../cache/distributed/near/GridNearLockRequest.java| 2 +-
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1.3.2-p2 [deleted] b27941ccb
svn commit: r1697531 - in /ignite/site/trunk: community/resources.html includes/header.html
Author: dsetrakyan Date: Tue Aug 25 02:19:56 2015 New Revision: 1697531 URL: http://svn.apache.org/r1697531 Log: Added GIT repositories. Modified: ignite/site/trunk/community/resources.html ignite/site/trunk/includes/header.html Modified: ignite/site/trunk/community/resources.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/community/resources.html?rev=1697531r1=1697530r2=1697531view=diff == --- ignite/site/trunk/community/resources.html (original) +++ ignite/site/trunk/community/resources.html Tue Aug 25 02:19:56 2015 @@ -111,6 +111,14 @@ under the License. /ul /section +section id=git class=page-section +h2Git Repositories/h2 +ul class=page-list +liIgnite Git: a href=https://git-wip-us.apache.org/repos/asf/ignite;https://git-wip-us.apache.org/repos/asf/ignite/a/li +liGitHub Mirror: a href=https://github.com/apache/ignite;https://github.com/apache/ignite/a/li +/ul +/section + section id=jira class=page-section h2Issue Tracking/h2 p Modified: ignite/site/trunk/includes/header.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/includes/header.html?rev=1697531r1=1697530r2=1697531view=diff == --- ignite/site/trunk/includes/header.html (original) +++ ignite/site/trunk/includes/header.html Tue Aug 25 02:19:56 2015 @@ -73,6 +73,7 @@ lia href=/community/resources.html#askAsk a Question/a/li lia href=/community/resources.html#stackoverflowStack Overflow/a/li lia href=/community/resources.html#mail-listsMailing Lists/a/li +lia href=/community/resources.html#gitGit Repos/a/li lia href=https://issues.apache.org/jira/browse/IGNITE; target=_blankIgnite Jira/a/li lia href=https://cwiki.apache.org/confluence/display/IGNITE/; target=_blankIgnite Wiki/a/li li class=lasta href=/community/resources.html#peoplePeople/a/li
