Merge remote-tracking branch 'remotes/origin/master' into ignite-zk-ce
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/246b7655 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/246b7655 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/246b7655 Branch: refs/heads/ignite-zk-ce Commit: 246b7655a036c792994cc7c99b1108aef4aa9c4e Parents: 1fb53f3 8f327a1 Author: sboikov <[email protected]> Authored: Tue Dec 19 10:57:34 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 19 10:57:34 2017 +0300 ---------------------------------------------------------------------- .../processors/igfs/IgfsDataManager.java | 4 +- ...zySecondaryFileSystemPositionedReadable.java | 15 +++-- .../query/PlatformAbstractQueryCursor.java | 9 +++ .../cache/query/PlatformFieldsQueryCursor.java | 24 ++++++- ...fsSecondaryFileSystemPositionedReadable.java | 41 +++++++----- .../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 +- 32 files changed, 263 insertions(+), 108 deletions(-) ----------------------------------------------------------------------
