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 2015/11/05 11:00:56 UTC
[2/3] ignite git commit: IGNITE-1819: WIP.
IGNITE-1819: WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f04252b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f04252b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f04252b
Branch: refs/heads/ignite-1819
Commit: 7f04252bb10c670a37c3979cbec970a564b5e5b3
Parents: df6b8ee
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Nov 5 12:54:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Nov 5 12:54:17 2015 +0300
----------------------------------------------------------------------
.../internal/portable/PortableContext.java | 25 +++++---------------
1 file changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7f04252b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 8380053..106f8cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -292,12 +292,10 @@ public class PortableContext implements Externalizable {
String pkgName = clsName.substring(0, clsName.length() - 2);
for (String clsName0 : classesInPackage(pkgName))
- descs.add(clsName0, idMapper, null, null, true,
- globalKeepDeserialized, true);
+ descs.add(clsName0, idMapper, null, null, globalKeepDeserialized, true);
}
else // Regular single class
- descs.add(clsName, idMapper, null, null, true,
- globalKeepDeserialized, true);
+ descs.add(clsName, idMapper, null, null, globalKeepDeserialized, true);
}
}
@@ -320,7 +318,6 @@ public class PortableContext implements Externalizable {
if (typeCfg.getSerializer() != null)
serializer = typeCfg.getSerializer();
- boolean metaDataEnabled = true;
boolean keepDeserialized = typeCfg.isKeepDeserialized() != null ? typeCfg.isKeepDeserialized() :
globalKeepDeserialized;
@@ -329,17 +326,17 @@ public class PortableContext implements Externalizable {
for (String clsName0 : classesInPackage(pkgName))
descs.add(clsName0, idMapper, serializer, typeCfg.getAffinityKeyFieldName(),
- metaDataEnabled, keepDeserialized, true);
+ keepDeserialized, true);
}
else
descs.add(clsName, idMapper, serializer, typeCfg.getAffinityKeyFieldName(),
- metaDataEnabled, keepDeserialized, false);
+ keepDeserialized, false);
}
}
for (TypeDescriptor desc : descs.descriptors()) {
registerUserType(desc.clsName, desc.idMapper, desc.serializer, desc.affKeyFieldName,
- desc.metadataEnabled, desc.keepDeserialized);
+ true, desc.keepDeserialized); // TODO: Remove.
}
}
@@ -1036,7 +1033,6 @@ public class PortableContext implements Externalizable {
* @param idMapper ID mapper.
* @param serializer Serializer.
* @param affKeyFieldName Affinity key field name.
- * @param metadataEnabled Metadata enabled flag.
* @param keepDeserialized Keep deserialized flag.
* @param canOverride Whether this descriptor can be override.
* @throws PortableException If failed.
@@ -1045,7 +1041,6 @@ public class PortableContext implements Externalizable {
PortableIdMapper idMapper,
PortableSerializer serializer,
String affKeyFieldName,
- boolean metadataEnabled,
boolean keepDeserialized,
boolean canOverride)
throws PortableException {
@@ -1053,7 +1048,6 @@ public class PortableContext implements Externalizable {
idMapper,
serializer,
affKeyFieldName,
- metadataEnabled,
keepDeserialized,
canOverride);
@@ -1091,9 +1085,6 @@ public class PortableContext implements Externalizable {
/** Affinity key field name. */
private String affKeyFieldName;
- /** Metadata enabled flag. */
- private boolean metadataEnabled;
-
/** Keep deserialized flag. */
private boolean keepDeserialized;
@@ -1107,18 +1098,15 @@ public class PortableContext implements Externalizable {
* @param idMapper ID mapper.
* @param serializer Serializer.
* @param affKeyFieldName Affinity key field name.
- * @param metadataEnabled Metadata enabled flag.
* @param keepDeserialized Keep deserialized flag.
* @param canOverride Whether this descriptor can be override.
*/
private TypeDescriptor(String clsName, PortableIdMapper idMapper, PortableSerializer serializer,
- String affKeyFieldName, boolean metadataEnabled, boolean keepDeserialized,
- boolean canOverride) {
+ String affKeyFieldName, boolean keepDeserialized, boolean canOverride) {
this.clsName = clsName;
this.idMapper = idMapper;
this.serializer = serializer;
this.affKeyFieldName = affKeyFieldName;
- this.metadataEnabled = metadataEnabled;
this.keepDeserialized = keepDeserialized;
this.canOverride = canOverride;
}
@@ -1136,7 +1124,6 @@ public class PortableContext implements Externalizable {
idMapper = other.idMapper;
serializer = other.serializer;
affKeyFieldName = other.affKeyFieldName;
- metadataEnabled = other.metadataEnabled;
keepDeserialized = other.keepDeserialized;
canOverride = other.canOverride;
}