You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/07/14 04:25:13 UTC
[1/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 1fe1e579b -> b9f2ee49d
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98181163
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98181163
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98181163
Branch: refs/heads/ignite-1232
Commit: 98181163d84189ffc9dde4f9cf8332497f16e6a4
Parents: 8ab0608 27b032e
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 30 19:45:56 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 30 19:45:56 2016 +0300
----------------------------------------------------------------------
.../integration/ClientAbstractSelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 57 ++---
.../org/apache/ignite/cache/QueryEntity.java | 18 ++
.../affinity/PlatformAffinityFunction.java | 24 ++-
.../PlatformDotNetConfigurationClosure.java | 41 ++++
.../services/PlatformAbstractService.java | 3 +-
.../handlers/cache/GridCacheCommandHandler.java | 16 +-
.../dotnet/PlatformDotNetAffinityFunction.java | 211 +++++++++++++++++++
.../processors/igfs/IgfsStreamsSelfTest.java | 5 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 1 +
...IgniteCachePrimitiveFieldsQuerySelfTest.java | 134 ++++++++++++
.../Apache.Ignite.Core.Tests.csproj | 4 +
.../Affinity/AffinityFunctionSpringTest.cs | 132 ++++++++++++
.../Cache/Affinity/AffinityFunctionTest.cs | 26 +++
.../Cache/Query/CacheLinqTest.cs | 7 +-
.../Compute/ComputeApiTest.cs | 42 ++--
.../Config/Cache/Affinity/affinity-function.xml | 87 ++++++++
.../Services/ServicesTest.cs | 1 +
.../Apache.Ignite.Core.Tests/TestRunner.cs | 2 +-
.../Cache/Affinity/AffinityFunctionBase.cs | 13 ++
.../dotnet/Apache.Ignite.Core/Ignition.cs | 41 ++--
.../Impl/Cache/Store/CacheStore.cs | 4 +-
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 12 +-
.../Impl/Services/Services.cs | 17 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 15 +-
.../cache/websession/WebSessionFilter.java | 7 +-
.../ignite/cache/websession/WebSessionV2.java | 10 +-
27 files changed, 838 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
[7/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18c61411
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18c61411
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18c61411
Branch: refs/heads/ignite-1232
Commit: 18c614110fdf4b31eda34377df9daa326ecbe00d
Parents: a19a817 1a612fa
Author: sboikov <sb...@gridgain.com>
Authored: Sat Jul 9 09:44:18 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Sat Jul 9 09:44:18 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 25 +
.../processors/cache/GridCacheAdapter.java | 215 ++++++-
.../processors/cache/GridCacheProxyImpl.java | 36 ++
.../processors/cache/IgniteCacheProxy.java | 40 ++
.../processors/cache/IgniteInternalCache.java | 23 +
.../cache/IgniteCacheAtomicPeekModesTest.java | 2 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 463 ++++++++++++++-
.../multijvm/IgniteCacheProcessProxy.java | 46 +-
.../query/h2/opt/GridH2TreeIndex.java | 33 ++
.../query/h2/sql/GridSqlQuerySplitter.java | 2 -
.../IgniteCacheCrossCacheJoinRandomTest.java | 371 ++++++++++++
...iteCacheDistributedJoinCollocatedAndNot.java | 365 ++++++++++++
...ributedJoinPartitionedAndReplicatedTest.java | 171 +++---
...CacheDistributedJoinQueryConditionsTest.java | 588 +++++++++++++++++++
.../IgniteCacheDistributedJoinQueryTest.java | 572 ------------------
...teCacheJoinPartitionedAndReplicatedTest.java | 28 +-
.../cache/IgniteCacheJoinQueryTest.java | 563 ------------------
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 563 ++++++++++++++++++
.../cache/IgniteCrossCachesJoinsQueryTest.java | 7 +-
.../IgniteCacheQuerySelfTestSuite.java | 16 +-
20 files changed, 2902 insertions(+), 1227 deletions(-)
----------------------------------------------------------------------
[8/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d3d9b47
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d3d9b47
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d3d9b47
Branch: refs/heads/ignite-1232
Commit: 8d3d9b4714be175b88206784afd5dfeda340bf20
Parents: 18c6141 1fe1e57
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 13 08:39:19 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 13 08:39:19 2016 +0300
----------------------------------------------------------------------
.../jdbc/TcpDiscoveryJdbcIpFinderSelfTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 17 +
.../query/h2/opt/GridH2SpatialIndex.java | 24 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../query/h2/opt/GridH2CollocationModel.java | 4 +-
.../query/h2/opt/GridH2IndexBase.java | 20 +-
.../query/h2/opt/GridH2QueryContext.java | 7 +
.../query/h2/opt/GridH2RowDescriptor.java | 8 +-
.../processors/query/h2/opt/GridH2Table.java | 4 +-
.../query/h2/opt/GridH2TreeIndex.java | 47 +-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +
.../IgniteCacheCrossCacheJoinRandomTest.java | 136 ++--
...iteCacheDistributedJoinCollocatedAndNot.java | 365 ----------
...acheDistributedJoinCollocatedAndNotTest.java | 360 ++++++++++
.../IgniteCacheDistributedJoinNoIndexTest.java | 262 +++++++
...ributedJoinPartitionedAndReplicatedTest.java | 6 +-
...CacheDistributedJoinQueryConditionsTest.java | 18 +-
.../cache/IgniteCacheJoinNoIndexTest.java | 248 -------
...PartitionedAndReplicatedCollocationTest.java | 2 +
...teCacheJoinPartitionedAndReplicatedTest.java | 6 +-
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 4 +
.../cache/IgniteCrossCachesJoinsQueryTest.java | 689 +++++++++----------
.../query/IgniteSqlSplitterSelfTest.java | 393 ++++++++++-
.../h2/sql/AbstractH2CompareQueryTest.java | 4 +-
.../IgniteCacheQuerySelfTestSuite.java | 12 +-
26 files changed, 1569 insertions(+), 1093 deletions(-)
----------------------------------------------------------------------
[9/9] ignite git commit: ignite-1232
Posted by sb...@apache.org.
ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9f2ee49
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9f2ee49
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9f2ee49
Branch: refs/heads/ignite-1232
Commit: b9f2ee49dc558373e71ffb5b82fd054724d9f5b9
Parents: 8d3d9b4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 13 14:43:04 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 14 07:24:51 2016 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 3 ++
.../query/h2/opt/GridH2CollocationModel.java | 23 +++++++++--
.../query/h2/opt/GridH2IndexBase.java | 11 +-----
.../query/h2/opt/GridH2TreeIndex.java | 17 +++++++++
...teCacheJoinPartitionedAndReplicatedTest.java | 40 ++++++++++++++++----
.../IgniteCacheQuerySelfTestSuite.java | 2 -
6 files changed, 74 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 5d25dd4..0c1752c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1871,6 +1871,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
@Nullable @Override public <K, V> IgniteBiPredicate<K, V> forSpace(String spaceName) {
final GridCacheAdapter<Object, Object> cache = ctx.cache().internalCache(spaceName);
+ if (cache.context().isReplicated())
+ return null;
+
final GridCacheAffinityManager aff = cache.context().affinity();
if (parts != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2CollocationModel.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2CollocationModel.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2CollocationModel.java
index c11d9e0..d8757a0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2CollocationModel.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2CollocationModel.java
@@ -48,6 +48,9 @@ public final class GridH2CollocationModel {
private static final int MULTIPLIER_BROADCAST = 200;
/** */
+ private static final int MULTIPLIER_REPLICATED_NOT_LAST = 1000;
+
+ /** */
private final GridH2CollocationModel upper;
/** */
@@ -206,7 +209,7 @@ public final class GridH2CollocationModel {
if (m > maxMultiplier) {
maxMultiplier = m;
- if (maxMultiplier == MULTIPLIER_BROADCAST)
+ if (maxMultiplier == MULTIPLIER_REPLICATED_NOT_LAST)
break;
}
}
@@ -224,7 +227,7 @@ public final class GridH2CollocationModel {
GridH2Table tbl = (GridH2Table)upper.childFilters[filter].getTable();
// Backup filter is used for REPLICATED cache if this is first cache in query.
- if (!tbl.isPartitioned() && filter != 0) {
+ if (!tbl.isPartitioned()) {
type = Type.REPLICATED;
multiplier = MULTIPLIER_COLLOCATED;
@@ -236,7 +239,7 @@ public final class GridH2CollocationModel {
// to all the affinity nodes the "base" does not need to get remote results.
if (!upper.findPartitionedTableBefore(filter)) {
type = Type.PARTITIONED_COLLOCATED;
- multiplier = MULTIPLIER_COLLOCATED;
+ multiplier = upper.previousReplicated(filter) ? MULTIPLIER_REPLICATED_NOT_LAST : MULTIPLIER_COLLOCATED;
return;
}
@@ -265,6 +268,9 @@ public final class GridH2CollocationModel {
default:
throw new IllegalStateException();
}
+
+ if (upper.previousReplicated(filter))
+ multiplier = MULTIPLIER_REPLICATED_NOT_LAST;
}
}
@@ -287,6 +293,17 @@ public final class GridH2CollocationModel {
}
/**
+ * @param f Current filter.
+ * @return {@code true} If previous table is REPLICATED.
+ */
+ private boolean previousReplicated(int f) {
+ if (f > 0 && child(f - 1, true).type(true) == Type.REPLICATED)
+ return true;
+
+ return upper != null && upper.previousReplicated(filter);
+ }
+
+ /**
* @param f Filter.
* @return Affinity join type.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index 9ee417b..985d4ba 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -212,17 +212,8 @@ public abstract class GridH2IndexBase extends BaseIndex {
protected static IndexingQueryFilter threadLocalFilter(GridH2Table tbl, TableFilter tblFilter) {
GridH2QueryContext qctx = GridH2QueryContext.get();
- if (qctx != null) {
- if (!tbl.isPartitioned()) {
- if (tblFilter == null || qctx.queryType() == REPLICATED || qctx.queryType() == LOCAL)
- return null;
-
- if (tblFilter != tblFilter.getSelect().getTopFilters().get(0))
- return null;
- }
-
+ if (qctx != null)
return qctx.filter();
- }
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
index 6ac6645..5dfc8e6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
@@ -465,6 +465,23 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator<GridS
/** {@inheritDoc} */
@Override public double getCost(Session ses, int[] masks, TableFilter[] filters, int filter, SortOrder sortOrder) {
+ TableFilter tblFilter = filters[filter];
+
+ if (false && tblFilter.getJoin() != null) {
+ GridH2Table tbl = (GridH2Table)tblFilter.getTable();
+
+ TableFilter join = tblFilter.getJoin();
+
+ if (!tbl.isPartitioned() && join.isJoinOuter() && join.getTable() instanceof GridH2Table) {
+ GridH2Table joinTbl = (GridH2Table)join.getTable();
+
+ if (joinTbl.isPartitioned())
+ throw new CacheException("Outer join REPLICATED PARTITIONED table [replCache=" + tbl.spaceName() +
+ ", partCache=" + joinTbl.spaceName() + ", sql=" + tblFilter.getSelect().getPlanSQL() + ']');
+ }
+ }
+
+
long rowCnt = getRowCountApproximation();
double baseCost = getCostRangeIndex(masks, rowCnt, filters, filter, sortOrder, false);
int mul = getDistributedMultiplier(ses, filters, filter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
index 9ba35d3..1d528c9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
@@ -17,9 +17,6 @@
package org.apache.ignite.internal.processors.cache;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.QueryEntity;
@@ -32,8 +29,15 @@ import org.apache.ignite.internal.util.typedef.internal.S;
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 javax.cache.CacheException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -101,6 +105,8 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr
{
CacheConfiguration ccfg = configuration(ORG_CACHE_REPLICATED);
+ ccfg.setCacheMode(REPLICATED);
+
QueryEntity entity = new QueryEntity();
entity.setKeyType(Integer.class.getName());
entity.setValueType(Organization.class.getName());
@@ -193,10 +199,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr
checkQuery("select p.name from \"person\".Person p", personCache, 2);
checkQuery("select o.name, p._key, p.name " +
- "from \"person\".Person p left join \"org\".Organization o " +
- "on (p.orgId = o.id)", orgCache, 2);
-
- checkQuery("select o.name, p._key, p.name " +
"from \"org\".Organization o left join \"person\".Person p " +
"on (p.orgId = o.id)", orgCache, 2);
@@ -207,6 +209,30 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr
checkQuery("select o.name, p._key, p.name " +
"from \"orgRepl\".Organization o left join \"person\".Person p " +
"on (p.orgId = o.id)", orgCacheRepl, 2);
+
+ checkQueryFails("select o.name, p._key, p.name " +
+ "from \"person\".Person p left join \"org\".Organization o " +
+ "on (p.orgId = o.id)", personCache);
+
+ checkQueryFails("select o.name, p._key, p.name " +
+ "from \"org\".Organization o right join \"person\".Person p " +
+ "on (p.orgId = o.id)", personCache);
+ }
+
+ /**
+ * @param sql SQL.
+ * @param cache Cache.
+ */
+ private void checkQueryFails(final String sql, final IgniteCache<Object, Object> cache) {
+ GridTestUtils.assertThrows(log, new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ SqlFieldsQuery qry = new SqlFieldsQuery(sql);
+
+ cache.query(qry).getAll();
+
+ return null;
+ }
+ }, CacheException.class, null);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9f2ee49/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 50bf51c..951522a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.processors.cache.IgniteBinaryWrappedObjectFiel
import org.apache.ignite.internal.processors.cache.IgniteCacheCollocatedQuerySelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheDistributedJoinCollocatedAndNotTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheDistributedJoinCustomAffinityMapper;
import org.apache.ignite.internal.processors.cache.IgniteCacheDistributedJoinPartitionedAndReplicatedTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheDistributedJoinQueryConditionsTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheDuplicateEntityConfigurationSelfTest;
@@ -131,7 +130,6 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheDistributedJoinQueryConditionsTest.class);
suite.addTestSuite(IgniteCacheJoinPartitionedAndReplicatedTest.class);
suite.addTestSuite(IgniteCacheDistributedJoinNoIndexTest.class);
- suite.addTestSuite(IgniteCacheDistributedJoinCustomAffinityMapper.class);
suite.addTestSuite(IgniteCrossCachesJoinsQueryTest.class);
suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
[3/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91bce875
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91bce875
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91bce875
Branch: refs/heads/ignite-1232
Commit: 91bce875f3f3b7ed10738fa93effbc389bc57313
Parents: 4940f24 6491e89
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 5 06:37:54 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 5 06:37:54 2016 +0300
----------------------------------------------------------------------
.../messages/GridQueryNextPageResponse.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +
.../query/h2/opt/GridH2CollocationModel.java | 14 +-
.../query/h2/twostep/msg/GridH2RowRange.java | 2 +-
...ributedJoinPartitionedAndReplicatedTest.java | 315 ++++++++++++++
.../IgniteCacheDistributedJoinQueryTest.java | 6 +-
.../cache/IgniteCacheJoinNoIndexTest.java | 2 +-
...teCacheJoinPartitionedAndReplicatedTest.java | 314 --------------
.../cache/IgniteCrossCachesJoinsQueryTest.java | 414 ++++++++++++-------
.../query/IgniteSqlSplitterSelfTest.java | 79 ++++
.../h2/sql/AbstractH2CompareQueryTest.java | 33 +-
11 files changed, 706 insertions(+), 481 deletions(-)
----------------------------------------------------------------------
[6/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a19a8174
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a19a8174
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a19a8174
Branch: refs/heads/ignite-1232
Commit: a19a81742cf3774ea744e7bd79c4fe90a99c1e94
Parents: 38dfb3f b7826b2
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jul 7 21:26:52 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 7 21:26:52 2016 +0300
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 8 +-
assembly/LICENSE_HADOOP | 6 -
bin/include/hadoop-classpath.bat | 73 --
bin/include/hadoop-classpath.sh | 65 --
bin/include/setenv.bat | 4 +-
bin/include/setenv.sh | 25 +-
examples/pom-standalone-lgpl.xml | 6 +-
examples/pom-standalone.xml | 6 +-
examples/pom.xml | 6 +-
examples/schema-import/pom-standalone.xml | 6 +-
examples/schema-import/pom.xml | 6 +-
modules/cassandra/pom.xml | 4 +-
.../store/cassandra/common/package-info.java | 21 +
.../cassandra/datasource/package-info.java | 21 +
.../cache/store/cassandra/package-info.java | 21 +
.../cassandra/persistence/package-info.java | 21 +
.../cassandra/serializer/package-info.java | 21 +
.../store/cassandra/session/package-info.java | 21 +
.../cassandra/session/pool/package-info.java | 21 +
.../store/cassandra/utils/package-info.java | 21 +
.../tests/load/cassandra/package-info.java | 21 +
.../ignite/tests/load/ignite/package-info.java | 21 +
.../apache/ignite/tests/load/package-info.java | 21 +
.../org/apache/ignite/tests/package-info.java | 21 +
.../apache/ignite/tests/pojos/package-info.java | 21 +
.../apache/ignite/tests/utils/package-info.java | 21 +
.../integration/ClientAbstractSelfTest.java | 4 +-
modules/core/pom.xml | 6 +-
.../org/apache/ignite/IgniteDataStreamer.java | 5 +-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../ignite/binary/BinaryObjectBuilder.java | 11 +
.../configuration/HadoopConfiguration.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 73 +-
.../ignite/internal/binary/BinaryContext.java | 85 +-
.../internal/binary/BinaryEnumObjectImpl.java | 9 +-
.../ignite/internal/binary/BinaryObjectEx.java | 11 +
.../internal/binary/BinaryObjectExImpl.java | 4 +-
.../internal/binary/BinaryObjectImpl.java | 8 +-
.../binary/BinaryObjectOffheapImpl.java | 8 +-
.../ignite/internal/binary/BinaryTypeProxy.java | 111 ++
.../ignite/internal/binary/BinaryUtils.java | 35 +-
.../processors/cache/GridCacheAdapter.java | 4 +
.../processors/cache/GridCacheContext.java | 7 +
.../processors/cache/GridCacheIoManager.java | 150 ++-
.../processors/cache/GridCacheMessage.java | 9 +
.../GridCachePartitionExchangeManager.java | 103 ++
.../cache/GridCacheSharedContext.java | 68 ++
.../processors/cache/GridCacheUtils.java | 21 +
.../binary/CacheObjectBinaryProcessorImpl.java | 3 +-
.../distributed/GridCacheTxRecoveryFuture.java | 70 +-
.../distributed/GridCacheTxRecoveryRequest.java | 7 +
.../GridCacheTxRecoveryResponse.java | 7 +
.../distributed/GridDistributedLockRequest.java | 6 +
.../GridDistributedLockResponse.java | 6 +
.../GridDistributedTxFinishRequest.java | 7 +
.../GridDistributedTxFinishResponse.java | 7 +
.../GridDistributedTxPrepareRequest.java | 6 +
.../GridDistributedTxPrepareResponse.java | 7 +
.../GridDistributedUnlockRequest.java | 6 +
.../distributed/dht/GridDhtLockFuture.java | 59 +-
.../dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 77 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 92 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 27 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 122 +-
.../dht/atomic/GridDhtAtomicCache.java | 138 ++-
.../GridDhtAtomicDeferredUpdateResponse.java | 7 +
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 47 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 +
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +
.../GridNearAtomicAbstractUpdateFuture.java | 7 +-
.../GridNearAtomicSingleUpdateFuture.java | 30 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 45 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 6 +
.../atomic/GridNearAtomicUpdateResponse.java | 6 +
.../dht/colocated/GridDhtColocatedCache.java | 10 +
.../colocated/GridDhtColocatedLockFuture.java | 71 +-
.../GridDhtPartitionsExchangeFuture.java | 3 +
.../near/GridNearOptimisticTxPrepareFuture.java | 33 +
.../GridNearPessimisticTxPrepareFuture.java | 34 +-
.../near/GridNearTxFinishFuture.java | 91 +-
.../near/GridNearTxPrepareFutureAdapter.java | 7 +-
.../cache/transactions/IgniteTxHandler.java | 286 +++--
.../processors/hadoop/HadoopNoopProcessor.java | 5 +
.../hadoop/HadoopProcessorAdapter.java | 7 +
.../platform/PlatformAbstractBootstrap.java | 5 +
.../processors/platform/PlatformBootstrap.java | 6 +
.../processors/platform/PlatformIgnition.java | 7 +-
.../affinity/PlatformAffinityFunction.java | 154 ++-
.../PlatformAffinityFunctionTarget.java | 113 ++
.../cache/affinity/PlatformAffinityUtils.java | 113 ++
.../callback/PlatformCallbackGateway.java | 16 +-
.../callback/PlatformCallbackUtils.java | 13 +-
.../dotnet/PlatformDotNetBootstrap.java | 12 +
.../PlatformDotNetConfigurationClosure.java | 8 +-
.../dotnet/PlatformDotNetConsoleStream.java | 54 +
.../utils/PlatformConfigurationUtils.java | 96 +-
.../processors/query/GridQueryProcessor.java | 4 +-
.../service/GridServiceProcessor.java | 2 +-
.../util/nio/GridNioRecoveryDescriptor.java | 19 +-
.../ignite/internal/util/nio/GridNioServer.java | 47 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../visor/cache/VisorCachePartitionsTask.java | 2 +-
.../visor/compute/VisorGatewayTask.java | 2 +-
.../ignite/internal/visor/igfs/VisorIgfs.java | 2 +-
.../internal/visor/igfs/VisorIgfsMetrics.java | 11 +-
.../visor/node/VisorNodeDataCollectorTask.java | 26 -
.../dotnet/PlatformDotNetAffinityFunction.java | 89 +-
.../communication/tcp/TcpCommunicationSpi.java | 163 ++-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 109 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 45 +-
.../resources/META-INF/classnames.properties | 165 ++-
modules/core/src/test/config/log4j-test.xml | 6 +
.../IgniteCountDownLatchAbstractSelfTest.java | 2 -
...gniteCacheMessageRecoveryIdleConnection.java | 154 +++
.../service/IgniteServiceReassignmentTest.java | 250 ++++
.../tcp/TcpDiscoveryMultiThreadedTest.java | 222 ++++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 63 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
modules/flume/README.txt | 2 +-
.../IgniteHadoopClientProtocolProvider.java | 1 +
.../processors/hadoop/HadoopAttributes.java | 168 +++
.../processors/hadoop/HadoopClassLoader.java | 73 +-
.../processors/hadoop/HadoopClasspathMain.java | 44 +
.../processors/hadoop/HadoopClasspathUtils.java | 295 +++++
.../processors/hadoop/HadoopLocations.java | 123 ++
.../processors/hadoop/HadoopProcessor.java | 118 +-
.../processors/query/h2/IgniteH2Indexing.java | 10 +-
.../query/h2/opt/GridH2QueryContext.java | 24 +-
.../processors/query/h2/opt/GridH2Table.java | 4 +-
.../query/h2/opt/GridH2TreeIndex.java | 26 +-
...ributedJoinPartitionedAndReplicatedTest.java | 36 +-
.../IgniteCacheDistributedJoinQueryTest.java | 43 +
...PartitionedAndReplicatedCollocationTest.java | 397 +++++++
...teCacheJoinPartitionedAndReplicatedTest.java | 42 +
.../h2/sql/AbstractH2CompareQueryTest.java | 32 +-
modules/kafka/README.txt | 4 +-
.../include/ignite/binary/binary_containers.h | 6 +-
.../include/ignite/binary/binary_raw_reader.h | 6 +-
.../include/ignite/binary/binary_reader.h | 6 +-
.../ignite/impl/binary/binary_reader_impl.h | 11 +-
.../ignite/impl/binary/binary_writer_impl.h | 2 +-
modules/platforms/cpp/common/Makefile.am | 5 +-
.../platforms/cpp/common/include/Makefile.am | 19 +-
.../common/include/ignite/common/big_integer.h | 523 +++++++++
.../cpp/common/include/ignite/common/bits.h | 218 ++++
.../cpp/common/include/ignite/common/decimal.h | 527 +++++++++
.../include/ignite/common/default_allocator.h | 95 ++
.../include/ignite/common/dynamic_size_array.h | 415 +++++++
.../include/ignite/common/fixed_size_array.h | 288 +++++
.../cpp/common/include/ignite/common/utils.h | 81 +-
.../platforms/cpp/common/include/ignite/guid.h | 4 +-
.../cpp/common/os/win/src/common/utils.cpp | 21 -
.../cpp/common/project/vs/common.vcxproj | 17 +-
.../common/project/vs/common.vcxproj.filters | 27 +
.../cpp/common/src/common/big_integer.cpp | 830 +++++++++++++
.../platforms/cpp/common/src/common/bits.cpp | 233 ++++
.../platforms/cpp/common/src/common/decimal.cpp | 275 +++++
modules/platforms/cpp/core-test/Makefile.am | 4 +
.../cpp/core-test/project/vs/core-test.vcxproj | 9 +-
.../project/vs/core-test.vcxproj.filters | 14 +-
.../platforms/cpp/core-test/src/bits_test.cpp | 124 ++
.../cpp/core-test/src/decimal_test.cpp | 1101 ++++++++++++++++++
.../core-test/src/dynamic_size_array_test.cpp | 360 ++++++
.../cpp/core-test/src/fixed_size_array_test.cpp | 208 ++++
.../cpp/core/include/ignite/cache/cache_entry.h | 2 +-
.../cpp/jni/include/ignite/jni/exports.h | 3 +
.../platforms/cpp/jni/include/ignite/jni/java.h | 10 +-
modules/platforms/cpp/jni/project/vs/module.def | 2 +
modules/platforms/cpp/jni/src/exports.cpp | 8 +
modules/platforms/cpp/jni/src/java.cpp | 64 +-
modules/platforms/cpp/odbc-test/Makefile.am | 1 -
.../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 -
.../project/vs/odbc-test.vcxproj.filters | 3 -
.../src/application_data_buffer_test.cpp | 35 +-
.../platforms/cpp/odbc-test/src/row_test.cpp | 5 +-
modules/platforms/cpp/odbc/Makefile.am | 1 -
modules/platforms/cpp/odbc/include/Makefile.am | 1 -
.../ignite/odbc/app/application_data_buffer.h | 11 +-
.../cpp/odbc/include/ignite/odbc/decimal.h | 137 ---
.../cpp/odbc/include/ignite/odbc/utility.h | 12 +-
.../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 -
.../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 -
.../odbc/src/app/application_data_buffer.cpp | 165 ++-
.../platforms/cpp/odbc/src/app/parameter.cpp | 6 +-
modules/platforms/cpp/odbc/src/column.cpp | 6 +-
modules/platforms/cpp/odbc/src/connection.cpp | 1 -
modules/platforms/cpp/odbc/src/decimal.cpp | 135 ---
modules/platforms/cpp/odbc/src/odbc.cpp | 3 -
modules/platforms/cpp/odbc/src/utility.cpp | 25 +-
.../Apache.Ignite.Core.Tests.csproj | 1 +
.../Affinity/AffinityFunctionSpringTest.cs | 64 +-
.../Cache/Affinity/AffinityFunctionTest.cs | 209 +++-
.../Config/Cache/Affinity/affinity-function.xml | 40 +
.../ConsoleRedirectTest.cs | 177 +++
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 4 +-
.../Apache.Ignite.Core.Tests/TestRunner.cs | 23 +-
.../Apache.Ignite.Core.csproj | 3 +
.../Cache/Affinity/AffinityFunctionBase.cs | 126 +-
.../Cache/Affinity/AffinityFunctionContext.cs | 14 +-
.../Cache/Affinity/Fair/FairAffinityFunction.cs | 4 +
.../Rendezvous/RendezvousAffinityFunction.cs | 4 +
.../Cache/Configuration/CacheConfiguration.cs | 5 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 6 +-
.../Impl/Binary/BinaryReaderExtensions.cs | 14 +
.../Impl/Binary/Marshaller.cs | 1 +
.../Affinity/AffinityFunctionSerializer.cs | 277 +++++
.../Cache/Affinity/PlatformAffinityFunction.cs | 74 ++
.../Impl/Common/ObjectInfoHolder.cs | 86 ++
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 21 +
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 6 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 87 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 16 +
modules/yardstick/pom.xml | 46 +-
.../IgniteCacheRandomOperationBenchmark.java | 147 ++-
.../yardstick/cache/load/model/ModelUtil.java | 6 +-
parent/pom.xml | 1 -
219 files changed, 11832 insertions(+), 1743 deletions(-)
----------------------------------------------------------------------
[5/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38dfb3f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38dfb3f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38dfb3f9
Branch: refs/heads/ignite-1232
Commit: 38dfb3f9c5f7418312c7886d70ff85e4becbad1b
Parents: 4c4b5cb 3fd608e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 6 18:40:18 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 6 18:40:18 2016 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/opt/GridH2TreeIndex.java | 4 ++--
.../cache/IgniteCacheDistributedJoinQueryTest.java | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c4b5cb4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c4b5cb4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c4b5cb4
Branch: refs/heads/ignite-1232
Commit: 4c4b5cb491fd47aa51a98147da743125ab75d4c3
Parents: 91bce87 5fd2793
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 5 18:46:02 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 5 18:46:02 2016 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 322 ++++++-------
.../cache/GridCacheAbstractMetricsSelfTest.java | 2 +-
.../cache/GridCacheAbstractSelfTest.java | 113 ++---
.../GridCacheInterceptorAbstractSelfTest.java | 2 +-
.../processors/cache/H2CacheStoreStrategy.java | 468 +++++++++++++++++++
.../IgniteCacheConfigVariationsFullApiTest.java | 279 +++++------
.../IgniteCacheReadThroughEvictionSelfTest.java | 2 +-
.../processors/cache/MapCacheStoreStrategy.java | 145 ++++++
.../cache/TestCacheStoreStrategy.java | 96 ++++
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 170 +++----
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 2 +-
.../configvariations/ConfigVariations.java | 6 +-
...IgniteCacheConfigVariationsAbstractTest.java | 67 +--
.../junits/common/GridCommonAbstractTest.java | 12 +-
.../multijvm/IgniteCacheProcessProxy.java | 109 +++--
...teCacheJoinPartitionedAndReplicatedTest.java | 248 ++++++++++
.../cache/IgniteCacheQueryIndexSelfTest.java | 2 +-
.../cache/IgniteCacheUnionDuplicatesTest.java | 151 ++++++
.../h2/sql/AbstractH2CompareQueryTest.java | 2 +-
.../org/apache/ignite/spark/IgniteContext.scala | 8 +-
.../org/apache/ignite/spark/IgniteRDD.scala | 10 +-
.../apache/ignite/spark/JavaIgniteContext.scala | 2 +-
.../org/apache/ignite/spark/JavaIgniteRDD.scala | 6 +-
.../ignite/spark/impl/IgniteAbstractRDD.scala | 2 +-
.../apache/ignite/spark/impl/IgniteSqlRDD.scala | 2 +-
.../org/apache/ignite/spark/IgniteRDDSpec.scala | 38 +-
.../yardstick/IgniteBenchmarkArguments.java | 11 +
.../ignite/yardstick/IgniteBenchmarkUtils.java | 22 +
.../IgniteSqlQueryDistributedJoinBenchmark.java | 163 +++++++
29 files changed, 1832 insertions(+), 630 deletions(-)
----------------------------------------------------------------------
[2/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1232' into ignite-1232
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4940f241
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4940f241
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4940f241
Branch: refs/heads/ignite-1232
Commit: 4940f241af0bb2c35416f4034e8747e94ae5b62b
Parents: 9818116 407b306
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 4 11:54:52 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 4 11:54:52 2016 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheJoinPartitionedAndReplicatedTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------