http://git-wip-us.apache.org/repos/asf/ignite/blob/f53d8574/modules/web-console/frontend/app/modules/states/configuration/clusters/marshaller.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/marshaller.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/marshaller.pug index 6126a9e..0a7d4b2 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/marshaller.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/marshaller.pug @@ -34,39 +34,40 @@ include /app/helpers/jade/mixins .panel-collapse(role='tabpanel' bs-collapse-target id=`${form}`) .panel-body(ng-if=`ui.isPanelLoaded('${form}')`) .col-sm-6 - .settings-row - div(ng-if='$ctrl.available(["1.0.0", "2.0.0"])') - +dropdown('Marshaller:', marshaller + '.kind', '"kind"', 'true', 'Default', 'marshallerVariant', - 'Instance of marshaller to use in grid<br/>\ - <ul>\ - <li>OptimizedMarshaller - Optimized implementation of marshaller</li>\ - <li>JdkMarshaller - Marshaller based on JDK serialization mechanism</li>\ - <li>Default - BinaryMarshaller serialize and deserialize all objects in the binary format</li>\ - </ul>') - div(ng-if='$ctrl.available("2.0.0")') - +dropdown('Marshaller:', marshaller + '.kind', '"kind"', 'true', 'Default', 'marshallerVariant', - 'Instance of marshaller to use in grid<br/>\ - <ul>\ - <li>JdkMarshaller - Marshaller based on JDK serialization mechanism</li>\ - <li>Default - BinaryMarshaller serialize and deserialize all objects in the binary format</li>\ - </ul>') - a.customize( - ng-if=`${marshaller}.kind && ${marshaller}.kind === 'OptimizedMarshaller'` - ng-click=`${marshaller}.expanded = !${marshaller}.expanded` - ) {{ #{marshaller}.expanded ? 'Hide settings' : 'Show settings'}} - .settings-row - .panel-details(ng-show=`${marshaller}.expanded && ${marshaller}.kind === 'OptimizedMarshaller'`) - .details-row - +number('Streams pool size:', `${optMarshaller}.poolSize`, '"poolSize"', 'true', '0', '0', - 'Specifies size of cached object streams used by marshaller<br/>\ - Object streams are cached for performance reason to avoid costly recreation for every serialization routine<br/>\ - If 0 (default), pool is not used and each thread has its own cached object stream which it keeps reusing<br/>\ - Since each stream has an internal buffer, creating a stream for each thread can lead to high memory consumption if many large messages are marshalled or unmarshalled concurrently<br/>\ - Consider using pool in this case. This will limit number of streams that can be created and, therefore, decrease memory consumption<br/>\ - NOTE: Using streams pool can decrease performance since streams will be shared between different threads which will lead to more frequent context switching') - .details-row - +checkbox('Require serializable', `${optMarshaller}.requireSerializable`, '"requireSerializable"', - 'Whether marshaller should require Serializable interface or not') + div(ng-if='$ctrl.available(["1.0.0", "2.1.0"])') + .settings-row + div(ng-if='$ctrl.available(["1.0.0", "2.0.0"])') + +dropdown('Marshaller:', marshaller + '.kind', '"kind"', 'true', 'Default', 'marshallerVariant', + 'Instance of marshaller to use in grid<br/>\ + <ul>\ + <li>OptimizedMarshaller - Optimized implementation of marshaller</li>\ + <li>JdkMarshaller - Marshaller based on JDK serialization mechanism</li>\ + <li>Default - BinaryMarshaller serialize and deserialize all objects in the binary format</li>\ + </ul>') + div(ng-if='$ctrl.available("2.0.0")') + +dropdown('Marshaller:', marshaller + '.kind', '"kind"', 'true', 'Default', 'marshallerVariant', + 'Instance of marshaller to use in grid<br/>\ + <ul>\ + <li>JdkMarshaller - Marshaller based on JDK serialization mechanism</li>\ + <li>Default - BinaryMarshaller serialize and deserialize all objects in the binary format</li>\ + </ul>') + a.customize( + ng-if=`${marshaller}.kind && ${marshaller}.kind === 'OptimizedMarshaller'` + ng-click=`${marshaller}.expanded = !${marshaller}.expanded` + ) {{ #{marshaller}.expanded ? 'Hide settings' : 'Show settings'}} + .settings-row + .panel-details(ng-show=`${marshaller}.expanded && ${marshaller}.kind === 'OptimizedMarshaller'`) + .details-row + +number('Streams pool size:', `${optMarshaller}.poolSize`, '"poolSize"', 'true', '0', '0', + 'Specifies size of cached object streams used by marshaller<br/>\ + Object streams are cached for performance reason to avoid costly recreation for every serialization routine<br/>\ + If 0 (default), pool is not used and each thread has its own cached object stream which it keeps reusing<br/>\ + Since each stream has an internal buffer, creating a stream for each thread can lead to high memory consumption if many large messages are marshalled or unmarshalled concurrently<br/>\ + Consider using pool in this case. This will limit number of streams that can be created and, therefore, decrease memory consumption<br/>\ + NOTE: Using streams pool can decrease performance since streams will be shared between different threads which will lead to more frequent context switching') + .details-row + +checkbox('Require serializable', `${optMarshaller}.requireSerializable`, '"requireSerializable"', + 'Whether marshaller should require Serializable interface or not') .settings-row +checkbox('Marshal local jobs', `${model}.marshalLocalJobs`, '"marshalLocalJobs"', 'If this flag is enabled, jobs mapped to local node will be marshalled as if it was remote node')
http://git-wip-us.apache.org/repos/asf/ignite/blob/f53d8574/modules/web-console/frontend/app/modules/states/configuration/clusters/misc.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/misc.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/misc.pug index 077897b..e22ec6f 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/misc.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/misc.pug @@ -53,7 +53,7 @@ include /app/helpers/jade/mixins <li>Each entry in partition group - lock transaction belongs to the same partition as was specified on partition transaction start</li>\ </ul>') - .settings-row + .settings-row(ng-if='$ctrl.available(["1.0.0", "2.1.0"])') +checkbox('Late affinity assignment', model + '.lateAffinityAssignment', '"lateAffinityAssignment"', 'With late affinity assignment mode if primary node was changed for some partition this nodes becomes primary only when rebalancing for all assigned primary partitions is finished') http://git-wip-us.apache.org/repos/asf/ignite/blob/f53d8574/modules/web-console/frontend/app/primitives/btn/index.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/btn/index.scss b/modules/web-console/frontend/app/primitives/btn/index.scss index 2870cff..162fde4 100644 --- a/modules/web-console/frontend/app/primitives/btn/index.scss +++ b/modules/web-console/frontend/app/primitives/btn/index.scss @@ -155,7 +155,7 @@ $btn-content-padding-with-border: 9px 11px; background-color: $accent-color; color: white; - &:hover, &.hover, + &:hover, &.hover, &:focus, &:active, &.active { &:not([disabled]) { color: white; http://git-wip-us.apache.org/repos/asf/ignite/blob/f53d8574/modules/web-console/frontend/app/services/CSV.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/services/CSV.js b/modules/web-console/frontend/app/services/CSV.js new file mode 100644 index 0000000..ac87bbf --- /dev/null +++ b/modules/web-console/frontend/app/services/CSV.js @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export class CSV { + getSeparator() { + return (0.5).toLocaleString().includes(',') ? ';' : ','; + } +}
