[50/50] [abbrv] ignite git commit: IGNITE-950 - Fixing tests.

[agoncharuk]

IGNITE-950 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0d0e3e3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0d0e3e3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0d0e3e3

Branch: refs/heads/ignite-950-new
Commit: d0d0e3e35e20cfd8cd6e2bfe0bed7c4e034cab82
Parents: 5bf0698
Author: Alexey Goncharuk 
Authored: Fri Oct 23 12:51:06 2015 +0300
Committer: Alexey Goncharuk 
Committed: Fri Oct 23 12:51:06 2015 +0300

--
 .../internal/portable/PortableObjectImpl.java   |  4 +--
 .../processors/cache/GridCacheMapEntry.java |  4 +--
 .../dht/atomic/GridDhtAtomicCache.java  | 33 ++--
 .../atomic/GridNearAtomicUpdateResponse.java|  5 ++-
 .../store/GridCacheStoreManagerAdapter.java | 24 +++---
 ...IgniteCacheAbstractExecutionContextTest.java |  5 +++
 .../IgniteCacheTxExecutionContextTest.java  |  6 
 7 files changed, 39 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0d0e3e3/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
index 9c618cf..d82162a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
@@ -403,8 +403,8 @@ public final class PortableObjectImpl extends 
PortableObjectEx implements Extern
 
 assert desc != null;
 
-//if (desc.keepDeserialized())
-//obj = obj0;
+if (desc.keepDeserialized())
+obj = obj0;
 
 return obj0;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d0d0e3e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 6546d76..4bf50ee 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2098,7 +2098,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 // Try write-through.
 if (writeThrough)
 // Must persist inside synchronization in non-tx mode.
-cctx.store().put(null, keyValue(false), CU.value(updated, 
cctx, false), newVer);
+cctx.store().put(null, key, updated, newVer);
 
 if (!hadVal) {
 boolean new0 = isNew();
@@ -2168,7 +2168,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 
 if (writeThrough)
 // Must persist inside synchronization in non-tx mode.
-cctx.store().remove(null, keyValue(false));
+cctx.store().remove(null, key);
 
 if (oldVal == null)
 oldVal = saveValueForIndexUnlocked();

http://git-wip-us.apache.org/repos/asf/ignite/blob/d0d0e3e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index b740d27..259b4c9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1326,11 +1326,11 @@ public class GridDhtAtomicCache extends 
GridDhtCacheAdapter {
 
 int size = req.keys().size();
 
-Map putMap = null;
+Map putMap = null;
 
 Map> 
entryProcessorMap = null;
 
-Collection rmvKeys = null;
+Collection rmvKeys = null;
 
 List writeVals = null;
 
@@ -1470,7 +1470,7 

[50/50] [abbrv] ignite git commit: IGNITE-950 - Fixing tests.

[agoncharuk]

IGNITE-950 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3fd771c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3fd771c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3fd771c

Branch: refs/heads/ignite-950
Commit: b3fd771cac277bc154a6c4130bcd32fc6ba76309
Parents: e50d736
Author: Alexey Goncharuk 
Authored: Tue Aug 4 10:43:55 2015 -0700
Committer: Alexey Goncharuk 
Committed: Tue Aug 4 10:43:55 2015 -0700

--
 .../configuration/CacheConfiguration.java   | 11 +++-
 .../communication/GridIoMessageFactory.java |  5 +-
 .../cache/CacheIndexedObjectImpl.java   | 23 ++-
 .../cache/KeyCacheIndexedObjectImpl.java| 65 
 .../query/GridCacheDistributedQueryManager.java | 10 +--
 .../IgniteCacheObjectProcessorImpl.java | 48 +--
 .../processors/query/GridQueryProcessor.java| 54 +---
 .../optimized/OptimizedObjectInputStream.java   |  2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 21 +--
 9 files changed, 88 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b3fd771c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index eb8186a..f25e98d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -2340,8 +2340,15 @@ public class CacheConfiguration extends 
MutableConfiguration {
 ClassProperty(Member member) {
 this.member = member;
 
-name = member instanceof Method && 
member.getName().startsWith("get") && member.getName().length() > 3 ?
-member.getName().substring(3) : member.getName();
+if (member instanceof Method && member.getName().startsWith("get") 
&& member.getName().length() > 3) {
+StringBuilder s = new StringBuilder(member.getName());
+
+s.setCharAt(3, Character.toLowerCase(s.charAt(3)));
+
+name = s.substring(3);
+}
+else
+name = member.getName();
 
 ((AccessibleObject) member).setAccessible(true);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/b3fd771c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 29e778d..7da621b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -605,10 +605,7 @@ public class GridIoMessageFactory implements 
MessageFactory {
 
 break;
 
-case 114:
-msg = new KeyCacheIndexedObjectImpl();
-
-// [-3..114] - this
+// [-3..113] - this
 // [120..123] - DR
 // [-4..-22] - SQL
 default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/b3fd771c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIndexedObjectImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIndexedObjectImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIndexedObjectImpl.java
index 931380f..1655b9d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIndexedObjectImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheIndexedObjectImpl.java
@@ -34,7 +34,7 @@ import static 
org.apache.ignite.marshaller.optimized.OptimizedObjectOutputStream
  * Cache object implementation for classes that support footer injection is 
their serialized form thus enabling fields
  * search and extraction without necessity to fully deserialize an object.
  */
-public class CacheIndexedObjectImpl extends CacheObjectAdapter implements 
CacheIndexedObject {
+public class CacheIndexedObjectImpl extends CacheObjectAdapter implements