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 2016/02/17 09:35:21 UTC
ignite git commit: ignite-1232 Temporary workaround for case when
affinity key is not sql field
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 55f39e4a6 -> 8bb68cf53
ignite-1232 Temporary workaround for case when affinity key is not sql field
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8bb68cf5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8bb68cf5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8bb68cf5
Branch: refs/heads/ignite-1232
Commit: 8bb68cf530bfc8952eec7c4819a7c83ca25ede36
Parents: 55f39e4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 17 11:35:01 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 17 11:35:01 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/GridQueryProcessor.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8bb68cf5/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 7e5ef94..3572e12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -289,6 +289,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
altTypeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(qryEntity.getValueType()));
}
+ if (desc.affinityKey() != null) {
+ // TODO: IGNITE-1232
+ if (!desc.fields().containsKey(desc.affinityKey()))
+ desc.affinityKey(null);
+ }
+
addTypeByName(ccfg, desc);
types.put(typeId, desc);