You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 10:49:46 UTC

[01/50] [abbrv] incubator-ignite git commit: # ignite-322: clear exclude list and add exclude reason

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-342 a69151bc2 -> 9eae231f9


# ignite-322: clear exclude list and add exclude reason


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

Branch: refs/heads/ignite-342
Commit: 6a083e5fdb69e845d895a1a139974b2da81b02b9
Parents: d4dbac0
Author: Artem Shutak <as...@gridgain.com>
Authored: Thu Feb 26 16:01:33 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Thu Feb 26 16:01:33 2015 +0300

----------------------------------------------------------------------
 pom.xml | 83 ++++++++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a083e5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48a95d2..9b65d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,7 +499,7 @@
 
     <profiles>
         <profile>
-            <id>rat-license-check</id>
+            <id>check-licenses</id>
             <build>
                 <plugins>
                     <plugin>
@@ -513,62 +513,55 @@
                                     <goal>check</goal>
                                 </goals>
                                 <configuration>
-                                    <!--<ignoreErrors>true</ignoreErrors>-->
-                                    <!--<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>-->
-                                    <!--<addLicenseHeaders>forced</addLicenseHeaders>-->
-                                    <!--<copyrightMessage>rat.copyrightMessage</copyrightMessage>-->
                                     <excludes>
                                         <exclude>work/**</exclude>
                                         <exclude>**/target/**</exclude>
-                                        <exclude>**/*.jks</exclude>
-                                        <exclude>**/*.pem</exclude>
-                                        <exclude>**/*.m4</exclude><!--Free Software Foundation notice-->
                                         <exclude>**/*.log</exclude>
+                                        <exclude>**/*.m4</exclude><!--Free Software Foundation notice-->
                                         <exclude>**/*.dylib</exclude><!--bin-files-->
                                         <exclude>**/*.gar</exclude><!--bin-files-->
-                                        <exclude>**/licenses/*.txt</exclude>
-                                        <exclude>**/*.timestamp</exclude>
-                                        <exclude>**/*.iml</exclude>
-                                        <exclude>**/*.md</exclude>
-                                        <exclude>**/pom-installed.xml</exclude>
-                                        <exclude>**/keystore/*.pfx</exclude>
+                                        <exclude>**/licenses/*.txt</exclude><!--files of licenses-->
+                                        <exclude>**/*.timestamp</exclude><!--tmp-files-->
+                                        <exclude>**/*.iml</exclude><!--IDEA files-->
+                                        <exclude>**/*.md</exclude><!--readme-files-->
+                                        <exclude>**/pom-installed.xml</exclude><!--tmp-files-->
+                                        <exclude>**/keystore/*.jks</exclude><!--bin-files-->
+                                        <exclude>**/keystore/*.pem</exclude><!--auto generated files-->
+                                        <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
                                         <!--special excludes-->
-                                        <exclude>**/com/romix/scala/**</exclude>
-                                        <exclude>**/GridOffHeapSnapTreeMap.java</exclude><!--Copyright (c) 2009 Stanford University-->
-                                        <exclude>**/org/apache/ignite/internal/util/snaptree/*.java</exclude>
-                                        <exclude>**/org/pcollections/**</exclude>
-                                        <exclude>**/org/jetbrains/annotations/**</exclude>
-                                        <exclude>**/org/jdk8/backport/</exclude>
+                                        <exclude>**/com/romix/scala/**</exclude><!--own license-->
+                                        <exclude>**/GridOffHeapSnapTreeMap.java</exclude><!--own license-->
+                                        <exclude>**/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--own license-->
+                                        <exclude>**/org/pcollections/**</exclude><!--own license-->
+                                        <exclude>**/org/jdk8/backport/</exclude><!--own license-->
                                         <exclude>**/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test depends on file content-->
-                                        <exclude>**/test/resources/log/ignite.log.tst</exclude>
-                                        <exclude>**/test/config/start-nodes.ini</exclude>
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.incorrefs</exclude>
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.empty</exclude>
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.brokenxml</exclude>
-                                        <exclude>**/hadoop/books/*.txt</exclude>
-                                        <exclude>**/javax.cache.spi.CachingProvider</exclude>
-                                        <exclude>**/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude>
+                                        <exclude>**/test/resources/log/ignite.log.tst</exclude><!--test resource-->
+                                        <exclude>**/test/config/start-nodes.ini</exclude><!---->
+                                        <exclude>**/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test resource-->
+                                        <exclude>**/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should be empty-->
+                                        <exclude>**/spi/deployment/uri/META-INF/ignite.brokenxml</exclude><!--test resource-->
+                                        <exclude>**/hadoop/books/*.txt</exclude><!--books examples-->
+                                        <exclude>**/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
+                                        <exclude>**/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
                                         <!--shmem-->
-                                        <exclude>ipc/shmem/**/Makefile.am</exclude>
-                                        <exclude>ipc/shmem/**/Makefile.in</exclude>
-                                        <exclude>ipc/shmem/**/Makefile</exclude>
-                                        <exclude>ipc/shmem/compile</exclude>
+                                        <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
+                                        <exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
+                                        <exclude>ipc/shmem/compile</exclude><!---->
                                         <exclude>ipc/shmem/config.guess</exclude><!--own license-->
                                         <exclude>ipc/shmem/config.sub</exclude><!--own license-->
-                                        <exclude>ipc/shmem/configure</exclude>
-                                        <exclude>ipc/shmem/configure.ac</exclude>
-                                        <exclude>ipc/shmem/igniteshmem/.libs/*</exclude>
-                                        <exclude>ipc/shmem/igniteshmem/.deps/*</exclude>
-                                        <exclude>ipc/shmem/include/Makefile</exclude>
+                                        <exclude>ipc/shmem/configure</exclude><!--own license-->
+                                        <exclude>ipc/shmem/configure.ac</exclude><!---->
+                                        <exclude>ipc/shmem/igniteshmem/.libs/*</exclude><!--tmp files-->
+                                        <exclude>ipc/shmem/igniteshmem/.deps/*</exclude><!--tmp files-->
                                         <exclude>ipc/shmem/ltmain.sh</exclude><!--own license-->
-                                        <exclude>ipc/shmem/install-sh</exclude>
-                                        <exclude>ipc/shmem/depcomp</exclude>
-                                        <exclude>ipc/shmem/config.status</exclude>
-                                        <exclude>ipc/shmem/libtool</exclude>
-                                        <exclude>ipc/shmem/missing</exclude>
-                                        <exclude>ipc/shmem/stamp-h1</exclude>
-                                        <exclude>ipc/shmem/igniteshmem/libigniteshmem.la</exclude>
-                                        <exclude>ipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo</exclude>
+                                        <exclude>ipc/shmem/install-sh</exclude><!--own license-->
+                                        <exclude>ipc/shmem/depcomp</exclude><!--own license-->
+                                        <exclude>ipc/shmem/config.status</exclude><!--auto generated-->
+                                        <exclude>ipc/shmem/libtool</exclude><!--own license-->
+                                        <exclude>ipc/shmem/missing</exclude><!--own license-->
+                                        <exclude>ipc/shmem/stamp-h1</exclude><!--tmp timestamp-->
+                                        <exclude>ipc/shmem/igniteshmem/libigniteshmem.la</exclude><!--tmp (not under VCS)-->
+                                        <exclude>ipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo</exclude><!--tmp (not under VCS)-->
                                     </excludes>
                                 </configuration>
                             </execution>


[48/50] [abbrv] incubator-ignite git commit: IGNITE-342 Fixed review notes.

Posted by sb...@apache.org.
IGNITE-342 Fixed review notes.


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

Branch: refs/heads/ignite-342
Commit: 2f3b8fb6abc275e88176e535af44560ef2737b50
Parents: a69151b
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 12:45:20 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 12:45:20 2015 +0300

----------------------------------------------------------------------
 .../affinity/GridAffinityAssignmentCache.java    |  8 +-------
 .../cache/GridCacheAffinityManager.java          | 13 ++-----------
 .../processors/cache/GridCacheContext.java       | 19 +++++++++++++++++++
 .../processors/cache/GridCacheProcessor.java     | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f3b8fb6/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 9bfcca0..3cd5bb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -59,9 +59,6 @@ public class GridAffinityAssignmentCache {
     /** Affinity mapper function. */
     private final CacheAffinityKeyMapper affMapper;
 
-    /** Default affinity mapper function. */
-    private final CacheAffinityKeyMapper dfltAffMapper;
-
     /** Affinity calculation results cache: topology version => partition => nodes. */
     private final ConcurrentMap<Long, GridAffinityAssignment> affCache;
 
@@ -87,7 +84,6 @@ public class GridAffinityAssignmentCache {
      * @param cacheName Cache name.
      * @param aff Affinity function.
      * @param affMapper Affinity key mapper.
-     * @param dfltAffMapper Default affinity key mapper.
      * @param backups Number of backups.
      */
     @SuppressWarnings("unchecked")
@@ -95,7 +91,6 @@ public class GridAffinityAssignmentCache {
         String cacheName,
         CacheAffinityFunction aff,
         CacheAffinityKeyMapper affMapper,
-        CacheAffinityKeyMapper dfltAffMapper,
         int backups)
     {
         this.ctx = ctx;
@@ -103,7 +98,6 @@ public class GridAffinityAssignmentCache {
         this.affMapper = affMapper;
         this.cacheName = cacheName;
         this.backups = backups;
-        this.dfltAffMapper = dfltAffMapper;
 
         log = ctx.logger(GridAffinityAssignmentCache.class);
 
@@ -322,7 +316,7 @@ public class GridAffinityAssignmentCache {
      * @return Affinity key.
      */
     private Object affinityKey(Object key) {
-        return (dfltAffMapper != null && key instanceof GridCacheInternal ? dfltAffMapper : affMapper).affinityKey(key);
+        return (key instanceof GridCacheInternal ? ctx.defaultAffMapper() : affMapper).affinityKey(key);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f3b8fb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index 0e0b26b..d3510e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -44,17 +44,8 @@ public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V
 
     /** {@inheritDoc} */
     @Override public void start0() throws IgniteCheckedException {
-        GridCacheDefaultAffinityKeyMapper dfltAffKeyMapper = null;
-
-        if (!cctx.config().getAffinityMapper().getClass().equals(GridCacheDefaultAffinityKeyMapper.class)) {
-            dfltAffKeyMapper = new GridCacheDefaultAffinityKeyMapper();
-            
-            dfltAffKeyMapper.setIgnite(cctx.grid());
-            dfltAffKeyMapper.setLog(cctx.logger(GridCacheDefaultAffinityKeyMapper.class));
-        }
-
-        aff = new GridAffinityAssignmentCache(cctx, cctx.namex(), cctx.config().getAffinity(), 
-            cctx.config().getAffinityMapper(), dfltAffKeyMapper, cctx.config().getBackups());
+        aff = new GridAffinityAssignmentCache(cctx, cctx.namex(), cctx.config().getAffinity(),
+            cctx.config().getAffinityMapper(), cctx.config().getBackups());
 
         // Generate internal keys for partitions.
         int partCnt = partitions();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f3b8fb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 3ec013c..44f8e69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
@@ -164,6 +165,9 @@ public class GridCacheContext<K, V> implements Externalizable {
     /** Cached local rich node. */
     private ClusterNode locNode;
 
+    /** Default cache affinity mapper. */
+    private CacheAffinityKeyMapper affMapper;
+
     /**
      * Thread local projection. If it's set it means that method call was initiated
      * by child projection of initial cache.
@@ -1016,6 +1020,20 @@ public class GridCacheContext<K, V> implements Externalizable {
     }
 
     /**
+     * @return Default affinity key mapper.
+     */
+    public CacheAffinityKeyMapper defaultAffMapper() {
+        return affMapper;
+    }
+
+    /**
+     * Sets default affinity key mapper.
+     */
+    public void defaultAffMapper(CacheAffinityKeyMapper dfltAffMapper) {
+        this.affMapper = dfltAffMapper;
+    }
+
+    /**
      * @param p Single predicate.
      * @return Array containing single predicate.
      */
@@ -1770,6 +1788,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         evictMgr = null;
         qryMgr = null;
         dataStructuresMgr = null;
+        affMapper = null;
 
         mgrs.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f3b8fb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index e99c706..45fcf1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -618,6 +618,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
             U.startLifecycleAware(lifecycleAwares(cfg, jta.tmLookup(), cfgStore));
 
+            // Init default key mapper.
+            CacheAffinityKeyMapper dfltAffMapper;
+            
+            if (cfg.getAffinityMapper().getClass().equals(GridCacheDefaultAffinityKeyMapper.class))
+                dfltAffMapper = cfg.getAffinityMapper();
+            else {
+                dfltAffMapper = new GridCacheDefaultAffinityKeyMapper();
+                
+                prepare(cfg, dfltAffMapper, false);
+            }
+
             cfgs[i] = cfg; // Replace original configuration value.
 
             GridCacheAffinityManager affMgr = new GridCacheAffinityManager();
@@ -655,6 +666,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 drMgr,
                 jta);
 
+            cacheCtx.defaultAffMapper(dfltAffMapper);
+
             GridCacheAdapter cache = null;
 
             switch (cfg.getCacheMode()) {
@@ -793,6 +806,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                     drMgr,
                     jta);
 
+                cacheCtx.defaultAffMapper(dfltAffMapper);
+
                 GridDhtCacheAdapter dht = null;
 
                 switch (cfg.getAtomicityMode()) {


[38/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2

Posted by sb...@apache.org.
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2


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

Branch: refs/heads/ignite-342
Commit: a792c995ed211f56b741396ab9c2cf2f74646597
Parents: 9fb1eeb f053746
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 19:57:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 19:57:11 2015 +0300

----------------------------------------------------------------------
 .../HibernateReadWriteAccessStrategy.java       | 81 +++++++++++++++-----
 1 file changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------



[28/50] [abbrv] incubator-ignite git commit: # ignite-325: revert license from some files and fix serialVersionUID at 2 files

Posted by sb...@apache.org.
# ignite-325: revert license from some files and fix serialVersionUID at 2 files


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

Branch: refs/heads/ignite-342
Commit: b08bfe7bb789a85cfd2232d9bdc4867fe1bf6281
Parents: 5121aa0
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 17:17:36 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 17:17:36 2015 +0300

----------------------------------------------------------------------
 ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h |   17 -
 ipc/shmem/ltmain.sh                             |   14 -
 .../internal/events/DiscoveryCustomEvent.java   |    3 +
 .../optimized/optimized-classnames.properties   | 1550 ------------------
 .../TcpDiscoveryCustomEventMessage.java         |    3 +
 modules/winservice/IgniteService.sln            |   14 -
 .../IgniteService/IgniteService.csproj          |   17 -
 pom.xml                                         |    8 +-
 8 files changed, 12 insertions(+), 1614 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h
----------------------------------------------------------------------
diff --git a/ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h b/ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h
index dae96d4..af04e5b 100644
--- a/ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h
+++ b/ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h
@@ -1,20 +1,3 @@
-/*
- * 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.
- */
-
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
 /* Header for class org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/ipc/shmem/ltmain.sh
----------------------------------------------------------------------
diff --git a/ipc/shmem/ltmain.sh b/ipc/shmem/ltmain.sh
index a125c14..0096fe6 100644
--- a/ipc/shmem/ltmain.sh
+++ b/ipc/shmem/ltmain.sh
@@ -1,17 +1,3 @@
-# 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.
 
 # libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
index 3a53fc6..0f3e83b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
@@ -27,6 +27,9 @@ import java.io.*;
  * Custom event.
  */
 public class DiscoveryCustomEvent extends DiscoveryEvent {
+    /** */
+    private static final long serialVersionUID = 0L;
+    
     /**
      * Built-in event type: custom event sent.
      * <br>


[34/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311


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

Branch: refs/heads/ignite-342
Commit: 2ef2271b3f214db6143cd4166377c46f465449f8
Parents: 6e2ef56 e1c0945
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 17:56:34 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 17:56:34 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |   12 +
 config/ignite-log4j.xml                         |    2 +-
 .../datagrid/CacheContinuousQueryExample.java   |    2 +-
 ipc/shmem/Makefile.am                           |   15 +
 ipc/shmem/igniteshmem/Makefile.am               |   15 +
 ipc/shmem/include/Makefile.am                   |   15 +
 modules/clients/src/test/keystore/generate.sh   |   15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    4 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |    2 +-
 .../ignite/cache/query/ContinuousQuery.java     |   18 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |    2 +-
 .../configuration/QueryConfiguration.java       |   37 +-
 .../ignite/events/DiscoveryCustomEvent.java     |   56 -
 .../org/apache/ignite/events/EventType.java     |   14 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |    6 +-
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../internal/events/DiscoveryCustomEvent.java   |   71 +
 .../discovery/GridDiscoveryManager.java         |    7 +-
 .../processors/cache/IgniteCacheProxy.java      |    6 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   10 +-
 .../visor/node/VisorBasicConfiguration.java     |   17 -
 .../node/VisorNodeEventsCollectorTask.java      |   10 +-
 .../internal/visor/node/VisorNodeGcTask.java    |   10 +-
 .../internal/visor/node/VisorNodePingTask.java  |   10 +-
 .../optimized-classnames.previous.properties    |   15 +
 .../optimized/optimized-classnames.properties   | 1565 +-----------------
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    9 +-
 .../TcpDiscoveryCustomEventMessage.java         |    3 +
 .../internal/GridDiscoveryEventSelfTest.java    |    9 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    8 +-
 ...dStartupWithUndefinedIgniteHomeSelfTest.java |  103 ++
 .../config/GridTestProperties.java              |   10 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |    1 +
 modules/extdata/p2p/pom.xml                     |    6 -
 .../client/hadoop/GridHadoopClientProtocol.java |    6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  412 +++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |    3 +-
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |   10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  413 -----
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |    4 +-
 .../hadoop/GridHadoopClassLoader.java           |   12 +-
 .../processors/hadoop/GridHadoopSetup.java      |    8 +-
 .../processors/hadoop/GridHadoopUtils.java      |    4 +-
 .../collections/GridHadoopHashMultimapBase.java |    2 +-
 .../GridHadoopExternalCommunication.java        |   14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |    6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |    2 +-
 .../GridHadoopClientProtocolSelfTest.java       |    6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |    2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |    2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |    2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |    1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    2 +-
 .../hadoop/GridHadoopGroupingTest.java          |    4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |    9 +-
 .../testsuites/IgniteHadoopTestSuite.java       |    7 +-
 modules/hibernate/pom.xml                       |    6 -
 modules/indexing/pom.xml                        |    6 -
 modules/jta/pom.xml                             |    6 -
 modules/scalar/pom.xml                          |    6 -
 modules/spring/pom.xml                          |    6 -
 modules/visor-console/pom.xml                   |    7 -
 .../commands/alert/VisorAlertCommand.scala      |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |   82 +-
 .../config/VisorConfigurationCommand.scala      |  140 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   64 +-
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 +-
 modules/web/pom.xml                             |    6 -
 modules/winservice/IgniteService.sln            |    2 +-
 .../IgniteService/IgniteService.csproj          |    2 +-
 .../config/benchmark-atomic-win.properties      |   15 +
 .../config/benchmark-atomic.properties          |   15 +
 .../config/benchmark-compute-win.properties     |   15 +
 .../config/benchmark-compute.properties         |   15 +
 .../config/benchmark-multicast.properties       |   15 +
 .../config/benchmark-query-win.properties       |   15 +
 .../yardstick/config/benchmark-query.properties |   15 +
 .../config/benchmark-tx-win.properties          |   15 +
 .../yardstick/config/benchmark-tx.properties    |   15 +
 .../yardstick/config/benchmark-win.properties   |   15 +
 modules/yardstick/config/benchmark.properties   |   15 +
 pom.xml                                         |  150 +-
 86 files changed, 1280 insertions(+), 2405 deletions(-)
----------------------------------------------------------------------



[43/50] [abbrv] incubator-ignite git commit: sprint-2 - Added isWithinTransaction() method to session.

Posted by sb...@apache.org.
sprint-2 - Added isWithinTransaction() method to session.


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

Branch: refs/heads/ignite-342
Commit: 16105ec9687732d0b01cfeaee9a5b1c227b0921f
Parents: 6097e7b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 09:44:30 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 09:44:30 2015 -0800

----------------------------------------------------------------------
 .../store/jdbc/CacheJdbcPersonStore.java        | 110 +++++++------------
 .../ignite/cache/store/CacheStoreSession.java   |   9 ++
 .../processors/cache/GridCacheStoreManager.java |   6 +-
 .../junits/cache/TestCacheSession.java          |   5 +
 .../cache/TestThreadLocalCacheSession.java      |   5 +
 5 files changed, 62 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index d80861d..0473280 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.store.*;
 import org.apache.ignite.examples.datagrid.store.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;
@@ -72,8 +71,6 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
 
     /** {@inheritDoc} */
     @Override public void txEnd(boolean commit) {
-        Transaction tx = transaction();
-
         Map<String, Connection> props = ses.properties();
 
         try (Connection conn = props.remove(ATTR_NAME)) {
@@ -84,23 +81,21 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
                     conn.rollback();
             }
 
-            System.out.println(">>> Transaction ended [xid=" + tx.xid() + ", commit=" + commit + ']');
+            System.out.println(">>> Transaction ended [commit=" + commit + ']');
         }
         catch (SQLException e) {
-            throw new CacheWriterException("Failed to end transaction [xid=" + tx.xid() + ", commit=" + commit + ']', e);
+            throw new CacheWriterException("Failed to end transaction: " + ses.transaction(), e);
         }
     }
 
     /** {@inheritDoc} */
     @Override public Person load(Long key) {
-        Transaction tx = transaction();
-
-        System.out.println(">>> Store load [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+        System.out.println(">>> Loading key: " + key);
 
         Connection conn = null;
 
         try {
-            conn = connection(tx);
+            conn = connection();
 
             try (PreparedStatement st = conn.prepareStatement("select * from PERSONS where id=?")) {
                 st.setString(1, key.toString());
@@ -108,14 +103,14 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
                 ResultSet rs = st.executeQuery();
 
                 if (rs.next())
-                    return person(rs.getLong(1), rs.getString(2), rs.getString(3));
+                    return new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
             }
         }
         catch (SQLException e) {
             throw new CacheLoaderException("Failed to load object: " + key, e);
         }
         finally {
-            end(tx, conn);
+            end(conn);
         }
 
         return null;
@@ -123,60 +118,57 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
 
     /** {@inheritDoc} */
     @Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) {
-        Transaction tx = transaction();
-
         Long key = entry.getKey();
 
         Person val = entry.getValue();
 
-        System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+        System.out.println(">>> Putting [key=" + key + ", val=" + val +  ']');
 
         Connection conn = null;
 
         try {
-            conn = connection(tx);
+            conn = connection();
 
-        int updated;
+            int updated;
 
-        try (PreparedStatement st = conn.prepareStatement(
-            "update PERSONS set firstName=?, lastName=? where id=?")) {
-            st.setString(1, val.getFirstName());
-            st.setString(2, val.getLastName());
-            st.setLong(3, val.getId());
+            // Try update first.
+            try (PreparedStatement st = conn.prepareStatement(
+                "update PERSONS set firstName=?, lastName=? where id=?")) {
+                st.setString(1, val.getFirstName());
+                st.setString(2, val.getLastName());
+                st.setLong(3, val.getId());
 
-            updated = st.executeUpdate();
-        }
+                updated = st.executeUpdate();
+            }
 
-        // If update failed, try to insert.
-        if (updated == 0) {
-            try (PreparedStatement st = conn.prepareStatement(
-                "insert into PERSONS (id, firstName, lastName) values(?, ?, ?)")) {
-                st.setLong(1, val.getId());
-                st.setString(2, val.getFirstName());
-                st.setString(3, val.getLastName());
+            // If update failed, try to insert.
+            if (updated == 0) {
+                try (PreparedStatement st = conn.prepareStatement(
+                    "insert into PERSONS (id, firstName, lastName) values(?, ?, ?)")) {
+                    st.setLong(1, val.getId());
+                    st.setString(2, val.getFirstName());
+                    st.setString(3, val.getLastName());
 
-                st.executeUpdate();
+                    st.executeUpdate();
+                }
             }
         }
-        }
         catch (SQLException e) {
             throw new CacheLoaderException("Failed to put object [key=" + key + ", val=" + val + ']', e);
         }
         finally {
-            end(tx, conn);
+            end(conn);
         }
     }
 
     /** {@inheritDoc} */
     @Override public void delete(Object key) {
-        Transaction tx = transaction();
-
-        System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+        System.out.println(">>> Removing key: " + key);
 
         Connection conn = null;
 
         try {
-            conn = connection(tx);
+            conn = connection();
 
             try (PreparedStatement st = conn.prepareStatement("delete from PERSONS where id=?")) {
                 st.setLong(1, (Long)key);
@@ -188,7 +180,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
             throw new CacheWriterException("Failed to remove object: " + key, e);
         }
         finally {
-            end(tx, conn);
+            end(conn);
         }
     }
 
@@ -199,17 +191,13 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
 
         final int entryCnt = (Integer)args[0];
 
-        Connection conn = null;
-
-        try {
-            conn = connection(null);
-
+        try (Connection conn = connection()) {
             try (PreparedStatement st = conn.prepareStatement("select * from PERSONS")) {
                 try (ResultSet rs = st.executeQuery()) {
                     int cnt = 0;
 
                     while (cnt < entryCnt && rs.next()) {
-                        Person person = person(rs.getLong(1), rs.getString(2), rs.getString(3));
+                        Person person = new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
 
                         clo.apply(person.getId(), person);
 
@@ -223,18 +211,16 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
         catch (SQLException e) {
             throw new CacheLoaderException("Failed to load values from cache store.", e);
         }
-        finally {
-            end(null, conn);
-        }
     }
 
     /**
-     * @param tx Cache transaction.
      * @return Connection.
      * @throws SQLException In case of error.
      */
-    private Connection connection(@Nullable Transaction tx) throws SQLException  {
-        if (tx != null) {
+    private Connection connection() throws SQLException  {
+        // If there is an ongoing transaction,
+        // we must reuse the same connection.
+        if (ses.isWithinTransaction()) {
             Map<Object, Object> props = ses.properties();
 
             Connection conn = (Connection)props.get(ATTR_NAME);
@@ -257,11 +243,10 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
     /**
      * Closes allocated resources depending on transaction status.
      *
-     * @param tx Active transaction, if any.
      * @param conn Allocated connection.
      */
-    private void end(@Nullable Transaction tx, @Nullable Connection conn) {
-        if (tx == null && conn != null) {
+    private void end(@Nullable Connection conn) {
+        if (!ses.isWithinTransaction() && conn != null) {
             // Close connection right away if there is no transaction.
             try {
                 conn.close();
@@ -286,23 +271,4 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
 
         return conn;
     }
-
-    /**
-     * Builds person object out of provided values.
-     *
-     * @param id ID.
-     * @param firstName First name.
-     * @param lastName Last name.
-     * @return Person.
-     */
-    private Person person(Long id, String firstName, String lastName) {
-        return new Person(id, firstName, lastName);
-    }
-
-    /**
-     * @return Current transaction.
-     */
-    private Transaction transaction() {
-        return ses != null ? ses.transaction() : null;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index a2be4c5..38fe95c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -43,6 +43,15 @@ public interface CacheStoreSession {
     public Transaction transaction();
 
     /**
+     * Returns {@code true} if performing store operation within a transaction,
+     * {@code false} otherwise. Analogous to calling {@code transaction() != null}.
+     *
+     * @return {@code True} if performing store operation within a transaction,
+     * {@code false} otherwise.
+     */
+    public boolean isWithinTransaction();
+
+    /**
      * Gets current session properties. You can add properties directly to the
      * returned map.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
index fac6ea3..9262a8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
@@ -36,7 +36,6 @@ import org.jetbrains.annotations.*;
 
 import javax.cache.*;
 import javax.cache.integration.*;
-import java.lang.reflect.*;
 import java.util.*;
 
 /**
@@ -913,6 +912,11 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
         }
 
         /** {@inheritDoc} */
+        @Override public boolean isWithinTransaction() {
+            return transaction() != null;
+        }
+
+        /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
         @Override public <K1, V1> Map<K1, V1> properties() {
             SessionData ses0 = sesHolder.get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
index cca20fe..0709880 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
@@ -50,6 +50,11 @@ public class TestCacheSession implements CacheStoreSession {
     }
 
     /** {@inheritDoc} */
+    @Override public boolean isWithinTransaction() {
+        return transaction() != null;
+    }
+
+    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public <K, V> Map<K, V> properties() {
         if (props == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
index 6687f1f..2bbcf1b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
@@ -49,6 +49,11 @@ public class TestThreadLocalCacheSession implements CacheStoreSession {
     }
 
     /** {@inheritDoc} */
+    @Override public boolean isWithinTransaction() {
+        return transaction() != null;
+    }
+
+    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public <K, V> Map<K, V> properties() {
         TestCacheSession ses = sesHolder.get();


[41/50] [abbrv] incubator-ignite git commit: # sprint-2 - exception fix.

Posted by sb...@apache.org.
# sprint-2 - exception fix.


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

Branch: refs/heads/ignite-342
Commit: 6097e7bfc3af49296b50017d5661d313aaa3db80
Parents: a14ef18
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 00:29:42 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 00:29:42 2015 -0500

----------------------------------------------------------------------
 .../examples/datagrid/store/jdbc/CacheJdbcPersonStore.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6097e7bf/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 6388fbf..d80861d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -92,7 +92,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Person load(Long key) {
+    @Override public Person load(Long key) {
         Transaction tx = transaction();
 
         System.out.println(">>> Store load [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
@@ -185,7 +185,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
             }
         }
         catch (SQLException e) {
-            throw new CacheLoaderException("Failed to remove object: " + key, e);
+            throw new CacheWriterException("Failed to remove object: " + key, e);
         }
         finally {
             end(tx, conn);
@@ -302,7 +302,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
     /**
      * @return Current transaction.
      */
-    @Nullable private Transaction transaction() {
+    private Transaction transaction() {
         return ses != null ? ses.transaction() : null;
     }
 }


[04/50] [abbrv] incubator-ignite git commit: ignite-11 use ExecutorCompletionService.

Posted by sb...@apache.org.
ignite-11 use ExecutorCompletionService.


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

Branch: refs/heads/ignite-342
Commit: 8b9e7f8f5ae205da389411f5aa763d329e3ea6bd
Parents: de75adb
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Feb 26 17:23:52 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Feb 26 17:23:52 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/util/IgniteUtils.java       |  1 +
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   | 85 +++++++++-----------
 2 files changed, 40 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b9e7f8f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index a8b6991..b24743a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -298,6 +298,7 @@ public abstract class IgniteUtils {
     private static final Map<Class<? extends IgniteCheckedException>, C1<IgniteCheckedException, IgniteException>>
         exceptionConverters;
 
+    /** */
     private volatile static IgniteBiTuple<Collection<String>, Collection<String>> cachedLocalAddr;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b9e7f8f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 322b954..80b793a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -1018,13 +1018,10 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
         private int connInProgress;
 
         /** */
-        private boolean closed;
-
-        /** */
         private final ExecutorService executor;
 
         /** */
-        private final Queue<GridTuple3<InetSocketAddress, Socket, Exception>> queue = new LinkedList<>();
+        private final CompletionService<GridTuple3<InetSocketAddress, Socket, Exception>> completionSrvc;
 
         /**
          * @param addrs Addresses.
@@ -1033,19 +1030,19 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
         public SocketMultiConnector(Collection<InetSocketAddress> addrs, final int retryCnt) {
             connInProgress = addrs.size();
 
-            executor = Executors.newFixedThreadPool(Math.min(10, addrs.size()));
+            executor = Executors.newFixedThreadPool(Math.min(1, addrs.size()));
+
+            completionSrvc = new ExecutorCompletionService<>(executor);
 
             for (final InetSocketAddress addr : addrs) {
-                executor.execute(new Runnable() {
-                    @Override public void run() {
+                completionSrvc.submit(new Callable<GridTuple3<InetSocketAddress, Socket, Exception>>() {
+                    @Override public GridTuple3<InetSocketAddress, Socket, Exception> call() {
                         Exception ex = null;
                         Socket sock = null;
 
                         for (int i = 0; i < retryCnt; i++) {
-                            synchronized (SocketMultiConnector.this) {
-                                if (closed)
-                                    return;
-                            }
+                            if (Thread.currentThread().isInterrupted())
+                                return null; // Executor is shutdown.
 
                             try {
                                 sock = openSocket(addr);
@@ -1057,16 +1054,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
                             }
                         }
 
-                        synchronized (SocketMultiConnector.this) {
-                            if (closed)
-                                U.closeQuiet(sock);
-                            else
-                                queue.add(new GridTuple3<>(addr, sock, ex));
-
-                            connInProgress--;
-
-                            SocketMultiConnector.this.notifyAll();
-                        }
+                        return new GridTuple3<>(addr, sock, ex);
                     }
                 });
             }
@@ -1075,46 +1063,51 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
         /**
          *
          */
-        @Nullable public synchronized GridTuple3<InetSocketAddress, Socket, Exception> next() {
-            try {
-                do {
-                    if (closed)
-                        return null;
+        @Nullable public GridTuple3<InetSocketAddress, Socket, Exception> next() {
+            if (connInProgress == 0)
+                return null;
 
-                    GridTuple3<InetSocketAddress, Socket, Exception> res = queue.poll();
-
-                    if (res != null)
-                        return res;
-
-                    if (connInProgress == 0)
-                        return null;
+            try {
+                connInProgress--;
 
-                    wait();
-                }
-                while (true);
+                return completionSrvc.take().get();
             }
             catch (InterruptedException e) {
                 throw new IgniteSpiException("Thread has been interrupted.", e);
             }
+            catch (ExecutionException e) {
+                throw new IgniteSpiException(e);
+            }
         }
 
         /**
          *
          */
         public void close() {
-            synchronized (this) {
-                if (closed)
-                    return;
-
-                closed = true;
+            executor.shutdown();
 
-                notifyAll();
-            }
+            if (connInProgress > 0) {
+                new Thread(new Runnable() {
+                    @Override public void run() {
+                        try {
+                            for (int i = 0; i < connInProgress; i++) {
+                                try {
+                                    GridTuple3<InetSocketAddress, Socket, Exception> take = completionSrvc.take().get();
 
-            executor.shutdown();
+                                    if (take != null)
+                                        IgniteUtils.closeQuiet(take.get2());
+                                }
+                                catch (ExecutionException ignored) {
 
-            for (GridTuple3<InetSocketAddress, Socket, Exception> tuple : queue)
-                U.closeQuiet(tuple.get2());
+                                }
+                            }
+                        }
+                        catch (InterruptedException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }).start();
+            }
         }
     }
 }


[09/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: adb24548b7a934eef474a389acec14c0905ff241
Parents: 8f566e0 9e1377f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Feb 26 22:40:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Feb 26 22:40:28 2015 +0700

----------------------------------------------------------------------
 ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +++++++++++++++++++
 .../testsuites/IgniteKernalSelfTestSuite.java   |   1 +
 2 files changed, 104 insertions(+)
----------------------------------------------------------------------



[46/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-11' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-11' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: c9f46c1b39577c82d1084f13ffedb965a8e2c83c
Parents: 036bd71 6130f7e
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun Mar 1 22:59:09 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun Mar 1 22:59:09 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/util/IgniteUtils.java       |  90 ++++++++++--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 137 +++++++++++--------
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   | 116 ++++++++++++++++
 3 files changed, 275 insertions(+), 68 deletions(-)
----------------------------------------------------------------------



[44/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixing comments.

Posted by sb...@apache.org.
# sprint-2 - fixing comments.


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

Branch: refs/heads/ignite-342
Commit: 3a77acf759cd30bbb7bdcb51ab8e1bcecb273639
Parents: 16105ec
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 09:49:15 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 09:49:15 2015 -0800

----------------------------------------------------------------------
 .../ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a77acf7/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 0473280..55ba1a7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -131,7 +131,8 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
 
             int updated;
 
-            // Try update first.
+            // Try update first. If it does not work, then try insert.
+            // Some databases would allow these to be done in one 'upsert' operation.
             try (PreparedStatement st = conn.prepareStatement(
                 "update PERSONS set firstName=?, lastName=? where id=?")) {
                 st.setString(1, val.getFirstName());


[26/50] [abbrv] incubator-ignite git commit: # ignite-325: revert license from some files and fix serialVersionUID at 2 files

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index f83765a..fcf10e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -25,6 +25,9 @@ import java.util.*;
  */
 public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage {
     /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
     private Serializable msg;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/winservice/IgniteService.sln
----------------------------------------------------------------------
diff --git a/modules/winservice/IgniteService.sln b/modules/winservice/IgniteService.sln
index e8ba1ec..7658fb1 100644
--- a/modules/winservice/IgniteService.sln
+++ b/modules/winservice/IgniteService.sln
@@ -1,17 +1,3 @@
-# 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.
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/winservice/IgniteService/IgniteService.csproj
----------------------------------------------------------------------
diff --git a/modules/winservice/IgniteService/IgniteService.csproj b/modules/winservice/IgniteService/IgniteService.csproj
index 6c4f87e..6f41039 100644
--- a/modules/winservice/IgniteService/IgniteService.csproj
+++ b/modules/winservice/IgniteService/IgniteService.csproj
@@ -1,20 +1,3 @@
-<!--
-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.
--->
-
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bd5f2d3..98f649d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,6 +543,8 @@
                                         <exclude>src/test/java/org/apache/ignite/internal/processors/hadoop/books/*.txt</exclude><!--books examples-->
                                         <exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
                                         <exclude>src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
+                                        <exclude>modules/winservice/IgniteService.sln</exclude>
+                                        <exclude>modules/winservice/IgniteService/IgniteService.csproj</exclude>
                                         <!--shmem-->
                                         <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
                                         <exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
@@ -551,8 +553,6 @@
                                         <exclude>ipc/shmem/config.sub</exclude><!--own license-->
                                         <exclude>ipc/shmem/configure</exclude><!--own license-->
                                         <exclude>ipc/shmem/configure.ac</exclude><!---->
-                                        <exclude>ipc/shmem/igniteshmem/.libs/*</exclude><!--tmp files-->
-                                        <exclude>ipc/shmem/igniteshmem/.deps/*</exclude><!--tmp files-->
                                         <exclude>ipc/shmem/ltmain.sh</exclude><!--own license-->
                                         <exclude>ipc/shmem/install-sh</exclude><!--own license-->
                                         <exclude>ipc/shmem/depcomp</exclude><!--own license-->
@@ -560,6 +560,10 @@
                                         <exclude>ipc/shmem/libtool</exclude><!--own license-->
                                         <exclude>ipc/shmem/missing</exclude><!--own license-->
                                         <exclude>ipc/shmem/stamp-h1</exclude><!--tmp timestamp-->
+                                        <exclude>ipc/shmem/ltmain.sh</exclude><!--tmp (not under VCS)-->
+                                        <exclude>ipc/shmem/include/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h</exclude><!--auto generated files-->
+                                        <exclude>ipc/shmem/igniteshmem/.libs/*</exclude><!--tmp files-->
+                                        <exclude>ipc/shmem/igniteshmem/.deps/*</exclude><!--tmp files-->
                                         <exclude>ipc/shmem/igniteshmem/libigniteshmem.la</exclude><!--tmp (not under VCS)-->
                                         <exclude>ipc/shmem/igniteshmem/libigniteshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo</exclude><!--tmp (not under VCS)-->
                                     </excludes>


[19/50] [abbrv] incubator-ignite git commit: # Minor JavaDoc fixes.

Posted by sb...@apache.org.
# Minor JavaDoc fixes.


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

Branch: refs/heads/ignite-342
Commit: cefc8855b5d18c6ab2c27ec88f51f0bf8c73476f
Parents: 55c093d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 13:49:44 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 13:49:44 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  4 +--
 .../configuration/QueryConfiguration.java       | 37 ++++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cefc8855/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index a120701..8851d8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -37,7 +37,7 @@ import java.util.concurrent.*;
  * each instance a different name.
  * <p>
  * Note that {@code Grid} extends {@link ClusterGroup} which means that it provides grid projection
- * functionality over the whole grid (instead os a subgroup of nodes).
+ * functionality over the whole grid (instead of a subgroup of nodes).
  * <p>
  * In addition to {@link ClusterGroup} functionality, from here you can get the following:
  * <ul>
@@ -159,7 +159,7 @@ public interface Ignite extends AutoCloseable {
      * Creates new {@link ExecutorService} which will execute all submitted
      * {@link java.util.concurrent.Callable} and {@link Runnable} jobs on nodes in this grid projection.
      * This essentially
-     * creates a <b><i>Distributed Thread Pool</i</b> that can be used as a
+     * creates a <b><i>Distributed Thread Pool</i></b> that can be used as a
      * replacement for local thread pools.
      *
      * @return Grid-enabled {@code ExecutorService}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cefc8855/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
index 98b0f6f..2aba025 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/QueryConfiguration.java
@@ -76,7 +76,11 @@ public class QueryConfiguration {
         this.maxOffHeapMemory = maxOffHeapMemory;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Gets maximum amount of memory available to off-heap storage.
+     *
+     * @return Maximum memory in bytes available to off-heap memory space.
+     */
     public long getMaxOffHeapMemory() {
         return maxOffHeapMemory;
     }
@@ -103,12 +107,20 @@ public class QueryConfiguration {
         this.searchPath = searchPath;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Gets the optional search path consisting of space names to search SQL schema objects.
+     *
+     * @return Search path.
+     */
     @Nullable public String[] getSearchPath() {
         return searchPath;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Gets script path to be ran against H2 database after opening.
+     *
+     * @return Script path.
+     */
     @Nullable public String getInitialScriptPath() {
         return initScriptPath;
     }
@@ -133,12 +145,21 @@ public class QueryConfiguration {
         this.idxCustomFuncClss = idxCustomFuncClss;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Gets classes with methods annotated by {@link QuerySqlFunction}
+     * to be used as user-defined functions from SQL queries.
+     *
+     * @return List of classes.
+     */
     @Nullable public Class<?>[] getIndexCustomFunctionClasses() {
         return idxCustomFuncClss;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Get long query execution time timeout.
+     *
+     * @return Long query execution timeout.
+     */
     public long getLongQueryExecutionTimeout() {
         return longQryExecTimeout;
     }
@@ -157,7 +178,11 @@ public class QueryConfiguration {
         this.longQryExecTimeout = longQryExecTimeout;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Gets flag marking SPI should print SQL execution plan for long queries (explain SQL query).
+     *
+     * @return Flag marking SPI should print SQL execution plan for long queries (explain SQL query).
+     */
     public boolean isLongQueryExplain() {
         return longQryExplain;
     }


[02/50] [abbrv] incubator-ignite git commit: Merge commit

Posted by sb...@apache.org.
Merge commit


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

Branch: refs/heads/ignite-342
Commit: 153cbee41b8adbcac1989f7746d1ef51049cda1f
Parents: 493775a bf8c048
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Feb 26 17:01:52 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Feb 26 17:01:52 2015 +0300

----------------------------------------------------------------------
 examples/config/example-compute.xml             |    2 +
 .../hibernate/example-hibernate-L2-cache.xml    |    2 +-
 .../ComputeFibonacciContinuationExample.java    |   17 +-
 .../examples/datagrid/CacheApiExample.java      |    4 +-
 .../datagrid/CacheContinuousQueryExample.java   |    6 +-
 .../IgniteCountDownLatchExample.java            |    3 +-
 .../MessagingPingPongListenActorExample.java    |    3 +-
 .../examples/ScalarContinuationExample.scala    |   20 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |   10 +-
 .../internal/client/ClientStartNodeTask.java    |    5 +-
 .../processors/rest/RestProcessorTest.java      |    8 +-
 .../processors/rest/TestBinaryClient.java       |    1 -
 .../processors/rest/TestMemcacheClient.java     |   13 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |    2 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   28 +-
 .../java/org/apache/ignite/IgniteCache.java     |   69 +
 .../java/org/apache/ignite/IgniteCluster.java   |    3 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |    2 +-
 .../apache/ignite/IgniteSystemProperties.java   |    5 +
 .../ignite/cache/IgniteEntryProcessor.java      |   28 +
 .../CacheRendezvousAffinityFunction.java        |    1 +
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   28 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     |   60 -
 .../org/apache/ignite/events/EventType.java     |    8 +
 .../IgfsByteDelimiterRecordResolver.java        |    1 +
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |    9 +-
 .../internal/GridEventConsumeHandler.java       |    1 +
 .../ignite/internal/GridKernalContext.java      |   16 +-
 .../ignite/internal/GridKernalContextImpl.java  |   23 +-
 .../internal/GridMessageListenHandler.java      |    1 +
 .../apache/ignite/internal/IgniteKernal.java    |   11 +-
 .../cluster/ClusterNodeLocalMapImpl.java        |   27 +-
 .../cluster/IgniteClusterAsyncImpl.java         |    3 +-
 .../internal/cluster/IgniteClusterImpl.java     |    4 +-
 .../internal/events/DiscoveryCustomEvent.java   |   68 +
 .../igfs/common/IgfsControlResponse.java        |    1 +
 .../internal/igfs/common/IgfsMarshaller.java    |    1 +
 .../internal/managers/GridManagerAdapter.java   |    5 +
 .../discovery/GridDiscoveryManager.java         |  105 +-
 .../affinity/GridAffinityMessage.java           |    1 +
 .../processors/cache/GridCacheEntryInfo.java    |    5 +-
 .../processors/cache/GridCacheMapEntry.java     |  562 ++--
 .../processors/cache/GridCacheSwapManager.java  |    4 +-
 .../processors/cache/GridCacheUtils.java        |    4 +
 .../processors/cache/IgniteCacheProxy.java      |   63 +
 .../GridDistributedTxRemoteAdapter.java         |   66 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   44 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   84 +-
 .../distributed/near/GridNearAtomicCache.java   |    3 -
 .../query/GridCacheDistributedQueryManager.java |    4 +-
 .../cache/query/GridCacheQueryManager.java      |    2 +-
 .../continuous/CacheContinuousQueryEntry.java   |    1 +
 .../continuous/CacheContinuousQueryHandler.java |    1 +
 .../cache/transactions/IgniteTxAdapter.java     |   58 +-
 .../cache/transactions/IgniteTxEntry.java       |   17 +-
 .../transactions/IgniteTxLocalAdapter.java      |   48 +-
 .../version/GridCacheRawVersionedEntry.java     |    1 +
 .../cache/version/GridCacheVersion.java         |    3 +-
 .../GridCacheVersionConflictContext.java        |   35 +-
 .../cache/version/GridCacheVersionEx.java       |    2 +-
 .../processors/clock/GridClockMessage.java      |    1 +
 .../closure/GridClosureProcessor.java           |   82 +-
 .../dataload/GridDataLoaderProcessor.java       |    2 +-
 .../datastructures/DataStructuresProcessor.java |    2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |    6 +-
 .../processors/igfs/IgfsDataManager.java        |    4 +-
 .../internal/processors/igfs/IgfsImpl.java      |    6 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    4 +-
 .../internal/processors/igfs/IgfsServer.java    |    1 +
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../processors/rest/GridRestProcessor.java      |   85 +-
 .../processors/rest/GridRestResponse.java       |    1 +
 .../message/GridClientAbstractMessage.java      |    1 +
 .../message/GridClientHandshakeRequest.java     |    1 +
 .../cache/GridCacheQueryCommandHandler.java     |    7 +-
 .../protocols/tcp/GridMemcachedMessage.java     |    3 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   10 +-
 .../securesession/GridSecureSession.java        |   60 -
 .../GridSecureSessionProcessor.java             |   59 -
 .../os/GridOsSecureSessionProcessor.java        |   61 -
 .../security/GridSecurityContext.java           |  251 --
 .../security/GridSecurityProcessor.java         |    6 +-
 .../processors/security/SecurityContext.java    |   56 +
 .../security/os/GridOsSecurityProcessor.java    |  146 +-
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../internal/util/IgniteExceptionRegistry.java  |  259 ++
 .../ignite/internal/util/IgniteUtils.java       | 2569 ++++++++----------
 .../nio/GridConnectionBytesVerifyFilter.java    |    1 +
 .../util/nio/GridTcpCommunicationClient.java    |    1 +
 .../apache/ignite/internal/util/typedef/X.java  |    3 +-
 .../VisorComputeToggleMonitoringTask.java       |    4 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |    4 +-
 .../node/VisorNodeEventsCollectorTask.java      |    3 +-
 .../visor/query/VisorQueryCleanupTask.java      |    4 +-
 .../visor/query/VisorQueryNextPageTask.java     |    6 +-
 .../internal/visor/query/VisorQueryTask.java    |    4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   45 +-
 .../ignite/lang/IgniteProductVersion.java       |    1 +
 .../optimized/optimized-classnames.properties   |    3 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    6 +
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   15 +
 .../org/apache/ignite/spi/IgniteSpiContext.java |    8 +
 .../ignite/spi/IgniteSpiThreadFactory.java      |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   54 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |    7 +
 .../spi/discovery/DiscoverySpiListener.java     |   11 +-
 .../DiscoverySpiNodeAuthenticator.java          |    2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |    7 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  280 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |    3 +
 .../tcp/internal/TcpDiscoveryNode.java          |    1 +
 .../TcpDiscoveryMulticastIpFinder.java          |    1 +
 .../messages/TcpDiscoveryAuthFailedMessage.java |    1 +
 .../TcpDiscoveryCustomEventMessage.java         |   66 +
 .../messages/TcpDiscoveryHeartbeatMessage.java  |    1 +
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    2 +-
 .../core/src/main/resources/ignite.properties   |    2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   44 +
 .../internal/GridEventStorageSelfTest.java      |    3 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |   24 +-
 .../internal/GridMultipleJobsSelfTest.java      |    2 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |    4 +-
 .../GridTaskContinuousMapperSelfTest.java       |    3 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |   20 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  101 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   13 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    5 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   33 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   12 +-
 .../GridCacheMultiNodeDataStructureTest.java    |    3 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   16 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |    4 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    6 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    3 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |    2 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |    3 +
 .../GridCacheRandomEvictionPolicySelfTest.java  |    2 +-
 .../IgniteCacheLoaderWriterAbstractTest.java    |   47 +
 .../closure/GridClosureProcessorSelfTest.java   |   14 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |    5 +-
 .../igfs/IgfsDataManagerSelfTest.java           |    1 +
 .../processors/igfs/IgfsProcessorSelfTest.java  |    3 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 .../util/IgniteExceptionRegistrySelfTest.java   |   89 +
 .../internal/util/IgniteUtilsSelfTest.java      |    6 +-
 .../internal/util/nio/GridRoundTripTest.java    |    1 +
 .../offheap/GridOffHeapMapAbstractSelfTest.java |    1 +
 .../cache/GridCacheDataStructuresLoadTest.java  |   36 +-
 .../loadtests/cache/GridCacheLoadTest.java      |    6 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |    5 +-
 .../loadtests/colocation/GridTestMain.java      |    3 +-
 .../communication/GridIoManagerBenchmark.java   |    3 +-
 .../GridMultiSplitsRedeployLoadTest.java        |    5 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |    3 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   16 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |    2 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    3 +-
 .../loadtests/mapper/GridNodeStartup.java       |    3 +-
 .../mergesort/GridMergeSortLoadTest.java        |    3 +-
 .../streamer/GridStreamerIndexLoadTest.java     |    4 +-
 .../swap/GridSwapEvictAllBenchmark.java         |    3 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 ...idSessionFutureWaitJobAttributeSelfTest.java |    3 +-
 .../GridSessionSetTaskAttributeSelfTest.java    |    3 +-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |    3 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   22 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   23 -
 .../roundrobin/GridRoundRobinTestUtils.java     |    6 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |    1 +
 .../index/GridStreamerIndexSelfTest.java        |   17 +-
 .../window/GridStreamerWindowSelfTest.java      |    3 +-
 .../testframework/GridSpiTestContext.java       |    6 +
 .../junits/GridTestKernalContext.java           |    2 +
 .../ignite/testframework/junits/IgniteMock.java |    1 -
 .../cache/GridAbstractCacheStoreSelfTest.java   |    3 +-
 .../junits/spi/GridSpiAbstractTest.java         |   12 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    3 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |    1 +
 .../tests/p2p/GridP2PAwareTestUserResource.java |    5 +-
 .../tests/p2p/GridTestMessageListener.java      |    4 +-
 modules/hadoop/pom.xml                          |   10 -
 .../client/hadoop/GridHadoopClientProtocol.java |    3 +-
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopWrapper.java |    2 +-
 .../hadoop/GridHadoopDefaultJobInfo.java        |    5 +-
 .../processors/hadoop/GridHadoopSetup.java      |    3 +-
 .../GridHadoopDefaultMapReducePlanner.java      |    3 +-
 .../shuffle/GridHadoopShuffleMessage.java       |    1 +
 .../taskexecutor/GridHadoopExecutorService.java |    2 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |    3 +-
 .../hadoop/GridHadoopGroupingTest.java          |   10 +-
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |    2 +-
 .../hadoop/GridHadoopSortingTest.java           |    9 +-
 .../processors/hadoop/GridHadoopStartup.java    |    2 +-
 .../ignite/loadtests/igfs/IgfsNodeStartup.java  |    3 +-
 .../testsuites/IgniteHadoopTestSuite.java       |    7 +-
 ...idHibernateAbstractRegionAccessStrategy.java |   97 -
 .../GridHibernateAccessStrategyAdapter.java     |  369 ---
 .../GridHibernateCollectionRegion.java          |   99 -
 .../hibernate/GridHibernateEntityRegion.java    |  110 -
 .../GridHibernateGeneralDataRegion.java         |   69 -
 .../hibernate/GridHibernateNaturalIdRegion.java |   98 -
 .../GridHibernateNonStrictAccessStrategy.java   |  220 --
 .../GridHibernateQueryResultsRegion.java        |   71 -
 .../GridHibernateReadOnlyAccessStrategy.java    |  106 -
 .../GridHibernateReadWriteAccessStrategy.java   |  282 --
 .../cache/hibernate/GridHibernateRegion.java    |  101 -
 .../hibernate/GridHibernateRegionFactory.java   |  231 --
 .../GridHibernateTimestampsRegion.java          |   40 -
 ...ridHibernateTransactionalAccessStrategy.java |  139 -
 .../GridHibernateTransactionalDataRegion.java   |   96 -
 .../HibernateAbstractRegionAccessStrategy.java  |   97 +
 .../HibernateAccessStrategyAdapter.java         |  369 +++
 .../hibernate/HibernateCollectionRegion.java    |   99 +
 .../cache/hibernate/HibernateEntityRegion.java  |  110 +
 .../hibernate/HibernateGeneralDataRegion.java   |   69 +
 .../hibernate/HibernateNaturalIdRegion.java     |   98 +
 .../HibernateNonStrictAccessStrategy.java       |  220 ++
 .../hibernate/HibernateQueryResultsRegion.java  |   71 +
 .../HibernateReadOnlyAccessStrategy.java        |  106 +
 .../HibernateReadWriteAccessStrategy.java       |  282 ++
 .../ignite/cache/hibernate/HibernateRegion.java |  101 +
 .../cache/hibernate/HibernateRegionFactory.java |  231 ++
 .../hibernate/HibernateTimestampsRegion.java    |   40 +
 .../HibernateTransactionalAccessStrategy.java   |  139 +
 .../HibernateTransactionalDataRegion.java       |   96 +
 .../apache/ignite/cache/hibernate/package.html  |    2 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |  393 ---
 .../hibernate/GridHibernateL2CacheSelfTest.java | 1923 -------------
 ...idHibernateL2CacheTransactionalSelfTest.java |  135 -
 .../HibernateL2CacheConfigurationSelfTest.java  |  393 +++
 .../hibernate/HibernateL2CacheSelfTest.java     | 1925 +++++++++++++
 .../HibernateL2CacheTransactionalSelfTest.java  |  135 +
 .../testsuites/IgniteHibernateTestSuite.java    |    6 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheCrossCacheQuerySelfTestNewApi.java |    2 +-
 .../http/jetty/GridJettyRestHandler.java        |    1 +
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    4 +-
 ...gniteProjectionStartStopRestartSelfTest.java |    3 +-
 pom.xml                                         |    2 +-
 247 files changed, 8023 insertions(+), 7780 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/153cbee4/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --cc examples/config/example-compute.xml
index c532e17,c532e17..303b4eb
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@@ -32,6 -32,6 +32,8 @@@
          <!-- Set to true to enable distributed class loading for examples, default is false. -->
          <property name="peerClassLoadingEnabled" value="true"/>
  
++        <property name="localHost" value="127.0.0.1" />
++
          <property name="marshaller">
              <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                  <!-- Set to false to allow non-serializable objects in examples, default is true. -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/153cbee4/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/153cbee4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 3e9c120,ecdc6cc..3fc52b1
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@@ -1395,83 -1399,68 +1399,86 @@@ public class TcpDiscoverySpi extends Tc
                  return false;
  
              boolean retry = false;
 -            IgniteCheckedException errs = null;
 +            Collection<Exception> errs = new ArrayList<>();
  
 -            for (InetSocketAddress addr : addrs) {
 -                try {
 -                    Integer res = sendMessageDirectly(joinReq, addr);
 +            SocketMultiConnector multiConnector = new SocketMultiConnector(addrs, 2);
  
 -                    assert res != null;
 +            try {
 +                GridTuple3<InetSocketAddress, Socket, Exception> tuple;
  
 -                    noResAddrs.remove(addr);
 +                while ((tuple = multiConnector.next()) != null) {
 +                    InetSocketAddress addr = tuple.get1();
 +                    Socket sock = tuple.get2();
 +                    Exception ex = tuple.get3();
  
 -                    // Address is responsive, reset period start.
 -                    noResStart = 0;
 +                    if (ex == null) {
 +                        assert sock != null;
  
 -                    switch (res) {
 -                        case RES_WAIT:
 -                            // Concurrent startup, try sending join request again or wait if no success.
 -                            retry = true;
 +                        try {
 +                            Integer res = sendMessageDirectly(joinReq, addr, sock);
  
 -                            break;
 -                        case RES_OK:
 -                            if (log.isDebugEnabled())
 -                                log.debug("Join request message has been sent to address [addr=" + addr +
 -                                    ", req=" + joinReq + ']');
 +                            assert res != null;
  
 -                            // Join request sending succeeded, wait for response from topology.
 -                            return true;
 +                            noResAddrs.remove(addr);
  
 -                        default:
 -                            // Concurrent startup, try next node.
 -                            if (res == RES_CONTINUE_JOIN) {
 -                                if (!fromAddrs.contains(addr))
 +                            // Address is responsive, reset period start.
 +                            noResStart = 0;
 +
 +                            switch (res) {
 +                                case RES_WAIT:
 +                                    // Concurrent startup, try sending join request again or wait if no success.
                                      retry = true;
 -                            }
 -                            else {
 -                                if (log.isDebugEnabled())
 -                                    log.debug("Unexpected response to join request: " + res);
  
 -                                retry = true;
 -                            }
 +                                    break;
 +                                case RES_OK:
 +                                    if (log.isDebugEnabled())
 +                                        log.debug("Join request message has been sent to address [addr=" + addr +
 +                                            ", req=" + joinReq + ']');
  
 -                            break;
 +                                    // Join request sending succeeded, wait for response from topology.
 +                                    return true;
 +
 +                                default:
 +                                    // Concurrent startup, try next node.
 +                                    if (res == RES_CONTINUE_JOIN) {
 +                                        if (!fromAddrs.contains(addr))
 +                                            retry = true;
 +                                    }
 +                                    else {
 +                                        if (log.isDebugEnabled())
 +                                            log.debug("Unexpected response to join request: " + res);
 +
 +                                        retry = true;
 +                                    }
 +
 +                                    break;
 +                            }
 +                        }
 +                        catch (IgniteSpiException e) {
 +                            ex = e;
 +                        }
                      }
 -                }
 -                catch (IgniteSpiException e) {
 -                    if (errs == null)
 -                        errs = new IgniteCheckedException("Multiple connection attempts failed.");
  
 -                    errs.addSuppressed(e);
 +                    if (ex != null) {
 +                        errs.add(ex);
  
 -                    if (log.isDebugEnabled()) {
 -                        IOException ioe = X.cause(e, IOException.class);
 +                        if (log.isDebugEnabled()) {
 +                            IOException ioe = X.cause(ex, IOException.class);
  
 -                        log.debug("Failed to send join request message [addr=" + addr +
 -                            ", msg=" + ioe != null ? ioe.getMessage() : e.getMessage() + ']');
 +                            log.debug("Failed to send join request message [addr=" + addr +
 +                                ", msg=" + ioe != null ? ioe.getMessage() : ex.getMessage() + ']');
+ 
 -                        onException("Failed to send join request message [addr=" + addr +
 -                            ", msg=" + ioe != null ? ioe.getMessage() : e.getMessage() + ']', ioe);
 -                    }
++                            onException("Failed to send join request message [addr=" + addr +
++                                ", msg=" + ioe != null ? ioe.getMessage() : ex.getMessage() + ']', ioe);
 +                        }
  
 -                    noResAddrs.add(addr);
 +                        noResAddrs.add(addr);
 +                    }
                  }
              }
 +            finally {
 +                multiConnector.close();
 +            }
  
              if (retry) {
                  if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/153cbee4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------


[36/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: f053746ff8c6f4c03726706f74de7bda3e0a8468
Parents: a663f83 e1c0945
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 18:01:09 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 18:01:09 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[07/50] [abbrv] incubator-ignite git commit: # ignite-11 Fix issues found on review.

Posted by sb...@apache.org.
# ignite-11 Fix issues found on review.


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

Branch: refs/heads/ignite-342
Commit: 6130f7e52214ab0b0d0876d8be0c141e9dc1a2df
Parents: 2999d20
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Feb 26 18:11:50 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Feb 26 18:11:50 2015 +0300

----------------------------------------------------------------------
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  7 +---
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   | 42 +++++++++++++-------
 2 files changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6130f7e5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 3fc52b1..df39d6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1401,9 +1401,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
             boolean retry = false;
             Collection<Exception> errs = new ArrayList<>();
 
-            SocketMultiConnector multiConnector = new SocketMultiConnector(addrs, 2);
-
-            try {
+            try (SocketMultiConnector multiConnector = new SocketMultiConnector(addrs, 2)) {
                 GridTuple3<InetSocketAddress, Socket, Exception> tuple;
 
                 while ((tuple = multiConnector.next()) != null) {
@@ -1476,9 +1474,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                     }
                 }
             }
-            finally {
-                multiConnector.close();
-            }
 
             if (retry) {
                 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6130f7e5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 80b793a..1d9559e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -1013,7 +1013,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
     /**
      *
      */
-    protected class SocketMultiConnector {
+    protected class SocketMultiConnector implements AutoCloseable {
         /** */
         private int connInProgress;
 
@@ -1068,11 +1068,15 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
                 return null;
 
             try {
+                Future<GridTuple3<InetSocketAddress, Socket, Exception>> fut = completionSrvc.take();
+
                 connInProgress--;
 
-                return completionSrvc.take().get();
+                return fut.get();
             }
             catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+
                 throw new IgniteSpiException("Thread has been interrupted.", e);
             }
             catch (ExecutionException e) {
@@ -1080,33 +1084,43 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
             }
         }
 
-        /**
-         *
-         */
-        public void close() {
-            executor.shutdown();
+        /** {@inheritDoc} */
+        @Override public void close() {
+            List<Runnable> unstartedTasks = executor.shutdownNow();
+
+            connInProgress -= unstartedTasks.size();
 
             if (connInProgress > 0) {
-                new Thread(new Runnable() {
+                Thread thread = new Thread(new Runnable() {
                     @Override public void run() {
                         try {
-                            for (int i = 0; i < connInProgress; i++) {
+                            executor.awaitTermination(5, TimeUnit.MINUTES);
+
+                            Future<GridTuple3<InetSocketAddress, Socket, Exception>> fut;
+
+                            while ((fut = completionSrvc.poll()) != null) {
                                 try {
-                                    GridTuple3<InetSocketAddress, Socket, Exception> take = completionSrvc.take().get();
+                                    GridTuple3<InetSocketAddress, Socket, Exception> tuple3 = fut.get();
 
-                                    if (take != null)
-                                        IgniteUtils.closeQuiet(take.get2());
+                                    if (tuple3 != null)
+                                        IgniteUtils.closeQuiet(tuple3.get2());
                                 }
-                                catch (ExecutionException ignored) {
+                                catch (ExecutionException ignore) {
 
                                 }
                             }
                         }
                         catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+
                             throw new RuntimeException(e);
                         }
                     }
-                }).start();
+                });
+
+                thread.setDaemon(true);
+
+                thread.start();
             }
         }
     }


[33/50] [abbrv] incubator-ignite git commit: #ignite-343: change Log4JFileAppender to Log4jRollingFileAppender.

Posted by sb...@apache.org.
#ignite-343: change Log4JFileAppender to Log4jRollingFileAppender.


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

Branch: refs/heads/ignite-342
Commit: e1c0945dd6e459ea9c5a890feac66d6c70274a60
Parents: 28ecf57
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 17:45:36 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 17:45:36 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1c0945d/config/ignite-log4j.xml
----------------------------------------------------------------------
diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml
index 36fb40b..9d4521a 100644
--- a/config/ignite-log4j.xml
+++ b/config/ignite-log4j.xml
@@ -67,10 +67,12 @@
         Logs all output to specified file.
         By default, the logging goes to IGNITE_HOME/work/log folder
     -->
-    <appender name="FILE" class="org.apache.ignite.logger.log4j.Log4JFileAppender">
+    <appender name="FILE" class="org.apache.ignite.logger.log4j.Log4jRollingFileAppender">
         <param name="Threshold" value="DEBUG"/>
         <param name="File" value="${IGNITE_HOME}/work/log/ignite.log"/>
         <param name="Append" value="true"/>
+        <param name="MaxFileSize" value="10MB"/>
+        <param name="MaxBackupIndex" value="10"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/>
         </layout>


[25/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-335' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-335

Posted by sb...@apache.org.
Merge branches 'ignite-335' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-335


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

Branch: refs/heads/ignite-342
Commit: 27a160a01584cd2c780062cee16d94a5a3d6b41c
Parents: 339d57b 0e7a7ef
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Feb 27 17:05:24 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Feb 27 17:05:24 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  12 +
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |   2 +-
 .../configuration/QueryConfiguration.java       |  37 +-
 .../ignite/events/DiscoveryCustomEvent.java     |  56 ---
 .../org/apache/ignite/events/EventType.java     |  14 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   6 +-
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../internal/events/DiscoveryCustomEvent.java   |  68 +++
 .../discovery/GridDiscoveryManager.java         |   7 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  10 +-
 .../visor/node/VisorBasicConfiguration.java     |  17 -
 .../node/VisorNodeEventsCollectorTask.java      |  10 +-
 .../internal/visor/node/VisorNodeGcTask.java    |  10 +-
 .../internal/visor/node/VisorNodePingTask.java  |  10 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   9 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   9 +-
 ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +++++
 .../config/GridTestProperties.java              |  10 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |   1 +
 modules/extdata/p2p/pom.xml                     |   6 -
 .../client/hadoop/GridHadoopClientProtocol.java |   6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 412 ++++++++++++++++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   3 +-
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |  10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 413 -------------------
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   4 +-
 .../hadoop/GridHadoopClassLoader.java           |  12 +-
 .../processors/hadoop/GridHadoopSetup.java      |   8 +-
 .../processors/hadoop/GridHadoopUtils.java      |   4 +-
 .../collections/GridHadoopHashMultimapBase.java |   2 +-
 .../GridHadoopExternalCommunication.java        |  14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |   6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |   2 +-
 .../GridHadoopClientProtocolSelfTest.java       |   6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |   2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |   2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |   1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   2 +-
 .../hadoop/GridHadoopGroupingTest.java          |   4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |   9 +-
 .../testsuites/IgniteHadoopTestSuite.java       |   7 +-
 modules/hibernate/pom.xml                       |   6 -
 modules/indexing/pom.xml                        |   6 -
 modules/jta/pom.xml                             |   6 -
 modules/scalar/pom.xml                          |   6 -
 modules/spring/pom.xml                          |   6 -
 modules/visor-console/pom.xml                   |   7 -
 .../commands/alert/VisorAlertCommand.scala      |   8 +-
 .../commands/cache/VisorCacheCommand.scala      |  82 ++--
 .../config/VisorConfigurationCommand.scala      | 140 ++++---
 .../commands/disco/VisorDiscoveryCommand.scala  |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  64 ++-
 .../commands/tasks/VisorTasksCommandSpec.scala  |   2 +-
 modules/web/pom.xml                             |   6 -
 59 files changed, 922 insertions(+), 760 deletions(-)
----------------------------------------------------------------------



[32/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-343

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-343


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

Branch: refs/heads/ignite-342
Commit: 28ecf57acd93c7ca5fe6ca9abf90fa9a233e3707
Parents: e16f2a1 b14be3b
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 17:41:06 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 17:41:06 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |   12 +
 .../datagrid/CacheContinuousQueryExample.java   |    2 +-
 ipc/shmem/Makefile.am                           |   15 +
 ipc/shmem/igniteshmem/Makefile.am               |   15 +
 ipc/shmem/include/Makefile.am                   |   15 +
 modules/clients/src/test/keystore/generate.sh   |   15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    4 +-
 .../ignite/cache/query/ContinuousQuery.java     |   18 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |    2 +-
 .../configuration/QueryConfiguration.java       |   37 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |    6 +-
 .../internal/events/DiscoveryCustomEvent.java   |    3 +
 .../processors/cache/IgniteCacheProxy.java      |    6 +-
 .../visor/node/VisorBasicConfiguration.java     |   17 -
 .../optimized-classnames.previous.properties    |   15 +
 .../optimized/optimized-classnames.properties   | 1565 +-----------------
 .../TcpDiscoveryCustomEventMessage.java         |    3 +
 ...ridCacheContinuousQueryAbstractSelfTest.java |    8 +-
 .../config/GridTestProperties.java              |   10 +-
 modules/extdata/p2p/pom.xml                     |    6 -
 .../client/hadoop/GridHadoopClientProtocol.java |    6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  412 +++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |   10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  413 -----
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |    4 +-
 .../hadoop/GridHadoopClassLoader.java           |   12 +-
 .../processors/hadoop/GridHadoopSetup.java      |    8 +-
 .../processors/hadoop/GridHadoopUtils.java      |    4 +-
 .../collections/GridHadoopHashMultimapBase.java |    2 +-
 .../GridHadoopExternalCommunication.java        |   14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |    6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |    2 +-
 .../GridHadoopClientProtocolSelfTest.java       |    6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |    2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |    2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |    2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |    1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    2 +-
 .../hadoop/GridHadoopGroupingTest.java          |    4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |    9 +-
 modules/hibernate/pom.xml                       |    6 -
 modules/indexing/pom.xml                        |    6 -
 modules/jta/pom.xml                             |    6 -
 modules/scalar/pom.xml                          |    6 -
 modules/spring/pom.xml                          |    6 -
 modules/visor-console/pom.xml                   |    7 -
 .../commands/alert/VisorAlertCommand.scala      |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |   82 +-
 .../config/VisorConfigurationCommand.scala      |  140 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   64 +-
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 +-
 modules/web/pom.xml                             |    6 -
 modules/winservice/IgniteService.sln            |    2 +-
 .../IgniteService/IgniteService.csproj          |    2 +-
 .../config/benchmark-atomic-win.properties      |   15 +
 .../config/benchmark-atomic.properties          |   15 +
 .../config/benchmark-compute-win.properties     |   15 +
 .../config/benchmark-compute.properties         |   15 +
 .../config/benchmark-multicast.properties       |   15 +
 .../config/benchmark-query-win.properties       |   15 +
 .../yardstick/config/benchmark-query.properties |   15 +
 .../config/benchmark-tx-win.properties          |   15 +
 .../yardstick/config/benchmark-tx.properties    |   15 +
 .../yardstick/config/benchmark-win.properties   |   15 +
 modules/yardstick/config/benchmark.properties   |   15 +
 pom.xml                                         |  150 +-
 70 files changed, 1060 insertions(+), 2303 deletions(-)
----------------------------------------------------------------------



[16/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-325

Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-325


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

Branch: refs/heads/ignite-342
Commit: c9f83ffdb0b1df4697ae716c76c29cba0a074922
Parents: 6a083e5 4e7463d
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 13:19:53 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 13:19:53 2015 +0300

----------------------------------------------------------------------
 .../ComputeFibonacciContinuationExample.java    |   17 +-
 .../datagrid/CacheContinuousQueryExample.java   |    6 +-
 .../IgniteCountDownLatchExample.java            |    3 +-
 .../MessagingPingPongListenActorExample.java    |    3 +-
 .../examples/ScalarContinuationExample.scala    |   20 +-
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |   10 +-
 .../internal/client/ClientStartNodeTask.java    |    5 +-
 .../processors/rest/RestProcessorTest.java      |    8 +-
 .../processors/rest/TestBinaryClient.java       |    1 -
 .../processors/rest/TestMemcacheClient.java     |   13 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |    2 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   28 +-
 .../java/org/apache/ignite/IgniteCache.java     |   69 +
 .../java/org/apache/ignite/IgniteCluster.java   |    3 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |    2 +-
 .../apache/ignite/IgniteSystemProperties.java   |    5 +
 .../ignite/cache/IgniteEntryProcessor.java      |   28 +
 .../CacheRendezvousAffinityFunction.java        |    1 +
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   28 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     |   60 -
 .../org/apache/ignite/events/EventType.java     |    8 +
 .../IgfsByteDelimiterRecordResolver.java        |    1 +
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |    9 +-
 .../internal/GridEventConsumeHandler.java       |    1 +
 .../ignite/internal/GridKernalContext.java      |    8 +
 .../ignite/internal/GridKernalContextImpl.java  |   11 +
 .../internal/GridMessageListenHandler.java      |    1 +
 .../apache/ignite/internal/IgniteKernal.java    |    6 +
 .../cluster/ClusterNodeLocalMapImpl.java        |   27 +-
 .../cluster/IgniteClusterAsyncImpl.java         |    3 +-
 .../internal/cluster/IgniteClusterImpl.java     |    4 +-
 .../internal/events/DiscoveryCustomEvent.java   |   68 +
 .../igfs/common/IgfsControlResponse.java        |    1 +
 .../internal/igfs/common/IgfsMarshaller.java    |    1 +
 .../internal/managers/GridManagerAdapter.java   |    5 +
 .../discovery/GridDiscoveryManager.java         |   79 +-
 .../affinity/GridAffinityMessage.java           |    1 +
 .../processors/cache/GridCacheEntryInfo.java    |    5 +-
 .../processors/cache/GridCacheSwapManager.java  |    4 +-
 .../processors/cache/GridCacheUtils.java        |    4 +
 .../processors/cache/IgniteCacheProxy.java      |   63 +
 .../query/GridCacheDistributedQueryManager.java |    4 +-
 .../cache/query/GridCacheQueryManager.java      |    2 +-
 .../continuous/CacheContinuousQueryEntry.java   |    1 +
 .../continuous/CacheContinuousQueryHandler.java |    1 +
 .../cache/transactions/IgniteTxEntry.java       |    5 +-
 .../transactions/IgniteTxLocalAdapter.java      |    8 +
 .../version/GridCacheRawVersionedEntry.java     |    1 +
 .../processors/clock/GridClockMessage.java      |    1 +
 .../dataload/GridDataLoaderProcessor.java       |    2 +-
 .../datastructures/DataStructuresProcessor.java |    2 +-
 .../processors/igfs/IgfsDataManager.java        |    4 +-
 .../internal/processors/igfs/IgfsImpl.java      |    6 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    4 +-
 .../internal/processors/igfs/IgfsServer.java    |    1 +
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../processors/rest/GridRestResponse.java       |    1 +
 .../message/GridClientAbstractMessage.java      |    1 +
 .../message/GridClientHandshakeRequest.java     |    1 +
 .../cache/GridCacheQueryCommandHandler.java     |    7 +-
 .../protocols/tcp/GridMemcachedMessage.java     |    3 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   10 +-
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../internal/util/IgniteExceptionRegistry.java  |  259 ++
 .../ignite/internal/util/IgniteUtils.java       | 2569 ++++++++----------
 .../nio/GridConnectionBytesVerifyFilter.java    |    1 +
 .../util/nio/GridTcpCommunicationClient.java    |    1 +
 .../apache/ignite/internal/util/typedef/X.java  |    3 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   10 +-
 .../VisorComputeToggleMonitoringTask.java       |    4 +-
 .../visor/node/VisorBasicConfiguration.java     |   17 -
 .../visor/node/VisorNodeDataCollectorJob.java   |    4 +-
 .../node/VisorNodeEventsCollectorTask.java      |   13 +-
 .../internal/visor/node/VisorNodeGcTask.java    |   10 +-
 .../internal/visor/node/VisorNodePingTask.java  |   10 +-
 .../visor/query/VisorQueryCleanupTask.java      |    4 +-
 .../visor/query/VisorQueryNextPageTask.java     |    6 +-
 .../internal/visor/query/VisorQueryTask.java    |    4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   45 +-
 .../ignite/lang/IgniteProductVersion.java       |    1 +
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    6 +
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   15 +
 .../org/apache/ignite/spi/IgniteSpiContext.java |    8 +
 .../ignite/spi/IgniteSpiThreadFactory.java      |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   54 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |    7 +
 .../spi/discovery/DiscoverySpiListener.java     |   11 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |    7 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  141 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |    3 +
 .../tcp/internal/TcpDiscoveryNode.java          |    1 +
 .../TcpDiscoveryMulticastIpFinder.java          |    1 +
 .../messages/TcpDiscoveryAuthFailedMessage.java |    1 +
 .../TcpDiscoveryCustomEventMessage.java         |   66 +
 .../messages/TcpDiscoveryHeartbeatMessage.java  |    1 +
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   44 +
 .../internal/GridEventStorageSelfTest.java      |    3 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |   24 +-
 .../internal/GridMultipleJobsSelfTest.java      |    2 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |    4 +-
 .../GridTaskContinuousMapperSelfTest.java       |    3 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |   20 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  101 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   13 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    5 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   33 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   12 +-
 .../GridCacheMultiNodeDataStructureTest.java    |    3 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   16 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |    4 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    6 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    3 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |    2 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |    3 +
 .../GridCacheRandomEvictionPolicySelfTest.java  |    2 +-
 .../IgniteCacheLoaderWriterAbstractTest.java    |   47 +
 .../closure/GridClosureProcessorSelfTest.java   |   14 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |    5 +-
 .../igfs/IgfsDataManagerSelfTest.java           |    1 +
 .../processors/igfs/IgfsProcessorSelfTest.java  |    3 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 ...dStartupWithUndefinedIgniteHomeSelfTest.java |  103 +
 .../util/IgniteExceptionRegistrySelfTest.java   |   89 +
 .../internal/util/IgniteUtilsSelfTest.java      |    6 +-
 .../internal/util/nio/GridRoundTripTest.java    |    1 +
 .../offheap/GridOffHeapMapAbstractSelfTest.java |    1 +
 .../cache/GridCacheDataStructuresLoadTest.java  |   36 +-
 .../loadtests/cache/GridCacheLoadTest.java      |    6 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |    5 +-
 .../loadtests/colocation/GridTestMain.java      |    3 +-
 .../communication/GridIoManagerBenchmark.java   |    3 +-
 .../GridMultiSplitsRedeployLoadTest.java        |    5 +-
 .../loadtests/discovery/GridGcTimeoutTest.java  |    3 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   16 +-
 .../job/GridJobExecutionSingleNodeLoadTest.java |    2 +-
 .../mapper/GridContinuousMapperLoadTest1.java   |    3 +-
 .../loadtests/mapper/GridNodeStartup.java       |    3 +-
 .../mergesort/GridMergeSortLoadTest.java        |    3 +-
 .../streamer/GridStreamerIndexLoadTest.java     |    4 +-
 .../swap/GridSwapEvictAllBenchmark.java         |    3 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 ...idSessionFutureWaitJobAttributeSelfTest.java |    3 +-
 .../GridSessionSetTaskAttributeSelfTest.java    |    3 +-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |    3 +-
 .../discovery/AbstractDiscoverySelfTest.java    |    7 +-
 .../roundrobin/GridRoundRobinTestUtils.java     |    6 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |    1 +
 .../index/GridStreamerIndexSelfTest.java        |   17 +-
 .../window/GridStreamerWindowSelfTest.java      |    3 +-
 .../testframework/GridSpiTestContext.java       |    6 +
 .../junits/GridTestKernalContext.java           |    2 +
 .../cache/GridAbstractCacheStoreSelfTest.java   |    3 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |    3 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |    1 +
 .../testsuites/IgniteUtilSelfTestSuite.java     |    1 +
 .../tests/p2p/GridP2PAwareTestUserResource.java |    5 +-
 .../tests/p2p/GridTestMessageListener.java      |    4 +-
 modules/hadoop/pom.xml                          |   10 -
 .../java/org/apache/ignite/igfs/package.html    |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopWrapper.java |    2 +-
 .../processors/hadoop/GridHadoopSetup.java      |    3 +-
 .../GridHadoopDefaultMapReducePlanner.java      |    3 +-
 .../shuffle/GridHadoopShuffleMessage.java       |    1 +
 .../taskexecutor/GridHadoopExecutorService.java |    2 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |    3 +-
 .../hadoop/GridHadoopGroupingTest.java          |   10 +-
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |    2 +-
 .../hadoop/GridHadoopSortingTest.java           |    9 +-
 .../processors/hadoop/GridHadoopStartup.java    |    2 +-
 .../ignite/loadtests/igfs/IgfsNodeStartup.java  |    3 +-
 .../testsuites/IgniteHadoopTestSuite.java       |    7 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheCrossCacheQuerySelfTestNewApi.java |    2 +-
 .../http/jetty/GridJettyRestHandler.java        |    1 +
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    4 +-
 ...gniteProjectionStartStopRestartSelfTest.java |    3 +-
 .../commands/alert/VisorAlertCommand.scala      |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |   82 +-
 .../config/VisorConfigurationCommand.scala      |  140 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   64 +-
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 +-
 190 files changed, 2984 insertions(+), 2123 deletions(-)
----------------------------------------------------------------------



[08/50] [abbrv] incubator-ignite git commit: # minor: Visor jobs class names should be same as Visor tasks class names.

Posted by sb...@apache.org.
 # minor: Visor jobs class names should be same as Visor tasks class names.


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

Branch: refs/heads/ignite-342
Commit: 8f566e005fdd56d83fdd00aa81a017baa02bdd28
Parents: bf8c048
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Feb 26 22:37:26 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Feb 26 22:37:26 2015 +0700

----------------------------------------------------------------------
 .../visor/cache/VisorCacheMetricsCollectorTask.java       | 10 +++++-----
 .../internal/visor/node/VisorNodeEventsCollectorTask.java | 10 +++++-----
 .../ignite/internal/visor/node/VisorNodeGcTask.java       | 10 +++++-----
 .../ignite/internal/visor/node/VisorNodePingTask.java     | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f566e00/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index a92def6..2062727 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -38,8 +38,8 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Override protected VisorCacheMetricsJob job(IgniteBiTuple<Boolean, String> arg) {
-        return new VisorCacheMetricsJob(arg, debug);
+    @Override protected VisorCacheMetricsCollectorJob job(IgniteBiTuple<Boolean, String> arg) {
+        return new VisorCacheMetricsCollectorJob(arg, debug);
     }
 
     /** {@inheritDoc} */
@@ -71,7 +71,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
     /**
      * Job that collect cache metrics from node.
      */
-    private static class VisorCacheMetricsJob
+    private static class VisorCacheMetricsCollectorJob
         extends VisorJob<IgniteBiTuple<Boolean, String>, Map<String, VisorCacheMetrics>> {
         /** */
         private static final long serialVersionUID = 0L;
@@ -82,7 +82,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
          * @param arg Whether to collect metrics for all caches or for specified cache name only.
          * @param debug Debug flag.
          */
-        private VisorCacheMetricsJob(IgniteBiTuple<Boolean, String> arg, boolean debug) {
+        private VisorCacheMetricsCollectorJob(IgniteBiTuple<Boolean, String> arg, boolean debug) {
             super(arg, debug);
         }
 
@@ -106,7 +106,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return S.toString(VisorCacheMetricsJob.class, this);
+            return S.toString(VisorCacheMetricsCollectorJob.class, this);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f566e00/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
index bf13c1b..d1bd940 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
@@ -45,8 +45,8 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Override protected VisorEventsCollectJob job(VisorNodeEventsCollectorTaskArg arg) {
-        return new VisorEventsCollectJob(arg, debug);
+    @Override protected VisorNodeEventsCollectorJob job(VisorNodeEventsCollectorTaskArg arg) {
+        return new VisorNodeEventsCollectorJob(arg, debug);
     }
 
     /** {@inheritDoc} */
@@ -172,7 +172,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
     /**
      * Job for task returns events data.
      */
-    private static class VisorEventsCollectJob extends VisorJob<VisorNodeEventsCollectorTaskArg,
+    private static class VisorNodeEventsCollectorJob extends VisorJob<VisorNodeEventsCollectorTaskArg,
         Collection<? extends VisorGridEvent>> {
         /** */
         private static final long serialVersionUID = 0L;
@@ -183,7 +183,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
          * @param arg Job argument.
          * @param debug Debug flag.
          */
-        private VisorEventsCollectJob(VisorNodeEventsCollectorTaskArg arg, boolean debug) {
+        private VisorNodeEventsCollectorJob(VisorNodeEventsCollectorTaskArg arg, boolean debug) {
             super(arg, debug);
         }
 
@@ -334,7 +334,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return S.toString(VisorEventsCollectJob.class, this);
+            return S.toString(VisorNodeEventsCollectorJob.class, this);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f566e00/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
index b545809..12e186b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeGcTask.java
@@ -37,8 +37,8 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Override protected VisorGcJob job(Void arg) {
-        return new VisorGcJob(arg, debug);
+    @Override protected VisorNodeGcJob job(Void arg) {
+        return new VisorNodeGcJob(arg, debug);
     }
 
     /** {@inheritDoc} */
@@ -55,7 +55,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
     }
 
     /** Job that perform GC on node. */
-    private static class VisorGcJob extends VisorJob<Void, IgniteBiTuple<Long, Long>> {
+    private static class VisorNodeGcJob extends VisorJob<Void, IgniteBiTuple<Long, Long>> {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -65,7 +65,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
          * @param arg Formal task argument.
          * @param debug Debug flag.
          */
-        private VisorGcJob(Void arg, boolean debug) {
+        private VisorNodeGcJob(Void arg, boolean debug) {
             super(arg, debug);
         }
 
@@ -92,7 +92,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return S.toString(VisorGcJob.class, this);
+            return S.toString(VisorNodeGcJob.class, this);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f566e00/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
index 9987eba..64c8376 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java
@@ -36,8 +36,8 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Override protected VisorPingJob job(UUID arg) {
-        return new VisorPingJob(arg, debug);
+    @Override protected VisorNodePingJob job(UUID arg) {
+        return new VisorNodePingJob(arg, debug);
     }
 
     /** {@inheritDoc} */
@@ -53,7 +53,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
     /**
      * Job that ping node.
      */
-    private static class VisorPingJob extends VisorJob<UUID, GridTuple3<Boolean, Long, Long>> {
+    private static class VisorNodePingJob extends VisorJob<UUID, GridTuple3<Boolean, Long, Long>> {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -61,7 +61,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
          * @param arg Node ID to ping.
          * @param debug Debug flag.
          */
-        protected VisorPingJob(UUID arg, boolean debug) {
+        protected VisorNodePingJob(UUID arg, boolean debug) {
             super(arg, debug);
         }
 
@@ -74,7 +74,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return S.toString(VisorPingJob.class, this);
+            return S.toString(VisorNodePingJob.class, this);
         }
     }
 }


[35/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-322' into sprint-2

Posted by sb...@apache.org.
Merge branch 'ignite-322' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: a663f8395668f6a473b63260a373776312f78154
Parents: b14be3b 96deb43
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 18:00:50 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 18:00:50 2015 +0300

----------------------------------------------------------------------
 .../HibernateReadWriteAccessStrategy.java       | 81 +++++++++++++++-----
 1 file changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------



[15/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-298' into sprint-2

Posted by sb...@apache.org.
Merge branch 'ignite-298' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: 4e7463d1d2d5eeffecb7ede458597ed86aadaebc
Parents: 47539d8 388da76
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Feb 27 16:51:05 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Feb 27 16:51:05 2015 +0700

----------------------------------------------------------------------
 .../visor/node/VisorBasicConfiguration.java     |  17 ---
 .../commands/alert/VisorAlertCommand.scala      |   8 +-
 .../commands/cache/VisorCacheCommand.scala      |  82 +++++++----
 .../config/VisorConfigurationCommand.scala      | 140 ++++++++++---------
 .../commands/disco/VisorDiscoveryCommand.scala  |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  64 ++++++---
 .../commands/tasks/VisorTasksCommandSpec.scala  |   2 +-
 7 files changed, 173 insertions(+), 142 deletions(-)
----------------------------------------------------------------------



[27/50] [abbrv] incubator-ignite git commit: # ignite-325: revert license from some files and fix serialVersionUID at 2 files

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08bfe7b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
index 67f56e7..3988cef 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
@@ -76,1546 +76,7 @@ junit.swingui.TestSelector
 junit.swingui.TestSelector$TestCellRenderer
 junit.swingui.TestSuitePanel
 junit.swingui.TestSuitePanel$TestTreeCellRenderer
-org.apache.ignite.IgniteAuthenticationException
-org.apache.ignite.IgniteCheckedException
-org.apache.ignite.IgniteDeploymentException
-org.apache.ignite.IgniteException
-org.apache.ignite.IgniteIllegalStateException
-org.apache.ignite.IgniteInterruptedException
-org.apache.ignite.IgniteState
-org.apache.ignite.cache.CacheAtomicWriteOrderMode
-org.apache.ignite.cache.CacheAtomicityMode
-org.apache.ignite.cache.CacheDistributionMode
-org.apache.ignite.cache.CacheMemoryMode
-org.apache.ignite.cache.CacheMode
-org.apache.ignite.cache.CachePeekMode
-org.apache.ignite.cache.CachePreloadMode
-org.apache.ignite.cache.CacheWriteSynchronizationMode
-org.apache.ignite.cache.affinity.CacheAffinityKey
-org.apache.ignite.cache.affinity.CacheAffinityNodeAddressHashResolver
-org.apache.ignite.cache.affinity.CacheAffinityNodeIdHashResolver
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction$1
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction$2
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction$3
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction$4
-org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction$5
-org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity
-org.apache.ignite.cache.affinity.fair.CachePartitionFairAffinity$PartitionSetComparator
-org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction
-org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction$HashComparator
-org.apache.ignite.cache.hibernate.HibernateAccessStrategyAdapter$ClearKeyCallable
-org.apache.ignite.cache.query.ScanQuery
-org.apache.ignite.cache.query.SpiQuery
-org.apache.ignite.cache.query.SqlFieldsQuery
-org.apache.ignite.cache.query.SqlQuery
-org.apache.ignite.cache.query.TextQuery
-org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$1
-org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$2
-org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$1
-org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$2
-org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$3
-org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$4
-org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$5
-org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect$1
-org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect$2
-org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect$3
-org.apache.ignite.cache.store.jdbc.dialect.MySQLDialect$1
-org.apache.ignite.cache.store.jdbc.dialect.OracleDialect$1
-org.apache.ignite.cache.store.jdbc.dialect.OracleDialect$2
-org.apache.ignite.cache.store.jdbc.dialect.OracleDialect$3
-org.apache.ignite.cache.store.jdbc.dialect.OracleDialect$4
-org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect$1
-org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect$2
-org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect$3
-org.apache.ignite.cluster.ClusterGroupEmptyException
-org.apache.ignite.cluster.ClusterTopologyException
-org.apache.ignite.compute.ComputeExecutionRejectedException
-org.apache.ignite.compute.ComputeJobFailoverException
-org.apache.ignite.compute.ComputeJobResultPolicy
-org.apache.ignite.compute.ComputeTaskCancelledException
-org.apache.ignite.compute.ComputeTaskSessionScope
-org.apache.ignite.compute.ComputeTaskTimeoutException
-org.apache.ignite.compute.ComputeUserUndeclaredException
-org.apache.ignite.compute.gridify.GridifyRuntimeException
-org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter
-org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask
-org.apache.ignite.compute.gridify.aop.GridifyDefaultTask
-org.apache.ignite.compute.gridify.aop.spring.GridifySpringPointcut$GridifySpringPointcutType
-org.apache.ignite.configuration.CacheQueryConfiguration
-org.apache.ignite.configuration.DeploymentMode
-org.apache.ignite.configuration.TransactionConfiguration
-org.apache.ignite.events.CacheEvent
-org.apache.ignite.events.CachePreloadingEvent
-org.apache.ignite.events.CheckpointEvent
-org.apache.ignite.events.DeploymentEvent
-org.apache.ignite.events.DiscoveryEvent
-org.apache.ignite.events.EventAdapter
-org.apache.ignite.events.IgfsEvent
-org.apache.ignite.events.JobEvent
-org.apache.ignite.events.SwapSpaceEvent
-org.apache.ignite.events.TaskEvent
-org.apache.ignite.igfs.IgfsConcurrentModificationException
-org.apache.ignite.igfs.IgfsCorruptedFileException
-org.apache.ignite.igfs.IgfsException
-org.apache.ignite.igfs.IgfsFileNotFoundException
-org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper
-org.apache.ignite.igfs.IgfsInvalidHdfsVersionException
-org.apache.ignite.igfs.IgfsInvalidPathException
-org.apache.ignite.igfs.IgfsMode
-org.apache.ignite.igfs.IgfsOutOfSpaceException
-org.apache.ignite.igfs.IgfsParentNotDirectoryException
-org.apache.ignite.igfs.IgfsPath
-org.apache.ignite.igfs.IgfsPathAlreadyExistsException
-org.apache.ignite.igfs.IgfsPathSummary
-org.apache.ignite.igfs.mapreduce.records.IgfsByteDelimiterRecordResolver
-org.apache.ignite.igfs.mapreduce.records.IgfsFixedLengthRecordResolver
-org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver
-org.apache.ignite.igfs.mapreduce.records.IgfsStringDelimiterRecordResolver
-org.apache.ignite.internal.ComputeTaskInternalFuture
-org.apache.ignite.internal.GridClosureCallMode
-org.apache.ignite.internal.GridComponent$DiscoveryDataExchangeType
-org.apache.ignite.internal.GridEventConsumeHandler
-org.apache.ignite.internal.GridEventConsumeHandler$1
-org.apache.ignite.internal.GridEventConsumeHandler$EventWrapper
-org.apache.ignite.internal.GridInternalException
-org.apache.ignite.internal.GridJobCancelRequest
-org.apache.ignite.internal.GridJobContextImpl
-org.apache.ignite.internal.GridJobExecuteRequest
-org.apache.ignite.internal.GridJobExecuteResponse
-org.apache.ignite.internal.GridJobSiblingImpl
-org.apache.ignite.internal.GridJobSiblingsRequest
-org.apache.ignite.internal.GridJobSiblingsResponse
-org.apache.ignite.internal.GridKernalContextImpl
-org.apache.ignite.internal.GridKernalGatewayImpl
-org.apache.ignite.internal.GridKernalState
-org.apache.ignite.internal.GridLoggerProxy
-org.apache.ignite.internal.GridMessageListenHandler
-org.apache.ignite.internal.GridNodeOrderComparator
-org.apache.ignite.internal.GridTaskCancelRequest
-org.apache.ignite.internal.GridTaskNameHashKey
-org.apache.ignite.internal.GridTaskSessionRequest
-org.apache.ignite.internal.GridTopic
-org.apache.ignite.internal.GridTopic$T1
-org.apache.ignite.internal.GridTopic$T2
-org.apache.ignite.internal.GridTopic$T3
-org.apache.ignite.internal.GridTopic$T4
-org.apache.ignite.internal.GridTopic$T5
-org.apache.ignite.internal.GridTopic$T6
-org.apache.ignite.internal.GridTopic$T7
-org.apache.ignite.internal.GridTopic$T8
-org.apache.ignite.internal.IgniteComponentType
-org.apache.ignite.internal.IgniteComputeImpl
-org.apache.ignite.internal.IgniteDeploymentCheckedException
-org.apache.ignite.internal.IgniteEventsImpl
-org.apache.ignite.internal.IgniteEventsImpl$1
-org.apache.ignite.internal.IgniteFutureCancelledCheckedException
-org.apache.ignite.internal.IgniteFutureTimeoutCheckedException
-org.apache.ignite.internal.IgniteInterruptedCheckedException
-org.apache.ignite.internal.IgniteKernal
-org.apache.ignite.internal.IgniteKernal$1
-org.apache.ignite.internal.IgniteKernal$5
-org.apache.ignite.internal.IgniteKernal$6
-org.apache.ignite.internal.IgniteMessagingImpl
-org.apache.ignite.internal.IgniteSchedulerImpl
-org.apache.ignite.internal.IgniteServicesImpl
-org.apache.ignite.internal.IgnitionEx$IgniteNamedInstance$1
-org.apache.ignite.internal.client.GridClientAuthenticationException
-org.apache.ignite.internal.client.GridClientCacheFlag
-org.apache.ignite.internal.client.GridClientCacheMode
-org.apache.ignite.internal.client.GridClientClosedException
-org.apache.ignite.internal.client.GridClientDisconnectedException
-org.apache.ignite.internal.client.GridClientException
-org.apache.ignite.internal.client.GridClientFutureTimeoutException
-org.apache.ignite.internal.client.GridClientHandshakeException
-org.apache.ignite.internal.client.GridClientProtocol
-org.apache.ignite.internal.client.GridServerUnreachableException
-org.apache.ignite.internal.client.balancer.GridClientBalancerAdapter$1
-org.apache.ignite.internal.client.impl.GridClientDataMetricsAdapter
-org.apache.ignite.internal.client.impl.GridClientFutureAdapter
-org.apache.ignite.internal.client.impl.GridClientNodeMetricsAdapter
-org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason
-org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$2
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$3
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$5
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$6
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$7
-org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$TcpClientFuture
-org.apache.ignite.internal.client.impl.connection.GridClientTopology$1
-org.apache.ignite.internal.client.impl.connection.GridConnectionIdleClosedException
-org.apache.ignite.internal.cluster.ClusterGroupAdapter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$AgeProjection
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$AttributeFilter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$CachesFilter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$DaemonFilter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$OthersFilter
-org.apache.ignite.internal.cluster.ClusterGroupAdapter$StreamersFilter
-org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
-org.apache.ignite.internal.cluster.ClusterNodeLocalMapImpl
-org.apache.ignite.internal.cluster.ClusterTopologyCheckedException
-org.apache.ignite.internal.cluster.IgniteClusterAsyncImpl
-org.apache.ignite.internal.cluster.IgniteClusterImpl
-org.apache.ignite.internal.cluster.IgniteClusterImpl$1
-org.apache.ignite.internal.cluster.IgniteKillTask
-org.apache.ignite.internal.cluster.IgniteKillTask$IgniteKillJob
-org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException
-org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException
-org.apache.ignite.internal.executor.GridExecutorService
-org.apache.ignite.internal.executor.GridExecutorService$1
-org.apache.ignite.internal.executor.GridExecutorService$TaskTerminateListener
-org.apache.ignite.internal.igfs.common.IgfsIpcCommand
-org.apache.ignite.internal.igfs.hadoop.IgfsHadoopCommunicationException
-org.apache.ignite.internal.managers.GridManagerAdapter$1$1
-org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet
-org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest
-org.apache.ignite.internal.managers.communication.GridIoManager$ConcurrentHashMap0
-org.apache.ignite.internal.managers.communication.GridIoMessage
-org.apache.ignite.internal.managers.communication.GridIoPolicy
-org.apache.ignite.internal.managers.communication.GridIoUserMessage
-org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean
-org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2
-org.apache.ignite.internal.managers.deployment.GridDeploymentRequest
-org.apache.ignite.internal.managers.deployment.GridDeploymentResponse
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$1
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$1
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$6
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoCache$1
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoCache$2
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoTopologyFuture
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoveryWorker$1
-org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage
-org.apache.ignite.internal.managers.indexing.GridIndexingManager$1
-org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1
-org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
-org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache$AffinityReadyFuture
-org.apache.ignite.internal.processors.affinity.GridAffinityMessage
-org.apache.ignite.internal.processors.affinity.GridAffinityProcessor$2
-org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob
-org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException
-org.apache.ignite.internal.processors.cache.CacheFlag
-org.apache.ignite.internal.processors.cache.CacheFlagException
-org.apache.ignite.internal.processors.cache.CacheInvokeEntry$Operation
-org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException
-org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException
-org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakQueryFutureIterator
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$10
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$12
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$13
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$14
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$15
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$16$1
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$17
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$18
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$2
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$27$1
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$29
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$3
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$30$1
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$31
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$33
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$5
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$6
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$65
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$67
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$68
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$69
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$7
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$71
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$72
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$72$1
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$73
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$74
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$75
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$77
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$9
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalClearAllCallable
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalSizeCallable
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeCallable
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateGetTimeStatClosure
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutAndGetTimeStatClosure
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdatePutTimeStatClosure
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$UpdateRemoveTimeStatClosure
-org.apache.ignite.internal.processors.cache.GridCacheAtomicVersionComparator
-org.apache.ignite.internal.processors.cache.GridCacheAttributes
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$1
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$2
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$3
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$EntryIterator
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$EntrySet
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Iterator0
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$KeyIterator
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$KeySet
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Segment
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Set0
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$ValueIterator
-org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Values
-org.apache.ignite.internal.processors.cache.GridCacheContext$2
-org.apache.ignite.internal.processors.cache.GridCacheContext$3
-org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper
-org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$1
-org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$2
-org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$2
-org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$4
-org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$5
-org.apache.ignite.internal.processors.cache.GridCacheEntryInfo
-org.apache.ignite.internal.processors.cache.GridCacheEntryRedeployException
-org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$2
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$3
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$5
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$6
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$7
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$EvictionFuture
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$EvictionFuture$2
-org.apache.ignite.internal.processors.cache.GridCacheEvictionManager$EvictionFuture$3
-org.apache.ignite.internal.processors.cache.GridCacheEvictionRequest
-org.apache.ignite.internal.processors.cache.GridCacheEvictionResponse
-org.apache.ignite.internal.processors.cache.GridCacheExplicitLockSpan
-org.apache.ignite.internal.processors.cache.GridCacheExplicitLockSpan$1
-org.apache.ignite.internal.processors.cache.GridCacheFilterFailedException
-org.apache.ignite.internal.processors.cache.GridCacheIndexUpdateException
-org.apache.ignite.internal.processors.cache.GridCacheIoManager$1$1
-org.apache.ignite.internal.processors.cache.GridCacheIoManager$2
-org.apache.ignite.internal.processors.cache.GridCacheIoManager$3
-org.apache.ignite.internal.processors.cache.GridCacheKeySet
-org.apache.ignite.internal.processors.cache.GridCacheLockTimeoutException
-org.apache.ignite.internal.processors.cache.GridCacheLogger
-org.apache.ignite.internal.processors.cache.GridCacheMultiTxFuture
-org.apache.ignite.internal.processors.cache.GridCacheMultiTxFuture$1
-org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate
-org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate$Mask
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$5
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$6
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$7
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$8
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$FinishLockFuture
-org.apache.ignite.internal.processors.cache.GridCacheMvccManager$FinishLockFuture$1
-org.apache.ignite.internal.processors.cache.GridCacheOperation
-org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$1$1
-org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$2
-org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$3
-org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$4
-org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$ExchangeFutureSet
-org.apache.ignite.internal.processors.cache.GridCachePeekMode
-org.apache.ignite.internal.processors.cache.GridCacheProcessor$LocalAffinityFunction
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$1
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$2
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$3
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$4
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$FullFilter
-org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$KeyValueFilter
-org.apache.ignite.internal.processors.cache.GridCacheProxyImpl
-org.apache.ignite.internal.processors.cache.GridCacheReturn
-org.apache.ignite.internal.processors.cache.GridCacheStoreManager$1
-org.apache.ignite.internal.processors.cache.GridCacheStoreManager$2
-org.apache.ignite.internal.processors.cache.GridCacheStoreManager$3
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$10
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$13
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$2
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$3
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$4
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$5
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$6
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$7
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$8
-org.apache.ignite.internal.processors.cache.GridCacheSwapManager$IteratorWrapper
-org.apache.ignite.internal.processors.cache.GridCacheUtils$10
-org.apache.ignite.internal.processors.cache.GridCacheUtils$11
-org.apache.ignite.internal.processors.cache.GridCacheUtils$12
-org.apache.ignite.internal.processors.cache.GridCacheUtils$13
-org.apache.ignite.internal.processors.cache.GridCacheUtils$14
-org.apache.ignite.internal.processors.cache.GridCacheUtils$15
-org.apache.ignite.internal.processors.cache.GridCacheUtils$16
-org.apache.ignite.internal.processors.cache.GridCacheUtils$17
-org.apache.ignite.internal.processors.cache.GridCacheUtils$18
-org.apache.ignite.internal.processors.cache.GridCacheUtils$19
-org.apache.ignite.internal.processors.cache.GridCacheUtils$2
-org.apache.ignite.internal.processors.cache.GridCacheUtils$20
-org.apache.ignite.internal.processors.cache.GridCacheUtils$21
-org.apache.ignite.internal.processors.cache.GridCacheUtils$22
-org.apache.ignite.internal.processors.cache.GridCacheUtils$23
-org.apache.ignite.internal.processors.cache.GridCacheUtils$25
-org.apache.ignite.internal.processors.cache.GridCacheUtils$3
-org.apache.ignite.internal.processors.cache.GridCacheUtils$4
-org.apache.ignite.internal.processors.cache.GridCacheUtils$5
-org.apache.ignite.internal.processors.cache.GridCacheUtils$6
-org.apache.ignite.internal.processors.cache.GridCacheUtils$7
-org.apache.ignite.internal.processors.cache.GridCacheUtils$8
-org.apache.ignite.internal.processors.cache.GridCacheUtils$9
-org.apache.ignite.internal.processors.cache.GridCacheValueBytes
-org.apache.ignite.internal.processors.cache.GridCacheValueCollection
-org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1
-org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StoreOperation
-org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$ValueStatus
-org.apache.ignite.internal.processors.cache.GridPartitionLockKey
-org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy
-org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$BlockSetCallable
-org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$RemoveSetDataCallable
-org.apache.ignite.internal.processors.cache.distributed.GridCacheCommittedTxInfo
-org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxFuture
-org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxRequest
-org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxResponse
-org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheAdapter$1
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheAdapter$GlobalRemoveAllCallable
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAssignmentFetchFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$3
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$5
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$MultiUpdateFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtEmbeddedFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFinishedFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetFuture$3
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$3
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$3
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$4
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$5
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$6
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$7
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$8
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9$1$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocalAdapter$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$3
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1$1
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$11
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$12
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$13
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$14
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$15
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$16
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$17
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$18
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$19
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$2
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$20
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$21
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$3
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$4
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$5
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$6
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$7
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$8
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$9
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$DeferredResponseBuffer
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$FinishedLockFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicDeferredUpdateResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$3
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$2
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$3
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$5
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$6
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$7
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$3
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$4
-org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$2$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$DemandWorker$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$DemandWorker$2
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandPool$SyncFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyPool$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyPool$DemandMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture$2
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture$3
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$10
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$2
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$3
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$4
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$5
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$6
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$7
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$8
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$9
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$3
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$4
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$EntrySet$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$2$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$3
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$4
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$3
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$4
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$5
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$6
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$7
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$PessimisticPrepareFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$1
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$2
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$3
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$4
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$5
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFuture$MiniFuture
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse
-org.apache.ignite.internal.processors.cache.distributed.near.GridNearUnlockRequest
-org.apache.ignite.internal.processors.cache.dr.GridCacheDrExpirationInfo
-org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo
-org.apache.ignite.internal.processors.cache.local.GridLocalLockFuture
-org.apache.ignite.internal.processors.cache.local.GridLocalTxFuture
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$10
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$11
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$3
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6
-org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$7
-org.apache.ignite.internal.processors.cache.query.CacheQueryType
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedFieldsQueryFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$1
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$2
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$4
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$5
-org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$6
-org.apache.ignite.internal.processors.cache.query.GridCacheFieldsQueryErrorFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheLocalFieldsQueryFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheLocalQueryFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheQueriesImpl
-org.apache.ignite.internal.processors.cache.query.GridCacheQueriesProxy
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryAdapter$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryErrorFuture
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$2
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$1$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$1$2
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$10
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$13$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$14$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$2
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$3
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$5
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$6
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$7
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$8
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$9
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CachedResult$QueueIterator
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$1
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$2
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$3
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsKey
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponse
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponseEntry
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryType
-org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery
-org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery
-org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry
-org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$DeployableObject
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadataTask
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadataTask$JdbcDriverMetadataJob
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob$1
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob$2
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask
-org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask$1
-org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx$FinalizationStatus
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter$1
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$1
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$10
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$11
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$12
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$13
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$14
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$2
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$3
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$4
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$5
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$6
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$7
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$8
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$9
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$10
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$11
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$12
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$13
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$14
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$15
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$16
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$2
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$3
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$4
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$5
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$6
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$7
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$8
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$9
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostLockClosure1$1
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostLockClosure1$2
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostLockClosure1$3
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostLockClosure1$4
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$2
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$AtomicInt
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$CommitListener
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$CommittedVersion
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap$1
-org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap$1$1
-org.apache.ignite.internal.processors.cache.transactions.TransactionMetricsAdapter
-org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl
-org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl$1
-org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry
-org.apache.ignite.internal.processors.cache.version.GridCacheVersion
-org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State
-org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx
-org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage
-org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
-org.apache.ignite.internal.processors.closure.GridClosurePolicy
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T1
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T10
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T11
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T3
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T4
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T5
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T6
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T7
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T8
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$T9
-org.apache.ignite.internal.processors.continuous.GridContinuousMessage
-org.apache.ignite.internal.processors.continuous.GridContinuousMessageType
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$DiscoveryData
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$DiscoveryDataItem
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$StartFuture
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$StartRequestData
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$StopFuture
-org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$SyncMessageAckFuture
-org.apache.ignite.internal.processors.dataload.GridDataLoadCacheUpdaters$Batched
-org.apache.ignite.internal.processors.dataload.GridDataLoadCacheUpdaters$BatchedSorted
-org.apache.ignite.internal.processors.dataload.GridDataLoadCacheUpdaters$Individual
-org.apache.ignite.internal.processors.dataload.GridDataLoadRequest
-org.apache.ignite.internal.processors.dataload.GridDataLoadResponse
-org.apache.ignite.internal.processors.dataload.GridDataLoaderFuture
-org.apache.ignite.internal.processors.dataload.GridDataLoaderProcessor$3
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$1
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$4
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Buffer$1
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Buffer$2
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$DataLoaderPda
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Entries0
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Entry0
-org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$IsolatedUpdater
-org.apache.ignite.internal.processors.datastructures.CacheDataStructuresConfigurationKey
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$1
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$10
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$11
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$12
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$14
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$15
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$17
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$18
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$19
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$2
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$3
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$5
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$6
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$7
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$8
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$9
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$DataStructureType
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongValue
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicReferenceImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicReferenceImpl$3
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicReferenceImpl$4
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicReferenceValue
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicSequenceImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicSequenceValue
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicStampedImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicStampedImpl$5
-org.apache.ignite.internal.processors.datastructures.GridCacheAtomicStampedValue
-org.apache.ignite.internal.processors.datastructures.GridCacheCountDownLatchImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheCountDownLatchValue
-org.apache.ignite.internal.processors.datastructures.GridCacheInternalKeyImpl
-org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeader
-org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeaderKey
-org.apache.ignite.internal.processors.datastructures.GridCacheQueueItemKey
-org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy
-org.apache.ignite.internal.processors.datastructures.GridCacheSetHeader
-org.apache.ignite.internal.processors.datastructures.GridCacheSetHeaderKey
-org.apache.ignite.internal.processors.datastructures.GridCacheSetImpl$CollocatedItemKey
-org.apache.ignite.internal.processors.datastructures.GridCacheSetImpl$SumReducer
-org.apache.ignite.internal.processors.datastructures.GridCacheSetItemKey
-org.apache.ignite.internal.processors.datastructures.GridCacheSetProxy
-org.apache.ignite.internal.processors.datastructures.GridSetQueryPredicate
-org.apache.ignite.internal.processors.dr.GridDrDataLoadCacheUpdater
-org.apache.ignite.internal.processors.dr.GridDrType
-org.apache.ignite.internal.processors.hadoop.GridHadoopDefaultJobInfo
-org.apache.ignite.internal.processors.hadoop.GridHadoopFileBlock
-org.apache.ignite.internal.processors.hadoop.GridHadoopJobId
-org.apache.ignite.internal.processors.hadoop.GridHadoopJobPhase
-org.apache.ignite.internal.processors.hadoop.GridHadoopJobProperty
-org.apache.ignite.internal.processors.hadoop.GridHadoopJobStatus
-org.apache.ignite.internal.processors.hadoop.GridHadoopTaskCancelledException
-org.apache.ignite.internal.processors.hadoop.GridHadoopTaskInfo
-org.apache.ignite.internal.processors.hadoop.GridHadoopTaskType
-org.apache.ignite.internal.processors.hadoop.counter.GridHadoopCountersImpl
-org.apache.ignite.internal.processors.hadoop.counter.GridHadoopCountersImpl$CounterKey
-org.apache.ignite.internal.processors.hadoop.counter.GridHadoopLongCounter
-org.apache.ignite.internal.processors.hadoop.counter.GridHadoopPerformanceCounter
-org.apache.ignite.internal.processors.hadoop.jobtracker.GridHadoopJobMetadata
-org.apache.ignite.internal.processors.hadoop.jobtracker.GridHadoopJobTracker$1
-org.apache.ignite.internal.processors.hadoop.jobtracker.GridHadoopJobTracker$JobLocalState$1
-org.apache.ignite.internal.processors.hadoop.jobtracker.GridHadoopJobTracker$JobLocalState$2
-org.apache.ignite.internal.processors.hadoop.planner.GridHadoopDefaultMapReducePlan
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolJobCountersTask
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolJobStatusTask
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolJobStatusTask$1
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolKillJobTask
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolNextTaskIdTask
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolSubmitJobTask
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolTaskAdapter$Job
-org.apache.ignite.internal.processors.hadoop.proto.GridHadoopProtocolTaskArguments
-org.apache.ignite.internal.processors.hadoop.shuffle.GridHadoopShuffle$1
-org.apache.ignite.internal.processors.hadoop.shuffle.GridHadoopShuffle$2
-org.apache.ignite.internal.processors.hadoop.shuffle.GridHadoopShuffleAck
-org.apache.ignite.internal.processors.hadoop.shuffle.GridHadoopShuffleJob$4
-org.apache.ignite.internal.processors.hadoop.shuffle.GridHadoopShuffleMessage
-org.apache.ignite.internal.processors.hadoop.shuffle.collections.GridHadoopConcurrentHashMultimap$State
-org.apache.ignite.internal.processors.hadoop.taskexecutor.GridHadoopTaskState
-org.apache.ignite.internal.processors.hadoop.taskexecutor.GridHadoopTaskStatus
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$2
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$4
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$GridHadoopProcessFuture
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$HadoopProcess
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopExternalTaskExecutor$HadoopProcess$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopJobInfoUpdateRequest
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopPrepareForJobRequest
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopProcessDescriptor
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopProcessStartedAck
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopTaskExecutionRequest
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.GridHadoopTaskFinishedMessage
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopChildProcessRunner$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopChildProcessRunner$2
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopChildProcessRunner$2$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopChildProcessRunner$3
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopChildProcessRunner$MessageListener$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child.GridHadoopExternalProcessStarter$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.communication.GridHadoopExternalCommunication$HandshakeAndBackpressureFilter$1
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.communication.GridHadoopExternalCommunication$ProcessHandshakeMessage
-org.apache.ignite.internal.processors.hadoop.taskexecutor.external.communication.GridHadoopHandshakeTimeoutException
-org.apache.ignite.internal.processors.hadoop.v2.GridHadoopExternalSplit
-org.apache.ignite.internal.processors.hadoop.v2.GridHadoopSplitWrapper
-org.apache.ignite.internal.processors.igfs.IgfsAckMessage
-org.apache.ignite.internal.processors.igfs.IgfsAttributes
-org.apache.ignite.internal.processors.igfs.IgfsBlockKey
-org.apache.ignite.internal.processors.igfs.IgfsBlockLocationImpl
-org.apache.ignite.internal.processors.igfs.IgfsBlocksMessage
-org.apache.ignite.internal.processors.igfs.IgfsDataManager$3
-org.apache.ignite.internal.processors.igfs.IgfsDataManager$5$1
-org.apache.ignite.internal.processors.igfs.IgfsDataManager$7
-org.apache.ignite.internal.processors.igfs.IgfsDataManager$WriteCompletionFuture
-org.apache.ignite.internal.processors.igfs.IgfsDeleteMessage
-org.apache.ignite.internal.processors.igfs.IgfsDirectoryNotEmptyException
-org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange
-org.apache.ignite.internal.processors.igfs.IgfsFileImpl
-org.apache.ignite.internal.processors.igfs.IgfsFileInfo
-org.apache.ignite.internal.processors.igfs.IgfsFileMap
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerManager$2
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerManager$3
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerManager$FragmentizerCoordinator$1
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerManager$IdentityHashSet
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerRequest
-org.apache.ignite.internal.processors.igfs.IgfsFragmentizerResponse
-org.apache.ignite.internal.processors.igfs.IgfsHandshakeResponse
-org.apache.ignite.internal.processors.igfs.IgfsImpl$2
-org.apache.ignite.internal.processors.igfs.IgfsImpl$IgfsGlobalSpaceTask
-org.apache.ignite.internal.processors.igfs.IgfsImpl$IgfsGlobalSpaceTask$1
-org.apache.ignite.internal.processors.igfs.IgfsInputStreamDescriptor
-org.apache.ignite.internal.processors.igfs.IgfsInputStreamImpl$1
-org.apache.ignite.internal.processors.igfs.IgfsInvalidRangeException
-org.apache.ignite.internal.processors.igfs.IgfsJobImpl
-org.apache.ignite.internal.processors.igfs.IgfsListingEntry
-org.apache.ignite.internal.processors.igfs.IgfsMetaManager$1
-org.apache.ignite.internal.processors.igfs.IgfsMetaManager$2$1
-org.apache.ignite.internal.processors.igfs.IgfsMetricsAdapter
-org.apache.ignite.internal.processors.igfs.IgfsOutputStreamImpl$ReserveSpaceClosure
-org.apache.ignite.internal.processors.igfs.IgfsPaths
-org.apache.ignite.internal.processors.igfs.IgfsProcessor$1
-org.apache.ignite.internal.processors.igfs.IgfsProcessor$2
-org.apache.ignite.internal.processors.igfs.IgfsSamplingKey
-org.apache.ignite.internal.processors.igfs.IgfsServer$ClientWorker$1
-org.apache.ignite.internal.processors.igfs.IgfsServerManager$1
-org.apache.ignite.internal.processors.igfs.IgfsStatus
-org.apache.ignite.internal.processors.igfs.IgfsSyncMessage
-org.apache.ignite.internal.processors.igfs.IgfsTaskArgsImpl
-org.apache.ignite.internal.processors.job.GridJobProcessor$5
-org.apache.ignite.internal.processors.job.GridJobProcessor$6
-org.apache.ignite.internal.processors.job.GridJobProcessor$7
-org.apache.ignite.internal.processors.job.GridJobWorker$3
-org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor$SnapshotReducer
-org.apache.ignite.internal.processors.query.GridQueryIndexType
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$4$1
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$DBTypeEnum
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$FieldsIterator
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$KeyValIterator
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$Schema
-org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing$SqlFieldMetadata
-org.apache.ignite.internal.processors.query.h2.sql.GridSqlFunctionType
-org.apache.ignite.internal.processors.query.h2.sql.GridSqlOperationType
-org.apache.ignite.internal.processors.query.h2.twostep.GridMapQueryExecutor$1
-org.apache.ignite.internal.processors.query.h2.twostep.GridMapQueryExecutor$2$1
-org.apache.ignite.internal.processors.query.h2.twostep.GridReduceQueryExecutor$1
-org.apache.ignite.internal.processors.query.h2.twostep.GridReduceQueryExecutor$Iter
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridNextPageRequest
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridNextPageResponse
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryAck
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryRequest
-org.apache.ignite.internal.processors.resource.GridResourceProcessor$1
-org.apache.ignite.internal.processors.rest.GridRestCommand
-org.apache.ignite.internal.processors.rest.GridRestProcessor$2$1
-org.apache.ignite.internal.processors.rest.GridRestProcessor$3
-org.apache.ignite.internal.processors.rest.GridRestResponse
-org.apache.ignite.internal.processors.rest.client.message.GridClientAuthenticationRequest
-org.apache.ignite.internal.processors.rest.client.message.GridClientCacheQueryRequest
-org.apache.ignite.internal.processors.rest.client.message.GridClientCacheQueryRequest$GridQueryOperation
-org.apache.ignite.internal.processors.rest.client.message.GridClientCacheQueryRequest$GridQueryType
-org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest
-org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest$GridCacheOperation
-org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeRequest
-org.apache.ignite.internal.processors.rest.client.message.GridClientHandshakeResponse
-org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean
-org.apache.ignite.internal.processors.rest.client.message.GridClientNodeMetricsBean
-org.apache.ignite.internal.processors.rest.client.message.GridClientPingPacket
-org.apache.ignite.internal.processors.rest.client.message.GridClientResponse
-org.apache.ignite.internal.processors.rest.client.message.GridClientTaskRequest
-org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean
-org.apache.ignite.internal.processors.rest.client.message.GridClientTopologyRequest
-org.apache.ignite.internal.processors.rest.client.message.GridRouterRequest
-org.apache.ignite.internal.processors.rest.client.message.GridRouterResponse
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheClientQueryResult
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$2
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$AppendCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$CacheOperationCallable
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$CasCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$FixedResult
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$FlaggedCacheOperationCallable
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$GetAllCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$GetCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$MetricsCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$PrependCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$PutAllCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$RemoveAllCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler$RemoveCommand
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheQueryCommandHandler$1
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheQueryCommandHandler$ExecuteQuery
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheQueryCommandHandler$FetchQueryResults
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheQueryCommandHandler$RebuildIndexes
-org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheRestResponse
-org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructuresCommandHandler$1
-org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler$2
-org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler$ExeCallable
-org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRequest
-org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse
-org.apache.ignite.internal.processors.rest.handlers.top.GridTopologyCommandHandler$1
-org.apache.ignite.internal.processors.rest.protocols.http.jetty.GridJettyRestProtocol$1
-org.apache.ignite.internal.processors.rest.protocols.tcp.GridClientPacketType
-org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage
-org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpMemcachedNioListener$1
-org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpMemcachedNioListener$2
-org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestNioListener$1
-org.apache.ignite.internal.processors.rest.request.GridRestCacheQueryRequest
-org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessor$1
-org.apache.ignite.internal.processors.schedule.ScheduleFutureImpl$3
-org.apache.ignite.internal.processors.schedule.ScheduleFutureImpl$4
-org.apache.ignite.internal.processors.security.os.GridOsSecurityProcessor$1
-org.apache.ignite.internal.processors.security.os.GridOsSecurityProcessor$GridSecuritySubjectAdapter
-org.apache.ignite.internal.processors.service.GridServiceAssignments
-org.apache.ignite.internal.processors.service.GridServiceAssignmentsKey
-org.apache.ignite.internal.processors.service.GridServiceDeployment
-org.apache.ignite.internal.processors.service.GridServiceDeploymentFuture
-org.apache.ignite.internal.processors.service.GridServiceDeploymentKey
-org.apache.ignite.internal.processors.service.GridServiceMethodNotFoundException
-org.apache.ignite.internal.processors.service.GridServiceNotFoundException
-org.apache.ignite.internal.processors.service.GridServiceProxy
-org.apache.ignite.internal.processors.service.GridServiceProxy$ServiceProxyCallable
-org.apache.ignite.internal.processors.service.ServiceContextImpl
-org.apache.ignite.internal.processors.service.ServiceDescriptorImpl
-org.apache.ignite.internal.processors.streamer.GridStreamerAttributes
-org.apache.ignite.internal.processors.streamer.GridStreamerCancelRequest
-org.apache.ignite.internal.processors.streamer.GridStreamerExecutionBatch
-org.apache.ignite.internal.processors.streamer.GridStreamerExecutionRequest
-org.apache.ignite.internal.processors.streamer.GridStreamerResponse
-org.apache.ignite.internal.processors.streamer.GridStreamerRouteFailedException
-org.apache.ignite.internal.processors.streamer.GridStreamerStageExecutionFuture
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$3
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$BatchExecutionFuture
-org.apache.ignite.internal.processors.streamer.IgniteStreamerImpl$StreamerPda
-org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerBroadcastTask$StreamerBroadcastJob
-org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerQueryTask$QueryJob
-org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask
-org.apache.ignite.internal.processors.streamer.task.GridStreamerReduceTask$ReduceJob
-org.apache.ignite.internal.processors.task.GridTaskProcessor$1
-org.apache.ignite.internal.processors.task.GridTaskThreadContextKey
-org.apache.ignite.internal.processors.task.GridTaskWorker$3
-org.apache.ignite.internal.processors.task.GridTaskWorker$State
-org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException
-org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException
-org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException
-org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException
-org.apache.ignite.internal.util.F0$1
-org.apache.ignite.internal.util.F0$2
-org.apache.ignite.internal.util.F0$3
-org.apache.ignite.internal.util.F0$4
-org.apache.ignite.internal.util.F0$5
-org.apache.ignite.internal.util.F0$6
-org.apache.ignite.internal.util.F0$7
-org.apache.ignite.internal.util.F0$8
-org.apache.ignite.internal.util.F0$9
-org.apache.ignite.internal.util.GridAtomicInteger
-org.apache.ignite.internal.util.GridAtomicLong
-org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet
-org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap
-org.apache.ignite.internal.util.GridBoundedConcurrentOrderedSet
-org.apache.ignite.internal.util.GridBoundedLinkedHashMap
-org.apache.ignite.internal.util.GridBoundedLinkedHashSet
-org.apache.ignite.internal.util.GridByteArrayList
-org.apache.ignite.internal.util.GridCollections$LockedCollection
-org.apache.ignite.internal.util.GridCollections$LockedList
-org.apache.ignite.internal.util.GridCollections$LockedMap
-org.apache.ignite.internal.util.GridCollections$LockedSet
-org.apache.ignite.internal.util.GridConcurrentHashSet
-org.apache.ignite.internal.util.GridConcurrentLinkedHashSet
-org.apache.ignite.internal.util.GridConcurrentPhantomHashSet$1
-org.apache.ignite.internal.util.GridConcurrentSkipListSet
-org.apache.ignite.internal.util.GridConcurrentWeakHashSet$1
-org.apache.ignite.internal.util.GridConsistentHash$1
-org.apache.ignite.internal.util.GridConsistentHash$2
-org.apache.ignite.internal.util.GridEmptyCloseableIterator
-org.apache.ignite.internal.util.GridEmptyIterator
-org.apache.ignite.internal.util.GridIdentityHashSet
-org.apache.ignite.internal.util.GridLeanMap
-org.apache.ignite.internal.util.GridLeanMap$LeanHashMap
-org.apache.ignite.internal.util.GridLeanMap$Map1
-org.apache.ignite.internal.util.GridLeanMap$Map2
-org.apache.ignite.internal.util.GridLeanMap$Map3
-org.apache.ignite.internal.util.GridLeanMap$Map4
-org.apache.ignite.internal.util.GridLeanMap$Map5
-org.apache.ignite.internal.util.GridLeanSet
-org.apache.ignite.internal.util.GridListSet
-org.apache.ignite.internal.util.GridListSet$1
-org.apache.ignite.internal.util.GridLogThrottle$LogLevel$1
-org.apache.ignite.internal.util.GridLogThrottle$LogLevel$2
-org.apache.ignite.internal.util.GridLogThrottle$LogLevel$3
-org.apache.ignite.internal.util.GridLongList
-org.apache.ignite.internal.util.GridMutex
-org.apache.ignite.internal.util.GridRandom
-org.apache.ignite.internal.util.GridReflectionCache
-org.apache.ignite.internal.util.GridSetWrapper
-org.apache.ignite.internal.util.GridSnapshotLock$Sync
-org.apache.ignite.internal.util.GridSpiCloseableIteratorWrapper
-org.apache.ignite.internal.util.GridStringBuilder
-org.apache.ignite.internal.util.GridSynchronizedMap
-org.apache.ignite.internal.util.IgniteUtils$10
-org.apache.ignite.internal.util.IgniteUtils$11
-org.apache.ignite.internal.util.IgniteUtils$12
-org.apache.ignite.internal.util.IgniteUtils$13
-org.apache.ignite.internal.util.IgniteUtils$14
-org.apache.ignite.internal.util.IgniteUtils$19
-org.apache.ignite.internal.util.IgniteUtils$2
-org.apache.ignite.internal.util.IgniteUtils$20
-org.apache.ignite.internal.util.IgniteUtils$21
-org.apache.ignite.internal.util.IgniteUtils$22
-org.apache.ignite.internal.util.IgniteUtils$23
-org.apache.ignite.internal.util.IgniteUtils$24
-org.apache.ignite.internal.util.IgniteUtils$25
-org.apache.ignite.internal.util.IgniteUtils$3
-org.apache.ignite.internal.util.IgniteUtils$4
-org.apache.ignite.internal.util.IgniteUtils$5
-org.apache.ignite.internal.util.IgniteUtils$6
-org.apache.ignite.internal.util.IgniteUtils$7
-org.apache.ignite.internal.util.IgniteUtils$8
-org.apache.ignite.internal.util.IgniteUtils$9
-org.apache.ignite.internal.util.future.GridCompoundFuture
-org.apache.ignite.internal.util.future.GridCompoundFuture$1
-org.apache.ignite.internal.util.future.GridCompoundFuture$Listener
-org.apache.ignite.internal.util.future.GridCompoundIdentityFuture
-org.apache.ignite.internal.util.future.GridEmbeddedFuture
-org.apache.ignite.internal.util.future.GridEmbeddedFuture$1
-org.apache.ignite.internal.util.future.GridEmbeddedFuture$2
-org.apache.ignite.internal.util.future.GridEmbeddedFuture$2$1
-org.apache.ignite.internal.util.future.GridEmbeddedFuture$3
-org.apache.ignite.internal.util.future.GridEmbeddedFuture$3$1
-org.apache.ignite.internal.util.future.GridFinishedFuture
-org.apache.ignite.internal.util.future.GridFinishedFuture$2
-org.apache.ignite.internal.util.future.GridFinishedFutureEx
-org.apache.ignite.internal.util.future.GridFutureAdapter
-org.apache.ignite.internal.util.future.GridFutureAdapter$ChainFuture
-org.apache.ignite.internal.util.future.GridFutureAdapterEx
-org.apache.ignite.internal.util.future.GridFutureAdapterEx$1
-org.apache.ignite.internal.util.future.GridFutureAdapterEx$2
-org.apache.ignite.internal.util.future.GridFutureAdapterEx$3
-org.apache.ignite.internal.util.future.GridFutureChainListener
-org.apache.ignite.internal.util.future.IgniteFutureImpl$1
-org.apache.ignite.internal.util.future.IgniteFutureImpl$InternalFutureListener
-org.apache.ignite.internal.util.gridify.GridifyJobAdapter
-org.apache.ignite.internal.util.gridify.GridifyRangeArgument
-org.apache.ignite.internal.util.gridify.GridifyUtils$EnumerationAdapter
-org.apache.ignite.internal.util.gridify.GridifyUtils$IteratorAdapter
-org.apache.ignite.internal.util.io.GridFilenameUtils$IOCase
-org.apache.ignite.internal.util.ipc.IpcEndpointBindException
-org.apache.ignite.internal.util.ipc.IpcEndpointType
-org.apache.ignite.internal.util.ipc.shmem.IpcOutOfSystemResourcesException
-org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryInitRequest
-org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryInitResponse
-org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryOperationTimedoutException
-org.apache.ignite.internal.util.lang.GridClosureException
-org.apache.ignite.internal.util.lang.GridComputeJobWrapper
-org.apache.ignite.internal.util.lang.GridFunc$1
-org.apache.ignite.internal.util.lang.GridFunc$10
-org.apache.ignite.internal.util.lang.GridFunc$100
-org.apache.ignite.internal.util.lang.GridFunc$101
-org.apache.ignite.internal.util.lang.GridFunc$101$1
-org.apache.ignite.internal.util.lang.GridFunc$101$2
-org.apache.ignite.internal.util.lang.GridFunc$102
-org.apache.ignite.internal.util.lang.GridFunc$102$1
-org.apache.ignite.internal.util.lang.GridFunc$102$2
-org.apache.ignite.internal.util.lang.GridFunc$103
-org.apache.ignite.internal.util.lang.GridFunc$103$1
-org.apache.ignite.internal.util.lang.GridFunc$103$2
-org.apache.ignite.internal.util.lang.GridFunc$104
-org.apache.ignite.internal.util.lang.GridFunc$104$1
-org.apache.ignite.internal.util.lang.GridFunc$104$2
-org.apache.ignite.internal.util.lang.GridFunc$105
-org.apache.ignite.internal.util.lang.GridFunc$106
-org.apache.ignite.internal.util.lang.GridFunc$107
-org.apache.ignite.internal.util.lang.GridFunc$108
-org.apache.ignite.internal.util.lang.GridFunc$109
-org.apache.ignite.internal.util.lang.GridFunc$11
-org.apache.ignite.internal.util.lang.GridFunc$110
-org.apache.ignite.internal.util.lang.GridFunc$111
-org.apache.ignite.internal.util.lang.GridFunc$112
-org.apache.ignite.internal.util.lang.GridFunc$113
-org.apache.ignite.internal.util.lang.GridFunc$114
-org.apache.ignite.internal.util.lang.GridFunc$115
-org.apache.ignite.internal.util.lang.GridFunc$116
-org.apache.ignite.internal.util.lang.GridFunc$117
-org.apache.ignite.internal.util.lang.GridFunc$118
-org.apache.ignite.internal.util.lang.GridFunc$119
-org.apache.ignite.internal.util.lang.GridFunc$12
-org.apache.ignite.internal.util.lang.GridFunc$120
-org.apache.ignite.internal.util.lang.GridFunc$122
-org.apache.ignite.internal.util.lang.GridFunc$123
-org.apache.ignite.internal.util.lang.GridFunc$125
-org.apache.ignite.internal.util.lang.GridFunc$126
-org.apache.ignite.internal.util.lang.GridFunc$128
-org.apache.ignite.internal.util.lang.GridFunc$129
-org.apache.ignite.internal.util.lang.GridFunc$13
-org.apache.ignite.internal.util.lang.GridFunc$130
-org.apache.ignite.internal.util.lang.GridFunc$132
-org.apache.ignite.internal.util.lang.GridFunc$133
-org.apache.ignite.internal.util.lang.GridFunc$134
-org.apache.ignite.internal.util.lang.GridFunc$135
-org.apache.ignite.internal.util.lang.GridFunc$136
-org.apache.ignite.internal.util.lang.GridFunc$137
-org.apache.ignite.internal.util.lang.GridFunc$139
-org.apache.ignite.internal.util.lang.GridFunc$14
-org.apache.ignite.internal.util.lang.GridFunc$140
-org.apache.ignite.internal.util.lang.GridFunc$141
-org.apache.ignite.internal.util.lang.GridFunc$142
-org.apache.ignite.internal.util.lang.GridFunc$143
-org.apache.ignite.internal.util.lang.GridFunc$144
-org.apache.ignite.internal.util.lang.GridFunc$145
-org.apache.ignite.internal.util.lang.GridFunc$146
-org.apache.ignite.internal.util.lang.GridFunc$147
-org.apache.ignite.internal.util.lang.GridFunc$148
-org.apache.ignite.internal.util.lang.GridFunc$149
-org.apache.ignite.internal.util.lang.GridFunc$15
-org.apache.ignite.internal.util.lang.GridFunc$150
-org.apache.ignite.internal.util.lang.GridFunc$151
-org.apache.ignite.internal.util.lang.GridFunc$152
-org.apache.ignite.internal.util.lang.GridFunc$153
-org.apache.ignite.internal.util.lang.GridFunc$154
-org.apache.ignite.internal.util.lang.GridFunc$155
-org.apache.ignite.internal.util.lang.GridFunc$156
-org.apache.ignite.internal.util.lang.GridFunc$157
-org.apache.ignite.internal.util.lang.GridFunc$158
-org.apache.ignite.internal.util.lang.GridFunc$159
-org.apache.ignite.internal.util.lang.GridFunc$16
-org.apache.ignite.internal.util.lang.GridFunc$160
-org.apache.ignite.internal.util.lang.GridFunc$161
-org.apache.ignite.internal.util.lang.GridFunc$162
-org.apache.ignite.internal.util.lang.GridFunc$17
-org.apache.ignite.internal.util.lang.GridFunc$18
-org.apache.ignite.internal.util.lang.GridFunc$19
-org.apache.ignite.internal.util.lang.GridFunc$2
-org.apache.ignite.internal.util.lang.GridFunc$20
-org.apache.ignite.internal.util.lang.GridFunc$21
-org.apache.ignite.internal.util.lang.GridFunc$22
-org.apache.ignite.internal.util.lang.GridFunc$23
-org.apache.ignite.internal.util.lang.GridFunc$24
-org.apache.ignite.internal.util.lang.GridFunc$25
-org.apache.ignite.internal.util.lang.GridFunc$26
-org.apache.ignite.internal.util.lang.GridFunc$27
-org.apache.ignite.internal.util.lang.GridFunc$28
-org.apache.ignite.internal.util.lang.GridFunc$29
-org.apache.ignite.internal.util.lang.GridFunc$3
-org.apache.ignite.internal.util.lang.GridFunc$30
-org.apache.ignite.internal.util.lang.GridFunc$31
-org.apache.ignite.internal.util.lang.GridFunc$32
-org.apache.ignite.internal.util.lang.GridFunc$33
-org.apache.ignite.internal.util.lang.GridFunc$34
-org.apache.ignite.internal.util.lang.GridFunc$35
-org.apache.ignite.internal.util.lang.GridFunc$36
-org.apache.ignite.internal.util.lang.GridFunc$37
-org.apache.ignite.internal.util.lang.GridFunc$38
-org.apache.ignite.internal.util.lang.GridFunc$39
-org.apache.ignite.internal.util.lang.GridFunc$4
-org.apache.ignite.internal.util.lang.GridFunc$40
-org.apache.ignite.internal.util.lang.GridFunc$41
-org.apache.ignite.internal.util.lang.GridFunc$42
-org.apache.ignite.internal.util.lang.GridFunc$43
-org.apache.ignite.internal.util.lang.GridFunc$44
-org.apache.ignite.internal.util.lang.GridFunc$45
-org.apache.ignite.internal.util.lang.GridFunc$46
-org.apache.ignite.internal.util.lang.GridFunc$47
-org.apache.ignite.internal.util.lang.GridFunc$48
-org.apache.ignite.internal.util.lang.GridFunc$49
-org.apache.ignite.internal.util.lang.GridFunc$5
-org.apache.ignite.internal.util.lang.GridFunc$50
-org.apache.ignite.internal.util.lang.GridFunc$51
-org.apache.ignite.internal.util.lang.GridFunc$52
-org.apache.ignite.internal.util.lang.GridFunc$53
-org.apache.ignite.internal.util.lang.GridFunc$54
-org.apache.ignite.internal.util.lang.GridFunc$55
-org.apache.ignite.internal.util.lang.GridFunc$56
-org.apache.ignite.internal.util.lang.GridFunc$57
-org.apache.ignite.internal.util.lang.GridFunc$58
-org.apache.ignite.internal.util.lang.GridFunc$59
-org.apache.ignite.internal.util.lang.GridFunc$6
-org.apache.ignite.internal.util.lang.GridFunc$60
-org.apache.ignite.internal.util.lang.GridFunc$61
-org.apache.ignite.internal.util.lang.GridFunc$62
-org.apache.ignite.internal.util.lang.GridFunc$63
-org.apache.ignite.internal.util.lang.GridFunc$64
-org.apache.ignite.internal.util.lang.GridFunc$65
-org.apache.ignite.internal.util.lang.GridFunc$66
-org.apache.ignite.internal.util.lang.GridFunc$67
-org.apache.ignite.internal.util.lang.GridFunc$68
-org.apache.ignite.internal.util.lang.GridFunc$69
-org.apache.ignite.internal.util.lang.GridFunc$69$1
-org.apache.ignite.internal.util.lang.GridFunc$7
-org.apache.ignite.internal.util.lan

<TRUNCATED>

[45/50] [abbrv] incubator-ignite git commit: # sprint-2 - javadoc fixes.

Posted by sb...@apache.org.
# sprint-2 - javadoc fixes.


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

Branch: refs/heads/ignite-342
Commit: 036bd71537630b082b747f518172da6ebfe11105
Parents: 3a77acf
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 19:05:42 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 19:05:42 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/cache/store/CacheStore.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/036bd715/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index 848df39..eefcfb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -119,7 +119,7 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> {
     /**
      * Loads all values from underlying persistent storage. Note that keys are not
      * passed, so it is up to implementation to figure out what to load. This method
-     * is called whenever {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
+     * is called whenever {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)}
      * method is invoked which is usually to preload the cache from persistent storage.
      * <p>
      * This method is optional, and cache implementation does not depend on this
@@ -132,7 +132,7 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> {
      *
      * @param clo Closure for loaded values.
      * @param args Arguments passes into
-     *      {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method.
+     *      {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)} method.
      * @throws CacheLoaderException If loading failed.
      */
     public void loadCache(IgniteBiInClosure<K, V> clo, @Nullable Object... args) throws CacheLoaderException;


[05/50] [abbrv] incubator-ignite git commit: gg-fix-deploy Examples fix. "-ent" removal

Posted by sb...@apache.org.
gg-fix-deploy Examples fix. "-ent" removal


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

Branch: refs/heads/ignite-342
Commit: 9f44e103fd5812617dbe7e7458e3c27f058992e9
Parents: 4e57996
Author: avinogradov <av...@gridgain.com>
Authored: Thu Feb 26 17:39:14 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Feb 26 17:39:14 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/events/DiscoveryCustomEvent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f44e103/modules/core/src/main/java/org/apache/ignite/events/DiscoveryCustomEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryCustomEvent.java
index af15055..557e65d 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/DiscoveryCustomEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/DiscoveryCustomEvent.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import java.io.*;
 
 /**
- *
+ * 123
  */
 public class DiscoveryCustomEvent extends DiscoveryEvent {
     /** */


[24/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-gg-fix-deploy' into sprint-2

Posted by sb...@apache.org.
Merge branch 'ignite-gg-fix-deploy' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: 0e7a7ef58711d7e0136eb68542f089b729459ee5
Parents: dd66167 a80af86
Author: avinogradov <av...@gridgain.com>
Authored: Fri Feb 27 16:57:14 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri Feb 27 16:57:14 2015 +0300

----------------------------------------------------------------------
 modules/extdata/p2p/pom.xml   | 6 ------
 modules/hibernate/pom.xml     | 6 ------
 modules/indexing/pom.xml      | 6 ------
 modules/jta/pom.xml           | 6 ------
 modules/scalar/pom.xml        | 6 ------
 modules/spring/pom.xml        | 6 ------
 modules/visor-console/pom.xml | 7 -------
 modules/web/pom.xml           | 6 ------
 8 files changed, 49 deletions(-)
----------------------------------------------------------------------



[47/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-377' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2

Posted by sb...@apache.org.
Merge branches 'ignite-377' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2


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

Branch: refs/heads/ignite-342
Commit: 13e2d1f678cea51f18b7c5ae2ec48157eccbf4c3
Parents: c9f46c1 061ea8a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 15:55:59 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 15:55:59 2015 +0700

----------------------------------------------------------------------
 .../core/src/test/config/store/jdbc/Ignite.xml  |  63 ++++++---
 .../ignite/schema/generator/XmlGenerator.java   |   8 +-
 .../apache/ignite/schema/model/PojoField.java   |  11 +-
 .../apache/ignite/schema/load/model/Ignite.xml  | 133 ++++++++++++++-----
 .../yardstick/config/ignite-store-config.xml    |  15 ++-
 5 files changed, 168 insertions(+), 62 deletions(-)
----------------------------------------------------------------------



[42/50] [abbrv] incubator-ignite git commit: IGNITE-377 Rework schema load XML generator to generate instead of int number.

Posted by sb...@apache.org.
 IGNITE-377 Rework schema load XML generator to generate <util:constant static-field="java.sql.Types.XXX"/> instead of int number.


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

Branch: refs/heads/ignite-342
Commit: 061ea8aed7f43a47b5097f3c626701c688014e63
Parents: 6097e7b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sun Mar 1 00:17:19 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sun Mar 1 00:17:19 2015 +0700

----------------------------------------------------------------------
 .../core/src/test/config/store/jdbc/Ignite.xml  |  63 ++++++---
 .../ignite/schema/generator/XmlGenerator.java   |   8 +-
 .../apache/ignite/schema/model/PojoField.java   |  11 +-
 .../apache/ignite/schema/load/model/Ignite.xml  | 133 ++++++++++++++-----
 .../yardstick/config/ignite-store-config.xml    |  15 ++-
 5 files changed, 168 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/061ea8ae/modules/core/src/test/config/store/jdbc/Ignite.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml b/modules/core/src/test/config/store/jdbc/Ignite.xml
index 1b6f702..d56b4e6 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -21,9 +21,12 @@
     XML generated by Apache Ignite Schema Load utility: 02/03/2015
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd">
     <bean class="org.apache.ignite.cache.CacheTypeMetadata">
         <property name="databaseSchema" value="PUBLIC"/>
         <property name="databaseTable" value="ORGANIZATION"/>
@@ -33,7 +36,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
@@ -43,24 +48,31 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="NAME"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="name"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="CITY"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="city"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>
             </list>
         </property>
+
     </bean>
     <bean class="org.apache.ignite.cache.CacheTypeMetadata">
         <property name="databaseSchema" value="PUBLIC"/>
@@ -71,7 +83,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
@@ -81,24 +95,31 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ORG_ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="orgId"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="NAME"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="name"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>
             </list>
         </property>
+
     </bean>
     <bean class="org.apache.ignite.cache.CacheTypeMetadata">
         <property name="databaseSchema" value="PUBLIC"/>
@@ -109,19 +130,25 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="int"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ORG_ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="orgId"/>
                     <property name="javaType" value="int"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="CITY_ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="cityId"/>
                     <property name="javaType" value="int"/>
                 </bean>
@@ -131,19 +158,25 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ORG_ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="orgId"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="NAME"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="name"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/061ea8ae/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
index d4d7054..c62a720 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
@@ -159,7 +159,8 @@ public class XmlGenerator {
                 Element item = addBean(doc, list, CacheTypeFieldMetadata.class);
 
                 addProperty(doc, item, "databaseName", field.dbName());
-                addProperty(doc, item, "databaseType", String.valueOf(field.dbType()));
+                Element dbType = addProperty(doc, item, "databaseType", null);
+                addElement(doc, dbType, "util:constant", "static-field", "java.sql.Types." + field.dbTypeName());
                 addProperty(doc, item, "javaName", field.javaName());
                 addProperty(doc, item, "javaType", field.javaTypeName());
             }
@@ -308,9 +309,12 @@ public class XmlGenerator {
             Element beans = addElement(doc, doc, "beans");
             beans.setAttribute("xmlns", "http://www.springframework.org/schema/beans");
             beans.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+            beans.setAttribute("xmlns:util", "http://www.springframework.org/schema/util");
             beans.setAttribute("xsi:schemaLocation",
                 "http://www.springframework.org/schema/beans " +
-                "http://www.springframework.org/schema/beans/spring-beans.xsd");
+                "http://www.springframework.org/schema/beans/spring-beans.xsd " +
+                "http://www.springframework.org/schema/util " +
+                "http://www.springframework.org/schema/util/spring-util.xsd");
 
             for (PojoDescriptor pojo : pojos)
                 addTypeMetadata(doc, beans, pkg, pojo, includeKeys);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/061ea8ae/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
index f9a5837..10939d9 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/model/PojoField.java
@@ -45,9 +45,6 @@ public class PojoField {
     /** Field name in database. */
     private final StringProperty dbNameProp;
 
-    /** JDBC field type in database. */
-    private final int dbType;
-
     /** Field type in database. */
     private final StringProperty dbTypeNameProp;
 
@@ -139,8 +136,6 @@ public class PojoField {
     public PojoField(String dbName, int dbType, String javaName, String javaTypeName, boolean key, boolean nullable) {
         dbNameProp = new SimpleStringProperty(dbName);
 
-        this.dbType = dbType;
-
         dbTypeNameProp = new SimpleStringProperty(jdbcTypeName(dbType));
 
         javaNamePrev = javaName;
@@ -340,10 +335,10 @@ public class PojoField {
     }
 
     /**
-     * @return POJO field JDBC type in database.
+     * @return POJO field JDBC type name in database.
      */
-    public int dbType() {
-        return dbType;
+    public String dbTypeName() {
+        return dbTypeNameProp.get();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/061ea8ae/modules/schema-load/src/test/java/org/apache/ignite/schema/load/model/Ignite.xml
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/model/Ignite.xml b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/model/Ignite.xml
index 8690dbd..f0b5696 100644
--- a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/model/Ignite.xml
+++ b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/model/Ignite.xml
@@ -21,9 +21,12 @@
     XML generated by Apache Ignite Schema Load utility: 02/05/2015
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd">
     <bean class="org.apache.ignite.cache.CacheTypeMetadata">
         <property name="databaseSchema" value="PUBLIC"/>
         <property name="databaseTable" value="OBJECTS"/>
@@ -33,7 +36,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="PK"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="pk"/>
                     <property name="javaType" value="int"/>
                 </bean>
@@ -43,91 +48,121 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="PK"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="pk"/>
                     <property name="javaType" value="int"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BOOLCOL"/>
-                    <property name="databaseType" value="16"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.BOOLEAN"/>
+                    </property>
                     <property name="javaName" value="boolcol"/>
                     <property name="javaType" value="java.lang.Boolean"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BYTECOL"/>
-                    <property name="databaseType" value="-6"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TINYINT"/>
+                    </property>
                     <property name="javaName" value="bytecol"/>
                     <property name="javaType" value="java.lang.Byte"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="SHORTCOL"/>
-                    <property name="databaseType" value="5"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.SMALLINT"/>
+                    </property>
                     <property name="javaName" value="shortcol"/>
                     <property name="javaType" value="java.lang.Short"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="INTCOL"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="intcol"/>
                     <property name="javaType" value="java.lang.Integer"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="LONGCOL"/>
-                    <property name="databaseType" value="-5"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.BIGINT"/>
+                    </property>
                     <property name="javaName" value="longcol"/>
                     <property name="javaType" value="java.lang.Long"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="FLOATCOL"/>
-                    <property name="databaseType" value="7"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.REAL"/>
+                    </property>
                     <property name="javaName" value="floatcol"/>
                     <property name="javaType" value="java.lang.Float"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DOUBLECOL"/>
-                    <property name="databaseType" value="8"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DOUBLE"/>
+                    </property>
                     <property name="javaName" value="doublecol"/>
                     <property name="javaType" value="java.lang.Double"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DOUBLECOL2"/>
-                    <property name="databaseType" value="8"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DOUBLE"/>
+                    </property>
                     <property name="javaName" value="doublecol2"/>
                     <property name="javaType" value="java.lang.Double"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BIGDECIMALCOL"/>
-                    <property name="databaseType" value="3"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DECIMAL"/>
+                    </property>
                     <property name="javaName" value="bigdecimalcol"/>
                     <property name="javaType" value="java.math.BigDecimal"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="STRCOL"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="strcol"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DATECOL"/>
-                    <property name="databaseType" value="91"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DATE"/>
+                    </property>
                     <property name="javaName" value="datecol"/>
                     <property name="javaType" value="java.sql.Date"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="TIMECOL"/>
-                    <property name="databaseType" value="92"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TIME"/>
+                    </property>
                     <property name="javaName" value="timecol"/>
                     <property name="javaType" value="java.sql.Time"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="TSCOL"/>
-                    <property name="databaseType" value="93"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TIMESTAMP"/>
+                    </property>
                     <property name="javaName" value="tscol"/>
                     <property name="javaType" value="java.sql.Timestamp"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ARRCOL"/>
-                    <property name="databaseType" value="-3"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARBINARY"/>
+                    </property>
                     <property name="javaName" value="arrcol"/>
                     <property name="javaType" value="java.lang.Object"/>
                 </bean>
@@ -181,7 +216,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="PK"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="pk"/>
                     <property name="javaType" value="int"/>
                 </bean>
@@ -191,91 +228,121 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="PK"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="pk"/>
                     <property name="javaType" value="int"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BOOLCOL"/>
-                    <property name="databaseType" value="16"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.BOOLEAN"/>
+                    </property>
                     <property name="javaName" value="boolcol"/>
                     <property name="javaType" value="boolean"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BYTECOL"/>
-                    <property name="databaseType" value="-6"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TINYINT"/>
+                    </property>
                     <property name="javaName" value="bytecol"/>
                     <property name="javaType" value="byte"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="SHORTCOL"/>
-                    <property name="databaseType" value="5"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.SMALLINT"/>
+                    </property>
                     <property name="javaName" value="shortcol"/>
                     <property name="javaType" value="short"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="INTCOL"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="intcol"/>
                     <property name="javaType" value="int"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="LONGCOL"/>
-                    <property name="databaseType" value="-5"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.BIGINT"/>
+                    </property>
                     <property name="javaName" value="longcol"/>
                     <property name="javaType" value="long"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="FLOATCOL"/>
-                    <property name="databaseType" value="7"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.REAL"/>
+                    </property>
                     <property name="javaName" value="floatcol"/>
                     <property name="javaType" value="float"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DOUBLECOL"/>
-                    <property name="databaseType" value="8"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DOUBLE"/>
+                    </property>
                     <property name="javaName" value="doublecol"/>
                     <property name="javaType" value="double"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DOUBLECOL2"/>
-                    <property name="databaseType" value="8"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DOUBLE"/>
+                    </property>
                     <property name="javaName" value="doublecol2"/>
                     <property name="javaType" value="double"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="BIGDECIMALCOL"/>
-                    <property name="databaseType" value="3"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DECIMAL"/>
+                    </property>
                     <property name="javaName" value="bigdecimalcol"/>
                     <property name="javaType" value="java.math.BigDecimal"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="STRCOL"/>
-                    <property name="databaseType" value="12"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARCHAR"/>
+                    </property>
                     <property name="javaName" value="strcol"/>
                     <property name="javaType" value="java.lang.String"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="DATECOL"/>
-                    <property name="databaseType" value="91"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.DATE"/>
+                    </property>
                     <property name="javaName" value="datecol"/>
                     <property name="javaType" value="java.sql.Date"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="TIMECOL"/>
-                    <property name="databaseType" value="92"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TIME"/>
+                    </property>
                     <property name="javaName" value="timecol"/>
                     <property name="javaType" value="java.sql.Time"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="TSCOL"/>
-                    <property name="databaseType" value="93"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.TIMESTAMP"/>
+                    </property>
                     <property name="javaName" value="tscol"/>
                     <property name="javaType" value="java.sql.Timestamp"/>
                 </bean>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ARRCOL"/>
-                    <property name="databaseType" value="-3"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.VARBINARY"/>
+                    </property>
                     <property name="javaName" value="arrcol"/>
                     <property name="javaType" value="java.lang.Object"/>
                 </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/061ea8ae/modules/yardstick/config/ignite-store-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml
index 161cfa5..066b246 100644
--- a/modules/yardstick/config/ignite-store-config.xml
+++ b/modules/yardstick/config/ignite-store-config.xml
@@ -21,9 +21,12 @@
     Ignite Spring configuration file to startup grid.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd">
     <!--
         Store data source.
     -->
@@ -45,7 +48,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="ID"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="int"/>
                 </bean>
@@ -55,7 +60,9 @@
             <list>
                 <bean class="org.apache.ignite.cache.CacheTypeFieldMetadata">
                     <property name="databaseName" value="VALUE"/>
-                    <property name="databaseType" value="4"/>
+                    <property name="databaseType">
+                        <util:constant static-field="java.sql.Types.INTEGER"/>
+                    </property>
                     <property name="javaName" value="id"/>
                     <property name="javaType" value="int"/>
                 </bean>


[17/50] [abbrv] incubator-ignite git commit: # IGNITE-348: Applied patch from Ivan V..

Posted by sb...@apache.org.
# IGNITE-348: Applied patch from Ivan V..


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

Branch: refs/heads/ignite-342
Commit: 23bee413c6e4f382036ab63433e1a38927a8347f
Parents: 4e7463d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 13:30:53 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 13:30:53 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  12 +
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 412 ++++++++++++++++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   1 +
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   1 +
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |  10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 413 -------------------
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |   2 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |   2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |   2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |   1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   2 +-
 12 files changed, 437 insertions(+), 423 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml
index 5fafad8..a264749 100644
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@ -129,6 +129,18 @@
                             <entry key="port" value="10500"/>
                         </map>
                     </property>
+
+                    <!-- Example secondary file system configuration (IGFS configured over Hadoop HDFS): -->
+                    <!--
+                    <property name="defaultMode" value="PROXY"/>
+
+                    <property name="secondaryFileSystem">
+                        <bean class="org.apache.ignite.igfs.hadoop.IgfsHadoopFileSystemWrapper">
+                            <constructor-arg name="uri"     value="hdfs://1.2.3.4:9000"/>
+                            <constructor-arg name="cfgPath" value="/opt/hadoop-server/etc/hadoop/core-site.xml"/>
+                        </bean>
+                    </property>
+                    -->
                 </bean>
             </list>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
new file mode 100644
index 0000000..29dfde5
--- /dev/null
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
@@ -0,0 +1,412 @@
+/*
+ * 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.igfs.hadoop;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+import org.apache.hadoop.ipc.*;
+import org.apache.ignite.*;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.internal.igfs.hadoop.*;
+import org.apache.ignite.internal.processors.igfs.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link org.apache.ignite.igfs.Igfs}.
+ */
+public class IgfsHadoopFileSystemWrapper implements Igfs, AutoCloseable {
+    /** Property name for path to Hadoop configuration. */
+    public static final String SECONDARY_FS_CONFIG_PATH = "SECONDARY_FS_CONFIG_PATH";
+
+    /** Property name for URI of file system. */
+    public static final String SECONDARY_FS_URI = "SECONDARY_FS_URI";
+
+    /** Hadoop file system. */
+    private final FileSystem fileSys;
+
+    /** Properties of file system */
+    private final Map<String, String> props = new HashMap<>();
+
+    /**
+     * Constructor.
+     *
+     * @param uri URI of file system.
+     * @param cfgPath Additional path to Hadoop configuration.
+     * @throws IgniteCheckedException In case of error.
+     */
+    public IgfsHadoopFileSystemWrapper(@Nullable String uri, @Nullable String cfgPath) throws IgniteCheckedException {
+        Configuration cfg = new Configuration();
+
+        if (cfgPath != null)
+            cfg.addResource(U.resolveIgniteUrl(cfgPath));
+
+        try {
+            fileSys = uri == null ? FileSystem.get(cfg) : FileSystem.get(new URI(uri), cfg);
+        }
+        catch (IOException | URISyntaxException e) {
+            throw new IgniteCheckedException(e);
+        }
+
+        uri = fileSys.getUri().toString();
+
+        if (!uri.endsWith("/"))
+            uri += "/";
+
+        props.put(SECONDARY_FS_CONFIG_PATH, cfgPath);
+        props.put(SECONDARY_FS_URI, uri);
+    }
+
+    /**
+     * Convert IGFS path into Hadoop path.
+     *
+     * @param path IGFS path.
+     * @return Hadoop path.
+     */
+    private Path convert(IgfsPath path) {
+        URI uri = fileSys.getUri();
+
+        return new Path(uri.getScheme(), uri.getAuthority(), path.toString());
+    }
+
+    /**
+     * Heuristically checks if exception was caused by invalid HDFS version and returns appropriate exception.
+     *
+     * @param e Exception to check.
+     * @param detailMsg Detailed error message.
+     * @return Appropriate exception.
+     */
+    private IgfsException handleSecondaryFsError(IOException e, String detailMsg) {
+        boolean wrongVer = X.hasCause(e, RemoteException.class) ||
+            (e.getMessage() != null && e.getMessage().contains("Failed on local"));
+
+        IgfsException igfsErr = !wrongVer ? cast(detailMsg, e) :
+            new IgfsInvalidHdfsVersionException("HDFS version you are connecting to differs from local " +
+                "version.", e);
+
+        return igfsErr;
+    }
+
+    /**
+     * Cast IO exception to IGFS exception.
+     *
+     * @param e IO exception.
+     * @return IGFS exception.
+     */
+    public static IgfsException cast(String msg, IOException e) {
+        if (e instanceof FileNotFoundException)
+            return new IgfsFileNotFoundException(e);
+        else if (e instanceof ParentNotDirectoryException)
+            return new IgfsParentNotDirectoryException(msg, e);
+        else if (e instanceof PathIsNotEmptyDirectoryException)
+            return new IgfsDirectoryNotEmptyException(e);
+        else if (e instanceof PathExistsException)
+            return new IgfsPathAlreadyExistsException(msg, e);
+        else
+            return new IgfsException(msg, e);
+    }
+
+    /**
+     * Convert Hadoop FileStatus properties to map.
+     *
+     * @param status File status.
+     * @return IGFS attributes.
+     */
+    private static Map<String, String> properties(FileStatus status) {
+        FsPermission perm = status.getPermission();
+
+        if (perm == null)
+            perm = FsPermission.getDefault();
+
+        return F.asMap(PROP_PERMISSION, String.format("%04o", perm.toShort()), PROP_USER_NAME, status.getOwner(),
+            PROP_GROUP_NAME, status.getGroup());
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean exists(IgfsPath path) {
+        try {
+            return fileSys.exists(convert(path));
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to check file existence [path=" + path + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public IgfsFile update(IgfsPath path, Map<String, String> props) {
+        IgfsHadoopFSProperties props0 = new IgfsHadoopFSProperties(props);
+
+        try {
+            if (props0.userName() != null || props0.groupName() != null)
+                fileSys.setOwner(convert(path), props0.userName(), props0.groupName());
+
+            if (props0.permission() != null)
+                fileSys.setPermission(convert(path), props0.permission());
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to update file properties [path=" + path + "]");
+        }
+
+        //Result is not used in case of secondary FS.
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void rename(IgfsPath src, IgfsPath dest) {
+        // Delegate to the secondary file system.
+        try {
+            if (!fileSys.rename(convert(src), convert(dest)))
+                throw new IgfsException("Failed to rename (secondary file system returned false) " +
+                    "[src=" + src + ", dest=" + dest + ']');
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to rename file [src=" + src + ", dest=" + dest + ']');
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean delete(IgfsPath path, boolean recursive) {
+        try {
+            return fileSys.delete(convert(path), recursive);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to delete file [path=" + path + ", recursive=" + recursive + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void mkdirs(IgfsPath path) {
+        try {
+            if (!fileSys.mkdirs(convert(path)))
+                throw new IgniteException("Failed to make directories [path=" + path + "]");
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void mkdirs(IgfsPath path, @Nullable Map<String, String> props) {
+        try {
+            if (!fileSys.mkdirs(convert(path), new IgfsHadoopFSProperties(props).permission()))
+                throw new IgniteException("Failed to make directories [path=" + path + ", props=" + props + "]");
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + ", props=" + props + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public Collection<IgfsPath> listPaths(IgfsPath path) {
+        try {
+            FileStatus[] statuses = fileSys.listStatus(convert(path));
+
+            if (statuses == null)
+                throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
+
+            Collection<IgfsPath> res = new ArrayList<>(statuses.length);
+
+            for (FileStatus status : statuses)
+                res.add(new IgfsPath(path, status.getPath().getName()));
+
+            return res;
+        }
+        catch (FileNotFoundException ignored) {
+            throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public Collection<IgfsFile> listFiles(IgfsPath path) {
+        try {
+            FileStatus[] statuses = fileSys.listStatus(convert(path));
+
+            if (statuses == null)
+                throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
+
+            Collection<IgfsFile> res = new ArrayList<>(statuses.length);
+
+            for (FileStatus status : statuses) {
+                IgfsFileInfo fsInfo = status.isDirectory() ? new IgfsFileInfo(true, properties(status)) :
+                    new IgfsFileInfo((int)status.getBlockSize(), status.getLen(), null, null, false,
+                    properties(status));
+
+                res.add(new IgfsFileImpl(new IgfsPath(path, status.getPath().getName()), fsInfo, 1));
+            }
+
+            return res;
+        }
+        catch (FileNotFoundException ignored) {
+            throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public IgfsReader open(IgfsPath path, int bufSize) {
+        return new IgfsHadoopReader(fileSys, convert(path), bufSize);
+    }
+
+    /** {@inheritDoc} */
+    @Override public OutputStream create(IgfsPath path, boolean overwrite) {
+        try {
+            return fileSys.create(convert(path), overwrite);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to create file [path=" + path + ", overwrite=" + overwrite + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public OutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication,
+        long blockSize, @Nullable Map<String, String> props) {
+        IgfsHadoopFSProperties props0 =
+            new IgfsHadoopFSProperties(props != null ? props : Collections.<String, String>emptyMap());
+
+        try {
+            return fileSys.create(convert(path), props0.permission(), overwrite, bufSize, (short)replication, blockSize,
+                null);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to create file [path=" + path + ", props=" + props +
+                ", overwrite=" + overwrite + ", bufSize=" + bufSize + ", replication=" + replication +
+                ", blockSize=" + blockSize + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public OutputStream append(IgfsPath path, int bufSize, boolean create,
+        @Nullable Map<String, String> props) {
+        try {
+            return fileSys.append(convert(path), bufSize);
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to append file [path=" + path + ", bufSize=" + bufSize + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public IgfsFile info(final IgfsPath path) {
+        try {
+            final FileStatus status = fileSys.getFileStatus(convert(path));
+
+            if (status == null)
+                return null;
+
+            final Map<String, String> props = properties(status);
+
+            return new IgfsFile() {
+                @Override public IgfsPath path() {
+                    return path;
+                }
+
+                @Override public boolean isFile() {
+                    return status.isFile();
+                }
+
+                @Override public boolean isDirectory() {
+                    return status.isDirectory();
+                }
+
+                @Override public int blockSize() {
+                    return (int)status.getBlockSize();
+                }
+
+                @Override public long groupBlockSize() {
+                    return status.getBlockSize();
+                }
+
+                @Override public long accessTime() {
+                    return status.getAccessTime();
+                }
+
+                @Override public long modificationTime() {
+                    return status.getModificationTime();
+                }
+
+                @Override public String property(String name) throws IllegalArgumentException {
+                    String val = props.get(name);
+
+                    if (val ==  null)
+                        throw new IllegalArgumentException("File property not found [path=" + path + ", name=" + name + ']');
+
+                    return val;
+                }
+
+                @Nullable @Override public String property(String name, @Nullable String dfltVal) {
+                    String val = props.get(name);
+
+                    return val == null ? dfltVal : val;
+                }
+
+                @Override public long length() {
+                    return status.getLen();
+                }
+
+                /** {@inheritDoc} */
+                @Override public Map<String, String> properties() {
+                    return props;
+                }
+            };
+
+        }
+        catch (FileNotFoundException ignore) {
+            return null;
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to get file status [path=" + path + "]");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public long usedSpaceSize() {
+        try {
+            return fileSys.getContentSummary(new Path(fileSys.getUri())).getSpaceConsumed();
+        }
+        catch (IOException e) {
+            throw handleSecondaryFsError(e, "Failed to get used space size of file system.");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public Map<String, String> properties() {
+        return props;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() throws IgniteCheckedException {
+        try {
+            fileSys.close();
+        }
+        catch (IOException e) {
+            throw new IgniteCheckedException(e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
index 8762d83..2f8b013 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.*;
 import org.apache.hadoop.util.*;
 import org.apache.ignite.*;
 import org.apache.ignite.igfs.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.internal.igfs.common.*;
 import org.apache.ignite.internal.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
index a38178c..ff8c50c 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.*;
 import org.apache.hadoop.util.*;
 import org.apache.ignite.*;
 import org.apache.ignite.igfs.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.internal.igfs.common.*;
 import org.apache.ignite.internal.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFSProperties.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFSProperties.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFSProperties.java
index e0ea1b6..c9d1322 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFSProperties.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFSProperties.java
@@ -27,7 +27,7 @@ import static org.apache.ignite.IgniteFs.*;
 /**
  * Hadoop file system properties.
  */
-class IgfsHadoopFSProperties {
+public class IgfsHadoopFSProperties {
     /** Username. */
     private String usrName;
 
@@ -43,7 +43,7 @@ class IgfsHadoopFSProperties {
      * @param props Properties.
      * @throws IgniteException In case of error.
      */
-    IgfsHadoopFSProperties(Map<String, String> props) throws IgniteException {
+    public IgfsHadoopFSProperties(Map<String, String> props) throws IgniteException {
         usrName = props.get(PROP_USER_NAME);
         grpName = props.get(PROP_GROUP_NAME);
 
@@ -64,7 +64,7 @@ class IgfsHadoopFSProperties {
      *
      * @return User name.
      */
-    String userName() {
+    public String userName() {
         return usrName;
     }
 
@@ -73,7 +73,7 @@ class IgfsHadoopFSProperties {
      *
      * @return Group name.
      */
-    String groupName() {
+    public String groupName() {
         return grpName;
     }
 
@@ -82,7 +82,7 @@ class IgfsHadoopFSProperties {
      *
      * @return Permission.
      */
-    FsPermission permission() {
+    public FsPermission permission() {
         return perm;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
deleted file mode 100644
index 9935466..0000000
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.igfs.hadoop;
-
-import org.apache.hadoop.conf.*;
-import org.apache.hadoop.fs.*;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.permission.*;
-import org.apache.hadoop.ipc.*;
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-/**
- * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link org.apache.ignite.igfs.Igfs}.
- */
-public class IgfsHadoopFileSystemWrapper implements Igfs, AutoCloseable {
-    /** Property name for path to Hadoop configuration. */
-    public static final String SECONDARY_FS_CONFIG_PATH = "SECONDARY_FS_CONFIG_PATH";
-
-    /** Property name for URI of file system. */
-    public static final String SECONDARY_FS_URI = "SECONDARY_FS_URI";
-
-    /** Hadoop file system. */
-    private final FileSystem fileSys;
-
-    /** Properties of file system */
-    private final Map<String, String> props = new HashMap<>();
-
-    /**
-     * Constructor.
-     *
-     * @param uri URI of file system.
-     * @param cfgPath Additional path to Hadoop configuration.
-     * @throws IgniteCheckedException In case of error.
-     */
-    public IgfsHadoopFileSystemWrapper(@Nullable String uri, @Nullable String cfgPath) throws IgniteCheckedException {
-        Configuration cfg = new Configuration();
-
-        if (cfgPath != null)
-            cfg.addResource(U.resolveIgniteUrl(cfgPath));
-
-        try {
-            fileSys = uri == null ? FileSystem.get(cfg) : FileSystem.get(new URI(uri), cfg);
-        }
-        catch (IOException | URISyntaxException e) {
-            throw new IgniteCheckedException(e);
-        }
-
-        uri = fileSys.getUri().toString();
-
-        if (!uri.endsWith("/"))
-            uri += "/";
-
-        props.put(SECONDARY_FS_CONFIG_PATH, cfgPath);
-        props.put(SECONDARY_FS_URI, uri);
-    }
-
-    /**
-     * Convert IGFS path into Hadoop path.
-     *
-     * @param path IGFS path.
-     * @return Hadoop path.
-     */
-    private Path convert(IgfsPath path) {
-        URI uri = fileSys.getUri();
-
-        return new Path(uri.getScheme(), uri.getAuthority(), path.toString());
-    }
-
-    /**
-     * Heuristically checks if exception was caused by invalid HDFS version and returns appropriate exception.
-     *
-     * @param e Exception to check.
-     * @param detailMsg Detailed error message.
-     * @return Appropriate exception.
-     */
-    private IgfsException handleSecondaryFsError(IOException e, String detailMsg) {
-        boolean wrongVer = X.hasCause(e, RemoteException.class) ||
-            (e.getMessage() != null && e.getMessage().contains("Failed on local"));
-
-        IgfsException igfsErr = !wrongVer ? cast(detailMsg, e) :
-            new IgfsInvalidHdfsVersionException("HDFS version you are connecting to differs from local " +
-                "version.", e);
-
-
-
-        return igfsErr;
-    }
-
-    /**
-     * Cast IO exception to IGFS exception.
-     *
-     * @param e IO exception.
-     * @return IGFS exception.
-     */
-    public static IgfsException cast(String msg, IOException e) {
-        if (e instanceof FileNotFoundException)
-            return new IgfsFileNotFoundException(e);
-        else if (e instanceof ParentNotDirectoryException)
-            return new IgfsParentNotDirectoryException(msg, e);
-        else if (e instanceof PathIsNotEmptyDirectoryException)
-            return new IgfsDirectoryNotEmptyException(e);
-        else if (e instanceof PathExistsException)
-            return new IgfsPathAlreadyExistsException(msg, e);
-        else
-            return new IgfsException(msg, e);
-    }
-
-    /**
-     * Convert Hadoop FileStatus properties to map.
-     *
-     * @param status File status.
-     * @return IGFS attributes.
-     */
-    private static Map<String, String> properties(FileStatus status) {
-        FsPermission perm = status.getPermission();
-
-        if (perm == null)
-            perm = FsPermission.getDefault();
-
-        return F.asMap(PROP_PERMISSION, String.format("%04o", perm.toShort()), PROP_USER_NAME, status.getOwner(),
-            PROP_GROUP_NAME, status.getGroup());
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean exists(IgfsPath path) {
-        try {
-            return fileSys.exists(convert(path));
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to check file existence [path=" + path + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public IgfsFile update(IgfsPath path, Map<String, String> props) {
-        IgfsHadoopFSProperties props0 = new IgfsHadoopFSProperties(props);
-
-        try {
-            if (props0.userName() != null || props0.groupName() != null)
-                fileSys.setOwner(convert(path), props0.userName(), props0.groupName());
-
-            if (props0.permission() != null)
-                fileSys.setPermission(convert(path), props0.permission());
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to update file properties [path=" + path + "]");
-        }
-
-        //Result is not used in case of secondary FS.
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void rename(IgfsPath src, IgfsPath dest) {
-        // Delegate to the secondary file system.
-        try {
-            if (!fileSys.rename(convert(src), convert(dest)))
-                throw new IgfsException("Failed to rename (secondary file system returned false) " +
-                    "[src=" + src + ", dest=" + dest + ']');
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to rename file [src=" + src + ", dest=" + dest + ']');
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean delete(IgfsPath path, boolean recursive) {
-        try {
-            return fileSys.delete(convert(path), recursive);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to delete file [path=" + path + ", recursive=" + recursive + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void mkdirs(IgfsPath path) {
-        try {
-            if (!fileSys.mkdirs(convert(path)))
-                throw new IgniteException("Failed to make directories [path=" + path + "]");
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void mkdirs(IgfsPath path, @Nullable Map<String, String> props) {
-        try {
-            if (!fileSys.mkdirs(convert(path), new IgfsHadoopFSProperties(props).permission()))
-                throw new IgniteException("Failed to make directories [path=" + path + ", props=" + props + "]");
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to make directories [path=" + path + ", props=" + props + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public Collection<IgfsPath> listPaths(IgfsPath path) {
-        try {
-            FileStatus[] statuses = fileSys.listStatus(convert(path));
-
-            if (statuses == null)
-                throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
-
-            Collection<IgfsPath> res = new ArrayList<>(statuses.length);
-
-            for (FileStatus status : statuses)
-                res.add(new IgfsPath(path, status.getPath().getName()));
-
-            return res;
-        }
-        catch (FileNotFoundException ignored) {
-            throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public Collection<IgfsFile> listFiles(IgfsPath path) {
-        try {
-            FileStatus[] statuses = fileSys.listStatus(convert(path));
-
-            if (statuses == null)
-                throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
-
-            Collection<IgfsFile> res = new ArrayList<>(statuses.length);
-
-            for (FileStatus status : statuses) {
-                IgfsFileInfo fsInfo = status.isDirectory() ? new IgfsFileInfo(true, properties(status)) :
-                    new IgfsFileInfo((int)status.getBlockSize(), status.getLen(), null, null, false,
-                    properties(status));
-
-                res.add(new IgfsFileImpl(new IgfsPath(path, status.getPath().getName()), fsInfo, 1));
-            }
-
-            return res;
-        }
-        catch (FileNotFoundException ignored) {
-            throw new IgfsFileNotFoundException("Failed to list files (path not found): " + path);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgfsReader open(IgfsPath path, int bufSize) {
-        return new IgfsHadoopReader(fileSys, convert(path), bufSize);
-    }
-
-    /** {@inheritDoc} */
-    @Override public OutputStream create(IgfsPath path, boolean overwrite) {
-        try {
-            return fileSys.create(convert(path), overwrite);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to create file [path=" + path + ", overwrite=" + overwrite + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public OutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication,
-        long blockSize, @Nullable Map<String, String> props) {
-        IgfsHadoopFSProperties props0 =
-            new IgfsHadoopFSProperties(props != null ? props : Collections.<String, String>emptyMap());
-
-        try {
-            return fileSys.create(convert(path), props0.permission(), overwrite, bufSize, (short)replication, blockSize,
-                null);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to create file [path=" + path + ", props=" + props +
-                ", overwrite=" + overwrite + ", bufSize=" + bufSize + ", replication=" + replication +
-                ", blockSize=" + blockSize + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public OutputStream append(IgfsPath path, int bufSize, boolean create,
-        @Nullable Map<String, String> props) {
-        try {
-            return fileSys.append(convert(path), bufSize);
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to append file [path=" + path + ", bufSize=" + bufSize + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgfsFile info(final IgfsPath path) {
-        try {
-            final FileStatus status = fileSys.getFileStatus(convert(path));
-
-            if (status == null)
-                return null;
-
-            final Map<String, String> props = properties(status);
-
-            return new IgfsFile() {
-                @Override public IgfsPath path() {
-                    return path;
-                }
-
-                @Override public boolean isFile() {
-                    return status.isFile();
-                }
-
-                @Override public boolean isDirectory() {
-                    return status.isDirectory();
-                }
-
-                @Override public int blockSize() {
-                    return (int)status.getBlockSize();
-                }
-
-                @Override public long groupBlockSize() {
-                    return status.getBlockSize();
-                }
-
-                @Override public long accessTime() {
-                    return status.getAccessTime();
-                }
-
-                @Override public long modificationTime() {
-                    return status.getModificationTime();
-                }
-
-                @Override public String property(String name) throws IllegalArgumentException {
-                    String val = props.get(name);
-
-                    if (val ==  null)
-                        throw new IllegalArgumentException("File property not found [path=" + path + ", name=" + name + ']');
-
-                    return val;
-                }
-
-                @Nullable @Override public String property(String name, @Nullable String dfltVal) {
-                    String val = props.get(name);
-
-                    return val == null ? dfltVal : val;
-                }
-
-                @Override public long length() {
-                    return status.getLen();
-                }
-
-                /** {@inheritDoc} */
-                @Override public Map<String, String> properties() {
-                    return props;
-                }
-            };
-
-        }
-        catch (FileNotFoundException ignore) {
-            return null;
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to get file status [path=" + path + "]");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public long usedSpaceSize() {
-        try {
-            return fileSys.getContentSummary(new Path(fileSys.getUri())).getSpaceConsumed();
-        }
-        catch (IOException e) {
-            throw handleSecondaryFsError(e, "Failed to get used space size of file system.");
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public Map<String, String> properties() {
-        return props;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IgniteCheckedException {
-        try {
-            fileSys.close();
-        }
-        catch (IOException e) {
-            throw new IgniteCheckedException(e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopReader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopReader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopReader.java
index 7234269..3ab3acc 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopReader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopReader.java
@@ -56,7 +56,7 @@ public class IgfsHadoopReader implements IgfsReader {
      * @param path Path to the file to open.
      * @param bufSize Buffer size.
      */
-    IgfsHadoopReader(FileSystem fs, Path path, int bufSize) {
+    public IgfsHadoopReader(FileSystem fs, Path path, int bufSize) {
         assert fs != null;
         assert path != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
index 05a7b1d..29696bf 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
@@ -20,7 +20,7 @@ package org.apache.ignite.igfs;
 import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.igfs.hadoop.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.hadoop.*;
 import org.apache.ignite.internal.util.ipc.shmem.*;
 import org.apache.ignite.internal.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
index 207bc79..9f9a6d8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.fs.permission.*;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.igfs.hadoop.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java
index 22c144f..a54e264 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.igfs.hadoop.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
index 606eb48..7359fdf 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
@@ -24,6 +24,7 @@ import org.apache.hadoop.fs.permission.*;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem;
 import org.apache.ignite.internal.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23bee413/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
index 2e22d93..b88816a 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
@@ -21,8 +21,8 @@ import org.apache.hadoop.conf.*;
 import org.apache.hadoop.fs.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.igfs.hadoop.*;
 import org.apache.ignite.igfs.hadoop.v1.*;
-import org.apache.ignite.internal.igfs.hadoop.*;
 import org.apache.ignite.internal.processors.igfs.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;


[29/50] [abbrv] incubator-ignite git commit: # Minors.

Posted by sb...@apache.org.
# Minors.


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

Branch: refs/heads/ignite-342
Commit: 8c49ff681809deba01b4128b3ff7f2ff562d27d5
Parents: 0e7a7ef
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 17:21:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 17:21:55 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/cluster/ClusterMetrics.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c49ff68/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
index 4ad936c..c2b9a05 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.cluster;
 
 /**
- * This class represents runtime information on a node. Apart from obvious
+ * This class represents runtime information on a cluster. Apart from obvious
  * statistical value, this information is used for implementation of
  * load balancing, failover, and collision SPIs. For example, collision SPI
  * in combination with fail-over SPI could check if other nodes don't have


[23/50] [abbrv] incubator-ignite git commit: # IGNITE-147: Applied intermediate patch with minor changes from Ivan V..

Posted by sb...@apache.org.
# IGNITE-147: Applied intermediate patch with minor changes from Ivan V..


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

Branch: refs/heads/ignite-342
Commit: dd66167656fb2364cac531e7780f1ec069ebfb03
Parents: cefc885
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 16:36:03 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 16:36:03 2015 +0300

----------------------------------------------------------------------
 .../ignite/testframework/config/GridTestProperties.java | 10 +++++-----
 .../ignite/client/hadoop/GridHadoopClientProtocol.java  |  2 +-
 .../processors/hadoop/GridHadoopClassLoader.java        | 12 ++++++------
 .../internal/processors/hadoop/GridHadoopSetup.java     |  8 ++++----
 .../client/hadoop/GridHadoopClientProtocolSelfTest.java |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 37b3a44..5fa78ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -66,13 +66,13 @@ public final class GridTestProperties {
     /** */
     static {
         // Initialize IGNITE_HOME system property.
-        String ggHome = System.getProperty("IGNITE_HOME");
+        String igniteHome = System.getProperty("IGNITE_HOME");
 
-        if (ggHome == null || ggHome.isEmpty()) {
-            ggHome = System.getenv("IGNITE_HOME");
+        if (igniteHome == null || igniteHome.isEmpty()) {
+            igniteHome = System.getenv("IGNITE_HOME");
 
-            if (ggHome != null && !ggHome.isEmpty())
-                System.setProperty("IGNITE_HOME", ggHome);
+            if (igniteHome != null && !igniteHome.isEmpty())
+                System.setProperty("IGNITE_HOME", igniteHome);
         }
 
         // Load default properties.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index 1a70593..bd31951 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -311,7 +311,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
     /**
      * Process received status update.
      *
-     * @param status Hadoop map-reduce job status.
+     * @param status Ignite status.
      * @return Hadoop status.
      */
     private JobStatus processStatus(GridHadoopJobStatus status) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 4a81bba..bc4c0bb 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -73,11 +73,11 @@ public class GridHadoopClassLoader extends URLClassLoader {
      * @param cls Class name.
      * @return {@code true} if we need to check this class.
      */
-    private static boolean isIgfsOrGgHadoop(String cls) {
-        String gg = "org.apache.ignite";
-        int len = gg.length();
+    private static boolean isIgfsHadoop(String cls) {
+        String ignitePackagePrefix = "org.apache.ignite";
+        int len = ignitePackagePrefix.length();
 
-        return cls.startsWith(gg) && (cls.indexOf("igfs.", len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) != -1);
+        return cls.startsWith(ignitePackagePrefix) && (cls.indexOf("igfs.", len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) != -1);
     }
 
     /**
@@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
                 return loadClassExplicitly(name, resolve);
             }
 
-            if (isIgfsOrGgHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
+            if (isIgfsHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
                 Boolean hasDeps = cache.get(name);
 
                 if (hasDeps == null) {
@@ -224,7 +224,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
         if (in == null) // The class is external itself, it must be loaded from this class loader.
             return true;
 
-        if (!isIgfsOrGgHadoop(clsName)) // Other classes should not have external dependencies.
+        if (!isIgfsHadoop(clsName)) // Other classes should not have external dependencies.
             return false;
 
         final ClassReader rdr;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
index 0f09600..66b1db4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
@@ -289,16 +289,16 @@ public class GridHadoopSetup {
     /**
      * Checks Ignite home.
      *
-     * @param ggHome Ignite home.
+     * @param igniteHome Ignite home.
      */
-    private static void checkIgniteHome(String ggHome) {
+    private static void checkIgniteHome(String igniteHome) {
         URL jarUrl = U.class.getProtectionDomain().getCodeSource().getLocation();
 
         try {
             Path jar = Paths.get(jarUrl.toURI());
-            Path gg = Paths.get(ggHome);
+            Path igHome = Paths.get(igniteHome);
 
-            if (!jar.startsWith(gg))
+            if (!jar.startsWith(igHome))
                 exit("Ignite JAR files are not under IGNITE_HOME.", null);
         }
         catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
index 0d4b0fc..ff8798b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
@@ -51,15 +51,15 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest
 
     /** Setup lock file. */
     private static File setupLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
-        "gg-lock-setup.file");
+        "ignite-lock-setup.file");
 
     /** Map lock file. */
     private static File mapLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
-        "gg-lock-map.file");
+        "ignite-lock-map.file");
 
     /** Reduce lock file. */
     private static File reduceLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
-        "gg-lock-reduce.file");
+        "ignite-lock-reduce.file");
 
     /** {@inheritDoc} */
     @Override protected int gridCount() {


[06/50] [abbrv] incubator-ignite git commit: ignite-11 Ad missing javadoc.

Posted by sb...@apache.org.
ignite-11 Ad missing javadoc.


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

Branch: refs/heads/ignite-342
Commit: 2999d205d963f444812c9d380f0620f30c095196
Parents: 8b9e7f8
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Feb 26 17:40:44 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Feb 26 17:40:44 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2999d205/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index b24743a..de71f59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -1434,6 +1434,9 @@ public abstract class IgniteUtils {
         return locHost0 != null && !resetLocalHost().equals(locHost0);
     }
 
+    /**
+     * @param addrs Addresses.
+     */
     public static List<InetAddress> filterReachable(List<InetAddress> addrs) {
         final int reachTimeout = 2000;
 
@@ -1495,7 +1498,6 @@ public abstract class IgniteUtils {
      */
     public static IgniteBiTuple<Collection<String>, Collection<String>> resolveLocalAddresses(InetAddress locAddr)
         throws IOException, IgniteCheckedException {
-
         assert locAddr != null;
 
         Collection<String> addrs = new ArrayList<>();


[20/50] [abbrv] incubator-ignite git commit: # ignite-325

Posted by sb...@apache.org.
# ignite-325


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

Branch: refs/heads/ignite-342
Commit: 0c26585c353d558ae42aea1c42c92da2e0dec42f
Parents: c9f83ff
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 14:09:05 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 14:09:05 2015 +0300

----------------------------------------------------------------------
 pom.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c26585c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9b65d10..bd5f2d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -529,20 +529,20 @@
                                         <exclude>**/keystore/*.pem</exclude><!--auto generated files-->
                                         <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
                                         <!--special excludes-->
-                                        <exclude>**/com/romix/scala/**</exclude><!--own license-->
-                                        <exclude>**/GridOffHeapSnapTreeMap.java</exclude><!--own license-->
-                                        <exclude>**/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--own license-->
-                                        <exclude>**/org/pcollections/**</exclude><!--own license-->
-                                        <exclude>**/org/jdk8/backport/</exclude><!--own license-->
-                                        <exclude>**/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test depends on file content-->
-                                        <exclude>**/test/resources/log/ignite.log.tst</exclude><!--test resource-->
-                                        <exclude>**/test/config/start-nodes.ini</exclude><!---->
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test resource-->
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should be empty-->
-                                        <exclude>**/spi/deployment/uri/META-INF/ignite.brokenxml</exclude><!--test resource-->
-                                        <exclude>**/hadoop/books/*.txt</exclude><!--books examples-->
-                                        <exclude>**/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
-                                        <exclude>**/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
+                                        <exclude>src/main/java/com/romix/scala/**</exclude><!--own license-->
+                                        <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--own license-->
+                                        <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--own license-->
+                                        <exclude>src/main/java/org/pcollections/**</exclude><!--own license-->
+                                        <exclude>src/main/java/org/jdk8/backport/*.java</exclude><!--own license-->
+                                        <exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test depends on file content-->
+                                        <exclude>src/test/resources/log/ignite.log.tst</exclude><!--test resource-->
+                                        <exclude>src/test/config/start-nodes.ini</exclude><!---->
+                                        <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test resource-->
+                                        <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should be empty-->
+                                        <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml</exclude><!--test resource-->
+                                        <exclude>src/test/java/org/apache/ignite/internal/processors/hadoop/books/*.txt</exclude><!--books examples-->
+                                        <exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
+                                        <exclude>src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
                                         <!--shmem-->
                                         <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
                                         <exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->


[18/50] [abbrv] incubator-ignite git commit: # IGNITE-350: Applied patch from Ivan V..

Posted by sb...@apache.org.
# IGNITE-350: Applied patch from Ivan V..


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

Branch: refs/heads/ignite-342
Commit: 55c093d409be131637ab295ac2ec8939f7b1a1a3
Parents: 23bee41
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 13:49:28 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 13:49:28 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/igfs/IgfsMode.java    |  6 +++---
 .../client/hadoop/GridHadoopClientProtocol.java       |  6 +++---
 .../ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java   |  2 +-
 .../ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java   |  2 +-
 .../ignite/internal/igfs/hadoop/IgfsHadoopUtils.java  |  4 ++--
 .../processors/hadoop/GridHadoopClassLoader.java      |  2 +-
 .../internal/processors/hadoop/GridHadoopUtils.java   |  4 ++--
 .../collections/GridHadoopHashMultimapBase.java       |  2 +-
 .../GridHadoopExternalCommunication.java              | 14 +++++++++++++-
 .../processors/hadoop/v1/GridHadoopV1MapTask.java     |  6 +++++-
 .../hadoop/v2/GridHadoopV2JobResourceManager.java     |  2 +-
 .../processors/hadoop/GridHadoopGroupingTest.java     |  4 ++--
 .../loadtests/igfs/IgfsPerformanceBenchmark.java      |  9 ++++++++-
 13 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
index 5c5aa57..3c440ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
@@ -39,7 +39,7 @@ public enum IgfsMode {
      * through to secondary Hadoop file system. If this mode is enabled, then
      * secondary Hadoop file system must be configured.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     PROXY,
 
@@ -50,7 +50,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     DUAL_SYNC,
 
@@ -61,7 +61,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
      */
     DUAL_ASYNC;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index b058961..1a70593 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -57,7 +57,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
     /** Configuration. */
     private final Configuration conf;
 
-    /** GG client. */
+    /** Ignite client. */
     private volatile GridClient cli;
 
     /** Last received version. */
@@ -70,7 +70,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
      * Constructor.
      *
      * @param conf Configuration.
-     * @param cli GG client.
+     * @param cli Ignite client.
      */
     GridHadoopClientProtocol(Configuration conf, GridClient cli) {
         assert cli != null;
@@ -311,7 +311,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
     /**
      * Process received status update.
      *
-     * @param status GG status.
+     * @param status Hadoop map-reduce job status.
      * @return Hadoop status.
      */
     private JobStatus processStatus(GridHadoopJobStatus status) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
index 2f8b013..1648bdc 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -228,7 +228,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
             if (seqReadsBeforePrefetch > 0)
                 seqReadsBeforePrefetchOverride = true;
 
-            // In GG replication factor is controlled by data cache affinity.
+            // In Ignite replication factor is controlled by data cache affinity.
             // We use replication factor to force the whole file to be stored on local node.
             dfltReplication = (short)cfg.getInt("dfs.replication", 3);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
index ff8c50c..5475cf4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -224,7 +224,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
             if (seqReadsBeforePrefetch > 0)
                 seqReadsBeforePrefetchOverride = true;
 
-            // In GG replication factor is controlled by data cache affinity.
+            // In Ignite replication factor is controlled by data cache affinity.
             // We use replication factor to force the whole file to be stored on local node.
             dfltReplication = (short)cfg.getInt("dfs.replication", 3);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
index f8bf1ae..bd96e60 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
@@ -87,7 +87,7 @@ public class IgfsHadoopUtils {
     }
 
     /**
-     * Cast GG exception to appropriate IO exception.
+     * Cast Ignite exception to appropriate IO exception.
      *
      * @param e Exception to cast.
      * @return Casted exception.
@@ -97,7 +97,7 @@ public class IgfsHadoopUtils {
     }
 
     /**
-     * Cast GG exception to appropriate IO exception.
+     * Cast Ignite exception to appropriate IO exception.
      *
      * @param e Exception to cast.
      * @param path Path for exceptions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 11f8358..4a81bba 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
                 return loadClassExplicitly(name, resolve);
             }
 
-            if (isIgfsOrGgHadoop(name)) { // For GG Hadoop and IGFS classes we have to check if they depend on Hadoop.
+            if (isIgfsOrGgHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
                 Boolean hasDeps = cache.get(name);
 
                 if (hasDeps == null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
index b94b561..763f45a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
@@ -98,9 +98,9 @@ public class GridHadoopUtils {
     }
 
     /**
-     * Convert GG job status to Hadoop job status.
+     * Convert Ignite job status to Hadoop job status.
      *
-     * @param status GG job status.
+     * @param status Ignite job status.
      * @return Hadoop job status.
      */
     public static JobStatus status(GridHadoopJobStatus status, Configuration conf) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
index f7e1362..92854f1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
@@ -160,8 +160,8 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
         private final Reader valReader;
 
         /**
-         * @throws IgniteCheckedException If failed.
          * @param taskCtx Task context.
+         * @throws IgniteCheckedException If failed.
          */
         public Input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
             cap = capacity();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index 6726bab..f5ddced 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -45,7 +45,7 @@ import java.util.concurrent.*;
 public class GridHadoopExternalCommunication {
     /** IPC error message. */
     public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " +
-        "(switching to TCP, may be slower)."; // todo IGNITE-70 Add link to documentation
+        "(switching to TCP, may be slower)."; // TODO IGNITE-70 Add link to documentation
 
     /** Default port which node sets listener to (value is <tt>47100</tt>). */
     public static final int DFLT_PORT = 27100;
@@ -687,6 +687,11 @@ public class GridHadoopExternalCommunication {
             locPort + ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx);
     }
 
+    /**
+     * Stops the server.
+     *
+     * @throws IgniteCheckedException
+     */
     public void stop() throws IgniteCheckedException {
         // Stop TCP server.
         if (nioSrvr != null)
@@ -710,6 +715,13 @@ public class GridHadoopExternalCommunication {
         boundTcpPort = -1;
     }
 
+    /**
+     * Sends message to Hadoop process.
+     *
+     * @param desc
+     * @param msg
+     * @throws IgniteCheckedException
+     */
     public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws
         IgniteCheckedException {
         assert desc != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
index 16c2b8c..878b61b 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
@@ -31,7 +31,11 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
     /** */
     private static final String[] EMPTY_HOSTS = new String[0];
 
-    /** {@inheritDoc} */
+    /**
+     * Constructor.
+     *
+     * @param taskInfo 
+     */
     public GridHadoopV1MapTask(GridHadoopTaskInfo taskInfo) {
         super(taskInfo);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
index b288089..be619c7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
@@ -73,8 +73,8 @@ public class GridHadoopV2JobResourceManager {
     /**
      * Set working directory in local file system.
      *
-     * @throws IOException If fails.
      * @param dir Working directory.
+     * @throws IOException If fails.
      */
     private void setLocalFSWorkingDirectory(File dir) throws IOException {
         JobConf cfg = ctx.getJobConf();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
index 7f56995..49099fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
@@ -144,12 +144,12 @@ public class GridHadoopGroupingTest extends GridHadoopAbstractSelfTest {
     }
 
     public static class YearComparator implements RawComparator<YearTemperature> { // Grouping comparator.
-        /** {@inheritDoc */
+        /** {@inheritDoc} */
         @Override public int compare(YearTemperature o1, YearTemperature o2) {
             return Integer.compare(o1.year, o2.year);
         }
 
-        /** {@inheritDoc */
+        /** {@inheritDoc} */
         @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
             throw new IllegalStateException();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
index 7b54561..00dc4f5 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
@@ -202,7 +202,14 @@ public class IgfsPerformanceBenchmark {
         return args[idx];
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Get IGFS FileSystem.
+     *
+     * @param home Home path.
+     * @param cfgPath Config path.
+     * @return FileSystem.
+     * @throws IOException If failed.
+     */
     private static FileSystem igfs(Path home, String cfgPath) throws IOException {
         Configuration cfg = new Configuration();
 


[22/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-325

Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-325


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

Branch: refs/heads/ignite-342
Commit: 5121aa07bffa08a59b678442e4a68f36c9a6b51c
Parents: 0c26585 cefc885
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 16:18:44 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 16:18:44 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  12 +
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../configuration/QueryConfiguration.java       |  37 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   6 +-
 .../client/hadoop/GridHadoopClientProtocol.java |   6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 412 ++++++++++++++++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   3 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |  10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 413 -------------------
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   4 +-
 .../hadoop/GridHadoopClassLoader.java           |   2 +-
 .../processors/hadoop/GridHadoopUtils.java      |   4 +-
 .../collections/GridHadoopHashMultimapBase.java |   2 +-
 .../GridHadoopExternalCommunication.java        |  14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |   6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |   2 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |   2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |   2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |   1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   2 +-
 .../hadoop/GridHadoopGroupingTest.java          |   4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |   9 +-
 25 files changed, 513 insertions(+), 451 deletions(-)
----------------------------------------------------------------------



[12/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-gg-fix-deploy' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-gg-fix-deploy' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: 47539d89f8f1a3ce9ff63b3732a27a42fb1b4a88
Parents: adb2454 07905ba
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Thu Feb 26 23:27:08 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Thu Feb 26 23:27:08 2015 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



[13/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-322

Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-322


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

Branch: refs/heads/ignite-342
Commit: 96deb436833efa77eadca95753eca2a2d0817814
Parents: 5ed43d1 47539d8
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 12:30:52 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 12:30:52 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/IgniteFs.java   |   2 +-
 .../ignite/events/DiscoveryCustomEvent.java     |  56 ----------
 .../org/apache/ignite/events/EventType.java     |  14 +--
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../internal/events/DiscoveryCustomEvent.java   |  68 ++++++++++++
 .../discovery/GridDiscoveryManager.java         |   7 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  10 +-
 .../node/VisorNodeEventsCollectorTask.java      |  10 +-
 .../internal/visor/node/VisorNodeGcTask.java    |  10 +-
 .../internal/visor/node/VisorNodePingTask.java  |  10 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   9 +-
 .../internal/GridDiscoveryEventSelfTest.java    |   9 +-
 ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +++++++++++++++++++
 .../testsuites/IgniteKernalSelfTestSuite.java   |   1 +
 .../java/org/apache/ignite/igfs/package.html    |   2 +-
 .../testsuites/IgniteHadoopTestSuite.java       |   7 +-
 16 files changed, 219 insertions(+), 101 deletions(-)
----------------------------------------------------------------------



[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: 42f138a05f1308ff38a52e22aaaef7540d2420e8
Parents: b08bfe7 8c49ff6
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 17:35:04 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 17:35:04 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/cluster/ClusterMetrics.java  |  2 +-
 .../ignite/testframework/config/GridTestProperties.java | 10 +++++-----
 modules/extdata/p2p/pom.xml                             |  6 ------
 .../ignite/client/hadoop/GridHadoopClientProtocol.java  |  2 +-
 .../processors/hadoop/GridHadoopClassLoader.java        | 12 ++++++------
 .../internal/processors/hadoop/GridHadoopSetup.java     |  8 ++++----
 .../client/hadoop/GridHadoopClientProtocolSelfTest.java |  6 +++---
 modules/hibernate/pom.xml                               |  6 ------
 modules/indexing/pom.xml                                |  6 ------
 modules/jta/pom.xml                                     |  6 ------
 modules/scalar/pom.xml                                  |  6 ------
 modules/spring/pom.xml                                  |  6 ------
 modules/visor-console/pom.xml                           |  7 -------
 modules/web/pom.xml                                     |  6 ------
 14 files changed, 20 insertions(+), 69 deletions(-)
----------------------------------------------------------------------



[37/50] [abbrv] incubator-ignite git commit: review ignite-311

Posted by sb...@apache.org.
review ignite-311


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

Branch: refs/heads/ignite-342
Commit: 9fb1eeb55e8eadf9190d0d675f65e5020543ad39
Parents: 2ef2271
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Feb 27 19:09:27 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Feb 27 19:09:27 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridProperties.java  | 79 --------------------
 .../ignite/internal/GridUpdateNotifier.java     |  2 +-
 .../apache/ignite/internal/IgniteKernal.java    |  2 +-
 .../ignite/internal/IgniteProperties.java       | 79 ++++++++++++++++++++
 .../ignite/internal/IgniteVersionUtils.java     |  8 +-
 .../plugin/IgnitePluginProcessor.java           | 37 +++------
 .../internal/GridUpdateNotifierSelfTest.java    |  2 +-
 7 files changed, 98 insertions(+), 111 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
deleted file mode 100644
index 89110af..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Ignite properties holder.
- */
-public class GridProperties {
-    /** Properties file path. */
-    private static final String FILE_PATH = "ignite.properties";
-
-    /** Properties. */
-    private static final Properties PROPS;
-
-    /**
-     *
-     */
-    static {
-        PROPS = new Properties();
-
-        readProperties(FILE_PATH, PROPS, true);
-    }
-
-    /**
-     * @param path Path.
-     * @param props Properties.
-     * @param throwExc Flag indicating whether to throw an exception or not.
-     */
-    public static void readProperties(String path, Properties props, boolean throwExc) {
-        try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
-            if (is == null) {
-                if (throwExc)
-                    throw new RuntimeException("Failed to find properties file: " + path);
-                else
-                    return;
-            }
-
-            props.load(is);
-        }
-        catch (IOException e) {
-            throw new RuntimeException("Failed to read properties file: " + path, e);
-        }
-    }
-
-    /**
-     * Gets property value.
-     *
-     * @param key Property key.
-     * @return Property value (possibly empty string, but never {@code null}).
-     */
-    public static String get(String key) {
-        return PROPS.getProperty(key, "");
-    }
-
-    /**
-     *
-     */
-    private GridProperties() {
-        // No-op.
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index d1436a9..830481f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -42,7 +42,7 @@ import static java.net.URLEncoder.*;
  */
 class GridUpdateNotifier {
     /** Access URL to be used to access latest version data. */
-    private static final String UPD_STATUS_PARAMS = GridProperties.get("ignite.update.status.params");
+    private static final String UPD_STATUS_PARAMS = IgniteProperties.get("ignite.update.status.params");
 
     /** Throttling for logging out. */
     private static final long THROTTLE_PERIOD = 24 * 60 * 60 * 1000; // 1 day.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c21ceb3..9c92edd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -100,7 +100,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** Compatible versions. */
-    private static final String COMPATIBLE_VERS = GridProperties.get("ignite.compatible.vers");
+    private static final String COMPATIBLE_VERS = IgniteProperties.get("ignite.compatible.vers");
 
     /** Ignite site that is shown in log messages. */
     static final String SITE = "www.gridgain.com";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
new file mode 100644
index 0000000..74c0ce4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
@@ -0,0 +1,79 @@
+/*
+ * 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;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Ignite properties holder.
+ */
+public class IgniteProperties {
+    /** Properties file path. */
+    private static final String FILE_PATH = "ignite.properties";
+
+    /** Properties. */
+    private static final Properties PROPS;
+
+    /**
+     *
+     */
+    static {
+        PROPS = new Properties();
+
+        readProperties(FILE_PATH, PROPS, true);
+    }
+
+    /**
+     * @param path Path.
+     * @param props Properties.
+     * @param throwExc Flag indicating whether to throw an exception or not.
+     */
+    public static void readProperties(String path, Properties props, boolean throwExc) {
+        try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
+            if (is == null) {
+                if (throwExc)
+                    throw new RuntimeException("Failed to find properties file: " + path);
+                else
+                    return;
+            }
+
+            props.load(is);
+        }
+        catch (IOException e) {
+            throw new RuntimeException("Failed to read properties file: " + path, e);
+        }
+    }
+
+    /**
+     * Gets property value.
+     *
+     * @param key Property key.
+     * @return Property value (possibly empty string, but never {@code null}).
+     */
+    public static String get(String key) {
+        return PROPS.getProperty(key, "");
+    }
+
+    /**
+     *
+     */
+    private IgniteProperties() {
+        // No-op.
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
index 51668b6..3c47f23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
@@ -54,13 +54,13 @@ public class IgniteVersionUtils {
      * Static initializer.
      */
     static {
-        VER_STR = GridProperties.get("ignite.version");
+        VER_STR = IgniteProperties.get("ignite.version");
 
-        BUILD_TSTAMP = Long.valueOf(GridProperties.get("ignite.build"));
+        BUILD_TSTAMP = Long.valueOf(IgniteProperties.get("ignite.build"));
         BUILD_TSTAMP_STR = new SimpleDateFormat("yyyyMMdd").format(new Date(BUILD_TSTAMP * 1000));
 
-        REV_HASH_STR = GridProperties.get("ignite.revision");
-        RELEASE_DATE_STR = GridProperties.get("ignite.rel.date");
+        REV_HASH_STR = IgniteProperties.get("ignite.revision");
+        RELEASE_DATE_STR = IgniteProperties.get("ignite.rel.date");
 
         String rev = REV_HASH_STR.length() > 8 ? REV_HASH_STR.substring(0, 8) : REV_HASH_STR;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index aca8fb8..05f227b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -42,9 +42,6 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
     /** */
     private volatile Map<Class<?>, Object[]> extensions;
 
-    /** Plugin information. */
-    public static final String PLUGIN_INFO = "Configured plugins: ";
-
     /**
      *
      * @param ctx Kernal context.
@@ -206,32 +203,22 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Plugin information.
-     */
-    private String pluginInfo() {
-        Collection<PluginProvider> plugins = ctx.plugins().allProviders();
-
-        if (plugins.size() == 0)
-            return U.nl() + ">>>    " + PLUGIN_INFO + "none";
-
-        String info = U.nl() + ">>>    " + PLUGIN_INFO + U.nl();
-
-        for (PluginProvider plugin : plugins)
-            info += ">>>    " + plugin.name() + " " + plugin.version() + U.nl() +
-                ">>>    " + plugin.copyright();
-
-        return info;
-    }
-
-    /**
      * Print plugin information.
      */
     private void ackPluginsInfo() {
-        if (log.isQuiet())
-            U.quiet(false, pluginInfo().split(U.nl() + ">>> "));
+        U.quietAndInfo(log, "Configured plugins:");
 
-        if (log.isInfoEnabled())
-            log.info(pluginInfo());
+        if (plugins.isEmpty()) {
+            U.quietAndInfo(log, "  ^-- None");
+            U.quietAndInfo(log, "");
+        }
+        else {
+            for (PluginProvider plugin : plugins.values()) {
+                U.quietAndInfo(log, "  ^-- " + plugin.name() + " " + plugin.version());
+                U.quietAndInfo(log, "  ^-- " + plugin.copyright());
+                U.quietAndInfo(log, "");
+            }
+        }
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
index 8cc0b28..07bcf48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
@@ -36,7 +36,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testNotifier() throws Exception {
-        GridUpdateNotifier ntf = new GridUpdateNotifier(null, GridProperties.get("ignite.version"),
+        GridUpdateNotifier ntf = new GridUpdateNotifier(null, IgniteProperties.get("ignite.version"),
             IgniteKernal.SITE, TEST_GATEWAY, false);
 
         ntf.checkForNewVersion(new SelfExecutor(), log);


[14/50] [abbrv] incubator-ignite git commit: # IGNITE-298 special care for '-1' value.

Posted by sb...@apache.org.
# IGNITE-298 special care for '-1' value.


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

Branch: refs/heads/ignite-342
Commit: 388da76293f4f0a8ed3265b9782633496863508f
Parents: ae37301
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Feb 27 16:50:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Feb 27 16:50:02 2015 +0700

----------------------------------------------------------------------
 .../ignite/visor/commands/config/VisorConfigurationCommand.scala  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/388da762/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 64e230c..a2ab512 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -242,7 +242,8 @@ class VisorConfigurationCommand {
                 cmnT += ("Query Function Classes", arr2Str(query.indexCustomFunctionClasses()))
                 cmnT += ("Query Path To SQL Schema Objects", arr2Str(query.searchPath()))
                 cmnT += ("Query Initial Script Path", safe(query.initialScriptPath()))
-                cmnT += ("Query Off-Heap Storage Memory", query.maxOffHeapMemory())
+                cmnT += ("Query Off-Heap Storage Memory",
+                    if (query.maxOffHeapMemory() >= 0) query.maxOffHeapMemory() else NA)
                 cmnT += ("Query Execution Time Threshold", query.longQueryExecutionTimeout())
                 cmnT += ("Query Long Queries Explaining", bool2Str(query.longQryExplain()))
                 cmnT += ("Query Serializer", bool2Str(query.useOptimizedSerializer()))


[50/50] [abbrv] incubator-ignite git commit: IGNITE-342 Fixed review notes.

Posted by sb...@apache.org.
IGNITE-342 Fixed review notes.


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

Branch: refs/heads/ignite-342
Commit: 9eae231f9a8244047fdf5f5aed7298c51ed2b28b
Parents: e959d15
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 12:47:21 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 12:47:21 2015 +0300

----------------------------------------------------------------------
 .../GridCacheDefaultAffinityKeyMapper.java      | 22 ++------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9eae231f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index 87ed28e..2b6bfc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -45,6 +45,7 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper
     private static final long serialVersionUID = 0L;
 
     /** Injected ignite instance. */
+    @IgniteInstanceResource
     private Ignite ignite;
 
     /** Reflection cache. */
@@ -74,6 +75,7 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper
     );
 
     /** Logger. */
+    @LoggerResource
     private transient IgniteLogger log;
 
     /**
@@ -122,24 +124,4 @@ public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper
     @Override public void reset() {
         // No-op.
     }
-
-    /**
-     * Sets logger.
-     *
-     * @param log Ignite logger.
-     */
-    @LoggerResource
-    public void setLog(IgniteLogger log) {
-        this.log = log;
-    }
-
-    /**
-     * Sets Ignite.
-     *
-     * @param ignite Ignite.
-     */
-    @IgniteInstanceResource
-    public void setIgnite(Ignite ignite) {
-        this.ignite = ignite;
-    }
 }


[21/50] [abbrv] incubator-ignite git commit: gg-fix-deploy exclude redundant cache-api.jar

Posted by sb...@apache.org.
gg-fix-deploy exclude redundant cache-api.jar


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

Branch: refs/heads/ignite-342
Commit: a80af86f509dcb738a7142b73cb8c0dc7565d3ee
Parents: cefc885
Author: avinogradov <av...@gridgain.com>
Authored: Fri Feb 27 16:15:26 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri Feb 27 16:15:26 2015 +0300

----------------------------------------------------------------------
 modules/extdata/p2p/pom.xml   | 6 ------
 modules/hibernate/pom.xml     | 6 ------
 modules/indexing/pom.xml      | 6 ------
 modules/jta/pom.xml           | 6 ------
 modules/scalar/pom.xml        | 6 ------
 modules/spring/pom.xml        | 6 ------
 modules/visor-console/pom.xml | 7 -------
 modules/web/pom.xml           | 6 ------
 8 files changed, 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index eea2052..a2f5564 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 6aab989..f9b5a71 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 716d6bf..bd807f9 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 893aba9..e767b9f 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index c38085c..d88d7ec 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 2b00c3e..b102966 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 543b087..a02560e 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -54,13 +54,6 @@
             <version>${ignite.version}</version>
         </dependency>
 
-        <!-- Third party dependencies -->
-        <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a80af86f/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 4d7f771..8fae0a2 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -37,12 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
             <version>${ignite.version}</version>


[11/50] [abbrv] incubator-ignite git commit: #ignite-343: remove incorrect properties from ignite-log4j.xml.

Posted by sb...@apache.org.
#ignite-343: remove incorrect properties from ignite-log4j.xml.


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

Branch: refs/heads/ignite-342
Commit: e16f2a19b789281d10407945aab31773a0a6233b
Parents: adb2454
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 26 19:08:49 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 26 19:08:49 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e16f2a19/config/ignite-log4j.xml
----------------------------------------------------------------------
diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml
index 20b4a4e..36fb40b 100644
--- a/config/ignite-log4j.xml
+++ b/config/ignite-log4j.xml
@@ -71,8 +71,6 @@
         <param name="Threshold" value="DEBUG"/>
         <param name="File" value="${IGNITE_HOME}/work/log/ignite.log"/>
         <param name="Append" value="true"/>
-        <param name="MaxFileSize" value="10MB"/>
-        <param name="MaxBackupIndex" value="10"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/>
         </layout>


[39/50] [abbrv] incubator-ignite git commit: # sprint-2 - Fixed warning in example.

Posted by sb...@apache.org.
# sprint-2 - Fixed warning in example.


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

Branch: refs/heads/ignite-342
Commit: 375376b68ccb9e8d83746f6eeac49a6388396012
Parents: a792c99
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Fri Feb 27 23:50:04 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Fri Feb 27 23:50:04 2015 -0500

----------------------------------------------------------------------
 .../examples/datagrid/store/CacheNodeWithStoreStartup.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/375376b6/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
index 0c87f84..5245f98 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
@@ -64,19 +64,19 @@ public class CacheNodeWithStoreStartup {
 
         discoSpi.setIpFinder(ipFinder);
 
-        CacheConfiguration cacheCfg = new CacheConfiguration();
+        CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>();
 
         // Set atomicity as transaction, since we are showing transactions in example.
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        CacheStore store;
+        CacheStore<Long, Person> store;
 
         // Uncomment other cache stores to try them.
         store = new CacheDummyPersonStore();
         // store = new CacheJdbcPersonStore();
         // store = new CacheHibernatePersonStore();
 
-        cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
+        cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory<>(store));
         cacheCfg.setReadThrough(true);
         cacheCfg.setWriteThrough(true);
 


[03/50] [abbrv] incubator-ignite git commit: Remove temporary code.

Posted by sb...@apache.org.
Remove temporary code.


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

Branch: refs/heads/ignite-342
Commit: de75adb288fc246e710528b42fdf78d7d1b8cdf3
Parents: 153cbee
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Feb 26 17:02:30 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Feb 26 17:02:30 2015 +0300

----------------------------------------------------------------------
 examples/config/example-compute.xml | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de75adb2/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml
index 303b4eb..c532e17 100644
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@ -32,8 +32,6 @@
         <!-- Set to true to enable distributed class loading for examples, default is false. -->
         <property name="peerClassLoadingEnabled" value="true"/>
 
-        <property name="localHost" value="127.0.0.1" />
-
         <property name="marshaller">
             <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->


[31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-335' into sprint-2

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-335' into sprint-2


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

Branch: refs/heads/ignite-342
Commit: b14be3bf279dc8400621ff65508a3df7082b0de2
Parents: 42f138a 27a160a
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 17:36:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 17:36:12 2015 +0300

----------------------------------------------------------------------
 .../datagrid/CacheContinuousQueryExample.java     |  2 +-
 .../ignite/cache/query/ContinuousQuery.java       | 18 +++++++++---------
 .../processors/cache/IgniteCacheProxy.java        |  6 +++---
 .../GridCacheContinuousQueryAbstractSelfTest.java |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



[10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-fix-deploy

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-fix-deploy

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java


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

Branch: refs/heads/ignite-342
Commit: 07905ba44924473b51c7a9b1c827d3dc12797bbe
Parents: 9f44e10 bf8c048
Author: avinogradov <av...@gridgain.com>
Authored: Thu Feb 26 18:45:04 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Feb 26 18:45:04 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/IgniteFs.java   |  2 +-
 .../ignite/events/DiscoveryCustomEvent.java     | 56 ----------------
 .../org/apache/ignite/events/EventType.java     | 14 ++--
 .../java/org/apache/ignite/igfs/package.html    |  2 +-
 .../internal/events/DiscoveryCustomEvent.java   | 68 ++++++++++++++++++++
 .../discovery/GridDiscoveryManager.java         |  7 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  9 ++-
 .../internal/GridDiscoveryEventSelfTest.java    |  9 +--
 .../java/org/apache/ignite/igfs/package.html    |  2 +-
 .../testsuites/IgniteHadoopTestSuite.java       |  7 +-
 10 files changed, 95 insertions(+), 81 deletions(-)
----------------------------------------------------------------------



[49/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-342

Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-342


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

Branch: refs/heads/ignite-342
Commit: e959d15b56f30fd8d3bbf56a78ce0bd513d34ed5
Parents: 2f3b8fb 13e2d1f
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 12:46:16 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 12:46:16 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |   12 +
 config/ignite-log4j.xml                         |    2 +-
 .../datagrid/CacheContinuousQueryExample.java   |    2 +-
 .../store/CacheNodeWithStoreStartup.java        |    6 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |  115 +-
 ipc/shmem/Makefile.am                           |   15 +
 ipc/shmem/igniteshmem/Makefile.am               |   15 +
 ipc/shmem/include/Makefile.am                   |   15 +
 modules/clients/src/test/keystore/generate.sh   |   15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    4 +-
 .../ignite/cache/query/ContinuousQuery.java     |   18 +-
 .../apache/ignite/cache/store/CacheStore.java   |    4 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |    2 +-
 .../ignite/cache/store/CacheStoreSession.java   |   17 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |    2 +-
 .../configuration/QueryConfiguration.java       |   37 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |    6 +-
 .../apache/ignite/internal/GridProperties.java  |   78 -
 .../ignite/internal/GridUpdateNotifier.java     |    2 +-
 .../apache/ignite/internal/IgniteKernal.java    |   18 +-
 .../ignite/internal/IgniteProperties.java       |   79 +
 .../ignite/internal/IgniteVersionUtils.java     |    8 +-
 .../internal/events/DiscoveryCustomEvent.java   |    3 +
 .../processors/cache/GridCacheStoreManager.java |    6 +-
 .../processors/cache/IgniteCacheProxy.java      |    6 +-
 .../plugin/IgnitePluginProcessor.java           |   24 +
 .../ignite/internal/util/IgniteUtils.java       |   90 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   10 +-
 .../visor/node/VisorBasicConfiguration.java     |   17 -
 .../node/VisorNodeEventsCollectorTask.java      |   10 +-
 .../internal/visor/node/VisorNodeGcTask.java    |   10 +-
 .../internal/visor/node/VisorNodePingTask.java  |   10 +-
 .../optimized-classnames.previous.properties    |   15 +
 .../optimized/optimized-classnames.properties   | 1565 +-----------------
 .../apache/ignite/plugin/PluginProvider.java    |    5 +
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  137 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  116 ++
 .../TcpDiscoveryCustomEventMessage.java         |    3 +
 .../core/src/test/config/store/jdbc/Ignite.xml  |   63 +-
 .../internal/GridUpdateNotifierSelfTest.java    |    2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    8 +-
 .../config/GridTestProperties.java              |   10 +-
 .../junits/cache/TestCacheSession.java          |    5 +
 .../cache/TestThreadLocalCacheSession.java      |    5 +
 modules/extdata/p2p/pom.xml                     |    6 -
 .../client/hadoop/GridHadoopClientProtocol.java |    6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  412 +++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |    3 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |   10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     |  413 -----
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |    2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |    4 +-
 .../hadoop/GridHadoopClassLoader.java           |   12 +-
 .../processors/hadoop/GridHadoopSetup.java      |    8 +-
 .../processors/hadoop/GridHadoopUtils.java      |    4 +-
 .../collections/GridHadoopHashMultimapBase.java |    2 +-
 .../GridHadoopExternalCommunication.java        |   14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |    6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |    2 +-
 .../GridHadoopClientProtocolSelfTest.java       |    6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |    2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |    2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |    2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |    1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    2 +-
 .../hadoop/GridHadoopGroupingTest.java          |    4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |    9 +-
 modules/hibernate/pom.xml                       |    6 -
 .../HibernateReadWriteAccessStrategy.java       |   81 +-
 modules/indexing/pom.xml                        |    6 -
 modules/jta/pom.xml                             |    6 -
 modules/scalar/pom.xml                          |    6 -
 .../ignite/schema/generator/XmlGenerator.java   |    8 +-
 .../apache/ignite/schema/model/PojoField.java   |   11 +-
 .../apache/ignite/schema/load/model/Ignite.xml  |  133 +-
 modules/spring/pom.xml                          |    6 -
 modules/visor-console/pom.xml                   |    7 -
 .../commands/alert/VisorAlertCommand.scala      |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |   82 +-
 .../config/VisorConfigurationCommand.scala      |  140 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |    2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   64 +-
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 +-
 modules/web/pom.xml                             |    6 -
 modules/winservice/IgniteService.sln            |    2 +-
 .../IgniteService/IgniteService.csproj          |    2 +-
 .../config/benchmark-atomic-win.properties      |   15 +
 .../config/benchmark-atomic.properties          |   15 +
 .../config/benchmark-compute-win.properties     |   15 +
 .../config/benchmark-compute.properties         |   15 +
 .../config/benchmark-multicast.properties       |   15 +
 .../config/benchmark-query-win.properties       |   15 +
 .../yardstick/config/benchmark-query.properties |   15 +
 .../config/benchmark-tx-win.properties          |   15 +
 .../yardstick/config/benchmark-tx.properties    |   15 +
 .../yardstick/config/benchmark-win.properties   |   15 +
 modules/yardstick/config/benchmark.properties   |   15 +
 .../yardstick/config/ignite-store-config.xml    |   15 +-
 pom.xml                                         |  150 +-
 100 files changed, 1788 insertions(+), 2647 deletions(-)
----------------------------------------------------------------------



[40/50] [abbrv] incubator-ignite git commit: # sprint-2 - javadoc fixes.

Posted by sb...@apache.org.
# sprint-2 - javadoc fixes.


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

Branch: refs/heads/ignite-342
Commit: a14ef18335ad5f6c78c35b711f4bd8d5a40f6910
Parents: 375376b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 00:19:58 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 00:19:58 2015 -0500

----------------------------------------------------------------------
 .../org/apache/ignite/cache/store/CacheStoreAdapter.java     | 2 +-
 .../org/apache/ignite/cache/store/CacheStoreSession.java     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14ef183/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
index 794281b..58a3f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
@@ -39,7 +39,7 @@ import java.util.*;
 public abstract class CacheStoreAdapter<K, V> implements CacheStore<K, V> {
     /**
      * Default empty implementation. This method needs to be overridden only if
-     * {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method
+     * {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)} method
      * is explicitly called.
      *
      * @param clo {@inheritDoc}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14ef183/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index 0bfc6fc..a2be4c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -23,7 +23,13 @@ import org.apache.ignite.transactions.*;
 import java.util.*;
 
 /**
- * Session for the cache store operations.
+ * Session for the cache store operations. The main purpose of cache store session
+ * is to hold context between multiple store invocations whenever in transaction. For example,
+ * if using JDBC, you can store the ongoing database connection in the session {@link #properties()} map.
+ * You can then commit this connection in the {@link CacheStore#txEnd(boolean)} method.
+ * <p>
+ * {@code CacheStoreSession} can be injected into an implementation of {@link CacheStore} with
+ * {@link CacheStoreSessionResource @CacheStoreSessionResource} annotation.
  *
  * @see CacheStoreSessionResource
  */