You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/12 11:27:44 UTC
[2/2] incubator-ignite git commit: ignite-471: fix all TODOs
ignite-471: fix all TODOs
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74c6bab7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74c6bab7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74c6bab7
Branch: refs/heads/ignite-471
Commit: 74c6bab709ec0ca6ea3d7c0beb16a83819ee8880
Parents: a6a46c4
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue May 12 12:27:13 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue May 12 12:27:13 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/offheap/GridOffHeapProcessor.java | 3 +--
.../apache/ignite/marshaller/optimized/OptimizedMarshaller.java | 4 ++--
.../processors/cache/GridCacheIncrementTransformTest.java | 1 -
.../external/communication/HadoopMarshallerFilter.java | 4 +---
4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c6bab7/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
index bda4836..e0151c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java
@@ -209,8 +209,7 @@ public class GridOffHeapProcessor extends GridProcessorAdapter {
if (valBytes == null)
return null;
- // TODO: IGNITE-471 - Migrate to buffers.
- // Create a subtask
+ //TODO: https://issues.apache.org/jira/browse/IGNITE-892
return marsh.unmarshal(ByteBuffer.wrap(valBytes), ldr == null ? U.gridClassLoader() : ldr);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c6bab7/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
index 0b0baea..a29bda2 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
@@ -153,7 +153,7 @@ public class OptimizedMarshaller extends AbstractMarshaller {
OptimizedObjectOutputStream objOut = null;
try {
- // TODO: IGNITE-471 - Need adaptive initial size.
+ // TODO: https://issues.apache.org/jira/browse/IGNITE-893
objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize));
objOut.context(clsMap, ctx, mapper, requireSer);
@@ -175,7 +175,7 @@ public class OptimizedMarshaller extends AbstractMarshaller {
OptimizedObjectOutputStream objOut = null;
try {
- // TODO: IGNITE-471 - Need adaptive initial size.
+ // TODO: https://issues.apache.org/jira/browse/IGNITE-893
objOut = new OptimizedObjectOutputStream(new GridUnsafeDataOutput(initBufSize));
objOut.context(clsMap, ctx, mapper, requireSer);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c6bab7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index b7de63e..418c95a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -179,7 +179,6 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
while (true) {
try {
- // TODO: IGNITE-471
cache.invoke("key", new Processor());
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c6bab7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
index b9b30bd..a53c3b0 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopMarshallerFilter.java
@@ -66,9 +66,7 @@ public class HadoopMarshallerFilter extends GridNioFilterAdapter {
assert msg instanceof byte[];
// Always unmarshal with system classloader.
- // TODO: IGNITE-471 - Is this correct?
- // Check with tests, just wrap into ByteBuffer
- proceedMessageReceived(ses, marshaller.unmarshal((ByteBuffer)msg, null));
+ proceedMessageReceived(ses, marshaller.unmarshal(ByteBuffer.wrap((byte[])msg), null));
}
/** {@inheritDoc} */