Merge branch 'master' into ignite-5368
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e90ee955 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e90ee955 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e90ee955 Branch: refs/heads/ignite-5368 Commit: e90ee95567c5f9525fd5cddf6c37f41a415679b7 Parents: 18f3c9b 0a6b44c Author: Igor Rudyak <[email protected]> Authored: Wed Jun 7 21:25:33 2017 -0700 Committer: Igor Rudyak <[email protected]> Committed: Wed Jun 7 21:25:33 2017 -0700 ---------------------------------------------------------------------- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + .../thin/JdbcThinAutoCloseServerCursorTest.java | 359 +++++++++++++++++++ .../jdbc/thin/JdbcThinConnectionSelfTest.java | 36 ++ .../configuration/CacheConfiguration.java | 24 ++ .../SqlConnectorConfiguration.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 1 - .../internal/jdbc/thin/JdbcThinConnection.java | 4 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 18 +- .../internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 17 +- .../internal/jdbc/thin/JdbcThinUtils.java | 7 +- .../discovery/GridDiscoveryManager.java | 32 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 6 +- .../processors/odbc/SqlListenerNioListener.java | 3 +- .../processors/odbc/jdbc/JdbcQueryCursor.java | 9 +- .../odbc/jdbc/JdbcRequestHandler.java | 21 +- .../utils/PlatformConfigurationUtils.java | 86 +++++ .../processors/query/GridQueryProcessor.java | 2 +- .../internal/processors/query/QueryUtils.java | 32 ++ .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../top/GridTopologyCommandHandler.java | 10 +- .../node/VisorExecutorServiceConfiguration.java | 20 +- .../visor/node/VisorGridConfiguration.java | 22 +- .../visor/node/VisorOdbcConfiguration.java | 114 ------ .../node/VisorSqlConnectorConfiguration.java | 166 +++++++++ .../resources/META-INF/classnames.properties | 2 +- .../ignite/internal/ClusterGroupSelfTest.java | 100 ++++++ .../top/CacheTopologyCommandHandlerTest.java | 152 ++++++++ .../testsuites/IgniteRestHandlerTestSuite.java | 2 + .../query/h2/ddl/DdlStatementsProcessor.java | 23 +- .../query/h2/sql/GridSqlQuerySplitter.java | 69 +++- .../cache/index/H2DynamicTableSelfTest.java | 37 +- .../query/IgniteSqlSplitterSelfTest.java | 47 +++ .../IgniteConfigurationSerializerTest.cs | 26 +- .../IgniteConfigurationTest.cs | 56 +++ .../Apache.Ignite.Core.csproj | 2 + .../Configuration/Package-Info.cs | 26 ++ .../Configuration/SqlConnectorConfiguration.cs | 159 ++++++++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 164 +++++++++ .../IgniteConfigurationSection.xsd | 92 +++++ .../Common/IgniteConfigurationXmlSerializer.cs | 10 + .../config/VisorConfigurationCommand.scala | 1 + modules/web-console/backend/app/mongo.js | 12 + .../modules/configuration/Version.service.js | 4 + .../generator/AbstractTransformer.js | 9 +- .../generator/ConfigurationGenerator.js | 35 +- .../generator/defaults/Cluster.service.js | 9 + .../states/configuration/caches/query.pug | 3 +- .../states/configuration/clusters/memory.pug | 9 + .../states/configuration/clusters/odbc.pug | 2 +- .../configuration/clusters/sql-connector.pug | 62 ++++ .../frontend/controllers/clusters-controller.js | 5 +- .../views/configuration/clusters.tpl.pug | 6 + 53 files changed, 1906 insertions(+), 217 deletions(-) ----------------------------------------------------------------------
