ignite git commit: IgniteCacheRandomOperationBenchmark: removed unnecessary output.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master e7547248b -> 422c9a832


IgniteCacheRandomOperationBenchmark: removed unnecessary output.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/422c9a83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/422c9a83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/422c9a83

Branch: refs/heads/master
Commit: 422c9a8320b4a11c64ab95311a9897fdb48e6ed6
Parents: e754724
Author: sboikov 
Authored: Tue Jul 26 16:25:50 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 16:25:50 2016 +0300

--
 .../yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/422c9a83/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
--
diff --git 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
index c2947ba..e62df45 100644
--- 
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
+++ 
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
@@ -885,8 +885,6 @@ public class IgniteCacheRandomOperationBenchmark extends 
IgniteAbstractBenchmark
 else {
 String sql = rendomizeSql();
 
-BenchmarkUtils.println(sql);
-
 sq = new SqlFieldsQuery(sql);
 }
 

ignite git commit: IGNITE-3349 .NET: Ignition.Start overload with a custom config file

[ptupitsyn]

Repository: ignite
Updated Branches:
  refs/heads/master 3af756d71 -> e7547248b


IGNITE-3349 .NET: Ignition.Start overload with a custom config file


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7547248
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7547248
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7547248

Branch: refs/heads/master
Commit: e7547248b077275ea2d7eb4bbd8382b054e95f2b
Parents: 3af756d
Author: Pavel Tupitsyn 
Authored: Tue Jul 26 15:33:39 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jul 26 15:33:39 2016 +0300

--
 .../Apache.Ignite.Core.Tests.csproj |  3 ++
 .../IgniteConfigurationSectionTest.cs   | 32 
 .../IgniteStartStopTest.cs  |  3 +-
 .../Apache.Ignite.Core.Tests/custom_app.config  | 34 +
 .../dotnet/Apache.Ignite.Core/Ignition.cs   | 40 +++-
 .../dotnet/Apache.Ignite/Config/Configurator.cs | 11 +++---
 6 files changed, 116 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7547248/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 5c10612..4e33a91 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -291,6 +291,9 @@
   
 
 
+
+  PreserveNewest
+
 
 
   PreserveNewest

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7547248/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs
index 29aea90..4e10a2b 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs
@@ -64,6 +64,38 @@ namespace Apache.Ignite.Core.Tests
 {
 Assert.IsTrue(ignite.Name.StartsWith("myGrid"));
 }
