You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/10/26 22:55:11 UTC
[19/50] [abbrv] ignite git commit: Merge commit 'bba019fd' into
ignite-1.7.3
Merge commit 'bba019fd' into ignite-1.7.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3fa0124c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fa0124c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3fa0124c
Branch: refs/heads/ignite-4110
Commit: 3fa0124c554b65ffbd319c2b8b34f7e70985fbe1
Parents: d45383b bba019f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Oct 24 10:39:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Oct 24 10:39:53 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/query/SpiQuery.java | 8 +-
.../local/LocalIgfsSecondaryFileSystem.java | 90 ++-
.../processors/cache/IgniteCacheProxy.java | 34 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 62 +-
.../internal/processors/igfs/IgfsImpl.java | 11 +-
.../processors/igfs/IgfsMetaManager.java | 1 -
.../local/LocalFileSystemIgfsFile.java | 9 +-
.../secondary/local/LocalFileSystemUtils.java | 142 +++++
.../cache/CacheGetEntryAbstractTest.java | 38 ++
.../processors/cache/CachePutIfAbsentTest.java | 161 ++++++
.../CacheSerializableTransactionsTest.java | 70 +--
.../processors/cache/CacheTxFastFinishTest.java | 2 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 218 +++++++
.../cache/query/IndexingSpiQueryTxSelfTest.java | 162 ++++++
.../igfs/IgfsAbstractBaseSelfTest.java | 19 +
.../processors/igfs/IgfsAbstractSelfTest.java | 146 ++---
.../igfs/IgfsDualAbstractSelfTest.java | 42 +-
...SecondaryFileSystemDualAbstractSelfTest.java | 26 +-
...fsLocalSecondaryFileSystemProxySelfTest.java | 5 -
...IgfsLocalSecondaryFileSystemTestAdapter.java | 27 +-
.../igfs/benchmark/IgfsBenchmark.java | 561 +++++++++++++++++++
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 14 +-
.../ignite/testframework/IgniteTestSuite.java | 18 +-
.../testsuites/IgniteCacheTestSuite4.java | 2 +
...doopIgfsSecondaryFileSystemDelegateImpl.java | 3 +-
.../hadoop/impl/igfs/HadoopIgfsProperties.java | 3 +
modules/ignored-tests/pom.xml | 8 +
...gniteIgnoredBinarySimpleMapperTestSuite.java | 41 ++
.../IgniteIgnoredBinaryTestSuite.java | 42 ++
.../testsuites/IgniteIgnoredTestSuite.java | 4 +
.../IgniteCacheReplicatedQuerySelfTest.java | 4 +-
.../query/IgniteSqlSplitterSelfTest.java | 2 +
.../query/h2/sql/BaseH2CompareQueryTest.java | 3 +-
.../IgniteBinaryCacheQueryTestSuite.java | 1 -
...narySimpleNameMapperCacheQueryTestSuite.java | 2 -
.../IgniteCacheQuerySelfTestSuite.java | 8 +-
.../IgniteCacheQuerySelfTestSuite2.java | 3 +-
modules/platforms/cpp/odbc/src/odbc.cpp | 4 +-
41 files changed, 1790 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8ab70ba,64be936..1a2530e
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@@ -43,9 -38,8 +43,10 @@@ import org.apache.ignite.internal.util.
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+ import org.apache.ignite.testsuites.IgniteIgnore;
+import org.springframework.util.StringUtils;
/**
* Tests for correct distributed partitioned queries.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fa0124c/modules/platforms/cpp/odbc/src/odbc.cpp
----------------------------------------------------------------------