You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/18 15:17:57 UTC
[1/3] ignite git commit: IGNITE-843 Updated tip for idMapper and
nameMapper.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 a86fdc003 -> 400203743
IGNITE-843 Updated tip for idMapper and nameMapper.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a9ced4a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a9ced4a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a9ced4a
Branch: refs/heads/ignite-2612
Commit: 6a9ced4ad50061ee24878c7eaf76e041ae2acc25
Parents: 3655140
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Feb 18 20:39:36 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Feb 18 20:39:36 2016 +0700
----------------------------------------------------------------------
.../modules/states/configuration/clusters/binary.jade | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a9ced4a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/binary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/binary.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/binary.jade
index 60e34db..6e78df3 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/binary.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/binary.jade
@@ -32,8 +32,8 @@ form.panel.panel-default(name='binary' novalidate)
ignite-form-field-label
| ID mapper:
ignite-form-field-tooltip
- | Type and field ID mapper for binary objects#[br]
- | Ignite never writes full strings for field or type names. Instead, for performance reasons, Ignite writes integer hash codes for type and field names. It has been tested that hash code conflicts for the type names or the field names within the same type are virtually non-existent and, to gain performance, it is safe to work with hash codes. For the cases when hash codes for different types or fields actually do collide #[b BinaryIdMapper] allows to override the automatically generated hash code IDs for the type and field names
+ | Maps given from BinaryNameMapper type and filed name to ID that will be used by Ignite in internals#[br]
+ | Ignite never writes full strings for field or type names. Instead, for performance reasons, Ignite writes integer hash codes for type/class and field names. It has been tested that hash code conflicts for the type/class names or the field names within the same type are virtually non-existent and, to gain performance, it is safe to work with hash codes. For the cases when hash codes for different types or fields actually do collide #[b BinaryIdMapper] allows to override the automatically generated hash code IDs for the type and field names
ignite-form-field-java-class(
data-id='idMapper'
data-name='idMapper'
@@ -44,7 +44,7 @@ form.panel.panel-default(name='binary' novalidate)
ignite-form-field-label
| Name mapper:
ignite-form-field-tooltip
- | Name mapper
+ | Maps type/class and field names to different names#[br]
ignite-form-field-java-class(
data-id='nameMapper'
data-name='nameMapper'
@@ -94,8 +94,8 @@ form.panel.panel-default(name='binary' novalidate)
ignite-form-field-label
| ID mapper:
ignite-form-field-tooltip
- | Type and field ID mapper for binary objects#[br]
- | Ignite never writes full strings for field or type names. Instead, for performance reasons, Ignite writes integer hash codes for type and field names. It has been tested that hash code conflicts for the type names or the field names within the same type are virtually non-existent and, to gain performance, it is safe to work with hash codes. For the cases when hash codes for different types or fields actually do collide #[b BinaryIdMapper] allows to override the automatically generated hash code IDs for the type and field names
+ | Maps given from BinaryNameMapper type and filed name to ID that will be used by Ignite in internals#[br]
+ | Ignite never writes full strings for field or type/class names. Instead, for performance reasons, Ignite writes integer hash codes for type/class and field names. It has been tested that hash code conflicts for the type/class names or the field names within the same type are virtually non-existent and, to gain performance, it is safe to work with hash codes. For the cases when hash codes for different types or fields actually do collide #[b BinaryIdMapper] allows to override the automatically generated hash code IDs for the type and field names
ignite-form-field-java-class(
data-id='idMapper'
data-name='idMapper'
@@ -106,7 +106,7 @@ form.panel.panel-default(name='binary' novalidate)
ignite-form-field-label
| Name mapper:
ignite-form-field-tooltip
- | Name mapper
+ | Maps type/class and field names to different names#[br]
ignite-form-field-java-class(
data-id='nameMapper'
data-name='nameMapper'
[3/3] ignite git commit: Merge branches 'ignite-2612' and
'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-2612
Posted by ak...@apache.org.
Merge branches 'ignite-2612' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40020374
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40020374
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40020374
Branch: refs/heads/ignite-2612
Commit: 40020374399809f2692b2fd72a19547e38c02a7f
Parents: a86fdc0 695c217
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Feb 18 21:17:51 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Feb 18 21:17:51 2016 +0700
----------------------------------------------------------------------
.../modules/states/configuration/clusters/binary.jade | 12 ++++++------
.../src/main/js/helpers/generator/generator-java.js | 10 ++++------
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/3] ignite git commit: IGNITE-843 refactored toString() in POJO
java code generation.
Posted by ak...@apache.org.
IGNITE-843 refactored toString() in POJO java code generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/695c217b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/695c217b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/695c217b
Branch: refs/heads/ignite-2612
Commit: 695c217b74ba9c12170f56ca17ca72915b4ccb05
Parents: 6a9ced4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Feb 18 20:41:17 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Feb 18 20:41:17 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-java.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/695c217b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 08e88c6..abee0be 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -2073,15 +2073,13 @@ $generatorJava.javaClassCode = function (domain, key, pkg, useConstructor, inclu
res.line('/** {@inheritDoc} */');
res.startBlock('@Override public String toString() {');
+ res.startBlock('return \"' + type + ' [" + ');
+
_.forEach(allFields, function (field, idx) {
- if (idx === 0)
- res.startBlock('return \"' + type + ' [' + field.javaFieldName + '=\" + ' + field.javaFieldName + ' +', type);
- else
- res.line('\", ' + field.javaFieldName + '=\" + ' + field.javaFieldName + ' +');
+ res.line('\"' + field.javaFieldName + '=\" + ' + field.javaFieldName + (idx < allFields.length - 1 ? ' + ", " + ' : ' +'));
});
- res.line('"]";');
- res.endBlock();
+ res.endBlock('"]";');
res.endBlock('}');
res.endBlock('}');