You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/08 00:50:51 UTC
[39/39] ignite git commit: Merge branches 'ignite-843' and 'master'
of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5625672b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5625672b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5625672b
Branch: refs/heads/ignite-843
Commit: 5625672bc4164900f2b8e1e648a84f35101cf2c2
Parents: aec68a4 f8aafe4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 8 05:49:50 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 8 05:49:50 2015 +0700
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 +-
.../messaging/MessagingPingPongExample.java | 6 +-
.../CacheClientPortableQueryExample.java | 3 -
.../messaging/MessagingPingPongExample.java | 2 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../ignite/internal/MarshallerContextImpl.java | 31 +--
.../distributed/dht/GridDhtLocalPartition.java | 51 ++++-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../distributed/near/GridNearGetFuture.java | 13 ++
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 177 +++++----------
.../cache/query/GridCacheQueryRequest.java | 59 ++++-
.../visor/cache/VisorCacheStartTask.java | 6 +-
.../messages/TcpDiscoveryClientAckResponse.java | 2 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 5 -
.../IgniteDaemonNodeMarshallerCacheTest.java | 10 +
.../IgniteCacheNodeJoinAbstractTest.java | 42 ++++
.../main/cpp/common/project/vs/common.vcxproj | 10 +-
.../platform/src/main/cpp/common/src/java.cpp | 2 +-
.../Apache.Ignite.Core/Cluster/IClusterGroup.cs | 2 +-
.../Impl/Common/DelegateTypeDescriptor.cs | 17 +-
.../Apache.Ignite.Core/Impl/Common/Future.cs | 1 +
.../Impl/Common/IFutureConverter.cs | 2 +
.../Impl/Common/IFutureInternal.cs | 1 +
.../Impl/Compute/ComputeImpl.cs | 2 +-
.../Impl/Compute/ComputeJobHolder.cs | 6 +
.../Apache.Ignite.Core/Impl/IgniteManager.cs | 2 +-
.../Impl/Memory/IPlatformMemory.cs | 3 +
.../Impl/Memory/PlatformMemory.cs | 1 +
.../Impl/Memory/PlatformMemoryManager.cs | 2 +
.../Impl/Memory/PlatformMemoryPool.cs | 1 +
.../Impl/Memory/PlatformMemoryStream.cs | 1 +
.../Impl/Memory/PlatformMemoryUtils.cs | 1 +
.../Impl/Memory/PlatformRawMemory.cs | 1 +
.../Impl/Portable/Io/PortableAbstractStream.cs | 1 -
.../Properties/AssemblyInfo.cs | 3 +-
.../platform/src/main/dotnet/Apache.Ignite.sln | 10 +
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 76 +++++++
.../src/main/dotnet/Apache.Ignite/App.config | 56 +++++
.../Config/AppSettingsConfigurator.cs | 113 ++++++++++
.../Apache.Ignite/Config/ArgsConfigurator.cs | 164 ++++++++++++++
.../Apache.Ignite/Config/ConfigValueParser.cs | 42 ++++
.../Apache.Ignite/Config/IConfigurator.cs | 34 +++
.../main/dotnet/Apache.Ignite/IgniteRunner.cs | 171 ++++++++++++++
.../Apache.Ignite/Properties/AssemblyInfo.cs | 35 +++
.../Apache.Ignite/Service/IgniteService.cs | 219 ++++++++++++++++++
.../Apache.Ignite/Service/NativeMethods.cs | 57 +++++
.../Apache.Ignite/Service/ServiceDescription.cs | 32 +++
.../Apache.Ignite.Core.Tests.csproj | 5 +-
.../Cache/CacheForkedTest.cs | 1 -
.../Forked/ForkedPortableClosureTaskTest.cs | 3 -
.../Compute/Forked/ForkedResourceTaskTest.cs | 2 +-
.../Forked/ForkedSerializableClosureTaskTest.cs | 2 +-
.../Compute/Forked/ForkedTaskAdapterTest.cs | 3 -
.../Config/Apache.Ignite.exe.config.test | 41 ++++
.../Config/Ignite.exe.config.test | 41 ----
.../native-client-test-cache-portables.xml | 226 -------------------
.../Config/native-client-test-cache.xml | 30 ---
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 39 ++--
.../IgniteStartStopTest.cs | 28 ---
.../Apache.Ignite.Core.Tests/LoadDllTest.cs | 2 +-
.../Process/IgniteProcess.cs | 33 +--
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 2 +-
parent/pom.xml | 1 +
69 files changed, 1405 insertions(+), 582 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5625672b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5625672b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 3df473e,2041464..07b6fa1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@@ -3126,25 -3057,4 +3082,4 @@@ public abstract class GridCacheQueryMan
false,
keepPortable);
}
-
- /**
- * Creates SQL fields query which will include results metadata if needed.
- *
- * @param qry SQL query.
- * @param incMeta Whether to include results metadata.
- * @param keepPortable Keep portable flag.
- * @return Created query.
- */
- public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta, boolean keepPortable) {
- assert qry != null;
-
- return new GridCacheQueryAdapter<>(cctx,
- SQL_FIELDS,
- null,
- qry,
- null,
- null,
- incMeta,
- keepPortable);
- }
-}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5625672b/parent/pom.xml
----------------------------------------------------------------------