[23/50] [abbrv] ignite git commit: IGNITE-5779 - Fixes #3471.

2018-02-09 Thread akuznetsov 
IGNITE-5779 - Fixes #3471.

Signed-off-by: Igor Rudyak 


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

Branch: refs/heads/ignite-7485-2
Commit: 08f96597660e57e8b558d57387b1bba3c3889902
Parents: 54bac75
Author: Igor Rudyak 
Authored: Sun Feb 4 22:06:47 2018 -0800
Committer: Igor Rudyak 
Committed: Sun Feb 4 22:06:47 2018 -0800

--
 .../cache/store/cassandra/CassandraCacheStore.java  |  3 ++-
 .../store/cassandra/common/PropertyMappingHelper.java   |  7 +++
 .../store/cassandra/session/CassandraSessionImpl.java   |  3 +--
 .../org/apache/ignite/tests/load/PersonGenerator.java   |  2 +-
 .../test/java/org/apache/ignite/tests/pojos/Person.java | 12 ++--
 .../org/apache/ignite/tests/pojos/SimplePerson.java |  8 
 .../java/org/apache/ignite/tests/utils/TestsHelper.java |  4 ++--
 7 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
index b438946..b223cb3 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
+++ 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
@@ -272,7 +272,8 @@ public class CassandraCacheStore implements 
CacheStore {
 
 /** {@inheritDoc} */
 @Override protected void process(Row row) {
-data.put((K)controller.buildKeyObject(row), 
(V)controller.buildValueObject(row));
+if (row != null)
+data.put((K)controller.buildKeyObject(row), 
(V)controller.buildValueObject(row));
 }
 }, keys);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
index 66d7294..ed9f054 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
+++ 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
@@ -46,8 +46,8 @@ public class PropertyMappingHelper {
 put(String.class, DataType.Name.TEXT);
 put(Integer.class, DataType.Name.INT);
 put(int.class, DataType.Name.INT);
-put(Short.class, DataType.Name.INT);
-put(short.class, DataType.Name.INT);
+put(Short.class, DataType.Name.SMALLINT);
+put(short.class, DataType.Name.SMALLINT);
 put(Long.class, DataType.Name.BIGINT);
 put(long.class, DataType.Name.BIGINT);
 put(Double.class, DataType.Name.DOUBLE);
@@ -129,7 +129,7 @@ public class PropertyMappingHelper {
 return row.getInt(col);
 
 if (Short.class.equals(clazz) || short.class.equals(clazz))
-return (short)row.getInt(col);
+return row.getShort(col);
 
 if (Long.class.equals(clazz) || long.class.equals(clazz))
 return row.getLong(col);
@@ -148,7 +148,6 @@ public class PropertyMappingHelper {
 
 if (PropertyMappingHelper.BYTES_ARRAY_CLASS.equals(clazz)) {
 ByteBuffer buf = row.getBytes(col);
-
 return buf == null ? null : buf.array();
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
index 819120a..4fb0cb2 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
+++ 
b/modules/cassandra/store/src/main/java/org/apache/igni

ignite git commit: IGNITE-5779 - Fixes #3471.

2018-02-04 Thread irudyak 
Repository: ignite
Updated Branches:
  refs/heads/master 54bac7500 -> 08f965976


IGNITE-5779 - Fixes #3471.

Signed-off-by: Igor Rudyak 


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

Branch: refs/heads/master
Commit: 08f96597660e57e8b558d57387b1bba3c3889902
Parents: 54bac75
Author: Igor Rudyak 
Authored: Sun Feb 4 22:06:47 2018 -0800
Committer: Igor Rudyak 
Committed: Sun Feb 4 22:06:47 2018 -0800

--
 .../cache/store/cassandra/CassandraCacheStore.java  |  3 ++-
 .../store/cassandra/common/PropertyMappingHelper.java   |  7 +++
 .../store/cassandra/session/CassandraSessionImpl.java   |  3 +--
 .../org/apache/ignite/tests/load/PersonGenerator.java   |  2 +-
 .../test/java/org/apache/ignite/tests/pojos/Person.java | 12 ++--
 .../org/apache/ignite/tests/pojos/SimplePerson.java |  8 
 .../java/org/apache/ignite/tests/utils/TestsHelper.java |  4 ++--
 7 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
index b438946..b223cb3 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
+++ 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
@@ -272,7 +272,8 @@ public class CassandraCacheStore implements 
CacheStore {
 
 /** {@inheritDoc} */
 @Override protected void process(Row row) {
-data.put((K)controller.buildKeyObject(row), 
(V)controller.buildValueObject(row));
+if (row != null)
+data.put((K)controller.buildKeyObject(row), 
(V)controller.buildValueObject(row));
 }
 }, keys);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
index 66d7294..ed9f054 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
+++ 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/PropertyMappingHelper.java
@@ -46,8 +46,8 @@ public class PropertyMappingHelper {
 put(String.class, DataType.Name.TEXT);
 put(Integer.class, DataType.Name.INT);
 put(int.class, DataType.Name.INT);
-put(Short.class, DataType.Name.INT);
-put(short.class, DataType.Name.INT);
+put(Short.class, DataType.Name.SMALLINT);
+put(short.class, DataType.Name.SMALLINT);
 put(Long.class, DataType.Name.BIGINT);
 put(long.class, DataType.Name.BIGINT);
 put(Double.class, DataType.Name.DOUBLE);
@@ -129,7 +129,7 @@ public class PropertyMappingHelper {
 return row.getInt(col);
 
 if (Short.class.equals(clazz) || short.class.equals(clazz))
-return (short)row.getInt(col);
+return row.getShort(col);
 
 if (Long.class.equals(clazz) || long.class.equals(clazz))
 return row.getLong(col);
@@ -148,7 +148,6 @@ public class PropertyMappingHelper {
 
 if (PropertyMappingHelper.BYTES_ARRAY_CLASS.equals(clazz)) {
 ByteBuffer buf = row.getBytes(col);
-
 return buf == null ? null : buf.array();
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/08f96597/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
--
diff --git 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
 
b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java
index 819120a..4fb0cb2 100644
--- 
a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSe