ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/33] ignite git commit: ignite-2.1 Fixed minor issues and typos.
Date Wed, 05 Jul 2017 11:23:50 GMT
ignite-2.1 Fixed minor issues and typos.


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

Branch: refs/heads/ignite-2.1.2-exchange
Commit: a5abdd579cc7ace5d17ebcc6555e3ce66c777917
Parents: 15613e2
Author: Vasiliy Sisko <vsisko@gridgain.com>
Authored: Tue Jul 4 18:44:42 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Jul 4 18:44:42 2017 +0700

----------------------------------------------------------------------
 .../visor/cache/VisorCacheConfiguration.java    | 11 +----
 .../visor/node/VisorBasicConfiguration.java     |  2 +-
 .../node/VisorMemoryPolicyConfiguration.java    |  2 +-
 .../states/configuration/caches/affinity.pug    | 18 +++----
 .../states/configuration/caches/general.pug     | 50 ++++++++++----------
 5 files changed, 38 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a5abdd57/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 7dba829..6fe056c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -320,13 +320,6 @@ public class VisorCacheConfiguration extends VisorDataTransferObject
{
     }
 
     /**
-     * @return Default lock acquisition timeout.
-     */
-    public long getDfltLockTimeout() {
-        return dfltLockTimeout;
-    }
-
-    /**
      * @return {@code true} if cache statistics collection enabled.
      */
     public boolean isStatisticsEnabled() {
@@ -455,7 +448,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
     /**
      * @return Listener configurations.
      */
-    public String getLsnrConfigurations() {
+    public String getListenerConfigurations() {
         return lsnrConfigurations;
     }
 
@@ -476,7 +469,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
     /**
      * @return Maximum payload size for offheap indexes.
      */
-    public int getSqlIdxMaxInlineSize() {
+    public int getSqlIndexMaxInlineSize() {
         return sqlIdxMaxInlineSize;
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a5abdd57/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 56d000d..b32e814 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -195,7 +195,7 @@ public class VisorBasicConfiguration extends VisorDataTransferObject {
         addrRslvr = compactClass(c.getAddressResolver());
         cacheSanityCheckEnabled = c.isCacheSanityCheckEnabled();
         clsLdr = compactClass(c.getClassLoader());
-        consistentId = String.valueOf(c.getConsistentId());
+        consistentId = c.getConsistentId() != null ? String.valueOf(c.getConsistentId())
: null;
         failureDetectionTimeout = c.getFailureDetectionTimeout();
         igniteWorkDir = c.getWorkDirectory();
         lateAffAssignment = c.isLateAffinityAssignment();

http://git-wip-us.apache.org/repos/asf/ignite/blob/a5abdd57/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java
index ced3124..d3153a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java
@@ -98,7 +98,7 @@ public class VisorMemoryPolicyConfiguration extends VisorDataTransferObject
{
     /**
      * Initial memory region size defined by this memory policy.
      */
-    public long getInitSize() {
+    public long getInitialSize() {
         return initSize;
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a5abdd57/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
b/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
index cb333ac..bc7674f 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
@@ -40,20 +40,20 @@ include /app/helpers/jade/mixins
             .col-sm-6
                 .settings-row(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
                     +dropdown('Function:', `${affModel}.kind`, '"AffinityKind"', 'true',
'Default', 'affinityFunction',
-                        'Key topology resolver to provide mapping from keys to nodes\
+                        'Key topology resolver to provide mapping from keys to nodes<br/>\
                         <ul>\
-                            <li>Rendezvous - Based on Highest Random Weight algorithm<br/></li>\
-                            <li>Fair - Tries to ensure that all nodes get equal number
of partitions with minimum amount of reassignments between existing nodes<br/></li>\
-                            <li>Custom - Custom implementation of key affinity fynction<br/></li>\
-                            <li>Default - By default rendezvous affinity function 
with 1024 partitions is used<br/></li>\
+                            <li>Rendezvous - Based on Highest Random Weight algorithm</li>\
+                            <li>Fair - Tries to ensure that all nodes get equal number
of partitions with minimum amount of reassignments between existing nodes</li>\
+                            <li>Custom - Custom implementation of key affinity fynction</li>\
+                            <li>Default - By default rendezvous affinity function 
with 1024 partitions is used</li>\
                         </ul>')
                 .settings-row(ng-if='$ctrl.available("2.0.0")')
                     +dropdown('Function:', `${affModel}.kind`, '"AffinityKind"', 'true',
'Default', 'affinityFunction',
-                        'Key topology resolver to provide mapping from keys to nodes\
+                        'Key topology resolver to provide mapping from keys to nodes<br/>\
                         <ul>\
-                            <li>Rendezvous - Based on Highest Random Weight algorithm<br/></li>\
-                            <li>Custom - Custom implementation of key affinity fynction<br/></li>\
-                            <li>Default - By default rendezvous affinity function 
with 1024 partitions is used<br/></li>\
+                            <li>Rendezvous - Based on Highest Random Weight algorithm</li>\
+                            <li>Custom - Custom implementation of key affinity fynction</li>\
+                            <li>Default - By default rendezvous affinity function 
with 1024 partitions is used</li>\
                         </ul>')
                 .panel-details(ng-if=rendezvousAff)
                     .details-row

http://git-wip-us.apache.org/repos/asf/ignite/blob/a5abdd57/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
b/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
index 33e62b8..87c67f5 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
@@ -82,31 +82,31 @@ include /app/helpers/jade/mixins
                         'Flag indicating whether data can be read from backup<br/>\
                         If not set then always get data from primary node (never from backup)')
                 //- Since ignite 2.0
-                    .settings-row(ng-if='$ctrl.available("2.0.0")')
-                        +dropdown('Partition loss policy:', `${model}.partitionLossPolicy`,
'"partitionLossPolicy"', 'true', 'IGNORE',
-                        '[\
-                            {value: "READ_ONLY_SAFE", label: "READ_ONLY_SAFE"},\
-                            {value: "READ_ONLY_ALL", label: "READ_ONLY_ALL"},\
-                            {value: "READ_WRITE_SAFE", label: "READ_WRITE_SAFE"},\
-                            {value: "READ_WRITE_ALL", label: "READ_WRITE_ALL"},\
-                            {value: "IGNORE", label: "IGNORE"}\
-                        ]',
-                        'Partition loss policies:\
-                        <ul>\
-                            <li>READ_ONLY_SAFE - in this mode all writes to the cache
will be failed with an exception,\
-                                reads will only be allowed for keys in  non-lost partitions.\
-                                Reads from lost partitions will be failed with an exception.</li>\
-                            <li>READ_ONLY_ALL - in this mode фll writes to the cache
will be failed with an exception.\
-                                All reads will proceed as if all partitions were in a consistent
state.\
-                                The result of reading from a lost partition is undefined
and may be different on different nodes in the cluster.</li>\
-                            <li>READ_WRITE_SAFE - in this mode Aall reads and writes
will be allowed for keys in valid partitions.\
-                                All reads and writes for keys in lost partitions will be
failed with an exception.</li>\
-                            <li>READ_WRITE_ALL - in this mode all reads and writes
will proceed as if all partitions were in a consistent state.\
-                                The result of reading from a lost partition is undefined
and may be different on different nodes in the cluster.</li>\
-                            <li>IGNORE - in this mode if partition is lost, reset it
state and do not clear intermediate data.\
-                                The result of reading from a previously lost and not cleared
partition is undefined and may be different\
-                                on different nodes in the cluster.</li>\
-                        </ul>')
+                .settings-row(ng-if='$ctrl.available("2.0.0")')
+                    +dropdown('Partition loss policy:', `${model}.partitionLossPolicy`, '"partitionLossPolicy"',
'true', 'IGNORE',
+                    '[\
+                        {value: "READ_ONLY_SAFE", label: "READ_ONLY_SAFE"},\
+                        {value: "READ_ONLY_ALL", label: "READ_ONLY_ALL"},\
+                        {value: "READ_WRITE_SAFE", label: "READ_WRITE_SAFE"},\
+                        {value: "READ_WRITE_ALL", label: "READ_WRITE_ALL"},\
+                        {value: "IGNORE", label: "IGNORE"}\
+                    ]',
+                    'Partition loss policies:\
+                    <ul>\
+                        <li>READ_ONLY_SAFE - in this mode all writes to the cache will
be failed with an exception,\
+                            reads will only be allowed for keys in  non-lost partitions.\
+                            Reads from lost partitions will be failed with an exception.</li>\
+                        <li>READ_ONLY_ALL - in this mode фll writes to the cache will
be failed with an exception.\
+                            All reads will proceed as if all partitions were in a consistent
state.\
+                            The result of reading from a lost partition is undefined and
may be different on different nodes in the cluster.</li>\
+                        <li>READ_WRITE_SAFE - in this mode Aall reads and writes will
be allowed for keys in valid partitions.\
+                            All reads and writes for keys in lost partitions will be failed
with an exception.</li>\
+                        <li>READ_WRITE_ALL - in this mode all reads and writes will
proceed as if all partitions were in a consistent state.\
+                            The result of reading from a lost partition is undefined and
may be different on different nodes in the cluster.</li>\
+                        <li>IGNORE - in this mode if partition is lost, reset it state
and do not clear intermediate data.\
+                            The result of reading from a previously lost and not cleared
partition is undefined and may be different\
+                            on different nodes in the cluster.</li>\
+                    </ul>')
                 .settings-row
                     +checkbox('Copy on read', `${model}.copyOnRead`, '"copyOnRead"',
                         'Flag indicating whether copy of the value stored in cache should
be created for cache operation implying return value<br/>\


Mime
View raw message