Merge remote-tracking branch 'community/gridgain-7.6.1' into gridgain-7.6.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/735cc7ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/735cc7ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/735cc7ca Branch: refs/heads/ignite-1232 Commit: 735cc7ca127435ddacb9ba9baf9a162c6cfc2a1f Parents: 55e616f 5cc1f07 Author: sboikov <[email protected]> Authored: Wed Jun 29 10:20:25 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Jun 29 10:20:25 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteDataStreamer.java | 5 +- .../visor/compute/VisorGatewayTask.java | 3 +- .../include/ignite/binary/binary_containers.h | 197 +- .../include/ignite/binary/binary_raw_reader.h | 31 +- .../include/ignite/binary/binary_raw_writer.h | 13 + .../include/ignite/binary/binary_reader.h | 19 +- .../include/ignite/binary/binary_writer.h | 13 + .../ignite/impl/binary/binary_reader_impl.h | 11 +- .../ignite/impl/binary/binary_writer_impl.h | 2 +- modules/platforms/cpp/common/Makefile.am | 5 +- .../platforms/cpp/common/include/Makefile.am | 19 +- .../common/include/ignite/common/big_integer.h | 523 +++++ .../cpp/common/include/ignite/common/bits.h | 218 ++ .../include/ignite/common/default_allocator.h | 95 + .../include/ignite/common/dynamic_size_array.h | 415 ++++ .../include/ignite/common/fixed_size_array.h | 288 +++ .../cpp/common/include/ignite/common/utils.h | 81 +- .../platforms/cpp/common/include/ignite/date.h | 2 +- .../platforms/cpp/common/include/ignite/guid.h | 4 +- .../cpp/common/include/ignite/ignite_error.h | 19 +- .../cpp/common/include/ignite/timestamp.h | 2 +- .../cpp/common/os/win/src/common/utils.cpp | 21 - .../cpp/common/project/vs/common.vcxproj | 17 +- .../common/project/vs/common.vcxproj.filters | 27 + .../cpp/common/src/common/big_integer.cpp | 830 +++++++ .../platforms/cpp/common/src/common/bits.cpp | 233 ++ .../platforms/cpp/common/src/ignite_error.cpp | 12 +- modules/platforms/cpp/core-test/Makefile.am | 4 + .../cpp/core-test/project/vs/core-test.vcxproj | 7 + .../project/vs/core-test.vcxproj.filters | 12 + .../platforms/cpp/core-test/src/bits_test.cpp | 124 + .../cpp/core-test/src/decimal_test.cpp | 1101 +++++++++ .../core-test/src/dynamic_size_array_test.cpp | 360 +++ .../cpp/core-test/src/fixed_size_array_test.cpp | 208 ++ .../cpp/core/include/ignite/cache/cache.h | 186 +- .../cpp/core/include/ignite/cache/cache_entry.h | 16 +- .../include/ignite/cache/query/query_argument.h | 33 +- .../include/ignite/cache/query/query_cursor.h | 17 +- .../ignite/cache/query/query_fields_cursor.h | 11 +- .../ignite/cache/query/query_fields_row.h | 22 +- .../include/ignite/cache/query/query_scan.h | 10 +- .../core/include/ignite/cache/query/query_sql.h | 15 +- .../ignite/cache/query/query_sql_fields.h | 15 +- .../platforms/cpp/core/include/ignite/ignite.h | 21 +- .../core/include/ignite/ignite_configuration.h | 4 +- .../cpp/core/include/ignite/ignition.h | 2 +- .../include/ignite/transactions/transaction.h | 68 +- .../ignite/transactions/transaction_consts.h | 84 +- .../ignite/transactions/transaction_metrics.h | 13 +- .../include/ignite/transactions/transactions.h | 36 +- modules/platforms/cpp/core/namespaces.dox | 2 +- modules/platforms/cpp/cpp.dxg | 4 +- modules/platforms/cpp/odbc-test/Makefile.am | 1 - .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 - .../project/vs/odbc-test.vcxproj.filters | 3 - .../src/application_data_buffer_test.cpp | 35 +- .../platforms/cpp/odbc-test/src/row_test.cpp | 5 +- modules/platforms/cpp/odbc/Makefile.am | 1 - modules/platforms/cpp/odbc/include/Makefile.am | 1 - .../ignite/odbc/app/application_data_buffer.h | 11 +- .../cpp/odbc/include/ignite/odbc/decimal.h | 137 -- .../cpp/odbc/include/ignite/odbc/utility.h | 12 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 - .../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 - .../odbc/src/app/application_data_buffer.cpp | 210 +- .../platforms/cpp/odbc/src/app/parameter.cpp | 6 +- modules/platforms/cpp/odbc/src/column.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 1 - modules/platforms/cpp/odbc/src/decimal.cpp | 135 -- modules/platforms/cpp/odbc/src/odbc.cpp | 3 - modules/platforms/cpp/odbc/src/utility.cpp | 25 +- modules/schema-import/README.txt | 12 +- modules/web-agent/README.txt | 25 +- .../web-agent/assembly/release-web-agent.xml | 2 - modules/web-agent/bin/ignite-web-agent.bat | 2 +- modules/web-agent/bin/ignite-web-agent.sh | 2 +- modules/web-agent/pom.xml | 22 +- .../console/agent/AgentConfiguration.java | 53 +- .../ignite/console/agent/AgentLauncher.java | 21 +- .../ignite/console/demo/AgentClusterDemo.java | 82 +- modules/web-console/README.txt | 4 +- modules/web-console/src/main/js/.eslintrc | 7 +- .../src/main/js/app/data/getting-started.json | 2 +- .../src/main/js/app/data/pom-dependencies.json | 20 + .../directives/ui-ace-docker/ui-ace-docker.jade | 4 +- .../ui-ace-java/ui-ace-java.directive.js | 4 +- .../directives/ui-ace-pojos/ui-ace-pojos.jade | 4 +- .../ui-ace-xml/ui-ace-xml.directive.js | 4 +- .../src/main/js/app/helpers/jade/mixins.jade | 17 +- modules/web-console/src/main/js/app/index.js | 18 +- .../src/main/js/app/modules/Demo/Demo.module.js | 14 +- .../QueryNotebooks/QueryNotebooks.provider.js | 115 - .../main/js/app/modules/agent/agent.module.js | 323 +++ .../configuration/generator/Pom.service.js | 46 +- .../form/field/input/datalist.directive.js | 6 +- .../modules/form/field/input/text.directive.js | 9 +- .../js/app/modules/form/field/input/text.jade | 2 +- .../app/modules/form/group/group.directive.js | 6 +- .../form/validator/java-keywords.directive.js | 9 +- .../src/main/js/app/modules/loading/loading.css | 2 +- .../query-notebooks/query-notebooks.module.js | 115 + .../app/modules/states/configuration.state.js | 32 +- .../states/configuration/caches/general.jade | 2 +- .../states/configuration/caches/store.jade | 37 +- .../clusters/attributes.directive.js | 27 + .../configuration/clusters/attributes.jade | 58 + .../states/configuration/clusters/binary.jade | 12 +- .../clusters/collision.directive.js | 27 + .../configuration/clusters/collision.jade | 60 + .../clusters/collision/custom.directive.js | 27 + .../clusters/collision/custom.jade | 24 + .../clusters/collision/fifo-queue.directive.js | 27 + .../clusters/collision/fifo-queue.jade | 28 + .../collision/job-stealing.directive.js | 27 + .../clusters/collision/job-stealing.jade | 64 + .../collision/priority-queue.directive.js | 27 + .../clusters/collision/priority-queue.jade | 43 + .../configuration/clusters/communication.jade | 30 +- .../configuration/clusters/deployment.jade | 31 +- .../configuration/clusters/discovery.jade | 4 +- .../clusters/failover.directive.js | 27 + .../states/configuration/clusters/failover.jade | 82 + .../states/configuration/clusters/general.jade | 20 +- .../clusters/general/discovery/cloud.jade | 6 +- .../clusters/general/discovery/google.jade | 11 +- .../clusters/general/discovery/s3.jade | 4 +- .../clusters/general/discovery/zookeeper.jade | 21 +- .../bounded-exponential-backoff.jade | 6 +- .../discovery/zookeeper/retrypolicy/custom.jade | 6 +- .../retrypolicy/exponential-backoff.jade | 6 +- .../zookeeper/retrypolicy/forever.jade | 2 +- .../zookeeper/retrypolicy/n-times.jade | 2 +- .../zookeeper/retrypolicy/one-time.jade | 2 +- .../zookeeper/retrypolicy/until-elapsed.jade | 4 +- .../states/configuration/clusters/igfs.jade | 4 +- .../configuration/clusters/logger.directive.js | 27 + .../states/configuration/clusters/logger.jade | 65 + .../clusters/logger/custom.directive.js | 27 + .../configuration/clusters/logger/custom.jade | 24 + .../clusters/logger/log4j.directive.js | 27 + .../configuration/clusters/logger/log4j.jade | 49 + .../clusters/logger/log4j2.directive.js | 27 + .../configuration/clusters/logger/log4j2.jade | 38 + .../states/configuration/domains/query.jade | 4 +- .../states/configuration/domains/store.jade | 2 +- .../modules/states/configuration/igfs/misc.jade | 2 +- .../main/js/app/modules/user/Auth.service.js | 19 +- .../js/app/services/AgentMonitor.service.js | 337 --- .../src/main/js/app/services/cleanup.service.js | 4 +- .../src/main/js/build/system.config.js | 55 +- .../src/main/js/controllers/admin-controller.js | 14 +- .../main/js/controllers/caches-controller.js | 336 ++- .../main/js/controllers/clusters-controller.js | 537 +++-- .../src/main/js/controllers/common-module.js | 1052 +++++---- .../main/js/controllers/domains-controller.js | 847 ++++--- .../src/main/js/controllers/igfs-controller.js | 212 +- .../main/js/controllers/profile-controller.js | 60 +- .../src/main/js/controllers/sql-controller.js | 2173 +++++++++--------- .../src/main/js/generator/generator-common.js | 151 +- .../src/main/js/generator/generator-java.js | 998 ++++---- .../src/main/js/generator/generator-optional.js | 2 +- .../main/js/generator/generator-properties.js | 25 +- .../src/main/js/generator/generator-readme.js | 6 +- .../src/main/js/generator/generator-xml.js | 430 +++- .../main/js/gulpfile.babel.js/tasks/eslint.js | 3 + .../src/main/js/public/images/cluster.png | Bin 29670 -> 29376 bytes .../src/main/js/public/images/query-table.png | Bin 42253 -> 29189 bytes .../src/main/js/public/stylesheets/style.scss | 28 + modules/web-console/src/main/js/serve/agent.js | 222 +- .../web-console/src/main/js/serve/browser.js | 120 +- .../web-console/src/main/js/serve/configure.js | 1 + modules/web-console/src/main/js/serve/mongo.js | 58 +- .../src/main/js/serve/routes/agent.js | 3 +- .../src/main/js/serve/routes/caches.js | 4 +- .../src/main/js/serve/routes/clusters.js | 8 +- .../src/main/js/serve/routes/igfs.js | 2 +- .../src/main/js/serve/routes/profile.js | 11 +- .../src/main/js/serve/routes/public.js | 35 +- .../main/js/views/configuration/clusters.jade | 4 + .../js/views/configuration/domains-import.jade | 325 +-- .../src/main/js/views/settings/profile.jade | 14 +- .../web-console/src/main/js/views/signin.jade | 26 +- .../src/main/js/views/sql/cache-metadata.jade | 2 +- .../web-console/src/main/js/views/sql/sql.jade | 205 +- 184 files changed, 11535 insertions(+), 4909 deletions(-) ----------------------------------------------------------------------
