You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/08/31 12:16:04 UTC
[1/2] ignite git commit: IGNITE-1325: Implemented platform extensions.
Repository: ignite
Updated Branches:
refs/heads/master 4369c2033 -> c2de38d13
IGNITE-1325: Implemented platform extensions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e4052a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e4052a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e4052a6
Branch: refs/heads/master
Commit: 3e4052a6d2b50b538585f94443b354d803e235d2
Parents: a457ab1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Aug 31 13:16:09 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Aug 31 13:16:09 2015 +0300
----------------------------------------------------------------------
.../processors/platform/PlatformTarget.java | 36 +++++++++++++-----
.../platform/PlatformAbstractTarget.java | 40 ++++++++++++++++++++
2 files changed, 67 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3e4052a6/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
index 6a22453..c45bea1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java
@@ -46,15 +46,6 @@ public interface PlatformTarget {
public Object inStreamOutObject(int type, long memPtr) throws Exception;
/**
- * Operation returning result to memory stream.
- *
- * @param type Operation type.
- * @param memPtr Memory pointer.
- * @throws Exception In case of failure.
- */
- public void outStream(int type, long memPtr) throws Exception;
-
- /**
* Operation accepting one memory stream and returning result to another memory stream.
*
* @param type Operation type.
@@ -76,6 +67,33 @@ public interface PlatformTarget {
public void inObjectStreamOutStream(int type, @Nullable Object arg, long inMemPtr, long outMemPtr) throws Exception;
/**
+ * Operation returning long result.
+ *
+ * @param type Operation type.
+ * @return Result.
+ * @throws Exception In case of failure.
+ */
+ public long outLong(int type) throws Exception;
+
+ /**
+ * Operation returning result to memory stream.
+ *
+ * @param type Operation type.
+ * @param memPtr Memory pointer.
+ * @throws Exception In case of failure.
+ */
+ public void outStream(int type, long memPtr) throws Exception;
+
+ /**
+ * Operation returning object result.
+ *
+ * @param type Operation type.
+ * @return Result.
+ * @throws Exception If failed.
+ */
+ public Object outObject(int type) throws Exception;
+
+ /**
* Start listening for the future.
*
* @param futId Future ID.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3e4052a6/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
index 5864a7e..4c01bc0 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
@@ -85,6 +85,16 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
}
/** {@inheritDoc} */
+ @Override public long outLong(int type) throws Exception {
+ try {
+ return processOutLong(type);
+ }
+ catch (Exception e) {
+ throw convertException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public void outStream(int type, long memPtr) throws Exception {
try (PlatformMemory mem = platformCtx.memory().get(memPtr)) {
PlatformOutputStream out = mem.output();
@@ -101,6 +111,16 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
}
/** {@inheritDoc} */
+ @Override public Object outObject(int type) throws Exception {
+ try {
+ return processOutObject(type);
+ }
+ catch (Exception e) {
+ throw convertException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public void inStreamOutStream(int type, long inMemPtr, long outMemPtr) throws Exception {
try (PlatformMemory inMem = platformCtx.memory().get(inMemPtr)) {
PortableRawReaderEx reader = platformCtx.reader(inMem);
@@ -271,6 +291,16 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
* Process OUT operation.
*
* @param type Type.
+ * @throws IgniteCheckedException In case of exception.
+ */
+ protected long processOutLong(int type) throws IgniteCheckedException {
+ return throwUnsupported(type);
+ }
+
+ /**
+ * Process OUT operation.
+ *
+ * @param type Type.
* @param writer Portable writer.
* @throws IgniteCheckedException In case of exception.
*/
@@ -279,6 +309,16 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
}
/**
+ * Process OUT operation.
+ *
+ * @param type Type.
+ * @throws IgniteCheckedException In case of exception.
+ */
+ protected Object processOutObject(int type) throws IgniteCheckedException {
+ return throwUnsupported(type);
+ }
+
+ /**
* Throw an exception rendering unsupported operation type.
*
* @param type Operation type.
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2de38d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2de38d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2de38d1
Branch: refs/heads/master
Commit: c2de38d13a1b116cf923125416e3e894604d8b01
Parents: 3e4052a 4369c20
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Aug 31 13:16:47 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Aug 31 13:16:47 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 22 ++++++++++----------
DISCLAIMER.txt | 15 -------------
LICENSE | 2 +-
NOTICE | 2 +-
assembly/LICENSE_FABRIC | 2 +-
assembly/LICENSE_HADOOP | 2 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
assembly/release-base.xml | 5 -----
dev-tools/slurp.sh | 2 +-
dev-tools/src/main/groovy/jiraslurp.groovy | 2 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
.../cloud/TcpDiscoveryCloudIpFinder.java | 2 +-
modules/core/src/main/java/META-INF/LICENSE | 2 +-
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/IgniteReflectionFactory.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 6 +++++-
.../apache/ignite/marshaller/Marshaller.java | 2 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 2 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../marshaller/portable/PortableMarshaller.java | 2 +-
.../SpringApplicationContextResource.java | 2 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 ++--
.../PriorityQueueCollisionSpi.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../memory/MemoryEventStorageSpi.java | 2 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../jobstealing/JobStealingFailoverSpi.java | 2 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
modules/docker/download_ignite.sh | 2 +-
.../CacheHibernateBlobStoreFactory.java | 2 +-
.../log4j2/GridLog4j2InitializedTest.java | 6 +++---
.../rest/protocols/http/jetty/rest.html | 4 ++--
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
.../ant/beautifier/GridJavadocAntTask.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
modules/yardstick/README.txt | 2 +-
parent/pom.xml | 12 +++++------
51 files changed, 72 insertions(+), 88 deletions(-)
----------------------------------------------------------------------