[27/51] [abbrv] incubator-ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/535ca6f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/535ca6f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/535ca6f3
Branch: refs/heads/ignite-72-1
Commit: 535ca6f3b32f80df24325b3fcf6fb722b525e201
Parents: c5247ab
Author: Yakov Zhdanov
Authored: Thu Jan 29 12:46:12 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jan 29 12:46:12 2015 +0300
--
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/535ca6f3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index acab6d0..d962de0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1144,9 +1144,6 @@ public class IgnitionEx {
/** */
private static final String[] EMPTY_STR_ARR = new String[0];
-/** Empty array of caches. */
-private static final CacheConfiguration[] EMPTY_CACHE_CONFIGS = new
CacheConfiguration[0];
-
/** Grid name. */
private final String name;
[24/51] [abbrv] incubator-ignite git commit: GridNamedInstance -> IgniteNamedInstance GridgainEx -> IgnitionEx
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/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 776cda6..88dbef6 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
@@ -888,7 +888,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
*/
protected Object readResolve() throws ObjectStreamException {
try {
-return GridGainEx.gridx(stash.get()).context();
+return IgnitionEx.gridx(stash.get()).context();
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
index 042e3ec..d8e6816 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
@@ -200,7 +200,7 @@ public class GridLoggerProxy implements IgniteLogger,
LifecycleAware, Externaliz
String gridNameR = t.get1();
Object ctgrR = t.get2();
-return GridGainEx.gridx(gridNameR).log().getLogger(ctgrR);
+return IgnitionEx.gridx(gridNameR).log().getLogger(ctgrR);
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
[28/51] [abbrv] incubator-ignite git commit: #Tests: fix ignite-readme.pdf
#Tests: fix ignite-readme.pdf Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45353228 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45353228 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45353228 Branch: refs/heads/ignite-72-1 Commit: 45353228310224dbf4f86fb7b278e315b87bd0b2 Parents: d5bef13 Author: ivasilinets Authored: Thu Jan 29 12:49:22 2015 +0300 Committer: ivasilinets Committed: Thu Jan 29 12:49:22 2015 +0300 -- assembly/release-base-fabric.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45353228/assembly/release-base-fabric.xml -- diff --git a/assembly/release-base-fabric.xml b/assembly/release-base-fabric.xml index a13c6dc..bd70839 100644 --- a/assembly/release-base-fabric.xml +++ b/assembly/release-base-fabric.xml @@ -29,7 +29,7 @@ -docs/gridgain_readme.pdf +docs/ignite_readme.pdf /docs
[21/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
GridEx -> IgniteEx GridKernal -> IgniteKernal Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c323a8e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c323a8e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c323a8e7 Branch: refs/heads/ignite-72-1 Commit: c323a8e7b5302d3fe0aff957774b393e5097 Parents: d5bef13 Author: Yakov Zhdanov Authored: Thu Jan 29 12:41:40 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 12:41:41 2015 +0300 -- .../ClientAbstractMultiThreadedSelfTest.java|2 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 20 +- .../org/apache/ignite/internal/GridKernal.java | 3322 -- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |6 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../apache/ignite/internal/IgniteKernal.java| 3322 ++ .../processors/affinity/GridAffinityUtils.java |2 +- .../processors/cache/GridCacheAdapter.java |6 +- .../processors/cache/GridCacheContext.java |4 +- .../GridCacheDataStructuresManager.java |4 +- .../cache/query/GridCacheQueryManager.java |2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java|2 +- .../query/jdbc/GridCacheQueryJdbcTask.java |2 +- .../dr/GridDrDataLoadCacheUpdater.java |2 +- .../internal/processors/fs/GridGgfsImpl.java|2 +- .../resource/GridResourceProcessor.java |2 +- .../handlers/cache/GridCacheCommandHandler.java |6 +- .../handlers/task/GridTaskCommandHandler.java |2 +- .../processors/service/GridServiceProxy.java|2 +- .../apache/ignite/internal/visor/VisorJob.java |2 +- .../internal/visor/VisorMultiNodeTask.java |2 +- .../ignite/internal/visor/cache/VisorCache.java |2 +- .../compute/VisorComputeMonitoringHolder.java | 10 +- .../visor/node/VisorBasicConfiguration.java |2 +- .../visor/node/VisorGridConfiguration.java |2 +- .../visor/node/VisorNodeDataCollectorJob.java |2 +- .../internal/visor/query/VisorQueryTask.java|2 +- .../StreamerCacheAffinityEventRouter.java |2 +- .../ignite/GridExceptionHelpLinksSelfTest.java | 106 - .../ignite/GridExternalizableAbstractTest.java | 41 - .../IgniteExceptionHelpLinksSelfTest.java | 106 + .../IgniteExternalizableAbstractTest.java | 41 + ...CachePartitionFairAffinityNodesSelfTest.java |6 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java |2 +- .../ignite/fs/GridGgfsFragmentizerSelfTest.java |2 +- .../internal/GridDiscoveryEventSelfTest.java|3 +- .../ignite/internal/GridDiscoverySelfTest.java |4 +- .../internal/GridExecutorServiceTest.java | 315 -- .../GridExplicitImplicitDeploymentSelfTest.java | 476 --- .../ignite/internal/GridKernalTestUtils.java|3 +- .../internal/GridListenActorSelfTest.java |3 +- .../GridTopicExternalizableSelfTest.java|3 +- .../GridTopologyBuildVersionSelfTest.java |2 +- .../internal/GridUpdateNotifierSelfTest.java|3 +- .../internal/IgniteExecutorServiceTest.java | 315 ++ ...gniteExplicitImplicitDeploymentSelfTest.java | 476 +++ .../GridCheckpointManagerAbstractSelfTest.java |2 +- .../GridCommunicationSendMessageSelfTest.java |4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java |2 +- .../discovery/GridDiscoveryManagerSelfTest.java |6 +- .../swapspace/GridSwapSpaceManagerSelfTest.java |2 +- .../GridAffinityProcessorAbstractSelfTest.java |6 +- .../cache/GridCacheAbstractFullApiSelfTest.java |4 +- .../cache/GridCacheAbstractSelfTest.java|2 +- .../cache/GridCacheAffinityApiSelfTest.java |4 +- .../GridCacheConcurrentTxMultiNodeTest.java |4 +- .../cache/GridCacheEntryVersionSelfTest.java|4 +- .../GridCacheFinishPartitionsSelfTest.java |4 +- .../GridCacheGroupLockAbstractSelfTest.java |4 +- .../processors/cache/GridCacheLeakTest.java |2 +- ...GridCacheMixedPartitionExchangeSelfTest.java |2 +- .../cache/GridCacheMultiUpdateLockSelfTest.java |2 +- .../cache/GridCacheMvccFlagsTest.java |4 +- .../cache/GridCacheMvccManagerSelfTest.java |4 +- .../cache/G
[26/51] [abbrv] incubator-ignite git commit: GridNamedInstance -> IgniteNamedInstance GridgainEx -> IgnitionEx
GridNamedInstance -> IgniteNamedInstance
GridgainEx -> IgnitionEx
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5247ab3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5247ab3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5247ab3
Branch: refs/heads/ignite-72-1
Commit: c5247ab37b5233520bb610570d9a1dd2b793d0bb
Parents: c323a8e
Author: Yakov Zhdanov
Authored: Thu Jan 29 12:44:57 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jan 29 12:44:57 2015 +0300
--
.../main/java/org/apache/ignite/Ignition.java | 38 +-
.../apache/ignite/cache/CachingProvider.java|2 +-
.../ignite/internal/ClusterGroupAdapter.java|2 +-
.../internal/ClusterNodeLocalMapImpl.java |2 +-
.../org/apache/ignite/internal/GridGainEx.java | 2399 --
.../ignite/internal/GridKernalContextImpl.java |2 +-
.../apache/ignite/internal/GridLoggerProxy.java |2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 2399 ++
.../processors/cache/GridCacheAdapter.java |2 +-
.../processors/cache/GridCacheContext.java |2 +-
.../resource/GridSpringResourceContext.java |2 +-
.../fs/GridGgfsEventsAbstractSelfTest.java |2 +-
.../cache/GridCachePutRemoveLoadTest.java |2 +-
.../testframework/junits/GridAbstractTest.java |2 +-
.../java/org/apache/ignite/IgniteSpring.java|8 +-
.../GridServletContextListenerStartup.java |4 +-
.../startup/servlet/GridServletStartup.java |4 +-
17 files changed, 2437 insertions(+), 2437 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/Ignition.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java
b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 568b520..a8c3619 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -120,7 +120,7 @@ public class Ignition {
* @param daemon Daemon flag to set.
*/
public static void setDaemon(boolean daemon) {
-GridGainEx.setDaemon(daemon);
+IgnitionEx.setDaemon(daemon);
}
/**
@@ -134,7 +134,7 @@ public class Ignition {
* @return Daemon flag.
*/
public static boolean isDaemon() {
-return GridGainEx.isDaemon();
+return IgnitionEx.isDaemon();
}
/**
@@ -143,7 +143,7 @@ public class Ignition {
* @return Default grid state.
*/
public static IgniteState state() {
-return GridGainEx.state();
+return IgnitionEx.state();
}
/**
@@ -155,7 +155,7 @@ public class Ignition {
* @return Grid state.
*/
public static IgniteState state(@Nullable String name) {
-return GridGainEx.state(name);
+return IgnitionEx.state(name);
}
/**
@@ -170,7 +170,7 @@ public class Ignition {
* {@code false} otherwise (if it was not started).
*/
public static boolean stop(boolean cancel) {
-return GridGainEx.stop(cancel);
+return IgnitionEx.stop(cancel);
}
/**
@@ -193,7 +193,7 @@ public class Ignition {
* not found).
*/
public static boolean stop(@Nullable String name, boolean cancel) {
-return GridGainEx.stop(name, cancel);
+return IgnitionEx.stop(name, cancel);
}
/**
@@ -212,7 +212,7 @@ public class Ignition {
* up to the actual job to exit from execution
*/
public static void stopAll(boolean cancel) {
-GridGainEx.stopAll(cancel);
+IgnitionEx.stopAll(cancel);
}
/**
@@ -236,7 +236,7 @@ public class Ignition {
* @see #RESTART_EXIT_CODE
*/
public static void restart(boolean cancel) {
-GridGainEx.restart(cancel);
+IgnitionEx.restart(cancel);
}
/**
@@ -259,7 +259,7 @@ public class Ignition {
* @see #KILL_EXIT_CODE
*/
public static void kill(boolean cancel) {
-GridGainEx.kill(cancel);
+IgnitionEx.kill(cancel);
}
/**
@@ -272,7 +272,7 @@ public class Ignition {
* also if default grid has already been started.
*/
public static Ignite start() throws IgniteCheckedException {
-return GridGainEx.start();
+return IgnitionEx.start();
}
/**
@@ -285,7 +285,7 @@ public class Ignition {
* also if named grid has already been started.
*/
public static Ignite start(IgniteConfiguration cfg) throws
IgniteCheckedException {
-return GridGainEx.start(cfg);
+return
[11/51] [abbrv] incubator-ignite git commit: # ignite-117 : refactoring (java-doc and etc.)
# ignite-117 : refactoring (java-doc and etc.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d01fa229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d01fa229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d01fa229
Branch: refs/heads/ignite-72-1
Commit: d01fa229ea9552e9e5b7272dea89266a63fac3ed
Parents: d5ef125
Author: Artem SHutak
Authored: Wed Jan 28 21:30:00 2015 +0300
Committer: Artem SHutak
Committed: Wed Jan 28 21:30:00 2015 +0300
--
.../apache/ignite/internal/util/GridUtils.java | 22 +++-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 10 +++---
.../IpcSharedMemoryNativeLoaderSelfTest.java| 32 ++
.../LoadWithCorruptedLibFileTestRunner.java | 35 ++--
4 files changed, 83 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
index 62b2069..9f01e98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
@@ -9099,12 +9099,14 @@ public abstract class GridUtils {
}
/**
- * @param in
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * Calculate MD5 digits.
+ *
+ * @param in Input stream.
+ * @return Calculated MD5 digest for given input stream.
+ * @throws NoSuchAlgorithmException If MD5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
-public static byte[] calculateMD5Digest(InputStream in) throws
NoSuchAlgorithmException, IOException {
+public static byte[] calculateMD5Digest(@NotNull InputStream in) throws
NoSuchAlgorithmException, IOException {
MessageDigest md = MessageDigest.getInstance("MD5");
InputStream fis = new BufferedInputStream(in);
byte[] dataBytes = new byte[1024];
@@ -9118,10 +9120,12 @@ public abstract class GridUtils {
}
/**
- * @param in Input.
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * Calculate MD5 string.
+ *
+ * @param in Input stream.
+ * @return Calculated MD5 string for given input stream.
+ * @throws NoSuchAlgorithmException If MD5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
public static String calculateMD5(InputStream in) throws
NoSuchAlgorithmException, IOException {
byte[] md5Bytes = calculateMD5Digest(in);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index a835c96..cb52912 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -242,11 +242,11 @@ public class IpcSharedMemoryNativeLoader {
}
/**
- * @param target
- * @param src
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * @param target Target.
+ * @param src Source.
+ * @return {@code True} if target md5-sum equal to source md5-sum.
+ * @throws NoSuchAlgorithmException If md5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
private static boolean haveEqualMD5(File target, URL src) throws
NoSuchAlgorithmException, IOException {
try (InputStream targetIS = new FileInputStream(target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
index e75eb04..e70c207 100644
---
a/modules/core/src/test/java/org/apac
[22/51] [abbrv] incubator-ignite git commit: GridNamedInstance -> IgniteNamedInstance GridgainEx -> IgnitionEx
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 35b34f0..0e60832 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4430,7 +4430,7 @@ public abstract class GridCacheAdapter implements
GridCache,
try {
IgniteBiTuple t = stash.get();
-return GridGainEx.gridx(t.get1()).cachex(t.get2());
+return IgnitionEx.gridx(t.get1()).cachex(t.get2());
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 0f5b06d..1f624f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1888,7 +1888,7 @@ public class GridCacheContext implements
Externalizable {
try {
IgniteBiTuple t = stash.get();
-IgniteKernal grid = GridGainEx.gridx(t.get1());
+IgniteKernal grid = IgnitionEx.gridx(t.get1());
GridCacheAdapter cache = grid.internalCache(t.get2());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
index f5db642..369837e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.*;
/**
* Interface was introduced to avoid compile-time dependency on spring
framework. Spring resource context
* provides optional spring resource injectors, it can be passed to factory
method
- * starting GridGain {@link GridGainEx#start(GridSpringResourceContext)}.
+ * starting GridGain {@link IgnitionEx#start(GridSpringResourceContext)}.
*/
public interface GridSpringResourceContext {
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
index a72b151..c96ad41 100644
---
a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java
@@ -111,7 +111,7 @@ public abstract class GridGgfsEventsAbstractSelfTest
extends GridCommonAbstractT
* @throws Exception If failed.
*/
protected IgniteConfiguration getConfiguration(String gridName,
IgniteFsConfiguration ggfsCfg) throws Exception {
-IgniteConfiguration cfg =
GridGainEx.loadConfiguration("config/hadoop/default-config.xml").get1();
+IgniteConfiguration cfg =
IgnitionEx.loadConfiguration("config/hadoop/default-config.xml").get1();
assert cfg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
index e11963d..6eca2c8 100644
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java
+++
b/modules
[01/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename all 'ggshem' on 'igniteshmem'
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-72-1 18e02cd7c -> e19655dfb
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
--
diff --git
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
new file mode 100644
index 000..eaa13fd
--- /dev/null
+++
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
@@ -0,0 +1,882 @@
+/*
+ * 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.
+ */
+
+#include "org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace std;
+
+/** IgniteCheckedException JNI class name. */
+const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
+
+/** GridIpcSharedMemoryOperationTimedoutException JNI class name. */
+const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryOperationTimedoutException";
+
+/** GridIpcOutOfSystemResourcesException JNI class name. */
+const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcOutOfSystemResourcesException";
+
+/** Global flag for enabling debug logging. */
+static bool __GG_DEBUG = false;
+
+/** Read semaphore ID. */
+#define SEM_READ 0
+
+/** Write semaphore ID. */
+#define SEM_WRITE 1
+
+/**
+ * Logging macro.
+ *
+ * @param m Logging message with optional formatting symbols.
+ * @param varagrs Formatting arguments.
+ */
+#define GG_LOG_DEBUG(m, ...) {\
+if(__GG_DEBUG)\
+log(__FILE__, __LINE__, __FUNCTION__, m, __VA_ARGS__);\
+}
+
+/** Buffer size for current time string. */
+#define TIME_NOW_BUF_SIZE 1024
+
+/** Buffer size for debug message. */
+#define FORMAT_LOG_BUF_SIZE 4096
+
+/**
+ * @return Current time string in format: year-month-day hour:minute:second.
+ */
+static string timeNow() {
+timeval tv;
+tm lt;
+
+char timebuf[TIME_NOW_BUF_SIZE];
+
+gettimeofday(&tv, 0);
+
+time_t now = tv.tv_sec;
+localtime_r(&now, <);
+
+// Clone the format used by log4j ISO8601DateFormat,
+// specifically: "-MM-dd HH:mm:ss.SSS"
+size_t len = strftime(timebuf, TIME_NOW_BUF_SIZE, "%Y-%m-%d %H:%M:%S",
<);
+
+snprintf(timebuf + len, TIME_NOW_BUF_SIZE - len, ".%03d", (int)
(tv.tv_usec / 1000));
+
+return string(timebuf);
+}
+
+/**
+ * Writes debug message to standard output, if global debug flag is enabled.
+ *
+ * @param file Source file, from which the message originates.
+ * @param line Source line, from which the message originates.
+ * @param funcName Name of the function, from which the message originates.
+ * @param format Message string with optional formatting symbols.
+ * @param varargs Formatting arguments.
+ */
+static void log(const char* file, int line, const char* funcName, const char*
format, ...) {
+static pid_t pid = getpid();
+
+char msgbuf[FORMAT_LOG_BUF_SIZE];
+va_list va;
+
+va_start(va, format);
+vsnprintf(msgbuf, FORMAT_LOG_BUF_SIZE - 1, format, va);
+va_end(va);
+
+cout << timeNow() << " pid:" << pid << " " << file << ":" << funcName <<
":" << line << ": " << msgbuf << endl;
+
+flush(cout);
+}
+
+/** Lock operation on semaphore #0. */
+struct sembuf op_lock0[2] = {
+0, 0, 0, // Wait until semaphore #0 becomes 0.
+0, 1, 0 // Then increment semaphore #0 by 1.
+};
+
+/** Lock operation on semaphore #1. */
+struct sembuf op_lock1[2] = {
+1, 0, 0, // Wait until semaphore #1 becomes 0.
+1, 1, 0 // Then increment semaphore #1 by 1.
+};
+
+/**
+ * Data offset in shared memory buffer (the memory segment preceding data
+ * is used for IPC data).
+ */
+#define BUF_OFFSET 64
+
+/**
+ * IPC data, that is used for inter-process communication.
+ */
+typedef struct {
+/** Number of parties that have closed the connection (0, 1, or 2). */
+int clo
[10/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-117' into ignite-117
Merge remote-tracking branch 'origin/ignite-117' into ignite-117 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5ef125c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5ef125c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5ef125c Branch: refs/heads/ignite-72-1 Commit: d5ef125ca7be8d203c4ff4dbcb9268df8ea0144b Parents: e50ca07 07b24d0 Author: Artem SHutak Authored: Wed Jan 28 20:52:31 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 20:52:31 2015 +0300 -- .../main/java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../java/META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33108 bytes 2 files changed, 0 insertions(+), 0 deletions(-) --
[13/51] [abbrv] incubator-ignite git commit: # ignite-109 Fixed test
# ignite-109 Fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4cd6321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4cd6321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4cd6321
Branch: refs/heads/ignite-72-1
Commit: e4cd6321c34e2b1490d360fc6e7d236d4be6c1b0
Parents: 5791d43
Author: sboikov
Authored: Thu Jan 29 07:27:05 2015 +0300
Committer: sboikov
Committed: Thu Jan 29 07:27:05 2015 +0300
--
.../cache/integration/IgniteCacheTxStoreSessionTest.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4cd6321/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
index c95461d..bfc8837 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
@@ -248,7 +248,6 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
/**
* @throws Exception If failed.
*/
-// TODO IGNITE-109: fix test when fixed.
public void testSessionCrossCacheTx() throws Exception {
IgniteCache cache0 = ignite(0).jcache(null);
@@ -262,8 +261,9 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
cache1.put(key2, 0);
-expData.add(new ExpectedData(true, "writeAll", new HashMap<>(),
null));
-expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "writeAll"), null));
+expData.add(new ExpectedData(true, "write", new HashMap<>(),
null));
+expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), CACHE_NAME1));
+expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "write", 1, "write"), null));
tx.commit();
}
@@ -275,8 +275,9 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
cache0.put(key2, 0);
-expData.add(new ExpectedData(true, "writeAll", new HashMap<>(),
null));
-expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "writeAll"), null));
+expData.add(new ExpectedData(true, "write", new HashMap<>(),
CACHE_NAME1));
+expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), null));
+expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "write", 1, "write"), null));
tx.commit();
}
[30/51] [abbrv] incubator-ignite git commit: # ignite-117 : fix IpcSharedMemoryUtils.cpp (fix name of exceptions)
# ignite-117 : fix IpcSharedMemoryUtils.cpp (fix name of exceptions)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96f56c78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96f56c78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96f56c78
Branch: refs/heads/ignite-72-1
Commit: 96f56c7801c920b47e76b752a903f023bab74b35
Parents: d01fa22
Author: Artem SHutak
Authored: Thu Jan 29 15:49:45 2015 +0300
Committer: Artem SHutak
Committed: Thu Jan 29 15:49:45 2015 +0300
--
...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 26 ++--
1 file changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96f56c78/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
--
diff --git
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
index eaa13fd..923c6fb 100644
---
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
+++
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
@@ -36,13 +36,13 @@
using namespace std;
/** IgniteCheckedException JNI class name. */
-const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
+const char* IGNITE_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
-/** GridIpcSharedMemoryOperationTimedoutException JNI class name. */
-const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryOperationTimedoutException";
+/** IpcSharedMemoryOperationTimedoutException JNI class name. */
+const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException";
-/** GridIpcOutOfSystemResourcesException JNI class name. */
-const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcOutOfSystemResourcesException";
+/** IpcOutOfSystemResourcesException JNI class name. */
+const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException";
/** Global flag for enabling debug logging. */
static bool __GG_DEBUG = false;
@@ -220,7 +220,7 @@ static void throwExceptionByErrno(JNIEnv* env) {
break;
default:
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
break;
}
}
@@ -244,7 +244,7 @@ static bool semInit(JNIEnv* env, int semId, int semNum) {
GG_LOG_DEBUG("Semaphore init failed [semId=%d, semNum=%s, errno=%d]",
semId,
semNum == SEM_READ ? "SEM_READ" : "SEM_WRITE", errno);
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
return false;
}
@@ -299,7 +299,7 @@ static void semWait(JNIEnv * env, int semId, int semNum,
int timeout, T_IpcData
return;
}
else {
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
}
}
}
@@ -329,7 +329,7 @@ static void semNotify(JNIEnv * env, int semId, int semNum,
T_IpcData *ipcData) {
GG_LOG_DEBUG("Semaphore wait failed [semId=%d, semNum=%s, errno=%d]",
semId,
semNum == SEM_READ ? "SEM_READ" : "SEM_WRITE", errno);
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
}
}
@@ -361,7 +361,7 @@ jlong
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_alloca
// Get system token, used in IPC.
if ((key = ::ftok(tokFileName.c_str(), 'G')) == -1) {
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
return 0;
}
@@ -405,7 +405,7 @@ jlong
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_alloca
// Initialize SEM_READ and SEM_WRITE to 1.
if (!semInit(env, semId, SEM_READ) || !semInit(env, semId, SEM_WRITE)) {
// Exception will be thrown on return.
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
// Cleanup ignoring possible errors.
::semctl(semId, 0, IPC_RMID);
@@ -722,7 +722,7 @@ void
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_WriteSh
while (unreadCnt == ipcData->size) {
if (ipcData->closed) {
-env->ThrowNew(env->FindClass(GRID_EXCEPTION), "Shared memory
segment has been closed.");
+env->ThrowNew(env->FindClass(IGNITE_EXCEPTION), "Shared memory
segment has been close
[31/51] [abbrv] incubator-ignite git commit: # ignite-117 : rebuild igniteshmem.so
# ignite-117 : rebuild igniteshmem.so Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e73857f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e73857f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e73857f1 Branch: refs/heads/ignite-72-1 Commit: e73857f1604645fa7593d7a7f8d26f286a8c8ea5 Parents: 96f56c7 Author: Artem SHutak Authored: Thu Jan 29 16:07:44 2015 +0300 Committer: Artem SHutak Committed: Thu Jan 29 16:07:44 2015 +0300 -- .../META-INF/native/linux64/libigniteshmem.so | Bin 138335 -> 138345 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73857f1/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so index ff0f674..36de663 100755 Binary files a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so and b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so differ
[19/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 a7dd3aa..17f3ec8 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
@@ -138,7 +138,7 @@ public interface GridKernalContext extends
Iterable {
*
* @return Grid instance.
*/
-public GridEx grid();
+public IgniteEx grid();
/**
* Gets grid configuration.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 8bb0085..776cda6 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
@@ -266,7 +266,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
private List comps = new LinkedList<>();
/** */
-private GridEx grid;
+private IgniteEx grid;
/** */
private ExecutorService utilityCachePool;
@@ -320,7 +320,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
*/
@SuppressWarnings("TypeMayBeWeakened")
protected GridKernalContextImpl(GridLoggerProxy log,
-GridEx grid,
+IgniteEx grid,
IgniteConfiguration cfg,
GridKernalGateway gw,
ExecutorService utilityCachePool,
@@ -496,7 +496,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
}
/** {@inheritDoc} */
-@Override public GridEx grid() {
+@Override public IgniteEx grid() {
return grid;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 9720a60..4bfeb5c 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
@@ -219,7 +219,7 @@ class GridUpdateNotifier {
throttle(log, false, "Your version is up to date.");
}
else
-throttle(log, true, "New version is available at " +
GridKernal.SITE + ": " + latestVer);
+throttle(log, true, "New version is available at " +
IgniteKernal.SITE + ": " + latestVer);
else
if (!reportOnlyNew)
throttle(log, false, "Update status is not available.");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
index a02c931..ae4b541 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
@@ -31,12 +31,12 @@ import java.util.*;
*/
public class IgniteClusterAsyncImpl extends
IgniteAsyncSupportAdapter implements IgniteCluster {
/** */
-private final GridKernal grid;
+private final IgniteKernal grid;
/**
* @param grid Grid.
*/
-public IgniteClusterAsyncImpl(GridKernal grid) {
+public IgniteClusterAsyncImpl(IgniteKernal grid) {
super(true);
this.grid = grid;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
new file mode 100644
index 000..6aa8bf5
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Fou
[14/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index fda2751..0e83e66 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -71,10 +71,10 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(GridDeploymentSelfTest.class);
suite.addTestSuite(GridDeploymentMultiThreadedSelfTest.class);
suite.addTestSuite(GridMultipleVersionsDeploymentSelfTest.class);
-suite.addTestSuite(GridExplicitImplicitDeploymentSelfTest.class);
+suite.addTestSuite(IgniteExplicitImplicitDeploymentSelfTest.class);
suite.addTestSuite(GridEventStorageCheckAllEventsSelfTest.class);
suite.addTestSuite(GridCommunicationManagerListenersSelfTest.class);
-suite.addTestSuite(GridExecutorServiceTest.class);
+suite.addTestSuite(IgniteExecutorServiceTest.class);
suite.addTestSuite(GridTaskInstantiationSelfTest.class);
suite.addTestSuite(GridManagementJobSelfTest.class);
suite.addTestSuite(GridMultipleJobsSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
index 651ed02..d98d8f4 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
@@ -158,7 +158,7 @@ public class GridHadoopDefaultMapReducePlanner implements
GridHadoopMapReducePla
GridGgfsEx ggfs = null;
if (F.eq(ignite.name(), endpoint.grid()))
-ggfs = (GridGgfsEx)((GridEx)ignite).ggfsx(endpoint.ggfs());
+ggfs =
(GridGgfsEx)((IgniteEx)ignite).ggfsx(endpoint.ggfs());
if (ggfs != null && !ggfs.isProxy(split0.file())) {
Collection blocks =
ggfs.affinity(new IgniteFsPath(split0.file()),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
index 13618fc..8f66dae 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
@@ -164,7 +164,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends
GridGgfsCommonAbstra
*/
@SuppressWarnings("ConstantConditions")
private void switchHandlerErrorFlag(boolean flag) throws Exception {
-IgniteFsProcessorAdapter ggfsProc =
((GridKernal)grid(0)).context().ggfs();
+IgniteFsProcessorAdapter ggfsProc =
((IgniteKernal)grid(0)).context().ggfs();
Map ggfsMap = getField(ggfsProc, "ggfsCache");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 5688500..65b8ba2 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -70,7 +70,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest
extends GridHadoopAbstrac
private static final String INVALID_HOST_3 = "invalid_host3";
/** Mocked Gr
[12/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-109
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-109 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5791d43a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5791d43a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5791d43a Branch: refs/heads/ignite-72-1 Commit: 5791d43aed7d8a1a4566d4b18b4b20848f1d942c Parents: 31ce585 673d11b Author: sboikov Authored: Thu Jan 29 07:09:13 2015 +0300 Committer: sboikov Committed: Thu Jan 29 07:09:13 2015 +0300 -- .../hibernate/example-hibernate-L2-cache.xml| 14 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../datagrid/CacheDataLoaderExample.java| 15 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- .../examples/ScalarContinuationExample.scala| 2 +- .../apache/ignite/gridify/AbstractAopTest.java | 2 +- .../apache/ignite/gridify/TestGridifyTask.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java| 1 + .../java/org/apache/ignite/IgniteCache.java | 40 ++- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../java/org/apache/ignite/IgniteCompute.java | 2 +- .../java/org/apache/ignite/IgniteEvents.java| 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../java/org/apache/ignite/IgniteManaged.java | 2 +- .../java/org/apache/ignite/IgniteMessaging.java | 2 +- .../java/org/apache/ignite/cache/CacheLock.java | 57 .../org/apache/ignite/cache/CacheManager.java | 10 +- .../ignite/cache/GridCacheVersionedEntry.java | 82 ++ .../org/apache/ignite/internal/GridKernal.java | 32 +-- .../ignite/internal/IgniteClusterAsyncImpl.java | 9 +- .../ignite/internal/IgniteComputeImpl.java | 70 ++--- .../ignite/internal/IgniteEventsImpl.java | 9 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../ignite/internal/IgniteMessagingImpl.java| 12 +- .../internal/executor/GridExecutorService.java | 2 +- .../managers/communication/GridIoManager.java | 3 +- .../processors/cache/CacheLockImpl.java | 132 ++--- .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheAtomicVersionComparator.java | 2 + .../cache/GridCacheBatchSwapEntry.java | 1 + .../cache/GridCacheClearAllRunnable.java| 1 + .../processors/cache/GridCacheContext.java | 44 +++ .../processors/cache/GridCacheEntryEx.java | 9 + .../processors/cache/GridCacheEntryInfo.java| 1 + .../cache/GridCacheEvictionManager.java | 1 + .../cache/GridCacheEvictionRequest.java | 1 + .../cache/GridCacheExplicitLockSpan.java| 1 + .../processors/cache/GridCacheFuture.java | 1 + .../cache/GridCacheLockTimeoutException.java| 2 + .../processors/cache/GridCacheMapEntry.java | 117 ++-- .../processors/cache/GridCacheMvcc.java | 1 + .../cache/GridCacheMvccCandidate.java | 1 + .../processors/cache/GridCacheMvccManager.java | 1 + .../cache/GridCacheOffheapSwapEntry.java| 1 + .../processors/cache/GridCacheProcessor.java| 1 + .../processors/cache/GridCacheProjectionEx.java | 1 + .../cache/GridCacheProjectionImpl.java | 1 + .../processors/cache/GridCacheProxyImpl.java| 1 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheStoreManager.java | 19 +- .../processors/cache/GridCacheSwapEntry.java| 1 + .../cache/GridCacheSwapEntryImpl.java | 1 + .../processors/cache/GridCacheSwapManager.java | 1 + .../processors/cache/GridCacheTtlManager.java | 1 + .../cache/GridCacheUpdateAtomicResult.java | 7 +- .../processors/cache/GridCacheUtils.java| 1 + .../processors/cache/GridCacheVersion.java | 256 - .../processors/cache/GridCacheVersionEx.java| 104 --- .../cache/GridCacheVersionManager.java | 281 -- .../processors/cache/GridCacheVersionable.java | 28 -- .../processors/cache/GridDrResolveResult.java | 63 - .../cache/IgniteCacheExpiryPolicy.java | 1 + .../processors/cache/IgniteCacheProxy.java | 33 +-- .../distributed/GridCacheCommittedTxInfo.java | 2 +- .../distributed/GridCacheMappedVersion.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 1 + ...idCacheOptimisticCheckPreparedTxRequest.java | 2 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../GridCachePerThreadTxCommitBuffer.java | 1 + ...dCachePessimisticCheckCommittedTxFuture.java | 1 + ...CachePessimisticCheckCommittedTxRequest.java | 2 +
[04/51] [abbrv] incubator-ignite git commit: ignite-117: rebuilt
ignite-117: rebuilt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07b24d04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07b24d04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07b24d04 Branch: refs/heads/ignite-72-1 Commit: 07b24d040a36e2419557a9e7f455ce41952a15df Parents: 3789241 Author: Yakov Zhdanov Authored: Wed Jan 28 19:54:51 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jan 28 19:54:51 2015 +0300 -- .../main/java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../java/META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33108 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b24d04/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib deleted file mode 100755 index bfee82f..000 Binary files a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b24d04/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib new file mode 100755 index 000..6cfeb9e Binary files /dev/null and b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib differ
[29/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ea96070 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ea96070 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ea96070 Branch: refs/heads/ignite-72-1 Commit: 9ea96070ac972ca23ccf1e34c980303a4c45e823 Parents: 535ca6f 4535322 Author: Yakov Zhdanov Authored: Thu Jan 29 13:33:03 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 13:33:03 2015 +0300 -- assembly/release-base-fabric.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[03/51] [abbrv] incubator-ignite git commit: # ignite-117 : native code was rebuilded and 'libigniteshmem.so' was added
# ignite-117 : native code was rebuilded and 'libigniteshmem.so' was added Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3789241c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3789241c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3789241c Branch: refs/heads/ignite-72-1 Commit: 3789241c9342bf8d399bd39842deb4c67c9379a2 Parents: ae3ba8c Author: Artem SHutak Authored: Wed Jan 28 19:42:13 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 19:42:13 2015 +0300 -- .../java/META-INF/native/linux64/libggshmem.so| Bin 138335 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138335 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3789241c/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so deleted file mode 100755 index 7dd28f0..000 Binary files a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3789241c/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so new file mode 100755 index 000..ff0f674 Binary files /dev/null and b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so differ
[47/51] [abbrv] incubator-ignite git commit: # ignite-sprint-1 fixed build.
# ignite-sprint-1 fixed build. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fe57d44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fe57d44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fe57d44 Branch: refs/heads/ignite-72-1 Commit: 4fe57d44373294700dcdeb42206bd525ce84475a Parents: bdebb40 Author: AKuznetsov Authored: Fri Jan 30 09:55:21 2015 +0700 Committer: AKuznetsov Committed: Fri Jan 30 09:55:21 2015 +0700 -- assembly/release-hadoop.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe57d44/assembly/release-hadoop.xml -- diff --git a/assembly/release-hadoop.xml b/assembly/release-hadoop.xml index 7dbd5ea..576425c 100644 --- a/assembly/release-hadoop.xml +++ b/assembly/release-hadoop.xml @@ -39,15 +39,15 @@ /docs -docs/core-site.gridgain.xml +docs/core-site.ignite.xml /docs -docs/mapred-site.gridgain.xml +docs/mapred-site.ignite.xml /docs -docs/hive-site.gridgain.xml +docs/hive-site.ignite.xml /docs
[43/51] [abbrv] incubator-ignite git commit: # sprint-1 Fixed typo after auto renaming.
# sprint-1 Fixed typo after auto renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14ad3ea5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14ad3ea5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14ad3ea5
Branch: refs/heads/ignite-72-1
Commit: 14ad3ea5c988ab0a034fbfb389b9274f9631fd69
Parents: 7eebc7e
Author: AKuznetsov
Authored: Thu Jan 29 22:30:51 2015 +0700
Committer: AKuznetsov
Committed: Thu Jan 29 22:30:51 2015 +0700
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14ad3ea5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index 1899ca4..837b424 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -278,7 +278,7 @@ class VisorAlertCommand {
// Grid-wide metrics (not node specific).
case "cc" if v != null => gf = makeGridFilter(v,
gf, grid.metrics().getTotalCpus)
case "nc" if v != null => gf = makeGridFilter(v,
gf, grid.nodes().size)
-case "hc" if v != null => gf = makeGridFilter(v,
gf, IgniteUtils.neighborhood(grid.nodes()).size)
+case "hc" if v != null => gf = makeGridFilter(v,
gf, U.neighborhood(grid.nodes()).size)
case "cl" if v != null => gf = makeGridFilter(v,
gf,
() => (grid.metrics().getAverageCpuLoad *
100).toLong)
[05/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
new file mode 100644
index 000..fab41e7
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
@@ -0,0 +1,259 @@
+/*
+ * 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.util.ipc.shmem;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jdk8.backport.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ *
+ */
+public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
+/** */
+public static final int DATA_LEN = 1024 * 1024;
+
+/** */
+private static final byte[] DATA = new byte[DATA_LEN];
+
+/**
+ *
+ */
+static {
+for (int i = 0; i < DATA_LEN; i++)
+DATA[i] = (byte)i;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+IpcSharedMemoryNativeLoader.load();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testBasicOperations() throws Exception {
+File tokFile = new
File(IgniteSystemProperties.getString("java.io.tmpdir"),
UUID.randomUUID().toString());
+
+assert tokFile.createNewFile();
+
+final String tok = tokFile.getAbsolutePath();
+
+info("Array length: " + DATA.length);
+
+final AtomicReference spaceRef = new
AtomicReference<>();
+
+IgniteFuture fut1 = multithreadedAsync(
+new Callable() {
+@SuppressWarnings("TooBroadScope")
+@Override public Object call() throws Exception {
+try (IpcSharedMemorySpace space = new
IpcSharedMemorySpace(tok, 0, 0, 128, false,
+log)) {
+spaceRef.set(space);
+
+int bytesWritten = 0;
+
+for (; ; ) {
+int len = Math.min(DATA.length - bytesWritten,
+ThreadLocalRandom8.current().nextInt(256) + 1);
+
+space.write(DATA, bytesWritten, len, 0);
+
+bytesWritten += len;
+
+if (bytesWritten == DATA.length)
+break;
+}
+
+info("Thread finished.");
+
+return null;
+}
+}
+},
+1,
+"writer");
+
+IgniteFuture fut2 = multithreadedAsync(
+new Callable() {
+@SuppressWarnings({"TooBroadScope", "StatementWithEmptyBody"})
+@Override public Object call() throws Exception {
+IpcSharedMemorySpace inSpace;
+
+while ((inSpace = spaceRef.get()) == null) {
+// No-op;
+}
+
+try (IpcSharedMemorySpace space = new
IpcSharedMemorySpace(tok, 0, 0, 128, true,
+inSpace.sharedMemoryId(), log)) {
+byte[] buf = new byte[DATA_LEN];
+
+int bytesRead = 0;
+
+for (; ; ) {
+int len = Math.min(DATA.length - bytesRead,
+ThreadLocalRandom8.current().nextInt(32) + 1);
+
+int len0 = space.read(buf, bytesRead, len, 0);
+
+assert len0 > 0;
+
+bytesRead += len0;
+
+if (bytesRead == DATA_LEN)
+bre
[34/51] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
index ef36125..05c76b4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
@@ -20,9 +20,9 @@ package org.apache.ignite.internal.util.typedef.internal;
import org.apache.ignite.internal.util.*;
/**
- * Defines internal {@code typedef} for {@link GridUtils}. Since Java doesn't
provide type aliases
+ * Defines internal {@code typedef} for {@link IgniteUtils}. Since Java
doesn't provide type aliases
* (like Scala, for example) we resort to these types of measures. This is
intended for internal
* use only and meant to provide for more terse code when readability of code
is not compromised.
*/
@SuppressWarnings({"ExtendsUtilityClass"})
-public class U extends GridUtils { /* No-op. */ }
+public class U extends IgniteUtils { /* No-op. */ }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
index 8a2247e..6342bb5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
@@ -63,7 +63,7 @@ public class VisorResolveHostNameTask extends
VisorOneNodeTask, Collection> addrs =
-
GridUtils.resolveLocalAddresses(InetAddress.getByName("0.0.0.0"));
+
IgniteUtils.resolveLocalAddresses(InetAddress.getByName("0.0.0.0"));
assert(addrs.get1() != null);
assert(addrs.get2() != null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index 95bb434..190f6da 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -53,8 +53,8 @@ public class VisorQueryUtils {
if (o != null) {
Class clazz = o.getClass();
-return clazz.isArray() ?
GridUtils.compact(clazz.getComponentType().getName()) + "[]"
-: GridUtils.compact(o.getClass().getName());
+return clazz.isArray() ?
IgniteUtils.compact(clazz.getComponentType().getName()) + "[]"
+: IgniteUtils.compact(o.getClass().getName());
}
else
return "n/a";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index bee3a2e..22349e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -183,7 +183,7 @@ public class IgniteOptimizedMarshaller extends
IgniteAbstractMarshaller {
if (path == null)
return;
-URL url = GridUtils.resolveGridGainUrl(path, false);
+URL url = IgniteUtils.resolveGridGainUrl(path, false);
if (url == null)
throw new IgniteCheckedException("Failed to find resource for
name: " + path);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
index 3fbf4ec.
[16/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
new file mode 100644
index 000..d76fe95
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
@@ -0,0 +1,315 @@
+/*
+ * 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 org.apache.ignite.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.executor.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Grid distributed executor test.
+ */
+@GridCommonTest(group = "Thread Tests")
+public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
+/** */
+public IgniteExecutorServiceTest() {
+super(true);
+}
+
+/**
+ * @throws Exception Thrown in case of test failure.
+ */
+public void testExecute() throws Exception {
+Ignite ignite = G.ignite(getTestGridName());
+
+ExecutorService srvc = createExecutorService(ignite);
+
+srvc.execute(new Runnable() {
+@IgniteInstanceResource
+private Ignite ignite;
+
+@Override public void run() {
+System.out.println("Test message.");
+
+assert this.ignite != null;
+}
+});
+
+srvc.execute(new TestRunnable());
+
+srvc.shutdown();
+}
+
+/**
+ * @throws Exception Thrown in case of test failure.
+ */
+public void testSubmit() throws Exception {
+Ignite ignite = G.ignite(getTestGridName());
+
+ExecutorService srvc = createExecutorService(ignite);
+
+Future fut = srvc.submit(new TestRunnable());
+
+Object res = fut.get();
+
+info("Default Runnable result:" + res);
+
+assert res == null : "Failed to get valid default result for submitted
Runnable: " + res;
+
+String val = "test-value";
+
+fut = srvc.submit(new TestRunnable(), val);
+
+res = fut.get();
+
+info("Defined Runnable result:" + res);
+
+assert val.equals(res) : "Failed to get valid predefined result for
submitted Runnable: " + res;
+
+fut = srvc.submit(new TestCallable<>(val));
+
+res = fut.get();
+
+info("Callable result:" + res);
+
+assert val.equals(res) : "Failed to get valid result for submitted
Callable: " + res;
+
+srvc.shutdown();
+}
+
+/**
+ * @throws Exception Thrown in case of test failure.
+ */
+public void testSubmitWithFutureTimeout() throws Exception {
+Ignite ignite = G.ignite(getTestGridName());
+
+ExecutorService srvc = createExecutorService(ignite);
+
+Future fut = srvc.submit(new TestCallable<>(3000)); // Just
sleep for 3 seconds.
+
+boolean ok = true;
+
+try {
+fut.get(1, TimeUnit.SECONDS);
+
+ok = false;
+}
+catch (TimeoutException e) {
+info("Task timeout elapsed: " + e.getMessage());
+}
+
+assert ok : "Timeout must be thrown.";
+
+srvc.shutdown();
+}
+
+/**
+ * @throws Exception Thrown in case of test failure.
+ */
+@SuppressWarnings("TooBroadScope")
+public void testInvokeAll() throws Exception {
+Ignite ignite = G.ignite(getTestGridName());
+
+ExecutorService srvc = createExecutorService(ignite);
+
+Collection> cmds = new ArrayList<>(2);
+
+String val1 = "test-value-1";
+String val2 = "test-value-2";
+
+cmds.add(new TestCallable<>(val1));
+cmds.add(new TestCallable<>(val2));
+
+List> futs = srvc.invokeAll(cmds);
+
+assert futs != null;
+assert futs.size() == 2;
+
+String res1 = fut
[23/51] [abbrv] incubator-ignite git commit: GridNamedInstance -> IgniteNamedInstance GridgainEx -> IgnitionEx
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
new file mode 100644
index 000..acab6d0
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -0,0 +1,2399 @@
+/*
+ * 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 org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.fs.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.logger.*;
+import org.apache.ignite.logger.java.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.mxbean.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.authentication.*;
+import org.apache.ignite.spi.authentication.noop.*;
+import org.apache.ignite.spi.indexing.*;
+import org.apache.ignite.streamer.*;
+import org.apache.ignite.thread.*;
+import org.apache.ignite.internal.processors.resource.*;
+import org.apache.ignite.internal.processors.spring.*;
+import org.apache.ignite.plugin.segmentation.*;
+import org.apache.ignite.spi.checkpoint.*;
+import org.apache.ignite.spi.checkpoint.noop.*;
+import org.apache.ignite.spi.collision.*;
+import org.apache.ignite.spi.collision.noop.*;
+import org.apache.ignite.spi.communication.*;
+import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.deployment.*;
+import org.apache.ignite.spi.deployment.local.*;
+import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
+import org.apache.ignite.spi.eventstorage.*;
+import org.apache.ignite.spi.eventstorage.memory.*;
+import org.apache.ignite.spi.failover.*;
+import org.apache.ignite.spi.failover.always.*;
+import org.apache.ignite.spi.loadbalancing.*;
+import org.apache.ignite.spi.loadbalancing.roundrobin.*;
+import org.apache.ignite.spi.securesession.*;
+import org.apache.ignite.spi.securesession.noop.*;
+import org.apache.ignite.spi.swapspace.*;
+import org.apache.ignite.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.noop.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import javax.management.*;
+import java.io.*;
+import java.lang.management.*;
+import java.lang.reflect.*;
+import java.net.*;
+import java.util.*;
+import java.util.Map.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.logging.*;
+
+import static org.apache.ignite.configuration.IgniteConfiguration.*;
+import static org.apache.ignite.IgniteState.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.internal.IgniteComponentType.*;
+import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
+
+/**
+ * This class defines a factory for the main GridGain API. It controls Grid
life cycle
+ * and allows listening for grid events.
+ * Grid Loaders
+ * Although user can apply grid factory directly to start and stop grid, grid
is
+ * often started and stopped by grid loaders. Grid loaders can be found in
+ * {@link org.apache.ignite.startup} package, for example:
+ *
+ * {@code GridCommandLineStartup}
+ * {@code GridServletStartup}
+ *
+ * Examples
+ * Use {@link #start()} method to s
[44/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/580c36e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/580c36e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/580c36e6 Branch: refs/heads/ignite-72-1 Commit: 580c36e66625ad203dfa18e830649c64e3e531f0 Parents: 14ad3ea f30d79d Author: AKuznetsov Authored: Thu Jan 29 22:31:25 2015 +0700 Committer: AKuznetsov Committed: Thu Jan 29 22:31:25 2015 +0700 -- .../processors/cache/GridCacheAdapter.java | 16 ++- .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java| 50 .../commands/alert/VisorAlertCommand.scala | 2 +- 4 files changed, 55 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580c36e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala --
[37/51] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
GridUtils -> IgniteUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc768b83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc768b83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc768b83
Branch: refs/heads/ignite-72-1
Commit: fc768b8318213841dec6d92d1fcd013a8052aaca
Parents: d6a720f
Author: Yakov Zhdanov
Authored: Thu Jan 29 17:10:36 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jan 29 17:10:36 2015 +0300
--
.../spi/checkpoint/s3/S3CheckpointSpi.java |4 +-
.../ClientPropertiesConfigurationSelfTest.java |4 +-
.../apache/ignite/IgniteCheckedException.java |2 +-
.../java/org/apache/ignite/IgniteException.java |2 +-
.../cache/GridCacheDeploymentManager.java |2 +-
.../cache/GridCacheMvccCandidate.java |4 +-
.../apache/ignite/internal/util/GridUtils.java | 9141 --
.../ignite/internal/util/IgniteUtils.java | 9141 ++
.../internal/util/typedef/internal/U.java |4 +-
.../visor/misc/VisorResolveHostNameTask.java|2 +-
.../internal/visor/query/VisorQueryUtils.java |4 +-
.../optimized/IgniteOptimizedMarshaller.java|2 +-
.../IgniteExceptionHelpLinksSelfTest.java |3 +-
.../GridEventStorageCheckAllEventsSelfTest.java |2 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 10 +-
...artupWithSpecifiedWorkDirectorySelfTest.java |2 +-
...tartupWithUndefinedGridGainHomeSelfTest.java |4 +-
.../internal/util/GridTestClockTimer.java |6 +-
.../ignite/internal/util/GridUtilsSelfTest.java | 728 --
.../internal/util/IgniteUtilsSelfTest.java | 728 ++
.../ignite/lang/GridSetWrapperSelfTest.java |2 +-
.../testsuites/IgniteUtilSelfTestSuite.java |2 +-
.../ignite/visor/commands/VisorConsole.scala|6 +-
.../commands/alert/VisorAlertCommand.scala |4 +-
.../config/VisorConfigurationCommand.scala |6 +-
.../commands/deploy/VisorDeployCommand.scala|4 +-
.../commands/disco/VisorDiscoveryCommand.scala |4 +-
.../commands/events/VisorEventsCommand.scala|4 +-
.../visor/commands/node/VisorNodeCommand.scala |4 +-
.../commands/start/VisorStartCommand.scala |4 +-
.../commands/tasks/VisorTasksCommand.scala |4 +-
.../commands/top/VisorTopologyCommand.scala |6 +-
.../visor/commands/vvm/VisorVvmCommand.scala|8 +-
.../scala/org/apache/ignite/visor/visor.scala | 20 +-
34 files changed, 9935 insertions(+), 9938 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
--
diff --git
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 8bc0fb7..5a977a1 100644
---
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -338,8 +338,8 @@ public class S3CheckpointSpi extends IgniteSpiAdapter
implements CheckpointSpi,
/** {@inheritDoc} */
@Override public void spiStop() throws IgniteSpiException {
if (timeoutWrk != null) {
-GridUtils.interrupt(timeoutWrk);
-GridUtils.join(timeoutWrk, log);
+IgniteUtils.interrupt(timeoutWrk);
+IgniteUtils.join(timeoutWrk, log);
}
unregisterMBean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
index 31e8638..7b903fa 100644
---
a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
@@ -158,7 +158,7 @@ public class ClientPropertiesConfigurationSelfTest extends
GridCommonAbstractTes
while (it.hasNext())
lines.add(it.nextLine().replace("#gg.client.", "gg.client."));
-GridUtils.closeQuiet(in);
+IgniteUtils.closeQuiet(in);
File tmp = File.createTempFile(UUID.randomUUID().toString(),
"properties");
@@ -188,7 +188,7 @@ public class Cl
[39/51] [abbrv] incubator-ignite git commit: ignite-146 changes to flags
ignite-146 changes to flags
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7eebc7e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7eebc7e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7eebc7e0
Branch: refs/heads/ignite-72-1
Commit: 7eebc7e0878e7cb7687315e0bdc4467ec1bdc26d
Parents: 25fb8e5
Author: Yakov Zhdanov
Authored: Thu Jan 29 15:56:51 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 29 17:22:35 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 22 +---
.../service/GridServiceProcessor.java | 2 +-
.../GridCacheReturnValueTransferSelfTest.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java| 4 ++--
...GridCacheValueConsistencyAtomicSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 ++--
6 files changed, 21 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 743e5b9..dd7b781 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -143,7 +143,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter withSkipStore() {
-return flagsOn(CacheFlag.SKIP_STORE);
+return flagOn(CacheFlag.SKIP_STORE);
}
/** {@inheritDoc} */
@@ -1018,21 +1018,27 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter flagsOn(@Nullable CacheFlag... flags) {
+public IgniteCache flagOn(CacheFlag flag) {
GridCacheProjectionImpl prev = gate.enter(prj);
try {
-Set res = EnumSet.noneOf(CacheFlag.class);
+Set res;
-Set flags0 = prj !=null ? prj.flags() : null;
+Set flags0 = prj != null ? prj.flags() : null;
-if (flags0 != null && !flags0.isEmpty())
-res.addAll(flags0);
+if (flags0 != null) {
+if (flags0.contains(flag))
+return this;
-res.addAll(EnumSet.copyOf(F.asList(flags)));
+res = EnumSet.copyOf(flags0);
+}
+else
+res = EnumSet.noneOf(CacheFlag.class);
+
+res.add(flag);
GridCacheProjectionImpl prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 8db40b9..4bcad37 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -481,7 +481,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
ManagedServiceDescriptorImpl desc = new
ManagedServiceDescriptorImpl(dep);
try {
-GridServiceAssignments assigns =
(GridServiceAssignments)cache.//flagsOn(CacheFlag.GET_PRIMARY).
+GridServiceAssignments assigns =
(GridServiceAssignments)cache.//flagOn(CacheFlag.GET_PRIMARY).
get(new
GridServiceAssignmentsKey(dep.configuration().getName()));
if (assigns != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 7657842..d70bc82 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/proces
[48/51] [abbrv] incubator-ignite git commit: IGNITE-109 - Merge branch 'ignite-109' into sprint-1
IGNITE-109 - Merge branch 'ignite-109' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61a9f986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61a9f986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61a9f986 Branch: refs/heads/ignite-72-1 Commit: 61a9f986a918052aae159e21ca37693491d34382 Parents: 4fe57d4 e4cd632 Author: Alexey Goncharuk Authored: Thu Jan 29 19:04:38 2015 -0800 Committer: Alexey Goncharuk Committed: Thu Jan 29 19:04:38 2015 -0800 -- .../processors/cache/GridCacheStoreManager.java | 25 +- .../transactions/IgniteTxLocalAdapter.java | 42 ++- .../IgniteCrossCacheTxStoreSelfTest.java| 288 +++ .../IgniteCacheTxStoreSessionTest.java | 11 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 5 files changed, 357 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61a9f986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java --
[18/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 new file mode 100644 index 000..7854bd9 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -0,0 +1,3322 @@ +/* + * 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 org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.portable.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.lifecycle.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.mxbean.*; +import org.apache.ignite.plugin.*; +import org.apache.ignite.internal.product.*; +import org.apache.ignite.spi.*; +import org.apache.ignite.spi.authentication.*; +import org.apache.ignite.spi.authentication.noop.*; +import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.managers.*; +import org.apache.ignite.internal.managers.checkpoint.*; +import org.apache.ignite.internal.managers.collision.*; +import org.apache.ignite.internal.managers.communication.*; +import org.apache.ignite.internal.managers.deployment.*; +import org.apache.ignite.internal.managers.discovery.*; +import org.apache.ignite.internal.managers.eventstorage.*; +import org.apache.ignite.internal.managers.failover.*; +import org.apache.ignite.internal.managers.indexing.*; +import org.apache.ignite.internal.managers.loadbalancer.*; +import org.apache.ignite.internal.managers.securesession.*; +import org.apache.ignite.internal.managers.security.*; +import org.apache.ignite.internal.managers.swapspace.*; +import org.apache.ignite.internal.processors.affinity.*; +import org.apache.ignite.internal.processors.clock.*; +import org.apache.ignite.internal.processors.closure.*; +import org.apache.ignite.internal.processors.continuous.*; +import org.apache.ignite.internal.processors.dataload.*; +import org.apache.ignite.internal.processors.email.*; +import org.apache.ignite.internal.processors.interop.*; +import org.apache.ignite.internal.processors.job.*; +import org.apache.ignite.internal.processors.jobmetrics.*; +import org.apache.ignite.internal.processors.license.*; +import org.apache.ignite.internal.processors.offheap.*; +import org.apache.ignite.internal.processors.plugin.*; +import org.apache.ignite.internal.processors.port.*; +import org.apache.ignite.internal.processors.query.*; +import org.apache.ignite.internal.processors.resource.*; +import org.apache.ignite.internal.processors.rest.*; +import org.apache.ignite.internal.processors.segmentation.*; +import org.apache.ignite.internal.processors.service.*; +import org.apache.ignite.internal.processors.session.*; +import org.apache.ignite.internal.processors.streamer.*; +import org.apache.ignite.internal.processors.task.*; +import org.apache.ignite.internal.processors.timeout.*; +import org.apache.ignite.plugin.security.*; +import org.apache.ignite.spi.securesession.noop.*; +import org.apache.ignite.internal.util.future.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.nodestart.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.jetbrains.annotations.*; + +import javax.management.*; +import java.io.*; +import java.lang.management.*; +import java.lang.reflect.*; +import java.net.*; +import java.text.*; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.*; + +import static org.apache.ignite.internal.GridKernalState.*; +import static org.
[41/51] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4009aaa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4009aaa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4009aaa3 Branch: refs/heads/ignite-72-1 Commit: 4009aaa35cba35752b80d39c03d3b5a87fdf4041 Parents: 9900ae4 7eebc7e Author: ivasilinets Authored: Thu Jan 29 18:14:21 2015 +0300 Committer: ivasilinets Committed: Thu Jan 29 18:14:21 2015 +0300 -- ipc/shmem/Makefile.am |2 +- ipc/shmem/Makefile.in |2 +- ipc/shmem/configure |4 +- ipc/shmem/configure.ac |2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am |2 +- ipc/shmem/include/Makefile.in |2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt|9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java |4 +- .../ClientAbstractMultiThreadedSelfTest.java|2 +- .../ClientPropertiesConfigurationSelfTest.java |4 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib| Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java |2 +- .../java/org/apache/ignite/IgniteException.java |2 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../apache/ignite/cache/CachingProvider.java|2 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterNodeLocalMapImpl.java |2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 - .../org/apache/ignite/internal/GridKernal.java | 3322 --- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |8 +- .../apache/ignite/internal/GridLoggerProxy.java |2 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../apache/ignite/internal/IgniteKernal.java| 3322 +++ .../org/apache/ignite/internal/IgnitionEx.java | 2396 + .../processors/affinity/GridAffinityUtils.java |2 +- .../processors/cache/GridCacheAdapter.java |8 +- .../processors/cache/GridCacheContext.java |4 +- .../cache/GridCacheDeploymentManager.java |2 +- .../cache/GridCacheMvccCandidate.java |4 +- .../processors/cache/IgniteCacheProxy.java | 22 +- .../GridCacheDataStructuresManager.java |4 +- .../cache/query/GridCacheQueryManager.java |2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java|2 +- .../query/jdbc/GridCacheQueryJdbcTask.java |2 +- .../dr/GridDrDataLoadCacheUpdater.java |2 +- .../internal/processors/fs/GridGgfsImpl.java|2 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java|8 +- .../processors/fs/IgniteFsNoopProcessor.java|2 +- .../processors/fs/IgniteFsProcessor.java|4 +- .../processors/fs/IgniteFsProcessorAdapter.java |2 +- .../resource/GridResourceProcessor.java |2 +- .../resource/GridSpringResourceContext.java |2 +- .../handlers/cache/GridCacheCommandHandler.java |6 +- .../handlers/task/GridTaskCommandHandler.java |2 +- .../service/GridServiceProcessor.java |2 +- .../processors/service/GridServiceProxy.java|2 +- .../apache/ignite/internal/util/GridUtils.java | 9100 - .../ignite/internal/util/IgniteUtils.java | 9141 ++ .../internal/util/ipc/GridIpcEndpoint.java | 49 - .../util/ipc/GridIpcEndpointBindException.java | 47 - .../util/ipc/GridIpcEndpointFactory.java| 84 - .../
[06/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
new file mode 100644
index 000..a32ebb6
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.util.ipc;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.fs.*;
+import org.apache.ignite.internal.util.ipc.loopback.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.testframework.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Tests for {@code IpcServerEndpointDeserializer}.
+ */
+public class IpcServerEndpointDeserializerSelfTest extends
GridGgfsCommonAbstractTest {
+/** */
+private Map shmemSrvEndpoint;
+
+/** */
+private Map tcpSrvEndpoint;
+
+/**
+ * Initialize test stuff.
+ */
+@Override protected void beforeTest() throws Exception {
+shmemSrvEndpoint = new HashMap<>();
+shmemSrvEndpoint.put("port", "888");
+shmemSrvEndpoint.put("size", "111");
+shmemSrvEndpoint.put("tokenDirectoryPath", "test-my-path-baby");
+
+tcpSrvEndpoint = new HashMap<>();
+tcpSrvEndpoint.put("port", "999");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfCfgIsNull() throws Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@SuppressWarnings("NullableProblems")
+@Override public Object call() throws Exception {
+return IpcServerEndpointDeserializer.deserialize(null);
+}
+}, NullPointerException.class, "Ouch! Argument cannot be null:
endpointCfg");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndNoTypeInfoInJson() throws Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+return
IpcServerEndpointDeserializer.deserialize(shmemSrvEndpoint);
+}
+}, IgniteCheckedException.class, "Failed to create server endpoint
(type is not specified)");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndNoUnknownTypeInfoInJson() throws
Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+Map endPnt = new HashMap<>();
+
+endPnt.putAll(shmemSrvEndpoint);
+endPnt.put("type", "unknownEndpointType");
+
+return IpcServerEndpointDeserializer.deserialize(endPnt);
+}
+}, IgniteCheckedException.class, "Failed to create server endpoint
(type is unknown): unknownEndpointType");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfLoopbackAndJsonIsLightlyBroken() throws
Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+return
IpcServerEndpointDeserializer.deserialize(tcpSrvEndpoint);
+}
+}, IgniteCheckedException.class, null);
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndJsonIsOk() throws Exception {
+Map endPnt = new HashMap<>();
+
+endPnt.putAll(shmemSrvEndpoint);
+endPnt.put("type", "shmem");
+
+IpcServerEndpoint deserialized =
IpcServerEndpointDeserializer.deserialize(endPnt);
+
+assertTrue(deserialized instanceof IpcSharedMemoryServerEndpoint)
[15/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
index 4bf8d42..3387ba6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
@@ -87,7 +87,7 @@ public class GridCacheAtomicTimeoutSelfTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
-final GridKernal grid = (GridKernal)grid(i);
+final IgniteKernal grid = (IgniteKernal)grid(i);
TestCommunicationSpi commSpi =
(TestCommunicationSpi)grid.configuration().getCommunicationSpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
index becab72..48e69aa 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
@@ -106,7 +106,7 @@ public abstract class GridCacheEventAbstractTest extends
GridCacheAbstractSelfTe
private void waitForEvents(int gridIdx, IgniteBiTuple...
evtCnts) throws Exception {
if (!F.isEmpty(evtCnts))
try {
-
TestEventListener.waitForEventCount(((GridKernal)grid(0)).context(), evtCnts);
+
TestEventListener.waitForEventCount(((IgniteKernal)grid(0)).context(), evtCnts);
}
catch (IgniteCheckedException e) {
printEventCounters(gridIdx, evtCnts);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
index 39a5aba..45fcfd5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
@@ -99,7 +99,7 @@ public abstract class
GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
// Start another node.
Ignite g1 = startGrid(1);
-final GridCacheAdapter cache1 =
((GridKernal)g1).context().cache().internalCache();
+final GridCacheAdapter cache1 =
((IgniteKernal)g1).context().cache().internalCache();
cache1.preloader().syncFuture().get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index 8796d69..7681046 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -110,7 +110,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest
extends GridCommonAbstr
cache(i).clearAll();
assertTrue(
-"Cache isn't empty [i=" + i + ", entries=" +
((GridKernal)grid(i)).internalCache().entries() + "]",
+
[25/51] [abbrv] incubator-ignite git commit: GridNamedInstance -> IgniteNamedInstance GridgainEx -> IgnitionEx
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
deleted file mode 100644
index 65c2776..000
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java
+++ /dev/null
@@ -1,2399 +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 org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.fs.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.logger.*;
-import org.apache.ignite.logger.java.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.authentication.*;
-import org.apache.ignite.spi.authentication.noop.*;
-import org.apache.ignite.spi.indexing.*;
-import org.apache.ignite.streamer.*;
-import org.apache.ignite.thread.*;
-import org.apache.ignite.internal.processors.resource.*;
-import org.apache.ignite.internal.processors.spring.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.spi.checkpoint.noop.*;
-import org.apache.ignite.spi.collision.*;
-import org.apache.ignite.spi.collision.noop.*;
-import org.apache.ignite.spi.communication.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.spi.deployment.*;
-import org.apache.ignite.spi.deployment.local.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.eventstorage.*;
-import org.apache.ignite.spi.eventstorage.memory.*;
-import org.apache.ignite.spi.failover.*;
-import org.apache.ignite.spi.failover.always.*;
-import org.apache.ignite.spi.loadbalancing.*;
-import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.apache.ignite.spi.securesession.*;
-import org.apache.ignite.spi.securesession.noop.*;
-import org.apache.ignite.spi.swapspace.*;
-import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.spi.swapspace.noop.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import javax.management.*;
-import java.io.*;
-import java.lang.management.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
-
-import static org.apache.ignite.configuration.IgniteConfiguration.*;
-import static org.apache.ignite.IgniteState.*;
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.IgniteComponentType.*;
-import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
-
-/**
- * This class defines a factory for the main GridGain API. It controls Grid
life cycle
- * and allows listening for grid events.
- * Grid Loaders
- * Although user can apply grid factory directly to start and stop grid, grid
is
- * often started and stopped by grid loaders. Grid loaders can be found in
- * {@link org.apache.ignite.startup} package, for example:
- *
- * {@code GridCommandLineStartup}
- * {@code GridServletStartup}
- *
- * Examples
- * Use {@link #start()} method
[50/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-72-1
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e19655df/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 000,7854bd9..e29d04d mode 00,100644..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 @@@ -1,0 -1,3322 +1,3322 @@@ + /* + * 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 org.apache.ignite.*; + import org.apache.ignite.cache.*; + import org.apache.ignite.cache.affinity.*; + import org.apache.ignite.cluster.*; + import org.apache.ignite.configuration.*; + import org.apache.ignite.internal.processors.*; + import org.apache.ignite.internal.processors.cache.*; + import org.apache.ignite.internal.processors.portable.*; + import org.apache.ignite.internal.util.*; + import org.apache.ignite.lang.*; + import org.apache.ignite.lifecycle.*; + import org.apache.ignite.marshaller.*; + import org.apache.ignite.marshaller.optimized.*; + import org.apache.ignite.mxbean.*; + import org.apache.ignite.plugin.*; + import org.apache.ignite.internal.product.*; + import org.apache.ignite.spi.*; + import org.apache.ignite.spi.authentication.*; + import org.apache.ignite.spi.authentication.noop.*; + import org.apache.ignite.hadoop.*; + import org.apache.ignite.internal.managers.*; + import org.apache.ignite.internal.managers.checkpoint.*; + import org.apache.ignite.internal.managers.collision.*; + import org.apache.ignite.internal.managers.communication.*; + import org.apache.ignite.internal.managers.deployment.*; + import org.apache.ignite.internal.managers.discovery.*; + import org.apache.ignite.internal.managers.eventstorage.*; + import org.apache.ignite.internal.managers.failover.*; + import org.apache.ignite.internal.managers.indexing.*; + import org.apache.ignite.internal.managers.loadbalancer.*; + import org.apache.ignite.internal.managers.securesession.*; + import org.apache.ignite.internal.managers.security.*; + import org.apache.ignite.internal.managers.swapspace.*; + import org.apache.ignite.internal.processors.affinity.*; + import org.apache.ignite.internal.processors.clock.*; + import org.apache.ignite.internal.processors.closure.*; + import org.apache.ignite.internal.processors.continuous.*; + import org.apache.ignite.internal.processors.dataload.*; + import org.apache.ignite.internal.processors.email.*; + import org.apache.ignite.internal.processors.interop.*; + import org.apache.ignite.internal.processors.job.*; + import org.apache.ignite.internal.processors.jobmetrics.*; + import org.apache.ignite.internal.processors.license.*; + import org.apache.ignite.internal.processors.offheap.*; + import org.apache.ignite.internal.processors.plugin.*; + import org.apache.ignite.internal.processors.port.*; + import org.apache.ignite.internal.processors.query.*; + import org.apache.ignite.internal.processors.resource.*; + import org.apache.ignite.internal.processors.rest.*; + import org.apache.ignite.internal.processors.segmentation.*; + import org.apache.ignite.internal.processors.service.*; + import org.apache.ignite.internal.processors.session.*; + import org.apache.ignite.internal.processors.streamer.*; + import org.apache.ignite.internal.processors.task.*; + import org.apache.ignite.internal.processors.timeout.*; + import org.apache.ignite.plugin.security.*; + import org.apache.ignite.spi.securesession.noop.*; + import org.apache.ignite.internal.util.future.*; + import org.apache.ignite.internal.util.lang.*; + import org.apache.ignite.internal.util.nodestart.*; + import org.apache.ignite.internal.util.tostring.*; + import org.apache.ignite.internal.util.typedef.*; + import org.apache.ignite.internal.util.typedef.internal.*; + import org.jetbrains.annotations.*; + + import javax.management.*; + import java.io.*; + import java.lang.management.*; + import java.lang.reflect.*; + import java.net.*; + import java.text.*; + import java.util.*; + import java.util.concurrent.*; + import java.util.
[51/51] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-72-1
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-72-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e19655df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e19655df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e19655df Branch: refs/heads/ignite-72-1 Commit: e19655dfb3fd53f5423d3842bce7ca3395dc0f3b Parents: 18e02cd 9550905 Author: avinogradov Authored: Fri Jan 30 11:30:11 2015 +0300 Committer: avinogradov Committed: Fri Jan 30 11:30:11 2015 +0300 -- assembly/release-base-fabric.xml|2 +- assembly/release-hadoop.xml |6 +- ipc/shmem/Makefile.am |2 +- ipc/shmem/Makefile.in |2 +- ipc/shmem/configure |4 +- ipc/shmem/configure.ac |2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am |2 +- ipc/shmem/include/Makefile.in |2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt|9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java |4 +- .../ClientAbstractMultiThreadedSelfTest.java|2 +- .../ClientPropertiesConfigurationSelfTest.java |4 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib| Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java |2 +- .../java/org/apache/ignite/IgniteException.java |2 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../apache/ignite/cache/CachingProvider.java|2 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterNodeLocalMapImpl.java |2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 - .../org/apache/ignite/internal/GridKernal.java | 3322 --- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |8 +- .../apache/ignite/internal/GridLoggerProxy.java |2 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../apache/ignite/internal/IgniteKernal.java| 3322 +++ .../org/apache/ignite/internal/IgnitionEx.java | 2396 + .../processors/affinity/GridAffinityUtils.java |2 +- .../processors/cache/GridCacheAdapter.java | 24 +- .../processors/cache/GridCacheContext.java |4 +- .../cache/GridCacheDeploymentManager.java |2 +- .../cache/GridCacheMvccCandidate.java |4 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../GridCacheDataStructuresManager.java |4 +- .../cache/query/GridCacheQueryManager.java |2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java|2 +- .../query/jdbc/GridCacheQueryJdbcTask.java |2 +- .../transactions/IgniteTxLocalAdapter.java | 42 +- .../dr/GridDrDataLoadCacheUpdater.java |2 +- .../internal/processors/fs/GridGgfsImpl.java|2 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java|8 +- .../processors/fs/IgniteFsNoopProcessor.java|2 +- .../processors/fs/IgniteFsProcessor.java|4 +- .../processors/fs/IgniteFsProcessorAdapter.java |2 +- .../resource/GridResourceProcessor.java |2 +- .../resource/GridSpringResourceContext.java |2 +- .../handlers/cache/GridCacheCommandHandler.java |6 +- .../handlers/task/GridTaskCommandHandler.java |2 +- .../service/GridServiceProcessor.java |2 +- .../processors/service/GridServiceProxy.java|2 +- .../apache/ignite/internal/util/GridUtils.java | 9100 - .../ignite/internal/util/IgniteUtils.java
[02/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename all 'ggshem' on 'igniteshmem'
# ignite-117 : rename all 'ggshem' on 'igniteshmem' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae3ba8c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae3ba8c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae3ba8c9 Branch: refs/heads/ignite-72-1 Commit: ae3ba8c9da90f82d1461a7a5f1de6baec8803ef6 Parents: 50f31e6 Author: Artem SHutak Authored: Wed Jan 28 19:34:06 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 19:34:06 2015 +0300 -- ipc/shmem/Makefile.am | 2 +- ipc/shmem/Makefile.in | 2 +- ipc/shmem/configure | 4 +- ipc/shmem/configure.ac | 2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 - ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 --- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 + ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 +++ ipc/shmem/readme.txt| 2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138591 -> 138335 bytes .../shmem/GridIpcSharedMemoryNativeLoader.java | 4 +- .../util/ipc/shmem/IpcSharedMemoryUtils.java| 2 +- 14 files changed, 1503 insertions(+), 1503 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/Makefile.am -- diff --git a/ipc/shmem/Makefile.am b/ipc/shmem/Makefile.am index dd2b285..30696a5 100644 --- a/ipc/shmem/Makefile.am +++ b/ipc/shmem/Makefile.am @@ -1 +1 @@ -SUBDIRS=ggshmem include +SUBDIRS=igniteshmem include http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/Makefile.in -- diff --git a/ipc/shmem/Makefile.in b/ipc/shmem/Makefile.in index e37c55b..768fe76 100644 --- a/ipc/shmem/Makefile.in +++ b/ipc/shmem/Makefile.in @@ -251,7 +251,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = ggshmem include +SUBDIRS = igniteshmem include all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/configure -- diff --git a/ipc/shmem/configure b/ipc/shmem/configure index af4e3c0..88fef08 100755 --- a/ipc/shmem/configure +++ b/ipc/shmem/configure @@ -15161,7 +15161,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_config_files="$ac_config_files Makefile ggshmem/Makefile include/Makefile" +ac_config_files="$ac_config_files Makefile igniteshmem/Makefile include/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16263,7 +16263,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -"ggshmem/Makefile") CONFIG_FILES="$CONFIG_FILES ggshmem/Makefile" ;; +"igniteshmem/Makefile") CONFIG_FILES="$CONFIG_FILES igniteshmem/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/configure.ac -- diff --git a/ipc/shmem/configure.ac b/ipc/shmem/configure.ac index 6774187..2c3b4a3 100644 --- a/ipc/shmem/configure.ac +++ b/ipc/shmem/configure.ac @@ -28,6 +28,6 @@ dnl Libtool is used for building share libraries AC_PROG_LIBTOOL AC_CONFIG_FILES(Makefile -ggshmem/Makefile +igniteshmem/Makefile include/Makefile) AC_OUTPUT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/ggshmem/Makefile.am -- diff --git a/ipc/shmem/ggshmem/Makefile.am b/ipc/shmem/ggshmem/Makefile.am deleted file mode 100644 index 91f4c27..000 --- a/ipc/shmem/ggshmem/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# Include macros from m4 folder. -ACLOCAL_AMFLAGS = "-Im4" - -### -# The list of libraries we are building seperated by spaces. -# The 'lib_' indicates that these build products will be installed -# in the $(libdir) directory. For example /usr/lib -lib_LTLIBRARIES = libggshmem.la -
[45/51] [abbrv] incubator-ignite git commit: # sprint-1 Fixed typo after auto renaming.
# sprint-1 Fixed typo after auto renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9502c0d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9502c0d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9502c0d9
Branch: refs/heads/ignite-72-1
Commit: 9502c0d9f747bc77d6e10f999d86e7f6dc5cb402
Parents: 580c36e
Author: AKuznetsov
Authored: Thu Jan 29 22:35:26 2015 +0700
Committer: AKuznetsov
Committed: Thu Jan 29 22:35:26 2015 +0700
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9502c0d9/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index ca22fa1..837b424 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -17,7 +17,7 @@
package org.apache.ignite.visor.commands.alert
-import org.apache.ignite.internal.util.IgniteUtils
+import org.apache.ignite.internal.util.{IgniteUtils => U}
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite._
[09/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
# ignite-117 : rename classes from ipc package GridIpc..->Ipc.. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e50ca07d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e50ca07d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e50ca07d Branch: refs/heads/ignite-72-1 Commit: e50ca07de475612eb36e7706f6100e7c6f159826 Parents: 3789241 Author: Artem SHutak Authored: Wed Jan 28 20:52:06 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 20:52:06 2015 +0300 -- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java| 8 +- .../processors/fs/IgniteFsNoopProcessor.java| 2 +- .../processors/fs/IgniteFsProcessor.java| 4 +- .../processors/fs/IgniteFsProcessorAdapter.java | 2 +- .../internal/util/ipc/GridIpcEndpoint.java | 49 -- .../util/ipc/GridIpcEndpointBindException.java | 47 -- .../util/ipc/GridIpcEndpointFactory.java| 84 --- .../internal/util/ipc/GridIpcEndpointType.java | 29 - .../util/ipc/GridIpcServerEndpoint.java | 73 -- .../ipc/GridIpcServerEndpointDeserializer.java | 66 -- .../internal/util/ipc/GridIpcToNioAdapter.java | 250 --- .../ignite/internal/util/ipc/IpcEndpoint.java | 49 ++ .../util/ipc/IpcEndpointBindException.java | 47 ++ .../internal/util/ipc/IpcEndpointFactory.java | 84 +++ .../internal/util/ipc/IpcEndpointType.java | 29 + .../internal/util/ipc/IpcServerEndpoint.java| 73 ++ .../util/ipc/IpcServerEndpointDeserializer.java | 66 ++ .../internal/util/ipc/IpcToNioAdapter.java | 250 +++ .../ipc/loopback/GridIpcClientTcpEndpoint.java | 87 --- .../ipc/loopback/GridIpcServerTcpEndpoint.java | 179 - .../util/ipc/loopback/IpcClientTcpEndpoint.java | 87 +++ .../util/ipc/loopback/IpcServerTcpEndpoint.java | 179 + .../GridIpcOutOfSystemResourcesException.java | 59 -- .../GridIpcSharedMemoryClientEndpoint.java | 336 - .../shmem/GridIpcSharedMemoryInitRequest.java | 67 -- .../shmem/GridIpcSharedMemoryInitResponse.java | 171 - .../shmem/GridIpcSharedMemoryInputStream.java | 99 --- .../shmem/GridIpcSharedMemoryNativeLoader.java | 261 --- ...cSharedMemoryOperationTimedoutException.java | 59 -- .../shmem/GridIpcSharedMemoryOutputStream.java | 80 --- .../GridIpcSharedMemoryServerEndpoint.java | 707 --- .../ipc/shmem/GridIpcSharedMemorySpace.java | 374 -- .../shmem/IpcOutOfSystemResourcesException.java | 59 ++ .../shmem/IpcSharedMemoryClientEndpoint.java| 336 + .../ipc/shmem/IpcSharedMemoryInitRequest.java | 67 ++ .../ipc/shmem/IpcSharedMemoryInitResponse.java | 171 + .../ipc/shmem/IpcSharedMemoryInputStream.java | 99 +++ .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 261 +++ ...cSharedMemoryOperationTimedoutException.java | 59 ++ .../ipc/shmem/IpcSharedMemoryOutputStream.java | 80 +++ .../shmem/IpcSharedMemoryServerEndpoint.java| 707 +++ .../util/ipc/shmem/IpcSharedMemorySpace.java| 374 ++ .../util/ipc/shmem/IpcSharedMemoryUtils.java| 18 +- .../util/nio/GridShmemCommunicationClient.java | 4 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 24 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 4 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- ...idIpcServerEndpointDeserializerSelfTest.java | 160 - .../IpcServerEndpointDeserializerSelfTest.java | 160 + .../ipc/shmem/GgfsSharedMemoryTestClient.java | 76 ++ .../ipc/shmem/GgfsSharedMemoryTestServer.java | 71 ++ .../shmem/GridGgfsSharedMemoryTestClient.java | 76 -- .../shmem/GridGgfsSharedMemoryTestServer.java | 71 -- ...idIpcSharedMemoryCrashDetectionSelfTest.java | 500 - .../shmem/GridIpcSharedMemoryFakeClient.java| 36 - ...GridIpcSharedMemoryNativeLoaderSelfTest.java | 46 -- .../shmem/GridIpcSharedMemoryNodeStartup.java | 87 --- .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 259 --- .../IpcSharedMemoryCrashDetectionSelfTest.java | 500 + .../ipc/shmem/IpcSharedMemoryFakeClient.java| 36 + .../IpcSharedMemoryNativeLoaderSelfTest.java| 46 ++ .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 87 +++ .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 259 +++ .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 4 +- .../LoadWithCorruptedLibFileTestRunner.java | 4 +- .../GridIpcSharedMemoryBenchmarkParty.java | 35 - .../GridIpcSharedMemoryBenchmarkReader.java | 133 .../GridIpcSharedMemoryBenchmarkWriter.java | 125 .../IpcSharedMemoryBenchmarkParty.java | 35 + .../IpcSharedMemoryBenchmarkReader.java | 133 .../IpcSha
[40/51] [abbrv] incubator-ignite git commit: Fix IgniteCacheIterator
Fix IgniteCacheIterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9900ae49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9900ae49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9900ae49
Branch: refs/heads/ignite-72-1
Commit: 9900ae49ba2b839eb3c549bb95cdf397743a8303
Parents: 4535322
Author: ivasilinets
Authored: Thu Jan 29 18:14:08 2015 +0300
Committer: ivasilinets
Committed: Thu Jan 29 18:14:08 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 16 ++-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../GridCacheAbstractProjectionSelfTest.java| 50
3 files changed, 54 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 92d2039..1c04d29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3887,10 +3887,10 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/**
- * @param prj Projection.
+ * @param delegate Cache proxy.
* @return Distributed ignite cache iterator.
*/
-public Iterator> igniteIterator(final
GridCacheProjectionImpl prj) {
+public Iterator> igniteIterator(final
IgniteCacheProxy delegate) {
CacheQueryFuture> fut = queries().createScanQuery(null)
.keepAll(false)
.execute();
@@ -3901,17 +3901,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override protected void remove(Cache.Entry item) {
-GridCacheProjectionImpl prev = ctx.gate().enter(prj);
-
-try {
-GridCacheAdapter.this.removex(item.getKey());
-}
-catch (IgniteCheckedException e) {
-throw new CacheException(e);
-}
-finally {
-ctx.gate().leave(prev);
-}
+delegate.remove(item.getKey());
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 743e5b9..0bb2543 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -943,7 +943,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter prev = gate.enter(prj);
try {
-return ((GridCacheAdapter)delegate).igniteIterator(prj);
+return ctx.cache().igniteIterator(this);
}
finally {
gate.leave(prev);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index 6337339..acdeede 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -617,6 +617,56 @@ public abstract class GridCacheAbstractProjectionSelfTest
extends GridCacheAbstr
/**
* @throws Exception if failed.
*/
+public void testSkipStoreIterator() throws Exception {
+assertNull(cache().put("1", 100500));
+
+IgniteCache c = jcache().withSkipStore();
+
+Iterator i = c.iterator();
+
+assertTrue(i.hasNext());
+
+i.next();
+
+i.remove();
+
+i = c.iterator();
+
+assertFalse(i.hasNext(
[08/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
deleted file mode 100644
index 93590d5..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
+++ /dev/null
@@ -1,336 +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.util.ipc.shmem;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.ipc.*;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * IPC endpoint based on shared memory space.
- */
-public class GridIpcSharedMemoryClientEndpoint implements GridIpcEndpoint {
-/** In space. */
-private final GridIpcSharedMemorySpace inSpace;
-
-/** Out space. */
-private final GridIpcSharedMemorySpace outSpace;
-
-/** In space. */
-private final GridIpcSharedMemoryInputStream in;
-
-/** Out space. */
-private final GridIpcSharedMemoryOutputStream out;
-
-/** */
-private boolean checkIn = true;
-
-/** */
-private boolean checkOut = true;
-
-/** */
-private final Thread checker;
-
-/** */
-private final IgniteLogger log;
-
-/**
- * Creates connected client IPC endpoint.
- *
- * @param inSpace In space.
- * @param outSpace Out space.
- * @param parent Parent logger.
- */
-public GridIpcSharedMemoryClientEndpoint(GridIpcSharedMemorySpace inSpace,
GridIpcSharedMemorySpace outSpace,
-IgniteLogger parent) {
-assert inSpace != null;
-assert outSpace != null;
-
-log = parent.getLogger(GridIpcSharedMemoryClientEndpoint.class);
-
-this.inSpace = inSpace;
-this.outSpace = outSpace;
-
-in = new GridIpcSharedMemoryInputStream(inSpace);
-out = new GridIpcSharedMemoryOutputStream(outSpace);
-
-checker = null;
-}
-
-/**
- * Creates and connects client IPC endpoint and starts background checker
thread to avoid deadlocks on other party
- * crash. Waits until port became available.
- *
- * @param port Port server endpoint bound to.
- * @param parent Parent logger.
- * @throws IgniteCheckedException If connection fails.
- */
-public GridIpcSharedMemoryClientEndpoint(int port, IgniteLogger parent)
throws IgniteCheckedException {
-this(port, 0, parent);
-}
-
-/**
- * Creates and connects client IPC endpoint and starts background checker
thread to avoid deadlocks on other party
- * crash.
- *
- * @param port Port server endpoint bound to.
- * @param timeout Connection timeout.
- * @param parent Parent logger.
- * @throws IgniteCheckedException If connection fails.
- */
-@SuppressWarnings({"CallToThreadStartDuringObjectConstruction",
"ErrorNotRethrown"})
-public GridIpcSharedMemoryClientEndpoint(int port, int timeout,
IgniteLogger parent) throws IgniteCheckedException {
-assert port > 0;
-assert port < 0x;
-
-log = parent.getLogger(GridIpcSharedMemoryClientEndpoint.class);
-
-GridIpcSharedMemorySpace inSpace = null;
-GridIpcSharedMemorySpace outSpace = null;
-
-Socket sock = new Socket();
-
-Exception err = null;
-boolean clear = true;
-
-try {
-GridIpcSharedMemoryNativeLoader.load();
-
-sock.connect(new InetSocketAddress("127.0.0.1", port), timeout);
-
-// Send request.
-ObjectOutputStream out = new
ObjectOutputStream(sock.getOutputStream());
-
-int pid = IpcSharedMemoryUtils.pid();
-
-out.writeObject(new GridIpcSharedMemoryInitRequest(pid));
-
-ObjectInputStream in = new
ObjectInputStream(sock.getInputStream());
-
-GridIpcSharedMemoryI
[07/51] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
new file mode 100644
index 000..c187dbc
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.util.ipc.shmem;
+
+import java.io.*;
+
+/**
+ *
+ */
+public class IpcSharedMemoryInitRequest implements Externalizable {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private int pid;
+
+/**
+ * @param pid PID of the {@code client} party.
+ */
+public IpcSharedMemoryInitRequest(int pid) {
+this.pid = pid;
+}
+
+/**
+ * Required by {@code Externalizable}.
+ */
+public IpcSharedMemoryInitRequest() {
+// No-op.
+}
+
+/**
+ * @return Sender PID.
+ */
+public int pid() {
+return pid;
+}
+
+/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeInt(pid);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+pid = in.readInt();
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return "IpcSharedMemoryInitRequest [pid=" + pid + ']';
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
new file mode 100644
index 000..9f2ed24
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
@@ -0,0 +1,171 @@
+/*
+ * 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.util.ipc.shmem;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ *
+ */
+public class IpcSharedMemoryInitResponse implements Externalizable {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private String inTokFileName;
+
+/** */
+private int inSharedMemId;
+
+/** */
+private String outTokFileName;
+
+/** */
+private int outSharedMemId;
+
+/** */
+private int pid;
+
+/** */
+private int size;
+
+/** */
+private Exception err;
+
+/**
+ * Constructs a successful response.
+ *
+ * @param inTokFileName In token.
+ * @param inSharedMemId In shared memory ID.
+ * @param outTokFileName Out token.
+ * @param outSharedMemId Out shared memory ID.
+ * @param pid PID of the {@code server} party.
+ * @param size Size.
+ */
[35/51] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
new file mode 100644
index 000..fedf24b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -0,0 +1,9141 @@
+/*
+ * 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.util;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.mxbean.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.portables.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.internal.processors.streamer.*;
+import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.internal.util.io.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.worker.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import javax.management.*;
+import javax.naming.*;
+import javax.net.ssl.*;
+import java.io.*;
+import java.lang.annotation.Annotation;
+import java.lang.management.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.*;
+import java.math.*;
+import java.net.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.nio.channels.spi.*;
+import java.nio.charset.*;
+import java.security.*;
+import java.security.cert.*;
+import java.sql.*;
+import java.sql.Timestamp;
+import java.text.*;
+import java.util.*;
+import java.util.Date;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.*;
+import java.util.jar.*;
+import java.util.logging.*;
+import java.util.regex.*;
+import java.util.zip.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.internal.GridNodeAttributes.*;
+
+/**
+ * Collection of utility methods used throughout the system.
+ */
+@SuppressWarnings({"UnusedReturnValue", "UnnecessaryFullyQualifiedName"})
+public abstract class IgniteUtils {
+/** Unsafe. */
+private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+/** {@code True} if {@code unsafe} should be used for array copy. */
+private static final boolean UNSAFE_BYTE_ARR_CP =
unsafeByteArrayCopyAvailable();
+
+/** Offset. */
+private static final int BYTE_ARRAY_DATA_OFFSET =
UNSAFE.arrayBaseOffset(byte[].class);
+
+/** Sun-specific JDK constructor factory for objects that don't have empty
constructor. */
+private static final Method CTOR_FACTORY;
+
+/** Sun JDK reflection factory. */
+private static final Object SUN_REFLECT_FACTORY;
+
+/** Public {@code java.lang.Object} no-argument constructor. */
+private static final Constructor OBJECT_CTOR;
+
+/** All grid event names. */
+private static final Map GRID_EVT_NAMES = new HashMap<>();
+
+/** All grid events. */
+private static final int[] GRID_EVTS;
+
+/** Empty integers array. */
+private static final int[] EMPTY_INTS = new int[0];
+
+/** Empty longs. */
+private static final long[] EMPTY_LONGS = new long[0];
+
+/** System line separator. */
+private static final String NL = System.getProperty("line.separator");
+
+/** Default user version. */
+public static final String DFLT_USER_VERSION = "0";
+
+/** Cache for {@link GridPeerDeployAware} fields to speed up reflection. */
+private sta
[49/51] [abbrv] incubator-ignite git commit: IGNITE-109 - Merge branch 'ignite-109' into sprint-1
IGNITE-109 - Merge branch 'ignite-109' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9550905e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9550905e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9550905e
Branch: refs/heads/ignite-72-1
Commit: 9550905e62dad06717ab666330c1d5b6523adc02
Parents: 61a9f98
Author: Alexey Goncharuk
Authored: Thu Jan 29 19:04:43 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Jan 29 19:04:43 2015 -0800
--
.../cache/distributed/IgniteCrossCacheTxStoreSelfTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9550905e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index 7df7619..f80549c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -108,7 +108,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testWriteThrough() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
TestStore firstStore =
(TestStore)grid(0).configuration().getCacheConfiguration()[1].getCacheStoreFactory().create();
@@ -153,7 +153,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIncompatibleCaches1() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
try (IgniteTx ignored = grid.transactions().txStart()) {
GridCache cacheA = grid.cache("cacheA");
@@ -174,7 +174,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIncompatibleCaches2() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
try (IgniteTx ignored = grid.transactions().txStart()) {
GridCache cacheA = grid.cache("cacheA");
[38/51] [abbrv] incubator-ignite git commit: IGNITE-146 (remove async instance caching inside Async support adapter and always create new instance)
IGNITE-146 (remove async instance caching inside Async support adapter and
always create new instance)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25fb8e5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25fb8e5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25fb8e5c
Branch: refs/heads/ignite-72-1
Commit: 25fb8e5ca42d8137c37ce513868bd246a5cc146a
Parents: fc768b8
Author: sevdokimov
Authored: Thu Jan 29 13:05:20 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 29 17:22:35 2015 +0300
--
.../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +++-
1 file changed, 4 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fb8e5c/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
index e9ab2a1..3d8e14c 100644
---
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
@@ -24,15 +24,9 @@ import org.apache.ignite.internal.*;
* Adapter for {@link IgniteAsyncSupport}.
*/
public class IgniteAsyncSupportAdapter
implements IgniteAsyncSupport {
-/** */
-private static final Object mux = new Object();
-
/** Future for previous asynchronous operation. */
protected ThreadLocal> curFut;
-/** */
-private volatile T asyncInstance;
-
/**
* Default constructor.
*/
@@ -44,29 +38,16 @@ public class IgniteAsyncSupportAdapter implements
* @param async Async enabled flag.
*/
public IgniteAsyncSupportAdapter(boolean async) {
-if (async) {
+if (async)
curFut = new ThreadLocal<>();
-
-asyncInstance = (T)this;
-}
}
/** {@inheritDoc} */
@Override public T withAsync() {
-T res = asyncInstance;
-
-if (res == null) {
-res = createAsyncInstance();
-
-synchronized (mux) {
-if (asyncInstance != null)
-return asyncInstance;
-
-asyncInstance = res;
-}
-}
+if (isAsync())
+return (T)this;
-return res;
+return createAsyncInstance();
}
/**
[33/51] [abbrv] incubator-ignite git commit: Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117
Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117 Conflicts: ipc/shmem/readme.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6a720f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6a720f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6a720f7 Branch: refs/heads/ignite-72-1 Commit: d6a720f7ae2be07dcb3207be445cfdb1cb816974 Parents: 506cda6 9ea9607 Author: Yakov Zhdanov Authored: Thu Jan 29 16:30:45 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 16:30:45 2015 +0300 -- assembly/libs/readme.txt| 111 +- assembly/release-base-fabric.xml|2 +- docs/core-site.gridgain.xml | 89 - docs/core-site.ignite.xml | 89 + docs/gridgain_readme.md | 149 - docs/gridgain_readme.pdf| Bin 407698 -> 0 bytes docs/hadoop_readme.md | 80 +- docs/hadoop_readme.pdf | Bin 411788 -> 82297 bytes docs/hive-site.gridgain.xml | 36 - docs/hive-site.ignite.xml | 36 + docs/ignite_readme.md | 100 + docs/ignite_readme.pdf | Bin 0 -> 76810 bytes docs/mapred-site.gridgain.xml | 79 - docs/mapred-site.ignite.xml | 79 + examples/config/filesystem/readme.txt |4 +- .../hibernate/example-hibernate-L2-cache.xml| 14 +- examples/config/hibernate/readme.txt|4 +- examples/config/servlet/readme.txt |2 +- .../ComputeFibonacciContinuationExample.java| 11 +- .../compute/ComputeRunnableExample.java |5 +- .../datagrid/CacheDataLoaderExample.java| 15 +- .../HibernateL2CacheExampleNodeStartup.java |6 +- .../examples/ScalarContinuationExample.scala|9 +- ipc/readme.txt |4 +- ipc/shmem/readme.txt| 10 +- modules/aop/readme.txt | 12 +- modules/aws/readme.txt | 12 +- .../ClientAbstractMultiThreadedSelfTest.java|8 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../integration/ClientAbstractSelfTest.java |8 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/RestProcessorStartSelfTest.java|3 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../org/apache/ignite/IgniteDataLoader.java | 14 +- .../java/org/apache/ignite/IgniteScheduler.java |6 +- .../apache/ignite/IgniteSystemProperties.java |6 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../org/apache/ignite/cache/CacheEntry.java | 27 +- .../apache/ignite/cache/CacheProjection.java| 43 +- .../apache/ignite/cache/CachingProvider.java|2 +- .../java/org/apache/ignite/cache/GridCache.java |5 +- .../apache/ignite/cache/query/CacheQueries.java |7 +- .../ignite/cache/query/CacheQueryFuture.java|4 +- .../ignite/compute/ComputeTaskFuture.java |4 +- .../ignite/compute/ComputeTaskSession.java |3 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../org/apache/ignite/hadoop/GridHadoop.java|6 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterNodeLocalMapImpl.java |2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 - .../ignite/internal/GridJobSessionImpl.java |2 +- .../org/apache/ignite/internal/GridKernal.java | 3322 -- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |8 +- .../apache/ignite/internal/GridLoggerProxy.java |2 +- .../ignite/internal/GridTaskSessionImpl.java|2 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../ignite/internal/IgniteInternalFuture.java | 190 + .../apache/ignite/internal/IgniteKernal.java| 3322 ++ .../ignite/internal/IgniteSchedulerImpl.java|6 +- .../org/apache/ignite/internal/IgnitionEx.java | 2396 + .../internal/executor/GridExecutorService.java | 44 +- .../managers/communication/GridIoManager.java |3 +- .../discovery/GridDiscoveryManager.java |2 +- .../eventstorage/GridEventStorageManager.java |4 +- .../affinity/GridAffinityAssignmentCache.java |5 +- .../affinity/GridAffinityProcessor.java |8 +- ..
[20/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java deleted file mode 100644 index 8ffafac..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java +++ /dev/null @@ -1,3322 +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 org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.portable.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.lifecycle.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.optimized.*; -import org.apache.ignite.mxbean.*; -import org.apache.ignite.plugin.*; -import org.apache.ignite.internal.product.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.authentication.*; -import org.apache.ignite.spi.authentication.noop.*; -import org.apache.ignite.hadoop.*; -import org.apache.ignite.internal.managers.*; -import org.apache.ignite.internal.managers.checkpoint.*; -import org.apache.ignite.internal.managers.collision.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.managers.discovery.*; -import org.apache.ignite.internal.managers.eventstorage.*; -import org.apache.ignite.internal.managers.failover.*; -import org.apache.ignite.internal.managers.indexing.*; -import org.apache.ignite.internal.managers.loadbalancer.*; -import org.apache.ignite.internal.managers.securesession.*; -import org.apache.ignite.internal.managers.security.*; -import org.apache.ignite.internal.managers.swapspace.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.clock.*; -import org.apache.ignite.internal.processors.closure.*; -import org.apache.ignite.internal.processors.continuous.*; -import org.apache.ignite.internal.processors.dataload.*; -import org.apache.ignite.internal.processors.email.*; -import org.apache.ignite.internal.processors.interop.*; -import org.apache.ignite.internal.processors.job.*; -import org.apache.ignite.internal.processors.jobmetrics.*; -import org.apache.ignite.internal.processors.license.*; -import org.apache.ignite.internal.processors.offheap.*; -import org.apache.ignite.internal.processors.plugin.*; -import org.apache.ignite.internal.processors.port.*; -import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.processors.resource.*; -import org.apache.ignite.internal.processors.rest.*; -import org.apache.ignite.internal.processors.segmentation.*; -import org.apache.ignite.internal.processors.service.*; -import org.apache.ignite.internal.processors.session.*; -import org.apache.ignite.internal.processors.streamer.*; -import org.apache.ignite.internal.processors.task.*; -import org.apache.ignite.internal.processors.timeout.*; -import org.apache.ignite.plugin.security.*; -import org.apache.ignite.spi.securesession.noop.*; -import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.internal.util.nodestart.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import javax.management.*; -import java.io.*; -import java.lang.management.*; -import java.lang.reflect.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.internal.GridKernalState.*; -import static org.apac
[42/51] [abbrv] incubator-ignite git commit: Tests: Fix compile
Tests: Fix compile
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f30d79d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f30d79d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f30d79d1
Branch: refs/heads/ignite-72-1
Commit: f30d79d1f4b71833fea763fdacfe5f15300e4aa2
Parents: 4009aaa
Author: ivasilinets
Authored: Thu Jan 29 18:29:51 2015 +0300
Committer: ivasilinets
Committed: Thu Jan 29 18:29:51 2015 +0300
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f30d79d1/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index 1899ca4..8047b8a 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -17,7 +17,7 @@
package org.apache.ignite.visor.commands.alert
-import org.apache.ignite.internal.util.{IgniteUtils => U}
+import org.apache.ignite.internal.util.IgniteUtils
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite._
[46/51] [abbrv] incubator-ignite git commit: # ignite-sprint-1.
# ignite-sprint-1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdebb406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdebb406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdebb406
Branch: refs/heads/ignite-72-1
Commit: bdebb406d6f58e7c6c4b334f6ea1a8be2b4ad7c8
Parents: 9502c0d
Author: AKuznetsov
Authored: Fri Jan 30 09:38:18 2015 +0700
Committer: AKuznetsov
Committed: Fri Jan 30 09:38:18 2015 +0700
--
.../visor/commands/gc/VisorGcCommand.scala | 13 --
.../visor/commands/gc/VisorGcCommandSpec.scala | 25 +++-
2 files changed, 19 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdebb406/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
index ef1a241..713247c 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
@@ -17,17 +17,14 @@
package org.apache.ignite.visor.commands.gc
-import org.apache.ignite.internal.visor.node.VisorNodeGcTask
-
import org.apache.ignite._
import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterNode}
-
-import java.lang.{Boolean => JavaBoolean}
-import java.util.{UUID, HashSet => JavaHashSet}
-
+import org.apache.ignite.internal.visor.node.VisorNodeGcTask
import org.apache.ignite.visor.VisorTag
import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
-import visor.visor._
+import org.apache.ignite.visor.visor._
+
+import java.util.UUID
import scala.collection.JavaConversions._
import scala.language.{implicitConversions, reflectiveCalls}
@@ -240,5 +237,5 @@ object VisorGcCommand {
*
* @param vs Visor tagging trait.
*/
-implicit def fromGc2Visor(vs: VisorTag) = cmd
+implicit def fromGc2Visor(vs: VisorTag): VisorGcCommand = cmd
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdebb406/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
index 5e6f1c3..1a59274 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
@@ -17,26 +17,29 @@
package org.apache.ignite.visor.commands.gc
-import org.apache.ignite.visor.visor
-import org.scalatest._
-
+import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.visor.commands.gc.VisorGcCommand._
-import org.apache.ignite.visor.commands.top.VisorTopologyCommand._
+import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor}
/**
* Unit test for 'gc' command.
*/
-class VisorGcCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAll
{
+class VisorGcCommandSpec extends VisorRuntimeBaseSpec(1) {
behavior of "A 'gc' visor command"
-override def beforeAll() {
-visor.open("-d")
+/**
+ * Creates grid configuration for provided grid host.
+ *
+ * @param name Grid name.
+ * @return Grid configuration.
+ */
+override def config(name: String): IgniteConfiguration = {
+val cfg = new IgniteConfiguration
-visor.top()
-}
+cfg.setGridName(name)
+cfg.setLifeCycleEmailNotification(false)
-override def afterAll() {
-visor.close()
+cfg
}
it should "run GC on all nodes" in {
[36/51] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
deleted file mode 100644
index b3627fc..000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ /dev/null
@@ -1,9141 +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.util;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.mxbean.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.portables.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.streamer.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import javax.management.*;
-import javax.naming.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.lang.annotation.Annotation;
-import java.lang.management.*;
-import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.math.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.security.cert.*;
-import java.sql.*;
-import java.sql.Timestamp;
-import java.text.*;
-import java.util.*;
-import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-import java.util.jar.*;
-import java.util.logging.*;
-import java.util.regex.*;
-import java.util.zip.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
-
-/**
- * Collection of utility methods used throughout the system.
- */
-@SuppressWarnings({"UnusedReturnValue", "UnnecessaryFullyQualifiedName"})
-public abstract class GridUtils {
-/** Unsafe. */
-private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-/** {@code True} if {@code unsafe} should be used for array copy. */
-private static final boolean UNSAFE_BYTE_ARR_CP =
unsafeByteArrayCopyAvailable();
-
-/** Offset. */
-private static final int BYTE_ARRAY_DATA_OFFSET =
UNSAFE.arrayBaseOffset(byte[].class);
-
-/** Sun-specific JDK constructor factory for objects that don't have empty
constructor. */
-private static final Method CTOR_FACTORY;
-
-/** Sun JDK reflection factory. */
-private static final Object SUN_REFLECT_FACTORY;
-
-/** Public {@code java.lang.Object} no-argument constructor. */
-private static final Constructor OBJECT_CTOR;
-
-/** All grid event names. */
-private static final Map GRID_EVT_NAMES = new HashMap<>();
-
-/** All grid events. */
-private static final int[] GRID_EVTS;
-
-/** Empty integers array. */
-private static final int[] EMPTY_INTS = new int[0];
-
-/** Empty longs. */
-private static final long[] EMPTY_LONGS = new long[0];
-
-/** System line separator. */
-private static final String NL = System.getProperty("line.separator");
-
-/** Default user version. */
-public static final String DFLT_USER_VERSION = "0";
-
-/** Cache for {@link GridPeerDeployAware} fields to speed up reflection. */
-private static fin
[32/51] [abbrv] incubator-ignite git commit: ignite-117 rebuilt mac natives
ignite-117 rebuilt mac natives Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/506cda64 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/506cda64 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/506cda64 Branch: refs/heads/ignite-72-1 Commit: 506cda644ac151d5b0da8e36de2959efc00d8f8e Parents: e73857f Author: Yakov Zhdanov Authored: Thu Jan 29 16:29:08 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 16:29:08 2015 +0300 -- .../META-INF/native/osx/libigniteshmem.dylib| Bin 33108 -> 33116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/506cda64/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib index 6cfeb9e..2152401 100755 Binary files a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib and b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib differ
[17/51] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
index c689be0..f4ba945 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
@@ -158,7 +158,7 @@ class GridAffinityUtils {
assert ignite != null;
assert log != null;
-GridKernal kernal = ((GridKernal) ignite);
+IgniteKernal kernal = ((IgniteKernal) ignite);
GridCacheContext cctx =
kernal.internalCache(cacheName).context();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 92d2039..35b34f0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5249,7 +5249,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public Object call() throws Exception {
-((GridEx) ignite).cachex(cacheName).clearAll();
+((IgniteEx) ignite).cachex(cacheName).clearAll();
return null;
}
@@ -5302,7 +5302,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public Integer apply(Object o) {
-GridCache cache =
((GridEx)ignite).cachex(cacheName);
+GridCache cache =
((IgniteEx)ignite).cachex(cacheName);
return primaryOnly ? cache.primarySize() : cache.size();
}
@@ -5533,7 +5533,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public Void call() throws Exception {
-GridCacheAdapter cache =
((GridKernal)ignite).context().cache().internalCache(cacheName);
+GridCacheAdapter cache =
((IgniteKernal)ignite).context().cache().internalCache(cacheName);
assert cache != null : cacheName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 0336832..0f5b06d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -530,7 +530,7 @@ public class GridCacheContext implements
Externalizable {
/**
* @return Grid instance.
*/
-public GridEx grid() {
+public IgniteEx grid() {
return ctx.grid();
}
@@ -1888,7 +1888,7 @@ public class GridCacheContext implements
Externalizable {
try {
IgniteBiTuple t = stash.get();
-GridKernal grid = GridGainEx.gridx(t.get1());
+IgniteKernal grid = GridGainEx.gridx(t.get1());
GridCacheAdapter cache = grid.internalCache(t.get2());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index d49ea9f..2793bb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -1493,7 +1493,7 @@ public final class GridCacheDataStructuresManager
extends GridCacheManager
/** {@inheritD
[30/50] [abbrv] incubator-ignite git commit: # ignite-117 : fix IpcSharedMemoryUtils.cpp (fix name of exceptions)
# ignite-117 : fix IpcSharedMemoryUtils.cpp (fix name of exceptions)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96f56c78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96f56c78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96f56c78
Branch: refs/heads/ignite-69
Commit: 96f56c7801c920b47e76b752a903f023bab74b35
Parents: d01fa22
Author: Artem SHutak
Authored: Thu Jan 29 15:49:45 2015 +0300
Committer: Artem SHutak
Committed: Thu Jan 29 15:49:45 2015 +0300
--
...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 26 ++--
1 file changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96f56c78/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
--
diff --git
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
index eaa13fd..923c6fb 100644
---
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
+++
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
@@ -36,13 +36,13 @@
using namespace std;
/** IgniteCheckedException JNI class name. */
-const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
+const char* IGNITE_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
-/** GridIpcSharedMemoryOperationTimedoutException JNI class name. */
-const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryOperationTimedoutException";
+/** IpcSharedMemoryOperationTimedoutException JNI class name. */
+const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryOperationTimedoutException";
-/** GridIpcOutOfSystemResourcesException JNI class name. */
-const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcOutOfSystemResourcesException";
+/** IpcOutOfSystemResourcesException JNI class name. */
+const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/IpcOutOfSystemResourcesException";
/** Global flag for enabling debug logging. */
static bool __GG_DEBUG = false;
@@ -220,7 +220,7 @@ static void throwExceptionByErrno(JNIEnv* env) {
break;
default:
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
break;
}
}
@@ -244,7 +244,7 @@ static bool semInit(JNIEnv* env, int semId, int semNum) {
GG_LOG_DEBUG("Semaphore init failed [semId=%d, semNum=%s, errno=%d]",
semId,
semNum == SEM_READ ? "SEM_READ" : "SEM_WRITE", errno);
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
return false;
}
@@ -299,7 +299,7 @@ static void semWait(JNIEnv * env, int semId, int semNum,
int timeout, T_IpcData
return;
}
else {
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
}
}
}
@@ -329,7 +329,7 @@ static void semNotify(JNIEnv * env, int semId, int semNum,
T_IpcData *ipcData) {
GG_LOG_DEBUG("Semaphore wait failed [semId=%d, semNum=%s, errno=%d]",
semId,
semNum == SEM_READ ? "SEM_READ" : "SEM_WRITE", errno);
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
}
}
@@ -361,7 +361,7 @@ jlong
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_alloca
// Get system token, used in IPC.
if ((key = ::ftok(tokFileName.c_str(), 'G')) == -1) {
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
return 0;
}
@@ -405,7 +405,7 @@ jlong
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_alloca
// Initialize SEM_READ and SEM_WRITE to 1.
if (!semInit(env, semId, SEM_READ) || !semInit(env, semId, SEM_WRITE)) {
// Exception will be thrown on return.
-throwException(env, GRID_EXCEPTION);
+throwException(env, IGNITE_EXCEPTION);
// Cleanup ignoring possible errors.
::semctl(semId, 0, IPC_RMID);
@@ -722,7 +722,7 @@ void
Java_org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils_WriteSh
while (unreadCnt == ipcData->size) {
if (ipcData->closed) {
-env->ThrowNew(env->FindClass(GRID_EXCEPTION), "Shared memory
segment has been closed.");
+env->ThrowNew(env->FindClass(IGNITE_EXCEPTION), "Shared memory
segment has been closed.
[47/50] [abbrv] incubator-ignite git commit: # ignite-sprint-1 fixed build.
# ignite-sprint-1 fixed build. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fe57d44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fe57d44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fe57d44 Branch: refs/heads/ignite-69 Commit: 4fe57d44373294700dcdeb42206bd525ce84475a Parents: bdebb40 Author: AKuznetsov Authored: Fri Jan 30 09:55:21 2015 +0700 Committer: AKuznetsov Committed: Fri Jan 30 09:55:21 2015 +0700 -- assembly/release-hadoop.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe57d44/assembly/release-hadoop.xml -- diff --git a/assembly/release-hadoop.xml b/assembly/release-hadoop.xml index 7dbd5ea..576425c 100644 --- a/assembly/release-hadoop.xml +++ b/assembly/release-hadoop.xml @@ -39,15 +39,15 @@ /docs -docs/core-site.gridgain.xml +docs/core-site.ignite.xml /docs -docs/mapred-site.gridgain.xml +docs/mapred-site.ignite.xml /docs -docs/hive-site.gridgain.xml +docs/hive-site.ignite.xml /docs
[20/50] [abbrv] incubator-ignite git commit: ignite-117: rebuilt
ignite-117: rebuilt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07b24d04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07b24d04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07b24d04 Branch: refs/heads/ignite-69 Commit: 07b24d040a36e2419557a9e7f455ce41952a15df Parents: 3789241 Author: Yakov Zhdanov Authored: Wed Jan 28 19:54:51 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jan 28 19:54:51 2015 +0300 -- .../main/java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../java/META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33108 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b24d04/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib deleted file mode 100755 index bfee82f..000 Binary files a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b24d04/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib new file mode 100755 index 000..6cfeb9e Binary files /dev/null and b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib differ
[08/50] [abbrv] incubator-ignite git commit: # ignite-117 : md5Calculation was moved at GridUtils
# ignite-117 : md5Calculation was moved at GridUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0632bb3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0632bb3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0632bb3b
Branch: refs/heads/ignite-69
Commit: 0632bb3b537e24571efc3be8a9ba5b01d3557069
Parents: 3f4c416
Author: Artem SHutak
Authored: Tue Jan 27 21:38:53 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 21:38:53 2015 +0300
--
.../apache/ignite/internal/util/GridUtils.java | 34
.../shmem/GridIpcSharedMemoryNativeLoader.java | 38 +-
.../ignite/internal/util/GridUtilsSelfTest.java | 41 +---
...GridIpcSharedMemoryNativeLoaderSelfTest.java | 8
4 files changed, 62 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0632bb3b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
index 5279b59..046422a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
@@ -9097,4 +9097,38 @@ public abstract class GridUtils {
return list;
}
+
+public static byte[] calculateMD5Digest(InputStream input) throws
NoSuchAlgorithmException, IOException {
+MessageDigest md = MessageDigest.getInstance("MD5");
+InputStream fis = new BufferedInputStream(input);
+byte[] dataBytes = new byte[1024];
+
+int nread;
+while ((nread = fis.read(dataBytes)) != -1) {
+md.update(dataBytes, 0, nread);
+}
+
+byte[] md5Bytes = md.digest();
+
+//convert the byte to hex format
+StringBuilder sb = new StringBuilder("");
+for (byte md5Byte : md5Bytes) {
+sb.append(Integer.toString((md5Byte & 0xff) + 0x100,
16).substring(1));
+}
+
+return md5Bytes;
+}
+
+public static String calculateMD5(InputStream input) throws
NoSuchAlgorithmException, IOException {
+byte[] md5Bytes = calculateMD5Digest(input);
+
+//convert the byte to hex format
+StringBuilder sb = new StringBuilder();
+for (byte md5Byte : md5Bytes) {
+sb.append(Integer.toString((md5Byte & 0xff) + 0x100,
16).substring(1));
+}
+
+return sb.toString();
+}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0632bb3b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
index 243a099..35c4754 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import java.io.*;
import java.net.URL;
import java.nio.channels.FileLock;
-import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Collection;
import java.util.LinkedList;
@@ -250,44 +249,11 @@ public class GridIpcSharedMemoryNativeLoader {
try (InputStream targetIS = new FileInputStream(target);
InputStream srcIS = src.openStream()){
-String targetMD5 = calculateMD5(targetIS);
-String srcMD5 = calculateMD5(srcIS);
+String targetMD5 = U.calculateMD5(targetIS);
+String srcMD5 = U.calculateMD5(srcIS);
return targetMD5.equals(srcMD5);
}
}
-static byte[] calculateMD5Digest(InputStream input) throws
NoSuchAlgorithmException, IOException {
-MessageDigest md = MessageDigest.getInstance("MD5");
-InputStream fis = new BufferedInputStream(input);
-byte[] dataBytes = new byte[1024];
-
-int nread;
-while ((nread = fis.read(dataBytes)) != -1) {
-md.update(dataBytes, 0, nread);
-}
-
-byte[] md5Bytes = md.digest();
-
-//convert the byte to hex format
-StringBuilder sb = new StringBuilder("");
-for (byte md5Byte : md5Bytes) {
-sb.append(Integer.toSt
[44/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/580c36e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/580c36e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/580c36e6 Branch: refs/heads/ignite-69 Commit: 580c36e66625ad203dfa18e830649c64e3e531f0 Parents: 14ad3ea f30d79d Author: AKuznetsov Authored: Thu Jan 29 22:31:25 2015 +0700 Committer: AKuznetsov Committed: Thu Jan 29 22:31:25 2015 +0700 -- .../processors/cache/GridCacheAdapter.java | 16 ++- .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java| 50 .../commands/alert/VisorAlertCommand.scala | 2 +- 4 files changed, 55 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580c36e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala --
[33/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117
Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117 Conflicts: ipc/shmem/readme.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6a720f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6a720f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6a720f7 Branch: refs/heads/ignite-69 Commit: d6a720f7ae2be07dcb3207be445cfdb1cb816974 Parents: 506cda6 9ea9607 Author: Yakov Zhdanov Authored: Thu Jan 29 16:30:45 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 16:30:45 2015 +0300 -- assembly/libs/readme.txt| 111 +- assembly/release-base-fabric.xml|2 +- docs/core-site.gridgain.xml | 89 - docs/core-site.ignite.xml | 89 + docs/gridgain_readme.md | 149 - docs/gridgain_readme.pdf| Bin 407698 -> 0 bytes docs/hadoop_readme.md | 80 +- docs/hadoop_readme.pdf | Bin 411788 -> 82297 bytes docs/hive-site.gridgain.xml | 36 - docs/hive-site.ignite.xml | 36 + docs/ignite_readme.md | 100 + docs/ignite_readme.pdf | Bin 0 -> 76810 bytes docs/mapred-site.gridgain.xml | 79 - docs/mapred-site.ignite.xml | 79 + examples/config/filesystem/readme.txt |4 +- .../hibernate/example-hibernate-L2-cache.xml| 14 +- examples/config/hibernate/readme.txt|4 +- examples/config/servlet/readme.txt |2 +- .../ComputeFibonacciContinuationExample.java| 11 +- .../compute/ComputeRunnableExample.java |5 +- .../datagrid/CacheDataLoaderExample.java| 15 +- .../HibernateL2CacheExampleNodeStartup.java |6 +- .../examples/ScalarContinuationExample.scala|9 +- ipc/readme.txt |4 +- ipc/shmem/readme.txt| 10 +- modules/aop/readme.txt | 12 +- modules/aws/readme.txt | 12 +- .../ClientAbstractMultiThreadedSelfTest.java|8 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../integration/ClientAbstractSelfTest.java |8 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/RestProcessorStartSelfTest.java|3 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../org/apache/ignite/IgniteDataLoader.java | 14 +- .../java/org/apache/ignite/IgniteScheduler.java |6 +- .../apache/ignite/IgniteSystemProperties.java |6 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../org/apache/ignite/cache/CacheEntry.java | 27 +- .../apache/ignite/cache/CacheProjection.java| 43 +- .../apache/ignite/cache/CachingProvider.java|2 +- .../java/org/apache/ignite/cache/GridCache.java |5 +- .../apache/ignite/cache/query/CacheQueries.java |7 +- .../ignite/cache/query/CacheQueryFuture.java|4 +- .../ignite/compute/ComputeTaskFuture.java |4 +- .../ignite/compute/ComputeTaskSession.java |3 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../org/apache/ignite/hadoop/GridHadoop.java|6 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterNodeLocalMapImpl.java |2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 - .../ignite/internal/GridJobSessionImpl.java |2 +- .../org/apache/ignite/internal/GridKernal.java | 3322 -- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |8 +- .../apache/ignite/internal/GridLoggerProxy.java |2 +- .../ignite/internal/GridTaskSessionImpl.java|2 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../ignite/internal/IgniteInternalFuture.java | 190 + .../apache/ignite/internal/IgniteKernal.java| 3322 ++ .../ignite/internal/IgniteSchedulerImpl.java|6 +- .../org/apache/ignite/internal/IgnitionEx.java | 2396 + .../internal/executor/GridExecutorService.java | 44 +- .../managers/communication/GridIoManager.java |3 +- .../discovery/GridDiscoveryManager.java |2 +- .../eventstorage/GridEventStorageManager.java |4 +- .../affinity/GridAffinityAssignmentCache.java |5 +- .../affinity/GridAffinityProcessor.java |8 +- .../
[24/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
deleted file mode 100644
index 93590d5..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
+++ /dev/null
@@ -1,336 +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.util.ipc.shmem;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.ipc.*;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * IPC endpoint based on shared memory space.
- */
-public class GridIpcSharedMemoryClientEndpoint implements GridIpcEndpoint {
-/** In space. */
-private final GridIpcSharedMemorySpace inSpace;
-
-/** Out space. */
-private final GridIpcSharedMemorySpace outSpace;
-
-/** In space. */
-private final GridIpcSharedMemoryInputStream in;
-
-/** Out space. */
-private final GridIpcSharedMemoryOutputStream out;
-
-/** */
-private boolean checkIn = true;
-
-/** */
-private boolean checkOut = true;
-
-/** */
-private final Thread checker;
-
-/** */
-private final IgniteLogger log;
-
-/**
- * Creates connected client IPC endpoint.
- *
- * @param inSpace In space.
- * @param outSpace Out space.
- * @param parent Parent logger.
- */
-public GridIpcSharedMemoryClientEndpoint(GridIpcSharedMemorySpace inSpace,
GridIpcSharedMemorySpace outSpace,
-IgniteLogger parent) {
-assert inSpace != null;
-assert outSpace != null;
-
-log = parent.getLogger(GridIpcSharedMemoryClientEndpoint.class);
-
-this.inSpace = inSpace;
-this.outSpace = outSpace;
-
-in = new GridIpcSharedMemoryInputStream(inSpace);
-out = new GridIpcSharedMemoryOutputStream(outSpace);
-
-checker = null;
-}
-
-/**
- * Creates and connects client IPC endpoint and starts background checker
thread to avoid deadlocks on other party
- * crash. Waits until port became available.
- *
- * @param port Port server endpoint bound to.
- * @param parent Parent logger.
- * @throws IgniteCheckedException If connection fails.
- */
-public GridIpcSharedMemoryClientEndpoint(int port, IgniteLogger parent)
throws IgniteCheckedException {
-this(port, 0, parent);
-}
-
-/**
- * Creates and connects client IPC endpoint and starts background checker
thread to avoid deadlocks on other party
- * crash.
- *
- * @param port Port server endpoint bound to.
- * @param timeout Connection timeout.
- * @param parent Parent logger.
- * @throws IgniteCheckedException If connection fails.
- */
-@SuppressWarnings({"CallToThreadStartDuringObjectConstruction",
"ErrorNotRethrown"})
-public GridIpcSharedMemoryClientEndpoint(int port, int timeout,
IgniteLogger parent) throws IgniteCheckedException {
-assert port > 0;
-assert port < 0x;
-
-log = parent.getLogger(GridIpcSharedMemoryClientEndpoint.class);
-
-GridIpcSharedMemorySpace inSpace = null;
-GridIpcSharedMemorySpace outSpace = null;
-
-Socket sock = new Socket();
-
-Exception err = null;
-boolean clear = true;
-
-try {
-GridIpcSharedMemoryNativeLoader.load();
-
-sock.connect(new InetSocketAddress("127.0.0.1", port), timeout);
-
-// Send request.
-ObjectOutputStream out = new
ObjectOutputStream(sock.getOutputStream());
-
-int pid = IpcSharedMemoryUtils.pid();
-
-out.writeObject(new GridIpcSharedMemoryInitRequest(pid));
-
-ObjectInputStream in = new
ObjectInputStream(sock.getInputStream());
-
-GridIpcSharedMemoryI
[13/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117
Merge branches 'ignite-117' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-117 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0db0cc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0db0cc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0db0cc5 Branch: refs/heads/ignite-69 Commit: f0db0cc55d77ba5ea07c90f8c5e21f4ce28867ac Parents: a6fad95 7e40e22 Author: Yakov Zhdanov Authored: Wed Jan 28 16:51:21 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jan 28 16:51:21 2015 +0300 -- .../ComputeFibonacciContinuationExample.java| 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../examples/ScalarContinuationExample.scala| 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../java/org/apache/ignite/IgniteCompute.java | 2 +- .../java/org/apache/ignite/IgniteEvents.java| 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../java/org/apache/ignite/IgniteManaged.java | 2 +- .../java/org/apache/ignite/IgniteMessaging.java | 2 +- .../ignite/cache/GridCacheVersionedEntry.java | 82 +++ .../org/apache/ignite/internal/GridKernal.java | 2 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../internal/executor/GridExecutorService.java | 2 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../cache/query/GridCacheQueryManager.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../cache/transactions/IgniteTxProxyImpl.java | 2 +- .../version/GridCachePlainVersionedEntry.java | 131 ++ .../version/GridCacheRawVersionedEntry.java | 238 +++ .../version/GridCacheVersionedEntryEx.java | 31 +++ .../dr/GridDrDataLoadCacheUpdater.java | 3 +- .../processors/dr/GridRawVersionedEntry.java| 210 .../processors/dr/GridVersionedEntry.java | 80 --- .../internal/processors/fs/GridGgfsImpl.java| 2 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 2 +- .../ignite/lang/IgniteAsyncSupported.java | 2 +- .../internal/GridCancelOnGridStopSelfTest.java | 2 +- .../GridCancelledJobsMetricsSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java| 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridFailoverCustomTopologySelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java| 34 +-- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java| 20 +- .../ignite/internal/GridReduceSelfTest.java | 2 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../internal/GridTaskExecutionSelfTest.java | 2 +- .../GridTaskInstanceExecutionSelfTest.java | 2 +- .../internal/GridTaskJobRejectSelfTest.java | 2 +- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 8 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../GridCacheGroupLockFailoverSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 4 +- .../cache/IgniteCacheInvokeAbstractTest.java| 4 +- .../GridCacheCountDownLatchSelfTest.java| 2 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheGlobalLoadTest.java| 2 +- .../GridCachePartitionedEntryLockSelfTest.java | 2 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 16 +- .../continuous/GridEventConsumeSelfTest.java| 8 +- .../continuous/GridMessageListenSelfTest.java | 4 +- .../processors/fs/GridGgfsTaskSelfTest.java | 2 +- .../GridServiceProcessorAbstractSelfTest.java | 18 +- .../GridServiceProcessorMultiNodeSelfTest.java | 6 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../loadtest/GridSingleExecutionTest.java | 2 +- .../loadtests/colocation/GridTestMain.java | 2 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiClient.java | 2 +- ...GridJobExecutionLoadTestClientSemaph
[07/50] [abbrv] incubator-ignite git commit: # ignite-117 : run test at own process
# ignite-117 : run test at own process
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f4c4167
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f4c4167
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f4c4167
Branch: refs/heads/ignite-69
Commit: 3f4c416715b07cdad4b1704a9490b18f05b93b0d
Parents: cd613db
Author: Artem SHutak
Authored: Tue Jan 27 21:25:24 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 21:25:24 2015 +0300
--
.../shmem/GridIpcSharedMemoryNativeLoader.java | 2 -
...GridIpcSharedMemoryNativeLoaderSelfTest.java | 41 +---
.../LoadIfLibFileWasCorruptedTestRunner.java| 36 +
3 files changed, 54 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f4c4167/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
index 825a235..243a099 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
@@ -275,8 +275,6 @@ public class GridIpcSharedMemoryNativeLoader {
sb.append(Integer.toString((md5Byte & 0xff) + 0x100,
16).substring(1));
}
-System.out.println("Digest(in hex format):: " + sb.toString());
-
return md5Bytes;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f4c4167/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
index 196be0a..2d082c2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
@@ -1,42 +1,37 @@
package org.apache.ignite.internal.util.ipc.shmem;
import junit.framework.TestCase;
+import org.apache.ignite.internal.util.GridJavaProcess;
+import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Collections;
public class GridIpcSharedMemoryNativeLoaderSelfTest extends TestCase {
-private static final String DEFAULT_TMP_DIR =
System.getProperty("java.io.tmpdir");
-public static final String TMP_DIR_FOR_TEST =
System.getProperty("user.home");
-public static final String LOADED_LIB_FILE_NAME =
System.mapLibraryName(GridIpcSharedMemoryNativeLoader.libFileName());
-
//TODO linux specific
public void testLoadIfLibFileWasCorrupted() throws Exception {
-try {
-System.setProperty("java.io.tmpdir", TMP_DIR_FOR_TEST);
+Process ps =
GridJavaProcess.exec(LoadIfLibFileWasCorruptedTestRunner.class, null, null,
null, null, Collections.emptyList(), null).getProcess();
-createCorruptedLibFile();
+readStreams(ps);
+int code = ps.waitFor();
-GridIpcSharedMemoryNativeLoader.load();
-} finally {
-System.setProperty("java.io.tmpdir", DEFAULT_TMP_DIR);
-}
+assertEquals("Returned code have to be 0.", 0, code);
}
-private void createCorruptedLibFile() throws IOException {
-File loadedFile = new File(System.getProperty("java.io.tmpdir"),
LOADED_LIB_FILE_NAME);
-
-if (loadedFile.exists())
-assertTrue("Could not delete libggshem file.",loadedFile.delete());
-loadedFile.deleteOnExit();
+private void readStreams(Process proc) throws IOException {
+BufferedReader stdOut = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+String s;
+while ((s = stdOut.readLine()) != null) {
+System.out.println("OUT>> " + s);
+}
-assertTrue("Could not create new file.", loadedFile.createNewFile());
+BufferedReader errOut = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));
+while ((s = errOu
[25/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
# ignite-117 : rename classes from ipc package GridIpc..->Ipc.. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e50ca07d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e50ca07d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e50ca07d Branch: refs/heads/ignite-69 Commit: e50ca07de475612eb36e7706f6100e7c6f159826 Parents: 3789241 Author: Artem SHutak Authored: Wed Jan 28 20:52:06 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 20:52:06 2015 +0300 -- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java| 8 +- .../processors/fs/IgniteFsNoopProcessor.java| 2 +- .../processors/fs/IgniteFsProcessor.java| 4 +- .../processors/fs/IgniteFsProcessorAdapter.java | 2 +- .../internal/util/ipc/GridIpcEndpoint.java | 49 -- .../util/ipc/GridIpcEndpointBindException.java | 47 -- .../util/ipc/GridIpcEndpointFactory.java| 84 --- .../internal/util/ipc/GridIpcEndpointType.java | 29 - .../util/ipc/GridIpcServerEndpoint.java | 73 -- .../ipc/GridIpcServerEndpointDeserializer.java | 66 -- .../internal/util/ipc/GridIpcToNioAdapter.java | 250 --- .../ignite/internal/util/ipc/IpcEndpoint.java | 49 ++ .../util/ipc/IpcEndpointBindException.java | 47 ++ .../internal/util/ipc/IpcEndpointFactory.java | 84 +++ .../internal/util/ipc/IpcEndpointType.java | 29 + .../internal/util/ipc/IpcServerEndpoint.java| 73 ++ .../util/ipc/IpcServerEndpointDeserializer.java | 66 ++ .../internal/util/ipc/IpcToNioAdapter.java | 250 +++ .../ipc/loopback/GridIpcClientTcpEndpoint.java | 87 --- .../ipc/loopback/GridIpcServerTcpEndpoint.java | 179 - .../util/ipc/loopback/IpcClientTcpEndpoint.java | 87 +++ .../util/ipc/loopback/IpcServerTcpEndpoint.java | 179 + .../GridIpcOutOfSystemResourcesException.java | 59 -- .../GridIpcSharedMemoryClientEndpoint.java | 336 - .../shmem/GridIpcSharedMemoryInitRequest.java | 67 -- .../shmem/GridIpcSharedMemoryInitResponse.java | 171 - .../shmem/GridIpcSharedMemoryInputStream.java | 99 --- .../shmem/GridIpcSharedMemoryNativeLoader.java | 261 --- ...cSharedMemoryOperationTimedoutException.java | 59 -- .../shmem/GridIpcSharedMemoryOutputStream.java | 80 --- .../GridIpcSharedMemoryServerEndpoint.java | 707 --- .../ipc/shmem/GridIpcSharedMemorySpace.java | 374 -- .../shmem/IpcOutOfSystemResourcesException.java | 59 ++ .../shmem/IpcSharedMemoryClientEndpoint.java| 336 + .../ipc/shmem/IpcSharedMemoryInitRequest.java | 67 ++ .../ipc/shmem/IpcSharedMemoryInitResponse.java | 171 + .../ipc/shmem/IpcSharedMemoryInputStream.java | 99 +++ .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 261 +++ ...cSharedMemoryOperationTimedoutException.java | 59 ++ .../ipc/shmem/IpcSharedMemoryOutputStream.java | 80 +++ .../shmem/IpcSharedMemoryServerEndpoint.java| 707 +++ .../util/ipc/shmem/IpcSharedMemorySpace.java| 374 ++ .../util/ipc/shmem/IpcSharedMemoryUtils.java| 18 +- .../util/nio/GridShmemCommunicationClient.java | 4 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 24 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 4 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- ...idIpcServerEndpointDeserializerSelfTest.java | 160 - .../IpcServerEndpointDeserializerSelfTest.java | 160 + .../ipc/shmem/GgfsSharedMemoryTestClient.java | 76 ++ .../ipc/shmem/GgfsSharedMemoryTestServer.java | 71 ++ .../shmem/GridGgfsSharedMemoryTestClient.java | 76 -- .../shmem/GridGgfsSharedMemoryTestServer.java | 71 -- ...idIpcSharedMemoryCrashDetectionSelfTest.java | 500 - .../shmem/GridIpcSharedMemoryFakeClient.java| 36 - ...GridIpcSharedMemoryNativeLoaderSelfTest.java | 46 -- .../shmem/GridIpcSharedMemoryNodeStartup.java | 87 --- .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 259 --- .../IpcSharedMemoryCrashDetectionSelfTest.java | 500 + .../ipc/shmem/IpcSharedMemoryFakeClient.java| 36 + .../IpcSharedMemoryNativeLoaderSelfTest.java| 46 ++ .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 87 +++ .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 259 +++ .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 4 +- .../LoadWithCorruptedLibFileTestRunner.java | 4 +- .../GridIpcSharedMemoryBenchmarkParty.java | 35 - .../GridIpcSharedMemoryBenchmarkReader.java | 133 .../GridIpcSharedMemoryBenchmarkWriter.java | 125 .../IpcSharedMemoryBenchmarkParty.java | 35 + .../IpcSharedMemoryBenchmarkReader.java | 133 .../IpcShare
[50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-69
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-69 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a50356e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a50356e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a50356e Branch: refs/heads/ignite-69 Commit: 5a50356e2f06f633ea3da1516694d606bc03cd48 Parents: a297fb3 9550905 Author: avinogradov Authored: Fri Jan 30 11:33:01 2015 +0300 Committer: avinogradov Committed: Fri Jan 30 11:33:01 2015 +0300 -- assembly/release-hadoop.xml |6 +- ipc/shmem/Makefile.am |2 +- ipc/shmem/Makefile.in |2 +- ipc/shmem/configure |4 +- ipc/shmem/configure.ac |2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am |2 +- ipc/shmem/include/Makefile.in |2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt|9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java |4 +- .../ClientPropertiesConfigurationSelfTest.java |4 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib| Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java |2 +- .../java/org/apache/ignite/IgniteException.java |2 +- .../processors/cache/GridCacheAdapter.java | 16 +- .../cache/GridCacheDeploymentManager.java |2 +- .../cache/GridCacheMvccCandidate.java |4 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../transactions/IgniteTxLocalAdapter.java | 42 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java|8 +- .../processors/fs/IgniteFsNoopProcessor.java|2 +- .../processors/fs/IgniteFsProcessor.java|4 +- .../processors/fs/IgniteFsProcessorAdapter.java |2 +- .../service/GridServiceProcessor.java |2 +- .../apache/ignite/internal/util/GridUtils.java | 9100 - .../ignite/internal/util/IgniteUtils.java | 9141 ++ .../internal/util/ipc/GridIpcEndpoint.java | 49 - .../util/ipc/GridIpcEndpointBindException.java | 47 - .../util/ipc/GridIpcEndpointFactory.java| 84 - .../internal/util/ipc/GridIpcEndpointType.java | 29 - .../util/ipc/GridIpcServerEndpoint.java | 73 - .../ipc/GridIpcServerEndpointDeserializer.java | 66 - .../internal/util/ipc/GridIpcToNioAdapter.java | 250 - .../ignite/internal/util/ipc/IpcEndpoint.java | 49 + .../util/ipc/IpcEndpointBindException.java | 47 + .../internal/util/ipc/IpcEndpointFactory.java | 84 + .../internal/util/ipc/IpcEndpointType.java | 29 + .../internal/util/ipc/IpcServerEndpoint.java| 73 + .../util/ipc/IpcServerEndpointDeserializer.java | 66 + .../internal/util/ipc/IpcToNioAdapter.java | 250 + .../ipc/loopback/GridIpcClientTcpEndpoint.java | 87 - .../ipc/loopback/GridIpcServerTcpEndpoint.java | 179 - .../util/ipc/loopback/IpcClientTcpEndpoint.java | 87 + .../util/ipc/loopback/IpcServerTcpEndpoint.java | 179 + .../GridIpcOutOfSystemResourcesException.java | 59 - .../GridIpcSharedMemoryClientEndpoint.java | 336 - .../shmem/GridIpcSharedMemoryInitRequest.java | 67 - .../shmem/GridIpcSharedMemoryInitResponse.java | 171 - .../shmem/GridIpcSharedMemoryInputStream.java | 99 - .../shmem/GridIpcSharedMemoryNativeLoader.java | 242 - ...cSharedMemoryOperationTimedoutException.java | 59 - .../shmem/GridIpcSharedMemoryOutputStream.java | 80 - .../GridIpcSharedMemoryServerEndpoint.java | 707 -- .../ipc/shmem/GridIpcSharedMemorySpace.java | 374 - .../ipc/shmem/GridIpcSharedMemoryUtils.java | 242 - .../shmem/IpcOutOfSystemResourcesException.java | 59 + .../shmem/IpcSharedMemoryClientEndpoint.java| 336 + .../ipc/shmem/IpcSharedMemoryInitRequest.java | 67 + .../ipc/shmem/IpcSharedMemoryInitResponse.java | 171 + .../ipc/shmem/IpcSharedMemoryInputStream.java | 99 + .../ipc/shmem/IpcSha
[28/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-109
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-109 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5791d43a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5791d43a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5791d43a Branch: refs/heads/ignite-69 Commit: 5791d43aed7d8a1a4566d4b18b4b20848f1d942c Parents: 31ce585 673d11b Author: sboikov Authored: Thu Jan 29 07:09:13 2015 +0300 Committer: sboikov Committed: Thu Jan 29 07:09:13 2015 +0300 -- .../hibernate/example-hibernate-L2-cache.xml| 14 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../datagrid/CacheDataLoaderExample.java| 15 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- .../examples/ScalarContinuationExample.scala| 2 +- .../apache/ignite/gridify/AbstractAopTest.java | 2 +- .../apache/ignite/gridify/TestGridifyTask.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java| 1 + .../java/org/apache/ignite/IgniteCache.java | 40 ++- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../java/org/apache/ignite/IgniteCompute.java | 2 +- .../java/org/apache/ignite/IgniteEvents.java| 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../java/org/apache/ignite/IgniteManaged.java | 2 +- .../java/org/apache/ignite/IgniteMessaging.java | 2 +- .../java/org/apache/ignite/cache/CacheLock.java | 57 .../org/apache/ignite/cache/CacheManager.java | 10 +- .../ignite/cache/GridCacheVersionedEntry.java | 82 ++ .../org/apache/ignite/internal/GridKernal.java | 32 +-- .../ignite/internal/IgniteClusterAsyncImpl.java | 9 +- .../ignite/internal/IgniteComputeImpl.java | 70 ++--- .../ignite/internal/IgniteEventsImpl.java | 9 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../ignite/internal/IgniteMessagingImpl.java| 12 +- .../internal/executor/GridExecutorService.java | 2 +- .../managers/communication/GridIoManager.java | 3 +- .../processors/cache/CacheLockImpl.java | 132 ++--- .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheAtomicVersionComparator.java | 2 + .../cache/GridCacheBatchSwapEntry.java | 1 + .../cache/GridCacheClearAllRunnable.java| 1 + .../processors/cache/GridCacheContext.java | 44 +++ .../processors/cache/GridCacheEntryEx.java | 9 + .../processors/cache/GridCacheEntryInfo.java| 1 + .../cache/GridCacheEvictionManager.java | 1 + .../cache/GridCacheEvictionRequest.java | 1 + .../cache/GridCacheExplicitLockSpan.java| 1 + .../processors/cache/GridCacheFuture.java | 1 + .../cache/GridCacheLockTimeoutException.java| 2 + .../processors/cache/GridCacheMapEntry.java | 117 ++-- .../processors/cache/GridCacheMvcc.java | 1 + .../cache/GridCacheMvccCandidate.java | 1 + .../processors/cache/GridCacheMvccManager.java | 1 + .../cache/GridCacheOffheapSwapEntry.java| 1 + .../processors/cache/GridCacheProcessor.java| 1 + .../processors/cache/GridCacheProjectionEx.java | 1 + .../cache/GridCacheProjectionImpl.java | 1 + .../processors/cache/GridCacheProxyImpl.java| 1 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheStoreManager.java | 19 +- .../processors/cache/GridCacheSwapEntry.java| 1 + .../cache/GridCacheSwapEntryImpl.java | 1 + .../processors/cache/GridCacheSwapManager.java | 1 + .../processors/cache/GridCacheTtlManager.java | 1 + .../cache/GridCacheUpdateAtomicResult.java | 7 +- .../processors/cache/GridCacheUtils.java| 1 + .../processors/cache/GridCacheVersion.java | 256 - .../processors/cache/GridCacheVersionEx.java| 104 --- .../cache/GridCacheVersionManager.java | 281 -- .../processors/cache/GridCacheVersionable.java | 28 -- .../processors/cache/GridDrResolveResult.java | 63 - .../cache/IgniteCacheExpiryPolicy.java | 1 + .../processors/cache/IgniteCacheProxy.java | 33 +-- .../distributed/GridCacheCommittedTxInfo.java | 2 +- .../distributed/GridCacheMappedVersion.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 1 + ...idCacheOptimisticCheckPreparedTxRequest.java | 2 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../GridCachePerThreadTxCommitBuffer.java | 1 + ...dCachePessimisticCheckCommittedTxFuture.java | 1 + ...CachePessimisticCheckCommittedTxRequest.java | 2 +-
[12/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-117
Merge branch 'sprint-1' into ignite-117 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6fad954 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6fad954 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6fad954 Branch: refs/heads/ignite-69 Commit: a6fad954f2c4998ebab0d656878b5037d3451498 Parents: 256a70b 0646bb9 Author: Artem SHutak Authored: Wed Jan 28 14:33:04 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 14:33:04 2015 +0300 -- NOTICE.txt | 14 +- examples/config/example-cache.xml |9 +- examples/config/example-compute.xml |9 +- examples/config/example-streamer.xml|9 +- examples/config/filesystem/example-ggfs.xml |9 +- .../examples/misc/springbean/spring-bean.xml|9 +- .../examples/ScalarStartStopExample.scala | 73 - .../examples/IgniteFsExamplesSelfTest.java | 26 +- .../tests/examples/ScalarExamplesSelfTest.scala |5 - .../apache/ignite/gridify/AbstractAopTest.java |2 +- .../apache/ignite/gridify/TestGridifyTask.java |2 +- .../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 12 +- .../ClientAbstractMultiNodeSelfTest.java|1 + .../integration/ClientAbstractSelfTest.java | 20 +- .../rest/AbstractRestProcessorSelfTest.java |2 + .../rest/ClientMemcachedProtocolSelfTest.java |4 +- .../rest/RestBinaryProtocolSelfTest.java|9 +- .../rest/RestMemcacheProtocolSelfTest.java |9 +- .../src/main/java/org/apache/ignite/Ignite.java | 10 + .../java/org/apache/ignite/IgniteCache.java | 53 +- .../apache/ignite/cache/CacheEntryEvent.java|2 +- .../java/org/apache/ignite/cache/CacheLock.java | 57 - .../org/apache/ignite/cache/CacheMBean.java | 295 .../org/apache/ignite/cache/CacheManager.java | 172 ++- .../org/apache/ignite/cache/CacheMetrics.java | 416 +- .../java/org/apache/ignite/cache/GridCache.java | 15 +- .../ignite/cache/affinity/CacheAffinity.java|9 +- .../fifo/CacheFifoEvictionPolicyMBean.java | 10 +- ...CacheGgfsPerBlockLruEvictionPolicyMBean.java | 18 +- .../lru/CacheLruEvictionPolicyMBean.java| 10 +- .../random/CacheRandomEvictionPolicyMBean.java |6 +- .../ignite/cache/store/CacheStoreSession.java |2 +- .../client/router/GridTcpRouterMBean.java | 16 +- .../apache/ignite/cluster/ClusterMetrics.java | 697 + .../org/apache/ignite/cluster/ClusterNode.java | 40 +- .../ignite/cluster/ClusterNodeMetrics.java | 695 - .../configuration/IgniteConfiguration.java | 27 +- .../ignite/dotnet/GridDotNetConfiguration.java | 113 -- .../dotnet/GridDotNetPortableConfiguration.java | 207 --- .../GridDotNetPortableTypeConfiguration.java| 219 --- .../java/org/apache/ignite/dotnet/package.html | 23 - .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterLocalNodeMetrics.java | 311 .../ClusterLocalNodeMetricsMXBeanImpl.java | 309 .../ignite/internal/ClusterMetricsImpl.java | 813 -- .../ignite/internal/ClusterMetricsSnapshot.java | 1397 ++ .../internal/ClusterNodeMetricsMBean.java | 29 - .../org/apache/ignite/internal/GridGainEx.java |8 +- .../ignite/internal/GridJobExecuteRequest.java | 95 +- .../internal/GridJobExecuteRequestV2.java | 185 --- .../org/apache/ignite/internal/GridKernal.java | 32 +- .../org/apache/ignite/internal/GridTopic.java |5 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 10 +- .../ignite/internal/IgniteComputeImpl.java | 70 +- .../ignite/internal/IgniteEventsImpl.java |9 +- .../ignite/internal/IgniteMessagingImpl.java| 12 +- .../internal/IgniteThreadPoolMBeanAdapter.java | 149 -- .../internal/IgniteThreadPoolMXBeanAdapter.java | 129 ++ .../ignite/internal/IgnitionMBeanAdapter.java | 59 - .../ignite/internal/IgnitionMXBeanAdapter.java | 59 + .../managers/communication/GridIoManager.java | 563 +++ .../managers/communication/GridIoMessage.java | 53 +- .../discovery/GridDiscoveryManager.java |4 +- .../internal/mxbean/IgniteStandardMXBean.java | 277 .../apache/ignite/internal/mxbean/package.html | 24 + .../affinity/GridAffinityAssignment.java| 10 +- .../affinity/GridAffinityProcessor.java | 330 - .../processors/cache/CacheLockImpl.java | 132 +- .../processors/cache/CacheMetricsImpl.java | 586 .../cache/CacheMetricsMXBeanImpl.java | 310 .../processors/cache/CacheMetricsSnapshot.java | 518 +++ .../processors/cache/GridCacheAdapter.java | 378 - .../cache/GridCacheAtomicVersionC
[36/50] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
deleted file mode 100644
index b3627fc..000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ /dev/null
@@ -1,9141 +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.util;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.mxbean.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.portables.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.streamer.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import javax.management.*;
-import javax.naming.*;
-import javax.net.ssl.*;
-import java.io.*;
-import java.lang.annotation.Annotation;
-import java.lang.management.*;
-import java.lang.reflect.Array;
-import java.lang.reflect.*;
-import java.math.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.security.cert.*;
-import java.sql.*;
-import java.sql.Timestamp;
-import java.text.*;
-import java.util.*;
-import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-import java.util.jar.*;
-import java.util.logging.*;
-import java.util.regex.*;
-import java.util.zip.*;
-
-import static org.apache.ignite.IgniteSystemProperties.*;
-import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.internal.GridNodeAttributes.*;
-
-/**
- * Collection of utility methods used throughout the system.
- */
-@SuppressWarnings({"UnusedReturnValue", "UnnecessaryFullyQualifiedName"})
-public abstract class GridUtils {
-/** Unsafe. */
-private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-/** {@code True} if {@code unsafe} should be used for array copy. */
-private static final boolean UNSAFE_BYTE_ARR_CP =
unsafeByteArrayCopyAvailable();
-
-/** Offset. */
-private static final int BYTE_ARRAY_DATA_OFFSET =
UNSAFE.arrayBaseOffset(byte[].class);
-
-/** Sun-specific JDK constructor factory for objects that don't have empty
constructor. */
-private static final Method CTOR_FACTORY;
-
-/** Sun JDK reflection factory. */
-private static final Object SUN_REFLECT_FACTORY;
-
-/** Public {@code java.lang.Object} no-argument constructor. */
-private static final Constructor OBJECT_CTOR;
-
-/** All grid event names. */
-private static final Map GRID_EVT_NAMES = new HashMap<>();
-
-/** All grid events. */
-private static final int[] GRID_EVTS;
-
-/** Empty integers array. */
-private static final int[] EMPTY_INTS = new int[0];
-
-/** Empty longs. */
-private static final long[] EMPTY_LONGS = new long[0];
-
-/** System line separator. */
-private static final String NL = System.getProperty("line.separator");
-
-/** Default user version. */
-public static final String DFLT_USER_VERSION = "0";
-
-/** Cache for {@link GridPeerDeployAware} fields to speed up reflection. */
-private static fin
[10/50] [abbrv] incubator-ignite git commit: IGNITE-109 - Fixed usage of cache store in cross-cache transactions.
IGNITE-109 - Fixed usage of cache store in cross-cache transactions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31ce5854
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31ce5854
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31ce5854
Branch: refs/heads/ignite-69
Commit: 31ce5854b87adf6bdb462fb08eb9cc6e4dd81465
Parents: c224017
Author: Alexey Goncharuk
Authored: Tue Jan 27 18:38:17 2015 -0800
Committer: Alexey Goncharuk
Committed: Tue Jan 27 18:38:17 2015 -0800
--
.../processors/cache/GridCacheStoreManager.java | 25 +-
.../transactions/IgniteTxLocalAdapter.java | 42 ++-
.../IgniteCrossCacheTxStoreSelfTest.java| 288 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
4 files changed, 351 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31ce5854/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 306a8c1..d92db74 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
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
import org.apache.ignite.transactions.*;
@@ -784,6 +785,9 @@ public class GridCacheStoreManager extends
GridCacheManagerAdapter {
tx.addMeta(SES_ATTR, ses);
}
+else
+// Session cache name may change in cross-cache transaction.
+ses.cacheName(cctx.name());
}
else
ses = new SessionData(null, cctx.name());
@@ -796,12 +800,14 @@ public class GridCacheStoreManager extends
GridCacheManagerAdapter {
*/
private static class SessionData {
/** */
+@GridToStringExclude
private final IgniteTx tx;
/** */
-private final String cacheName;
+private String cacheName;
/** */
+@GridToStringInclude
private Map props;
/**
@@ -836,6 +842,18 @@ public class GridCacheStoreManager extends
GridCacheManagerAdapter {
private String cacheName() {
return cacheName;
}
+
+/**
+ * @param cacheName Cache name.
+ */
+private void cacheName(String cacheName) {
+this.cacheName = cacheName;
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(SessionData.class, this, "tx", CU.txString(tx));
+}
}
/**
@@ -873,6 +891,11 @@ public class GridCacheStoreManager extends
GridCacheManagerAdapter {
return ses0 != null ? ses0.cacheName() : null;
}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(ThreadLocalSession.class, this);
+}
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31ce5854/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 0ff9627..b0934f1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -472,6 +472,7 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
if (writeEntries != null) {
Map> putMap = null;
List rmvCol = null;
+GridCacheStoreManager writeStore = null;
boolean skipNear = near() && store.writeToStoreFromDht();
@@ -496,10 +497,24 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
if (op == CREATE || op == UPDATE) {
[34/50] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
index ef36125..05c76b4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/internal/U.java
@@ -20,9 +20,9 @@ package org.apache.ignite.internal.util.typedef.internal;
import org.apache.ignite.internal.util.*;
/**
- * Defines internal {@code typedef} for {@link GridUtils}. Since Java doesn't
provide type aliases
+ * Defines internal {@code typedef} for {@link IgniteUtils}. Since Java
doesn't provide type aliases
* (like Scala, for example) we resort to these types of measures. This is
intended for internal
* use only and meant to provide for more terse code when readability of code
is not compromised.
*/
@SuppressWarnings({"ExtendsUtilityClass"})
-public class U extends GridUtils { /* No-op. */ }
+public class U extends IgniteUtils { /* No-op. */ }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
index 8a2247e..6342bb5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorResolveHostNameTask.java
@@ -63,7 +63,7 @@ public class VisorResolveHostNameTask extends
VisorOneNodeTask, Collection> addrs =
-
GridUtils.resolveLocalAddresses(InetAddress.getByName("0.0.0.0"));
+
IgniteUtils.resolveLocalAddresses(InetAddress.getByName("0.0.0.0"));
assert(addrs.get1() != null);
assert(addrs.get2() != null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
index 95bb434..190f6da 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryUtils.java
@@ -53,8 +53,8 @@ public class VisorQueryUtils {
if (o != null) {
Class clazz = o.getClass();
-return clazz.isArray() ?
GridUtils.compact(clazz.getComponentType().getName()) + "[]"
-: GridUtils.compact(o.getClass().getName());
+return clazz.isArray() ?
IgniteUtils.compact(clazz.getComponentType().getName()) + "[]"
+: IgniteUtils.compact(o.getClass().getName());
}
else
return "n/a";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index bee3a2e..22349e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -183,7 +183,7 @@ public class IgniteOptimizedMarshaller extends
IgniteAbstractMarshaller {
if (path == null)
return;
-URL url = GridUtils.resolveGridGainUrl(path, false);
+URL url = IgniteUtils.resolveGridGainUrl(path, false);
if (url == null)
throw new IgniteCheckedException("Failed to find resource for
name: " + path);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteExceptionHelpLinksSelfTest.java
index 3fbf4ec.
[01/50] [abbrv] incubator-ignite git commit: # ignite-117 : simple fix GridGainSharedMemoryUtils.cpp
Repository: incubator-ignite Updated Branches: refs/heads/ignite-69 a297fb321 -> 5a50356e2 # ignite-117 : simple fix GridGainSharedMemoryUtils.cpp Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/471fc6cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/471fc6cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/471fc6cb Branch: refs/heads/ignite-69 Commit: 471fc6cb61ed423ef7172a45a6fab97cc2a4f414 Parents: aeacd35 Author: Artem SHutak Authored: Mon Jan 26 18:47:45 2015 +0300 Committer: Artem SHutak Committed: Mon Jan 26 18:47:45 2015 +0300 -- ...ache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/471fc6cb/ipc/shmem/ggshmem/org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp -- diff --git a/ipc/shmem/ggshmem/org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp b/ipc/shmem/ggshmem/org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp index e649139..39ca908 100644 --- a/ipc/shmem/ggshmem/org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp +++ b/ipc/shmem/ggshmem/org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp @@ -39,7 +39,6 @@ using namespace std; const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException"; /** GridIpcSharedMemoryOperationTimedoutException JNI class name. */ -org.apache.ignite.internal.util.ipc.shmem const char* OP_TIMEDOUT_EXCEPTION = "org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryOperationTimedoutException"; /** GridIpcOutOfSystemResourcesException JNI class name. */
[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-117' into ignite-117
Merge remote-tracking branch 'origin/ignite-117' into ignite-117 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d5ef125c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d5ef125c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d5ef125c Branch: refs/heads/ignite-69 Commit: d5ef125ca7be8d203c4ff4dbcb9268df8ea0144b Parents: e50ca07 07b24d0 Author: Artem SHutak Authored: Wed Jan 28 20:52:31 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 20:52:31 2015 +0300 -- .../main/java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../java/META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33108 bytes 2 files changed, 0 insertions(+), 0 deletions(-) --
[38/50] [abbrv] incubator-ignite git commit: IGNITE-146 (remove async instance caching inside Async support adapter and always create new instance)
IGNITE-146 (remove async instance caching inside Async support adapter and
always create new instance)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25fb8e5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25fb8e5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25fb8e5c
Branch: refs/heads/ignite-69
Commit: 25fb8e5ca42d8137c37ce513868bd246a5cc146a
Parents: fc768b8
Author: sevdokimov
Authored: Thu Jan 29 13:05:20 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 29 17:22:35 2015 +0300
--
.../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +++-
1 file changed, 4 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fb8e5c/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
index e9ab2a1..3d8e14c 100644
---
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteAsyncSupportAdapter.java
@@ -24,15 +24,9 @@ import org.apache.ignite.internal.*;
* Adapter for {@link IgniteAsyncSupport}.
*/
public class IgniteAsyncSupportAdapter
implements IgniteAsyncSupport {
-/** */
-private static final Object mux = new Object();
-
/** Future for previous asynchronous operation. */
protected ThreadLocal> curFut;
-/** */
-private volatile T asyncInstance;
-
/**
* Default constructor.
*/
@@ -44,29 +38,16 @@ public class IgniteAsyncSupportAdapter implements
* @param async Async enabled flag.
*/
public IgniteAsyncSupportAdapter(boolean async) {
-if (async) {
+if (async)
curFut = new ThreadLocal<>();
-
-asyncInstance = (T)this;
-}
}
/** {@inheritDoc} */
@Override public T withAsync() {
-T res = asyncInstance;
-
-if (res == null) {
-res = createAsyncInstance();
-
-synchronized (mux) {
-if (asyncInstance != null)
-return asyncInstance;
-
-asyncInstance = res;
-}
-}
+if (isAsync())
+return (T)this;
-return res;
+return createAsyncInstance();
}
/**
[05/50] [abbrv] incubator-ignite git commit: # ignite-117 : fix issue: add md5 checksum validation
# ignite-117 : fix issue: add md5 checksum validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dca51c3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dca51c3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dca51c3f
Branch: refs/heads/ignite-69
Commit: dca51c3f24dfbcd16565099d98551e730285a149
Parents: 75544b2
Author: Artem SHutak
Authored: Tue Jan 27 17:42:02 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 17:42:02 2015 +0300
--
.../shmem/GridIpcSharedMemoryNativeLoader.java | 63 +---
...GridIpcSharedMemoryNativeLoaderSelfTest.java | 32 +-
2 files changed, 72 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dca51c3f/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
index cb001cd..875d7ba 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
@@ -17,14 +17,17 @@
package org.apache.ignite.internal.util.ipc.shmem;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridProductImpl;
+import org.apache.ignite.internal.util.typedef.internal.U;
import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.util.*;
+import java.net.URL;
+import java.nio.channels.FileLock;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collection;
+import java.util.LinkedList;
/**
* Shared memory native loader.
@@ -209,7 +212,7 @@ public class GridIpcSharedMemoryNativeLoader {
InputStream is = null;
try {
-if (!target.exists()) {
+if (!target.exists() || ! haveEqualMD5(target, src)) {
is = src.openStream();
if (is != null) {
@@ -232,7 +235,7 @@ public class GridIpcSharedMemoryNativeLoader {
return true;
}
-catch (IOException | UnsatisfiedLinkError | InterruptedException e) {
+catch (IOException | UnsatisfiedLinkError | InterruptedException |
NoSuchAlgorithmException e) {
errs.add(e);
}
finally {
@@ -242,4 +245,48 @@ public class GridIpcSharedMemoryNativeLoader {
return false;
}
+
+private static boolean haveEqualMD5(File target, URL src) throws
NoSuchAlgorithmException, IOException {
+String targetMD5 = calculateMD5(new FileInputStream(target));
+String srcMD5 = calculateMD5(src.openStream());
+
+return targetMD5.equals(srcMD5);
+}
+
+static byte[] calculateMD5Digest(InputStream input) throws
NoSuchAlgorithmException, IOException {
+MessageDigest md = MessageDigest.getInstance("MD5");
+InputStream fis = new BufferedInputStream(input);
+byte[] dataBytes = new byte[1024];
+
+int nread = 0;
+
+while ((nread = fis.read(dataBytes)) != -1) {
+md.update(dataBytes, 0, nread);
+};
+
+byte[] md5Bytes = md.digest();
+
+//convert the byte to hex format
+StringBuffer sb = new StringBuffer("");
+for (int i = 0; i < md5Bytes.length; i++) {
+sb.append(Integer.toString((md5Bytes[i] & 0xff) + 0x100,
16).substring(1));
+}
+
+System.out.println("Digest(in hex format):: " + sb.toString());
+
+return md5Bytes;
+}
+
+static String calculateMD5(InputStream input) throws
NoSuchAlgorithmException, IOException {
+byte[] md5Bytes = calculateMD5Digest(input);
+
+//convert the byte to hex format
+StringBuffer sb = new StringBuffer("");
+for (int i = 0; i < md5Bytes.length; i++) {
+sb.append(Integer.toString((md5Bytes[i] & 0xff) + 0x100,
16).substring(1));
+}
+
+return sb.toString();
+}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dca51c3f/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcShar
[21/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
new file mode 100644
index 000..fab41e7
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java
@@ -0,0 +1,259 @@
+/*
+ * 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.util.ipc.shmem;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jdk8.backport.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ *
+ */
+public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest {
+/** */
+public static final int DATA_LEN = 1024 * 1024;
+
+/** */
+private static final byte[] DATA = new byte[DATA_LEN];
+
+/**
+ *
+ */
+static {
+for (int i = 0; i < DATA_LEN; i++)
+DATA[i] = (byte)i;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+IpcSharedMemoryNativeLoader.load();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testBasicOperations() throws Exception {
+File tokFile = new
File(IgniteSystemProperties.getString("java.io.tmpdir"),
UUID.randomUUID().toString());
+
+assert tokFile.createNewFile();
+
+final String tok = tokFile.getAbsolutePath();
+
+info("Array length: " + DATA.length);
+
+final AtomicReference spaceRef = new
AtomicReference<>();
+
+IgniteFuture fut1 = multithreadedAsync(
+new Callable() {
+@SuppressWarnings("TooBroadScope")
+@Override public Object call() throws Exception {
+try (IpcSharedMemorySpace space = new
IpcSharedMemorySpace(tok, 0, 0, 128, false,
+log)) {
+spaceRef.set(space);
+
+int bytesWritten = 0;
+
+for (; ; ) {
+int len = Math.min(DATA.length - bytesWritten,
+ThreadLocalRandom8.current().nextInt(256) + 1);
+
+space.write(DATA, bytesWritten, len, 0);
+
+bytesWritten += len;
+
+if (bytesWritten == DATA.length)
+break;
+}
+
+info("Thread finished.");
+
+return null;
+}
+}
+},
+1,
+"writer");
+
+IgniteFuture fut2 = multithreadedAsync(
+new Callable() {
+@SuppressWarnings({"TooBroadScope", "StatementWithEmptyBody"})
+@Override public Object call() throws Exception {
+IpcSharedMemorySpace inSpace;
+
+while ((inSpace = spaceRef.get()) == null) {
+// No-op;
+}
+
+try (IpcSharedMemorySpace space = new
IpcSharedMemorySpace(tok, 0, 0, 128, true,
+inSpace.sharedMemoryId(), log)) {
+byte[] buf = new byte[DATA_LEN];
+
+int bytesRead = 0;
+
+for (; ; ) {
+int len = Math.min(DATA.length - bytesRead,
+ThreadLocalRandom8.current().nextInt(32) + 1);
+
+int len0 = space.read(buf, bytesRead, len, 0);
+
+assert len0 > 0;
+
+bytesRead += len0;
+
+if (bytesRead == DATA_LEN)
+bre
[23/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
new file mode 100644
index 000..c187dbc
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitRequest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.util.ipc.shmem;
+
+import java.io.*;
+
+/**
+ *
+ */
+public class IpcSharedMemoryInitRequest implements Externalizable {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private int pid;
+
+/**
+ * @param pid PID of the {@code client} party.
+ */
+public IpcSharedMemoryInitRequest(int pid) {
+this.pid = pid;
+}
+
+/**
+ * Required by {@code Externalizable}.
+ */
+public IpcSharedMemoryInitRequest() {
+// No-op.
+}
+
+/**
+ * @return Sender PID.
+ */
+public int pid() {
+return pid;
+}
+
+/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeInt(pid);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+pid = in.readInt();
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return "IpcSharedMemoryInitRequest [pid=" + pid + ']';
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
new file mode 100644
index 000..9f2ed24
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryInitResponse.java
@@ -0,0 +1,171 @@
+/*
+ * 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.util.ipc.shmem;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ *
+ */
+public class IpcSharedMemoryInitResponse implements Externalizable {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private String inTokFileName;
+
+/** */
+private int inSharedMemId;
+
+/** */
+private String outTokFileName;
+
+/** */
+private int outSharedMemId;
+
+/** */
+private int pid;
+
+/** */
+private int size;
+
+/** */
+private Exception err;
+
+/**
+ * Constructs a successful response.
+ *
+ * @param inTokFileName In token.
+ * @param inSharedMemId In shared memory ID.
+ * @param outTokFileName Out token.
+ * @param outSharedMemId Out shared memory ID.
+ * @param pid PID of the {@code server} party.
+ * @param size Size.
+ */
[29/50] [abbrv] incubator-ignite git commit: # ignite-109 Fixed test
# ignite-109 Fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4cd6321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4cd6321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4cd6321
Branch: refs/heads/ignite-69
Commit: e4cd6321c34e2b1490d360fc6e7d236d4be6c1b0
Parents: 5791d43
Author: sboikov
Authored: Thu Jan 29 07:27:05 2015 +0300
Committer: sboikov
Committed: Thu Jan 29 07:27:05 2015 +0300
--
.../cache/integration/IgniteCacheTxStoreSessionTest.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4cd6321/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
index c95461d..bfc8837 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
@@ -248,7 +248,6 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
/**
* @throws Exception If failed.
*/
-// TODO IGNITE-109: fix test when fixed.
public void testSessionCrossCacheTx() throws Exception {
IgniteCache cache0 = ignite(0).jcache(null);
@@ -262,8 +261,9 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
cache1.put(key2, 0);
-expData.add(new ExpectedData(true, "writeAll", new HashMap<>(),
null));
-expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "writeAll"), null));
+expData.add(new ExpectedData(true, "write", new HashMap<>(),
null));
+expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), CACHE_NAME1));
+expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "write", 1, "write"), null));
tx.commit();
}
@@ -275,8 +275,9 @@ public class IgniteCacheTxStoreSessionTest extends
IgniteCacheStoreSessionAbstra
cache0.put(key2, 0);
-expData.add(new ExpectedData(true, "writeAll", new HashMap<>(),
null));
-expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "writeAll"), null));
+expData.add(new ExpectedData(true, "write", new HashMap<>(),
CACHE_NAME1));
+expData.add(new ExpectedData(true, "write", F.asMap(0, "write"), null));
+expData.add(new ExpectedData(true, "txEnd", F.asMap(0, "write", 1, "write"), null));
tx.commit();
}
[27/50] [abbrv] incubator-ignite git commit: # ignite-117 : refactoring (java-doc and etc.)
# ignite-117 : refactoring (java-doc and etc.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d01fa229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d01fa229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d01fa229
Branch: refs/heads/ignite-69
Commit: d01fa229ea9552e9e5b7272dea89266a63fac3ed
Parents: d5ef125
Author: Artem SHutak
Authored: Wed Jan 28 21:30:00 2015 +0300
Committer: Artem SHutak
Committed: Wed Jan 28 21:30:00 2015 +0300
--
.../apache/ignite/internal/util/GridUtils.java | 22 +++-
.../ipc/shmem/IpcSharedMemoryNativeLoader.java | 10 +++---
.../IpcSharedMemoryNativeLoaderSelfTest.java| 32 ++
.../LoadWithCorruptedLibFileTestRunner.java | 35 ++--
4 files changed, 83 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
index 62b2069..9f01e98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java
@@ -9099,12 +9099,14 @@ public abstract class GridUtils {
}
/**
- * @param in
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * Calculate MD5 digits.
+ *
+ * @param in Input stream.
+ * @return Calculated MD5 digest for given input stream.
+ * @throws NoSuchAlgorithmException If MD5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
-public static byte[] calculateMD5Digest(InputStream in) throws
NoSuchAlgorithmException, IOException {
+public static byte[] calculateMD5Digest(@NotNull InputStream in) throws
NoSuchAlgorithmException, IOException {
MessageDigest md = MessageDigest.getInstance("MD5");
InputStream fis = new BufferedInputStream(in);
byte[] dataBytes = new byte[1024];
@@ -9118,10 +9120,12 @@ public abstract class GridUtils {
}
/**
- * @param in Input.
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * Calculate MD5 string.
+ *
+ * @param in Input stream.
+ * @return Calculated MD5 string for given input stream.
+ * @throws NoSuchAlgorithmException If MD5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
public static String calculateMD5(InputStream in) throws
NoSuchAlgorithmException, IOException {
byte[] md5Bytes = calculateMD5Digest(in);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index a835c96..cb52912 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -242,11 +242,11 @@ public class IpcSharedMemoryNativeLoader {
}
/**
- * @param target
- * @param src
- * @return
- * @throws NoSuchAlgorithmException
- * @throws IOException
+ * @param target Target.
+ * @param src Source.
+ * @return {@code True} if target md5-sum equal to source md5-sum.
+ * @throws NoSuchAlgorithmException If md5 algorithm was not found.
+ * @throws IOException If an I/O exception occurs.
*/
private static boolean haveEqualMD5(File target, URL src) throws
NoSuchAlgorithmException, IOException {
try (InputStream targetIS = new FileInputStream(target);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d01fa229/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoaderSelfTest.java
index e75eb04..e70c207 100644
---
a/modules/core/src/test/java/org/apache
[40/50] [abbrv] incubator-ignite git commit: Fix IgniteCacheIterator
Fix IgniteCacheIterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9900ae49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9900ae49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9900ae49
Branch: refs/heads/ignite-69
Commit: 9900ae49ba2b839eb3c549bb95cdf397743a8303
Parents: 4535322
Author: ivasilinets
Authored: Thu Jan 29 18:14:08 2015 +0300
Committer: ivasilinets
Committed: Thu Jan 29 18:14:08 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 16 ++-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../GridCacheAbstractProjectionSelfTest.java| 50
3 files changed, 54 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 92d2039..1c04d29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3887,10 +3887,10 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/**
- * @param prj Projection.
+ * @param delegate Cache proxy.
* @return Distributed ignite cache iterator.
*/
-public Iterator> igniteIterator(final
GridCacheProjectionImpl prj) {
+public Iterator> igniteIterator(final
IgniteCacheProxy delegate) {
CacheQueryFuture> fut = queries().createScanQuery(null)
.keepAll(false)
.execute();
@@ -3901,17 +3901,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override protected void remove(Cache.Entry item) {
-GridCacheProjectionImpl prev = ctx.gate().enter(prj);
-
-try {
-GridCacheAdapter.this.removex(item.getKey());
-}
-catch (IgniteCheckedException e) {
-throw new CacheException(e);
-}
-finally {
-ctx.gate().leave(prev);
-}
+delegate.remove(item.getKey());
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 743e5b9..0bb2543 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -943,7 +943,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter prev = gate.enter(prj);
try {
-return ((GridCacheAdapter)delegate).igniteIterator(prj);
+return ctx.cache().igniteIterator(this);
}
finally {
gate.leave(prev);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9900ae49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index 6337339..acdeede 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -617,6 +617,56 @@ public abstract class GridCacheAbstractProjectionSelfTest
extends GridCacheAbstr
/**
* @throws Exception if failed.
*/
+public void testSkipStoreIterator() throws Exception {
+assertNull(cache().put("1", 100500));
+
+IgniteCache c = jcache().withSkipStore();
+
+Iterator i = c.iterator();
+
+assertTrue(i.hasNext());
+
+i.next();
+
+i.remove();
+
+i = c.iterator();
+
+assertFalse(i.hasNext())
[18/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename all 'ggshem' on 'igniteshmem'
# ignite-117 : rename all 'ggshem' on 'igniteshmem' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae3ba8c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae3ba8c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae3ba8c9 Branch: refs/heads/ignite-69 Commit: ae3ba8c9da90f82d1461a7a5f1de6baec8803ef6 Parents: 50f31e6 Author: Artem SHutak Authored: Wed Jan 28 19:34:06 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 19:34:06 2015 +0300 -- ipc/shmem/Makefile.am | 2 +- ipc/shmem/Makefile.in | 2 +- ipc/shmem/configure | 4 +- ipc/shmem/configure.ac | 2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 - ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 --- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 + ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 +++ ipc/shmem/readme.txt| 2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138591 -> 138335 bytes .../shmem/GridIpcSharedMemoryNativeLoader.java | 4 +- .../util/ipc/shmem/IpcSharedMemoryUtils.java| 2 +- 14 files changed, 1503 insertions(+), 1503 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/Makefile.am -- diff --git a/ipc/shmem/Makefile.am b/ipc/shmem/Makefile.am index dd2b285..30696a5 100644 --- a/ipc/shmem/Makefile.am +++ b/ipc/shmem/Makefile.am @@ -1 +1 @@ -SUBDIRS=ggshmem include +SUBDIRS=igniteshmem include http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/Makefile.in -- diff --git a/ipc/shmem/Makefile.in b/ipc/shmem/Makefile.in index e37c55b..768fe76 100644 --- a/ipc/shmem/Makefile.in +++ b/ipc/shmem/Makefile.in @@ -251,7 +251,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = ggshmem include +SUBDIRS = igniteshmem include all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/configure -- diff --git a/ipc/shmem/configure b/ipc/shmem/configure index af4e3c0..88fef08 100755 --- a/ipc/shmem/configure +++ b/ipc/shmem/configure @@ -15161,7 +15161,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_config_files="$ac_config_files Makefile ggshmem/Makefile include/Makefile" +ac_config_files="$ac_config_files Makefile igniteshmem/Makefile include/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16263,7 +16263,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -"ggshmem/Makefile") CONFIG_FILES="$CONFIG_FILES ggshmem/Makefile" ;; +"igniteshmem/Makefile") CONFIG_FILES="$CONFIG_FILES igniteshmem/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/configure.ac -- diff --git a/ipc/shmem/configure.ac b/ipc/shmem/configure.ac index 6774187..2c3b4a3 100644 --- a/ipc/shmem/configure.ac +++ b/ipc/shmem/configure.ac @@ -28,6 +28,6 @@ dnl Libtool is used for building share libraries AC_PROG_LIBTOOL AC_CONFIG_FILES(Makefile -ggshmem/Makefile +igniteshmem/Makefile include/Makefile) AC_OUTPUT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/ggshmem/Makefile.am -- diff --git a/ipc/shmem/ggshmem/Makefile.am b/ipc/shmem/ggshmem/Makefile.am deleted file mode 100644 index 91f4c27..000 --- a/ipc/shmem/ggshmem/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# Include macros from m4 folder. -ACLOCAL_AMFLAGS = "-Im4" - -### -# The list of libraries we are building seperated by spaces. -# The 'lib_' indicates that these build products will be installed -# in the $(libdir) directory. For example /usr/lib -lib_LTLIBRARIES = libggshmem.la - -#
[19/50] [abbrv] incubator-ignite git commit: # ignite-117 : native code was rebuilded and 'libigniteshmem.so' was added
# ignite-117 : native code was rebuilded and 'libigniteshmem.so' was added Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3789241c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3789241c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3789241c Branch: refs/heads/ignite-69 Commit: 3789241c9342bf8d399bd39842deb4c67c9379a2 Parents: ae3ba8c Author: Artem SHutak Authored: Wed Jan 28 19:42:13 2015 +0300 Committer: Artem SHutak Committed: Wed Jan 28 19:42:13 2015 +0300 -- .../java/META-INF/native/linux64/libggshmem.so| Bin 138335 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138335 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3789241c/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so deleted file mode 100755 index 7dd28f0..000 Binary files a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3789241c/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so new file mode 100755 index 000..ff0f674 Binary files /dev/null and b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so differ
[22/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename classes from ipc package GridIpc..->Ipc..
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50ca07d/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
new file mode 100644
index 000..a32ebb6
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.util.ipc;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.fs.*;
+import org.apache.ignite.internal.util.ipc.loopback.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.testframework.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Tests for {@code IpcServerEndpointDeserializer}.
+ */
+public class IpcServerEndpointDeserializerSelfTest extends
GridGgfsCommonAbstractTest {
+/** */
+private Map shmemSrvEndpoint;
+
+/** */
+private Map tcpSrvEndpoint;
+
+/**
+ * Initialize test stuff.
+ */
+@Override protected void beforeTest() throws Exception {
+shmemSrvEndpoint = new HashMap<>();
+shmemSrvEndpoint.put("port", "888");
+shmemSrvEndpoint.put("size", "111");
+shmemSrvEndpoint.put("tokenDirectoryPath", "test-my-path-baby");
+
+tcpSrvEndpoint = new HashMap<>();
+tcpSrvEndpoint.put("port", "999");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfCfgIsNull() throws Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@SuppressWarnings("NullableProblems")
+@Override public Object call() throws Exception {
+return IpcServerEndpointDeserializer.deserialize(null);
+}
+}, NullPointerException.class, "Ouch! Argument cannot be null:
endpointCfg");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndNoTypeInfoInJson() throws Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+return
IpcServerEndpointDeserializer.deserialize(shmemSrvEndpoint);
+}
+}, IgniteCheckedException.class, "Failed to create server endpoint
(type is not specified)");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndNoUnknownTypeInfoInJson() throws
Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+Map endPnt = new HashMap<>();
+
+endPnt.putAll(shmemSrvEndpoint);
+endPnt.put("type", "unknownEndpointType");
+
+return IpcServerEndpointDeserializer.deserialize(endPnt);
+}
+}, IgniteCheckedException.class, "Failed to create server endpoint
(type is unknown): unknownEndpointType");
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfLoopbackAndJsonIsLightlyBroken() throws
Exception {
+GridTestUtils.assertThrows(log, new Callable() {
+@Override public Object call() throws Exception {
+return
IpcServerEndpointDeserializer.deserialize(tcpSrvEndpoint);
+}
+}, IgniteCheckedException.class, null);
+}
+
+/**
+ * @throws Exception In case of any exception.
+ */
+public void testDeserializeIfShmemAndJsonIsOk() throws Exception {
+Map endPnt = new HashMap<>();
+
+endPnt.putAll(shmemSrvEndpoint);
+endPnt.put("type", "shmem");
+
+IpcServerEndpoint deserialized =
IpcServerEndpointDeserializer.deserialize(endPnt);
+
+assertTrue(deserialized instanceof IpcSharedMemoryServerEndpoint)
[03/50] [abbrv] incubator-ignite git commit: # ignite-117 : add notes at shmem/readme.txt
# ignite-117 : add notes at shmem/readme.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1461271a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1461271a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1461271a Branch: refs/heads/ignite-69 Commit: 1461271af891f20d88fd03580f37c117ef04053f Parents: 43c1c2b Author: Artem SHutak Authored: Mon Jan 26 20:27:43 2015 +0300 Committer: Artem SHutak Committed: Mon Jan 26 20:27:43 2015 +0300 -- ipc/shmem/readme.txt | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1461271a/ipc/shmem/readme.txt -- diff --git a/ipc/shmem/readme.txt b/ipc/shmem/readme.txt index b0abe37..ebc64c8 100644 --- a/ipc/shmem/readme.txt +++ b/ipc/shmem/readme.txt @@ -28,3 +28,10 @@ Usage with GridGain Copy compiled library to folder that already listed in 'java.library.path' with name in form: 'libggshmem-.'. Note: Grid should be restarted. + +** +*** Additional notes: +*** - 'make install' should be run under sudo +*** - if you have problems with , remember that JAVA_HOME have to be set not only for current user, but and for sudo user (check it by typing 'sudo -E env | grep JAVA_HOME') +*** - if you do all right, but it still no work you can just replace manually $(JAVA_HOME) on your java home path at Makefiles.* . :-) +** \ No newline at end of file
[02/50] [abbrv] incubator-ignite git commit: # ignite-117 : rebuild libggshmem.so according to new packaging
# ignite-117 : rebuild libggshmem.so according to new packaging Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43c1c2b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43c1c2b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43c1c2b9 Branch: refs/heads/ignite-69 Commit: 43c1c2b9bd183517db9c84d8bc7baeb8928a2181 Parents: 471fc6c Author: Artem SHutak Authored: Mon Jan 26 20:19:26 2015 +0300 Committer: Artem SHutak Committed: Mon Jan 26 20:19:26 2015 +0300 -- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 138591 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43c1c2b9/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so old mode 100644 new mode 100755 index 709f66a..d39a83e Binary files a/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so and b/modules/core/src/main/java/META-INF/native/linux64/libggshmem.so differ
[42/50] [abbrv] incubator-ignite git commit: Tests: Fix compile
Tests: Fix compile
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f30d79d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f30d79d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f30d79d1
Branch: refs/heads/ignite-69
Commit: f30d79d1f4b71833fea763fdacfe5f15300e4aa2
Parents: 4009aaa
Author: ivasilinets
Authored: Thu Jan 29 18:29:51 2015 +0300
Committer: ivasilinets
Committed: Thu Jan 29 18:29:51 2015 +0300
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f30d79d1/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index 1899ca4..8047b8a 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -17,7 +17,7 @@
package org.apache.ignite.visor.commands.alert
-import org.apache.ignite.internal.util.{IgniteUtils => U}
+import org.apache.ignite.internal.util.IgniteUtils
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite._
[16/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename GridIpcSharedMemoryUtils at IpcSharedMemoryUtils (+ additional staff)
# ignite-117 : rename GridIpcSharedMemoryUtils at IpcSharedMemoryUtils (+
additional staff)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50f31e6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50f31e6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50f31e6e
Branch: refs/heads/ignite-69
Commit: 50f31e6e478756ba948ef3bb6b1a03dbd60d71c2
Parents: c351a7b
Author: Artem SHutak
Authored: Wed Jan 28 18:57:43 2015 +0300
Committer: Artem SHutak
Committed: Wed Jan 28 18:57:43 2015 +0300
--
ipc/shmem/ggshmem/Makefile.am | 2 +-
ipc/shmem/ggshmem/Makefile.in | 16 +-
..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 ---
...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 +++
ipc/shmem/include/Makefile.am | 2 +-
ipc/shmem/include/Makefile.in | 2 +-
...al_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 ---
...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 +++
.../GridIpcSharedMemoryClientEndpoint.java | 8 +-
.../GridIpcSharedMemoryServerEndpoint.java | 12 +-
.../ipc/shmem/GridIpcSharedMemorySpace.java | 24 +-
.../ipc/shmem/GridIpcSharedMemoryUtils.java | 242 -
.../util/ipc/shmem/IpcSharedMemoryUtils.java| 242 +
...idIpcSharedMemoryCrashDetectionSelfTest.java | 14 +-
.../shmem/GridIpcSharedMemorySpaceSelfTest.java | 20 +-
.../shmem/GridIpcSharedMemoryUtilsSelfTest.java | 84 --
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 84 ++
.../IgniteIpcSharedMemorySelfTestSuite.java | 2 +-
18 files changed, 1376 insertions(+), 1376 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50f31e6e/ipc/shmem/ggshmem/Makefile.am
--
diff --git a/ipc/shmem/ggshmem/Makefile.am b/ipc/shmem/ggshmem/Makefile.am
index 3cc295f..91f4c27 100644
--- a/ipc/shmem/ggshmem/Makefile.am
+++ b/ipc/shmem/ggshmem/Makefile.am
@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libggshmem.la
# Build information for each library
# Sources for ggshmem
-libggshmem_la_SOURCES =
org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
+libggshmem_la_SOURCES =
org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
# Linker options libTestProgram
libggshmem_la_LDFLAGS =
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50f31e6e/ipc/shmem/ggshmem/Makefile.in
--
diff --git a/ipc/shmem/ggshmem/Makefile.in b/ipc/shmem/ggshmem/Makefile.in
index b1305ea..1eb97d5 100644
--- a/ipc/shmem/ggshmem/Makefile.in
+++ b/ipc/shmem/ggshmem/Makefile.in
@@ -92,7 +92,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libggshmem_la_LIBADD =
-am_libggshmem_la_OBJECTS =
libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.lo
+am_libggshmem_la_OBJECTS =
libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.lo
libggshmem_la_OBJECTS = $(am_libggshmem_la_OBJECTS)
libggshmem_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -256,7 +256,7 @@ lib_LTLIBRARIES = libggshmem.la
# Build information for each library
# Sources for ggshmem
-libggshmem_la_SOURCES =
org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
+libggshmem_la_SOURCES =
org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
# Linker options libTestProgram
libggshmem_la_LDFLAGS =
@@ -341,7 +341,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.Plo@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o
$@ $<
@@ -364,12 +364,12 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.lo:
org_apache_ignite_internal_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libggshmem_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
libggshmem_la-org_apache_ignite_internal_util_ipc_shmem_GridIpcShar
[48/50] [abbrv] incubator-ignite git commit: IGNITE-109 - Merge branch 'ignite-109' into sprint-1
IGNITE-109 - Merge branch 'ignite-109' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61a9f986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61a9f986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61a9f986 Branch: refs/heads/ignite-69 Commit: 61a9f986a918052aae159e21ca37693491d34382 Parents: 4fe57d4 e4cd632 Author: Alexey Goncharuk Authored: Thu Jan 29 19:04:38 2015 -0800 Committer: Alexey Goncharuk Committed: Thu Jan 29 19:04:38 2015 -0800 -- .../processors/cache/GridCacheStoreManager.java | 25 +- .../transactions/IgniteTxLocalAdapter.java | 42 ++- .../IgniteCrossCacheTxStoreSelfTest.java| 288 +++ .../IgniteCacheTxStoreSessionTest.java | 11 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 5 files changed, 357 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61a9f986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java --
[37/50] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
GridUtils -> IgniteUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc768b83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc768b83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc768b83
Branch: refs/heads/ignite-69
Commit: fc768b8318213841dec6d92d1fcd013a8052aaca
Parents: d6a720f
Author: Yakov Zhdanov
Authored: Thu Jan 29 17:10:36 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Jan 29 17:10:36 2015 +0300
--
.../spi/checkpoint/s3/S3CheckpointSpi.java |4 +-
.../ClientPropertiesConfigurationSelfTest.java |4 +-
.../apache/ignite/IgniteCheckedException.java |2 +-
.../java/org/apache/ignite/IgniteException.java |2 +-
.../cache/GridCacheDeploymentManager.java |2 +-
.../cache/GridCacheMvccCandidate.java |4 +-
.../apache/ignite/internal/util/GridUtils.java | 9141 --
.../ignite/internal/util/IgniteUtils.java | 9141 ++
.../internal/util/typedef/internal/U.java |4 +-
.../visor/misc/VisorResolveHostNameTask.java|2 +-
.../internal/visor/query/VisorQueryUtils.java |4 +-
.../optimized/IgniteOptimizedMarshaller.java|2 +-
.../IgniteExceptionHelpLinksSelfTest.java |3 +-
.../GridEventStorageCheckAllEventsSelfTest.java |2 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 10 +-
...artupWithSpecifiedWorkDirectorySelfTest.java |2 +-
...tartupWithUndefinedGridGainHomeSelfTest.java |4 +-
.../internal/util/GridTestClockTimer.java |6 +-
.../ignite/internal/util/GridUtilsSelfTest.java | 728 --
.../internal/util/IgniteUtilsSelfTest.java | 728 ++
.../ignite/lang/GridSetWrapperSelfTest.java |2 +-
.../testsuites/IgniteUtilSelfTestSuite.java |2 +-
.../ignite/visor/commands/VisorConsole.scala|6 +-
.../commands/alert/VisorAlertCommand.scala |4 +-
.../config/VisorConfigurationCommand.scala |6 +-
.../commands/deploy/VisorDeployCommand.scala|4 +-
.../commands/disco/VisorDiscoveryCommand.scala |4 +-
.../commands/events/VisorEventsCommand.scala|4 +-
.../visor/commands/node/VisorNodeCommand.scala |4 +-
.../commands/start/VisorStartCommand.scala |4 +-
.../commands/tasks/VisorTasksCommand.scala |4 +-
.../commands/top/VisorTopologyCommand.scala |6 +-
.../visor/commands/vvm/VisorVvmCommand.scala|8 +-
.../scala/org/apache/ignite/visor/visor.scala | 20 +-
34 files changed, 9935 insertions(+), 9938 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
--
diff --git
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 8bc0fb7..5a977a1 100644
---
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -338,8 +338,8 @@ public class S3CheckpointSpi extends IgniteSpiAdapter
implements CheckpointSpi,
/** {@inheritDoc} */
@Override public void spiStop() throws IgniteSpiException {
if (timeoutWrk != null) {
-GridUtils.interrupt(timeoutWrk);
-GridUtils.join(timeoutWrk, log);
+IgniteUtils.interrupt(timeoutWrk);
+IgniteUtils.join(timeoutWrk, log);
}
unregisterMBean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
index 31e8638..7b903fa 100644
---
a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
@@ -158,7 +158,7 @@ public class ClientPropertiesConfigurationSelfTest extends
GridCommonAbstractTes
while (it.hasNext())
lines.add(it.nextLine().replace("#gg.client.", "gg.client."));
-GridUtils.closeQuiet(in);
+IgniteUtils.closeQuiet(in);
File tmp = File.createTempFile(UUID.randomUUID().toString(),
"properties");
@@ -188,7 +188,7 @@ public class Clie
[11/50] [abbrv] incubator-ignite git commit: # ignite-117 : add new test at test-suite
# ignite-117 : add new test at test-suite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/256a70b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/256a70b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/256a70b1
Branch: refs/heads/ignite-69
Commit: 256a70b13d4985262df66e835915d64eb9b34026
Parents: 2f4b348
Author: Artem SHutak
Authored: Wed Jan 28 12:52:01 2015 +0300
Committer: Artem SHutak
Committed: Wed Jan 28 12:52:01 2015 +0300
--
.../ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/256a70b1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java
index 49c1e0c..395c3bb 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIpcSharedMemorySelfTestSuite.java
@@ -34,6 +34,7 @@ public class IgniteIpcSharedMemorySelfTestSuite extends
TestSuite {
suite.addTest(new TestSuite(GridIpcSharedMemorySpaceSelfTest.class));
suite.addTest(new TestSuite(GridIpcSharedMemoryUtilsSelfTest.class));
suite.addTest(new
TestSuite(GridIpcSharedMemoryCrashDetectionSelfTest.class));
+suite.addTest(new
TestSuite(GridIpcSharedMemoryNativeLoaderSelfTest.class));
return suite;
}
[35/50] [abbrv] incubator-ignite git commit: GridUtils -> IgniteUtils
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc768b83/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
new file mode 100644
index 000..fedf24b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -0,0 +1,9141 @@
+/*
+ * 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.util;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.mxbean.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.portables.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.internal.processors.streamer.*;
+import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.internal.util.io.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.internal.util.worker.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import javax.management.*;
+import javax.naming.*;
+import javax.net.ssl.*;
+import java.io.*;
+import java.lang.annotation.Annotation;
+import java.lang.management.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.*;
+import java.math.*;
+import java.net.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.nio.channels.spi.*;
+import java.nio.charset.*;
+import java.security.*;
+import java.security.cert.*;
+import java.sql.*;
+import java.sql.Timestamp;
+import java.text.*;
+import java.util.*;
+import java.util.Date;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.*;
+import java.util.jar.*;
+import java.util.logging.*;
+import java.util.regex.*;
+import java.util.zip.*;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.internal.GridNodeAttributes.*;
+
+/**
+ * Collection of utility methods used throughout the system.
+ */
+@SuppressWarnings({"UnusedReturnValue", "UnnecessaryFullyQualifiedName"})
+public abstract class IgniteUtils {
+/** Unsafe. */
+private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+/** {@code True} if {@code unsafe} should be used for array copy. */
+private static final boolean UNSAFE_BYTE_ARR_CP =
unsafeByteArrayCopyAvailable();
+
+/** Offset. */
+private static final int BYTE_ARRAY_DATA_OFFSET =
UNSAFE.arrayBaseOffset(byte[].class);
+
+/** Sun-specific JDK constructor factory for objects that don't have empty
constructor. */
+private static final Method CTOR_FACTORY;
+
+/** Sun JDK reflection factory. */
+private static final Object SUN_REFLECT_FACTORY;
+
+/** Public {@code java.lang.Object} no-argument constructor. */
+private static final Constructor OBJECT_CTOR;
+
+/** All grid event names. */
+private static final Map GRID_EVT_NAMES = new HashMap<>();
+
+/** All grid events. */
+private static final int[] GRID_EVTS;
+
+/** Empty integers array. */
+private static final int[] EMPTY_INTS = new int[0];
+
+/** Empty longs. */
+private static final long[] EMPTY_LONGS = new long[0];
+
+/** System line separator. */
+private static final String NL = System.getProperty("line.separator");
+
+/** Default user version. */
+public static final String DFLT_USER_VERSION = "0";
+
+/** Cache for {@link GridPeerDeployAware} fields to speed up reflection. */
+private sta
[45/50] [abbrv] incubator-ignite git commit: # sprint-1 Fixed typo after auto renaming.
# sprint-1 Fixed typo after auto renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9502c0d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9502c0d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9502c0d9
Branch: refs/heads/ignite-69
Commit: 9502c0d9f747bc77d6e10f999d86e7f6dc5cb402
Parents: 580c36e
Author: AKuznetsov
Authored: Thu Jan 29 22:35:26 2015 +0700
Committer: AKuznetsov
Committed: Thu Jan 29 22:35:26 2015 +0700
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9502c0d9/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index ca22fa1..837b424 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -17,7 +17,7 @@
package org.apache.ignite.visor.commands.alert
-import org.apache.ignite.internal.util.IgniteUtils
+import org.apache.ignite.internal.util.{IgniteUtils => U}
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite._
[15/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename GridIpcSharedMemoryUtils at IpcSharedMemoryUtils (+ additional staff)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50f31e6e/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryUtils.java
deleted file mode 100644
index 37a7c38..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryUtils.java
+++ /dev/null
@@ -1,242 +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.util.ipc.shmem;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.lang.management.*;
-import java.nio.*;
-import java.util.*;
-
-/**
- * NOTE: Native library should be loaded, before methods of this class are
called. Native library is loaded with: {@link
- * GridIpcSharedMemoryNativeLoader#load()}.
- */
-public class GridIpcSharedMemoryUtils {
-/**
- * Allocates shared memory segment and semaphores for IPC exchange.
- *
- * @param tokFileName OS token file name.
- * @param size Memory space size in bytes.
- * @param debug {@code True} to output debug to stdout (will set global
flag).
- * @return Shared memory pointer.
- * @throws IgniteCheckedException If failed.
- */
-static native long allocateSystemResources(String tokFileName, int size,
boolean debug)
-throws IgniteCheckedException;
-
-/**
- * Attaches to previously allocated shared memory segment.
- *
- * @param shmemId OS shared memory segment ID.
- * @param debug {@code True} to output debug to stdout (will set global
flag).
- * @return Shared memory pointer.
- * @throws IgniteCheckedException If failed.
- */
-static native long attach(int shmemId, boolean debug) throws
IgniteCheckedException;
-
-/**
- * Stops IPC communication. Call {@link #freeSystemResources(String, long,
boolean)} after this call.
- *
- * @param shmemPtr Shared memory pointer.
- */
-static native void ipcClose(long shmemPtr);
-
-/**
- * Frees system resources.
- *
- * @param tokFileName Token file name.
- * @param shmemPtr Shared memory pointer
- * @param force {@code True} to force close.
- */
-static native void freeSystemResources(String tokFileName, long shmemPtr,
boolean force);
-
-/**
- * Frees system resources.
- *
- * @param tokFileName Token file name.
- * @param size Size.
- */
-static native void freeSystemResources(String tokFileName, int size);
-
-/**
- * @param shMemPtr Shared memory pointer.
- * @param dest Destination buffer.
- * @param dOff Destination offset.
- * @param size Size.
- * @param timeout Operation timeout.
- * @return Read bytes count.
- * @throws IgniteCheckedException If space has been closed.
- * @throws GridIpcSharedMemoryOperationTimedoutException If operation
times out.
- */
-static native long readSharedMemory(long shMemPtr, byte dest[], long dOff,
long size, long timeout)
-throws IgniteCheckedException,
GridIpcSharedMemoryOperationTimedoutException;
-
-/**
- * @param shmemPtr Shared memory pointer.
- * @return Unread count.
- */
-static native int unreadCount(long shmemPtr);
-
-/**
- * @param shmemPtr Shared memory pointer.
- * @return Shared memory ID.
- */
-static native int sharedMemoryId(long shmemPtr);
-
-/**
- * @param shmemPtr Shared memory pointer.
- * @return Semaphore set ID.
- */
-static native int semaphoreId(long shmemPtr);
-
-/**
- * @param shMemPtr Shared memory pointer
- * @param dest Destination buffer.
- * @param dOff Destination offset.
- * @param size Size.
- * @param timeout Operation timeout.
- * @return Read bytes count.
- * @throws IgniteCheckedException If space has been closed.
- * @throws GridIpcSharedMemoryOperationTimedoutException If operation
time
[31/50] [abbrv] incubator-ignite git commit: # ignite-117 : rebuild igniteshmem.so
# ignite-117 : rebuild igniteshmem.so Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e73857f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e73857f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e73857f1 Branch: refs/heads/ignite-69 Commit: e73857f1604645fa7593d7a7f8d26f286a8c8ea5 Parents: 96f56c7 Author: Artem SHutak Authored: Thu Jan 29 16:07:44 2015 +0300 Committer: Artem SHutak Committed: Thu Jan 29 16:07:44 2015 +0300 -- .../META-INF/native/linux64/libigniteshmem.so | Bin 138335 -> 138345 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73857f1/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so -- diff --git a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so index ff0f674..36de663 100755 Binary files a/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so and b/modules/core/src/main/java/META-INF/native/linux64/libigniteshmem.so differ
[49/50] [abbrv] incubator-ignite git commit: IGNITE-109 - Merge branch 'ignite-109' into sprint-1
IGNITE-109 - Merge branch 'ignite-109' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9550905e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9550905e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9550905e
Branch: refs/heads/ignite-69
Commit: 9550905e62dad06717ab666330c1d5b6523adc02
Parents: 61a9f98
Author: Alexey Goncharuk
Authored: Thu Jan 29 19:04:43 2015 -0800
Committer: Alexey Goncharuk
Committed: Thu Jan 29 19:04:43 2015 -0800
--
.../cache/distributed/IgniteCrossCacheTxStoreSelfTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9550905e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index 7df7619..f80549c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -108,7 +108,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testWriteThrough() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
TestStore firstStore =
(TestStore)grid(0).configuration().getCacheConfiguration()[1].getCacheStoreFactory().create();
@@ -153,7 +153,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIncompatibleCaches1() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
try (IgniteTx ignored = grid.transactions().txStart()) {
GridCache cacheA = grid.cache("cacheA");
@@ -174,7 +174,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testIncompatibleCaches2() throws Exception {
-GridEx grid = grid(0);
+IgniteEx grid = grid(0);
try (IgniteTx ignored = grid.transactions().txStart()) {
GridCache cacheA = grid.cache("cacheA");
[04/50] [abbrv] incubator-ignite git commit: # ignite-117 : GridIpcSharedMemoryNativeLoaderSelfTest#testLoadIfLibFileWasCorrupted was added
# ignite-117 :
GridIpcSharedMemoryNativeLoaderSelfTest#testLoadIfLibFileWasCorrupted was added
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75544b27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75544b27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75544b27
Branch: refs/heads/ignite-69
Commit: 75544b271e92bf9abc64423a4fd4914265ff19ff
Parents: 1461271
Author: Artem SHutak
Authored: Tue Jan 27 16:32:49 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 16:32:49 2015 +0300
--
.../shmem/GridIpcSharedMemoryNativeLoader.java | 2 +
...GridIpcSharedMemoryNativeLoaderSelfTest.java | 45
2 files changed, 47 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75544b27/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
index 2795e03..cb001cd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
@@ -61,6 +61,8 @@ public class GridIpcSharedMemoryNativeLoader {
return name.replaceAll("\\W+", "_");
}
+static String libFileName(){return LIB_NAME;}
+
/**
* @return Platform.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75544b27/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
new file mode 100644
index 000..bf2396c
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
@@ -0,0 +1,45 @@
+package org.apache.ignite.internal.util.ipc.shmem;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class GridIpcSharedMemoryNativeLoaderSelfTest extends TestCase {
+private static final String DEFAULT_TMP_DIR =
System.getProperty("java.io.tmpdir");
+public static final String TMP_DIR_FOR_TEST =
System.getProperty("user.home");
+public static final String LOADED_FILE_NAME =
System.mapLibraryName(GridIpcSharedMemoryNativeLoader.libFileName());
+
+@Override
+public void setUp() throws Exception {
+System.setProperty("java.io.tmpdir", TMP_DIR_FOR_TEST);
+}
+
+@Override
+public void tearDown() throws Exception {
+super.tearDown();
+System.setProperty("java.io.tmpdir", DEFAULT_TMP_DIR);
+}
+
+//TODO linux specific
+public void testLoadIfLibFileWasCorrupted() throws Exception {
+createCorruptedLibFile();
+
+GridIpcSharedMemoryNativeLoader.load();
+}
+
+private void createCorruptedLibFile() throws IOException {
+File loadedFile = new File(System.getProperty("java.io.tmpdir"),
LOADED_FILE_NAME);
+
+if (loadedFile.exists())
+assertTrue("Could not delete libggshem file.",loadedFile.delete());
+loadedFile.deleteOnExit();
+
+assertTrue("Could not create new file.", loadedFile.createNewFile());
+
+try (FileOutputStream out = new FileOutputStream(loadedFile)){
+out.write("Corrupted information.\n".getBytes());
+};
+}
+}
\ No newline at end of file
[41/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4009aaa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4009aaa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4009aaa3 Branch: refs/heads/ignite-69 Commit: 4009aaa35cba35752b80d39c03d3b5a87fdf4041 Parents: 9900ae4 7eebc7e Author: ivasilinets Authored: Thu Jan 29 18:14:21 2015 +0300 Committer: ivasilinets Committed: Thu Jan 29 18:14:21 2015 +0300 -- ipc/shmem/Makefile.am |2 +- ipc/shmem/Makefile.in |2 +- ipc/shmem/configure |4 +- ipc/shmem/configure.ac |2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am |2 +- ipc/shmem/include/Makefile.in |2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt|9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java |4 +- .../ClientAbstractMultiThreadedSelfTest.java|2 +- .../ClientPropertiesConfigurationSelfTest.java |4 +- .../ClientAbstractMultiNodeSelfTest.java|4 +- .../rest/RestBinaryProtocolSelfTest.java|2 +- .../rest/TaskCommandHandlerSelfTest.java|2 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib| Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java |2 +- .../java/org/apache/ignite/IgniteException.java |2 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../apache/ignite/cache/CachingProvider.java|2 +- .../ignite/fs/mapreduce/IgniteFsTask.java |2 +- .../ignite/internal/ClusterGroupAdapter.java|2 +- .../internal/ClusterNodeLocalMapImpl.java |2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 - .../org/apache/ignite/internal/GridKernal.java | 3322 --- .../ignite/internal/GridKernalContext.java |2 +- .../ignite/internal/GridKernalContextImpl.java |8 +- .../apache/ignite/internal/GridLoggerProxy.java |2 +- .../ignite/internal/GridUpdateNotifier.java |2 +- .../ignite/internal/IgniteClusterAsyncImpl.java |4 +- .../org/apache/ignite/internal/IgniteEx.java| 143 + .../apache/ignite/internal/IgniteKernal.java| 3322 +++ .../org/apache/ignite/internal/IgnitionEx.java | 2396 + .../processors/affinity/GridAffinityUtils.java |2 +- .../processors/cache/GridCacheAdapter.java |8 +- .../processors/cache/GridCacheContext.java |4 +- .../cache/GridCacheDeploymentManager.java |2 +- .../cache/GridCacheMvccCandidate.java |4 +- .../processors/cache/IgniteCacheProxy.java | 22 +- .../GridCacheDataStructuresManager.java |4 +- .../cache/query/GridCacheQueryManager.java |2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java|2 +- .../query/jdbc/GridCacheQueryJdbcTask.java |2 +- .../dr/GridDrDataLoadCacheUpdater.java |2 +- .../internal/processors/fs/GridGgfsImpl.java|2 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java|8 +- .../processors/fs/IgniteFsNoopProcessor.java|2 +- .../processors/fs/IgniteFsProcessor.java|4 +- .../processors/fs/IgniteFsProcessorAdapter.java |2 +- .../resource/GridResourceProcessor.java |2 +- .../resource/GridSpringResourceContext.java |2 +- .../handlers/cache/GridCacheCommandHandler.java |6 +- .../handlers/task/GridTaskCommandHandler.java |2 +- .../service/GridServiceProcessor.java |2 +- .../processors/service/GridServiceProxy.java|2 +- .../apache/ignite/internal/util/GridUtils.java | 9100 - .../ignite/internal/util/IgniteUtils.java | 9141 ++ .../internal/util/ipc/GridIpcEndpoint.java | 49 - .../util/ipc/GridIpcEndpointBindException.java | 47 - .../util/ipc/GridIpcEndpointFactory.java| 84 - .../in
[32/50] [abbrv] incubator-ignite git commit: ignite-117 rebuilt mac natives
ignite-117 rebuilt mac natives Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/506cda64 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/506cda64 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/506cda64 Branch: refs/heads/ignite-69 Commit: 506cda644ac151d5b0da8e36de2959efc00d8f8e Parents: e73857f Author: Yakov Zhdanov Authored: Thu Jan 29 16:29:08 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Jan 29 16:29:08 2015 +0300 -- .../META-INF/native/osx/libigniteshmem.dylib| Bin 33108 -> 33116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/506cda64/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib -- diff --git a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib index 6cfeb9e..2152401 100755 Binary files a/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib and b/modules/core/src/main/java/META-INF/native/osx/libigniteshmem.dylib differ
[46/50] [abbrv] incubator-ignite git commit: # ignite-sprint-1.
# ignite-sprint-1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdebb406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdebb406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdebb406
Branch: refs/heads/ignite-69
Commit: bdebb406d6f58e7c6c4b334f6ea1a8be2b4ad7c8
Parents: 9502c0d
Author: AKuznetsov
Authored: Fri Jan 30 09:38:18 2015 +0700
Committer: AKuznetsov
Committed: Fri Jan 30 09:38:18 2015 +0700
--
.../visor/commands/gc/VisorGcCommand.scala | 13 --
.../visor/commands/gc/VisorGcCommandSpec.scala | 25 +++-
2 files changed, 19 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdebb406/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
index ef1a241..713247c 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
@@ -17,17 +17,14 @@
package org.apache.ignite.visor.commands.gc
-import org.apache.ignite.internal.visor.node.VisorNodeGcTask
-
import org.apache.ignite._
import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterNode}
-
-import java.lang.{Boolean => JavaBoolean}
-import java.util.{UUID, HashSet => JavaHashSet}
-
+import org.apache.ignite.internal.visor.node.VisorNodeGcTask
import org.apache.ignite.visor.VisorTag
import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
-import visor.visor._
+import org.apache.ignite.visor.visor._
+
+import java.util.UUID
import scala.collection.JavaConversions._
import scala.language.{implicitConversions, reflectiveCalls}
@@ -240,5 +237,5 @@ object VisorGcCommand {
*
* @param vs Visor tagging trait.
*/
-implicit def fromGc2Visor(vs: VisorTag) = cmd
+implicit def fromGc2Visor(vs: VisorTag): VisorGcCommand = cmd
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdebb406/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
index 5e6f1c3..1a59274 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
@@ -17,26 +17,29 @@
package org.apache.ignite.visor.commands.gc
-import org.apache.ignite.visor.visor
-import org.scalatest._
-
+import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.visor.commands.gc.VisorGcCommand._
-import org.apache.ignite.visor.commands.top.VisorTopologyCommand._
+import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor}
/**
* Unit test for 'gc' command.
*/
-class VisorGcCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAll
{
+class VisorGcCommandSpec extends VisorRuntimeBaseSpec(1) {
behavior of "A 'gc' visor command"
-override def beforeAll() {
-visor.open("-d")
+/**
+ * Creates grid configuration for provided grid host.
+ *
+ * @param name Grid name.
+ * @return Grid configuration.
+ */
+override def config(name: String): IgniteConfiguration = {
+val cfg = new IgniteConfiguration
-visor.top()
-}
+cfg.setGridName(name)
+cfg.setLifeCycleEmailNotification(false)
-override def afterAll() {
-visor.close()
+cfg
}
it should "run GC on all nodes" in {
[06/50] [abbrv] incubator-ignite git commit: # ignite-117 : small refactoring
# ignite-117 : small refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd613db8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd613db8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd613db8
Branch: refs/heads/ignite-69
Commit: cd613db8bc16dcdefa495cdd0c23ad9b85061018
Parents: dca51c3
Author: Artem SHutak
Authored: Tue Jan 27 18:55:34 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 18:55:34 2015 +0300
--
.../shmem/GridIpcSharedMemoryNativeLoader.java | 27 +++-
1 file changed, 15 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd613db8/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
index 875d7ba..825a235 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoader.java
@@ -247,10 +247,14 @@ public class GridIpcSharedMemoryNativeLoader {
}
private static boolean haveEqualMD5(File target, URL src) throws
NoSuchAlgorithmException, IOException {
-String targetMD5 = calculateMD5(new FileInputStream(target));
-String srcMD5 = calculateMD5(src.openStream());
+try (InputStream targetIS = new FileInputStream(target);
+ InputStream srcIS = src.openStream()){
-return targetMD5.equals(srcMD5);
+String targetMD5 = calculateMD5(targetIS);
+String srcMD5 = calculateMD5(srcIS);
+
+return targetMD5.equals(srcMD5);
+}
}
static byte[] calculateMD5Digest(InputStream input) throws
NoSuchAlgorithmException, IOException {
@@ -258,18 +262,17 @@ public class GridIpcSharedMemoryNativeLoader {
InputStream fis = new BufferedInputStream(input);
byte[] dataBytes = new byte[1024];
-int nread = 0;
-
+int nread;
while ((nread = fis.read(dataBytes)) != -1) {
md.update(dataBytes, 0, nread);
-};
+}
byte[] md5Bytes = md.digest();
//convert the byte to hex format
-StringBuffer sb = new StringBuffer("");
-for (int i = 0; i < md5Bytes.length; i++) {
-sb.append(Integer.toString((md5Bytes[i] & 0xff) + 0x100,
16).substring(1));
+StringBuilder sb = new StringBuilder("");
+for (byte md5Byte : md5Bytes) {
+sb.append(Integer.toString((md5Byte & 0xff) + 0x100,
16).substring(1));
}
System.out.println("Digest(in hex format):: " + sb.toString());
@@ -281,9 +284,9 @@ public class GridIpcSharedMemoryNativeLoader {
byte[] md5Bytes = calculateMD5Digest(input);
//convert the byte to hex format
-StringBuffer sb = new StringBuffer("");
-for (int i = 0; i < md5Bytes.length; i++) {
-sb.append(Integer.toString((md5Bytes[i] & 0xff) + 0x100,
16).substring(1));
+StringBuilder sb = new StringBuilder();
+for (byte md5Byte : md5Bytes) {
+sb.append(Integer.toString((md5Byte & 0xff) + 0x100,
16).substring(1));
}
return sb.toString();
[43/50] [abbrv] incubator-ignite git commit: # sprint-1 Fixed typo after auto renaming.
# sprint-1 Fixed typo after auto renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14ad3ea5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14ad3ea5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14ad3ea5
Branch: refs/heads/ignite-69
Commit: 14ad3ea5c988ab0a034fbfb389b9274f9631fd69
Parents: 7eebc7e
Author: AKuznetsov
Authored: Thu Jan 29 22:30:51 2015 +0700
Committer: AKuznetsov
Committed: Thu Jan 29 22:30:51 2015 +0700
--
.../org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14ad3ea5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index 1899ca4..837b424 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -278,7 +278,7 @@ class VisorAlertCommand {
// Grid-wide metrics (not node specific).
case "cc" if v != null => gf = makeGridFilter(v,
gf, grid.metrics().getTotalCpus)
case "nc" if v != null => gf = makeGridFilter(v,
gf, grid.nodes().size)
-case "hc" if v != null => gf = makeGridFilter(v,
gf, IgniteUtils.neighborhood(grid.nodes()).size)
+case "hc" if v != null => gf = makeGridFilter(v,
gf, U.neighborhood(grid.nodes()).size)
case "cl" if v != null => gf = makeGridFilter(v,
gf,
() => (grid.metrics().getAverageCpuLoad *
100).toLong)
[17/50] [abbrv] incubator-ignite git commit: # ignite-117 : rename all 'ggshem' on 'igniteshmem'
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae3ba8c9/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
--
diff --git
a/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
new file mode 100644
index 000..eaa13fd
--- /dev/null
+++
b/ipc/shmem/igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
@@ -0,0 +1,882 @@
+/*
+ * 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.
+ */
+
+#include "org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace std;
+
+/** IgniteCheckedException JNI class name. */
+const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
+
+/** GridIpcSharedMemoryOperationTimedoutException JNI class name. */
+const char* OP_TIMEDOUT_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryOperationTimedoutException";
+
+/** GridIpcOutOfSystemResourcesException JNI class name. */
+const char* OUT_OF_RSRCS_EXCEPTION =
"org/apache/ignite/internal/util/ipc/shmem/GridIpcOutOfSystemResourcesException";
+
+/** Global flag for enabling debug logging. */
+static bool __GG_DEBUG = false;
+
+/** Read semaphore ID. */
+#define SEM_READ 0
+
+/** Write semaphore ID. */
+#define SEM_WRITE 1
+
+/**
+ * Logging macro.
+ *
+ * @param m Logging message with optional formatting symbols.
+ * @param varagrs Formatting arguments.
+ */
+#define GG_LOG_DEBUG(m, ...) {\
+if(__GG_DEBUG)\
+log(__FILE__, __LINE__, __FUNCTION__, m, __VA_ARGS__);\
+}
+
+/** Buffer size for current time string. */
+#define TIME_NOW_BUF_SIZE 1024
+
+/** Buffer size for debug message. */
+#define FORMAT_LOG_BUF_SIZE 4096
+
+/**
+ * @return Current time string in format: year-month-day hour:minute:second.
+ */
+static string timeNow() {
+timeval tv;
+tm lt;
+
+char timebuf[TIME_NOW_BUF_SIZE];
+
+gettimeofday(&tv, 0);
+
+time_t now = tv.tv_sec;
+localtime_r(&now, <);
+
+// Clone the format used by log4j ISO8601DateFormat,
+// specifically: "-MM-dd HH:mm:ss.SSS"
+size_t len = strftime(timebuf, TIME_NOW_BUF_SIZE, "%Y-%m-%d %H:%M:%S",
<);
+
+snprintf(timebuf + len, TIME_NOW_BUF_SIZE - len, ".%03d", (int)
(tv.tv_usec / 1000));
+
+return string(timebuf);
+}
+
+/**
+ * Writes debug message to standard output, if global debug flag is enabled.
+ *
+ * @param file Source file, from which the message originates.
+ * @param line Source line, from which the message originates.
+ * @param funcName Name of the function, from which the message originates.
+ * @param format Message string with optional formatting symbols.
+ * @param varargs Formatting arguments.
+ */
+static void log(const char* file, int line, const char* funcName, const char*
format, ...) {
+static pid_t pid = getpid();
+
+char msgbuf[FORMAT_LOG_BUF_SIZE];
+va_list va;
+
+va_start(va, format);
+vsnprintf(msgbuf, FORMAT_LOG_BUF_SIZE - 1, format, va);
+va_end(va);
+
+cout << timeNow() << " pid:" << pid << " " << file << ":" << funcName <<
":" << line << ": " << msgbuf << endl;
+
+flush(cout);
+}
+
+/** Lock operation on semaphore #0. */
+struct sembuf op_lock0[2] = {
+0, 0, 0, // Wait until semaphore #0 becomes 0.
+0, 1, 0 // Then increment semaphore #0 by 1.
+};
+
+/** Lock operation on semaphore #1. */
+struct sembuf op_lock1[2] = {
+1, 0, 0, // Wait until semaphore #1 becomes 0.
+1, 1, 0 // Then increment semaphore #1 by 1.
+};
+
+/**
+ * Data offset in shared memory buffer (the memory segment preceding data
+ * is used for IPC data).
+ */
+#define BUF_OFFSET 64
+
+/**
+ * IPC data, that is used for inter-process communication.
+ */
+typedef struct {
+/** Number of parties that have closed the connection (0, 1, or 2). */
+int closedCnt;
+
+/** Shared memory segment ID. */
+int shmId;
+
+/** Semaphore set ID. */
+
[09/50] [abbrv] incubator-ignite git commit: # ignite-117 : skip test for windows
# ignite-117 : skip test for windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f4b3487
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f4b3487
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f4b3487
Branch: refs/heads/ignite-69
Commit: 2f4b348760989f4aa82a538f8b0b5e441621f9a7
Parents: 0632bb3
Author: Artem SHutak
Authored: Tue Jan 27 21:44:33 2015 +0300
Committer: Artem SHutak
Committed: Tue Jan 27 21:44:33 2015 +0300
--
...GridIpcSharedMemoryNativeLoaderSelfTest.java | 8 +++--
.../LoadIfLibFileWasCorruptedTestRunner.java| 36
.../LoadWithCorruptedLibFileTestRunner.java | 36
3 files changed, 41 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f4b3487/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
index c15748a..96ae3c5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemoryNativeLoaderSelfTest.java
@@ -9,9 +9,11 @@ import java.io.InputStreamReader;
import java.util.Collections;
public class GridIpcSharedMemoryNativeLoaderSelfTest extends TestCase {
-//TODO linux specific
-public void testLoadIfLibFileWasCorrupted() throws Exception {
-Process ps =
GridJavaProcess.exec(LoadIfLibFileWasCorruptedTestRunner.class, null, null,
null, null, Collections.emptyList(), null).getProcess();
+
+public void testLoadWithCorruptedLibFile() throws Exception {
+if
(System.getProperty("os.name").toLowerCase().trim().startsWith("win")) return;
+
+Process ps =
GridJavaProcess.exec(LoadWithCorruptedLibFileTestRunner.class, null, null,
null, null, Collections.emptyList(), null).getProcess();
readStreams(ps);
int code = ps.waitFor();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f4b3487/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadIfLibFileWasCorruptedTestRunner.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadIfLibFileWasCorruptedTestRunner.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadIfLibFileWasCorruptedTestRunner.java
deleted file mode 100644
index 544d2c2..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadIfLibFileWasCorruptedTestRunner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.ignite.internal.util.ipc.shmem;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class LoadIfLibFileWasCorruptedTestRunner {
-public static final String TMP_DIR_FOR_TEST =
System.getProperty("user.home");
-public static final String LOADED_LIB_FILE_NAME =
System.mapLibraryName(GridIpcSharedMemoryNativeLoader.libFileName());
-
-public static void main(String[] args) throws Exception {
-System.setProperty("java.io.tmpdir", TMP_DIR_FOR_TEST);
-
-createCorruptedLibFile();
-
-GridIpcSharedMemoryNativeLoader.load();
-}
-
-private static void createCorruptedLibFile() throws IOException {
-File libFile = new File(System.getProperty("java.io.tmpdir"),
LOADED_LIB_FILE_NAME);
-
-if (libFile.exists() && ! libFile.delete())
-throw new IllegalStateException("Could not delete loaded lib
file.");
-
-libFile.deleteOnExit();
-
-if (! libFile.createNewFile())
-throw new IllegalStateException("Could not create new file.");
-
-try (FileOutputStream out = new FileOutputStream(libFile)) {
-out.write("Corrupted file information instead of good
info.\n".getBytes());
-}
-}
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f4b3487/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/LoadWithCorruptedLibFileTestRunner.java
new file mode
[39/50] [abbrv] incubator-ignite git commit: ignite-146 changes to flags
ignite-146 changes to flags
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7eebc7e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7eebc7e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7eebc7e0
Branch: refs/heads/ignite-69
Commit: 7eebc7e0878e7cb7687315e0bdc4467ec1bdc26d
Parents: 25fb8e5
Author: Yakov Zhdanov
Authored: Thu Jan 29 15:56:51 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 29 17:22:35 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 22 +---
.../service/GridServiceProcessor.java | 2 +-
.../GridCacheReturnValueTransferSelfTest.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java| 4 ++--
...GridCacheValueConsistencyAtomicSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 ++--
6 files changed, 21 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 743e5b9..dd7b781 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -143,7 +143,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter withSkipStore() {
-return flagsOn(CacheFlag.SKIP_STORE);
+return flagOn(CacheFlag.SKIP_STORE);
}
/** {@inheritDoc} */
@@ -1018,21 +1018,27 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter flagsOn(@Nullable CacheFlag... flags) {
+public IgniteCache flagOn(CacheFlag flag) {
GridCacheProjectionImpl prev = gate.enter(prj);
try {
-Set res = EnumSet.noneOf(CacheFlag.class);
+Set res;
-Set flags0 = prj !=null ? prj.flags() : null;
+Set flags0 = prj != null ? prj.flags() : null;
-if (flags0 != null && !flags0.isEmpty())
-res.addAll(flags0);
+if (flags0 != null) {
+if (flags0.contains(flag))
+return this;
-res.addAll(EnumSet.copyOf(F.asList(flags)));
+res = EnumSet.copyOf(flags0);
+}
+else
+res = EnumSet.noneOf(CacheFlag.class);
+
+res.add(flag);
GridCacheProjectionImpl prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 8db40b9..4bcad37 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -481,7 +481,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
ManagedServiceDescriptorImpl desc = new
ManagedServiceDescriptorImpl(dep);
try {
-GridServiceAssignments assigns =
(GridServiceAssignments)cache.//flagsOn(CacheFlag.GET_PRIMARY).
+GridServiceAssignments assigns =
(GridServiceAssignments)cache.//flagOn(CacheFlag.GET_PRIMARY).
get(new
GridServiceAssignmentsKey(dep.configuration().getName()));
if (assigns != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eebc7e0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 7657842..d70bc82 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processo
