Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5882a85 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5882a85 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5882a85 Branch: refs/heads/ignite-2.0 Commit: c5882a85f4e3a1f61723ac54fd92f087684df6da Parents: c893da7 c040c37 Author: devozerov <[email protected]> Authored: Mon Dec 26 14:15:42 2016 +0300 Committer: devozerov <[email protected]> Committed: Mon Dec 26 14:15:42 2016 +0300 ---------------------------------------------------------------------- .../store/cassandra/CassandraCacheStore.java | 6 + .../store/cassandra/datasource/DataSource.java | 9 + .../java/org/apache/ignite/IgniteLogger.java | 6 +- .../java/org/apache/ignite/IgniteServices.java | 16 + .../ignite/cache/store/CacheStoreAdapter.java | 6 + .../cache/store/jdbc/CacheJdbcPojoStore.java | 19 +- .../store/jdbc/JdbcTypesDefaultTransformer.java | 112 +- .../org/apache/ignite/internal/GridTopic.java | 8 +- .../ignite/internal/IgniteServicesImpl.java | 9 +- .../internal/binary/BinaryClassDescriptor.java | 12 +- .../ignite/internal/binary/BinaryUtils.java | 10 +- .../binary/builder/BinaryObjectBuilderImpl.java | 11 +- .../affinity/GridAffinityProcessor.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 6 + .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheLoaderWriterStore.java | 6 + .../GridCachePartitionExchangeManager.java | 23 +- .../CacheDataStructuresManager.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 6 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../closure/GridClosureProcessor.java | 31 +- .../internal/processors/job/GridJobWorker.java | 76 +- .../processors/odbc/OdbcRequestHandler.java | 16 +- .../internal/processors/odbc/OdbcTableMeta.java | 15 +- .../platform/PlatformContextImpl.java | 2 +- .../dotnet/PlatformDotNetCacheStore.java | 11 + .../platform/services/PlatformServices.java | 2 +- .../platform/utils/PlatformUtils.java | 28 + .../service/GridServiceProcessor.java | 11 +- .../processors/service/GridServiceProxy.java | 18 +- .../processors/task/GridTaskWorker.java | 7 + .../visor/service/VisorCancelServiceTask.java | 70 + .../visor/service/VisorServiceDescriptor.java | 132 + .../visor/service/VisorServiceTask.java | 75 + .../internal/visor/util/VisorTaskUtils.java | 15 +- .../apache/ignite/logger/java/JavaLogger.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 4 +- .../apache/ignite/util/AttributeNodeFilter.java | 108 + .../resources/META-INF/classnames.properties | 65 +- .../jdbc/JdbcTypesDefaultTransformerTest.java | 283 ++ .../IgniteComputeTopologyExceptionTest.java | 5 +- .../binary/BinaryMarshallerSelfTest.java | 66 + ...heapCacheMetricsForClusterGroupSelfTest.java | 141 + .../CacheLockReleaseNodeLeaveTest.java | 135 + .../CacheOffHeapAndSwapMetricsSelfTest.java | 621 --- ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 621 +++ .../closure/GridClosureSerializationTest.java | 177 + ...gniteServiceProxyTimeoutInitializedTest.java | 284 ++ .../junits/logger/GridTestLog4jLogger.java | 4 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 5 + .../IgniteCacheMetricsSelfTestSuite.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../util/AttributeNodeFilterSelfTest.java | 184 + .../processors/query/h2/IgniteH2Indexing.java | 75 +- ...niteCachePartitionedFieldsQuerySelfTest.java | 25 + .../apache/ignite/logger/log4j/Log4JLogger.java | 4 +- .../cache/query/continuous/continuous_query.h | 2 +- .../cpp/odbc-test/config/queries-default.xml | 145 + .../odbc-test/config/queries-test-noodbc.xml | 84 +- .../cpp/odbc-test/config/queries-test.xml | 122 +- .../cpp/odbc-test/src/queries_test.cpp | 76 + .../cpp/odbc-test/src/utility_test.cpp | 27 +- modules/platforms/cpp/odbc/src/utility.cpp | 10 + .../Cache/Query/CacheLinqTest.cs | 51 +- .../EntityFrameworkCacheTest.cs | 54 +- .../Impl/DbCommandInfo.cs | 21 +- .../Apache.Ignite.Linq/Impl/ExpressionWalker.cs | 8 + modules/platforms/dotnet/Apache.Ignite.sln | 2 + modules/platforms/dotnet/DEVNOTES.txt | 12 +- modules/platforms/dotnet/build.bat | 19 + modules/platforms/dotnet/build.ps1 | 211 + .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- modules/web-console/backend/app/agent.js | 15 + modules/web-console/backend/app/browser.js | 13 + modules/web-console/backend/app/mongo.js | 24 +- modules/web-console/backend/routes/demo.js | 17 +- modules/web-console/backend/routes/profile.js | 3 +- .../web-console/backend/services/notebooks.js | 14 +- .../web-console/backend/services/sessions.js | 6 +- modules/web-console/backend/services/spaces.js | 15 + modules/web-console/frontend/app/app.js | 5 - .../controllers/reset-password.controller.js | 14 +- .../frontend/app/data/event-groups.json | 169 + .../frontend/app/data/event-types.json | 169 - .../frontend/app/data/pom-dependencies.json | 12 +- .../ui-ace-docker/ui-ace-docker.controller.js | 2 +- .../directives/ui-ace-docker/ui-ace-docker.jade | 2 +- .../ui-ace-pojos/ui-ace-pojos.controller.js | 12 +- .../ui-ace-pom/ui-ace-pom.controller.js | 4 +- .../helpers/jade/form/form-field-dropdown.jade | 5 +- .../helpers/jade/form/form-field-number.jade | 3 +- .../app/helpers/jade/form/form-field-text.jade | 19 +- .../frontend/app/helpers/jade/mixins.jade | 52 +- .../frontend/app/modules/Demo/Demo.module.js | 6 +- .../configuration/EventGroups.provider.js | 30 - .../modules/configuration/Version.service.js | 6 +- .../configuration/configuration.module.js | 63 +- .../generator/AbstractTransformer.js | 17 + .../modules/configuration/generator/Beans.js | 5 + .../generator/ConfigurationGenerator.js | 2795 +++++++------- .../configuration/generator/Custom.service.js | 23 + .../configuration/generator/Docker.service.js | 4 +- .../generator/JavaTransformer.service.js | 2318 +++++------ .../configuration/generator/Maven.service.js | 234 ++ .../configuration/generator/Pom.service.js | 233 -- .../generator/Properties.service.js | 2 +- .../configuration/generator/Readme.service.js | 2 +- .../generator/SharpTransformer.service.js | 437 ++- .../generator/SpringTransformer.service.js | 497 ++- .../defaults/Cache.platform.service.js | 56 + .../generator/defaults/Cache.service.js | 131 + .../defaults/Cluster.platform.service.js | 43 + .../generator/defaults/Cluster.service.js | 289 ++ .../generator/defaults/Event-groups.service.js | 27 + .../generator/defaults/IGFS.service.js | 64 + .../defaults/cache.platform.provider.js | 60 - .../generator/defaults/cache.provider.js | 137 - .../defaults/cluster.platform.provider.js | 49 - .../generator/defaults/cluster.provider.js | 293 -- .../generator/defaults/igfs.provider.js | 68 - .../configuration/generator/generator-common.js | 625 --- .../configuration/generator/generator-java.js | 3617 ------------------ .../generator/generator-optional.js | 25 - .../configuration/generator/generator-spring.js | 2111 ---------- .../frontend/app/modules/sql/Notebook.data.js | 11 +- .../app/modules/sql/Notebook.service.js | 2 +- .../app/modules/sql/scan-filter-input.jade | 39 - .../modules/sql/scan-filter-input.service.js | 51 - .../frontend/app/modules/sql/sql.controller.js | 211 +- .../frontend/app/modules/sql/sql.module.js | 2 - .../app/modules/states/configuration.state.js | 2 + .../configuration/caches/node-filter.jade | 2 +- .../states/configuration/caches/query.jade | 3 + .../states/configuration/caches/store.jade | 4 +- .../configuration/clusters/checkpoint.jade | 11 +- .../configuration/clusters/checkpoint/fs.jade | 8 +- .../configuration/clusters/checkpoint/jdbc.jade | 8 +- .../configuration/clusters/checkpoint/s3.jade | 25 +- .../clusters/collision/custom.jade | 2 +- .../clusters/collision/job-stealing.jade | 2 +- .../configuration/clusters/deployment.jade | 129 +- .../states/configuration/clusters/events.jade | 4 +- .../states/configuration/clusters/failover.jade | 4 +- .../clusters/general/discovery/zookeeper.jade | 2 +- .../discovery/zookeeper/retrypolicy/custom.jade | 2 +- .../configuration/clusters/load-balancing.jade | 23 +- .../configuration/clusters/logger/custom.jade | 2 +- .../states/configuration/clusters/ssl.jade | 2 +- .../summary/summary-zipper.service.js | 37 + .../configuration/summary/summary.controller.js | 103 +- .../configuration/summary/summary.worker.js | 123 + .../frontend/app/modules/user/Auth.service.js | 11 +- .../frontend/app/services/JavaTypes.service.js | 13 +- .../frontend/app/services/Messages.service.js | 17 +- .../frontend/controllers/admin-controller.js | 211 +- .../frontend/controllers/caches-controller.js | 22 +- .../frontend/controllers/clusters-controller.js | 42 +- .../frontend/controllers/domains-controller.js | 32 +- .../frontend/controllers/igfs-controller.js | 20 +- .../frontend/controllers/profile-controller.js | 3 +- .../gulpfile.babel.js/webpack/common.js | 17 +- .../webpack/environments/development.js | 14 +- .../webpack/environments/production.js | 3 +- .../webpack/plugins/progress.js | 82 - modules/web-console/frontend/package.json | 178 +- .../frontend/public/images/cache.png | Bin 23700 -> 24791 bytes .../frontend/public/images/domains.png | Bin 23828 -> 22131 bytes .../web-console/frontend/public/images/igfs.png | Bin 14307 -> 14139 bytes .../frontend/public/images/query-chart.png | Bin 16637 -> 17142 bytes .../frontend/public/images/query-metadata.png | Bin 32298 -> 39361 bytes .../frontend/public/images/query-table.png | Bin 29189 -> 28065 bytes .../frontend/public/images/summary.png | Bin 31997 -> 33650 bytes .../stylesheets/_font-awesome-custom.scss | 23 +- .../frontend/public/stylesheets/form-field.scss | 37 + .../frontend/public/stylesheets/style.scss | 111 +- .../frontend/test/unit/JavaTypes.test.js | 17 +- .../frontend/test/unit/Version.test.js | 8 +- .../views/configuration/domains-import.jade | 5 +- .../frontend/views/configuration/summary.jade | 25 +- .../frontend/views/settings/admin.jade | 85 +- .../frontend/views/sql/notebook-new.jade | 2 +- modules/web-console/frontend/views/sql/sql.jade | 235 +- .../frontend/views/templates/alert.jade | 2 +- .../frontend/views/templates/select.jade | 2 +- 185 files changed, 9012 insertions(+), 12322 deletions(-) ----------------------------------------------------------------------
