You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/03/02 14:25:39 UTC
[01/50] [abbrv] incubator-ignite git commit: # ignite-11 Fix issues
found on review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-368 c6be5f2b2 -> 141067acd
# 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-368
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();
}
}
}
[36/50] [abbrv] incubator-ignite git commit: # sprint-2 - javadoc
fixes.
Posted by ak...@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-368
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
*/
[04/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2'
of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Posted by ak...@apache.org.
Merge branch 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53141e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53141e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53141e55
Branch: refs/heads/ignite-368
Commit: 53141e550eb8af27bcf9b5d0d6fe73c465150130
Parents: ff0c1e1 47539d8
Author: anovikov <an...@gridgain.com>
Authored: Fri Feb 27 15:50:02 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Fri Feb 27 15:50:02 2015 +0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[42/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-11' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[12/50] [abbrv] incubator-ignite git commit: # Minor JavaDoc fixes.
Posted by ak...@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-368
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: #ignite-343: remove
incorrect properties from ignite-log4j.xml.
Posted by ak...@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-368
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>
[23/50] [abbrv] incubator-ignite git commit: # Minors.
Posted by ak...@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-368
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
[50/50] [abbrv] incubator-ignite git commit: # IGNITE-368 Review.
Posted by ak...@apache.org.
# IGNITE-368 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/141067ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/141067ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/141067ac
Branch: refs/heads/ignite-368
Commit: 141067acde5e9cfc58e58422a321371780f20797
Parents: aad668c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 20:24:52 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 20:24:52 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/node/VisorNodeLastErrorsTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141067ac/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeLastErrorsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeLastErrorsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeLastErrorsTask.java
index 3acd47d..2a5beaa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeLastErrorsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeLastErrorsTask.java
@@ -77,9 +77,9 @@ public class VisorNodeLastErrorsTask extends VisorMultiNodeTask<Map<UUID, Long>,
/** {@inheritDoc} */
@Override protected IgniteBiTuple<Long, List<IgniteExceptionRegistry.ExceptionInfo>> run(Map<UUID, Long> arg) {
- Long no = arg.get(ignite.localNode().id());
+ Long lastOrder = arg.get(ignite.localNode().id());
- long order = no != null ? no : 0;
+ long order = lastOrder != null ? lastOrder : 0;
List<IgniteExceptionRegistry.ExceptionInfo> errors = ignite.context().exceptionRegistry().getErrors(order);
[34/50] [abbrv] incubator-ignite git commit: # IGNITE-339 Review.
Posted by ak...@apache.org.
# IGNITE-339 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/5d3a2be2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d3a2be2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d3a2be2
Branch: refs/heads/ignite-368
Commit: 5d3a2be2b24b0d2c6e72648008219d269f92a142
Parents: 2710ece
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Feb 28 01:53:32 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Feb 28 01:53:32 2015 +0700
----------------------------------------------------------------------
.../internal/visor/cache/VisorCacheConfiguration.java | 12 ++----------
.../visor/node/VisorTransactionConfiguration.java | 2 +-
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3a2be2/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 8eee437..2ad0e49 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -93,7 +93,7 @@ public class VisorCacheConfiguration implements Serializable {
/** Cache interceptor. */
private String interceptor;
- /** Should value bytes be stored. */
+ /** Flag indicating if cached values should be additionally stored in serialized form. */
private boolean valBytes;
/** Cache affinityCfg config. */
@@ -331,21 +331,13 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Should value bytes be stored.
+ * @return {@code true} if cached values should be additionally stored in serialized form.
*/
public boolean valueBytes() {
return valBytes;
}
/**
- * @param valBytes New should value bytes be stored.
- */
- public void valueBytes(boolean valBytes) {
- this.valBytes = valBytes;
- }
-
-
- /**
* @return Collection of type metadata.
*/
public Collection<VisorCacheTypeMetadata> typeMeta() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3a2be2/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
index 667ff51..773f9dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
@@ -3,7 +3,7 @@
* 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 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
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d3a2be2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 577067a..7232221 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -854,7 +854,7 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
- cacheT += ("Store Values In Bytes", cfg.valueBytes())
+ cacheT += ("Store Values Bytes", cfg.valueBytes())
cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
[11/50] [abbrv] incubator-ignite git commit: # IGNITE-350: Applied
patch from Ivan V..
Posted by ak...@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-368
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();
[21/50] [abbrv] incubator-ignite git commit: # ignite-325: revert
license from some files and fix serialVersionUID at 2 files
Posted by ak...@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>
[08/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2'
into ignite-325
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[18/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-gg-fix-deploy' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/sprint-2' into ignite-343
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[33/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-339' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Posted by ak...@apache.org.
Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2710ece0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2710ece0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2710ece0
Branch: refs/heads/ignite-368
Commit: 2710ece0fb8c18fec65d7e4f745f048eca07790e
Parents: 57bdd8a a792c99
Author: AKuznetsov <ak...@gridgain.com>
Authored: Sat Feb 28 01:40:08 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Sat Feb 28 01:40:08 2015 +0700
----------------------------------------------------------------------
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 +-
.../ignite/cache/query/ContinuousQuery.java | 18 +-
.../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/IgniteCacheProxy.java | 6 +-
.../plugin/IgnitePluginProcessor.java | 24 +
.../optimized-classnames.previous.properties | 15 +
.../optimized/optimized-classnames.properties | 1565 +-----------------
.../apache/ignite/plugin/PluginProvider.java | 5 +
.../TcpDiscoveryCustomEventMessage.java | 3 +
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
...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 -
.../HibernateReadWriteAccessStrategy.java | 81 +-
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 -
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 +-
73 files changed, 1074 insertions(+), 2273 deletions(-)
----------------------------------------------------------------------
[44/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-339' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Posted by ak...@apache.org.
Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60e0ecb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60e0ecb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60e0ecb2
Branch: refs/heads/ignite-368
Commit: 60e0ecb2e269e6af2b0c04df2aed6f494657b03c
Parents: 5d3a2be 13e2d1f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 15:59:00 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 15:59:00 2015 +0700
----------------------------------------------------------------------
.../store/CacheNodeWithStoreStartup.java | 6 +-
.../store/jdbc/CacheJdbcPersonStore.java | 115 ++++++----------
.../apache/ignite/cache/store/CacheStore.java | 4 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 17 ++-
.../processors/cache/GridCacheStoreManager.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 90 ++++++++++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++--------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++
.../core/src/test/config/store/jdbc/Ignite.xml | 63 +++++++--
.../junits/cache/TestCacheSession.java | 5 +
.../cache/TestThreadLocalCacheSession.java | 5 +
.../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 +-
16 files changed, 521 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
[14/50] [abbrv] incubator-ignite git commit: # ignite-339 Refactored
Visor Configurations
Posted by ak...@apache.org.
# ignite-339 Refactored Visor Configurations
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57bdd8a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57bdd8a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57bdd8a5
Branch: refs/heads/ignite-368
Commit: 57bdd8a5412bec7fafd2481bc42752d50de36463
Parents: 555e3f9
Author: anovikov <an...@gridgain.com>
Authored: Fri Feb 27 18:20:57 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Fri Feb 27 18:20:57 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheConfiguration.java | 10 -
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 180 ++------------
.../node/VisorCacheQueryConfiguration.java | 45 +---
.../node/VisorExecutorServiceConfiguration.java | 54 +---
.../visor/node/VisorGridConfiguration.java | 177 ++------------
.../visor/node/VisorIgfsConfiguration.java | 244 ++-----------------
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +--
.../node/VisorPeerToPeerConfiguration.java | 28 +--
.../visor/node/VisorQueryConfiguration.java | 65 +----
.../visor/node/VisorRestConfiguration.java | 80 +-----
.../node/VisorSegmentationConfiguration.java | 45 +---
.../visor/node/VisorSpisConfiguration.java | 92 +------
.../node/VisorTransactionConfiguration.java | 64 +----
15 files changed, 139 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index cf149f7..8eee437 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -60,9 +60,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Write synchronization mode. */
private CacheWriteSynchronizationMode writeSynchronizationMode;
- /** Sequence reserve size. */
- private int seqReserveSize;
-
/** Swap enabled flag. */
private boolean swapEnabled;
@@ -257,13 +254,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Sequence reserve size.
- */
- public int sequenceReserveSize() {
- return seqReserveSize;
- }
-
- /**
* @return Swap enabled flag.
*/
public boolean swapEnabled() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
index 79ce903..c39e3d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
@@ -48,9 +48,9 @@ public class VisorAtomicConfiguration implements Serializable {
public static VisorAtomicConfiguration from(AtomicConfiguration src) {
VisorAtomicConfiguration cfg = new VisorAtomicConfiguration();
- cfg.atomicSequenceReserveSize(src.getAtomicSequenceReserveSize());
- cfg.cacheMode(src.getCacheMode());
- cfg.backups(src.getBackups());
+ cfg.seqReserveSize = src.getAtomicSequenceReserveSize();
+ cfg.cacheMode = src.getCacheMode();
+ cfg.backups = src.getBackups();
return cfg;
}
@@ -63,13 +63,6 @@ public class VisorAtomicConfiguration implements Serializable {
}
/**
- * @param seqReserveSize Atomic sequence reservation size.
- */
- public void atomicSequenceReserveSize(int seqReserveSize) {
- this.seqReserveSize = seqReserveSize;
- }
-
- /**
* @return Cache mode.
*/
public CacheMode cacheMode() {
@@ -77,26 +70,12 @@ public class VisorAtomicConfiguration implements Serializable {
}
/**
- * @param cacheMode Cache mode.
- */
- public void cacheMode(CacheMode cacheMode) {
- this.cacheMode = cacheMode;
- }
-
- /**
* @return Number of backup nodes.
*/
public int backups() {
return backups;
}
- /**
- * @param backups Number of backup nodes.
- */
- public void backups(int backups) {
- this.backups = backups;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorAtomicConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 8a79299..a3b6052 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -104,26 +104,26 @@ public class VisorBasicConfiguration implements Serializable {
public static VisorBasicConfiguration from(IgniteEx ignite, IgniteConfiguration c) {
VisorBasicConfiguration cfg = new VisorBasicConfiguration();
- cfg.gridName(c.getGridName());
- cfg.ggHome(getProperty(IGNITE_HOME, c.getIgniteHome()));
- cfg.localHost(getProperty(IGNITE_LOCAL_HOST, c.getLocalHost()));
- cfg.nodeId(ignite.localNode().id());
- cfg.marshaller(compactClass(c.getMarshaller()));
- cfg.deploymentMode(compactObject(c.getDeploymentMode()));
- cfg.daemon(boolValue(IGNITE_DAEMON, c.isDaemon()));
- cfg.jmxRemote(ignite.isJmxRemoteEnabled());
- cfg.restart(ignite.isRestartEnabled());
- cfg.networkTimeout(c.getNetworkTimeout());
- cfg.logger(compactClass(c.getGridLogger()));
- cfg.discoStartupDelay(c.getDiscoveryStartupDelay());
- cfg.mBeanServer(compactClass(c.getMBeanServer()));
- cfg.noAscii(boolValue(IGNITE_NO_ASCII, false));
- cfg.noDiscoOrder(boolValue(IGNITE_NO_DISCO_ORDER, false));
- cfg.noShutdownHook(boolValue(IGNITE_NO_SHUTDOWN_HOOK, false));
- cfg.programName(getProperty(IGNITE_PROG_NAME));
- cfg.quiet(boolValue(IGNITE_QUIET, true));
- cfg.successFile(getProperty(IGNITE_SUCCESS_FILE));
- cfg.updateNotifier(boolValue(IGNITE_UPDATE_NOTIFIER, true));
+ cfg.gridName = c.getGridName();
+ cfg.ggHome = getProperty(IGNITE_HOME, c.getIgniteHome());
+ cfg.locHost = getProperty(IGNITE_LOCAL_HOST, c.getLocalHost());
+ cfg.nodeId = ignite.localNode().id();
+ cfg.marsh = compactClass(c.getMarshaller());
+ cfg.deployMode = compactObject(c.getDeploymentMode());
+ cfg.daemon = boolValue(IGNITE_DAEMON, c.isDaemon());
+ cfg.jmxRemote = ignite.isJmxRemoteEnabled();
+ cfg.restart = ignite.isRestartEnabled();
+ cfg.netTimeout = c.getNetworkTimeout();
+ cfg.log = compactClass(c.getGridLogger());
+ cfg.discoStartupDelay = c.getDiscoveryStartupDelay();
+ cfg.mBeanSrv = compactClass(c.getMBeanServer());
+ cfg.noAscii = boolValue(IGNITE_NO_ASCII, false);
+ cfg.noDiscoOrder = boolValue(IGNITE_NO_DISCO_ORDER, false);
+ cfg.noShutdownHook = boolValue(IGNITE_NO_SHUTDOWN_HOOK, false);
+ cfg.progName = getProperty(IGNITE_PROG_NAME);
+ cfg.quiet = boolValue(IGNITE_QUIET, true);
+ cfg.successFile = getProperty(IGNITE_SUCCESS_FILE);
+ cfg.updateNtf = boolValue(IGNITE_UPDATE_NOTIFIER, true);
return cfg;
}
@@ -136,13 +136,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param gridName New grid name.
- */
- public void gridName(@Nullable String gridName) {
- this.gridName = gridName;
- }
-
- /**
* @return IGNITE_HOME determined at startup.
*/
@Nullable public String ggHome() {
@@ -150,13 +143,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param ggHome New IGNITE_HOME determined at startup.
- */
- public void ggHome(@Nullable String ggHome) {
- this.ggHome = ggHome;
- }
-
- /**
* @return Local host value used.
*/
@Nullable public String localHost() {
@@ -164,13 +150,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param locHost New local host value used.
- */
- public void localHost(@Nullable String locHost) {
- this.locHost = locHost;
- }
-
- /**
* @return Node id.
*/
public UUID nodeId() {
@@ -178,13 +157,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param nodeId New node id.
- */
- public void nodeId(UUID nodeId) {
- this.nodeId = nodeId;
- }
-
- /**
* @return Marshaller used.
*/
public String marshaller() {
@@ -192,13 +164,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param marsh New marshaller used.
- */
- public void marshaller(String marsh) {
- this.marsh = marsh;
- }
-
- /**
* @return Deployment Mode.
*/
public Object deploymentMode() {
@@ -206,13 +171,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param deployMode New Deployment Mode.
- */
- public void deploymentMode(Object deployMode) {
- this.deployMode = deployMode;
- }
-
- /**
* @return Whether this node daemon or not.
*/
public boolean daemon() {
@@ -220,13 +178,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param daemon New whether this node daemon or not.
- */
- public void daemon(boolean daemon) {
- this.daemon = daemon;
- }
-
- /**
* @return Whether remote JMX is enabled.
*/
public boolean jmxRemote() {
@@ -234,13 +185,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param jmxRemote New whether remote JMX is enabled.
- */
- public void jmxRemote(boolean jmxRemote) {
- this.jmxRemote = jmxRemote;
- }
-
- /**
* @return Is node restart enabled.
*/
public boolean restart() {
@@ -248,13 +192,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param restart New is node restart enabled.
- */
- public void restart(boolean restart) {
- this.restart = restart;
- }
-
- /**
* @return Network timeout.
*/
public long networkTimeout() {
@@ -262,13 +199,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param netTimeout New network timeout.
- */
- public void networkTimeout(long netTimeout) {
- this.netTimeout = netTimeout;
- }
-
- /**
* @return Logger used on node.
*/
public String logger() {
@@ -276,13 +206,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param log New logger used on node.
- */
- public void logger(String log) {
- this.log = log;
- }
-
- /**
* @return Discovery startup delay.
*/
public long discoStartupDelay() {
@@ -290,13 +213,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param discoStartupDelay New discovery startup delay.
- */
- public void discoStartupDelay(long discoStartupDelay) {
- this.discoStartupDelay = discoStartupDelay;
- }
-
- /**
* @return MBean server name
*/
@Nullable public String mBeanServer() {
@@ -304,13 +220,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param mBeanSrv New mBean server name
- */
- public void mBeanServer(@Nullable String mBeanSrv) {
- this.mBeanSrv = mBeanSrv;
- }
-
- /**
* @return Whether ASCII logo is disabled.
*/
public boolean noAscii() {
@@ -318,13 +227,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noAscii New whether ASCII logo is disabled.
- */
- public void noAscii(boolean noAscii) {
- this.noAscii = noAscii;
- }
-
- /**
* @return Whether no discovery order is allowed.
*/
public boolean noDiscoOrder() {
@@ -332,13 +234,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noDiscoOrder New whether no discovery order is allowed.
- */
- public void noDiscoOrder(boolean noDiscoOrder) {
- this.noDiscoOrder = noDiscoOrder;
- }
-
- /**
* @return Whether shutdown hook is disabled.
*/
public boolean noShutdownHook() {
@@ -346,13 +241,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noShutdownHook New whether shutdown hook is disabled.
- */
- public void noShutdownHook(boolean noShutdownHook) {
- this.noShutdownHook = noShutdownHook;
- }
-
- /**
* @return Name of command line program.
*/
public String programName() {
@@ -360,13 +248,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param progName New name of command line program.
- */
- public void programName(String progName) {
- this.progName = progName;
- }
-
- /**
* @return Whether node is in quiet mode.
*/
public boolean quiet() {
@@ -374,13 +255,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param quiet New whether node is in quiet mode.
- */
- public void quiet(boolean quiet) {
- this.quiet = quiet;
- }
-
- /**
* @return Success file name.
*/
public String successFile() {
@@ -388,26 +262,12 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param successFile New success file name.
- */
- public void successFile(String successFile) {
- this.successFile = successFile;
- }
-
- /**
* @return Whether update checker is enabled.
*/
public boolean updateNotifier() {
return updateNtf;
}
- /**
- * @param updateNtf New whether update checker is enabled.
- */
- public void updateNotifier(boolean updateNtf) {
- this.updateNtf = updateNtf;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorBasicConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
index 882fa34..8d284c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
@@ -58,12 +58,12 @@ public class VisorCacheQueryConfiguration implements Serializable {
QueryTypeResolver rslvr = qccfg.getTypeResolver();
if (rslvr != null)
- cfg.typeResolver(U.compact(rslvr.getClass().getName()));
+ cfg.typeRslvr = U.compact(rslvr.getClass().getName());
- cfg.indexPrimitiveKey(qccfg.isIndexPrimitiveKey());
- cfg.indexPrimitiveValue(qccfg.isIndexPrimitiveValue());
- cfg.indexFixedTyping(qccfg.isIndexFixedTyping());
- cfg.escapeAll(qccfg.isEscapeAll());
+ cfg.idxPrimitiveKey = qccfg.isIndexPrimitiveKey();
+ cfg.idxPrimitiveVal = qccfg.isIndexPrimitiveValue();
+ cfg.idxFixedTyping = qccfg.isIndexFixedTyping();
+ cfg.escapeAll = qccfg.isEscapeAll();
}
return cfg;
@@ -77,13 +77,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param typeRslvr Query type resolver class name.
- */
- public void typeResolver(String typeRslvr) {
- this.typeRslvr = typeRslvr;
- }
-
- /**
* @return {@code true} if primitive keys should be indexed.
*/
public boolean indexPrimitiveKey() {
@@ -91,13 +84,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxPrimitiveKey {@code true} if primitive keys should be indexed.
- */
- public void indexPrimitiveKey(boolean idxPrimitiveKey) {
- this.idxPrimitiveKey = idxPrimitiveKey;
- }
-
- /**
* @return {@code true} if primitive values should be indexed.
*/
public boolean indexPrimitiveValue() {
@@ -105,13 +91,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxPrimitiveVal {@code true} if primitive values should be indexed.
- */
- public void indexPrimitiveValue(boolean idxPrimitiveVal) {
- this.idxPrimitiveVal = idxPrimitiveVal;
- }
-
- /**
* @return {@code true} if SQL engine should try to convert values to their respective SQL types.
*/
public boolean indexFixedTyping() {
@@ -119,23 +98,9 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxFixedTyping {@code true} if SQL engine should try to convert values to their respective SQL types.
- */
- public void indexFixedTyping(boolean idxFixedTyping) {
- this.idxFixedTyping = idxFixedTyping;
- }
-
- /**
* @return {@code true} if SQL engine generate SQL statements with escaped names.
*/
public boolean escapeAll() {
return escapeAll;
}
-
- /**
- * @param escapeAll {@code true} if SQL engine should generate SQL statements with escaped names.
- */
- public void escapeAll(boolean escapeAll) {
- this.escapeAll = escapeAll;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index 05f407e..8bc891e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -54,16 +54,16 @@ public class VisorExecutorServiceConfiguration implements Serializable {
public static VisorExecutorServiceConfiguration from(IgniteConfiguration c) {
VisorExecutorServiceConfiguration cfg = new VisorExecutorServiceConfiguration();
- cfg.publicThreadPoolSize(c.getPublicThreadPoolSize());
- cfg.systemThreadPoolSize(c.getSystemThreadPoolSize());
- cfg.managementThreadPoolSize(c.getManagementThreadPoolSize());
- cfg.peerClassLoadingThreadPoolSize(c.getPeerClassLoadingThreadPoolSize());
- cfg.igfsThreadPoolSize(c.getIgfsThreadPoolSize());
+ cfg.pubPoolSize = c.getPublicThreadPoolSize();
+ cfg.sysPoolSz = c.getSystemThreadPoolSize();
+ cfg.mgmtPoolSize = c.getManagementThreadPoolSize();
+ cfg.p2pPoolSz = c.getPeerClassLoadingThreadPoolSize();
+ cfg.igfsPoolSize = c.getIgfsThreadPoolSize();
ConnectorConfiguration cc = c.getConnectorConfiguration();
if (cc != null)
- cfg.restThreadPoolSize(cc.getThreadPoolSize());
+ cfg.restPoolSz = cc.getThreadPoolSize();
return cfg;
}
@@ -76,13 +76,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param pubPoolSize Public pool size.
- */
- public void publicThreadPoolSize(int pubPoolSize) {
- this.pubPoolSize = pubPoolSize;
- }
-
- /**
* @return System pool size.
*/
public int systemThreadPoolSize() {
@@ -90,13 +83,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param sysPoolSz System pool size.
- */
- public void systemThreadPoolSize(int sysPoolSz) {
- this.sysPoolSz = sysPoolSz;
- }
-
- /**
* @return Management pool size.
*/
public int managementThreadPoolSize() {
@@ -104,13 +90,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param mgmtPoolSize New Management pool size.
- */
- public void managementThreadPoolSize(int mgmtPoolSize) {
- this.mgmtPoolSize = mgmtPoolSize;
- }
-
- /**
* @return IGFS pool size.
*/
public int igfsThreadPoolSize() {
@@ -118,13 +97,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param igfsPoolSize New iGFS pool size.
- */
- public void igfsThreadPoolSize(int igfsPoolSize) {
- this.igfsPoolSize = igfsPoolSize;
- }
-
- /**
* @return Peer-to-peer pool size.
*/
public int peerClassLoadingThreadPoolSize() {
@@ -132,26 +104,12 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param p2pPoolSz New peer-to-peer pool size.
- */
- public void peerClassLoadingThreadPoolSize(int p2pPoolSz) {
- this.p2pPoolSz = p2pPoolSz;
- }
-
- /**
* @return REST requests pool size.
*/
public int restThreadPoolSize() {
return restPoolSz;
}
- /**
- * @param restPoolSz REST requests pool size.
- */
- public void restThreadPoolSize(int restPoolSz) {
- this.restPoolSz = restPoolSz;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorExecutorServiceConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 446db32..96c69d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -102,25 +102,25 @@ public class VisorGridConfiguration implements Serializable {
IgniteConfiguration c = ignite.configuration();
- basic(VisorBasicConfiguration.from(ignite, c));
- metrics(VisorMetricsConfiguration.from(c));
- spis(VisorSpisConfiguration.from(c));
- p2p(VisorPeerToPeerConfiguration.from(c));
- lifecycle(VisorLifecycleConfiguration.from(c));
- executeService(VisorExecutorServiceConfiguration.from(c));
- segmentation(VisorSegmentationConfiguration.from(c));
- includeProperties(compactArray(c.getIncludeProperties()));
- includeEventTypes(c.getIncludeEventTypes());
- rest(VisorRestConfiguration.from(c));
- userAttributes(c.getUserAttributes());
- caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration()));
- igfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration()));
- streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration()));
- env(new HashMap<>(getenv()));
- systemProperties(getProperties());
- atomic(VisorAtomicConfiguration.from(c.getAtomicConfiguration()));
- transaction(VisorTransactionConfiguration.from(c.getTransactionConfiguration()));
- queryConfiguration(VisorQueryConfiguration.from(c.getQueryConfiguration()));
+ basic = VisorBasicConfiguration.from(ignite, c);
+ metrics = VisorMetricsConfiguration.from(c);
+ spis = VisorSpisConfiguration.from(c);
+ p2p = VisorPeerToPeerConfiguration.from(c);
+ lifecycle = VisorLifecycleConfiguration.from(c);
+ execSvc = VisorExecutorServiceConfiguration.from(c);
+ seg = VisorSegmentationConfiguration.from(c);
+ inclProps = compactArray(c.getIncludeProperties());
+ inclEvtTypes = c.getIncludeEventTypes();
+ rest = VisorRestConfiguration.from(c);
+ userAttrs = c.getUserAttributes();
+ caches = VisorCacheConfiguration.list(ignite, c.getCacheConfiguration());
+ igfss = VisorIgfsConfiguration.list(c.getIgfsConfiguration());
+ streamers = VisorStreamerConfiguration.list(c.getStreamerConfiguration());
+ env = new HashMap<>(getenv());
+ sysProps = getProperties();
+ atomic = VisorAtomicConfiguration.from(c.getAtomicConfiguration());
+ txCfg = VisorTransactionConfiguration.from(c.getTransactionConfiguration());
+ qryCfg = VisorQueryConfiguration.from(c.getQueryConfiguration());
return this;
}
@@ -133,13 +133,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param basic New basic.
- */
- public void basic(VisorBasicConfiguration basic) {
- this.basic = basic;
- }
-
- /**
* @return Metrics.
*/
public VisorMetricsConfiguration metrics() {
@@ -147,13 +140,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param metrics New metrics.
- */
- public void metrics(VisorMetricsConfiguration metrics) {
- this.metrics = metrics;
- }
-
- /**
* @return SPIs.
*/
public VisorSpisConfiguration spis() {
@@ -161,13 +147,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param spis New SPIs.
- */
- public void spis(VisorSpisConfiguration spis) {
- this.spis = spis;
- }
-
- /**
* @return P2P.
*/
public VisorPeerToPeerConfiguration p2p() {
@@ -175,13 +154,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param p2P New p2p.
- */
- public void p2p(VisorPeerToPeerConfiguration p2P) {
- p2p = p2P;
- }
-
- /**
* @return Lifecycle.
*/
public VisorLifecycleConfiguration lifecycle() {
@@ -189,13 +161,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param lifecycle New lifecycle.
- */
- public void lifecycle(VisorLifecycleConfiguration lifecycle) {
- this.lifecycle = lifecycle;
- }
-
- /**
* @return Executors service configuration.
*/
public VisorExecutorServiceConfiguration executeService() {
@@ -203,13 +168,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param execSvc New executors service configuration.
- */
- public void executeService(VisorExecutorServiceConfiguration execSvc) {
- this.execSvc = execSvc;
- }
-
- /**
* @return Segmentation.
*/
public VisorSegmentationConfiguration segmentation() {
@@ -217,13 +175,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param seg New segmentation.
- */
- public void segmentation(VisorSegmentationConfiguration seg) {
- this.seg = seg;
- }
-
- /**
* @return Include properties.
*/
public String includeProperties() {
@@ -231,13 +182,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param inclProps New include properties.
- */
- public void includeProperties(String inclProps) {
- this.inclProps = inclProps;
- }
-
- /**
* @return Include events types.
*/
public int[] includeEventTypes() {
@@ -245,13 +189,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param inclEvtTypes New include events types.
- */
- public void includeEventTypes(int[] inclEvtTypes) {
- this.inclEvtTypes = inclEvtTypes;
- }
-
- /**
* @return Rest.
*/
public VisorRestConfiguration rest() {
@@ -259,13 +196,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param rest New rest.
- */
- public void rest(VisorRestConfiguration rest) {
- this.rest = rest;
- }
-
- /**
* @return User attributes.
*/
public Map<String, ?> userAttributes() {
@@ -273,13 +203,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param userAttrs New user attributes.
- */
- public void userAttributes(Map<String, ?> userAttrs) {
- this.userAttrs = userAttrs;
- }
-
- /**
* @return Caches.
*/
public Iterable<VisorCacheConfiguration> caches() {
@@ -287,13 +210,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param caches New caches.
- */
- public void caches(Iterable<VisorCacheConfiguration> caches) {
- this.caches = caches;
- }
-
- /**
* @return Igfss.
*/
public Iterable<VisorIgfsConfiguration> igfss() {
@@ -301,13 +217,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param igfss New igfss.
- */
- public void igfss(Iterable<VisorIgfsConfiguration> igfss) {
- this.igfss = igfss;
- }
-
- /**
* @return Streamers.
*/
public Iterable<VisorStreamerConfiguration> streamers() {
@@ -315,13 +224,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param streamers New streamers.
- */
- public void streamers(Iterable<VisorStreamerConfiguration> streamers) {
- this.streamers = streamers;
- }
-
- /**
* @return Environment.
*/
public Map<String, String> env() {
@@ -329,13 +231,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param env New environment.
- */
- public void env(Map<String, String> env) {
- this.env = env;
- }
-
- /**
* @return System properties.
*/
public Properties systemProperties() {
@@ -343,13 +238,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param sysProps New system properties.
- */
- public void systemProperties(Properties sysProps) {
- this.sysProps = sysProps;
- }
-
- /**
* @return Configuration of atomic data structures.
*/
public VisorAtomicConfiguration atomic() {
@@ -357,13 +245,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param atomic New configuration of atomic data structures.
- */
- public void atomic(VisorAtomicConfiguration atomic) {
- this.atomic = atomic;
- }
-
- /**
* @return Transactions configuration.
*/
public VisorTransactionConfiguration transaction() {
@@ -371,28 +252,14 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param txCfg New transactions configuration.
- */
- public void transaction(VisorTransactionConfiguration txCfg) {
- this.txCfg = txCfg;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorGridConfiguration.class, this);
- }
-
- /**
* @return Query configuration.
*/
public VisorQueryConfiguration queryConfiguration() {
return qryCfg;
}
- /**
- * @param qryCfg New query configuration.
- */
- public void queryConfiguration(VisorQueryConfiguration qryCfg) {
- this.qryCfg = qryCfg;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorGridConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/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 287de27..056ac7f 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
@@ -128,44 +128,44 @@ public class VisorIgfsConfiguration implements Serializable {
public static VisorIgfsConfiguration from(IgfsConfiguration igfs) {
VisorIgfsConfiguration cfg = new VisorIgfsConfiguration();
- cfg.name(igfs.getName());
- cfg.metaCacheName(igfs.getMetaCacheName());
- cfg.dataCacheName(igfs.getDataCacheName());
- cfg.blockSize(igfs.getBlockSize());
- cfg.prefetchBlocks(igfs.getPrefetchBlocks());
- cfg.streamBufferSize(igfs.getStreamBufferSize());
- cfg.perNodeBatchSize(igfs.getPerNodeBatchSize());
- cfg.perNodeParallelBatchCount(igfs.getPerNodeParallelBatchCount());
+ cfg.name = igfs.getName();
+ cfg.metaCacheName = igfs.getMetaCacheName();
+ cfg.dataCacheName = igfs.getDataCacheName();
+ cfg.blockSize = igfs.getBlockSize();
+ cfg.prefetchBlocks = igfs.getPrefetchBlocks();
+ cfg.streamBufSize = igfs.getStreamBufferSize();
+ cfg.perNodeBatchSize = igfs.getPerNodeBatchSize();
+ cfg.perNodeParallelBatchCnt = igfs.getPerNodeParallelBatchCount();
Igfs secFs = igfs.getSecondaryFileSystem();
if (secFs != null) {
Map<String, String> props = secFs.properties();
- cfg.secondaryHadoopFileSystemUri(props.get(SECONDARY_FS_URI));
- cfg.secondaryHadoopFileSystemConfigPath(props.get(SECONDARY_FS_CONFIG_PATH));
+ cfg.secondaryHadoopFileSysUri = props.get(SECONDARY_FS_URI);
+ cfg.secondaryHadoopFileSysCfgPath = props.get(SECONDARY_FS_CONFIG_PATH);
}
- cfg.defaultMode(igfs.getDefaultMode());
- cfg.pathModes(igfs.getPathModes());
- cfg.dualModePutExecutorService(compactClass(igfs.getDualModePutExecutorService()));
- cfg.dualModePutExecutorServiceShutdown(igfs.getDualModePutExecutorServiceShutdown());
- cfg.dualModeMaxPendingPutsSize(igfs.getDualModeMaxPendingPutsSize());
- cfg.maxTaskRangeLength(igfs.getMaximumTaskRangeLength());
- cfg.fragmentizerConcurrentFiles(igfs.getFragmentizerConcurrentFiles());
- cfg.fragmentizerLocalWritesRatio(igfs.getFragmentizerLocalWritesRatio());
- cfg.fragmentizerEnabled(igfs.isFragmentizerEnabled());
- cfg.fragmentizerThrottlingBlockLength(igfs.getFragmentizerThrottlingBlockLength());
- cfg.fragmentizerThrottlingDelay(igfs.getFragmentizerThrottlingDelay());
+ cfg.dfltMode = igfs.getDefaultMode();
+ cfg.pathModes = igfs.getPathModes();
+ cfg.dualModePutExecutorSrvc = compactClass(igfs.getDualModePutExecutorService());
+ cfg.dualModePutExecutorSrvcShutdown = igfs.getDualModePutExecutorServiceShutdown();
+ cfg.dualModeMaxPendingPutsSize = igfs.getDualModeMaxPendingPutsSize();
+ cfg.maxTaskRangeLen = igfs.getMaximumTaskRangeLength();
+ cfg.fragmentizerConcurrentFiles = igfs.getFragmentizerConcurrentFiles();
+ cfg.fragmentizerLocWritesRatio = igfs.getFragmentizerLocalWritesRatio();
+ cfg.fragmentizerEnabled = igfs.isFragmentizerEnabled();
+ cfg.fragmentizerThrottlingBlockLen = igfs.getFragmentizerThrottlingBlockLength();
+ cfg.fragmentizerThrottlingDelay = igfs.getFragmentizerThrottlingDelay();
Map<String, String> endpointCfg = igfs.getIpcEndpointConfiguration();
- cfg.ipcEndpointConfiguration(endpointCfg != null ? endpointCfg.toString() : null);
+ cfg.ipcEndpointCfg = endpointCfg != null ? endpointCfg.toString() : null;
- cfg.ipcEndpointEnabled(igfs.isIpcEndpointEnabled());
- cfg.maxSpace(igfs.getMaxSpaceSize());
- cfg.managementPort(igfs.getManagementPort());
- cfg.sequenceReadsBeforePrefetch(igfs.getSequentialReadsBeforePrefetch());
- cfg.trashPurgeTimeout(igfs.getTrashPurgeTimeout());
+ cfg.ipcEndpointEnabled = igfs.isIpcEndpointEnabled();
+ cfg.maxSpace = igfs.getMaxSpaceSize();
+ cfg.mgmtPort = igfs.getManagementPort();
+ cfg.seqReadsBeforePrefetch = igfs.getSequentialReadsBeforePrefetch();
+ cfg.trashPurgeTimeout = igfs.getTrashPurgeTimeout();
return cfg;
}
@@ -196,13 +196,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param name New IGFS instance name.
- */
- public void name(@Nullable String name) {
- this.name = name;
- }
-
- /**
* @return Cache name to store IGFS meta information.
*/
@Nullable public String metaCacheName() {
@@ -210,13 +203,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param metaCacheName New cache name to store IGFS meta information.
- */
- public void metaCacheName(@Nullable String metaCacheName) {
- this.metaCacheName = metaCacheName;
- }
-
- /**
* @return Cache name to store IGFS data.
*/
@Nullable public String dataCacheName() {
@@ -224,13 +210,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dataCacheName New cache name to store IGFS data.
- */
- public void dataCacheName(@Nullable String dataCacheName) {
- this.dataCacheName = dataCacheName;
- }
-
- /**
* @return File's data block size.
*/
public int blockSize() {
@@ -238,13 +217,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param blockSize New file's data block size.
- */
- public void blockSize(int blockSize) {
- this.blockSize = blockSize;
- }
-
- /**
* @return Number of pre-fetched blocks if specific file's chunk is requested.
*/
public int prefetchBlocks() {
@@ -252,13 +224,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param prefetchBlocks New number of pre-fetched blocks if specific file's chunk is requested.
- */
- public void prefetchBlocks(int prefetchBlocks) {
- this.prefetchBlocks = prefetchBlocks;
- }
-
- /**
* @return Read/write buffer size for IGFS stream operations in bytes.
*/
public int streamBufferSize() {
@@ -266,13 +231,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param streamBufSize New read/write buffer size for IGFS stream operations in bytes.
- */
- public void streamBufferSize(int streamBufSize) {
- this.streamBufSize = streamBufSize;
- }
-
- /**
* @return Number of file blocks buffered on local node before sending batch to remote node.
*/
public int perNodeBatchSize() {
@@ -280,13 +238,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param perNodeBatchSize New number of file blocks buffered on local node before sending batch to remote node.
- */
- public void perNodeBatchSize(int perNodeBatchSize) {
- this.perNodeBatchSize = perNodeBatchSize;
- }
-
- /**
* @return Number of batches that can be concurrently sent to remote node.
*/
public int perNodeParallelBatchCount() {
@@ -294,13 +245,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param perNodeParallelBatchCnt New number of batches that can be concurrently sent to remote node.
- */
- public void perNodeParallelBatchCount(int perNodeParallelBatchCnt) {
- this.perNodeParallelBatchCnt = perNodeParallelBatchCnt;
- }
-
- /**
* @return URI of the secondary Hadoop file system.
*/
@Nullable public String secondaryHadoopFileSystemUri() {
@@ -308,13 +252,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param secondaryHadoopFileSysUri New URI of the secondary Hadoop file system.
- */
- public void secondaryHadoopFileSystemUri(@Nullable String secondaryHadoopFileSysUri) {
- this.secondaryHadoopFileSysUri = secondaryHadoopFileSysUri;
- }
-
- /**
* @return Path for the secondary hadoop file system config.
*/
@Nullable public String secondaryHadoopFileSystemConfigPath() {
@@ -322,13 +259,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param secondaryHadoopFileSysCfgPath New path for the secondary hadoop file system config.
- */
- public void secondaryHadoopFileSystemConfigPath(@Nullable String secondaryHadoopFileSysCfgPath) {
- this.secondaryHadoopFileSysCfgPath = secondaryHadoopFileSysCfgPath;
- }
-
- /**
* @return IGFS instance mode.
*/
public IgfsMode defaultMode() {
@@ -336,13 +266,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dfltMode New IGFS instance mode.
- */
- public void defaultMode(IgfsMode dfltMode) {
- this.dfltMode = dfltMode;
- }
-
- /**
* @return Map of paths to IGFS modes.
*/
@Nullable public Map<String, IgfsMode> pathModes() {
@@ -350,13 +273,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param pathModes New map of paths to IGFS modes.
- */
- public void pathModes(@Nullable Map<String, IgfsMode> pathModes) {
- this.pathModes = pathModes;
- }
-
- /**
* @return Dual mode PUT operations executor service.
*/
public String dualModePutExecutorService() {
@@ -364,13 +280,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModePutExecutorSrvc New dual mode PUT operations executor service.
- */
- public void dualModePutExecutorService(String dualModePutExecutorSrvc) {
- this.dualModePutExecutorSrvc = dualModePutExecutorSrvc;
- }
-
- /**
* @return Dual mode PUT operations executor service shutdown flag.
*/
public boolean dualModePutExecutorServiceShutdown() {
@@ -378,13 +287,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModePutExecutorSrvcShutdown New dual mode PUT operations executor service shutdown flag.
- */
- public void dualModePutExecutorServiceShutdown(boolean dualModePutExecutorSrvcShutdown) {
- this.dualModePutExecutorSrvcShutdown = dualModePutExecutorSrvcShutdown;
- }
-
- /**
* @return Maximum amount of data in pending puts.
*/
public long dualModeMaxPendingPutsSize() {
@@ -392,13 +294,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModeMaxPendingPutsSize New maximum amount of data in pending puts.
- */
- public void dualModeMaxPendingPutsSize(long dualModeMaxPendingPutsSize) {
- this.dualModeMaxPendingPutsSize = dualModeMaxPendingPutsSize;
- }
-
- /**
* @return Maximum range length.
*/
public long maxTaskRangeLength() {
@@ -406,13 +301,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param maxTaskRangeLen New maximum range length.
- */
- public void maxTaskRangeLength(long maxTaskRangeLen) {
- this.maxTaskRangeLen = maxTaskRangeLen;
- }
-
- /**
* @return Fragmentizer concurrent files.
*/
public int fragmentizerConcurrentFiles() {
@@ -420,13 +308,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerConcurrentFiles New fragmentizer concurrent files.
- */
- public void fragmentizerConcurrentFiles(int fragmentizerConcurrentFiles) {
- this.fragmentizerConcurrentFiles = fragmentizerConcurrentFiles;
- }
-
- /**
* @return Fragmentizer local writes ratio.
*/
public float fragmentizerLocalWritesRatio() {
@@ -434,13 +315,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerLocWritesRatio New fragmentizer local writes ratio.
- */
- public void fragmentizerLocalWritesRatio(float fragmentizerLocWritesRatio) {
- this.fragmentizerLocWritesRatio = fragmentizerLocWritesRatio;
- }
-
- /**
* @return Fragmentizer enabled flag.
*/
public boolean fragmentizerEnabled() {
@@ -448,13 +322,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerEnabled New fragmentizer enabled flag.
- */
- public void fragmentizerEnabled(boolean fragmentizerEnabled) {
- this.fragmentizerEnabled = fragmentizerEnabled;
- }
-
- /**
* @return Fragmentizer throttling block length.
*/
public long fragmentizerThrottlingBlockLength() {
@@ -462,13 +329,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerThrottlingBlockLen New fragmentizer throttling block length.
- */
- public void fragmentizerThrottlingBlockLength(long fragmentizerThrottlingBlockLen) {
- this.fragmentizerThrottlingBlockLen = fragmentizerThrottlingBlockLen;
- }
-
- /**
* @return Fragmentizer throttling delay.
*/
public long fragmentizerThrottlingDelay() {
@@ -476,13 +336,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerThrottlingDelay New fragmentizer throttling delay.
- */
- public void fragmentizerThrottlingDelay(long fragmentizerThrottlingDelay) {
- this.fragmentizerThrottlingDelay = fragmentizerThrottlingDelay;
- }
-
- /**
* @return IPC endpoint config (in JSON format) to publish IGFS over.
*/
@Nullable public String ipcEndpointConfiguration() {
@@ -490,13 +343,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param ipcEndpointCfg New IPC endpoint config (in JSON format) to publish IGFS over.
- */
- public void ipcEndpointConfiguration(@Nullable String ipcEndpointCfg) {
- this.ipcEndpointCfg = ipcEndpointCfg;
- }
-
- /**
* @return IPC endpoint enabled flag.
*/
public boolean ipcEndpointEnabled() {
@@ -504,13 +350,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param ipcEndpointEnabled New iPC endpoint enabled flag.
- */
- public void ipcEndpointEnabled(boolean ipcEndpointEnabled) {
- this.ipcEndpointEnabled = ipcEndpointEnabled;
- }
-
- /**
* @return Maximum space.
*/
public long maxSpace() {
@@ -518,13 +357,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param maxSpace New maximum space.
- */
- public void maxSpace(long maxSpace) {
- this.maxSpace = maxSpace;
- }
-
- /**
* @return Management port.
*/
public int managementPort() {
@@ -532,13 +364,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param mgmtPort New management port.
- */
- public void managementPort(int mgmtPort) {
- this.mgmtPort = mgmtPort;
- }
-
- /**
* @return Amount of sequential block reads before prefetch is triggered.
*/
public int sequenceReadsBeforePrefetch() {
@@ -546,29 +371,14 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param seqReadsBeforePrefetch New amount of sequential block reads before prefetch is triggered.
- */
- public void sequenceReadsBeforePrefetch(int seqReadsBeforePrefetch) {
- this.seqReadsBeforePrefetch = seqReadsBeforePrefetch;
- }
-
- /**
* @return Trash purge await timeout.
*/
public long trashPurgeTimeout() {
return trashPurgeTimeout;
}
- /**
- * @param trashPurgeTimeout New trash purge await timeout.
- */
- public void trashPurgeTimeout(long trashPurgeTimeout) {
- this.trashPurgeTimeout = trashPurgeTimeout;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorIgfsConfiguration.class, this);
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
index 723fbee..3e0f9cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
@@ -42,7 +42,7 @@ public class VisorLifecycleConfiguration implements Serializable {
public static VisorLifecycleConfiguration from(IgniteConfiguration c) {
VisorLifecycleConfiguration cfg = new VisorLifecycleConfiguration();
- cfg.beans(compactArray(c.getLifecycleBeans()));
+ cfg.beans = compactArray(c.getLifecycleBeans());
return cfg;
}
@@ -54,13 +54,6 @@ public class VisorLifecycleConfiguration implements Serializable {
return beans;
}
- /**
- * @param beans New lifecycle beans.
- */
- public void beans(@Nullable String beans) {
- this.beans = beans;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorLifecycleConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
index 51dc092..e76adac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.node;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -44,9 +45,9 @@ public class VisorMetricsConfiguration implements Serializable {
public static VisorMetricsConfiguration from(IgniteConfiguration c) {
VisorMetricsConfiguration cfg = new VisorMetricsConfiguration();
- cfg.expireTime(c.getMetricsExpireTime());
- cfg.historySize(c.getMetricsHistorySize());
- cfg.loggerFrequency(c.getMetricsLogFrequency());
+ cfg.expTime = c.getMetricsExpireTime();
+ cfg.histSize = c.getMetricsHistorySize();
+ cfg.logFreq = c.getMetricsLogFrequency();
return cfg;
}
@@ -59,13 +60,6 @@ public class VisorMetricsConfiguration implements Serializable {
}
/**
- * @param expTime New metrics expire time.
- */
- public void expireTime(long expTime) {
- this.expTime = expTime;
- }
-
- /**
* @return Number of node metrics stored in memory.
*/
public int historySize() {
@@ -73,23 +67,14 @@ public class VisorMetricsConfiguration implements Serializable {
}
/**
- * @param histSize New number of node metrics stored in memory.
- */
- public void historySize(int histSize) {
- this.histSize = histSize;
- }
-
- /**
* @return Frequency of metrics log printout.
*/
public long loggerFrequency() {
return logFreq;
}
- /**
- * @param logFreq New frequency of metrics log printout.
- */
- public void loggerFrequency(long logFreq) {
- this.logFreq = logFreq;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorMetricsConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
index 7f0d050..5c4f8fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
@@ -48,9 +48,9 @@ public class VisorPeerToPeerConfiguration implements Serializable {
public static VisorPeerToPeerConfiguration from(IgniteConfiguration c) {
VisorPeerToPeerConfiguration cfg = new VisorPeerToPeerConfiguration();
- cfg.p2pEnabled(c.isPeerClassLoadingEnabled());
- cfg.p2pMissedResponseCacheSize(c.getPeerClassLoadingMissedResourcesCacheSize());
- cfg.p2pLocalClassPathExclude(compactArray(c.getPeerClassLoadingLocalClassPathExclude()));
+ cfg.p2pEnabled = c.isPeerClassLoadingEnabled();
+ cfg.p2pMissedResCacheSize = c.getPeerClassLoadingMissedResourcesCacheSize();
+ cfg.p2pLocClsPathExcl = compactArray(c.getPeerClassLoadingLocalClassPathExclude());
return cfg;
}
@@ -63,13 +63,6 @@ public class VisorPeerToPeerConfiguration implements Serializable {
}
/**
- * @param p2pEnabled New whether peer-to-peer class loading is enabled.
- */
- public void p2pEnabled(boolean p2pEnabled) {
- this.p2pEnabled = p2pEnabled;
- }
-
- /**
* @return Missed resource cache size.
*/
public int p2pMissedResponseCacheSize() {
@@ -77,27 +70,12 @@ public class VisorPeerToPeerConfiguration implements Serializable {
}
/**
- * @param p2pMissedResCacheSize New missed resource cache size.
- */
- public void p2pMissedResponseCacheSize(int p2pMissedResCacheSize) {
- this.p2pMissedResCacheSize = p2pMissedResCacheSize;
- }
-
- /**
* @return List of packages from the system classpath that need to be loaded from task originating node.
*/
@Nullable public String p2pLocalClassPathExclude() {
return p2pLocClsPathExcl;
}
- /**
- * @param p2pLocClsPathExcl New list of packages from the system classpath that need to be loaded from task
- * originating node.
- */
- public void p2pLocalClassPathExclude(@Nullable String p2pLocClsPathExcl) {
- this.p2pLocClsPathExcl = p2pLocClsPathExcl;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorPeerToPeerConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
index a2599ab..de5e0b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
@@ -70,13 +70,13 @@ public class VisorQueryConfiguration implements Serializable {
for (int i = 0; i < sz; i++)
strClss[i] = U.compact(clss[i].getName());
- c.indexCustomFunctionClasses(strClss);
- c.searchPath(qcfg.getSearchPath());
- c.initialScriptPath(qcfg.getInitialScriptPath());
- c.maxOffHeapMemory(qcfg.getMaxOffHeapMemory());
- c.longQueryExecutionTimeout(qcfg.getLongQueryExecutionTimeout());
- c.longQueryExplain(qcfg.isLongQueryExplain());
- c.useOptimizedSerializer(qcfg.isUseOptimizedSerializer());
+ c.idxCustomFuncClss = strClss;
+ c.searchPath = qcfg.getSearchPath();
+ c.initScriptPath = qcfg.getInitialScriptPath();
+ c.maxOffHeapMemory = qcfg.getMaxOffHeapMemory();
+ c.longQryExecTimeout = qcfg.getLongQueryExecutionTimeout();
+ c.longQryExplain = qcfg.isLongQueryExplain();
+ c.useOptimizedSerializer = qcfg.isUseOptimizedSerializer();
}
return c;
@@ -90,13 +90,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param idxCustomFuncClss Classes with methods annotated by {@link QuerySqlFunction}.
- */
- public void indexCustomFunctionClasses(String[] idxCustomFuncClss) {
- this.idxCustomFuncClss = idxCustomFuncClss;
- }
-
- /**
* @return Optional search path consisting of space names to search SQL schema objects.
*/
public String[] searchPath() {
@@ -104,13 +97,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param searchPath Optional search path consisting of space names to search SQL schema objects.
- */
- public void searchPath(String[] searchPath) {
- this.searchPath = searchPath;
- }
-
- /**
* @return Script path to be ran against H2 database after opening.
*/
public String initialScriptPath() {
@@ -118,13 +104,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param initScriptPath Script path to be ran against H2 database after opening.
- */
- public void initialScriptPath(String initScriptPath) {
- this.initScriptPath = initScriptPath;
- }
-
- /**
* @return Maximum amount of memory available to off-heap storage.
*/
public long maxOffHeapMemory() {
@@ -132,13 +111,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param maxOffHeapMemory Maximum amount of memory available to off-heap storage.
- */
- public void maxOffHeapMemory(long maxOffHeapMemory) {
- this.maxOffHeapMemory = maxOffHeapMemory;
- }
-
- /**
* @return Query execution time threshold.
*/
public long longQueryExecutionTimeout() {
@@ -146,13 +118,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param longQryExecTimeout Query execution time threshold.
- */
- public void longQueryExecutionTimeout(long longQryExecTimeout) {
- this.longQryExecTimeout = longQryExecTimeout;
- }
-
- /**
* @return If {@code true}, SPI will print SQL execution plan for long queries.
*/
public boolean longQryExplain() {
@@ -160,24 +125,14 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param longQryExplain If {@code true}, SPI will print SQL execution plan for long queries.
- */
- public void longQueryExplain(boolean longQryExplain) {
- this.longQryExplain = longQryExplain;
- }
-
- /**
* @return The flag indicating that serializer for H2 database will be set to Ignite's marshaller.
*/
public boolean useOptimizedSerializer() {
return useOptimizedSerializer;
}
- /**
- * @param useOptimizedSerializer The flag indicating that serializer for H2 database will be set to Ignite's
- * marshaller.
- */
- public void useOptimizedSerializer(boolean useOptimizedSerializer) {
- this.useOptimizedSerializer = useOptimizedSerializer;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorQueryConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
index 1bdb7b7..f279253 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
@@ -72,16 +72,16 @@ public class VisorRestConfiguration implements Serializable {
boolean restEnabled = clnCfg != null;
- cfg.restEnabled(restEnabled);
+ cfg.restEnabled = restEnabled;
if (restEnabled) {
- cfg.tcpSslEnabled(clnCfg.isSslEnabled());
- cfg.jettyPath(clnCfg.getJettyPath());
- cfg.jettyHost(getProperty(IGNITE_JETTY_HOST));
- cfg.jettyPort(intValue(IGNITE_JETTY_PORT, null));
- cfg.tcpHost(clnCfg.getHost());
- cfg.tcpPort(clnCfg.getPort());
- cfg.tcpSslContextFactory(compactClass(clnCfg.getSslContextFactory()));
+ cfg.tcpSslEnabled = clnCfg.isSslEnabled();
+ cfg.jettyPath = clnCfg.getJettyPath();
+ cfg.jettyHost = getProperty(IGNITE_JETTY_HOST);
+ cfg.jettyPort = intValue(IGNITE_JETTY_PORT, null);
+ cfg.tcpHost = clnCfg.getHost();
+ cfg.tcpPort = clnCfg.getPort();
+ cfg.tcpSslCtxFactory = compactClass(clnCfg.getSslContextFactory());
}
return cfg;
@@ -93,14 +93,6 @@ public class VisorRestConfiguration implements Serializable {
public boolean restEnabled() {
return restEnabled;
}
-
- /**
- * @param restEnabled New whether REST enabled or not.
- */
- public void restEnabled(boolean restEnabled) {
- this.restEnabled = restEnabled;
- }
-
/**
* @return Whether or not SSL is enabled for TCP binary protocol.
*/
@@ -109,13 +101,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpSslEnabled New whether or not SSL is enabled for TCP binary protocol.
- */
- public void tcpSslEnabled(boolean tcpSslEnabled) {
- this.tcpSslEnabled = tcpSslEnabled;
- }
-
- /**
* @return Rest accessible folders (log command can get files from).
*/
@Nullable public String[] accessibleFolders() {
@@ -123,13 +108,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param accessibleFolders New rest accessible folders (log command can get files from).
- */
- public void accessibleFolders(String[] accessibleFolders) {
- this.accessibleFolders = accessibleFolders;
- }
-
- /**
* @return Jetty config path.
*/
@Nullable public String jettyPath() {
@@ -137,13 +115,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyPath New jetty config path.
- */
- public void jettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
* @return Jetty host.
*/
@Nullable public String jettyHost() {
@@ -151,13 +122,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyHost New jetty host.
- */
- public void jettyHost(String jettyHost) {
- this.jettyHost = jettyHost;
- }
-
- /**
* @return Jetty port.
*/
@Nullable public Integer jettyPort() {
@@ -165,13 +129,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyPort New jetty port.
- */
- public void jettyPort(Integer jettyPort) {
- this.jettyPort = jettyPort;
- }
-
- /**
* @return REST TCP binary host.
*/
@Nullable public String tcpHost() {
@@ -179,13 +136,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpHost New rEST TCP binary host.
- */
- public void tcpHost(String tcpHost) {
- this.tcpHost = tcpHost;
- }
-
- /**
* @return REST TCP binary port.
*/
@Nullable public Integer tcpPort() {
@@ -193,26 +143,12 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpPort New rEST TCP binary port.
- */
- public void tcpPort(Integer tcpPort) {
- this.tcpPort = tcpPort;
- }
-
- /**
* @return Context factory for SSL.
*/
@Nullable public String tcpSslContextFactory() {
return tcpSslCtxFactory;
}
- /**
- * @param tcpSslCtxFactory New context factory for SSL.
- */
- public void tcpSslContextFactory(String tcpSslCtxFactory) {
- this.tcpSslCtxFactory = tcpSslCtxFactory;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorRestConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
index 547e1c6..d712774 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
@@ -55,11 +55,11 @@ public class VisorSegmentationConfiguration implements Serializable {
public static VisorSegmentationConfiguration from(IgniteConfiguration c) {
VisorSegmentationConfiguration cfg = new VisorSegmentationConfiguration();
- cfg.policy(c.getSegmentationPolicy());
- cfg.resolvers(compactArray(c.getSegmentationResolvers()));
- cfg.checkFrequency(c.getSegmentCheckFrequency());
- cfg.waitOnStart(c.isWaitForSegmentOnStart());
- cfg.passRequired(c.isAllSegmentationResolversPassRequired());
+ cfg.plc = c.getSegmentationPolicy();
+ cfg.resolvers = compactArray(c.getSegmentationResolvers());
+ cfg.checkFreq = c.getSegmentCheckFrequency();
+ cfg.waitOnStart = c.isWaitForSegmentOnStart();
+ cfg.passRequired = c.isAllSegmentationResolversPassRequired();
return cfg;
}
@@ -72,13 +72,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param plc New segmentation policy.
- */
- public void policy(GridSegmentationPolicy plc) {
- this.plc = plc;
- }
-
- /**
* @return Segmentation resolvers.
*/
@Nullable public String resolvers() {
@@ -86,13 +79,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param resolvers New segmentation resolvers.
- */
- public void resolvers(@Nullable String resolvers) {
- this.resolvers = resolvers;
- }
-
- /**
* @return Frequency of network segment check by discovery manager.
*/
public long checkFrequency() {
@@ -100,13 +86,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param checkFreq New frequency of network segment check by discovery manager.
- */
- public void checkFrequency(long checkFreq) {
- this.checkFreq = checkFreq;
- }
-
- /**
* @return Whether or not node should wait for correct segment on start.
*/
public boolean waitOnStart() {
@@ -114,26 +93,12 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param waitOnStart New whether or not node should wait for correct segment on start.
- */
- public void waitOnStart(boolean waitOnStart) {
- this.waitOnStart = waitOnStart;
- }
-
- /**
* @return Whether or not all resolvers should succeed for node to be in correct segment.
*/
public boolean passRequired() {
return passRequired;
}
- /**
- * @param passRequired New whether or not all resolvers should succeed for node to be in correct segment.
- */
- public void passRequired(boolean passRequired) {
- this.passRequired = passRequired;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorSegmentationConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 6833393..4afb90f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.node;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.*;
@@ -141,16 +142,16 @@ public class VisorSpisConfiguration implements Serializable {
public static VisorSpisConfiguration from(IgniteConfiguration c) {
VisorSpisConfiguration cfg = new VisorSpisConfiguration();
- cfg.discoverySpi(collectSpiInfo(c.getDiscoverySpi()));
- cfg.communicationSpi(collectSpiInfo(c.getCommunicationSpi()));
- cfg.eventStorageSpi(collectSpiInfo(c.getEventStorageSpi()));
- cfg.collisionSpi(collectSpiInfo(c.getCollisionSpi()));
- cfg.deploymentSpi(collectSpiInfo(c.getDeploymentSpi()));
- cfg.checkpointSpis(collectSpiInfo(c.getCheckpointSpi()));
- cfg.failoverSpis(collectSpiInfo(c.getFailoverSpi()));
- cfg.loadBalancingSpis(collectSpiInfo(c.getLoadBalancingSpi()));
- cfg.swapSpaceSpi(collectSpiInfo(c.getSwapSpaceSpi()));
- cfg.indexingSpis(collectSpiInfo(c.getIndexingSpi()));
+ cfg.discoSpi = collectSpiInfo(c.getDiscoverySpi());
+ cfg.commSpi = collectSpiInfo(c.getCommunicationSpi());
+ cfg.evtSpi = collectSpiInfo(c.getEventStorageSpi());
+ cfg.colSpi = collectSpiInfo(c.getCollisionSpi());
+ cfg.deploySpi = collectSpiInfo(c.getDeploymentSpi());
+ cfg.cpSpis = collectSpiInfo(c.getCheckpointSpi());
+ cfg.failSpis = collectSpiInfo(c.getFailoverSpi());
+ cfg.loadBalancingSpis = collectSpiInfo(c.getLoadBalancingSpi());
+ cfg.swapSpaceSpis = collectSpiInfo(c.getSwapSpaceSpi());
+ cfg.indexingSpis = F.asArray(collectSpiInfo(c.getIndexingSpi()));
return cfg;
}
@@ -163,13 +164,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param discoSpi New discovery SPI.
- */
- public void discoverySpi(IgniteBiTuple<String, Map<String, Object>> discoSpi) {
- this.discoSpi = discoSpi;
- }
-
- /**
* @return Communication SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> communicationSpi() {
@@ -177,13 +171,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param commSpi New communication SPI.
- */
- public void communicationSpi(IgniteBiTuple<String, Map<String, Object>> commSpi) {
- this.commSpi = commSpi;
- }
-
- /**
* @return Event storage SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> eventStorageSpi() {
@@ -191,13 +178,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param evtSpi New event storage SPI.
- */
- public void eventStorageSpi(IgniteBiTuple<String, Map<String, Object>> evtSpi) {
- this.evtSpi = evtSpi;
- }
-
- /**
* @return Collision SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> collisionSpi() {
@@ -205,13 +185,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param colSpi New collision SPI.
- */
- public void collisionSpi(IgniteBiTuple<String, Map<String, Object>> colSpi) {
- this.colSpi = colSpi;
- }
-
- /**
* @return Deployment SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> deploymentSpi() {
@@ -219,13 +192,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param deploySpi New deployment SPI.
- */
- public void deploymentSpi(IgniteBiTuple<String, Map<String, Object>> deploySpi) {
- this.deploySpi = deploySpi;
- }
-
- /**
* @return Checkpoint SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] checkpointSpis() {
@@ -233,13 +199,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param cpSpis New checkpoint SPIs.
- */
- public void checkpointSpis(IgniteBiTuple<String, Map<String, Object>>[] cpSpis) {
- this.cpSpis = cpSpis;
- }
-
- /**
* @return Failover SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] failoverSpis() {
@@ -247,13 +206,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param failSpis New failover SPIs.
- */
- public void failoverSpis(IgniteBiTuple<String, Map<String, Object>>[] failSpis) {
- this.failSpis = failSpis;
- }
-
- /**
* @return Load balancing SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] loadBalancingSpis() {
@@ -261,13 +213,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param loadBalancingSpis New load balancing SPIs.
- */
- public void loadBalancingSpis(IgniteBiTuple<String, Map<String, Object>>[] loadBalancingSpis) {
- this.loadBalancingSpis = loadBalancingSpis;
- }
-
- /**
* @return Swap space SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>> swapSpaceSpi() {
@@ -275,27 +220,12 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param swapSpaceSpis New swap space SPIs.
- */
- public void swapSpaceSpi(IgniteBiTuple<String, Map<String, Object>> swapSpaceSpis) {
- this.swapSpaceSpis = swapSpaceSpis;
- }
-
- /**
* @return Indexing SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] indexingSpis() {
return indexingSpis;
}
- /**
- * @param indexingSpis New indexing SPIs.
- */
- @SafeVarargs
- public final void indexingSpis(IgniteBiTuple<String, Map<String, Object>>... indexingSpis) {
- this.indexingSpis = indexingSpis;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorSpisConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
index 597336b..667ff51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
@@ -3,7 +3,7 @@
* 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 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
@@ -31,10 +31,10 @@ public class VisorTransactionConfiguration implements Serializable {
private static final long serialVersionUID = 0L;
/** Default cache concurrency. */
- private TransactionConcurrency dfltConcurrency;
+ private TransactionConcurrency dfltTxConcurrency;
/** Default transaction isolation. */
- private TransactionIsolation dfltIsolation;
+ private TransactionIsolation dfltTxIsolation;
/** Default transaction timeout. */
private long dfltTxTimeout;
@@ -57,12 +57,12 @@ public class VisorTransactionConfiguration implements Serializable {
public static VisorTransactionConfiguration from(TransactionConfiguration src) {
VisorTransactionConfiguration cfg = new VisorTransactionConfiguration();
- cfg.defaultTxConcurrency(src.getDefaultTxConcurrency());
- cfg.defaultTxIsolation(src.getDefaultTxIsolation());
- cfg.defaultTxTimeout(src.getDefaultTxTimeout());
- cfg.pessimisticTxLogLinger(src.getPessimisticTxLogLinger());
- cfg.pessimisticTxLogSize(src.getPessimisticTxLogSize());
- cfg.txSerializableEnabled(src.isTxSerializableEnabled());
+ cfg.dfltTxConcurrency = src.getDefaultTxConcurrency();
+ cfg.dfltTxIsolation = src.getDefaultTxIsolation();
+ cfg.dfltTxTimeout = src.getDefaultTxTimeout();
+ cfg.pessimisticTxLogLinger = src.getPessimisticTxLogLinger();
+ cfg.pessimisticTxLogSize = src.getPessimisticTxLogSize();
+ cfg.txSerEnabled = src.isTxSerializableEnabled();
return cfg;
}
@@ -71,28 +71,14 @@ public class VisorTransactionConfiguration implements Serializable {
* @return Default cache transaction concurrency.
*/
public TransactionConcurrency defaultTxConcurrency() {
- return dfltConcurrency;
- }
-
- /**
- * @param dfltConcurrency Default cache transaction concurrency.
- */
- public void defaultTxConcurrency(TransactionConcurrency dfltConcurrency) {
- this.dfltConcurrency = dfltConcurrency;
+ return dfltTxConcurrency;
}
/**
* @return Default cache transaction isolation.
*/
public TransactionIsolation defaultTxIsolation() {
- return dfltIsolation;
- }
-
- /**
- * @param dfltIsolation Default cache transaction isolation.
- */
- public void defaultTxIsolation(TransactionIsolation dfltIsolation) {
- this.dfltIsolation = dfltIsolation;
+ return dfltTxIsolation;
}
/**
@@ -103,13 +89,6 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param dfltTxTimeout Default transaction timeout.
- */
- public void defaultTxTimeout(long dfltTxTimeout) {
- this.dfltTxTimeout = dfltTxTimeout;
- }
-
- /**
* @return Pessimistic log cleanup delay in milliseconds.
*/
public int pessimisticTxLogLinger() {
@@ -117,13 +96,6 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param pessimisticTxLogLinger Pessimistic log cleanup delay.
- */
- public void pessimisticTxLogLinger(int pessimisticTxLogLinger) {
- this.pessimisticTxLogLinger = pessimisticTxLogLinger;
- }
-
- /**
* @return Pessimistic transaction log size.
*/
public int getPessimisticTxLogSize() {
@@ -131,26 +103,12 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param pessimisticTxLogSize Pessimistic transactions log size.
- */
- public void pessimisticTxLogSize(int pessimisticTxLogSize) {
- this.pessimisticTxLogSize = pessimisticTxLogSize;
- }
-
- /**
* @return {@code True} if serializable transactions are enabled, {@code false} otherwise.
*/
public boolean txSerializableEnabled() {
return txSerEnabled;
}
- /**
- * @param txSerEnabled Flag to enable/disable serializable cache transactions.
- */
- public void txSerializableEnabled(boolean txSerEnabled) {
- this.txSerEnabled = txSerEnabled;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorTransactionConfiguration.class, this);
[48/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by ak...@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/3be22ab1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3be22ab1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3be22ab1
Branch: refs/heads/ignite-368
Commit: 3be22ab1f4d9e9096b5600cf8728b19800760ccc
Parents: ea6a1c0 0086e9c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 16:00:38 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 16:00:38 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCache.java | 190 ++------
.../cache/VisorCacheAffinityConfiguration.java | 53 +-
.../visor/cache/VisorCacheConfiguration.java | 484 ++++---------------
.../cache/VisorCacheDefaultConfiguration.java | 27 +-
.../cache/VisorCacheEvictionConfiguration.java | 81 +---
.../cache/VisorCacheNearConfiguration.java | 42 +-
.../cache/VisorCachePreloadConfiguration.java | 54 +--
.../cache/VisorCacheStoreConfiguration.java | 148 +++++-
.../VisorCacheWriteBehindConfiguration.java | 137 ------
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 180 +------
.../node/VisorCacheQueryConfiguration.java | 45 +-
.../node/VisorExecutorServiceConfiguration.java | 54 +--
.../visor/node/VisorGridConfiguration.java | 177 +------
.../visor/node/VisorIgfsConfiguration.java | 244 ++--------
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +-
.../node/VisorPeerToPeerConfiguration.java | 28 +-
.../visor/node/VisorQueryConfiguration.java | 65 +--
.../visor/node/VisorRestConfiguration.java | 80 +--
.../node/VisorSegmentationConfiguration.java | 45 +-
.../visor/node/VisorSpisConfiguration.java | 92 +---
.../node/VisorTransactionConfiguration.java | 62 +--
.../internal/visor/util/VisorTaskUtils.java | 4 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 63 ++-
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 +-
.../ignite/schema/generator/XmlGenerator.java | 8 +-
.../apache/ignite/schema/model/PojoField.java | 11 +-
.../apache/ignite/schema/load/model/Ignite.xml | 133 +++--
.../commands/cache/VisorCacheCommand.scala | 25 +-
.../yardstick/config/ignite-store-config.xml | 15 +-
31 files changed, 606 insertions(+), 2044 deletions(-)
----------------------------------------------------------------------
[37/50] [abbrv] incubator-ignite git commit: # sprint-2 - exception
fix.
Posted by ak...@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-368
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;
}
}
[31/50] [abbrv] incubator-ignite git commit: review ignite-311
Posted by ak...@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-368
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);
[49/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-368' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368
Posted by ak...@apache.org.
Merge branches 'ignite-368' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aad668c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aad668c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aad668c6
Branch: refs/heads/ignite-368
Commit: aad668c67a1919f4a634ef478585a0a24e60cbfb
Parents: c6be5f2 3be22ab
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 20:19:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 20:19:02 2015 +0700
----------------------------------------------------------------------
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 +-
.../ignite/internal/GridKernalContext.java | 10 +-
.../ignite/internal/GridKernalContextImpl.java | 14 +-
.../apache/ignite/internal/GridProperties.java | 78 -
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 41 +-
.../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 +-
.../processors/cluster/ClusterProcessor.java | 46 +
.../plugin/IgnitePluginProcessor.java | 24 +
.../ignite/internal/util/IgniteUtils.java | 90 +-
.../ignite/internal/visor/cache/VisorCache.java | 190 +--
.../cache/VisorCacheAffinityConfiguration.java | 53 +-
.../visor/cache/VisorCacheConfiguration.java | 484 +-----
.../cache/VisorCacheDefaultConfiguration.java | 27 +-
.../cache/VisorCacheEvictionConfiguration.java | 81 +-
.../cache/VisorCacheNearConfiguration.java | 42 +-
.../cache/VisorCachePreloadConfiguration.java | 54 +-
.../cache/VisorCacheStoreConfiguration.java | 148 +-
.../VisorCacheWriteBehindConfiguration.java | 137 --
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 197 +--
.../node/VisorCacheQueryConfiguration.java | 45 +-
.../node/VisorExecutorServiceConfiguration.java | 54 +-
.../visor/node/VisorGridConfiguration.java | 177 +-
.../visor/node/VisorIgfsConfiguration.java | 244 +--
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +-
.../node/VisorPeerToPeerConfiguration.java | 28 +-
.../visor/node/VisorQueryConfiguration.java | 65 +-
.../visor/node/VisorRestConfiguration.java | 80 +-
.../node/VisorSegmentationConfiguration.java | 45 +-
.../visor/node/VisorSpisConfiguration.java | 92 +-
.../node/VisorTransactionConfiguration.java | 62 +-
.../internal/visor/util/VisorTaskUtils.java | 4 +-
.../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 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 +-
...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 | 99 +-
.../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 +-
123 files changed, 2280 insertions(+), 4620 deletions(-)
----------------------------------------------------------------------
[16/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2'
into ignite-325
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[28/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/sprint-2' into ignite-311
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[05/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2'
into ignite-322
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[39/50] [abbrv] incubator-ignite git commit: sprint-2 - Added
isWithinTransaction() method to session.
Posted by ak...@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-368
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();
[27/50] [abbrv] incubator-ignite git commit: #ignite-343: change
Log4JFileAppender to Log4jRollingFileAppender.
Posted by ak...@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-368
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>
[43/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 ak...@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-368
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(-)
----------------------------------------------------------------------
[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[10/50] [abbrv] incubator-ignite git commit: # IGNITE-348: Applied
patch from Ivan V..
Posted by ak...@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-368
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.*;
[17/50] [abbrv] incubator-ignite git commit: # IGNITE-147: Applied
intermediate patch with minor changes from Ivan V..
Posted by ak...@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-368
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() {
[09/50] [abbrv] incubator-ignite git commit: # Merge sprint-2 into
ignite-339
Posted by ak...@apache.org.
# Merge sprint-2 into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/555e3f94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/555e3f94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/555e3f94
Branch: refs/heads/ignite-368
Commit: 555e3f9455dc82a011943a561c0aa6405cca82bc
Parents: 53141e5 4e7463d
Author: anovikov <an...@gridgain.com>
Authored: Fri Feb 27 17:21:33 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Fri Feb 27 17:21:33 2015 +0700
----------------------------------------------------------------------
.../visor/node/VisorBasicConfiguration.java | 17 ---
.../commands/alert/VisorAlertCommand.scala | 8 +-
.../commands/cache/VisorCacheCommand.scala | 95 +++++++------
.../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, 178 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/555e3f94/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 97adeac,5dd19b1..577067a
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@@ -776,6 -775,8 +775,7 @@@ object VisorCacheCommand
val evictCfg = cfg.evictConfiguration()
val defaultCfg = cfg.defaultConfiguration()
val storeCfg = cfg.storeConfiguration()
- val writeBehind = cfg.writeBehind()
+ val queryCfg = cfg.queryConfiguration()
val cacheT = VisorTextTable()
@@@ -789,19 -792,21 +791,19 @@@
cacheT += ("Time To Live", defaultCfg.timeToLive())
cacheT += ("Time To Live Eager Flag", cfg.eagerTtl)
- cacheT += ("Write Synchronization Mode", cfg.writeSynchronizationMode)
- cacheT += ("Swap Enabled", cfg.swapEnabled())
- cacheT += ("Invalidate", cfg.invalidate())
+ cacheT += ("Write Synchronization Mode", safe(cfg.writeSynchronizationMode))
+ cacheT += ("Swap Enabled", bool2Str(cfg.swapEnabled()))
+ cacheT += ("Invalidate", bool2Str(cfg.invalidate()))
- cacheT += ("Read Through", bool2Str(cfg.readThrough()))
- cacheT += ("Write Through", bool2Str(cfg.writeThrough()))
cacheT += ("Start Size", cfg.startSize())
- cacheT += ("Transaction Manager Lookup", cfg.transactionManagerLookupClassName())
+ cacheT += ("Transaction Manager Lookup", safe(cfg.transactionManagerLookupClassName()))
- cacheT += ("Affinity Function", affinityCfg.function())
+ cacheT += ("Affinity Function", safe(affinityCfg.function()))
cacheT += ("Affinity Backups", affinityCfg.partitionedBackups())
- cacheT += ("Affinity Partitions", affinityCfg.partitions())
- cacheT += ("Affinity Default Replicas", affinityCfg.defaultReplicas())
- cacheT += ("Affinity Exclude Neighbors", affinityCfg.excludeNeighbors())
- cacheT += ("Affinity Mapper", affinityCfg.mapper())
+ cacheT += ("Affinity Partitions", safe(affinityCfg.partitions()))
+ cacheT += ("Affinity Default Replicas", safe(affinityCfg.defaultReplicas()))
+ cacheT += ("Affinity Exclude Neighbors", safe(affinityCfg.excludeNeighbors()))
+ cacheT += ("Affinity Mapper", safe(affinityCfg.mapper()))
cacheT += ("Preload Mode", preloadCfg.mode())
cacheT += ("Preload Batch Size", preloadCfg.batchSize())
@@@ -830,30 -835,41 +832,45 @@@
cacheT += ("Default Lock Timeout", defaultCfg.txLockTimeout())
cacheT += ("Default Query Timeout", defaultCfg.queryTimeout())
- cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled())
+ cacheT += ("Query Indexing Enabled", bool2Str(cfg.queryIndexEnabled()))
cacheT += ("Query Iterators Number", cfg.maxQueryIteratorCount())
- cacheT += ("Indexing SPI Name", cfg.indexingSpiName())
- cacheT += ("Cache Interceptor", cfg.interceptor())
+ cacheT += ("Metadata type count", cfg.typeMeta().size())
+ cacheT += ("Indexing SPI Name", safe(cfg.indexingSpiName()))
+ cacheT += ("Cache Interceptor", safe(cfg.interceptor()))
+
+ cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
+ cacheT += ("Store", safe(storeCfg.store()))
- cacheT += ("Store Values In Bytes", storeCfg.valueBytes())
- cacheT += ("Configured JDBC Store", bool2Str(cfg.jdbcStore()))
++ cacheT += ("Configured JDBC Store", bool2Str(storeCfg.jdbcStore()))
+
- cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
++ cacheT += ("Read Through", bool2Str(storeCfg.readThrough()))
++ cacheT += ("Write Through", bool2Str(storeCfg.writeThrough()))
+
- cacheT += ("Write-Behind Enabled", bool2Str(writeBehind.enabled()))
- cacheT += ("Write-Behind Flush Size", writeBehind.flushSize())
- cacheT += ("Write-Behind Frequency", writeBehind.flushFrequency())
- cacheT += ("Write-Behind Flush Threads Count", writeBehind.flushThreadCount())
- cacheT += ("Write-Behind Batch Size", writeBehind.batchSize())
++ cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.enabled()))
++ cacheT += ("Write-Behind Flush Size", storeCfg.flushSize())
++ cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency())
++ cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount())
++ cacheT += ("Write-Behind Batch Size", storeCfg.batchSize())
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
+ cacheT += ("Store Values In Bytes", cfg.valueBytes())
+
+ cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
+
- cacheT += ("Store Enabled", storeCfg.enabled())
- cacheT += ("Store", storeCfg.store())
- cacheT += ("Store Factory", storeCfg.storeFactory())
-
- cacheT += ("Store Read-Through", storeCfg.readThrough())
- cacheT += ("Store Write-Through", storeCfg.writeThrough())
+ cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
+ cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory()))
+ cacheT += ("Expiry Policy Factory Class Name", safe(cfg.expiryPolicyFactory()))
- cacheT += ("Write-Behind Enabled", storeCfg.writeBehindEnabled())
- cacheT += ("Write-Behind Flush Size", storeCfg.flushSize())
- cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency())
- cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount())
- cacheT += ("Write-Behind Batch Size", storeCfg.batchSize())
+ if (queryCfg != null) {
+ cacheT +=("Query Type Resolver", safe(queryCfg.typeResolver()))
+ cacheT +=("Query Indexing Primitive Key", bool2Str(queryCfg.indexPrimitiveKey()))
+ cacheT +=("Query Indexing Primitive Value", bool2Str(queryCfg.indexPrimitiveValue()))
+ cacheT +=("Query Fixed Typing", bool2Str(queryCfg.indexFixedTyping()))
+ cacheT +=("Query Escaped Names", bool2Str(queryCfg.escapeAll()))
+ }
+ else
+ cacheT += ("Query Configuration", NA)
println(title)
[06/50] [abbrv] incubator-ignite git commit: # IGNITE-298 special
care for '-1' value.
Posted by ak...@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-368
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()))
[40/50] [abbrv] incubator-ignite git commit: # sprint-2 - fixing
comments.
Posted by ak...@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-368
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());
[38/50] [abbrv] incubator-ignite git commit: IGNITE-377 Rework schema
load XML generator to generate instead of int number.
Posted by ak...@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-368
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>
[35/50] [abbrv] incubator-ignite git commit: # sprint-2 - Fixed
warning in example.
Posted by ak...@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-368
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);
[45/50] [abbrv] incubator-ignite git commit: # IGNITE-339 Review.
Posted by ak...@apache.org.
# IGNITE-339 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/c847e885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c847e885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c847e885
Branch: refs/heads/ignite-368
Commit: c847e88513d47925a03e84faf8739b6e7b012755
Parents: 60e0ecb
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Mar 2 16:44:13 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Mar 2 16:44:13 2015 +0700
----------------------------------------------------------------------
.../internal/visor/cache/VisorCacheConfiguration.java | 10 ----------
.../visor/commands/cache/VisorCacheCommand.scala | 14 +++++---------
2 files changed, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c847e885/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 2ad0e49..a6ec05c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -48,9 +48,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Cache atomicity mode */
private CacheAtomicityMode atomicityMode;
- /** Cache atomic sequence reserve size */
- private int atomicSeqReserveSize;
-
/** Cache atomicity write ordering mode. */
private CacheAtomicWriteOrderMode atomicWriteOrderMode;
@@ -226,13 +223,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Cache atomic sequence reserve size
- */
- public int atomicSequenceReserveSize() {
- return atomicSeqReserveSize;
- }
-
- /**
* @return Cache atomicity write ordering mode.
*/
public CacheAtomicWriteOrderMode atomicWriteOrderMode() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c847e885/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 7232221..e2ca05b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -783,7 +783,6 @@ object VisorCacheCommand {
cacheT += ("Mode", cfg.mode)
cacheT += ("Atomicity Mode", safe(cfg.atomicityMode))
- cacheT += ("Atomic Sequence Reserve Size", cfg.atomicSequenceReserveSize)
cacheT += ("Atomic Write Ordering Mode", safe(cfg.atomicWriteOrderMode))
cacheT += ("Statistic Enabled", bool2Str(cfg.statisticsEnabled()))
cacheT += ("Management Enabled", bool2Str(cfg.managementEnabled()))
@@ -839,11 +838,10 @@ object VisorCacheCommand {
cacheT += ("Cache Interceptor", safe(cfg.interceptor()))
cacheT += ("Store Enabled", bool2Str(storeCfg.enabled()))
- cacheT += ("Store", safe(storeCfg.store()))
- cacheT += ("Configured JDBC Store", bool2Str(storeCfg.jdbcStore()))
-
- cacheT += ("Read Through", bool2Str(storeCfg.readThrough()))
- cacheT += ("Write Through", bool2Str(storeCfg.writeThrough()))
+ cacheT += ("Store Сlass", safe(storeCfg.store()))
+ cacheT += ("Store Factory Сlass", storeCfg.storeFactory())
+ cacheT += ("Store Read Through", bool2Str(storeCfg.readThrough()))
+ cacheT += ("Store Write Through", bool2Str(storeCfg.writeThrough()))
cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.enabled()))
cacheT += ("Write-Behind Flush Size", storeCfg.flushSize())
@@ -853,9 +851,7 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
-
- cacheT += ("Store Values Bytes", cfg.valueBytes())
-
+ cacheT += ("Keep Values Bytes", cfg.valueBytes())
cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
[20/50] [abbrv] incubator-ignite git commit: # ignite-325: revert
license from some files and fix serialVersionUID at 2 files
Posted by ak...@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>
[32/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 ak...@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-368
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(-)
----------------------------------------------------------------------
[41/50] [abbrv] incubator-ignite git commit: # sprint-2 - javadoc
fixes.
Posted by ak...@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-368
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;
[25/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-335' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[03/50] [abbrv] incubator-ignite git commit: # ignite-339 Refactored
VisorCacheAffinityConfiguration
Posted by ak...@apache.org.
# ignite-339 Refactored VisorCacheAffinityConfiguration
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ff0c1e1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff0c1e1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff0c1e1d
Branch: refs/heads/ignite-368
Commit: ff0c1e1dbbd6da1a8724b4b40ecbf1095f506be9
Parents: adb2454
Author: anovikov <an...@gridgain.com>
Authored: Fri Feb 27 15:49:47 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Fri Feb 27 15:49:47 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCache.java | 190 ++------
.../cache/VisorCacheAffinityConfiguration.java | 53 +--
.../visor/cache/VisorCacheConfiguration.java | 462 ++++---------------
.../cache/VisorCacheDefaultConfiguration.java | 27 +-
.../cache/VisorCacheEvictionConfiguration.java | 81 +---
.../cache/VisorCacheNearConfiguration.java | 42 +-
.../cache/VisorCachePreloadConfiguration.java | 54 +--
.../cache/VisorCacheStoreConfiguration.java | 148 +++++-
.../VisorCacheWriteBehindConfiguration.java | 137 ------
.../internal/visor/util/VisorTaskUtils.java | 4 +-
.../commands/cache/VisorCacheCommand.scala | 26 +-
11 files changed, 304 insertions(+), 920 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
index 72a93e0..500e517 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -77,19 +77,19 @@ public class VisorCache implements Serializable {
private long swapKeys;
/** Number of partitions. */
- private int partsCnt;
+ private int partitions;
/** Primary partitions IDs with sizes. */
- private Collection<IgnitePair<Integer>> primaryParts;
+ private Collection<IgnitePair<Integer>> primaryPartitions;
/** Backup partitions IDs with sizes. */
- private Collection<IgnitePair<Integer>> backupParts;
+ private Collection<IgnitePair<Integer>> backupPartitions;
/** Cache metrics. */
private VisorCacheMetrics metrics;
/** Cache partitions states. */
- private GridDhtPartitionMap partsMap;
+ private GridDhtPartitionMap partitionsMap;
/**
* @param ignite Grid.
@@ -209,22 +209,22 @@ public class VisorCache implements Serializable {
VisorCache cache = new VisorCache();
- cache.name(cacheName);
- cache.mode(mode);
- cache.memorySize(memSz);
- cache.size(size);
- cache.nearSize(near);
- cache.dhtSize(size - near);
- cache.primarySize(ca.primarySize());
- cache.offHeapAllocatedSize(ca.offHeapAllocatedSize());
- cache.offHeapEntriesCount(ca.offHeapEntriesCount());
- cache.swapSize(swapSize);
- cache.swapKeys(swapKeys);
- cache.partitions(ca.affinity().partitions());
- cache.primaryPartitions(pps);
- cache.backupPartitions(bps);
- cache.metrics(VisorCacheMetrics.from(ca));
- cache.partitionMap(partsMap);
+ cache.name = cacheName;
+ cache.mode = mode;
+ cache.memorySize = memSz;
+ cache.size = size;
+ cache.nearSize = near;
+ cache.dhtSize = size - near;
+ cache.primarySize = ca.primarySize();
+ cache.offHeapAllocatedSize = ca.offHeapAllocatedSize();
+ cache.offHeapEntriesCnt = ca.offHeapEntriesCount();
+ cache.swapSize = swapSize;
+ cache.swapKeys = swapKeys;
+ cache.partitions = ca.affinity().partitions();
+ cache.primaryPartitions = pps;
+ cache.backupPartitions = bps;
+ cache.metrics = VisorCacheMetrics.from(ca);
+ cache.partitionsMap = partsMap;
return cache;
}
@@ -235,21 +235,21 @@ public class VisorCache implements Serializable {
public VisorCache history() {
VisorCache c = new VisorCache();
- c.name(name);
- c.mode(mode);
- c.memorySize(memorySize);
- c.size(size);
- c.nearSize(nearSize);
- c.dhtSize(dhtSize);
- c.primarySize(primarySize);
- c.offHeapAllocatedSize(offHeapAllocatedSize);
- c.offHeapEntriesCount(offHeapEntriesCnt);
- c.swapSize(swapSize);
- c.swapKeys(swapKeys);
- c.partitions(partsCnt);
- c.primaryPartitions(Collections.<IgnitePair<Integer>>emptyList());
- c.backupPartitions(Collections.<IgnitePair<Integer>>emptyList());
- c.metrics(metrics);
+ c.name = name;
+ c.mode = mode;
+ c.memorySize = memorySize;
+ c.size = size;
+ c.nearSize = nearSize;
+ c.dhtSize = dhtSize;
+ c.primarySize = primarySize;
+ c.offHeapAllocatedSize = offHeapAllocatedSize;
+ c.offHeapEntriesCnt = offHeapEntriesCnt;
+ c.swapSize = swapSize;
+ c.swapKeys = swapKeys;
+ c.partitions = partitions;
+ c.primaryPartitions = Collections.emptyList();
+ c.backupPartitions = Collections.emptyList();
+ c.metrics = metrics;
return c;
}
@@ -262,13 +262,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param name New cache name.
- */
- public void name(String name) {
- this.name = name;
- }
-
- /**
* @return Cache mode.
*/
public CacheMode mode() {
@@ -276,13 +269,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param mode New cache mode.
- */
- public void mode(CacheMode mode) {
- this.mode = mode;
- }
-
- /**
* @return Cache size in bytes.
*/
public long memorySize() {
@@ -290,13 +276,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param memorySize New cache size in bytes.
- */
- public void memorySize(long memorySize) {
- this.memorySize = memorySize;
- }
-
- /**
* @return Number of all entries in cache.
*/
public int size() {
@@ -304,13 +283,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param size New number of all entries in cache.
- */
- public void size(int size) {
- this.size = size;
- }
-
- /**
* @return Number of all entries in near cache.
*/
public int nearSize() {
@@ -318,13 +290,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param nearSize New number of all entries in near cache.
- */
- public void nearSize(int nearSize) {
- this.nearSize = nearSize;
- }
-
- /**
* @return Number of all entries in DHT cache.
*/
public int dhtSize() {
@@ -332,13 +297,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param dhtSize New number of all entries in DHT cache.
- */
- public void dhtSize(int dhtSize) {
- this.dhtSize = dhtSize;
- }
-
- /**
* @return Number of primary entries in cache.
*/
public int primarySize() {
@@ -346,13 +304,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param primarySize New number of primary entries in cache.
- */
- public void primarySize(int primarySize) {
- this.primarySize = primarySize;
- }
-
- /**
* @return Memory size allocated in off-heap.
*/
public long offHeapAllocatedSize() {
@@ -360,13 +311,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param offHeapAllocatedSize New memory size allocated in off-heap.
- */
- public void offHeapAllocatedSize(long offHeapAllocatedSize) {
- this.offHeapAllocatedSize = offHeapAllocatedSize;
- }
-
- /**
* @return Number of cache entries stored in off-heap memory.
*/
public long offHeapEntriesCount() {
@@ -374,13 +318,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param offHeapEntriesCnt New number of cache entries stored in off-heap memory.
- */
- public void offHeapEntriesCount(long offHeapEntriesCnt) {
- this.offHeapEntriesCnt = offHeapEntriesCnt;
- }
-
- /**
* @return Size in bytes for swap space.
*/
public long swapSize() {
@@ -388,13 +325,6 @@ public class VisorCache implements Serializable {
}
/**
- * @param swapSize New size in bytes for swap space.
- */
- public void swapSize(long swapSize) {
- this.swapSize = swapSize;
- }
-
- /**
* @return Number of cache entries stored in swap space.
*/
public long swapKeys() {
@@ -402,52 +332,24 @@ public class VisorCache implements Serializable {
}
/**
- * @param swapKeys New number of cache entries stored in swap space.
- */
- public void swapKeys(long swapKeys) {
- this.swapKeys = swapKeys;
- }
-
- /**
* @return Number of partitions.
*/
public int partitions() {
- return partsCnt;
- }
-
- /**
- * @param partsCnt New number of partitions.
- */
- public void partitions(int partsCnt) {
- this.partsCnt = partsCnt;
+ return partitions;
}
/**
* @return Primary partitions IDs with sizes.
*/
public Collection<IgnitePair<Integer>> primaryPartitions() {
- return primaryParts;
- }
-
- /**
- * @param primaryParts New primary partitions IDs with sizes.
- */
- public void primaryPartitions(Collection<IgnitePair<Integer>> primaryParts) {
- this.primaryParts = primaryParts;
+ return primaryPartitions;
}
/**
* @return Backup partitions IDs with sizes.
*/
public Collection<IgnitePair<Integer>> backupPartitions() {
- return backupParts;
- }
-
- /**
- * @param backupParts New backup partitions IDs with sizes.
- */
- public void backupPartitions(Collection<IgnitePair<Integer>> backupParts) {
- this.backupParts = backupParts;
+ return backupPartitions;
}
/**
@@ -458,24 +360,10 @@ public class VisorCache implements Serializable {
}
/**
- * @param metrics New cache metrics.
- */
- public void metrics(VisorCacheMetrics metrics) {
- this.metrics = metrics;
- }
-
- /**
* @return Cache partitions states.
*/
@Nullable public GridDhtPartitionMap partitionMap() {
- return partsMap;
- }
-
- /**
- * @param partsMap New cache partitions states.
- */
- public void partitionMap(@Nullable GridDhtPartitionMap partsMap) {
- this.partsMap = partsMap;
+ return partitionsMap;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index 3d4d84a..0f6a84f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -71,11 +71,12 @@ public class VisorCacheAffinityConfiguration implements Serializable {
VisorCacheAffinityConfiguration cfg = new VisorCacheAffinityConfiguration();
- cfg.function(compactClass(aff));
- cfg.mapper(compactClass(ccfg.getAffinityMapper()));
- cfg.partitionedBackups(ccfg.getBackups());
- cfg.defaultReplicas(dfltReplicas);
- cfg.excludeNeighbors(excludeNeighbors);
+ cfg.function = compactClass(aff);
+ cfg.mapper = compactClass(ccfg.getAffinityMapper());
+ cfg.partitions = aff.partitions();
+ cfg.partitionedBackups = ccfg.getBackups();
+ cfg.dfltReplicas = dfltReplicas;
+ cfg.excludeNeighbors = excludeNeighbors;
return cfg;
}
@@ -88,13 +89,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @param function New cache affinity function.
- */
- public void function(String function) {
- this.function = function;
- }
-
- /**
* @return Cache affinity mapper.
*/
public String mapper() {
@@ -102,13 +96,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @param mapper New cache affinity mapper.
- */
- public void mapper(String mapper) {
- this.mapper = mapper;
- }
-
- /**
* @return Count of key backups.
*/
public int partitionedBackups() {
@@ -116,13 +103,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @param partitionedBackups New count of key backups.
- */
- public void partitionedBackups(int partitionedBackups) {
- this.partitionedBackups = partitionedBackups;
- }
-
- /**
* @return Cache affinity partitions.
*/
public Integer partitions() {
@@ -130,13 +110,6 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @param partitions New cache affinity partitions.
- */
- public void partitions(Integer partitions) {
- this.partitions = partitions;
- }
-
- /**
* @return Cache partitioned affinity default replicas.
*/
@Nullable public Integer defaultReplicas() {
@@ -144,26 +117,12 @@ public class VisorCacheAffinityConfiguration implements Serializable {
}
/**
- * @param dfltReplicas New cache partitioned affinity default replicas.
- */
- public void defaultReplicas(Integer dfltReplicas) {
- this.dfltReplicas = dfltReplicas;
- }
-
- /**
* @return Cache partitioned affinity exclude neighbors.
*/
@Nullable public Boolean excludeNeighbors() {
return excludeNeighbors;
}
- /**
- * @param excludeNeighbors New cache partitioned affinity exclude neighbors.
- */
- public void excludeNeighbors(Boolean excludeNeighbors) {
- this.excludeNeighbors = excludeNeighbors;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheAffinityConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 7bfaf79..cf149f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -19,10 +19,7 @@ package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.node.*;
import org.jetbrains.annotations.*;
@@ -99,39 +96,30 @@ public class VisorCacheConfiguration implements Serializable {
/** Cache interceptor. */
private String interceptor;
- /** Cache affinity config. */
- private VisorCacheAffinityConfiguration affinity;
+ /** Should value bytes be stored. */
+ private boolean valBytes;
+
+ /** Cache affinityCfg config. */
+ private VisorCacheAffinityConfiguration affinityCfg;
/** Preload config. */
- private VisorCachePreloadConfiguration preload;
+ private VisorCachePreloadConfiguration preloadCfg;
/** Eviction config. */
- private VisorCacheEvictionConfiguration evict;
+ private VisorCacheEvictionConfiguration evictCfg;
/** Near cache config. */
- private VisorCacheNearConfiguration near;
+ private VisorCacheNearConfiguration nearCfg;
/** Default config */
- private VisorCacheDefaultConfiguration dflt;
+ private VisorCacheDefaultConfiguration dfltCfg;
/** Store config */
- private VisorCacheStoreConfiguration store;
-
- /** Write behind config */
- private VisorCacheWriteBehindConfiguration writeBehind;
+ private VisorCacheStoreConfiguration storeCfg;
/** Collection of type metadata. */
private Collection<VisorCacheTypeMetadata> typeMeta;
- /** Whether cache has JDBC store. */
- private boolean jdbcStore;
-
- /** Whether cache should operate in read-through mode. */
- private boolean readThrough;
-
- /** Whether cache should operate in write-through mode. */
- private boolean writeThrough;
-
/** Whether statistics collection is enabled. */
private boolean statisticsEnabled;
@@ -156,50 +144,41 @@ public class VisorCacheConfiguration implements Serializable {
* @return Data transfer object for cache configuration properties.
*/
public static VisorCacheConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
- GridCacheContext cctx = ((IgniteKernal)ignite).internalCache(ccfg.getName()).context();
-
- boolean jdbcStore = cctx.store().configuredStore() instanceof CacheAbstractJdbcStore;
-
VisorCacheConfiguration cfg = new VisorCacheConfiguration();
- cfg.name(ccfg.getName());
- cfg.mode(ccfg.getCacheMode());
- cfg.distributionMode(ccfg.getDistributionMode());
- cfg.atomicityMode(ccfg.getAtomicityMode());
- cfg.atomicWriteOrderMode(ccfg.getAtomicWriteOrderMode());
- cfg.eagerTtl(ccfg.isEagerTtl());
- cfg.writeSynchronizationMode(ccfg.getWriteSynchronizationMode());
- cfg.swapEnabled(ccfg.isSwapEnabled());
- cfg.queryIndexEnabled(ccfg.isQueryIndexEnabled());
- cfg.invalidate(ccfg.isInvalidate());
- cfg.startSize(ccfg.getStartSize());
- cfg.transactionManagerLookupClassName(ccfg.getTransactionManagerLookupClassName());
- cfg.offsetHeapMaxMemory(ccfg.getOffHeapMaxMemory());
- cfg.maxQueryIteratorCount(ccfg.getMaximumQueryIteratorCount());
- cfg.maxConcurrentAsyncOperations(ccfg.getMaxConcurrentAsyncOperations());
- cfg.memoryMode(ccfg.getMemoryMode());
- cfg.indexingSpiName(ccfg.getIndexingSpiName());
- cfg.interceptor(compactClass(ccfg.getInterceptor()));
- cfg.affinityConfiguration(VisorCacheAffinityConfiguration.from(ccfg));
- cfg.preloadConfiguration(VisorCachePreloadConfiguration.from(ccfg));
- cfg.evictConfiguration(VisorCacheEvictionConfiguration.from(ccfg));
- cfg.nearConfiguration(VisorCacheNearConfiguration.from(ccfg));
- cfg.defaultConfiguration(VisorCacheDefaultConfiguration.from(ccfg));
- cfg.storeConfiguration(VisorCacheStoreConfiguration.from(ccfg));
- cfg.writeBehind(VisorCacheWriteBehindConfiguration.from(ccfg));
-
- cfg.typeMeta(VisorCacheTypeMetadata.list(ccfg.getTypeMetadata()));
- cfg.jdbcStore(jdbcStore);
-
- cfg.readThrough(ccfg.isReadThrough());
- cfg.writeThrough(ccfg.isWriteThrough());
- cfg.statisticsEnabled(ccfg.isStatisticsEnabled());
- cfg.managementEnabled(ccfg.isManagementEnabled());
- cfg.loaderFactory(compactClass(ccfg.getCacheLoaderFactory()));
- cfg.writerFactory(compactClass(ccfg.getCacheWriterFactory()));
- cfg.expiryPolicyFactory(compactClass(ccfg.getExpiryPolicyFactory()));
-
- cfg.queryConfiguration(VisorCacheQueryConfiguration.from(ccfg.getQueryConfiguration()));
+ cfg.name = ccfg.getName();
+ cfg.mode = ccfg.getCacheMode();
+ cfg.distributionMode = ccfg.getDistributionMode();
+ cfg.atomicityMode = ccfg.getAtomicityMode();
+ cfg.atomicWriteOrderMode = ccfg.getAtomicWriteOrderMode();
+ cfg.eagerTtl = ccfg.isEagerTtl();
+ cfg.writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
+ cfg.swapEnabled = ccfg.isSwapEnabled();
+ cfg.qryIdxEnabled = ccfg.isQueryIndexEnabled();
+ cfg.invalidate = ccfg.isInvalidate();
+ cfg.startSize = ccfg.getStartSize();
+ cfg.tmLookupClsName = ccfg.getTransactionManagerLookupClassName();
+ cfg.offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
+ cfg.maxQryIterCnt = ccfg.getMaximumQueryIteratorCount();
+ cfg.maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
+ cfg.memoryMode = ccfg.getMemoryMode();
+ cfg.indexingSpiName = ccfg.getIndexingSpiName();
+ cfg.interceptor = compactClass(ccfg.getInterceptor());
+ cfg.valBytes = ccfg.isStoreValueBytes();
+ cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
+ cfg.statisticsEnabled = ccfg.isStatisticsEnabled();
+ cfg.mgmtEnabled = ccfg.isManagementEnabled();
+ cfg.ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
+ cfg.writerFactory = compactClass(ccfg.getCacheWriterFactory());
+ cfg.expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
+
+ cfg.affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
+ cfg.preloadCfg = VisorCachePreloadConfiguration.from(ccfg);
+ cfg.evictCfg = VisorCacheEvictionConfiguration.from(ccfg);
+ cfg.nearCfg = VisorCacheNearConfiguration.from(ccfg);
+ cfg.dfltCfg = VisorCacheDefaultConfiguration.from(ccfg);
+ cfg.storeCfg = VisorCacheStoreConfiguration.from(ignite, ccfg);
+ cfg.qryCfg = VisorCacheQueryConfiguration.from(ccfg.getQueryConfiguration());
return cfg;
}
@@ -229,13 +208,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param name New cache name.
- */
- public void name(@Nullable String name) {
- this.name = name;
- }
-
- /**
* @return Cache mode.
*/
public CacheMode mode() {
@@ -243,13 +215,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param mode New cache mode.
- */
- public void mode(CacheMode mode) {
- this.mode = mode;
- }
-
- /**
* @return Distribution mode.
*/
public CacheDistributionMode distributionMode() {
@@ -257,13 +222,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param distributionMode New distribution mode.
- */
- public void distributionMode(CacheDistributionMode distributionMode) {
- this.distributionMode = distributionMode;
- }
-
- /**
* @return Cache atomicity mode
*/
public CacheAtomicityMode atomicityMode() {
@@ -271,13 +229,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param atomicityMode New cache atomicity mode
- */
- public void atomicityMode(CacheAtomicityMode atomicityMode) {
- this.atomicityMode = atomicityMode;
- }
-
- /**
* @return Cache atomic sequence reserve size
*/
public int atomicSequenceReserveSize() {
@@ -285,13 +236,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param atomicSeqReserveSize New cache atomic sequence reserve size
- */
- public void atomicSequenceReserveSize(int atomicSeqReserveSize) {
- this.atomicSeqReserveSize = atomicSeqReserveSize;
- }
-
- /**
* @return Cache atomicity write ordering mode.
*/
public CacheAtomicWriteOrderMode atomicWriteOrderMode() {
@@ -299,13 +243,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param atomicWriteOrderMode New cache atomicity write ordering mode.
- */
- public void atomicWriteOrderMode(CacheAtomicWriteOrderMode atomicWriteOrderMode) {
- this.atomicWriteOrderMode = atomicWriteOrderMode;
- }
-
- /**
* @return Eager ttl flag
*/
public boolean eagerTtl() {
@@ -313,13 +250,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param eagerTtl New eager ttl flag
- */
- public void eagerTtl(boolean eagerTtl) {
- this.eagerTtl = eagerTtl;
- }
-
- /**
* @return Write synchronization mode.
*/
public CacheWriteSynchronizationMode writeSynchronizationMode() {
@@ -327,13 +257,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param writeSynchronizationMode New write synchronization mode.
- */
- public void writeSynchronizationMode(CacheWriteSynchronizationMode writeSynchronizationMode) {
- this.writeSynchronizationMode = writeSynchronizationMode;
- }
-
- /**
* @return Sequence reserve size.
*/
public int sequenceReserveSize() {
@@ -341,13 +264,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param seqReserveSize New sequence reserve size.
- */
- public void sequenceReserveSize(int seqReserveSize) {
- this.seqReserveSize = seqReserveSize;
- }
-
- /**
* @return Swap enabled flag.
*/
public boolean swapEnabled() {
@@ -355,13 +271,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param swapEnabled New swap enabled flag.
- */
- public void swapEnabled(boolean swapEnabled) {
- this.swapEnabled = swapEnabled;
- }
-
- /**
* @return Flag indicating whether Ignite should attempt to index value and/or key instances stored in cache.
*/
public boolean queryIndexEnabled() {
@@ -369,14 +278,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param qryIdxEnabled New flag indicating whether Ignite should attempt to index value and/or key instances stored
- * in cache.
- */
- public void queryIndexEnabled(boolean qryIdxEnabled) {
- this.qryIdxEnabled = qryIdxEnabled;
- }
-
- /**
* @return Invalidate.
*/
public boolean invalidate() {
@@ -384,13 +285,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param invalidate New invalidate.
- */
- public void invalidate(boolean invalidate) {
- this.invalidate = invalidate;
- }
-
- /**
* @return Start size.
*/
public int startSize() {
@@ -398,13 +292,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param startSize New start size.
- */
- public void startSize(int startSize) {
- this.startSize = startSize;
- }
-
- /**
* @return Name of class implementing GridCacheTmLookup.
*/
@Nullable public String transactionManagerLookupClassName() {
@@ -412,13 +299,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param tmLookupClsName New name of class implementing GridCacheTmLookup.
- */
- public void transactionManagerLookupClassName(@Nullable String tmLookupClsName) {
- this.tmLookupClsName = tmLookupClsName;
- }
-
- /**
* @return Off-heap max memory.
*/
public long offsetHeapMaxMemory() {
@@ -426,13 +306,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param offHeapMaxMemory New off-heap max memory.
- */
- public void offsetHeapMaxMemory(long offHeapMaxMemory) {
- this.offHeapMaxMemory = offHeapMaxMemory;
- }
-
- /**
* @return Max query iterator count
*/
public int maxQueryIteratorCount() {
@@ -440,13 +313,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param maxQryIterCnt New max query iterator count
- */
- public void maxQueryIteratorCount(int maxQryIterCnt) {
- this.maxQryIterCnt = maxQryIterCnt;
- }
-
- /**
* @return Max concurrent async operations
*/
public int maxConcurrentAsyncOperations() {
@@ -454,13 +320,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param maxConcurrentAsyncOps New max concurrent async operations
- */
- public void maxConcurrentAsyncOperations(int maxConcurrentAsyncOps) {
- this.maxConcurrentAsyncOps = maxConcurrentAsyncOps;
- }
-
- /**
* @return Memory mode.
*/
public CacheMemoryMode memoryMode() {
@@ -468,13 +327,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param memoryMode New memory mode.
- */
- public void memoryMode(CacheMemoryMode memoryMode) {
- this.memoryMode = memoryMode;
- }
-
- /**
* @return Name of SPI to use for indexing.
*/
public String indexingSpiName() {
@@ -482,13 +334,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param indexingSpiName New name of SPI to use for indexing.
- */
- public void indexingSpiName(String indexingSpiName) {
- this.indexingSpiName = indexingSpiName;
- }
-
- /**
* @return Cache interceptor.
*/
@Nullable public String interceptor() {
@@ -496,116 +341,19 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param interceptor New cache interceptor.
- */
- public void interceptor(@Nullable String interceptor) {
- this.interceptor = interceptor;
- }
-
- /**
- * @return Cache affinity config.
- */
- public VisorCacheAffinityConfiguration affinityConfiguration() {
- return affinity;
- }
-
- /**
- * @param affinity New cache affinity config.
- */
- public void affinityConfiguration(VisorCacheAffinityConfiguration affinity) {
- this.affinity = affinity;
- }
-
- /**
- * @return Preload config.
- */
- public VisorCachePreloadConfiguration preloadConfiguration() {
- return preload;
- }
-
- /**
- * @param preload New preload config.
- */
- public void preloadConfiguration(VisorCachePreloadConfiguration preload) {
- this.preload = preload;
- }
-
- /**
- * @return Eviction config.
- */
- public VisorCacheEvictionConfiguration evictConfiguration() {
- return evict;
- }
-
- /**
- * @param evict New eviction config.
- */
- public void evictConfiguration(VisorCacheEvictionConfiguration evict) {
- this.evict = evict;
- }
-
- /**
- * @return Near cache config.
- */
- public VisorCacheNearConfiguration nearConfiguration() {
- return near;
- }
-
- /**
- * @param near New near cache config.
- */
- public void nearConfiguration(VisorCacheNearConfiguration near) {
- this.near = near;
- }
-
- /**
- * @return Dgc config
- */
- public VisorCacheDefaultConfiguration defaultConfiguration() {
- return dflt;
- }
-
- /**
- * @param dflt New default config
+ * @return Should value bytes be stored.
*/
- public void defaultConfiguration(VisorCacheDefaultConfiguration dflt) {
- this.dflt = dflt;
+ public boolean valueBytes() {
+ return valBytes;
}
/**
- * @return Store config
+ * @param valBytes New should value bytes be stored.
*/
- public VisorCacheStoreConfiguration storeConfiguration() {
- return store;
+ public void valueBytes(boolean valBytes) {
+ this.valBytes = valBytes;
}
- /**
- * @param store New store config
- */
- public void storeConfiguration(VisorCacheStoreConfiguration store) {
- this.store = store;
- }
-
- /**
- * @return Write behind config
- */
- public VisorCacheWriteBehindConfiguration writeBehind() {
- return writeBehind;
- }
-
- /**
- * @param writeBehind New write behind config
- */
- public void writeBehind(VisorCacheWriteBehindConfiguration writeBehind) {
- this.writeBehind = writeBehind;
- }
-
- /**
- * @param typeMeta New collection of type metadata.
- */
- public void typeMeta(Collection<VisorCacheTypeMetadata> typeMeta) {
- this.typeMeta = typeMeta;
- }
/**
* @return Collection of type metadata.
@@ -615,48 +363,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return {@code true} if cache has JDBC store.
- */
- public boolean jdbcStore() {
- return jdbcStore;
- }
-
- /**
- * @param jdbcStore {@code true} if cache has JDBC store.
- */
- public void jdbcStore(boolean jdbcStore) {
- this.jdbcStore = jdbcStore;
- }
-
- /**
- * @return Whether cache should operate in read-through mode.
- */
- public boolean readThrough() {
- return readThrough;
- }
-
- /**
- * @param readThrough New whether cache should operate in read-through mode.
- */
- public void readThrough(boolean readThrough) {
- this.readThrough = readThrough;
- }
-
- /**
- * @return Whether cache should operate in write-through mode.
- */
- public boolean writeThrough() {
- return writeThrough;
- }
-
- /**
- * @param writeThrough New whether cache should operate in write-through mode.
- */
- public void writeThrough(boolean writeThrough) {
- this.writeThrough = writeThrough;
- }
-
- /**
* @return {@code true} if cache statistics enabled.
*/
public boolean statisticsEnabled() {
@@ -664,71 +370,73 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @param statisticsEnabled {@code true} if cache statistics enabled.
+ * @return Whether management is enabled.
*/
- public void statisticsEnabled(boolean statisticsEnabled) {
- this.statisticsEnabled = statisticsEnabled;
+ public boolean managementEnabled() {
+ return mgmtEnabled;
}
/**
- * @return Whether management is enabled.
+ * @return Class name of cache loader factory.
*/
- public boolean managementEnabled() {
- return mgmtEnabled;
+ public String loaderFactory() {
+ return ldrFactory;
}
/**
- * @param mgmtEnabled New whether management is enabled.
+ * @return Class name of cache writer factory.
*/
- public void managementEnabled(boolean mgmtEnabled) {
- this.mgmtEnabled = mgmtEnabled;
+ public String writerFactory() {
+ return writerFactory;
}
/**
- * @return Class name of cache loader factory.
+ * @return Class name of expiry policy factory.
*/
- public String loaderFactory() {
- return ldrFactory;
+ public String expiryPolicyFactory() {
+ return expiryPlcFactory;
}
/**
- * @param ldrFactory New class name of cache loader factory.
+ * @return Cache affinityCfg config.
*/
- public void loaderFactory(String ldrFactory) {
- this.ldrFactory = ldrFactory;
+ public VisorCacheAffinityConfiguration affinityConfiguration() {
+ return affinityCfg;
}
/**
- * @return Class name of cache writer factory.
+ * @return Preload config.
*/
- public String writerFactory() {
- return writerFactory;
+ public VisorCachePreloadConfiguration preloadConfiguration() {
+ return preloadCfg;
}
/**
- * @param writerFactory New class name of cache writer factory.
+ * @return Eviction config.
*/
- public void writerFactory(String writerFactory) {
- this.writerFactory = writerFactory;
+ public VisorCacheEvictionConfiguration evictConfiguration() {
+ return evictCfg;
}
/**
- * @return Class name of expiry policy factory.
+ * @return Near cache config.
*/
- public String expiryPolicyFactory() {
- return expiryPlcFactory;
+ public VisorCacheNearConfiguration nearConfiguration() {
+ return nearCfg;
}
/**
- * @param expiryPlcFactory New class name of expiry policy factory.
+ * @return Dgc config
*/
- public void expiryPolicyFactory(String expiryPlcFactory) {
- this.expiryPlcFactory = expiryPlcFactory;
+ public VisorCacheDefaultConfiguration defaultConfiguration() {
+ return dfltCfg;
}
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorCacheConfiguration.class, this);
+ /**
+ * @return Store config
+ */
+ public VisorCacheStoreConfiguration storeConfiguration() {
+ return storeCfg;
}
/**
@@ -738,10 +446,8 @@ public class VisorCacheConfiguration implements Serializable {
return qryCfg;
}
- /**
- * @param qryCfg New cache query configuration.
- */
- public void queryConfiguration(VisorCacheQueryConfiguration qryCfg) {
- this.qryCfg = qryCfg;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorCacheConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index 97f8f30..0996e65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -45,9 +45,9 @@ public class VisorCacheDefaultConfiguration implements Serializable {
public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg) {
VisorCacheDefaultConfiguration cfg = new VisorCacheDefaultConfiguration();
- cfg.timeToLive(ccfg.getDefaultTimeToLive());
- cfg.txLockTimeout(ccfg.getDefaultLockTimeout());
- cfg.queryTimeout(ccfg.getDefaultQueryTimeout());
+ cfg.ttl = ccfg.getDefaultTimeToLive();
+ cfg.txLockTimeout = ccfg.getDefaultLockTimeout();
+ cfg.qryTimeout = ccfg.getDefaultQueryTimeout();
return cfg;
}
@@ -60,13 +60,6 @@ public class VisorCacheDefaultConfiguration implements Serializable {
}
/**
- * @param ttl New tTL value.
- */
- public void timeToLive(long ttl) {
- this.ttl = ttl;
- }
-
- /**
* @return Default transaction timeout.
*/
public long txLockTimeout() {
@@ -74,26 +67,12 @@ public class VisorCacheDefaultConfiguration implements Serializable {
}
/**
- * @param txLockTimeout New default transaction timeout.
- */
- public void txLockTimeout(long txLockTimeout) {
- this.txLockTimeout = txLockTimeout;
- }
-
- /**
* @return Default query timeout.
*/
public long queryTimeout() {
return qryTimeout;
}
- /**
- * @param qryTimeout New default query timeout.
- */
- public void queryTimeout(long qryTimeout) {
- this.qryTimeout = qryTimeout;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheDefaultConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
index 4b1a516..4c84f8d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -69,15 +69,15 @@ public class VisorCacheEvictionConfiguration implements Serializable {
final CacheEvictionPolicy plc = ccfg.getEvictionPolicy();
- cfg.policy(compactClass(plc));
- cfg.policyMaxSize(evictionPolicyMaxSize(plc));
- cfg.filter(compactClass(ccfg.getEvictionFilter()));
- cfg.synchronizedConcurrencyLevel(ccfg.getEvictSynchronizedConcurrencyLevel());
- cfg.synchronizedTimeout(ccfg.getEvictSynchronizedTimeout());
- cfg.synchronizedKeyBufferSize(ccfg.getEvictSynchronizedKeyBufferSize());
- cfg.evictSynchronized(ccfg.isEvictSynchronized());
- cfg.nearSynchronized(ccfg.isEvictNearSynchronized());
- cfg.maxOverflowRatio(ccfg.getEvictMaxOverflowRatio());
+ cfg.plc = compactClass(plc);
+ cfg.plcMaxSize = evictionPolicyMaxSize(plc);
+ cfg.filter = compactClass(ccfg.getEvictionFilter());
+ cfg.syncConcurrencyLvl = ccfg.getEvictSynchronizedConcurrencyLevel();
+ cfg.syncTimeout = ccfg.getEvictSynchronizedTimeout();
+ cfg.syncKeyBufSize = ccfg.getEvictSynchronizedKeyBufferSize();
+ cfg.evictSynchronized = ccfg.isEvictSynchronized();
+ cfg.nearSynchronized = ccfg.isEvictNearSynchronized();
+ cfg.maxOverflowRatio = ccfg.getEvictMaxOverflowRatio();
return cfg;
}
@@ -90,13 +90,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param plc New eviction policy.
- */
- public void policy(String plc) {
- this.plc = plc;
- }
-
- /**
* @return Cache eviction policy max size.
*/
@Nullable public Integer policyMaxSize() {
@@ -104,13 +97,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param plcMaxSize New cache eviction policy max size.
- */
- public void policyMaxSize(Integer plcMaxSize) {
- this.plcMaxSize = plcMaxSize;
- }
-
- /**
* @return Eviction filter to specify which entries should not be evicted.
*/
@Nullable public String filter() {
@@ -118,13 +104,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param filter New eviction filter to specify which entries should not be evicted.
- */
- public void filter(String filter) {
- this.filter = filter;
- }
-
- /**
* @return synchronized eviction concurrency level.
*/
public int synchronizedConcurrencyLevel() {
@@ -132,13 +111,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param syncConcurrencyLvl New synchronized eviction concurrency level.
- */
- public void synchronizedConcurrencyLevel(int syncConcurrencyLvl) {
- this.syncConcurrencyLvl = syncConcurrencyLvl;
- }
-
- /**
* @return synchronized eviction timeout.
*/
public long synchronizedTimeout() {
@@ -146,13 +118,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param syncTimeout New synchronized eviction timeout.
- */
- public void synchronizedTimeout(long syncTimeout) {
- this.syncTimeout = syncTimeout;
- }
-
- /**
* @return Synchronized key buffer size.
*/
public int synchronizedKeyBufferSize() {
@@ -160,13 +125,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param syncKeyBufSize New synchronized key buffer size.
- */
- public void synchronizedKeyBufferSize(int syncKeyBufSize) {
- this.syncKeyBufSize = syncKeyBufSize;
- }
-
- /**
* @return Synchronous evicts flag.
*/
public boolean evictSynchronized() {
@@ -174,13 +132,6 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param evictSynchronized New synchronous evicts flag.
- */
- public void evictSynchronized(boolean evictSynchronized) {
- this.evictSynchronized = evictSynchronized;
- }
-
- /**
* @return Synchronous near evicts flag.
*/
public boolean nearSynchronized() {
@@ -188,26 +139,12 @@ public class VisorCacheEvictionConfiguration implements Serializable {
}
/**
- * @param nearSynchronized New synchronous near evicts flag.
- */
- public void nearSynchronized(boolean nearSynchronized) {
- this.nearSynchronized = nearSynchronized;
- }
-
- /**
* @return Eviction max overflow ratio.
*/
public float maxOverflowRatio() {
return maxOverflowRatio;
}
- /**
- * @param maxOverflowRatio New eviction max overflow ratio.
- */
- public void maxOverflowRatio(float maxOverflowRatio) {
- this.maxOverflowRatio = maxOverflowRatio;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheEvictionConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
index 1f551a7..10db203 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
@@ -52,10 +52,10 @@ public class VisorCacheNearConfiguration implements Serializable {
public static VisorCacheNearConfiguration from(CacheConfiguration ccfg) {
VisorCacheNearConfiguration cfg = new VisorCacheNearConfiguration();
- cfg.nearEnabled(GridCacheUtils.isNearEnabled(ccfg));
- cfg.nearStartSize(ccfg.getNearStartSize());
- cfg.nearEvictPolicy(compactClass(ccfg.getNearEvictionPolicy()));
- cfg.nearEvictMaxSize(evictionPolicyMaxSize(ccfg.getNearEvictionPolicy()));
+ cfg.nearEnabled = GridCacheUtils.isNearEnabled(ccfg);
+ cfg.nearStartSize = ccfg.getNearStartSize();
+ cfg.nearEvictPlc = compactClass(ccfg.getNearEvictionPolicy());
+ cfg.nearEvictMaxSize = evictionPolicyMaxSize(ccfg.getNearEvictionPolicy());
return cfg;
}
@@ -68,13 +68,6 @@ public class VisorCacheNearConfiguration implements Serializable {
}
/**
- * @param nearEnabled New flag to enable/disable near cache eviction policy.
- */
- public void nearEnabled(boolean nearEnabled) {
- this.nearEnabled = nearEnabled;
- }
-
- /**
* @return Near cache start size.
*/
public int nearStartSize() {
@@ -82,13 +75,6 @@ public class VisorCacheNearConfiguration implements Serializable {
}
/**
- * @param nearStartSize New near cache start size.
- */
- public void nearStartSize(int nearStartSize) {
- this.nearStartSize = nearStartSize;
- }
-
- /**
* @return Near cache eviction policy.
*/
@Nullable public String nearEvictPolicy() {
@@ -96,28 +82,14 @@ public class VisorCacheNearConfiguration implements Serializable {
}
/**
- * @param nearEvictPlc New near cache eviction policy.
- */
- public void nearEvictPolicy(String nearEvictPlc) {
- this.nearEvictPlc = nearEvictPlc;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorCacheNearConfiguration.class, this);
- }
-
- /**
* @return Near cache eviction policy max size.
*/
@Nullable public Integer nearEvictMaxSize() {
return nearEvictMaxSize;
}
- /**
- * @param nearEvictMaxSize New near cache eviction policy max size.
- */
- public void nearEvictMaxSize(@Nullable Integer nearEvictMaxSize) {
- this.nearEvictMaxSize = nearEvictMaxSize;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorCacheNearConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
index 19a3734..f331789 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
@@ -55,12 +55,12 @@ public class VisorCachePreloadConfiguration implements Serializable {
public static VisorCachePreloadConfiguration from(CacheConfiguration ccfg) {
VisorCachePreloadConfiguration cfg = new VisorCachePreloadConfiguration();
- cfg.mode(ccfg.getPreloadMode());
- cfg.batchSize(ccfg.getPreloadBatchSize());
- cfg.threadPoolSize(ccfg.getPreloadThreadPoolSize());
- cfg.partitionedDelay(ccfg.getPreloadPartitionedDelay());
- cfg.throttle(ccfg.getPreloadThrottle());
- cfg.timeout(ccfg.getPreloadTimeout());
+ cfg.mode = ccfg.getPreloadMode();
+ cfg.batchSize = ccfg.getPreloadBatchSize();
+ cfg.threadPoolSize = ccfg.getPreloadThreadPoolSize();
+ cfg.partitionedDelay = ccfg.getPreloadPartitionedDelay();
+ cfg.throttle = ccfg.getPreloadThrottle();
+ cfg.timeout = ccfg.getPreloadTimeout();
return cfg;
}
@@ -73,13 +73,6 @@ public class VisorCachePreloadConfiguration implements Serializable {
}
/**
- * @param mode New cache preload mode.
- */
- public void mode(CachePreloadMode mode) {
- this.mode = mode;
- }
-
- /**
* @return Preload thread pool size.
*/
public int threadPoolSize() {
@@ -87,13 +80,6 @@ public class VisorCachePreloadConfiguration implements Serializable {
}
/**
- * @param threadPoolSize New preload thread pool size.
- */
- public void threadPoolSize(int threadPoolSize) {
- this.threadPoolSize = threadPoolSize;
- }
-
- /**
* @return Cache preload batch size.
*/
public int batchSize() {
@@ -101,13 +87,6 @@ public class VisorCachePreloadConfiguration implements Serializable {
}
/**
- * @param batchSize New cache preload batch size.
- */
- public void batchSize(int batchSize) {
- this.batchSize = batchSize;
- }
-
- /**
* @return Preloading partitioned delay.
*/
public long partitionedDelay() {
@@ -115,13 +94,6 @@ public class VisorCachePreloadConfiguration implements Serializable {
}
/**
- * @param partitionedDelay New preloading partitioned delay.
- */
- public void partitionedDelay(long partitionedDelay) {
- this.partitionedDelay = partitionedDelay;
- }
-
- /**
* @return Time in milliseconds to wait between preload messages.
*/
public long throttle() {
@@ -129,26 +101,12 @@ public class VisorCachePreloadConfiguration implements Serializable {
}
/**
- * @param throttle New time in milliseconds to wait between preload messages.
- */
- public void throttle(long throttle) {
- this.throttle = throttle;
- }
-
- /**
* @return Preload timeout.
*/
public long timeout() {
return timeout;
}
- /**
- * @param timeout New preload timeout.
- */
- public void timeout(long timeout) {
- this.timeout = timeout;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCachePreloadConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index b1ed170..7284b7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -17,7 +17,11 @@
package org.apache.ignite.internal.visor.cache;
+import org.apache.ignite.*;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -32,21 +36,58 @@ public class VisorCacheStoreConfiguration implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** Cache store. */
+ /** Whether cache has JDBC store. */
+ private boolean jdbcStore;
+
+ /** Cache store class name. */
private String store;
- /** Should value bytes be stored. */
- private boolean valBytes;
+ /** Cache store factory class name. */
+ private String storeFactory;
+
+ /** Whether cache should operate in read-through mode. */
+ private boolean readThrough;
+
+ /** Whether cache should operate in write-through mode. */
+ private boolean writeThrough;
+
+ /** Flag indicating whether write-behind behaviour should be used for the cache store. */
+ private boolean writeBehindEnabled;
+
+ /** Maximum batch size for write-behind cache store operations. */
+ private int batchSz;
+
+ /** Frequency with which write-behind cache is flushed to the cache store in milliseconds. */
+ private long flushFreq;
+
+ /** Maximum object count in write-behind cache. */
+ private int flushSz;
+
+ /** Number of threads that will perform cache flushing. */
+ private int flushThreadCnt;
/**
* @param ccfg Cache configuration.
* @return Data transfer object for cache store configuration properties.
*/
- public static VisorCacheStoreConfiguration from(CacheConfiguration ccfg) {
+ public static VisorCacheStoreConfiguration from(Ignite ignite, CacheConfiguration ccfg) {
VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration();
- cfg.store(compactClass(ccfg.getCacheStoreFactory()));
- cfg.valueBytes(ccfg.isStoreValueBytes());
+ CacheStore store = ((IgniteKernal)ignite).internalCache(ccfg.getName()).context().store().configuredStore();
+
+ cfg.jdbcStore = store instanceof CacheAbstractJdbcStore;
+
+ cfg.store = compactClass(store);
+ cfg.storeFactory = compactClass(ccfg.getCacheStoreFactory());
+
+ cfg.readThrough = ccfg.isReadThrough();
+ cfg.writeThrough = ccfg.isWriteThrough();
+
+ cfg.writeBehindEnabled = ccfg.isWriteBehindEnabled();
+ cfg.batchSz = ccfg.getWriteBehindBatchSize();
+ cfg.flushFreq = ccfg.getWriteBehindFlushFrequency();
+ cfg.flushSz = ccfg.getWriteBehindFlushSize();
+ cfg.flushThreadCnt = ccfg.getWriteBehindFlushThreadCount();
return cfg;
}
@@ -59,6 +100,13 @@ public class VisorCacheStoreConfiguration implements Serializable {
}
/**
+ * @return {@code true} if cache has JDBC store.
+ */
+ public boolean jdbcStore() {
+ return jdbcStore;
+ }
+
+ /**
* @return Cache store class name.
*/
@Nullable public String store() {
@@ -66,24 +114,94 @@ public class VisorCacheStoreConfiguration implements Serializable {
}
/**
- * @param store Cache store class name.
+ * @return Cache store factory class name..
+ */
+ public String storeFactory() {
+ return storeFactory;
+ }
+
+ /**
+ * @return Whether cache should operate in read-through mode.
+ */
+ public boolean readThrough() {
+ return readThrough;
+ }
+
+ /**
+ * @return Whether cache should operate in write-through mode.
+ */
+ public boolean writeThrough() {
+ return writeThrough;
+ }
+
+ /**
+ * @return Flag indicating whether write-behind behaviour should be used for the cache store.
+ */
+ public boolean writeBehindEnabled() {
+ return writeBehindEnabled;
+ }
+
+ /**
+ * @param writeBehindEnabled New flag indicating whether write-behind behaviour should be used for the cache store.
+ */
+ public void writeBehindEnabled(boolean writeBehindEnabled) {
+ this.writeBehindEnabled = writeBehindEnabled;
+ }
+
+ /**
+ * @return Maximum batch size for write-behind cache store operations.
+ */
+ public int batchSize() {
+ return batchSz;
+ }
+
+ /**
+ * @param batchSize New maximum batch size for write-behind cache store operations.
+ */
+ public void batchSize(int batchSize) {
+ this.batchSz = batchSize;
+ }
+
+ /**
+ * @return Frequency with which write-behind cache is flushed to the cache store in milliseconds.
+ */
+ public long flushFrequency() {
+ return flushFreq;
+ }
+
+ /**
+ * @param flushFreq New frequency with which write-behind cache is flushed to the cache store in milliseconds.
+ */
+ public void flushFrequency(long flushFreq) {
+ this.flushFreq = flushFreq;
+ }
+
+ /**
+ * @return Maximum object count in write-behind cache.
+ */
+ public int flushSize() {
+ return flushSz;
+ }
+
+ /**
+ * @param flushSize New maximum object count in write-behind cache.
*/
- public void store(String store) {
- this.store = store;
+ public void flushSize(int flushSize) {
+ this.flushSz = flushSize;
}
/**
- * @return Should value bytes be stored.
+ * @return Number of threads that will perform cache flushing.
*/
- public boolean valueBytes() {
- return valBytes;
+ public int flushThreadCount() {
+ return flushThreadCnt;
}
/**
- * @param valBytes New should value bytes be stored.
+ * @param flushThreadCnt New number of threads that will perform cache flushing.
*/
- public void valueBytes(boolean valBytes) {
- this.valBytes = valBytes;
+ public void flushThreadCount(int flushThreadCnt) {
+ this.flushThreadCnt = flushThreadCnt;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheWriteBehindConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheWriteBehindConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheWriteBehindConfiguration.java
deleted file mode 100644
index c55078c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheWriteBehindConfiguration.java
+++ /dev/null
@@ -1,137 +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.visor.cache;
-
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Data transfer object for write-behind cache configuration properties.
- */
-public class VisorCacheWriteBehindConfiguration implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Flag indicating whether write-behind behaviour should be used for the cache store. */
- private boolean enabled;
-
- /** Maximum batch size for write-behind cache store operations. */
- private int batchSize;
-
- /** Frequency with which write-behind cache is flushed to the cache store in milliseconds. */
- private long flushFreq;
-
- /** Maximum object count in write-behind cache. */
- private int flushSize;
-
- /** Number of threads that will perform cache flushing. */
- private int flushThreadCnt;
-
- /**
- * @param ccfg Cache configuration.
- * @return Data transfer object for write-behind cache configuration properties.
- */
- public static VisorCacheWriteBehindConfiguration from(CacheConfiguration ccfg) {
- VisorCacheWriteBehindConfiguration cfg = new VisorCacheWriteBehindConfiguration();
-
- cfg.enabled(ccfg.isWriteBehindEnabled());
- cfg.batchSize(ccfg.getWriteBehindBatchSize());
- cfg.flushFrequency(ccfg.getWriteBehindFlushFrequency());
- cfg.flushSize(ccfg.getWriteBehindFlushSize());
- cfg.flushThreadCount(ccfg.getWriteBehindFlushThreadCount());
-
- return cfg;
- }
-
- /**
- * @return Flag indicating whether write-behind behaviour should be used for the cache store.
- */
- public boolean enabled() {
- return enabled;
- }
-
- /**
- * @param enabled New flag indicating whether write-behind behaviour should be used for the cache store.
- */
- public void enabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- /**
- * @return Maximum batch size for write-behind cache store operations.
- */
- public int batchSize() {
- return batchSize;
- }
-
- /**
- * @param batchSize New maximum batch size for write-behind cache store operations.
- */
- public void batchSize(int batchSize) {
- this.batchSize = batchSize;
- }
-
- /**
- * @return Frequency with which write-behind cache is flushed to the cache store in milliseconds.
- */
- public long flushFrequency() {
- return flushFreq;
- }
-
- /**
- * @param flushFreq New frequency with which write-behind cache is flushed to the cache store in milliseconds.
- */
- public void flushFrequency(long flushFreq) {
- this.flushFreq = flushFreq;
- }
-
- /**
- * @return Maximum object count in write-behind cache.
- */
- public int flushSize() {
- return flushSize;
- }
-
- /**
- * @param flushSize New maximum object count in write-behind cache.
- */
- public void flushSize(int flushSize) {
- this.flushSize = flushSize;
- }
-
- /**
- * @return Number of threads that will perform cache flushing.
- */
- public int flushThreadCount() {
- return flushThreadCnt;
- }
-
- /**
- * @param flushThreadCnt New number of threads that will perform cache flushing.
- */
- public void flushThreadCount(int flushThreadCnt) {
- this.flushThreadCnt = flushThreadCnt;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorCacheWriteBehindConfiguration.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index a9b4e57..b03674f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -229,7 +229,7 @@ public class VisorTaskUtils {
* @param obj Object for compact.
* @return Compacted string.
*/
- @Nullable public static String compactClass(Object obj) {
+ @Nullable public static String compactClass(@Nullable Object obj) {
if (obj == null)
return null;
@@ -613,7 +613,7 @@ public class VisorTaskUtils {
* @param plc Eviction policy.
* @return Extracted max size.
*/
- public static Integer evictionPolicyMaxSize(CacheEvictionPolicy plc) {
+ public static Integer evictionPolicyMaxSize(@Nullable CacheEvictionPolicy plc) {
if (plc instanceof CacheLruEvictionPolicyMBean)
return ((CacheLruEvictionPolicyMBean)plc).getMaxSize();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff0c1e1d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 3c1aa01..97adeac 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -776,7 +776,6 @@ object VisorCacheCommand {
val evictCfg = cfg.evictConfiguration()
val defaultCfg = cfg.defaultConfiguration()
val storeCfg = cfg.storeConfiguration()
- val writeBehind = cfg.writeBehind()
val cacheT = VisorTextTable()
@@ -836,20 +835,25 @@ object VisorCacheCommand {
cacheT += ("Indexing SPI Name", cfg.indexingSpiName())
cacheT += ("Cache Interceptor", cfg.interceptor())
- cacheT += ("Store Enabled", storeCfg.enabled())
- cacheT += ("Store", storeCfg.store())
- cacheT += ("Store Values In Bytes", storeCfg.valueBytes())
+ cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
+ cacheT += ("Memory Mode", cfg.memoryMode())
+
+ cacheT += ("Store Values In Bytes", cfg.valueBytes())
cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
- cacheT += ("Write-Behind Enabled", writeBehind.enabled())
- cacheT += ("Write-Behind Flush Size", writeBehind.flushSize())
- cacheT += ("Write-Behind Frequency", writeBehind.flushFrequency())
- cacheT += ("Write-Behind Flush Threads Count", writeBehind.flushThreadCount())
- cacheT += ("Write-Behind Batch Size", writeBehind.batchSize())
+ cacheT += ("Store Enabled", storeCfg.enabled())
+ cacheT += ("Store", storeCfg.store())
+ cacheT += ("Store Factory", storeCfg.storeFactory())
- cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
- cacheT += ("Memory Mode", cfg.memoryMode())
+ cacheT += ("Store Read-Through", storeCfg.readThrough())
+ cacheT += ("Store Write-Through", storeCfg.writeThrough())
+
+ cacheT += ("Write-Behind Enabled", storeCfg.writeBehindEnabled())
+ cacheT += ("Write-Behind Flush Size", storeCfg.flushSize())
+ cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency())
+ cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount())
+ cacheT += ("Write-Behind Batch Size", storeCfg.batchSize())
println(title)
[46/50] [abbrv] incubator-ignite git commit: Improve
IgniteCacheExpiryPolicyAbstractTest.
Posted by ak...@apache.org.
Improve IgniteCacheExpiryPolicyAbstractTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0086e9cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0086e9cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0086e9cd
Branch: refs/heads/ignite-368
Commit: 0086e9cd2ab652d58adc4edf016932388de9686a
Parents: c847e88
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Mar 2 14:23:19 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Mar 2 14:25:02 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 ++------------------
1 file changed, 3 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0086e9cd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 3110cbc..e04659c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -103,23 +103,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
* @throws Exception If failed.
*/
public void testZeroOnUpdate() throws Exception {
- factory = new Factory<ExpiryPolicy>() {
- @Override public ExpiryPolicy create() {
- return new ExpiryPolicy() {
- @Override public Duration getExpiryForCreation() {
- return null;
- }
-
- @Override public Duration getExpiryForAccess() {
- return null;
- }
-
- @Override public Duration getExpiryForUpdate() {
- return Duration.ZERO;
- }
- };
- }
- };
+ factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, 0L, null));
startGrids();
@@ -150,23 +134,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
* @throws Exception If failed.
*/
public void testZeroOnAccess() throws Exception {
- factory = new Factory<ExpiryPolicy>() {
- @Override public ExpiryPolicy create() {
- return new ExpiryPolicy() {
- @Override public Duration getExpiryForCreation() {
- return null;
- }
-
- @Override public Duration getExpiryForAccess() {
- return Duration.ZERO;
- }
-
- @Override public Duration getExpiryForUpdate() {
- return null;
- }
- };
- }
- };
+ factory = new FactoryBuilder.SingletonFactory<>(new TestPolicy(null, null, 0L));
startGrids();
@@ -1087,7 +1055,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
/**
*
*/
- private class TestPolicy implements ExpiryPolicy {
+ private static class TestPolicy implements ExpiryPolicy {
/** */
private Long create;
[15/50] [abbrv] incubator-ignite git commit: gg-fix-deploy exclude
redundant cache-api.jar
Posted by ak...@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-368
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>
[13/50] [abbrv] incubator-ignite git commit: # ignite-325
Posted by ak...@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-368
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-->
[19/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 ak...@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-368
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(-)
----------------------------------------------------------------------
[24/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'origin/sprint-2' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[47/50] [abbrv] incubator-ignite git commit: sprint-2 fix for
ignite-301
Posted by ak...@apache.org.
sprint-2 fix for ignite-301
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea6a1c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea6a1c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea6a1c03
Branch: refs/heads/ignite-368
Commit: ea6a1c03c66c1f78a9d9f00f73f9483c32569858
Parents: c9f46c1
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Mar 2 16:00:21 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Mar 2 16:00:21 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContext.java | 10 ++++-
.../ignite/internal/GridKernalContextImpl.java | 14 +++++-
.../apache/ignite/internal/IgniteKernal.java | 23 +++++-----
.../processors/cluster/ClusterProcessor.java | 46 ++++++++++++++++++++
4 files changed, 78 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 100ad28..cb9ffa1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -33,11 +33,12 @@ import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.job.*;
import org.apache.ignite.internal.processors.jobmetrics.*;
import org.apache.ignite.internal.processors.offheap.*;
@@ -508,4 +509,11 @@ public interface GridKernalContext extends Iterable<GridComponent> {
* @return Exception registry.
*/
public IgniteExceptionRegistry exceptionRegistry();
+
+ /**
+ * Gets Cluster processor.
+ *
+ * @return Cluster processor.
+ */
+ public ClusterProcessor cluster();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 395ad52..756c16a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -36,11 +36,12 @@ import org.apache.ignite.internal.processors.cache.dr.os.*;
import org.apache.ignite.internal.processors.cache.serialization.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
-import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.job.*;
import org.apache.ignite.internal.processors.jobmetrics.*;
import org.apache.ignite.internal.processors.offheap.*;
@@ -245,6 +246,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringExclude
+ private ClusterProcessor cluster;
+
+ /** */
+ @GridToStringExclude
private DataStructuresProcessor dataStructuresProc;
/** */
@@ -461,6 +466,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
qryProc = (GridQueryProcessor)comp;
else if (comp instanceof DataStructuresProcessor)
dataStructuresProc = (DataStructuresProcessor)comp;
+ else if (comp instanceof ClusterProcessor)
+ cluster = (ClusterProcessor)comp;
else
assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();
@@ -854,6 +861,11 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
}
/** {@inheritDoc} */
+ @Override public ClusterProcessor cluster() {
+ return cluster;
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridKernalContextImpl.class, this);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/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 9c92edd..f46d071 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
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.clock.*;
import org.apache.ignite.internal.processors.closure.*;
+import org.apache.ignite.internal.processors.cluster.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.processors.dataload.*;
import org.apache.ignite.internal.processors.datastructures.*;
@@ -182,10 +183,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@GridToStringExclude
private boolean errOnStop;
- /** Cluster. */
- @GridToStringExclude
- private IgniteClusterImpl cluster;
-
/** Scheduler. */
@GridToStringExclude
private IgniteScheduler scheduler;
@@ -229,37 +226,37 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
@Override public IgniteClusterEx cluster() {
- return cluster;
+ return ctx.cluster().get();
}
/** {@inheritDoc} */
@Override public ClusterNode localNode() {
- return cluster.localNode();
+ return ctx.cluster().get().localNode();
}
/** {@inheritDoc} */
@Override public IgniteCompute compute() {
- return cluster.compute();
+ return ctx.cluster().get().compute();
}
/** {@inheritDoc} */
@Override public IgniteMessaging message() {
- return cluster.message();
+ return ctx.cluster().get().message();
}
/** {@inheritDoc} */
@Override public IgniteEvents events() {
- return cluster.events();
+ return ctx.cluster().get().events();
}
/** {@inheritDoc} */
@Override public IgniteServices services() {
- return cluster.services();
+ return ctx.cluster().get().services();
}
/** {@inheritDoc} */
@Override public ExecutorService executorService() {
- return cluster.executorService();
+ return ctx.cluster().get().executorService();
}
/** {@inheritDoc} */
@@ -678,7 +675,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
igfsExecSvc,
restExecSvc);
- cluster = new IgniteClusterImpl(ctx);
+ startProcessor(ctx, new ClusterProcessor(ctx), attrs);
U.onGridStart();
@@ -1793,7 +1790,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// No more kernal calls from this point on.
gw.setState(STOPPING);
- cluster.clearNodeMap();
+ ctx.cluster().get().clearNodeMap();
if (log.isDebugEnabled())
log.debug("Grid " + (gridName == null ? "" : '\'' + gridName + "' ") + "is stopping.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea6a1c03/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
new file mode 100644
index 0000000..0ee00f1
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cluster;
+
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.processors.*;
+
+/**
+ *
+ */
+public class ClusterProcessor extends GridProcessorAdapter {
+ /** */
+ private IgniteClusterImpl cluster;
+
+ /**
+ * @param ctx Kernal context.
+ */
+ public ClusterProcessor(GridKernalContext ctx) {
+ super(ctx);
+
+ cluster = new IgniteClusterImpl(ctx);
+ }
+
+ /**
+ * @return Cluster.
+ */
+ public IgniteClusterImpl get() {
+ return cluster;
+ }
+}
[29/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-322' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[07/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-298' into sprint-2
Posted by ak...@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-368
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(-)
----------------------------------------------------------------------
[22/50] [abbrv] incubator-ignite git commit: # ignite-325: revert
license from some files and fix serialVersionUID at 2 files
Posted by ak...@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-368
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>