+
+using (var ignite = Ignition.StartFromApplicationConfiguration(
+"igniteConfiguration3", "custom_app.config"))
+{
+Assert.AreEqual("myGrid3", ignite.Name);
+}
+}
+
+/// 
+/// Tests the ignite start error.
+/// 
+[Test]
+public void TestIgniteStartError()
+{
+var ex = Assert.Throws(() =>
+
Ignition.StartFromApplicationConfiguration("igniteConfiguration111"));
+
+Assert.AreEqual("Could not find IgniteConfigurationSection with 
name 'igniteConfiguration111'", 
+ex.Message);
+
+
+ex = Assert.Throws(() =>
+
Ignition.StartFromApplicationConfiguration("igniteConfiguration", "somefile"));
+
+Assert.AreEqual("Specified config file does not exist: somefile", 
ex.Message);
+
+
+ex = Assert.Throws(() =>
+
Ignition.StartFromApplicationConfiguration("igniteConfiguration", 
"custom_app.config"));
+
+Assert.AreEqual("Could not find IgniteConfigurationSection with 
name 'igniteConfiguration' " +
+"in file 'custom_app.config'", ex.Message);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7547248/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
index 47212fc..b863308 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteStartStopTest.cs
@@ -125,6 +125,7 @@ namespace Apache.Ignite.Core.Tests
 
 Assert.AreSame(grid3, Ignition.GetIgnite(null));
 Assert.AreSame(grid3, Ignition.TryGetIgnite(null));
+Assert.AreSame(grid3, Ignition.TryGetIgnite());
 
 Assert.Throws(() => 
Ignition.GetIgnite("invalid_name"));
 Assert.IsNull(Ignition.TryGetIgnite("invalid_name"));
@@ -365,7 +366,7 @@ namespace Apache.Ignite.Core.Tests

[1/2] ignite git commit: IGNITE-3476 Node started within SpringCacheManager does not inject Spring resources

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3547 220d68b37 -> 3691079d2


IGNITE-3476 Node started within SpringCacheManager does not inject Spring 
resources


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a39770aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a39770aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a39770aa

Branch: refs/heads/ignite-3547
Commit: a39770aa48412fad57712a4cb580b028cb111eb9
Parents: 71ef652
Author: EdShangGG 
Authored: Tue Jul 26 12:46:05 2016 +0300
Committer: EdShangGG 
Committed: Tue Jul 26 12:46:05 2016 +0300

--
 .../ignite/cache/spring/SpringCacheManager.java |  17 ++-
 .../spring/SpringTransactionManager.java|  59 +
 .../test/java/config/spring-transactions.xml|   4 +-
 .../ignite/TestInjectionLifecycleBean.java  |  42 +++
 .../org/apache/ignite/spring-injection-test.xml |  43 +++
 .../SpringCacheManagerContextInjectionTest.java | 126 +++
 .../testsuites/IgniteSpringTestSuite.java   |   5 +
 ...gTransactionManagerContextInjectionTest.java | 125 ++
 8 files changed, 393 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a39770aa/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
--
diff --git 
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
 
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index 71b723f..6d1a9b6 100644
--- 
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ 
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteSpring;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
@@ -28,6 +29,8 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.jsr166.ConcurrentHashMap8;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cache.CacheManager;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 /**
  * Implementation of Spring cache abstraction based on Ignite cache.
@@ -133,7 +136,7 @@ import org.springframework.cache.CacheManager;
  * Ignite distribution, and all these nodes will participate
  * in caching the data.
  */
-public class SpringCacheManager implements CacheManager, InitializingBean {
+public class SpringCacheManager implements CacheManager, InitializingBean, 
ApplicationContextAware {
 /** Caches map. */
 private final ConcurrentMap caches = new 
ConcurrentHashMap8<>();
 
@@ -155,6 +158,14 @@ public class SpringCacheManager implements CacheManager, 
InitializingBean {
 /** Ignite instance. */
 private Ignite ignite;
 
+/** Spring context */
+private ApplicationContext springCtx;
+
+/** {@inheritDoc} */
+@Override public void setApplicationContext(ApplicationContext ctx) {
+this.springCtx = ctx;
+}
+
 /**
  * Gets configuration file path.
  *
@@ -257,9 +268,9 @@ public class SpringCacheManager implements CacheManager, 
InitializingBean {
 }
 
 if (cfgPath != null)
-ignite = Ignition.start(cfgPath);
+ignite = IgniteSpring.start(cfgPath, springCtx);
 else if (cfg != null)
-ignite = Ignition.start(cfg);
+ignite = IgniteSpring.start(cfg, springCtx);
 else
 ignite = Ignition.ignite(gridName);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/a39770aa/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
--
diff --git 
a/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
 
b/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
index d8d..32a7b43 100644
--- 
a/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
+++ 
b/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
@@ -21,12 +21,15 @@ import java.util.concurrent.TimeUnit;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.5.31' into ignite-3547

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-1.5.31' into ignite-3547


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3691079d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3691079d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3691079d

Branch: refs/heads/ignite-3547
Commit: 3691079d222543f15a410ac7fd837dd4cc1c9af1
Parents: 220d68b a39770a
Author: sboikov 
Authored: Tue Jul 26 14:31:16 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 14:31:16 2016 +0300

--
 .../ignite/cache/spring/SpringCacheManager.java |  17 ++-
 .../spring/SpringTransactionManager.java|  59 +
 .../test/java/config/spring-transactions.xml|   4 +-
 .../ignite/TestInjectionLifecycleBean.java  |  42 +++
 .../org/apache/ignite/spring-injection-test.xml |  43 +++
 .../SpringCacheManagerContextInjectionTest.java | 126 +++
 .../testsuites/IgniteSpringTestSuite.java   |   5 +
 ...gTransactionManagerContextInjectionTest.java | 125 ++
 8 files changed, 393 insertions(+), 28 deletions(-)
--

ignite git commit: ignite-3547

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3547 1fdd6e8f9 -> 220d68b37


ignite-3547


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/220d68b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/220d68b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/220d68b3

Branch: refs/heads/ignite-3547
Commit: 220d68b37e51c6b419b13c8a2ed8784e8fdd3241
Parents: 1fdd6e8
Author: sboikov 
Authored: Tue Jul 26 14:26:07 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 14:26:07 2016 +0300

--
 .../distributed/IgniteCacheMessageRecoveryIdleConnection.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/220d68b3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnection.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnection.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnection.java
index 618fe2a..f48da61 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnection.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnection.java
@@ -134,6 +134,9 @@ public class IgniteCacheMessageRecoveryIdleConnection 
extends GridCommonAbstract
 fut.get(10_000);
 }
 catch (IgniteException e) {
+log.error("Failed to execute update, will dump debug 
information" +
+" [err=" + e+ ", iter=" + iter + ']', e);
+
 List nodes = IgnitionEx.allGridsx();
 
 for (Ignite node : nodes)

[ignite] Git Push Summary

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11359 [deleted] 5ba058512

[5/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3300

[sboikov]

Merge remote-tracking branch 'remotes/origin/master' into ignite-3300

# Conflicts:
#   
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cea3589
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cea3589
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cea3589

Branch: refs/heads/ignite-3300
Commit: 9cea3589ab85c7b6222fb4720d55f1802a07d699
Parents: 54df53d 3af756d
Author: sboikov 
Authored: Tue Jul 26 13:25:19 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 13:25:19 2016 +0300

--
 modules/core/pom.xml|   6 +
 .../managers/communication/GridIoManager.java   |   2 +
 .../java/org/jetbrains/annotations/NotNull.java |  38 
 .../org/jetbrains/annotations/Nullable.java |  33 
 .../org/jetbrains/annotations/package-info.java |  27 ---
 .../processors/query/h2/IgniteH2Indexing.java   |  31 ++--
 .../cache/CacheIndexingOffheapCleanupTest.java  | 178 +++
 .../IgniteCacheWithIndexingTestSuite.java   |   2 +
 .../Apache.Ignite.AspNet.csproj |   1 +
 .../dotnet/Apache.Ignite.AspNet/Package-Info.cs |  26 +++
 .../Apache.Ignite.Core.csproj   |   6 +
 .../Cache/Affinity/AffinityFunctionBase.cs  | 139 ---
 .../Configuration/Package-Info.cs   |  26 +++
 .../Discovery/Package-Info.cs   |  26 +++
 .../Discovery/Tcp/Multicast/Package-Info.cs |  26 +++
 .../Discovery/Tcp/Package-Info.cs   |  26 +++
 .../Discovery/Tcp/Static/Package-Info.cs|  26 +++
 .../Apache.Ignite.Core/Interop/Package-Info.cs  |  26 +++
 .../Apache.Ignite.Linq.csproj   |   1 +
 .../dotnet/Apache.Ignite.Linq/Package-Info.cs   |  26 +++
 modules/platforms/dotnet/Apache.Ignite.dxg  |   4 +-
 parent/pom.xml  |   1 +
 22 files changed, 423 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9cea3589/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
--
diff --cc 
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
index 96e8551,5cdd744..a264a2f
--- 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@@ -18,9 -18,9 +18,10 @@@
  package org.apache.ignite.testsuites;
  
  import junit.framework.TestSuite;
 +import 
org.apache.ignite.internal.processors.cache.CacheBinaryKeyConcurrentQueryTest;
  import org.apache.ignite.internal.processors.cache.CacheConfigurationP2PTest;
  import org.apache.ignite.internal.processors.cache.CacheIndexStreamerTest;
+ import 
org.apache.ignite.internal.processors.cache.CacheIndexingOffheapCleanupTest;
  import 
org.apache.ignite.internal.processors.cache.CacheOperationsWithExpirationTest;
  import 
org.apache.ignite.internal.processors.cache.CacheRandomOperationsMultithreadedTest;
  import 
org.apache.ignite.internal.processors.cache.GridCacheOffHeapAndSwapSelfTest;
@@@ -77,7 -77,7 +78,8 @@@ public class IgniteCacheWithIndexingTes
  suite.addTestSuite(CacheRandomOperationsMultithreadedTest.class);
  suite.addTestSuite(IgniteCacheStarvationOnRebalanceTest.class);
  suite.addTestSuite(CacheOperationsWithExpirationTest.class);
 +suite.addTestSuite(CacheBinaryKeyConcurrentQueryTest.class);
+ suite.addTestSuite(CacheIndexingOffheapCleanupTest.class);
  
  return suite;
  }

[3/5] ignite git commit: ignite-1232 Stop idx pool on node stop

[sboikov]

ignite-1232 Stop idx pool on node stop


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb884ec3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb884ec3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb884ec3

Branch: refs/heads/ignite-3300
Commit: fb884ec37cc362764a84c3d4d8feb69648346964
Parents: e70adde
Author: sboikov 
Authored: Tue Jul 26 11:13:52 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 11:13:52 2016 +0300

--
 .../ignite/internal/managers/communication/GridIoManager.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb884ec3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 99cb7f4..3fdda30 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -559,6 +559,8 @@ public class GridIoManager extends 
GridManagerAdapter

[1/5] ignite git commit: ignite-3560 Offheap resources cleanup on H2 table destroy.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3300 54df53d00 -> 9cea3589a


ignite-3560 Offheap resources cleanup on H2 table destroy.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44cabd84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44cabd84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44cabd84

Branch: refs/heads/ignite-3300
Commit: 44cabd84152b5d95b6c906eb43763ab7d72f
Parents: 856b536
Author: sboikov 
Authored: Tue Jul 26 10:41:50 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 10:41:50 2016 +0300

--
 .../processors/query/h2/IgniteH2Indexing.java   |  31 ++--
 .../cache/CacheIndexingOffheapCleanupTest.java  | 178 +++
 .../IgniteCacheWithIndexingTestSuite.java   |   2 +
 3 files changed, 196 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/44cabd84/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 535881e..e1b21e2 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -735,8 +735,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 U.close(stmt, log);
 }
 
-if (tbl.luceneIdx != null)
-U.closeQuiet(tbl.luceneIdx);
+tbl.onDrop();
 
 tbl.schema.tbls.remove(tbl.name());
 }
@@ -1816,12 +1815,8 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 
 //unregisterMBean(); TODO 
https://issues.apache.org/jira/browse/IGNITE-2139
 
-for (Schema schema : schemas.values()) {
-for (TableDescriptor desc : schema.tbls.values()) {
-if (desc.luceneIdx != null)
-U.closeQuiet(desc.luceneIdx);
-}
-}
+for (Schema schema : schemas.values())
+schema.onDrop();
 
 for (Connection c : conns)
 U.close(c, log);
@@ -2436,6 +2431,17 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 }
 
 /**
+ *
+ */
+void onDrop() {
+dataTables.remove(tbl.identifier(), tbl);
+
+tbl.destroy();
+
+U.closeQuiet(luceneIdx);
+}
+
+/**
  * @param tbl Table.
  * @param idxName Index name.
  * @param cols Columns.
@@ -2668,13 +2674,8 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
  * Called after the schema was dropped.
  */
 public void onDrop() {
-for (TableDescriptor tblDesc : tbls.values()) {
-GridH2Table tbl = tblDesc.tbl;
-
-dataTables.remove(tbl.identifier(), tbl);
-
-tbl.destroy();
-}
+for (TableDescriptor tblDesc : tbls.values())
+tblDesc.onDrop();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/44cabd84/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
new file mode 100644
index 000..3d7e30a
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
@@ -0,0 +1,178 @@
+/*
+ * 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 

[4/5] ignite git commit: IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead.

[sboikov]

IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3af756d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3af756d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3af756d7

Branch: refs/heads/ignite-3300
Commit: 3af756d71a68ad195d48bcced50ea92ba3078fad
Parents: fb884ec
Author: Jens Hoffmann 
Authored: Tue Jul 26 13:04:38 2016 +0300
Committer: Anton Vinogradov 
Committed: Tue Jul 26 13:04:38 2016 +0300

--
 modules/core/pom.xml|  6 
 .../java/org/jetbrains/annotations/NotNull.java | 38 
 .../org/jetbrains/annotations/Nullable.java | 33 -
 .../org/jetbrains/annotations/package-info.java | 27 --
 parent/pom.xml  |  1 +
 5 files changed, 7 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 5e32caf..7eefa4a 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -69,6 +69,12 @@
 
 
 
+org.jetbrains
+annotations
+${jetbrains.annotations.version}
+
+
+
 mx4j
 mx4j-tools
 3.0.1

http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
--
diff --git a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java 
b/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
deleted file mode 100644
index 66c66f3..000
--- a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed 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.jetbrains.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An element annotated with NotNull claims null value is 
forbidden
- * to return (for methods), pass to (parameters) and hold (local variables and 
fields).
- * Apart from documentation purposes this annotation is intended to be used by 
static analysis tools
- * to validate against probable runtime errors and element contract violations.
- *
- * @author max
- */
-@Documented
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, 
ElementType.LOCAL_VARIABLE})
-public @interface NotNull {
-String value() default "";
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
--
diff --git a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java 
b/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
deleted file mode 100644
index defd5d8..000
--- a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed 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.jetbrains.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * An element annotated with Nullable claims null value is 
perfectly valid
- * to return (for methods), pass to (parameters) and hold (local variables and 
fields).
- * 

[2/5] ignite git commit: IGNITE-3509 .NET: Add missing package-info, include LINQ and AspNet in doxygen

[sboikov]

IGNITE-3509 .NET: Add missing package-info, include LINQ and AspNet in doxygen


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e70adde7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e70adde7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e70adde7

Branch: refs/heads/ignite-3300
Commit: e70adde719009e99e56bb4398c6fa3e43cf6b2ca
Parents: 44cabd8
Author: Pavel Tupitsyn 
Authored: Tue Jul 26 10:47:49 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jul 26 10:47:49 2016 +0300

--
 .../Apache.Ignite.AspNet.csproj |   1 +
 .../dotnet/Apache.Ignite.AspNet/Package-Info.cs |  26 
 .../Apache.Ignite.Core.csproj   |   6 +
 .../Cache/Affinity/AffinityFunctionBase.cs  | 139 ---
 .../Configuration/Package-Info.cs   |  26 
 .../Discovery/Package-Info.cs   |  26 
 .../Discovery/Tcp/Multicast/Package-Info.cs |  26 
 .../Discovery/Tcp/Package-Info.cs   |  26 
 .../Discovery/Tcp/Static/Package-Info.cs|  26 
 .../Apache.Ignite.Core/Interop/Package-Info.cs  |  26 
 .../Apache.Ignite.Linq.csproj   |   1 +
 .../dotnet/Apache.Ignite.Linq/Package-Info.cs   |  26 
 modules/platforms/dotnet/Apache.Ignite.dxg  |   4 +-
 13 files changed, 218 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj 
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
index b18119e..0c273e0 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
@@ -48,6 +48,7 @@
   
 
 
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs 
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
new file mode 100644
index 000..5e74d3c
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
@@ -0,0 +1,26 @@
+/*
+* 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.
+*/
+
+#pragma warning disable 1587   // invalid XML comment
+
+/// 
+/// Ignite ASP.NET integration.
+/// 
+namespace Apache.Ignite.AspNet
+{
+// No-op.
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/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 2e374e5..59bf090 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -85,6 +85,11 @@
   
 
 
+
+
+
+
+
 
 
 
@@ -427,6 +432,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
deleted file mode 100644
index ce2e5e1..000
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * 

ignite git commit: ignite-3300

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3300 93899a01c -> 54df53d00


ignite-3300


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54df53d0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54df53d0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54df53d0

Branch: refs/heads/ignite-3300
Commit: 54df53d000af3f025903e70a8045e6cb6da14398
Parents: 93899a0
Author: sboikov 
Authored: Tue Jul 26 13:23:18 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 13:23:18 2016 +0300

--
 .../CacheBinaryKeyConcurrentQueryTest.java  | 298 +++
 .../IgniteCacheWithIndexingTestSuite.java   |   2 +
 2 files changed, 300 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/54df53d0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
new file mode 100644
index 000..e2de281
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
@@ -0,0 +1,298 @@
+/*
+ * 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.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheEntry;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.F;
+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.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ *
+ */
+@SuppressWarnings("unchecked")
+public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES = 3;
+
+/** */
+private static final int KEYS = 1000;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+cfg.setMarshaller(null);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGridsMultiThreaded(NODES);
+}
+
+/** {@inheritDoc} */
+   

ignite git commit: IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead.

[av]

Repository: ignite
Updated Branches:
  refs/heads/master fb884ec37 -> 3af756d71


IGNITE-3323 Get rid of copypasted JB annotations, use dependency instead.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3af756d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3af756d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3af756d7

Branch: refs/heads/master
Commit: 3af756d71a68ad195d48bcced50ea92ba3078fad
Parents: fb884ec
Author: Jens Hoffmann 
Authored: Tue Jul 26 13:04:38 2016 +0300
Committer: Anton Vinogradov 
Committed: Tue Jul 26 13:04:38 2016 +0300

--
 modules/core/pom.xml|  6 
 .../java/org/jetbrains/annotations/NotNull.java | 38 
 .../org/jetbrains/annotations/Nullable.java | 33 -
 .../org/jetbrains/annotations/package-info.java | 27 --
 parent/pom.xml  |  1 +
 5 files changed, 7 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/pom.xml
--
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 5e32caf..7eefa4a 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -69,6 +69,12 @@
 
 
 
+org.jetbrains
+annotations
+${jetbrains.annotations.version}
+
+
+
 mx4j
 mx4j-tools
 3.0.1

http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
--
diff --git a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java 
b/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
deleted file mode 100644
index 66c66f3..000
--- a/modules/core/src/main/java/org/jetbrains/annotations/NotNull.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed 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.jetbrains.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An element annotated with NotNull claims null value is 
forbidden
- * to return (for methods), pass to (parameters) and hold (local variables and 
fields).
- * Apart from documentation purposes this annotation is intended to be used by 
static analysis tools
- * to validate against probable runtime errors and element contract violations.
- *
- * @author max
- */
-@Documented
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, 
ElementType.LOCAL_VARIABLE})
-public @interface NotNull {
-String value() default "";
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/3af756d7/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
--
diff --git a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java 
b/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
deleted file mode 100644
index defd5d8..000
--- a/modules/core/src/main/java/org/jetbrains/annotations/Nullable.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed 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.jetbrains.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * An element annotated with Nullable claims null value is 
perfectly valid
- * to return (for 

ignite git commit: GG-11359 WIP: Hardcoded distributed join flag.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11359 [created] 5ba058512


GG-11359 WIP: Hardcoded distributed join flag.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5ba05851
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5ba05851
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5ba05851

Branch: refs/heads/ignite-gg-11359
Commit: 5ba058512867058fe0132fb9f2c8959a78d9cbfc
Parents: fb884ec
Author: Alexey Kuznetsov 
Authored: Tue Jul 26 16:53:55 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Jul 26 16:53:55 2016 +0700

--
 .../java/org/apache/ignite/internal/visor/query/VisorQueryJob.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ba05851/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index 0f2f82e..c40ce5c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -139,6 +139,7 @@ public class VisorQueryJob extends VisorJob

ignite git commit: IGNITE-3443 WIP

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3443 [created] 8ef730c88


IGNITE-3443 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ef730c8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ef730c8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ef730c8

Branch: refs/heads/ignite-3443
Commit: 8ef730c882e735e797086de0002194fdb62f4446
Parents: 58d0544
Author: Alexey Kuznetsov 
Authored: Tue Jul 26 16:36:15 2016 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Jul 26 16:36:15 2016 +0700

--
 .../ignite/cache/query/QueryMetricsEx.java  |  35 +
 .../processors/cache/IgniteCacheProxy.java  |  11 +-
 .../processors/cache/query/CacheQueryType.java  |   7 +-
 .../cache/query/GridCacheQueryAdapter.java  |   6 +-
 .../query/GridCacheQueryFutureAdapter.java  |  17 ++-
 .../cache/query/GridCacheQueryManager.java  |  16 +-
 .../query/GridCacheQueryMetricsAdapter.java |   7 +-
 .../processors/query/GridQueryProcessor.java| 145 ++-
 8 files changed, 161 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ef730c8/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetricsEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetricsEx.java 
b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetricsEx.java
new file mode 100644
index 000..085dea5
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryMetricsEx.java
@@ -0,0 +1,35 @@
+/*
+ * 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.cache.query;
+
+import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
+
+/**
+ * Per individual query metrics.
+ */
+public interface QueryMetricsEx extends QueryMetrics {
+/**
+ * @return String representation of query.
+ */
+public String query();
+
+/**
+ * @return Query type.
+ */
+public CacheQueryType queryType();
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ef730c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 0005530..9e7d0e1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -66,6 +66,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.query.CacheQuery;
 import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;
+import org.apache.ignite.internal.processors.cache.query.CacheQueryType;
 import org.apache.ignite.internal.processors.query.GridQueryProcessor;
 import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
 import org.apache.ignite.internal.util.GridEmptyIterator;
@@ -241,6 +242,7 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter gate = this.gate;
 
@@ -268,6 +270,7 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter gate = this.gate;
 
@@ -485,8 +488,8 @@ public class IgniteCacheProxy extends 
AsyncSupportAdapter

ignite git commit: ignite-1232 Stop idx pool on node stop

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master e70adde71 -> fb884ec37


ignite-1232 Stop idx pool on node stop


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb884ec3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb884ec3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb884ec3

Branch: refs/heads/master
Commit: fb884ec37cc362764a84c3d4d8feb69648346964
Parents: e70adde
Author: sboikov 
Authored: Tue Jul 26 11:13:52 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 11:13:52 2016 +0300

--
 .../ignite/internal/managers/communication/GridIoManager.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb884ec3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 99cb7f4..3fdda30 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -559,6 +559,8 @@ public class GridIoManager extends 
GridManagerAdapter

[ignite] Git Push Summary

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1232 [deleted] 606f401b9

ignite git commit: IGNITE-3509 .NET: Add missing package-info, include LINQ and AspNet in doxygen

[ptupitsyn]

Repository: ignite
Updated Branches:
  refs/heads/master 44cabd841 -> e70adde71


IGNITE-3509 .NET: Add missing package-info, include LINQ and AspNet in doxygen


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e70adde7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e70adde7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e70adde7

Branch: refs/heads/master
Commit: e70adde719009e99e56bb4398c6fa3e43cf6b2ca
Parents: 44cabd8
Author: Pavel Tupitsyn 
Authored: Tue Jul 26 10:47:49 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jul 26 10:47:49 2016 +0300

--
 .../Apache.Ignite.AspNet.csproj |   1 +
 .../dotnet/Apache.Ignite.AspNet/Package-Info.cs |  26 
 .../Apache.Ignite.Core.csproj   |   6 +
 .../Cache/Affinity/AffinityFunctionBase.cs  | 139 ---
 .../Configuration/Package-Info.cs   |  26 
 .../Discovery/Package-Info.cs   |  26 
 .../Discovery/Tcp/Multicast/Package-Info.cs |  26 
 .../Discovery/Tcp/Package-Info.cs   |  26 
 .../Discovery/Tcp/Static/Package-Info.cs|  26 
 .../Apache.Ignite.Core/Interop/Package-Info.cs  |  26 
 .../Apache.Ignite.Linq.csproj   |   1 +
 .../dotnet/Apache.Ignite.Linq/Package-Info.cs   |  26 
 modules/platforms/dotnet/Apache.Ignite.dxg  |   4 +-
 13 files changed, 218 insertions(+), 141 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj 
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
index b18119e..0c273e0 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
@@ -48,6 +48,7 @@
   
 
 
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs 
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
new file mode 100644
index 000..5e74d3c
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Package-Info.cs
@@ -0,0 +1,26 @@
+/*
+* 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.
+*/
+
+#pragma warning disable 1587   // invalid XML comment
+
+/// 
+/// Ignite ASP.NET integration.
+/// 
+namespace Apache.Ignite.AspNet
+{
+// No-op.
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/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 2e374e5..59bf090 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -85,6 +85,11 @@
   
 
 
+
+
+
+
+
 
 
 
@@ -427,6 +432,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e70adde7/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
deleted file mode 100644
index ce2e5e1..000
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Affinity/AffinityFunctionBase.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- 

[ignite] Git Push Summary

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3560 [deleted] 8d55120cb

ignite git commit: ignite-3560 Offheap resources cleanup on H2 table destroy.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master 856b536db -> 44cabd841


ignite-3560 Offheap resources cleanup on H2 table destroy.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44cabd84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44cabd84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44cabd84

Branch: refs/heads/master
Commit: 44cabd84152b5d95b6c906eb43763ab7d72f
Parents: 856b536
Author: sboikov 
Authored: Tue Jul 26 10:41:50 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 10:41:50 2016 +0300

--
 .../processors/query/h2/IgniteH2Indexing.java   |  31 ++--
 .../cache/CacheIndexingOffheapCleanupTest.java  | 178 +++
 .../IgniteCacheWithIndexingTestSuite.java   |   2 +
 3 files changed, 196 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/44cabd84/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 535881e..e1b21e2 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -735,8 +735,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
 U.close(stmt, log);
 }
 
-if (tbl.luceneIdx != null)
-U.closeQuiet(tbl.luceneIdx);
+tbl.onDrop();
 
 tbl.schema.tbls.remove(tbl.name());
 }
@@ -1816,12 +1815,8 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 
 //unregisterMBean(); TODO 
https://issues.apache.org/jira/browse/IGNITE-2139
 
-for (Schema schema : schemas.values()) {
-for (TableDescriptor desc : schema.tbls.values()) {
-if (desc.luceneIdx != null)
-U.closeQuiet(desc.luceneIdx);
-}
-}
+for (Schema schema : schemas.values())
+schema.onDrop();
 
 for (Connection c : conns)
 U.close(c, log);
@@ -2436,6 +2431,17 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 }
 
 /**
+ *
+ */
+void onDrop() {
+dataTables.remove(tbl.identifier(), tbl);
+
+tbl.destroy();
+
+U.closeQuiet(luceneIdx);
+}
+
+/**
  * @param tbl Table.
  * @param idxName Index name.
  * @param cols Columns.
@@ -2668,13 +2674,8 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
  * Called after the schema was dropped.
  */
 public void onDrop() {
-for (TableDescriptor tblDesc : tbls.values()) {
-GridH2Table tbl = tblDesc.tbl;
-
-dataTables.remove(tbl.identifier(), tbl);
-
-tbl.destroy();
-}
+for (TableDescriptor tblDesc : tbls.values())
+tblDesc.onDrop();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/44cabd84/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
new file mode 100644
index 000..3d7e30a
--- /dev/null
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexingOffheapCleanupTest.java
@@ -0,0 +1,178 @@
+/*
+ * 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 

[1/3] ignite git commit: IGNITE-3561 .NET: DistributedJoins property in SqlQuery & SqlFieldsQuery

[sergi]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3560 3180190e4 -> 8d55120cb


IGNITE-3561 .NET: DistributedJoins property in SqlQuery & SqlFieldsQuery


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/856b536d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/856b536d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/856b536d

Branch: refs/heads/ignite-3560
Commit: 856b536db66edf9e7e6fc1b96da55a0e846c70c3
Parents: 37195a0
Author: Pavel Tupitsyn 
Authored: Mon Jul 25 18:54:11 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jul 25 18:54:11 2016 +0300

--
 .../org/apache/ignite/cache/query/SqlQuery.java |   3 +
 .../platform/cache/PlatformCache.java   |  10 +-
 .../core/include/ignite/cache/query/query_sql.h |   2 +
 .../ignite/cache/query/query_sql_fields.h   |   3 +
 .../Cache/Query/CacheLinqTest.cs|  20 +-
 .../Cache/Query/CacheQueriesTest.cs | 252 +--
 .../Cache/Query/SqlFieldsQuery.cs   |  27 +-
 .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs  |  13 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs   |  39 ++-
 .../Impl/CacheFieldsQueryExecutor.cs|  63 -
 .../Apache.Ignite.Linq/Impl/CacheQueryable.cs   |  11 +-
 .../Impl/CacheQueryableBase.cs  |   7 +-
 13 files changed, 257 insertions(+), 196 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
index e05ff13..f809b8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
@@ -154,6 +154,9 @@ public final class SqlQuery extends 
Query> {
 /**
  * Specify if distributed joins are enabled for this query.
  *
+ * When disabled, join results will only contain colocated data (joins 
work locally).
+ * When enabled, joins work as expected, no matter how the data is 
distributed.
+ *
  * @param distributedJoins Distributed joins enabled.
  * @return {@code this} For chaining.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 9bf330c..d572e8b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -943,7 +943,9 @@ public class PlatformCache extends PlatformAbstractTarget {
 
 Object[] args = readQueryArgs(reader);
 
-return new SqlQuery(typ, 
sql).setPageSize(pageSize).setArgs(args).setLocal(loc);
+boolean distrJoins = reader.readBoolean();
+
+return new SqlQuery(typ, 
sql).setPageSize(pageSize).setArgs(args).setLocal(loc).setDistributedJoins(distrJoins);
 }
 
 /**
@@ -956,7 +958,11 @@ public class PlatformCache extends PlatformAbstractTarget {
 
 Object[] args = readQueryArgs(reader);
 
-return new 
SqlFieldsQuery(sql).setPageSize(pageSize).setArgs(args).setLocal(loc);
+boolean distrJoins = reader.readBoolean();
+boolean enforceJoinOrder = reader.readBoolean();
+
+return new 
SqlFieldsQuery(sql).setPageSize(pageSize).setArgs(args).setLocal(loc)
+
.setDistributedJoins(distrJoins).setEnforceJoinOrder(enforceJoinOrder);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
--
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h 
b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
index f7a00fa..cb7a739 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
@@ -228,6 +228,8 @@ namespace ignite
 
 for (std::vector::const_iterator it = 
args.begin(); it != args.end(); 

[3/3] ignite git commit: ignite-3560 - minor improvements

[sergi]

ignite-3560 - minor improvements


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d55120c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d55120c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d55120c

Branch: refs/heads/ignite-3560
Commit: 8d55120cb62628a1650c3633ebb6b405378e1bf6
Parents: 6d59756
Author: Sergi Vladykin 
Authored: Tue Jul 26 10:36:21 2016 +0300
Committer: Sergi Vladykin 
Committed: Tue Jul 26 10:36:21 2016 +0300

--
 .../ignite/internal/processors/query/h2/IgniteH2Indexing.java  | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8d55120c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 5522fee..e1b21e2 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1815,10 +1815,8 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 
 //unregisterMBean(); TODO 
https://issues.apache.org/jira/browse/IGNITE-2139
 
-for (Schema schema : schemas.values()) {
-for (TableDescriptor desc : schema.tbls.values())
-desc.onDrop();
-}
+for (Schema schema : schemas.values())
+schema.onDrop();
 
 for (Connection c : conns)
 U.close(c, log);

[2/3] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-3560

[sergi]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into 
ignite-3560


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d597566
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d597566
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d597566

Branch: refs/heads/ignite-3560
Commit: 6d597566a17a695ba7708a53971ec5a8b1a4a8bd
Parents: 3180190 856b536
Author: Sergi Vladykin 
Authored: Tue Jul 26 10:25:38 2016 +0300
Committer: Sergi Vladykin 
Committed: Tue Jul 26 10:25:38 2016 +0300

--
 .../org/apache/ignite/cache/query/SqlQuery.java |   3 +
 .../platform/cache/PlatformCache.java   |  10 +-
 .../core/include/ignite/cache/query/query_sql.h |   2 +
 .../ignite/cache/query/query_sql_fields.h   |   3 +
 .../Cache/Query/CacheLinqTest.cs|  20 +-
 .../Cache/Query/CacheQueriesTest.cs | 252 +--
 .../Cache/Query/SqlFieldsQuery.cs   |  27 +-
 .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs  |  13 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs   |  39 ++-
 .../Impl/CacheFieldsQueryExecutor.cs|  63 -
 .../Apache.Ignite.Linq/Impl/CacheQueryable.cs   |  11 +-
 .../Impl/CacheQueryableBase.cs  |   7 +-
 13 files changed, 257 insertions(+), 196 deletions(-)
--

[14/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3300

[sboikov]

Merge remote-tracking branch 'remotes/origin/master' into ignite-3300


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93899a01
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93899a01
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93899a01

Branch: refs/heads/ignite-3300
Commit: 93899a01c0242691c5e9bc9f9c40626bd075857f
Parents: 7ca0d8d 856b536
Author: sboikov 
Authored: Tue Jul 26 09:54:54 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 09:54:54 2016 +0300

--
 .../jdbc2/JdbcDistributedJoinsQueryTest.java| 319 ++
 .../JettyRestProcessorAbstractSelfTest.java | 121 ++-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../org/apache/ignite/IgniteJdbcDriver.java |  14 +-
 .../org/apache/ignite/cache/query/SqlQuery.java |   3 +
 .../ignite/internal/jdbc2/JdbcConnection.java   |  12 +
 .../ignite/internal/jdbc2/JdbcQueryTask.java|   9 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java|   4 +-
 .../ignite/internal/jdbc2/JdbcStatement.java|   2 +-
 .../internal/processors/igfs/IgfsImpl.java  |  12 +-
 .../processors/igfs/IgfsMetaManager.java| 115 ---
 .../igfs/IgfsSecondaryFileSystemImpl.java   |  15 +-
 .../igfs/IgfsSecondaryFileSystemV2.java |  40 +++
 .../platform/cache/PlatformCache.java   |  10 +-
 .../handlers/query/QueryCommandHandler.java |   4 +
 .../rest/request/RestQueryRequest.java  |  17 +
 .../processors/igfs/IgfsAbstractSelfTest.java   | 111 ++-
 .../igfs/IgfsDualAbstractSelfTest.java  |  34 ++
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  15 +
 .../igfs/UniversalFileSystemAdapter.java|  11 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  16 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |   8 +
 .../core/include/ignite/cache/query/query_sql.h |   2 +
 .../ignite/cache/query/query_sql_fields.h   |   3 +
 .../Binary/BinaryBuilderSelfTest.cs | 325 +++
 .../Cache/Query/CacheLinqTest.cs|  20 +-
 .../Cache/Query/CacheQueriesTest.cs | 252 --
 .../Binary/IBinaryObjectBuilder.cs  |   2 +-
 .../Cache/Query/SqlFieldsQuery.cs   |  27 +-
 .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs  |  13 +
 .../Impl/Binary/BinaryObjectBuilder.cs  |  16 +-
 .../Impl/Binary/BinaryWriter.cs | 133 +---
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs   |  39 ++-
 .../Impl/CacheFieldsQueryExecutor.cs|  63 +++-
 .../Apache.Ignite.Linq/Impl/CacheQueryable.cs   |  11 +-
 .../Impl/CacheQueryableBase.cs  |   7 +-
 .../http/jetty/GridJettyRestHandler.java|   5 +
 .../commands/cache/VisorCacheStopCommand.scala  |   5 +-
 .../internal/websession/WebSessionSelfTest.java |   8 +-
 40 files changed, 1424 insertions(+), 404 deletions(-)
--

[08/14] ignite git commit: ignite-3563 Support distributedJoins flag in JDBC driver

[sboikov]

ignite-3563 Support distributedJoins flag in JDBC driver


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/763f0676
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/763f0676
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/763f0676

Branch: refs/heads/ignite-3300
Commit: 763f0676b4cef169f41f648b6e41b8bcb16203d9
Parents: fd50502
Author: agura 
Authored: Mon Jul 25 12:31:24 2016 +0300
Committer: agura 
Committed: Mon Jul 25 15:16:44 2016 +0300

--
 .../jdbc2/JdbcDistributedJoinsQueryTest.java| 319 +++
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../org/apache/ignite/IgniteJdbcDriver.java |  14 +-
 .../ignite/internal/jdbc2/JdbcConnection.java   |  12 +
 .../ignite/internal/jdbc2/JdbcQueryTask.java|   9 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java|   4 +-
 .../ignite/internal/jdbc2/JdbcStatement.java|   2 +-
 7 files changed, 357 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/763f0676/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
new file mode 100644
index 000..53bfa73
--- /dev/null
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -0,0 +1,319 @@
+/*
+ * 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.jdbc2;
+
+import java.io.Serializable;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+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.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ * Tests for complex queries with distributed joins enabled (joins, etc.).
+ */
+public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
+/** IP finder. */
+private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
+/** JDBC URL. */
+private static final String BASE_URL = CFG_URL_PREFIX + 
"distributedJoins=true@modules/clients/src/test/config/jdbc-config.xml";
+
+/** Statement. */
+private Statement stmt;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration cache = defaultCacheConfiguration();
+
+cache.setCacheMode(PARTITIONED);
+cache.setBackups(1);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAtomicityMode(TRANSACTIONAL);
+cache.setIndexedTypes(String.class, Organization.class, String.class, 
Person.class);
+
+cfg.setCacheConfiguration(cache);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(IP_FINDER);
+
+cfg.setDiscoverySpi(disco);
+
+cfg.setConnectorConfiguration(new 

[04/14] ignite git commit: IGNITE-2344 WebSessionFilter doesn't support session ID renewal

[sboikov]

IGNITE-2344 WebSessionFilter doesn't support session ID renewal


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58d05444
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58d05444
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58d05444

Branch: refs/heads/ignite-3300
Commit: 58d054443d48f2ef48e935bd4e5ce24b5bb352ed
Parents: df1490e
Author: samaitra 
Authored: Mon Jul 25 10:54:35 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Jul 25 10:54:35 2016 +0300

--
 .../ignite/internal/websession/WebSessionSelfTest.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/58d05444/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
--
diff --git 
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
 
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 0ab1130..1a8c328 100644
--- 
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ 
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -854,7 +854,7 @@ public class WebSessionSelfTest extends 
GridCommonAbstractTest {
 HashLoginService hashLoginService = new HashLoginService();
 hashLoginService.setName("Test Realm");
 createRealm();
-hashLoginService.setConfig("realm.properties");
+hashLoginService.setConfig("/tmp/realm.properties");
 ctx.getSecurityHandler().setLoginService(hashLoginService);
 
 srv.setHandler(ctx);
@@ -884,14 +884,14 @@ public class WebSessionSelfTest extends 
GridCommonAbstractTest {
 private void stopServerWithLoginService(@Nullable Server srv) throws 
Exception{
 if (srv != null){
 srv.stop();
-File realmFile = new File("realm.properties");
+File realmFile = new File("/tmp/realm.properties");
 realmFile.delete();
 }
 }
 
 /** Creates a realm file to store test user credentials */
 private void createRealm() throws Exception{
-File realmFile = new File("realm.properties");
+File realmFile = new File("/tmp/realm.properties");
 FileWriter fileWriter = new FileWriter(realmFile);
 fileWriter.append("admin:admin");
 fileWriter.flush();
@@ -1128,7 +1128,7 @@ public class WebSessionSelfTest extends 
GridCommonAbstractTest {
 try {
 req.login("admin", "admin");
 } catch (Exception e) {
-X.printerrln("Login failed.");
+X.printerrln("Login failed due to exception.", e);
 }
 
 HttpSession session = req.getSession();

[11/14] ignite git commit: IGNITE-3504 .NET: Fix IBinaryObjectBuilder setter methods

[sboikov]

IGNITE-3504 .NET: Fix IBinaryObjectBuilder setter methods


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/332c8c2f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/332c8c2f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/332c8c2f

Branch: refs/heads/ignite-3300
Commit: 332c8c2f118226f3cd3c4dc1fa5564dd1d41d19c
Parents: 855281e
Author: Pavel Tupitsyn 
Authored: Mon Jul 25 16:12:51 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jul 25 16:12:51 2016 +0300

--
 .../Binary/BinaryBuilderSelfTest.cs | 325 +++
 .../Binary/IBinaryObjectBuilder.cs  |   2 +-
 .../Impl/Binary/BinaryObjectBuilder.cs  |  16 +-
 .../Impl/Binary/BinaryWriter.cs | 133 +---
 4 files changed, 345 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/332c8c2f/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
index 40ecc1e..80788a6 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs
@@ -595,7 +595,8 @@ namespace Apache.Ignite.Core.Tests.Binary
 [Test]
 public void TestPrimitiveFields()
 {
-IBinaryObject binObj = 
_grid.GetBinary().GetBuilder(typeof(Primitives))
+// Generic SetField method.
+var binObj = _grid.GetBinary().GetBuilder(typeof(Primitives))
 .SetField("fByte", 1)
 .SetField("fBool", true)
 .SetField("fShort", 2)
@@ -604,16 +605,73 @@ namespace Apache.Ignite.Core.Tests.Binary
 .SetField("fLong", 4)
 .SetField("fFloat", 5)
 .SetField("fDouble", 6)
+.SetField("fDecimal", 7.7m)
 .SetHashCode(100)
 .Build();
 
+CheckPrimitiveFields1(binObj);
+
+// Specific setter methods.
+binObj = _grid.GetBinary().GetBuilder(typeof(Primitives))
+.SetByteField("fByte", 1)
+.SetBooleanField("fBool", true)
+.SetShortField("fShort", 2)
+.SetCharField("fChar", 'a')
+.SetIntField("fInt", 3)
+.SetLongField("fLong", 4)
+.SetFloatField("fFloat", 5)
+.SetDoubleField("fDouble", 6)
+.SetDecimalField("fDecimal", 7.7m)
+.SetHashCode(100)
+.Build();
+
+CheckPrimitiveFields1(binObj);
+
+// Overwrite with generic methods.
+binObj = binObj.ToBuilder()
+.SetField("fByte", 7)
+.SetField("fBool", false)
+.SetField("fShort", 8)
+.SetField("fChar", 'b')
+.SetField("fInt", 9)
+.SetField("fLong", 10)
+.SetField("fFloat", 11)
+.SetField("fDouble", 12)
+.SetField("fDecimal", 13.13m)
+.SetHashCode(200)
+.Build();
+
+CheckPrimitiveFields2(binObj);
+
+// Overwrite with specific methods.
+binObj = binObj.ToBuilder()
+.SetByteField("fByte", 7)
+.SetBooleanField("fBool", false)
+.SetShortField("fShort", 8)
+.SetCharField("fChar", 'b')
+.SetIntField("fInt", 9)
+.SetLongField("fLong", 10)
+.SetFloatField("fFloat", 11)
+.SetDoubleField("fDouble", 12)
+.SetDecimalField("fDecimal", 13.13m)
+.SetHashCode(200)
+.Build();
+
+CheckPrimitiveFields2(binObj);
+}
+
+/// 
+/// Checks the primitive fields values.
+/// 
+private static void CheckPrimitiveFields1(IBinaryObject binObj)
+{
 Assert.AreEqual(100, binObj.GetHashCode());
 
 IBinaryType meta = binObj.GetBinaryType();
 
 Assert.AreEqual(typeof(Primitives).Name, meta.TypeName);
 
-Assert.AreEqual(8, meta.Fields.Count);
+Assert.AreEqual(9, meta.Fields.Count);
 
 Assert.AreEqual(BinaryTypeNames.TypeNameByte, 
meta.GetFieldTypeName("fByte"));
 Assert.AreEqual(BinaryTypeNames.TypeNameBool, 
meta.GetFieldTypeName("fBool"));
@@ -623,6 +681,7 @@ namespace Apache.Ignite.Core.Tests.Binary
 

[12/14] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.6.3' into UPSTREAM_master

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-1.6.3' into 
UPSTREAM_master


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37195a02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37195a02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37195a02

Branch: refs/heads/ignite-3300
Commit: 37195a024abf16de152dc06914cb88dfbffb1397
Parents: f245c38 332c8c2
Author: Pavel Tupitsyn 
Authored: Mon Jul 25 16:13:39 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jul 25 16:13:39 2016 +0300

--
 .../internal/processors/igfs/IgfsImpl.java  |  12 +-
 .../processors/igfs/IgfsMetaManager.java| 115 ---
 .../igfs/IgfsSecondaryFileSystemImpl.java   |  15 +-
 .../igfs/IgfsSecondaryFileSystemV2.java |  40 +++
 .../processors/igfs/IgfsAbstractSelfTest.java   | 111 ++-
 .../igfs/IgfsDualAbstractSelfTest.java  |  34 ++
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  15 +
 .../igfs/UniversalFileSystemAdapter.java|  11 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  16 +-
 ...oopFileSystemUniversalFileSystemAdapter.java |   8 +
 .../Binary/BinaryBuilderSelfTest.cs | 325 +++
 .../Binary/IBinaryObjectBuilder.cs  |   2 +-
 .../Impl/Binary/BinaryObjectBuilder.cs  |  16 +-
 .../Impl/Binary/BinaryWriter.cs | 133 +---
 .../commands/cache/VisorCacheStopCommand.scala  |   5 +-
 15 files changed, 664 insertions(+), 194 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/37195a02/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/37195a02/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs
--

[06/14] ignite git commit: Merge branches 'gridgain-7.6.2' and 'ignite-1.6.3' of https://github.com/gridgain/apache-ignite into ignite-1.6.3

[sboikov]

Merge branches 'gridgain-7.6.2' and 'ignite-1.6.3' of 
https://github.com/gridgain/apache-ignite into ignite-1.6.3


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd50502a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd50502a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd50502a

Branch: refs/heads/ignite-3300
Commit: fd50502a95f23c5a664c0e5e43f42a9709a0eef8
Parents: 9e7 3aaef96
Author: Andrey Novikov 
Authored: Mon Jul 25 17:53:41 2016 +0700
Committer: Andrey Novikov 
Committed: Mon Jul 25 17:53:41 2016 +0700

--
 .../ignite/visor/commands/cache/VisorCacheStopCommand.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[07/14] ignite git commit: ignite-3563 Support distributedJoins flag in JDBC driver

[sboikov]

ignite-3563 Support distributedJoins flag in JDBC driver


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e15cf1d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e15cf1d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e15cf1d

Branch: refs/heads/ignite-3300
Commit: 0e15cf1df8b161dbc44f8d3810feca3192f05f73
Parents: 58d0544
Author: agura 
Authored: Mon Jul 25 12:31:24 2016 +0300
Committer: agura 
Committed: Mon Jul 25 15:11:12 2016 +0300

--
 .../jdbc2/JdbcDistributedJoinsQueryTest.java| 319 +++
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   2 +
 .../org/apache/ignite/IgniteJdbcDriver.java |  14 +-
 .../ignite/internal/jdbc2/JdbcConnection.java   |  12 +
 .../ignite/internal/jdbc2/JdbcQueryTask.java|   9 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java|   4 +-
 .../ignite/internal/jdbc2/JdbcStatement.java|   2 +-
 7 files changed, 357 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0e15cf1d/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
new file mode 100644
index 000..53bfa73
--- /dev/null
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -0,0 +1,319 @@
+/*
+ * 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.jdbc2;
+
+import java.io.Serializable;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+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.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ * Tests for complex queries with distributed joins enabled (joins, etc.).
+ */
+public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
+/** IP finder. */
+private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
+/** JDBC URL. */
+private static final String BASE_URL = CFG_URL_PREFIX + 
"distributedJoins=true@modules/clients/src/test/config/jdbc-config.xml";
+
+/** Statement. */
+private Statement stmt;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration cache = defaultCacheConfiguration();
+
+cache.setCacheMode(PARTITIONED);
+cache.setBackups(1);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAtomicityMode(TRANSACTIONAL);
+cache.setIndexedTypes(String.class, Organization.class, String.class, 
Person.class);
+
+cfg.setCacheConfiguration(cache);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(IP_FINDER);
+
+cfg.setDiscoverySpi(disco);
+
+cfg.setConnectorConfiguration(new 

[10/14] ignite git commit: ignite-3573 Support of Distributed joins queries in REST API

[sboikov]

ignite-3573 Support of Distributed joins queries in REST API


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/855281ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/855281ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/855281ed

Branch: refs/heads/ignite-3300
Commit: 855281ed33563f861921c5f93b39625db0206f72
Parents: 763f067
Author: agura 
Authored: Mon Jul 25 14:31:10 2016 +0300
Committer: agura 
Committed: Mon Jul 25 15:24:41 2016 +0300

--
 .../JettyRestProcessorAbstractSelfTest.java | 121 ++-
 .../handlers/query/QueryCommandHandler.java |   4 +
 .../rest/request/RestQueryRequest.java  |  17 +++
 .../http/jetty/GridJettyRestHandler.java|   5 +
 4 files changed, 142 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/855281ed/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 81bffcf..637099b 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -1679,6 +1679,32 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 /**
  * @throws Exception If failed.
  */
+public void testDistributedJoinsQuery() throws Exception {
+String qry = "select * from Person, \"organization\".Organization " +
+"where \"organization\".Organization.id = Person.orgId " +
+"and \"organization\".Organization.name = ?";
+
+Map params = new HashMap<>();
+params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key());
+params.put("type", "Person");
+params.put("distributedJoins", "true");
+params.put("pageSize", "10");
+params.put("cacheName", "person");
+params.put("qry", URLEncoder.encode(qry, CHARSET));
+params.put("arg1", "o1");
+
+String ret = content(params);
+
+JsonNode items = jsonResponse(ret).get("items");
+
+assertEquals(2, items.size());
+
+assertFalse(queryCursorFound());
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testSqlFieldsQuery() throws Exception {
 String qry = "select concat(firstName, ' ', lastName) from Person";
 
@@ -1700,6 +1726,28 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 /**
  * @throws Exception If failed.
  */
+public void testDistributedJoinsSqlFieldsQuery() throws Exception {
+String qry = "select * from \"person\".Person p, 
\"organization\".Organization o where o.id = p.orgId";
+
+Map params = new HashMap<>();
+params.put("cmd", GridRestCommand.EXECUTE_SQL_FIELDS_QUERY.key());
+params.put("distributedJoins", "true");
+params.put("pageSize", "10");
+params.put("cacheName", "person");
+params.put("qry", URLEncoder.encode(qry, CHARSET));
+
+String ret = content(params);
+
+JsonNode items = jsonResponse(ret).get("items");
+
+assertEquals(4, items.size());
+
+assertFalse(queryCursorFound());
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testSqlFieldsMetadataQuery() throws Exception {
 String qry = "select firstName, lastName from Person";
 
@@ -1823,6 +1871,20 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
  * Init cache.
  */
 private void initCache() {
+CacheConfiguration orgCacheCfg = new 
CacheConfiguration<>("organization");
+
+orgCacheCfg.setIndexedTypes(Integer.class, Organization.class);
+
+IgniteCache orgCache = 
ignite(0).getOrCreateCache(orgCacheCfg);
+
+orgCache.clear();
+
+Organization o1 = new Organization(1, "o1");
+Organization o2 = new Organization(2, "o2");
+
+orgCache.put(1, o1);
+orgCache.put(2, o2);
+
 CacheConfiguration personCacheCfg = new 
CacheConfiguration<>("person");
 
 personCacheCfg.setIndexedTypes(Integer.class, Person.class);
@@ -1831,10 +1893,10 @@ public abstract class 
JettyRestProcessorAbstractSelfTest extends AbstractRestPro
 
 

[13/14] ignite git commit: IGNITE-3561 .NET: DistributedJoins property in SqlQuery & SqlFieldsQuery

[sboikov]

IGNITE-3561 .NET: DistributedJoins property in SqlQuery & SqlFieldsQuery


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/856b536d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/856b536d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/856b536d

Branch: refs/heads/ignite-3300
Commit: 856b536db66edf9e7e6fc1b96da55a0e846c70c3
Parents: 37195a0
Author: Pavel Tupitsyn 
Authored: Mon Jul 25 18:54:11 2016 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jul 25 18:54:11 2016 +0300

--
 .../org/apache/ignite/cache/query/SqlQuery.java |   3 +
 .../platform/cache/PlatformCache.java   |  10 +-
 .../core/include/ignite/cache/query/query_sql.h |   2 +
 .../ignite/cache/query/query_sql_fields.h   |   3 +
 .../Cache/Query/CacheLinqTest.cs|  20 +-
 .../Cache/Query/CacheQueriesTest.cs | 252 +--
 .../Cache/Query/SqlFieldsQuery.cs   |  27 +-
 .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs  |  13 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs   |  39 ++-
 .../Impl/CacheFieldsQueryExecutor.cs|  63 -
 .../Apache.Ignite.Linq/Impl/CacheQueryable.cs   |  11 +-
 .../Impl/CacheQueryableBase.cs  |   7 +-
 13 files changed, 257 insertions(+), 196 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
index e05ff13..f809b8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
@@ -154,6 +154,9 @@ public final class SqlQuery extends 
Query> {
 /**
  * Specify if distributed joins are enabled for this query.
  *
+ * When disabled, join results will only contain colocated data (joins 
work locally).
+ * When enabled, joins work as expected, no matter how the data is 
distributed.
+ *
  * @param distributedJoins Distributed joins enabled.
  * @return {@code this} For chaining.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index 9bf330c..d572e8b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -943,7 +943,9 @@ public class PlatformCache extends PlatformAbstractTarget {
 
 Object[] args = readQueryArgs(reader);
 
-return new SqlQuery(typ, 
sql).setPageSize(pageSize).setArgs(args).setLocal(loc);
+boolean distrJoins = reader.readBoolean();
+
+return new SqlQuery(typ, 
sql).setPageSize(pageSize).setArgs(args).setLocal(loc).setDistributedJoins(distrJoins);
 }
 
 /**
@@ -956,7 +958,11 @@ public class PlatformCache extends PlatformAbstractTarget {
 
 Object[] args = readQueryArgs(reader);
 
-return new 
SqlFieldsQuery(sql).setPageSize(pageSize).setArgs(args).setLocal(loc);
+boolean distrJoins = reader.readBoolean();
+boolean enforceJoinOrder = reader.readBoolean();
+
+return new 
SqlFieldsQuery(sql).setPageSize(pageSize).setArgs(args).setLocal(loc)
+
.setDistributedJoins(distrJoins).setEnforceJoinOrder(enforceJoinOrder);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/856b536d/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
--
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h 
b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
index f7a00fa..cb7a739 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_sql.h
@@ -228,6 +228,8 @@ namespace ignite
 
 for (std::vector::const_iterator it = 
args.begin(); it != args.end(); ++it)
 (*it)->Write(writer);
+
+

[02/14] ignite git commit: IGNITE-3446 Visor CMD: improve usability for batch mode. (cherry picked from commit 71ef652)

[sboikov]

IGNITE-3446 Visor CMD: improve usability for batch mode.
(cherry picked from commit 71ef652)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3aaef96a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3aaef96a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3aaef96a

Branch: refs/heads/ignite-3300
Commit: 3aaef96a5d2754613c8f7d24ff3045c258fad7d3
Parents: 7fb03c7
Author: Andrey Novikov 
Authored: Fri Jul 22 18:03:50 2016 +0700
Committer: Andrey Novikov 
Committed: Mon Jul 25 08:02:44 2016 +0700

--
 .../ignite/visor/commands/cache/VisorCacheStopCommand.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3aaef96a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
index 1b55505..22fb89d 100644
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala
@@ -19,7 +19,6 @@ package org.apache.ignite.visor.commands.cache
 
 import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterNode}
 import org.apache.ignite.visor.visor._
-
 import org.apache.ignite.internal.visor.cache.VisorCacheStopTask
 import org.apache.ignite.internal.visor.util.VisorTaskUtils._
 
@@ -102,7 +101,9 @@ class VisorCacheStopCommand {
 return
 }
 
-ask(s"Are you sure you want to stop cache: ${escapeName(cacheName)}? 
(y/n) [n]: ", "n") match {
+val dflt = if (batchMode) "y" else "n"
+
+ask(s"Are you sure you want to stop cache: ${escapeName(cacheName)}? 
(y/n) [$dflt]: ", dflt) match {
 case "y" | "Y" =>
 try {
 executeRandom(grp, classOf[VisorCacheStopTask], cacheName)

[09/14] ignite git commit: ignite-3573 Support of Distributed joins queries in REST API

[sboikov]

ignite-3573 Support of Distributed joins queries in REST API


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f245c383
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f245c383
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f245c383

Branch: refs/heads/ignite-3300
Commit: f245c3838bd2eda4aa11b0bd0d07223b9cb2f237
Parents: 0e15cf1
Author: agura 
Authored: Mon Jul 25 14:31:10 2016 +0300
Committer: agura 
Committed: Mon Jul 25 15:22:47 2016 +0300

--
 .../JettyRestProcessorAbstractSelfTest.java | 121 ++-
 .../handlers/query/QueryCommandHandler.java |   4 +
 .../rest/request/RestQueryRequest.java  |  17 +++
 .../http/jetty/GridJettyRestHandler.java|   5 +
 4 files changed, 142 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f245c383/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 0dd12ac..8d3ab74 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -1687,6 +1687,32 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 /**
  * @throws Exception If failed.
  */
+public void testDistributedJoinsQuery() throws Exception {
+String qry = "select * from Person, \"organization\".Organization " +
+"where \"organization\".Organization.id = Person.orgId " +
+"and \"organization\".Organization.name = ?";
+
+Map params = new HashMap<>();
+params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key());
+params.put("type", "Person");
+params.put("distributedJoins", "true");
+params.put("pageSize", "10");
+params.put("cacheName", "person");
+params.put("qry", URLEncoder.encode(qry, CHARSET));
+params.put("arg1", "o1");
+
+String ret = content(params);
+
+JsonNode items = jsonResponse(ret).get("items");
+
+assertEquals(2, items.size());
+
+assertFalse(queryCursorFound());
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testSqlFieldsQuery() throws Exception {
 String qry = "select concat(firstName, ' ', lastName) from Person";
 
@@ -1708,6 +1734,28 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 /**
  * @throws Exception If failed.
  */
+public void testDistributedJoinsSqlFieldsQuery() throws Exception {
+String qry = "select * from \"person\".Person p, 
\"organization\".Organization o where o.id = p.orgId";
+
+Map params = new HashMap<>();
+params.put("cmd", GridRestCommand.EXECUTE_SQL_FIELDS_QUERY.key());
+params.put("distributedJoins", "true");
+params.put("pageSize", "10");
+params.put("cacheName", "person");
+params.put("qry", URLEncoder.encode(qry, CHARSET));
+
+String ret = content(params);
+
+JsonNode items = jsonResponse(ret).get("items");
+
+assertEquals(4, items.size());
+
+assertFalse(queryCursorFound());
+}
+
+/**
+ * @throws Exception If failed.
+ */
 public void testSqlFieldsMetadataQuery() throws Exception {
 String qry = "select firstName, lastName from Person";
 
@@ -1831,6 +1879,20 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
  * Init cache.
  */
 private void initCache() {
+CacheConfiguration orgCacheCfg = new 
CacheConfiguration<>("organization");
+
+orgCacheCfg.setIndexedTypes(Integer.class, Organization.class);
+
+IgniteCache orgCache = 
ignite(0).getOrCreateCache(orgCacheCfg);
+
+orgCache.clear();
+
+Organization o1 = new Organization(1, "o1");
+Organization o2 = new Organization(2, "o2");
+
+orgCache.put(1, o1);
+orgCache.put(2, o2);
+
 CacheConfiguration personCacheCfg = new 
CacheConfiguration<>("person");
 
 personCacheCfg.setIndexedTypes(Integer.class, Person.class);
@@ -1839,10 +1901,10 @@ public abstract class 
JettyRestProcessorAbstractSelfTest extends AbstractRestPro
 
 

[03/14] ignite git commit: IGNITE-3530: IGFS: Added missing "setTimes" method to IgfsSeconadryFileSystem.

[sboikov]

IGNITE-3530: IGFS: Added missing "setTimes" method to IgfsSeconadryFileSystem.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c075ab33
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c075ab33
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c075ab33

Branch: refs/heads/ignite-3300
Commit: c075ab33254b7178c6e6b0a7b16801e787189ced
Parents: ce53491
Author: vozerov-gridgain 
Authored: Mon Jul 25 08:54:05 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Jul 25 08:54:05 2016 +0300

--
 .../internal/processors/igfs/IgfsImpl.java  |  12 +-
 .../processors/igfs/IgfsMetaManager.java| 115 ---
 .../igfs/IgfsSecondaryFileSystemImpl.java   |  15 ++-
 .../igfs/IgfsSecondaryFileSystemV2.java |  40 +++
 .../processors/igfs/IgfsAbstractSelfTest.java   | 111 +-
 .../igfs/IgfsDualAbstractSelfTest.java  |  34 ++
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |  15 +++
 .../processors/igfs/IgfsModesSelfTest.java  |   2 -
 .../igfs/UniversalFileSystemAdapter.java|  11 ++
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  16 ++-
 ...oopFileSystemUniversalFileSystemAdapter.java |   8 ++
 11 files changed, 316 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c075ab33/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 5b87698..df7dfb5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -1139,16 +1139,12 @@ public final class IgfsImpl implements IgfsEx {
 
 safeOp(new Callable() {
 @Override public Void call() throws Exception {
-FileDescriptor desc = getFileDescriptor(path);
-
-if (desc == null)
-throw new IgfsPathNotFoundException("Failed to update 
times (path not found): " + path);
+IgfsMode mode = resolveMode(path);
 
-// Cannot update times for root.
-if (desc.parentId == null)
-return null;
+boolean useSecondary = IgfsUtils.isDualMode(mode) && 
secondaryFs instanceof IgfsSecondaryFileSystemV2;
 
-meta.updateTimes(desc.parentId, desc.fileId, desc.fileName, 
accessTime, modificationTime);
+meta.updateTimes(path, accessTime, modificationTime,
+useSecondary ? (IgfsSecondaryFileSystemV2)secondaryFs : 
null);
 
 return null;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c075ab33/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 1640918..d891b38 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -51,14 +51,14 @@ import 
org.apache.ignite.internal.processors.igfs.client.IgfsClientAbstractCalla
 import 
org.apache.ignite.internal.processors.igfs.client.meta.IgfsClientMetaIdsForPathCallable;
 import 
org.apache.ignite.internal.processors.igfs.client.meta.IgfsClientMetaInfoForPathCallable;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryCreateProcessor;
+import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingAddProcessor;
+import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingRemoveProcessor;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingRenameProcessor;
+import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingReplaceProcessor;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileCreateProcessor;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileLockProcessor;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileReserveSpaceProcessor;
 import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileUnlockProcessor;
-import 
org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingAddProcessor;
-import 

[05/14] ignite git commit: IGNITE-3389 metadata result set throws NPE when closed - fixed

[sboikov]

 IGNITE-3389 metadata result set throws NPE when closed - fixed


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e7c

Branch: refs/heads/ignite-3300
Commit: 9e7c559342fcc6b67457f7456d6af2c084d8
Parents: c075ab3
Author: Alexandre Boudnik 
Authored: Fri Jul 22 18:40:47 2016 +0300
Committer: agura 
Committed: Mon Jul 25 12:39:35 2016 +0300

--
 .../internal/jdbc2/JdbcMetadataSelfTest.java| 63 ++--
 .../ignite/jdbc/JdbcMetadataSelfTest.java   | 18 ++
 .../ignite/internal/jdbc2/JdbcResultSet.java|  2 +-
 3 files changed, 64 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e7c/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
old mode 100644
new mode 100755
index f601dbc..7184b8d
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -17,24 +17,33 @@
 
 package org.apache.ignite.internal.jdbc2;
 
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
-import static java.sql.Types.*;
-import static org.apache.ignite.IgniteJdbcDriver.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.affinity.AffinityKey;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+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.junits.common.GridCommonAbstractTest;
+
+import static java.sql.Types.INTEGER;
+import static java.sql.Types.OTHER;
+import static java.sql.Types.VARCHAR;
+import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  * Metadata tests.
@@ -277,6 +286,24 @@ public class JdbcMetadataSelfTest extends 
GridCommonAbstractTest {
 }
 
 /**
+ * @throws Exception If failed.
+ */
+public void testMetadataResultSetClose() throws Exception {
+try (Connection conn = DriverManager.getConnection(BASE_URL);
+ ResultSet tbls = conn.getMetaData().getTables(null, null, "%", 
null)) {
+int colCnt = tbls.getMetaData().getColumnCount();
+
+while (tbls.next()) {
+for (int i = 0; i < colCnt; i++)
+tbls.getObject(i + 1);
+}
+}
+catch (Exception e) {
+fail();
+}
+}
+
+/**
  * Person.
  */
 @SuppressWarnings("UnusedDeclaration")

http://git-wip-us.apache.org/repos/asf/ignite/blob/9e7c/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 0deb45d..72d93c9 100644
--- 

ignite git commit: ignite-3300

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3300 6670ad62d -> 7ca0d8d59


ignite-3300


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ca0d8d5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ca0d8d5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ca0d8d5

Branch: refs/heads/ignite-3300
Commit: 7ca0d8d591ea1a8c3e43b91312771f3d7ef4db6f
Parents: 6670ad6
Author: sboikov 
Authored: Tue Jul 26 09:28:49 2016 +0300
Committer: sboikov 
Committed: Tue Jul 26 09:28:49 2016 +0300

--
 .../internal/binary/BinaryObjectImpl.java   | 11 +
 .../processors/cache/KeyCacheObject.java|  7 ++
 .../processors/cache/KeyCacheObjectImpl.java|  8 +++
 .../binary/CacheObjectBinaryProcessorImpl.java  | 23 ---
 .../IgniteCacheObjectProcessorImpl.java | 24 +++-
 5 files changed, 58 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca0d8d5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index ae110f1..7b42c03 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -98,6 +98,17 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
 }
 
 /** {@inheritDoc} */
+@Override public KeyCacheObject copy(int part) {
+if (this.part == part)
+return this;
+
+BinaryObjectImpl cp = new BinaryObjectImpl(ctx, arr, start);
+cp.part = part;
+
+return cp;
+}
+
+/** {@inheritDoc} */
 @Override public int partition() {
 return part;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca0d8d5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
index ffb846c..21b1f89 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
@@ -38,7 +38,14 @@ public interface KeyCacheObject extends CacheObject {
 
 /**
  * Sets partition ID for this key.
+ *
  * @param part Partition ID.
  */
 public void partition(int part);
+
+/**
+ * @param part Partition ID.
+ * @return Copy of this object with given partition set.
+ */
+public KeyCacheObject copy(int part);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca0d8d5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index 35e681c..146e554 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -61,6 +61,14 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter 
implements KeyCacheOb
 }
 
 /** {@inheritDoc} */
+@Override public KeyCacheObject copy(int part) {
+if (this.part == part)
+return this;
+
+return new KeyCacheObjectImpl(val, valBytes, part);
+}
+
+/** {@inheritDoc} */
 @Override public int partition() {
 return part;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ca0d8d5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 141f0f8..3ab01e7 100644
---