Merge branch 'master' into ignite-4490-batch # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlArguments.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb116bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb116bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb116bf Branch: refs/heads/ignite-6022-proto Commit: eeb116bf54aa72e5fabbe419383bec3d8a2e8bb4 Parents: b87d6c3 7782d38 Author: devozerov <[email protected]> Authored: Tue Dec 19 15:15:29 2017 +0300 Committer: devozerov <[email protected]> Committed: Tue Dec 19 15:15:29 2017 +0300 ---------------------------------------------------------------------- .../processors/igfs/IgfsDataManager.java | 4 +- ...zySecondaryFileSystemPositionedReadable.java | 15 +++-- .../query/PlatformAbstractQueryCursor.java | 9 +++ .../cache/query/PlatformFieldsQueryCursor.java | 24 ++++++- .../ignite/internal/util/nio/GridNioServer.java | 59 ++++++++++------- ...fsSecondaryFileSystemPositionedReadable.java | 41 +++++++----- .../processors/query/h2/dml/DmlArguments.java | 1 - .../regression/KNNMultipleLinearRegression.java | 2 +- .../ExpiryCacheHolderTest.cs | 5 ++ .../Binary/BinaryFooterTest.cs | 2 +- .../Binary/Serializable/SqlDmlTest.cs | 6 +- .../Cache/CacheTestAsyncWrapper.cs | 7 ++ .../Cache/Query/CacheDmlQueriesTest.cs | 18 ++--- .../Query/CacheQueriesCodeConfigurationTest.cs | 2 +- .../Cache/Query/CacheQueriesTest.cs | 69 +++++++++++++++----- .../Query/Linq/CacheLinqTest.Introspection.cs | 2 +- .../Client/Cache/SqlQueryTest.cs | 4 +- .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 8 +++ .../Impl/Binary/BinaryReaderExtensions.cs | 2 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 29 +++++--- .../Impl/Cache/ICacheInternal.cs | 2 +- .../Impl/Cache/Query/FieldsQueryCursor.cs | 39 +++++++++++ .../Impl/Cache/Query/PlatformQueryQursorBase.cs | 8 +++ .../Impl/Client/Cache/CacheClient.cs | 2 +- .../Cache/Query/ClientFieldsQueryCursor.cs | 12 +--- .../NuGet/LINQPad/BinaryModeExample.linq | 2 +- .../NuGet/LINQPad/QueryExample.linq | 2 +- .../Apache.Ignite.Linq/CacheLinqExtensions.cs | 10 +-- .../Impl/CacheFieldsQueryExecutor.cs | 10 +-- modules/platforms/dotnet/Apache.Ignite.ndproj | 2 +- .../Datagrid/BinaryModeExample.cs | 5 +- .../Datagrid/QueryDmlExample.cs | 18 ++--- .../Datagrid/QueryExample.cs | 5 +- .../dotnet/examples/dotnetcore/App.config | 5 +- .../dotnet/examples/dotnetcore/SqlExample.cs | 2 +- 35 files changed, 298 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
