This is an automated email from the ASF dual-hosted git repository. ptupitsyn pushed a commit to branch ignite-10754-dotnet in repository https://gitbox.apache.org/repos/asf/ignite.git
commit d53e8a355c5e68d7ed51e9b1b3b6dde8673ea309 Merge: 4e47c6a d6753c3 Author: Pavel Tupitsyn <[email protected]> AuthorDate: Tue Jan 15 23:10:47 2019 +0300 Merge branch 'ignite-10754' of https://github.com/gridgain/apache-ignite into ignite-10754-dotnet .../ignite/configuration/IgniteConfiguration.java | 34 ++ .../processors/bulkload/BulkLoadProcessor.java | 9 +- .../internal/processors/cache/QueryCursorImpl.java | 20 + .../cache/query/GridCacheQueryManager.java | 2 +- .../internal/processors/odbc/jdbc/JdbcCursor.java | 11 + .../processors/odbc/jdbc/JdbcQueryCursor.java | 7 + .../processors/odbc/jdbc/JdbcRequestHandler.java | 16 +- .../processors/query/GridQueryIndexing.java | 12 + .../processors/query/GridQueryProcessor.java | 16 + .../processors/query/QueryHistoryMetrics.java | 228 +++++++ .../processors/query/QueryHistoryMetricsKey.java | 99 ++++ .../processors/query/QueryHistoryTracker.java | 171 ++++++ .../processors/query/RunningQueryManager.java | 68 ++- .../IgniteClientCacheInitializationFailTest.java | 10 +- .../cache/query/RegisteredQueryCursor.java | 2 +- .../query/h2/DmlStatementsProcessor.java | 13 +- .../processors/query/h2/IgniteH2Indexing.java | 42 +- .../query/SqlQueryHistoryFromClientSelfTest.java | 55 ++ .../processors/query/SqlQueryHistorySelfTest.java | 658 +++++++++++++++++++++ .../IgniteBinaryCacheQueryTestSuite.java | 6 + 20 files changed, 1454 insertions(+), 25 deletions(-)
