# ignite-51

modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java

@@ -0,0 +1,29 @@
+/*
+ * 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.cache;
+
+import java.lang.annotation.*;
+
+/**
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface IgniteImmutable {
+    // No-op.
+}

modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java

@@ -217,6 +217,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
     /** Cache distribution mode. */
     private CacheDistributionMode distro = DFLT_DISTRIBUTION_MODE;
 
+    /** Default value for 'copyOnGet' flag. */
+    public static final boolean DFLT_COPY_ON_GET = true;
+
     /** Write synchronization mode. */
     private CacheWriteSynchronizationMode writeSync;
 
@@ -319,6 +322,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
     /** Collection of type metadata. */
     private Collection<CacheTypeMetadata> typeMeta;
 
+    /** */
+    private boolean cpOnGet = DFLT_COPY_ON_GET;
+
     /** Empty constructor (all values are initialized to their defaults). */
     public CacheConfiguration() {
         /* No-op. */
@@ -1620,6 +1626,20 @@ public void setReadFromBackup(boolean readFromBackup) {
         this.readFromBackup = readFromBackup;
     }
 
+    /**
+     * @return Copy on get flag.
+     */
+    public boolean isCopyOnGet() {
+        return cpOnGet;
+    }
+
+    /**
+     * @param cpOnGet Copy on get flag.
+     */
+    public void setCopyOnGet(boolean cpOnGet) {
+        this.cpOnGet = cpOnGet;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(CacheConfiguration.class, this);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java

@@ -1806,6 +1806,9 @@ public <K1, V1> void addResult(Map<K1, V1> map,
             Object key0 = key.value(this);
             Object val0 = skipVals ? Boolean.TRUE : val.value(this);
 
+            assert key0 != null;
+            assert val0 != null;
+
             if (portableEnabled() && deserializePortable) {
                 key0 = unwrapPortableIfNeeded(key0, false);
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java

@@ -338,7 +338,7 @@ protected GridCacheValueBytes valueBytesUnlocked() {
 
     /** {@inheritDoc} */
     @Override public boolean isInternal() {
-        return key instanceof GridCacheInternal;
+        return key.internal();
     }
 
     /** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java

@@ -44,13 +44,9 @@ public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCac
     /** Mini-future ID. */
     private IgniteUuid miniId;
 
-    /** Serialized keys. */
-    @GridDirectCollection(byte[].class)
-    private Collection<byte[]> keyBytes;
-
     /** Keys to request. */
     @GridToStringInclude
-    @GridDirectTransient
+    @GridDirectCollection(KeyCacheObject.class)
     private Collection<KeyCacheObject> keys;
 
     /** Topology version for which keys are requested. */
@@ -116,13 +112,6 @@ public IgniteUuid miniId() {
         return miniId;
     }
 
-    /**
-     * @return Collection of serialized keys.
-     */
-    public Collection<byte[]> keyBytes() {
-        return keyBytes;
-    }
-
     /**
      * @return Keys.
      */
@@ -142,23 +131,21 @@ public Collection<KeyCacheObject> keys() {
     @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
         super.prepareMarshal(ctx);
 
-        if (keyBytes == null)
-            keyBytes = marshalCollection(keys, ctx);
+        prepareMarshalCacheObjects(keys, ctx);
     }
 
     /** {@inheritDoc} */
     @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(ctx, ldr);
 
-        if (keys == null)
-            keys = unmarshalCollection(keyBytes, ctx, ldr);
+        finishUnmarshalCacheObjects(keys, ctx, ldr);
     }
 
     /**
      * @return Key count.
      */
     private int keyCount() {
-        return keyBytes == null ? keys.size() : keyBytes.size();
+        return keys.size();
     }
 
     /** {@inheritDoc} */
@@ -183,7 +170,7 @@ private int keyCount() {
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeCollection("keyBytes", keyBytes, MessageCollectionItemType.BYTE_ARR))
+                if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -225,7 +212,7 @@ private int keyCount() {
                 reader.incrementState();
 
             case 4:
-                keyBytes = reader.readCollection("keyBytes", MessageCollectionItemType.BYTE_ARR);
+                keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java

@@ -42,23 +42,16 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa
     /** Mini-future ID. */
     private IgniteUuid miniId;
 
-    /** */
-    @GridDirectCollection(byte[].class)
-    private Collection<byte[]> missedKeyBytes;
-
     /** Missed (not found) keys. */
     @GridToStringInclude
-    @GridDirectTransient
-    private Collection<KeyCacheObject> missedKeys;
+    @GridDirectCollection(KeyCacheObject.class)
+    private List<KeyCacheObject> missedKeys;
 
     /** Cache entries. */
     @GridToStringInclude
-    @GridDirectTransient
+    @GridDirectCollection(GridCacheEntryInfo.class)
     private List<GridCacheEntryInfo> infos;
 
-    /** */
-    private byte[] infosBytes;
-
     /**
      * Required by {@link Externalizable}.
      */
@@ -140,27 +133,27 @@ public void addInfo(GridCacheEntryInfo info) {
     @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
         super.prepareMarshal(ctx);
 
-        if (missedKeys != null && missedKeyBytes == null)
-            missedKeyBytes = marshalCollection(missedKeys, ctx);
+        if (missedKeys != null)
+            prepareMarshalCacheObjects(missedKeys, ctx);
 
         if (infos != null) {
-            marshalInfos(infos, ctx);
-
-            infosBytes = ctx.marshaller().marshal(infos);
+            for (GridCacheEntryInfo info : infos)
+                info.marshal(ctx);
         }
     }
 
     /** {@inheritDoc} */
     @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(ctx, ldr);
 
-        if (missedKeys == null && missedKeyBytes != null)
-            missedKeys = unmarshalCollection(missedKeyBytes, ctx, ldr);
+        if (missedKeys != null)
+            finishUnmarshalCacheObjects(missedKeys, ctx, ldr);
 
-        if (infosBytes != null) {
-            infos = ctx.marshaller().unmarshal(infosBytes, ldr);
+        if (infos != null) {
+            GridCacheContext cctx = ctx.cacheContext(cacheId);
 
-            unmarshalInfos(infos, ctx.cacheContext(cacheId()), ldr);
+            for (GridCacheEntryInfo info : infos)
+                info.unmarshal(cctx, ldr);
         }
     }
 
@@ -186,7 +179,7 @@ public void addInfo(GridCacheEntryInfo info) {
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeByteArray("infosBytes", infosBytes))
+                if (!writer.writeCollection("infos", infos, MessageCollectionItemType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -198,7 +191,7 @@ public void addInfo(GridCacheEntryInfo info) {
                 writer.incrementState();
 
             case 6:
-                if (!writer.writeCollection("missedKeyBytes", missedKeyBytes, MessageCollectionItemType.BYTE_ARR))
+                if (!writer.writeCollection("missedKeys", missedKeys, MessageCollectionItemType.MSG))
                     return false;
 
                 writer.incrementState();
@@ -228,7 +221,7 @@ public void addInfo(GridCacheEntryInfo info) {
                 reader.incrementState();
 
             case 4:
-                infosBytes = reader.readByteArray("infosBytes");
+                infos = reader.readCollection("infos", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -244,7 +237,7 @@ public void addInfo(GridCacheEntryInfo info) {
                 reader.incrementState();
 
             case 6:
-                missedKeyBytes = reader.readCollection("missedKeyBytes", MessageCollectionItemType.BYTE_ARR);
+                missedKeys = reader.readCollection("missedKeys", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
                     return false;

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java

@@ -120,7 +120,7 @@ public IgniteUuid miniId() {
      * @return Entries.
      */
     public Collection<GridCacheEntryInfo> entries() {
-        return entries;
+        return entries != null ? entries : Collections.<GridCacheEntryInfo>emptyList();
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java

@@ -133,6 +133,7 @@ public interface GridPortableProcessor extends GridProcessor {
 
     /**
      * @param obj Portable object to get field from.
+     * @param fieldName Field name.
      * @return Field value.
      */
     public Object field(Object obj, String fieldName);
@@ -153,8 +154,8 @@ public interface GridPortableProcessor extends GridProcessor {
     @Nullable public CacheObject toCacheObject(@Nullable Object obj);
 
     /**
-     * @param obj Object.
-     * @return Cache object.
+     * @param obj Key value.
+     * @return Cache key object.
      */
-    @Nullable public KeyCacheObject toCacheKeyObject(@Nullable Object obj);
+    public KeyCacheObject toCacheKeyObject(Object obj);
 }