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 2016/01/01 22:07:40 UTC
[13/18] ignite git commit: IGNITE-2263: DANGEROUS! Removed view()
from CacheAbstractJdbcStore.
IGNITE-2263: DANGEROUS! Removed view() from CacheAbstractJdbcStore.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef4736fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef4736fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef4736fd
Branch: refs/heads/ignite-2263
Commit: ef4736fd19e82887030d7a35c890335a4fad10e7
Parents: 22d36c4
Author: thatcoach <pp...@list.ru>
Authored: Fri Jan 1 23:18:00 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Fri Jan 1 23:18:00 2016 +0300
----------------------------------------------------------------------
.../ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef4736fd/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index c5c55e1..7c765e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -1738,11 +1738,14 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>,
keyCols = databaseColumns(F.asList(keyFields));
- uniqValFlds = F.view(F.asList(valFields), new IgnitePredicate<JdbcTypeField>() {
- @Override public boolean apply(JdbcTypeField col) {
- return !keyCols.contains(col.getDatabaseFieldName());
+ uniqValFlds = new ArrayList<>();
+
+ if (valFields != null) {
+ for (JdbcTypeField valField : valFields) {
+ if (valField != null && !keyCols.contains(valField.getDatabaseFieldName()))
+ uniqValFlds.add(valField);
}
- });
+ }
String schema = typeMeta.getDatabaseSchema();