[04/12] ignite git commit: Minor cleanup.

2017-03-21 Thread ntikhonov 
Minor cleanup.


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

Branch: refs/heads/master
Commit: 620235f3ca0fa32c1f4a4dc1a5e0bd5545f6e07e
Parents: 7292a53
Author: Alexey Kuznetsov 
Authored: Thu Mar 2 11:05:19 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Mar 2 11:05:19 2017 +0700

--
 .../ignite/internal/visor/cache/VisorCacheTypeMetadata.java| 6 ++
 .../ignite/internal/visor/node/VisorIgfsConfiguration.java | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/620235f3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
index f17e588..c87ad05 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
@@ -32,6 +32,7 @@ import org.apache.ignite.cache.store.jdbc.JdbcType;
 import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
 import org.apache.ignite.internal.LessNamingBean;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
 
@@ -372,4 +373,9 @@ public class VisorCacheTypeMetadata implements 
Serializable, LessNamingBean {
 public Map>> 
grps() {
 return grps;
 }
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(VisorCacheTypeMetadata.class, this);
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/620235f3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index 9f7652b..cb10c1c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import org.apache.ignite.configuration.FileSystemConfiguration;
 import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
 import org.apache.ignite.igfs.IgfsMode;
-import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
 import org.apache.ignite.internal.LessNamingBean;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.jetbrains.annotations.Nullable;

[04/12] ignite git commit: Minor

2017-02-22 Thread sergi 
Minor


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

Branch: refs/heads/ignite-1.9
Commit: f684c00affa25d67557b382e6ffaf2d1de45c964
Parents: e69d3c3
Author: Andrey V. Mashenkov 
Authored: Tue Feb 21 12:00:41 2017 +0300
Committer: Andrey V. Mashenkov 
Committed: Tue Feb 21 12:00:41 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/f684c00a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 652d1f3..de48eb9 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2831,7 +2831,7 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
 if (!ctor.isAccessible())
 ctor.setAccessible(true);
 
-final int segments = 
tbl.rowDescriptor().context().config().getQueryParallelism();
+final int segments = 
tbl.rowDescriptor().configuration().getQueryParallelism();
 
 return (SpatialIndex)ctor.newInstance(tbl, idxName, segments, 
cols);
 }
@@ -2848,7 +2848,7 @@ public class IgniteH2Indexing implements 
GridQueryIndexing {
  * @return
  */
 private Index createTreeIndex(String idxName, GridH2Table tbl, boolean 
pk, List columns) {
-final int segments = 
tbl.rowDescriptor().context().config().getQueryParallelism();
+final int segments = 
tbl.rowDescriptor().configuration().getQueryParallelism();
 
 return new GridH2TreeIndex(idxName, tbl, pk, columns, segments);
 }

[04/12] ignite git commit: Minor changes to GridCacheDrManager interface to better propagate topology version.

2016-02-20 Thread vozerov 
Minor changes to GridCacheDrManager interface to better propagate topology 
version.


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

Branch: refs/heads/ignite-1786
Commit: 1463311cd1541122174111c4f0cc39aae7879ac9
Parents: bcaa0a8
Author: Ilya Lantukh 
Authored: Fri Feb 19 16:22:23 2016 +0300
Committer: vozerov-gridgain 
Committed: Fri Feb 19 16:22:23 2016 +0300

--
 .../internal/processors/cache/GridCacheMapEntry.java | 15 ---
 .../processors/cache/dr/GridCacheDrManager.java  |  4 +++-
 .../processors/cache/dr/GridOsCacheDrManager.java|  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1463311c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index e8652e7..1658b85 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1203,7 +1203,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 
 update(val, expireTime, ttl, newVer, true);
 
-drReplicate(drType, val, newVer);
+drReplicate(drType, val, newVer, topVer);
 
 recordNodeId(affNodeId, topVer);
 
@@ -1391,7 +1391,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 if (updateCntr != null && updateCntr != 0)
 updateCntr0 = updateCntr;
 
-drReplicate(drType, null, newVer);
+drReplicate(drType, null, newVer, topVer);
 
 if (metrics && cctx.cache().configuration().isStatisticsEnabled())
 cctx.cache().metrics0().onRemove();
@@ -2359,7 +2359,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 if (updateCntr != null)
 updateCntr0 = updateCntr;
 
-drReplicate(drType, updated, newVer);
+drReplicate(drType, updated, newVer, topVer);
 
 recordNodeId(affNodeId, topVer);
 
@@ -2457,7 +2457,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 if (updateCntr != null)
 updateCntr0 = updateCntr;
 
-drReplicate(drType, null, newVer);
+drReplicate(drType, null, newVer, topVer);
 
 if (evt) {
 CacheObject evtOld = null;
@@ -2600,12 +2600,13 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
  * @param drType DR type.
  * @param val Value.
  * @param ver Version.
+ * @param topVer Topology version.
  * @throws IgniteCheckedException In case of exception.
  */
-private void drReplicate(GridDrType drType, @Nullable CacheObject val, 
GridCacheVersion ver)
+private void drReplicate(GridDrType drType, @Nullable CacheObject val, 
GridCacheVersion ver, AffinityTopologyVersion topVer)
 throws IgniteCheckedException {
 if (cctx.isDrEnabled() && drType != DR_NONE && !isInternal())
-cctx.dr().replicate(key, val, rawTtl(), rawExpireTime(), 
ver.conflictVersion(), drType);
+cctx.dr().replicate(key, val, rawTtl(), rawExpireTime(), 
ver.conflictVersion(), drType, topVer);
 }
 
 /**
@@ -3275,7 +3276,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 if (!preload)
 updateCntr = nextPartCounter(topVer);
 
-drReplicate(drType, val, ver);
+drReplicate(drType, val, ver, topVer);
 
 if (!skipQryNtf) {
 cctx.continuousQueries().onEntryUpdated(

http://git-wip-us.apache.org/repos/asf/ignite/blob/1463311c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
index 67174ef..358f90c 100644
---

[04/12] ignite git commit: minor

2015-11-30 Thread agoncharuk 
minor


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

Branch: refs/heads/ignite-1.5.1
Commit: 8e605e9f33c99a4f8404bff3dd8902f4b08704da
Parents: 0fcc1d1
Author: Yakov Zhdanov 
Authored: Mon Nov 30 16:45:27 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 16:45:27 2015 +0300

--
 .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8e605e9f/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index e58eb54..484ee87 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -71,10 +71,10 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 // Grid config.
 IgniteConfiguration cfg = super.getConfiguration();
 
-cfg.setLocalHost("localhost");
+cfg.setLocalHost("127.0.0.1");
 
 ConnectorConfiguration clnCfg = new ConnectorConfiguration();
-clnCfg.setHost("localhost");
+clnCfg.setHost("127.0.0.1");
 
 cfg.setConnectorConfiguration(clnCfg);
 cfg.setDiscoverySpi(disco);
@@ -239,4 +239,4 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 });
 }
 }
-}
\ No newline at end of file
+}