ignite git commit: merge from master
Repository: ignite Updated Branches: refs/heads/ignite-comm-balance-master ecd727c4d -> 983c9bd48 merge from master Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/983c9bd4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/983c9bd4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/983c9bd4 Branch: refs/heads/ignite-comm-balance-master Commit: 983c9bd48965de0696b697c106f8cfbf855004cf Parents: ecd727c Author: Yakov ZhdanovAuthored: Tue Jan 17 18:56:37 2017 +0300 Committer: Yakov Zhdanov Committed: Tue Jan 17 18:56:37 2017 +0300 -- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java| 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/983c9bd4/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index be79414..9601ab1 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1125,7 +1125,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter if (usePairedConnections == null) { // If not set, by default should be true for server and false for client. -usePairedConnections = !ignite.configuration().isClientMode(); +Boolean clientMode = ignite.configuration().isClientMode(); + +usePairedConnections = !clientMode; + +connectionsPerNode = clientMode ? 1 : 2; } } } @@ -3324,7 +3328,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter * @return {@code True} if given node supports multiple connections per-node for communication. */ private boolean useMultipleConnections(ClusterNode node) { -return node.version().compareToIgnoreTimestamp(MULTIPLE_CONN_SINCE_VER) >= 0; +return node.version().compareToIgnoreTimestamp(MULTIPLE_CONN_SINCE_VER) >= 0 && !node.isClient(); } /**
[2/2] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x
Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8c77533 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8c77533 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8c77533 Branch: refs/heads/ignite-3477 Commit: f8c7753395a6cf9c4948ebb32f1e0260e92d0915 Parents: b721d73d 7db65dd Author: Alexey GoncharukAuthored: Tue Jan 17 20:52:42 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 20:52:42 2017 +0300 -- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectImpl.java | 5 + .../binary/BinaryObjectOffheapImpl.java | 5 + .../apache/ignite/internal/pagemem/Page.java| 11 +- .../ignite/internal/pagemem/PageMemory.java | 9 +- .../ignite/internal/pagemem/PageUtils.java | 185 ++ .../pagemem/impl/PageMemoryNoStoreImpl.java | 134 ++-- .../internal/pagemem/impl/PageNoStoreImpl.java | 91 +-- .../delta/DataPageInsertFragmentRecord.java | 8 +- .../wal/record/delta/DataPageInsertRecord.java | 8 +- .../wal/record/delta/DataPageRemoveRecord.java | 8 +- .../delta/DataPageSetFreeListPageRecord.java| 8 +- .../wal/record/delta/FixCountRecord.java| 8 +- .../record/delta/FixLeftmostChildRecord.java| 8 +- .../pagemem/wal/record/delta/FixRemoveId.java | 8 +- .../wal/record/delta/InitNewPageRecord.java | 8 +- .../wal/record/delta/InnerReplaceRecord.java| 4 +- .../pagemem/wal/record/delta/InsertRecord.java | 5 +- .../pagemem/wal/record/delta/MergeRecord.java | 3 +- .../wal/record/delta/MetaPageAddRootRecord.java | 8 +- .../wal/record/delta/MetaPageCutRootRecord.java | 7 +- .../wal/record/delta/MetaPageInitRecord.java| 14 +- .../record/delta/MetaPageInitRootRecord.java| 9 +- .../delta/MetaPageUpdateLastAllocatedIndex.java | 10 +- ...aPageUpdateLastSuccessfulFullSnapshotId.java | 8 +- .../MetaPageUpdateLastSuccessfulSnapshotId.java | 8 +- .../delta/MetaPageUpdateNextSnapshotId.java | 8 +- .../MetaPageUpdatePartitionDataRecord.java | 12 +- .../wal/record/delta/NewRootInitRecord.java | 6 +- .../wal/record/delta/PageDeltaRecord.java | 7 +- .../delta/PageListMetaResetCountRecord.java | 8 +- .../record/delta/PagesListAddPageRecord.java| 8 +- .../delta/PagesListInitNewPageRecord.java | 10 +- .../record/delta/PagesListRemovePageRecord.java | 8 +- .../record/delta/PagesListSetNextRecord.java| 8 +- .../delta/PagesListSetPreviousRecord.java | 8 +- .../pagemem/wal/record/delta/RecycleRecord.java | 6 +- .../pagemem/wal/record/delta/RemoveRecord.java | 12 +- .../pagemem/wal/record/delta/ReplaceRecord.java | 7 +- .../record/delta/SplitExistingPageRecord.java | 8 +- .../record/delta/SplitForwardPageRecord.java| 3 +- .../record/delta/TrackingPageDeltaRecord.java | 10 +- .../internal/processors/cache/CacheObject.java | 7 + .../processors/cache/CacheObjectAdapter.java| 40 +- .../cache/CacheObjectByteArrayImpl.java | 5 + .../cache/IgniteCacheOffheapManagerImpl.java| 372 +++ .../processors/cache/database/CacheDataRow.java | 13 +- .../cache/database/CacheDataRowAdapter.java | 72 ++- .../cache/database/CacheSearchRow.java | 40 ++ .../cache/database/DataStructure.java | 36 +- .../IgniteCacheDatabaseSharedManager.java | 2 +- .../cache/database/MetadataStorage.java | 149 +++-- .../cache/database/freelist/FreeListImpl.java | 61 +- .../cache/database/freelist/PagesList.java | 212 +++ .../database/freelist/io/PagesListMetaIO.java | 71 +-- .../database/freelist/io/PagesListNodeIO.java | 117 ++-- .../cache/database/tree/BPlusTree.java | 616 ++- .../cache/database/tree/io/BPlusIO.java | 201 +++--- .../cache/database/tree/io/BPlusInnerIO.java| 71 ++- .../cache/database/tree/io/BPlusLeafIO.java | 11 +- .../cache/database/tree/io/BPlusMetaIO.java | 79 +-- .../cache/database/tree/io/CacheVersionIO.java | 46 ++ .../cache/database/tree/io/DataPageIO.java | 545 .../cache/database/tree/io/DataPagePayload.java | 64 ++ .../cache/database/tree/io/IOVersions.java | 12 +- .../cache/database/tree/io/PageIO.java | 110 +++- .../cache/database/tree/io/PageMetaIO.java | 118 ++-- .../database/tree/io/PagePartitionMetaIO.java | 67 +- .../database/tree/reuse/ReuseListImpl.java | 2 +- .../cache/database/tree/util/PageHandler.java | 135 ++-- .../database/tree/util/PageLockListener.java| 17 +- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 3 +-
[1/2] ignite git commit: ignite-gg-8.0.2.ea2 igfs test fix
Repository: ignite Updated Branches: refs/heads/ignite-3477 7db65ddd1 -> f8c775339 ignite-gg-8.0.2.ea2 igfs test fix (cherry picked from commit 9b40d0e) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b721d73d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b721d73d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b721d73d Branch: refs/heads/ignite-3477 Commit: b721d73dfe4bc5c64a9de0d93119c482a7020d79 Parents: cb60e38 Author: Dmitriy GovorukhinAuthored: Tue Jan 17 20:44:15 2017 +0300 Committer: Dmitriy Govorukhin Committed: Tue Jan 17 20:50:57 2017 +0300 -- .../processors/cache/GridCacheMapEntry.java | 31 - .../processors/cache/GridCacheProcessor.java| 9 ++-- .../cache/IgniteCacheOffheapManagerImpl.java| 48 .../query/h2/opt/GridH2TreeIndex.java | 2 +- 4 files changed, 55 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b721d73d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 9f01888..ee39ed9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -205,40 +205,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme protected void value(@Nullable CacheObject val) { assert Thread.holdsLock(this); -// In case we deal with IGFS cache, count updated data -if (cctx.cache().isIgfsDataCache() && -cctx.kernalContext().igfsHelper().isIgfsBlockKey(keyValue(false))) { -int newSize = valueLength0(val, null); -int oldSize = valueLength0(this.val, null); - -int delta = newSize - oldSize; - -if (delta != 0 && !cctx.isNear()) -cctx.cache().onIgfsDataSizeChanged(delta); -} - this.val = val; } -/** - * Isolated method to get length of IGFS block. - * - * @param val Value. - * @param valBytes Value bytes. - * @return Length of value. - */ -private int valueLength0(@Nullable CacheObject val, @Nullable IgniteBiTuple valBytes) { -byte[] bytes = val != null ? (byte[])val.value(cctx.cacheObjectContext(), false) : null; - -if (bytes != null) -return bytes.length; - -if (valBytes == null) -return 0; - -return valBytes.get1().length - (((valBytes.get2() == CacheObject.TYPE_BYTE_ARR) ? 0 : 6)); -} - /** {@inheritDoc} */ @Override public int memorySize() throws IgniteCheckedException { byte[] kb; http://git-wip-us.apache.org/repos/asf/ignite/blob/b721d73d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index be22aed..57b0d84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2037,9 +2037,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (desc == null) continue; -// requestId must be null because on different node will be different byte [] and we get duplicate discovery data -// see TcpDiscoveryNodeAddedMessage#addDiscoveryData 'Arrays.equals(curData, discoDataEntry.getValue())' -DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null, cache.name(), null); + +// RequestId must be null because on different node will be different byte [] and +// we get duplicate discovery data, for more details see +// TcpDiscoveryNodeAddedMessage#addDiscoveryData. +DynamicCacheChangeRequest req = new DynamicCacheChangeRequest( +null, cache.name(), null); req.startCacheConfiguration(desc.cacheConfiguration());
svn commit: r1779238 - /ignite/site/trunk/community/resources.html
Author: dmagda Date: Tue Jan 17 19:18:39 2017 New Revision: 1779238 URL: http://svn.apache.org/viewvc?rev=1779238=rev Log: fixed contributors name Modified: ignite/site/trunk/community/resources.html Modified: ignite/site/trunk/community/resources.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/community/resources.html?rev=1779238=1779237=1779238=diff == --- ignite/site/trunk/community/resources.html (original) +++ ignite/site/trunk/community/resources.html Tue Jan 17 19:18:39 2017 @@ -220,7 +220,7 @@ under the License. Cristian Malinescu Dmitriy Govorukhin Dmitriy Karachentsev -Edouard Shangareev +Eduard Shangareev Eduard Yuzlikeev Igor Sapego Ilya Lantukh
[2/2] ignite git commit: gg-11810
gg-11810 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/203f28f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/203f28f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/203f28f7 Branch: refs/heads/ignite-gg-11810 Commit: 203f28f7803c590628079be97544b7005a4af6df Parents: 3091863 Author: sboikovAuthored: Tue Jan 17 11:40:48 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:40:48 2017 +0300 -- .../distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java | 3 ++- .../distributed/dht/atomic/GridNearAtomicUpdateResponse.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java index 20d6e90..5fa1daa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java @@ -163,7 +163,8 @@ class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture /** {@inheritDoc} */ @Override protected void addFailedKeys(GridNearAtomicUpdateResponse updateRes, Throwable err) { -updateRes.addFailedKey(key, err); +if (key != null) +updateRes.addFailedKey(key, err); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 2e38733..b5b11db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -341,6 +341,9 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr * @param e Error cause. */ public synchronized void addFailedKey(KeyCacheObject key, Throwable e) { +assert key != null; +assert e != null; + if (failedKeys == null) failedKeys = new ConcurrentLinkedQueue<>();
[1/2] ignite git commit: gg-11810
Repository: ignite Updated Branches: refs/heads/ignite-gg-11810 fa28a2e5c -> 203f28f78 gg-11810 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30918634 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30918634 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30918634 Branch: refs/heads/ignite-gg-11810 Commit: 30918634c4b2409f5b3ff29e46b7fb3bfae281aa Parents: fa28a2e Author: sboikovAuthored: Mon Jan 16 16:58:42 2017 +0300 Committer: sboikov Committed: Mon Jan 16 16:58:42 2017 +0300 -- .../main/java/org/apache/ignite/internal/pagemem/Page.java| 7 --- .../apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java | 7 --- 2 files changed, 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/30918634/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java index 4ecad9e..2667e44 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.pagemem; -import java.nio.ByteBuffer; - /** * */ @@ -50,11 +48,6 @@ public interface Page extends AutoCloseable { /** * @return ByteBuffer for modifying the page. */ -public ByteBuffer getForWrite(); - -/** - * @return ByteBuffer for modifying the page. - */ public long getForWritePointer(); /** http://git-wip-us.apache.org/repos/asf/ignite/blob/30918634/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java index d68466f..b52df55 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java @@ -23,8 +23,6 @@ import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO; import org.apache.ignite.internal.util.typedef.internal.SB; -import java.nio.ByteBuffer; - /** * */ @@ -81,11 +79,6 @@ public class PageNoStoreImpl implements Page { } /** {@inheritDoc} */ -@Override public ByteBuffer getForWrite() { -throw new UnsupportedOperationException(); -} - -/** {@inheritDoc} */ @Override public long getForWritePointer() { int tag = PageIdUtils.tag(pageId); boolean locked = pageMem.writeLockPage(absPtr, tag);
[09/13] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2
Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c31bc1a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c31bc1a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c31bc1a Branch: refs/heads/ignite-gg-11810 Commit: 6c31bc1a59b56de5328af3d9c160e35dd7e52c34 Parents: 8f69186 6e5bfea Author: Alexey GoncharukAuthored: Mon Jan 16 21:10:08 2017 +0300 Committer: Alexey Goncharuk Committed: Mon Jan 16 21:10:08 2017 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../cache/DynamicCacheChangeRequest.java| 8 +++--- .../processors/cache/GridCacheProcessor.java| 9 --- .../ignite/spi/discovery/tcp/ServerImpl.java| 1 - .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 .../query/h2/opt/GridH2TableSelfTest.java | 8 +- 11 files changed, 56 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java --
[13/13] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/700398fc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/700398fc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/700398fc Branch: refs/heads/ignite-gg-11810 Commit: 700398fc1ce5b0c958c406174297efa14b4975e6 Parents: 203f28f e7e0d87 Author: sboikovAuthored: Tue Jan 17 11:48:38 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:48:38 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../org/apache/ignite/internal/IgnitionEx.java | 3 +- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../cache/DynamicCacheChangeRequest.java| 8 +-- .../processors/cache/GridCacheProcessor.java| 9 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 1 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 ++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 ++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 .../testsuites/IgniteCacheTestSuite5.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++ .../query/h2/opt/GridH2TableSelfTest.java | 8 ++- 16 files changed, 173 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java --
[06/13] ignite git commit: ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved
ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/166d6371 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/166d6371 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/166d6371 Branch: refs/heads/ignite-gg-11810 Commit: 166d63713c259f0b5882c41dffd3bf66d47da0fd Parents: e1b84b4 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 17:38:49 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 17:38:49 2017 +0300 -- .../processors/cache/DynamicCacheChangeRequest.java | 8 .../internal/processors/cache/GridCacheProcessor.java | 9 + .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index a3116ad..1e5ab88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@ -35,7 +35,7 @@ public class DynamicCacheChangeRequest implements Serializable { private static final long serialVersionUID = 0L; /** */ -private UUID requestId; +private UUID reqId; /** Start ID. */ private IgniteUuid deploymentId; @@ -95,8 +95,8 @@ public class DynamicCacheChangeRequest implements Serializable { * @param cacheName Cache stop name. * @param initiatingNodeId Initiating node ID. */ -public DynamicCacheChangeRequest(UUID requestId, String cacheName, UUID initiatingNodeId) { -this.requestId = requestId; +public DynamicCacheChangeRequest(UUID reqId, String cacheName, UUID initiatingNodeId) { +this.reqId = reqId; this.cacheName = cacheName; this.initiatingNodeId = initiatingNodeId; } @@ -105,7 +105,7 @@ public class DynamicCacheChangeRequest implements Serializable { * @return Request ID. */ public UUID requestId() { -return requestId; +return reqId; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 1e5fcc1..7f4fb99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2041,8 +2041,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (desc == null) continue; - -DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(UUID.randomUUID(), cache.name(), null); +// requestId must be null because on different node will be different byte [] and we get duplicate discovery data +// see TcpDiscoveryNodeAddedMessage#addDiscoveryData 'Arrays.equals(curData, discoDataEntry.getValue())' +DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null, cache.name(), null); req.startCacheConfiguration(desc.cacheConfiguration()); @@ -2068,7 +2069,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (DynamicCacheDescriptor desc : registeredCaches.values()) { DynamicCacheChangeRequest req = new DynamicCacheChangeRequest( -UUID.randomUUID(), desc.cacheConfiguration().getName(), null); +null, desc.cacheConfiguration().getName(), null); req.startCacheConfiguration(desc.cacheConfiguration()); @@ -2083,7 +2084,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (DynamicCacheDescriptor desc : registeredTemplates.values()) { DynamicCacheChangeRequest req = new DynamicCacheChangeRequest( -UUID.randomUUID(), desc.cacheConfiguration().getName(), null); +null,
[02/13] ignite git commit: Enabled tests.
Enabled tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb80830 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb80830 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb80830 Branch: refs/heads/ignite-gg-11810 Commit: beb80830c153ec529d082b3588951af43fdcff33 Parents: 81435cf Author: sboikovAuthored: Fri Jan 13 12:07:28 2017 +0300 Committer: sboikov Committed: Fri Jan 13 12:07:28 2017 +0300 -- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb80830/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index aa67011..b4d0822 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -64,8 +64,8 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTest(IgniteCacheReadThroughEvictionsVariationsSuite.suite()); suite.addTestSuite(IgniteCacheTxIteratorSelfTest.class); -//suite.addTestSuite(ClusterStatePartitionedSelfTest.class); -//suite.addTestSuite(ClusterStateReplicatedSelfTest.class); +suite.addTestSuite(ClusterStatePartitionedSelfTest.class); +suite.addTestSuite(ClusterStateReplicatedSelfTest.class); suite.addTestSuite(IgniteCachePartitionLossPolicySelfTest.class); suite.addTestSuite(CacheRebalancingSelfTest.class);
[10/13] ignite git commit: IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.
IGNITE-4518 Fixed parallel load of cache. - Fixes #1426. Signed-off-by: Andrey Novikov(cherry picked from commit 79401b2) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/393eb940 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/393eb940 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/393eb940 Branch: refs/heads/ignite-gg-11810 Commit: 393eb940eccef149fdd7a5162a533cebd225972e Parents: 6e5bfea Author: Andrey Novikov Authored: Mon Jan 16 10:33:16 2017 +0700 Committer: Andrey Novikov Committed: Tue Jan 17 13:45:26 2017 +0700 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++- 2 files changed, 66 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/393eb940/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java index 3ab112a..139f3fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java @@ -173,13 +173,15 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendLowerBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" > ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0; idx < keyCnt; idx++) { +if (idx == keyCnt - 1) +sb.a(cols[idx]).a(" > ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(cols[idx]).a(" = ? AND "); +} + +if (keyCnt != 1) sb.a("OR "); } @@ -192,13 +194,18 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendUpperBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" <= ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0, lastIdx = keyCnt - 1; idx < keyCnt; idx++) { +sb.a(cols[idx]); + +// For composite key when not all of the key columns are constrained should use < (strictly less). +if (idx == lastIdx) +sb.a(keyCnt == keyCols.size() ? " <= ? " : " < ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(" = ? AND "); +} + +if (keyCnt != 1) sb.a(" OR "); } http://git-wip-us.apache.org/repos/asf/ignite/blob/393eb940/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java index d8f75d3..4a0b1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java @@ -216,7 +216,7 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest> 2) & 1); +prnComplexStmt.setInt(2, (i >> 1) & 1); +prnComplexStmt.setInt(3, i % 2); + +prnComplexStmt.setString(4, "name"); +prnComplexStmt.setInt(5, 1000 + i * 500); + +prnComplexStmt.addBatch(); +} + +prnComplexStmt.executeBatch(); + +U.closeQuiet(prnComplexStmt); + +conn.commit(); + +U.closeQuiet(conn); + +final Collection prnComplexKeys = new ConcurrentLinkedQueue<>(); + +IgniteBiInClosure
[07/13] ignite git commit: ignite-gg-8.0.2.ea2 mute tests, link to task
ignite-gg-8.0.2.ea2 mute tests, link to task Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9bb1d90 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9bb1d90 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9bb1d90 Branch: refs/heads/ignite-gg-11810 Commit: e9bb1d900f6e65d8371cb32cbb09e79f9ccc8992 Parents: 166d637 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 18:27:51 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 18:27:51 2017 +0300 -- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +++- .../GridCacheReplicatedUnswapAdvancedSelfTest.java| 3 +++ .../local/LocalCacheOffHeapAndSwapMetricsSelfTest.java| 10 ++ .../internal/processors/query/h2/IgniteH2Indexing.java| 2 +- .../processors/query/h2/database/H2TreeIndex.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 5ad7e5c..aca01a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -615,6 +615,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMisses() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); int keyCnt = keyCount(); @@ -657,12 +659,14 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMissesOnEmptyCache() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); assertEquals("Expected 0 read", 0, cache.localMetrics().getCacheGets()); assertEquals("Expected 0 miss", 0, cache.localMetrics().getCacheMisses()); -Integer key = null; +Integer key = null; for (int i = 0; i < 1000; i++) { if (affinity(cache).isPrimary(grid(0).localNode(), i)) { @@ -709,6 +713,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testManualEvictions() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == CacheMode.PARTITIONED) http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index a1a92d4..006cb87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -69,6 +69,9 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testUnswapAdvanced() throws Exception { +//TODO GG-11141 +fail(); + Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java -- diff --git
[08/13] ignite git commit: ignite-gg-8.0.2.ea2 fix query test
ignite-gg-8.0.2.ea2 fix query test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e5bfea3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e5bfea3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e5bfea3 Branch: refs/heads/ignite-gg-11810 Commit: 6e5bfea3b71068bc4c4487e68d1d9ced4069005a Parents: e9bb1d9 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 21:09:04 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 21:09:04 2017 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../query/h2/opt/GridH2TreeIndex.java | 26 .../query/h2/opt/GridH2TableSelfTest.java | 8 +- .../query/h2/sql/GridQueryParsingTest.java | 4 +-- 4 files changed, 27 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index b464127..b47ed15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -2381,7 +2381,8 @@ public class IgnitionEx { grid = null; -stopExecutors(log); +if (log != null) +stopExecutors(log); log = null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/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 4fa8b0f..0f93f52 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 @@ -499,8 +499,8 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator find(GridSearchRowPointer lower, GridSearchRowPointer upper) throws IgniteCheckedException { -if (lower == null || upper == null) -throw new NullPointerException(); -NavigableMap subMap = -tree.subMap(lower, false, upper, false); +Collection rows; -return new GridCursorIteratorWrapper<>(subMap.values().iterator()); +if (lower == null && upper == null) +rows = tree.values(); +else if (lower != null && upper == null) +rows = tree.tailMap(lower).values(); +else if (lower == null) +rows = tree.headMap(upper).values(); +else +rows = tree.subMap(lower, true, upper, true).values(); + +return new GridCursorIteratorWrapper<>(rows.iterator()); } /** {@inheritDoc} */ @@ -532,16 +538,16 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparatorhttp://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java index 5daf415..dcb1840 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java @@ -70,6 +70,9 @@ public class GridH2TableSelfTest extends GridCommonAbstractTest { /** */ private static final String PK_NAME = "__GG_PK_"; +/** Hash. */ +private static final String HASH = "__GG_HASH"; + /** */ private static final String STR_IDX_NAME = "__GG_IDX_"; @@ -105,6 +108,7 @@ public class GridH2TableSelfTest extends GridCommonAbstractTest { IndexColumn x = tbl.indexColumn(3, SortOrder.DESCENDING); idxs.add(new GridH2TreeIndex(PK_NAME, tbl, true, F.asList(id))); +idxs.add(new GridH2TreeIndex(HASH,
[12/13] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477
Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e0d876 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e0d876 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e0d876 Branch: refs/heads/ignite-gg-11810 Commit: e7e0d876b609f3b2dabc8109471696e940ba Parents: 6c31bc1 b0ac987 Author: sboikovAuthored: Tue Jan 17 11:45:58 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:45:58 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- 4 files changed, 115 insertions(+), 24 deletions(-) --
[05/13] ignite git commit: Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite into ignite-gg-8.0.2.ea2
Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f691863 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f691863 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f691863 Branch: refs/heads/ignite-gg-11810 Commit: 8f69186343dc95aba403e12c8fb7c06a5042916a Parents: 5e289d8 e1b84b4 Author: Alexey GoncharukAuthored: Fri Jan 13 19:45:07 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:45:07 2017 +0300 -- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 +- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +-- .../ignite/internal/processors/query/h2/database/H2TreeIndex.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f691863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f691863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java --
[11/13] ignite git commit: IGNITE-4545 Added cache for router hostnames. - Fixes #1428.
IGNITE-4545 Added cache for router hostnames. - Fixes #1428. Signed-off-by: Andrey Novikov(cherry picked from commit 27ba69b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0ac987d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0ac987d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0ac987d Branch: refs/heads/ignite-gg-11810 Commit: b0ac987d3202f5796c101bfc1998e4d4dcfb2bab Parents: 393eb94 Author: Andrey Novikov Authored: Mon Jan 16 11:22:34 2017 +0700 Committer: Andrey Novikov Committed: Tue Jan 17 13:45:33 2017 +0700 -- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 2 files changed, 49 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b0ac987d/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java index 12baee0..f714e7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -85,6 +85,9 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo /** Class logger. */ private final Logger log; +/** All local enabled MACs. */ +private final Collection macs; + /** NIO server. */ private GridNioServer srv; @@ -166,6 +169,8 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo if (marshId == null && cfg.getMarshaller() == null) throw new GridClientException("Failed to start client (marshaller is not configured)."); +macs = U.allLocalMACs(); + if (cfg.getProtocol() == GridClientProtocol.TCP) { try { IgniteLogger gridLog = new JavaLogger(false); @@ -316,7 +321,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo } boolean sameHost = node.attributes().isEmpty() || -F.containsAny(U.allLocalMACs(), node.attribute(ATTR_MACS).toString().split(", ")); +F.containsAny(macs, node.attribute(ATTR_MACS).toString().split(", ")); Collection srvs = new LinkedHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b0ac987d/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java index effd5b3..97aa586 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Set; @@ -61,12 +60,18 @@ public class GridClientTopology { /** Cached last error prevented topology from update. */ private GridClientException lastError; +/** Router addresses from configuration. */ +private final String routers; + /** * Set of router addresses to infer direct connectivity * when client is working in router connection mode. * {@code null} when client is working in direct connection node. */ -private final Set routerAddrs; +private final Set routerAddrs; + +/** List of all known local MACs */ +private final Collection macsCache; /** Protocol. */ private final GridClientProtocol prot; @@ -96,8 +101,38 @@ public class GridClientTopology { metricsCache = cfg.isEnableMetricsCache(); attrCache = cfg.isEnableAttributesCache(); prot = cfg.getProtocol(); -routerAddrs = (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) ? -new HashSet<>(cfg.getRouters()) : null; + +if (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) { +
[03/13] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2
Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/049247d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/049247d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/049247d3 Branch: refs/heads/ignite-gg-11810 Commit: 049247d373d2b0197a36f133b21575462145f635 Parents: 79a546a 2254d37 Author: Alexey GoncharukAuthored: Fri Jan 13 19:06:12 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:06:12 2017 +0300 -- .../main/resources/META-INF/classnames.properties | 2 -- .../internal/ClusterNodeMetricsSelfTest.java | 2 ++ .../GridDeploymentMessageCountSelfTest.java| 3 +++ .../processors/cache/ClusterStateAbstractTest.java | 3 ++- .../IgniteCacheExpiryPolicyAbstractTest.java | 6 ++ .../testsuites/IgniteComputeGridTestSuite.java | 1 - .../main/resources/META-INF/classnames.properties | 16 +--- .../query/IgniteSqlSplitterSelfTest.java | 2 +- .../testsuites/IgniteDistributedJoinTestSuite.java | 17 + 9 files changed, 28 insertions(+), 24 deletions(-) --
[04/13] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2
Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e289d81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e289d81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e289d81 Branch: refs/heads/ignite-gg-11810 Commit: 5e289d81273f6eeac826e7f6b5c4de7df2d067ff Parents: 049247d beb8083 Author: Alexey GoncharukAuthored: Fri Jan 13 19:43:40 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:43:40 2017 +0300 -- .../util/GridCursorIteratorWrapper.java | 24 .../testsuites/IgniteCacheTestSuite5.java | 4 ++-- .../query/h2/database/H2TreeIndex.java | 3 +-- ...niteCachePartitionedFieldsQuerySelfTest.java | 8 +++ ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 ++--- .../query/h2/opt/GridH2TableSelfTest.java | 6 ++--- .../query/h2/sql/GridQueryParsingTest.java | 4 ++-- 7 files changed, 34 insertions(+), 21 deletions(-) --
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-4465 [deleted] 04504f7af
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477
Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e0d876 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e0d876 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e0d876 Branch: refs/heads/ignite-3477 Commit: e7e0d876b609f3b2dabc8109471696e940ba Parents: 6c31bc1 b0ac987 Author: sboikovAuthored: Tue Jan 17 11:45:58 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:45:58 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- 4 files changed, 115 insertions(+), 24 deletions(-) --
[05/15] ignite git commit: Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite into ignite-gg-8.0.2.ea2
Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f691863 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f691863 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f691863 Branch: refs/heads/ignite-gg-11810-1 Commit: 8f69186343dc95aba403e12c8fb7c06a5042916a Parents: 5e289d8 e1b84b4 Author: Alexey GoncharukAuthored: Fri Jan 13 19:45:07 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:45:07 2017 +0300 -- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 +- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +-- .../ignite/internal/processors/query/h2/database/H2TreeIndex.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f691863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f691863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java --
[02/15] ignite git commit: Enabled tests.
Enabled tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb80830 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb80830 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb80830 Branch: refs/heads/ignite-gg-11810-1 Commit: beb80830c153ec529d082b3588951af43fdcff33 Parents: 81435cf Author: sboikovAuthored: Fri Jan 13 12:07:28 2017 +0300 Committer: sboikov Committed: Fri Jan 13 12:07:28 2017 +0300 -- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb80830/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java index aa67011..b4d0822 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java @@ -64,8 +64,8 @@ public class IgniteCacheTestSuite5 extends TestSuite { suite.addTest(IgniteCacheReadThroughEvictionsVariationsSuite.suite()); suite.addTestSuite(IgniteCacheTxIteratorSelfTest.class); -//suite.addTestSuite(ClusterStatePartitionedSelfTest.class); -//suite.addTestSuite(ClusterStateReplicatedSelfTest.class); +suite.addTestSuite(ClusterStatePartitionedSelfTest.class); +suite.addTestSuite(ClusterStateReplicatedSelfTest.class); suite.addTestSuite(IgniteCachePartitionLossPolicySelfTest.class); suite.addTestSuite(CacheRebalancingSelfTest.class);
[07/15] ignite git commit: ignite-gg-8.0.2.ea2 mute tests, link to task
ignite-gg-8.0.2.ea2 mute tests, link to task Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9bb1d90 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9bb1d90 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9bb1d90 Branch: refs/heads/ignite-gg-11810-1 Commit: e9bb1d900f6e65d8371cb32cbb09e79f9ccc8992 Parents: 166d637 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 18:27:51 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 18:27:51 2017 +0300 -- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +++- .../GridCacheReplicatedUnswapAdvancedSelfTest.java| 3 +++ .../local/LocalCacheOffHeapAndSwapMetricsSelfTest.java| 10 ++ .../internal/processors/query/h2/IgniteH2Indexing.java| 2 +- .../processors/query/h2/database/H2TreeIndex.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 5ad7e5c..aca01a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -615,6 +615,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMisses() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); int keyCnt = keyCount(); @@ -657,12 +659,14 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testMissesOnEmptyCache() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); assertEquals("Expected 0 read", 0, cache.localMetrics().getCacheGets()); assertEquals("Expected 0 miss", 0, cache.localMetrics().getCacheMisses()); -Integer key = null; +Integer key = null; for (int i = 0; i < 1000; i++) { if (affinity(cache).isPrimary(grid(0).localNode(), i)) { @@ -709,6 +713,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testManualEvictions() throws Exception { +fail("https://issues.apache.org/jira/browse/IGNITE-4536;); + IgniteCache cache = grid(0).cache(null); if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == CacheMode.PARTITIONED) http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index a1a92d4..006cb87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -69,6 +69,9 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testUnswapAdvanced() throws Exception { +//TODO GG-11141 +fail(); + Ignite g1 = startGrid(1); Ignite g2 = startGrid(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java -- diff --git
[12/15] ignite git commit: gg-11810
gg-11810 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/203f28f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/203f28f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/203f28f7 Branch: refs/heads/ignite-gg-11810-1 Commit: 203f28f7803c590628079be97544b7005a4af6df Parents: 3091863 Author: sboikovAuthored: Tue Jan 17 11:40:48 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:40:48 2017 +0300 -- .../distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java | 3 ++- .../distributed/dht/atomic/GridNearAtomicUpdateResponse.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java index 20d6e90..5fa1daa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java @@ -163,7 +163,8 @@ class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture /** {@inheritDoc} */ @Override protected void addFailedKeys(GridNearAtomicUpdateResponse updateRes, Throwable err) { -updateRes.addFailedKey(key, err); +if (key != null) +updateRes.addFailedKey(key, err); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/203f28f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 2e38733..b5b11db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -341,6 +341,9 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr * @param e Error cause. */ public synchronized void addFailedKey(KeyCacheObject key, Throwable e) { +assert key != null; +assert e != null; + if (failedKeys == null) failedKeys = new ConcurrentLinkedQueue<>();
[04/15] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2
Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e289d81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e289d81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e289d81 Branch: refs/heads/ignite-gg-11810-1 Commit: 5e289d81273f6eeac826e7f6b5c4de7df2d067ff Parents: 049247d beb8083 Author: Alexey GoncharukAuthored: Fri Jan 13 19:43:40 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:43:40 2017 +0300 -- .../util/GridCursorIteratorWrapper.java | 24 .../testsuites/IgniteCacheTestSuite5.java | 4 ++-- .../query/h2/database/H2TreeIndex.java | 3 +-- ...niteCachePartitionedFieldsQuerySelfTest.java | 8 +++ ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 ++--- .../query/h2/opt/GridH2TableSelfTest.java | 6 ++--- .../query/h2/sql/GridQueryParsingTest.java | 4 ++-- 7 files changed, 34 insertions(+), 21 deletions(-) --
[14/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/700398fc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/700398fc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/700398fc Branch: refs/heads/ignite-gg-11810-1 Commit: 700398fc1ce5b0c958c406174297efa14b4975e6 Parents: 203f28f e7e0d87 Author: sboikovAuthored: Tue Jan 17 11:48:38 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:48:38 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../org/apache/ignite/internal/IgnitionEx.java | 3 +- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../cache/DynamicCacheChangeRequest.java| 8 +-- .../processors/cache/GridCacheProcessor.java| 9 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java| 1 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 ++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 ++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 .../testsuites/IgniteCacheTestSuite5.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++ .../query/h2/opt/GridH2TableSelfTest.java | 8 ++- 16 files changed, 173 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java --
[13/15] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477
Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7e0d876 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7e0d876 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7e0d876 Branch: refs/heads/ignite-gg-11810-1 Commit: e7e0d876b609f3b2dabc8109471696e940ba Parents: 6c31bc1 b0ac987 Author: sboikovAuthored: Tue Jan 17 11:45:58 2017 +0300 Committer: sboikov Committed: Tue Jan 17 11:45:58 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- 4 files changed, 115 insertions(+), 24 deletions(-) --
[15/15] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-11810' into ignite-gg-11810-1
Merge remote-tracking branch 'remotes/community/ignite-gg-11810' into ignite-gg-11810-1 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcfd62ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcfd62ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcfd62ac Branch: refs/heads/ignite-gg-11810-1 Commit: fcfd62ace54bb1d126120eadcad04527e023e694 Parents: 329c5cb 700398f Author: sboikovAuthored: Tue Jan 17 13:26:38 2017 +0300 Committer: sboikov Committed: Tue Jan 17 13:26:38 2017 +0300 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +++- .../org/apache/ignite/internal/IgnitionEx.java | 3 +- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 .../cache/DynamicCacheChangeRequest.java| 8 +-- .../processors/cache/GridCacheProcessor.java| 9 ++-- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 3 +- .../atomic/GridNearAtomicUpdateResponse.java| 3 ++ .../ignite/spi/discovery/tcp/ServerImpl.java| 1 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 ++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 ++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 .../testsuites/IgniteCacheTestSuite5.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++ .../query/h2/opt/GridH2TableSelfTest.java | 8 ++- 18 files changed, 178 insertions(+), 51 deletions(-) --
[10/15] ignite git commit: IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.
IGNITE-4518 Fixed parallel load of cache. - Fixes #1426. Signed-off-by: Andrey Novikov(cherry picked from commit 79401b2) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/393eb940 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/393eb940 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/393eb940 Branch: refs/heads/ignite-gg-11810-1 Commit: 393eb940eccef149fdd7a5162a533cebd225972e Parents: 6e5bfea Author: Andrey Novikov Authored: Mon Jan 16 10:33:16 2017 +0700 Committer: Andrey Novikov Committed: Tue Jan 17 13:45:26 2017 +0700 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++- 2 files changed, 66 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/393eb940/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java index 3ab112a..139f3fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java @@ -173,13 +173,15 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendLowerBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" > ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0; idx < keyCnt; idx++) { +if (idx == keyCnt - 1) +sb.a(cols[idx]).a(" > ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(cols[idx]).a(" = ? AND "); +} + +if (keyCnt != 1) sb.a("OR "); } @@ -192,13 +194,18 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendUpperBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" <= ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0, lastIdx = keyCnt - 1; idx < keyCnt; idx++) { +sb.a(cols[idx]); + +// For composite key when not all of the key columns are constrained should use < (strictly less). +if (idx == lastIdx) +sb.a(keyCnt == keyCols.size() ? " <= ? " : " < ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(" = ? AND "); +} + +if (keyCnt != 1) sb.a(" OR "); } http://git-wip-us.apache.org/repos/asf/ignite/blob/393eb940/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java index d8f75d3..4a0b1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java @@ -216,7 +216,7 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest> 2) & 1); +prnComplexStmt.setInt(2, (i >> 1) & 1); +prnComplexStmt.setInt(3, i % 2); + +prnComplexStmt.setString(4, "name"); +prnComplexStmt.setInt(5, 1000 + i * 500); + +prnComplexStmt.addBatch(); +} + +prnComplexStmt.executeBatch(); + +U.closeQuiet(prnComplexStmt); + +conn.commit(); + +U.closeQuiet(conn); + +final Collection prnComplexKeys = new ConcurrentLinkedQueue<>(); + +IgniteBiInClosure c = new CI2 () { +@Override public void apply(Object k, Object v) { +if (k instanceof PersonComplexKey && v instanceof Person) +
[10/50] [abbrv] ignite git commit: IGNITE-4405: Hadoop: implemented "readLine" method for HadoopDataInStream and HadoopDirectDataInput classes. This closes #1358.
IGNITE-4405: Hadoop: implemented "readLine" method for HadoopDataInStream and HadoopDirectDataInput classes. This closes #1358. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a61b0eaf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a61b0eaf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a61b0eaf Branch: refs/heads/ignite-3477 Commit: a61b0eaff1817d84c0659e8a7e095f29e22800e1 Parents: 7d82d6a Author: tledkov-gridgainAuthored: Wed Dec 28 14:09:38 2016 +0300 Committer: devozerov Committed: Wed Dec 28 14:09:38 2016 +0300 -- .../shuffle/direct/HadoopDirectDataInput.java | 34 +++- .../shuffle/streams/HadoopDataInStream.java | 34 +++- .../shuffle/streams/HadoopOffheapBuffer.java| 18 ++ .../streams/HadoopDataStreamSelfTest.java | 177 +-- 4 files changed, 244 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a61b0eaf/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java index e3a713a..6f0e2b0 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.hadoop.shuffle.direct; import org.apache.ignite.internal.util.GridUnsafe; +import org.apache.ignite.internal.util.typedef.internal.SB; import org.jetbrains.annotations.NotNull; import java.io.DataInput; @@ -150,8 +151,37 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public String readLine() throws IOException { -// TODO: Create ticket! -throw new UnsupportedOperationException(); +if (pos == buf.length) +return null; + +SB sb = new SB(); + +while (pos < buf.length) { +char c = (char)readByte(); + +switch (c) { +case '\n': +return sb.toString(); + +case '\r': +if (pos == buf.length) +return sb.toString(); + +c = (char)readByte(); + +if (c == '\n') +return sb.toString(); +else +pos--; + +return sb.toString(); + +default: +sb.a(c); +} +} + +return sb.toString(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a61b0eaf/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataInStream.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataInStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataInStream.java index 3b5fa15..261daee 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataInStream.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/HadoopDataInStream.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory; +import org.apache.ignite.internal.util.typedef.internal.SB; /** * Data input stream. @@ -52,6 +53,7 @@ public class HadoopDataInStream extends InputStream implements DataInput { /** * @param size Size. * @return Old pointer. + * @throws IOException On error. */ protected long move(long size) throws IOException { long ptr = buf.move(size); @@ -156,7 +158,37 @@ public class HadoopDataInStream extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public String readLine() throws IOException { -throw new UnsupportedOperationException(); +if (buf.remaining() == 0) +return null; + +SB sb = new SB(); + +while (buf.remaining() > 0) { +char c = (char)readByte(); + +switch (c) { +
[12/50] [abbrv] ignite git commit: IGNITE-4504 .NET: Expose default transaction settings on ITransactions
IGNITE-4504 .NET: Expose default transaction settings on ITransactions Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/828b9b61 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/828b9b61 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/828b9b61 Branch: refs/heads/ignite-3477 Commit: 828b9b614ba23d8316c8f0db173a2dc09a5bda27 Parents: 864af7e Author: Pavel TupitsynAuthored: Wed Dec 28 17:06:57 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Dec 28 17:06:57 2016 +0300 -- .../Cache/CacheAbstractTransactionalTest.cs | 9 + .../Impl/Transactions/TransactionsImpl.cs| 18 ++ .../Transactions/ITransactions.cs| 19 ++- 3 files changed, 45 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/828b9b61/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs index e836ba2..5dcc560 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTransactionalTest.cs @@ -399,6 +399,15 @@ namespace Apache.Ignite.Core.Tests.Cache Assert.AreEqual(TransactionIsolation.RepeatableRead, tx.Isolation); Assert.AreEqual(2500, tx.Timeout.TotalMilliseconds); Assert.AreEqual(startTime3, tx.StartTime); + +// Check defaults. +tx = Transactions.TxStart(); + +Assert.AreEqual(Transactions.DefaultTransactionConcurrency, tx.Concurrency); +Assert.AreEqual(Transactions.DefaultTransactionIsolation, tx.Isolation); +Assert.AreEqual(Transactions.DefaultTimeout, tx.Timeout); + +tx.Commit(); } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/828b9b61/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs index 6f8e5bf..5fa5db8 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Transactions/TransactionsImpl.cs @@ -158,6 +158,24 @@ namespace Apache.Ignite.Core.Impl.Transactions DoOutInOp(OpResetMetrics); } +/** */ +public TransactionConcurrency DefaultTransactionConcurrency +{ +get { return _dfltConcurrency; } +} + +/** */ +public TransactionIsolation DefaultTransactionIsolation +{ +get { return _dfltIsolation; } +} + +/** */ +public TimeSpan DefaultTimeout +{ +get { return _dfltTimeout; } +} + /// /// Commit transaction. /// http://git-wip-us.apache.org/repos/asf/ignite/blob/828b9b61/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/ITransactions.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/ITransactions.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/ITransactions.cs index ddd2b21..d3b98da 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/ITransactions.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Transactions/ITransactions.cs @@ -28,7 +28,9 @@ namespace Apache.Ignite.Core.Transactions public interface ITransactions { /// -/// Starts a transaction with default isolation, concurrency, timeout, and invalidation policy. +/// Starts a transaction with default isolation (, +/// concurrency (), timeout (), +/// and invalidation policy. /// All defaults are set in CacheConfiguration at startup. /// /// New transaction. @@ -62,6 +64,21 @@ namespace Apache.Ignite.Core.Transactions ITransaction Tx { get; } /// +/// Gets the default transaction concurrency. +/// +TransactionConcurrency DefaultTransactionConcurrency { get; } + +/// +/// Gets the default transaction isolation. +/// +TransactionIsolation DefaultTransactionIsolation { get; } + +/// +
[01/50] [abbrv] ignite git commit: Fixed Visor queries for BinaryObjects.
Repository: ignite Updated Branches: refs/heads/ignite-3477 e7e0d876b -> ca373d786 Fixed Visor queries for BinaryObjects. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5769f443 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5769f443 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5769f443 Branch: refs/heads/ignite-3477 Commit: 5769f44367cae5908cd291f226e9fccd68fe1c39 Parents: 9273e51 Author: Alexey KuznetsovAuthored: Tue Dec 27 15:14:13 2016 +0700 Committer: Alexey Kuznetsov Committed: Tue Dec 27 15:14:13 2016 +0700 -- .../query/VisorQueryScanSubstringFilter.java| 5 +- .../internal/visor/query/VisorQueryUtils.java | 60 2 files changed, 63 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5769f443/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryScanSubstringFilter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryScanSubstringFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryScanSubstringFilter.java index 43eb6dd..171698b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryScanSubstringFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryScanSubstringFilter.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.visor.query; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.lang.IgniteBiPredicate; /** @@ -52,8 +53,8 @@ public class VisorQueryScanSubstringFilter implements IgniteBiPredicate
[41/50] [abbrv] ignite git commit: IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.
IGNITE-4518 Fixed parallel load of cache. - Fixes #1426. Signed-off-by: Andrey NovikovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79401b2e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79401b2e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79401b2e Branch: refs/heads/ignite-3477 Commit: 79401b2ebf814eeffa36d41a82d1238d8eccc7e9 Parents: 6045a24 Author: Andrey Novikov Authored: Mon Jan 16 10:33:16 2017 +0700 Committer: Andrey Novikov Committed: Mon Jan 16 10:33:16 2017 +0700 -- .../store/jdbc/dialect/BasicJdbcDialect.java| 31 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++- 2 files changed, 66 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java index 3ab112a..139f3fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java @@ -173,13 +173,15 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendLowerBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" > ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0; idx < keyCnt; idx++) { +if (idx == keyCnt - 1) +sb.a(cols[idx]).a(" > ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(cols[idx]).a(" = ? AND "); +} + +if (keyCnt != 1) sb.a("OR "); } @@ -192,13 +194,18 @@ public class BasicJdbcDialect implements JdbcDialect { if (appendUpperBound) { sb.a("("); -for (int cnt = keyCols.size(); cnt > 0; cnt--) { -for (int j = 0; j < cnt; j++) -if (j == cnt - 1) -sb.a(cols[j]).a(" <= ? "); +for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) { +for (int idx = 0, lastIdx = keyCnt - 1; idx < keyCnt; idx++) { +sb.a(cols[idx]); + +// For composite key when not all of the key columns are constrained should use < (strictly less). +if (idx == lastIdx) +sb.a(keyCnt == keyCols.size() ? " <= ? " : " < ? "); else -sb.a(cols[j]).a(" = ? AND "); -if (cnt != 1) +sb.a(" = ? AND "); +} + +if (keyCnt != 1) sb.a(" OR "); } http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java index d8f75d3..4a0b1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java @@ -216,7 +216,7 @@ public class CacheJdbcPojoStoreTest extends GridAbstractCacheStoreSelfTest> 2) & 1); +prnComplexStmt.setInt(2, (i >> 1) & 1); +prnComplexStmt.setInt(3, i % 2); + +prnComplexStmt.setString(4, "name"); +prnComplexStmt.setInt(5, 1000 + i * 500); + +prnComplexStmt.addBatch(); +} + +prnComplexStmt.executeBatch(); + +U.closeQuiet(prnComplexStmt); + +conn.commit(); + +U.closeQuiet(conn); + +final Collection prnComplexKeys = new ConcurrentLinkedQueue<>(); + +IgniteBiInClosure c = new CI2 () { +@Override public void apply(Object k, Object v) { +if (k instanceof PersonComplexKey && v instanceof Person) +
[46/50] [abbrv] ignite git commit: IGNITE-4428: Hadoop: moved HadoopMapReducePlanner and dependent classes to public space. This closes #1389. This closes #1394.
IGNITE-4428: Hadoop: moved HadoopMapReducePlanner and dependent classes to public space. This closes #1389. This closes #1394. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d14e0727 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d14e0727 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d14e0727 Branch: refs/heads/ignite-3477 Commit: d14e0727b3dd61ab5ec2957133d77dbc25e9ba68 Parents: 77ca2e6 Author: tledkov-gridgainAuthored: Mon Jan 16 16:36:25 2017 +0300 Committer: devozerov Committed: Mon Jan 16 16:36:25 2017 +0300 -- .../configuration/HadoopConfiguration.java | 2 +- .../apache/ignite/hadoop/HadoopInputSplit.java | 54 +++ .../org/apache/ignite/hadoop/HadoopJob.java | 74 ++ .../ignite/hadoop/HadoopMapReducePlan.java | 80 +++ .../ignite/hadoop/HadoopMapReducePlanner.java | 40 ++ .../processors/hadoop/HadoopDefaultJobInfo.java | 4 +- .../processors/hadoop/HadoopFileBlock.java | 1 + .../processors/hadoop/HadoopInputSplit.java | 54 --- .../internal/processors/hadoop/HadoopJob.java | 107 -- .../internal/processors/hadoop/HadoopJobEx.java | 140 +++ .../processors/hadoop/HadoopJobInfo.java| 54 +++ .../processors/hadoop/HadoopMapReducePlan.java | 80 --- .../hadoop/HadoopMapReducePlanner.java | 40 -- .../processors/hadoop/HadoopTaskContext.java| 6 +- .../processors/hadoop/HadoopTaskInfo.java | 1 + .../hadoop/counter/HadoopCounterWriter.java | 4 +- .../resources/META-INF/classnames.properties| 4 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 6 +- .../IgniteHadoopWeightedMapReducePlanner.java | 10 +- .../planner/HadoopAbstractMapReducePlanner.java | 118 .../planner/HadoopTestRoundRobinMrPlanner.java | 75 ++ .../processors/hadoop/HadoopCommonUtils.java| 1 + .../processors/hadoop/HadoopContext.java| 2 + .../processors/hadoop/HadoopExternalSplit.java | 1 + .../processors/hadoop/HadoopSplitWrapper.java | 1 + .../HadoopFileSystemCounterWriterDelegate.java | 4 +- ...doopFileSystemCounterWriterDelegateImpl.java | 4 +- .../hadoop/impl/v1/HadoopV1MapTask.java | 6 +- .../hadoop/impl/v1/HadoopV1ReduceTask.java | 4 +- .../hadoop/impl/v1/HadoopV1Splitter.java| 2 +- .../hadoop/impl/v2/HadoopV2Context.java | 2 +- .../processors/hadoop/impl/v2/HadoopV2Job.java | 15 +- .../hadoop/impl/v2/HadoopV2Splitter.java| 2 +- .../hadoop/impl/v2/HadoopV2TaskContext.java | 6 +- .../hadoop/jobtracker/HadoopJobMetadata.java| 4 +- .../hadoop/jobtracker/HadoopJobTracker.java | 32 ++--- .../planner/HadoopAbstractMapReducePlanner.java | 116 --- .../planner/HadoopDefaultMapReducePlan.java | 4 +- .../hadoop/shuffle/HadoopShuffle.java | 4 +- .../hadoop/shuffle/HadoopShuffleJob.java| 7 +- .../HadoopEmbeddedTaskExecutor.java | 8 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 6 +- .../taskexecutor/HadoopTaskExecutorAdapter.java | 8 +- .../external/HadoopExternalTaskExecutor.java| 16 +-- .../child/HadoopChildProcessRunner.java | 4 +- .../resources/META-INF/classnames.properties| 4 +- .../hadoop/impl/HadoopCommandLineTest.java | 4 +- .../hadoop/impl/HadoopJobTrackerSelfTest.java | 1 + .../hadoop/impl/HadoopPlannerMockJob.java | 10 +- .../hadoop/impl/HadoopTasksAllVersionsTest.java | 16 +-- .../hadoop/impl/HadoopTasksV1Test.java | 4 +- .../hadoop/impl/HadoopTasksV2Test.java | 4 +- .../impl/HadoopTestRoundRobinMrPlanner.java | 75 -- .../hadoop/impl/HadoopTestTaskContext.java | 6 +- .../hadoop/impl/HadoopV2JobSelfTest.java| 6 +- .../HadoopWeightedMapReducePlannerTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 4 +- 57 files changed, 738 insertions(+), 615 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d14e0727/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java index 84014d6..6443a67 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java @@ -18,7 +18,7 @@ package org.apache.ignite.configuration; import
[44/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77ca2e63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77ca2e63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77ca2e63 Branch: refs/heads/ignite-3477 Commit: 77ca2e636c73e464f833f227c4894df0785ae9e2 Parents: 6090ebd 82dd912 Author: devozerovAuthored: Mon Jan 16 16:07:49 2017 +0300 Committer: devozerov Committed: Mon Jan 16 16:07:49 2017 +0300 -- .../ignite/cache/query/SqlFieldsQuery.java | 6 + .../store/jdbc/dialect/BasicJdbcDialect.java| 31 +- .../GridClientConnectionManagerAdapter.java | 7 +- .../impl/connection/GridClientTopology.java | 53 +++- .../GridNearAtomicAbstractUpdateFuture.java | 34 ++- .../GridNearAtomicSingleUpdateFuture.java | 44 +-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 ++-- .../IgniteCacheObjectProcessorImpl.java | 5 +- .../processors/query/GridQueryProcessor.java| 2 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../cache/CacheEntryProcessorCopySelfTest.java | 6 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +- .../AtomicPutAllChangingTopologyTest.java | 212 ++ .../IgniteCacheFailoverTestSuite.java | 3 + .../apache/ignite/stream/flume/IgniteSink.java | 7 +- .../hadoop/impl/v2/HadoopV2TaskContext.java | 64 +++-- ...niteCacheAbstractInsertSqlQuerySelfTest.java | 14 +- .../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +- .../IgniteCacheInsertSqlQuerySelfTest.java | 18 +- .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 14 +- .../IgniteCacheUpdateSqlQuerySelfTest.java | 4 +- .../cpp/common/project/vs/common.vcxproj| 1 + .../platforms/cpp/jni/project/vs/jni.vcxproj| 1 + .../cpp/odbc-test/src/api_robustness_test.cpp | 113 +++- modules/platforms/cpp/odbc/Makefile.am | 3 +- modules/platforms/cpp/odbc/include/Makefile.am | 3 +- .../cpp/odbc/include/ignite/odbc/common_types.h | 29 +- .../ignite/odbc/config/connection_info.h| 2 - .../cpp/odbc/include/ignite/odbc/log.h | 123 .../odbc/include/ignite/odbc/meta/column_meta.h | 2 - .../cpp/odbc/include/ignite/odbc/statement.h| 143 +++--- .../cpp/odbc/include/ignite/odbc/utility.h | 19 +- .../odbc/os/linux/src/system/socket_client.cpp | 9 +- .../odbc/os/win/src/system/socket_client.cpp| 9 +- .../src/system/ui/dsn_configuration_window.cpp | 18 +- .../cpp/odbc/os/win/src/system_dsn.cpp | 17 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 + .../cpp/odbc/project/vs/odbc.vcxproj.filters| 6 + .../cpp/odbc/src/config/connection_info.cpp | 3 - modules/platforms/cpp/odbc/src/connection.cpp | 21 +- .../odbc/src/diagnostic/diagnosable_adapter.cpp | 3 +- .../odbc/src/diagnostic/diagnostic_record.cpp | 38 +++ modules/platforms/cpp/odbc/src/entry_points.cpp | 52 ++-- modules/platforms/cpp/odbc/src/log.cpp | 83 ++ .../platforms/cpp/odbc/src/meta/column_meta.cpp | 4 - modules/platforms/cpp/odbc/src/odbc.cpp | 283 --- .../odbc/src/query/column_metadata_query.cpp| 13 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 23 +- .../cpp/odbc/src/query/table_metadata_query.cpp | 12 +- modules/platforms/cpp/odbc/src/statement.cpp| 187 ++-- modules/platforms/cpp/odbc/src/utility.cpp | 18 +- .../Apache.Ignite.AspNet.Tests.csproj | 7 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.AspNet.csproj | 5 + .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Benchmarks.csproj | 5 + .../Apache.Ignite.Core.Tests.TestDll.csproj | 5 + .../Apache.Ignite.Core.Tests.csproj | 6 + .../Cache/CacheAbstractTest.cs | 2 + .../Log/ConcurrentMemoryTarget.cs | 73 + .../Log/NLogLoggerTest.cs | 5 +- .../Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 1 - .../Apache.Ignite.Core.csproj | 16 +- .../Impl/Binary/BinaryReader.cs | 16 +- .../Impl/Unmanaged/UnmanagedUtils.cs| 4 +- .../Apache.Ignite.EntityFramework.Tests.csproj | 5 + .../Apache.Ignite.EntityFramework.csproj| 9 +- .../Impl/ArrayDbDataReader.cs | 5 + .../Impl/DataReaderResult.cs| 2 + .../Impl/DbCommandInfo.cs | 11
[22/50] [abbrv] ignite git commit: IGNITE-4519 Updating ignite-aws java sdk pom version
IGNITE-4519 Updating ignite-aws java sdk pom version Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c1cd162 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c1cd162 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c1cd162 Branch: refs/heads/ignite-3477 Commit: 6c1cd162e60af37c9d380d801a6d2ce7f3b448b1 Parents: 72f03ea Author: chandresh.pancholiAuthored: Wed Jan 4 18:21:41 2017 +0530 Committer: chandresh.pancholi Committed: Wed Jan 4 18:21:41 2017 +0530 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c1cd162/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 682efa2..2cb88b0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -53,7 +53,7 @@ 1.7.2_1 1.7.2 1.10.12_1 -1.10.29 +1.11.75 2.16.0 1.8.3_1 1.8.3
[06/50] [abbrv] ignite git commit: IGNITE-4307 .NET: Fix AtomicConfiguration in AtomicSequenceExample
IGNITE-4307 .NET: Fix AtomicConfiguration in AtomicSequenceExample Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06ef8460 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06ef8460 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06ef8460 Branch: refs/heads/ignite-3477 Commit: 06ef846067411350081c4112ef9e9466deb6086c Parents: 8dd0322 Author: Pavel TupitsynAuthored: Wed Dec 28 11:29:30 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Dec 28 11:29:30 2016 +0300 -- .../examples/Apache.Ignite.Examples/App.config | 2 ++ .../DataStructures/AtomicSequenceExample.cs | 26 +++- 2 files changed, 6 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/06ef8460/modules/platforms/dotnet/examples/Apache.Ignite.Examples/App.config -- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/App.config b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/App.config index 8b16df3..13f0d86 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/App.config +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/App.config @@ -40,6 +40,8 @@ Apache.Ignite.ExamplesDll.Compute.AverageSalaryJob + + http://git-wip-us.apache.org/repos/asf/ignite/blob/06ef8460/modules/platforms/dotnet/examples/Apache.Ignite.Examples/DataStructures/AtomicSequenceExample.cs -- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/DataStructures/AtomicSequenceExample.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/DataStructures/AtomicSequenceExample.cs index f08c998..89e8ed3 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/DataStructures/AtomicSequenceExample.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/DataStructures/AtomicSequenceExample.cs @@ -21,9 +21,6 @@ namespace Apache.Ignite.Examples.DataStructures using System.Threading; using Apache.Ignite.Core; using Apache.Ignite.Core.DataStructures; -using Apache.Ignite.Core.DataStructures.Configuration; -using Apache.Ignite.Core.Discovery.Tcp; -using Apache.Ignite.Core.Discovery.Tcp.Multicast; using Apache.Ignite.ExamplesDll.DataStructures; /// @@ -44,26 +41,11 @@ namespace Apache.Ignite.Examples.DataStructures [STAThread] public static void Main() { -var atomicCfg = new AtomicConfiguration -{ -// Each node reserves 10 numbers to itself, so that 10 increments can be done locally, -// without communicating to other nodes. After that, another 10 elements are reserved. -AtomicSequenceReserveSize = 10 -}; - -var cfg = new IgniteConfiguration -{ -DiscoverySpi = new TcpDiscoverySpi -{ -IpFinder = new TcpDiscoveryMulticastIpFinder -{ -Endpoints = new[] { "127.0.0.1:47500" } -} -}, -AtomicConfiguration = atomicCfg -}; +// See app.config: +// Each node reserves 10 numbers to itself, so that 10 increments can be done locally, +// without communicating to other nodes. After that, another 10 elements are reserved. -using (var ignite = Ignition.Start(cfg)) +using (var ignite = Ignition.StartFromApplicationConfiguration()) { Console.WriteLine(); Console.WriteLine(">>> Atomic sequence example started.");
[05/50] [abbrv] ignite git commit: IGNITE-4367 .NET: Fix flaky tests - add topology checks to ReconnectTest.TestClusterRestart
IGNITE-4367 .NET: Fix flaky tests - add topology checks to ReconnectTest.TestClusterRestart Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8dd03222 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8dd03222 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8dd03222 Branch: refs/heads/ignite-3477 Commit: 8dd03222f87dc0b0b6b0f0a86adb5ec196592e38 Parents: 10b2b97 Author: Pavel TupitsynAuthored: Tue Dec 27 20:11:37 2016 +0300 Committer: Pavel Tupitsyn Committed: Tue Dec 27 20:11:37 2016 +0300 -- .../platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/8dd03222/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs index 253a10f..5a2d2d0 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs @@ -53,8 +53,13 @@ namespace Apache.Ignite.Core.Tests }; var server = Ignition.Start(serverCfg); + +Assert.AreEqual(1, server.GetCluster().GetNodes().Count); + var client = Ignition.Start(clientCfg); +Assert.AreEqual(2, client.GetCluster().GetNodes().Count); + ClientReconnectEventArgs eventArgs = null; client.ClientReconnected += (sender, args) => { eventArgs = args; };
[15/50] [abbrv] ignite git commit: IGNITE-4459: Hadoop: weighted planned is default one from now on. This closes #1391.
IGNITE-4459: Hadoop: weighted planned is default one from now on. This closes #1391. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9b1fc2b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9b1fc2b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9b1fc2b Branch: refs/heads/ignite-3477 Commit: a9b1fc2b3840d47d7c978d9296e8ae6bdeb10be5 Parents: 2e691d8 Author: tledkov-gridgainAuthored: Thu Dec 29 11:07:22 2016 +0300 Committer: devozerov Committed: Thu Dec 29 11:07:22 2016 +0300 -- .../mapreduce/IgniteHadoopMapReducePlanner.java | 414 - .../processors/hadoop/HadoopProcessor.java | 4 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 619 --- .../testsuites/IgniteHadoopTestSuite.java | 2 - 4 files changed, 2 insertions(+), 1037 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a9b1fc2b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java deleted file mode 100644 index ac42381..000 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java +++ /dev/null @@ -1,414 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.hadoop.mapreduce; - -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteException; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.igfs.IgfsBlockLocation; -import org.apache.ignite.igfs.IgfsPath; -import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.processors.hadoop.HadoopFileBlock; -import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit; -import org.apache.ignite.internal.processors.hadoop.HadoopJob; -import org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan; -import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsEndpoint; -import org.apache.ignite.internal.processors.hadoop.planner.HadoopAbstractMapReducePlanner; -import org.apache.ignite.internal.processors.hadoop.planner.HadoopDefaultMapReducePlan; -import org.apache.ignite.internal.processors.igfs.IgfsEx; -import org.apache.ignite.internal.util.typedef.F; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.UUID; - -import static org.apache.ignite.IgniteFileSystem.IGFS_SCHEME; - -/** - * Default map-reduce planner implementation. - */ -public class IgniteHadoopMapReducePlanner extends HadoopAbstractMapReducePlanner { -/** {@inheritDoc} */ -@Override public HadoopMapReducePlan preparePlan(HadoopJob job, Collection top, -@Nullable HadoopMapReducePlan oldPlan) throws IgniteCheckedException { -// Convert collection of topology nodes to collection of topology node IDs. -Collection topIds = new HashSet<>(top.size(), 1.0f); - -for (ClusterNode topNode : top) -topIds.add(topNode.id()); - -Map mappers = mappers(top, topIds, job.input()); - -int rdcCnt = job.info().reducers(); - -if (rdcCnt < 0) -throw new IgniteCheckedException("Number of reducers must be non-negative, actual: " + rdcCnt); - -Map reducers = reducers(top, mappers, rdcCnt); - -return new HadoopDefaultMapReducePlan(mappers, reducers); -} - -/** - * Create plan for mappers. - * - * @param top Topology nodes. - * @param topIds Topology
[34/50] [abbrv] ignite git commit: IGNITE-3885 .NET: Add link to Ignite.NET development page in readme.md
IGNITE-3885 .NET: Add link to Ignite.NET development page in readme.md Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58188e81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58188e81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58188e81 Branch: refs/heads/ignite-3477 Commit: 58188e81b262c26f93b29f3facd3e77f4325e359 Parents: c4d67d2 Author: Pavel TupitsynAuthored: Tue Jan 10 17:32:57 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 17:32:57 2017 +0300 -- modules/platforms/dotnet/README.md | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/58188e81/modules/platforms/dotnet/README.md -- diff --git a/modules/platforms/dotnet/README.md b/modules/platforms/dotnet/README.md index 528a219..cbdc7c9 100644 --- a/modules/platforms/dotnet/README.md +++ b/modules/platforms/dotnet/README.md @@ -147,4 +147,8 @@ You can find the full Apache Ignite documentation here: [Full documentation][doc [apache-homepage]: https://ignite.apache.org/ [getting-started]: https://apacheignite-net.readme.io/docs/getting-started-2 -[docs]: https://apacheignite-net.readme.io/docs \ No newline at end of file +[docs]: https://apacheignite-net.readme.io/docs + +## Contribute to Ignite.NET + +See [Ignite.NET Development](https://cwiki.apache.org/confluence/display/IGNITE/Ignite.NET+Development) on wiki. \ No newline at end of file
[39/50] [abbrv] ignite git commit: .NET: Improve exception messages for binary misconfiguration and missing assemblies
.NET: Improve exception messages for binary misconfiguration and missing assemblies Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e304b48b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e304b48b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e304b48b Branch: refs/heads/ignite-3477 Commit: e304b48b92fe75027442b7f7cfb46b421d58ae49 Parents: d10946b Author: Pavel TupitsynAuthored: Fri Jan 13 16:49:48 2017 +0300 Committer: Pavel Tupitsyn Committed: Fri Jan 13 16:49:48 2017 +0300 -- .../Apache.Ignite.Core/Impl/Binary/BinaryReader.cs | 16 1 file changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e304b48b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs index 100091f..d9facc3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs @@ -697,10 +697,18 @@ namespace Apache.Ignite.Core.Impl.Binary if (desc.Type == null) { if (desc is BinarySurrogateTypeDescriptor) -throw new BinaryObjectException("Unknown type ID: " + hdr.TypeId); - -throw new BinaryObjectException("No matching type found for object [typeId=" + -desc.TypeId + ", typeName=" + desc.TypeName + ']'); +{ +throw new BinaryObjectException(string.Format( +"Unknown type ID: {0}. " + +"This usually indicates missing BinaryConfiguration." + +"Make sure that all nodes have the same BinaryConfiguration.", hdr.TypeId)); +} + +throw new BinaryObjectException(string.Format( +"No matching type found for object [typeId={0}, typeName={1}]." + +"This usually indicates that assembly with specified type is not loaded on a node." + +"When using Apache.Ignite.exe, make sure to load assemblies with -assembly parameter.", +desc.TypeId, desc.TypeName)); } // Preserve old frame.
[2/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java index aa2d368..f6ac905 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java @@ -20,6 +20,8 @@ package org.apache.ignite.internal.processors.cache.database.tree.io; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.pagemem.Page; +import org.apache.ignite.internal.pagemem.PageMemory; +import org.apache.ignite.internal.pagemem.PageUtils; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManagerImpl; import org.apache.ignite.internal.processors.cache.database.MetadataStorage; @@ -36,10 +38,10 @@ import org.apache.ignite.internal.processors.cache.database.tree.util.PageLockLi * 1. IO should not have any `public static` methods. *We have versioned IOs and any static method will mean that it have to always work in backward *compatible way between all the IO versions. The base class {@link PageIO} has - *static methods (like {@code {@link #getPageId(ByteBuffer)}}) intentionally: + *static methods (like {@code {@link #getPageId(long)}}) intentionally: *this base format can not be changed between versions. * - * 2. IO must correctly override {@link #initNewPage(ByteBuffer, long)} method and call super. + * 2. IO must correctly override {@link #initNewPage(long, long, int)} method and call super. *We have logic that relies on this behavior. * * 3. Page IO type ID constant must be declared in this class to have a list of all the @@ -58,7 +60,7 @@ import org.apache.ignite.internal.processors.cache.database.tree.util.PageLockLi * * 7. It is almost always preferable to read or write (especially write) page contents using *static methods on {@link PageHandler}. To just initialize new page use - *{@link PageHandler#initPage(Page, PageLockListener, PageIO, IgniteWriteAheadLogManager)} + *{@link PageHandler#initPage(PageMemory, Page, PageLockListener, PageIO, IgniteWriteAheadLogManager)} *method with needed IO instance. */ public abstract class PageIO { @@ -164,6 +166,7 @@ public abstract class PageIO { } /** + * @param buf Buffer. * @return Page type. */ public static int getType(ByteBuffer buf) { @@ -171,13 +174,21 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page addres. + * @return Page type. + */ +public static int getType(long pageAddr) { +return PageUtils.getShort(pageAddr, TYPE_OFF) & 0x; +} + +/** + * @param pageAddr Page address. * @param type Type. */ -public static void setType(ByteBuffer buf, int type) { -buf.putShort(TYPE_OFF, (short)type); +public static void setType(long pageAddr, int type) { +PageUtils.putShort(pageAddr, TYPE_OFF, (short)type); -assert getType(buf) == type; +assert getType(pageAddr) == type; } /** @@ -189,13 +200,21 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. + * @return Version. + */ +public static int getVersion(long pageAddr) { +return PageUtils.getShort(pageAddr, VER_OFF) & 0x; +} + +/** + * @param pageAddr Page address. * @param ver Version. */ -public static void setVersion(ByteBuffer buf, int ver) { -buf.putShort(VER_OFF, (short)ver); +private static void setVersion(long pageAddr, int ver) { +PageUtils.putShort(pageAddr, VER_OFF, (short)ver); -assert getVersion(buf) == ver; +assert getVersion(pageAddr) == ver; } /** @@ -207,13 +226,37 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. + * @return Page ID. + */ +public static long getPageId(long pageAddr) { +return PageUtils.getLong(pageAddr, PAGE_ID_OFF); +} + +/** + * @param pageAddr Page address. * @param pageId Page ID. */ -public static void setPageId(ByteBuffer buf, long pageId) { -buf.putLong(PAGE_ID_OFF, pageId); +public static void setPageId(long pageAddr, long pageId) { +PageUtils.putLong(pageAddr, PAGE_ID_OFF, pageId); + +assert getPageId(pageAddr) == pageId; +} + +/** +
[3/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java index 5fc3d25..c34296a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.database.tree.io; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.pagemem.PageUtils; import org.apache.ignite.internal.processors.cache.database.tree.BPlusTree; /** @@ -72,56 +73,56 @@ public abstract class BPlusIO extends PageIO { } /** {@inheritDoc} */ -@Override public void initNewPage(ByteBuffer buf, long pageId) { -super.initNewPage(buf, pageId); +@Override public void initNewPage(long pageAddr, long pageId, int pageSize) { +super.initNewPage(pageAddr, pageId, pageSize); -setCount(buf, 0); -setForward(buf, 0); -setRemoveId(buf, 0); +setCount(pageAddr, 0); +setForward(pageAddr, 0); +setRemoveId(pageAddr, 0); } /** - * @param buf Buffer. + * @param pageAddr Page address. * @return Forward page ID. */ -public final long getForward(ByteBuffer buf) { -return buf.getLong(FORWARD_OFF); +public final long getForward(long pageAddr) { +return PageUtils.getLong(pageAddr, FORWARD_OFF); } /** - * @param buf Buffer. + * @param pageAddr Page address. * @param pageId Forward page ID. */ -public final void setForward(ByteBuffer buf, long pageId) { -buf.putLong(FORWARD_OFF, pageId); +public final void setForward(long pageAddr, long pageId) { +PageUtils.putLong(pageAddr, FORWARD_OFF, pageId); -assert getForward(buf) == pageId; +assert getForward(pageAddr) == pageId; } /** - * @param buf Buffer. + * @param pageAddr Page address. * @return Remove ID. */ -public final long getRemoveId(ByteBuffer buf) { -return buf.getLong(REMOVE_ID_OFF); +public final long getRemoveId(long pageAddr) { +return PageUtils.getLong(pageAddr, REMOVE_ID_OFF); } /** - * @param buf Buffer. + * @param pageAddr Page address. * @param rmvId Remove ID. */ -public final void setRemoveId(ByteBuffer buf, long rmvId) { -buf.putLong(REMOVE_ID_OFF, rmvId); +public final void setRemoveId(long pageAddr, long rmvId) { +PageUtils.putLong(pageAddr, REMOVE_ID_OFF, rmvId); -assert getRemoveId(buf) == rmvId; +assert getRemoveId(pageAddr) == rmvId; } /** - * @param buf Buffer. + * @param pageAddr Page address. * @return Items count in the page. */ -public final int getCount(ByteBuffer buf) { -int cnt = buf.getShort(CNT_OFF) & 0x; +public final int getCount(long pageAddr) { +int cnt = PageUtils.getShort(pageAddr, CNT_OFF) & 0x; assert cnt >= 0: cnt; @@ -129,20 +130,20 @@ public abstract class BPlusIO extends PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. * @param cnt Count. */ -public final void setCount(ByteBuffer buf, int cnt) { +public final void setCount(long pageAddr, int cnt) { assert cnt >= 0: cnt; -buf.putShort(CNT_OFF, (short)cnt); +PageUtils.putShort(pageAddr, CNT_OFF, (short)cnt); -assert getCount(buf) == cnt; +assert getCount(pageAddr) == cnt; } /** * @return {@code true} If we can get the full row from this page using - * method {@link BPlusTree#getRow(BPlusIO, ByteBuffer, int)}. + * method {@link BPlusTree#getRow(BPlusIO, long, int)}. * Must always be {@code true} for leaf pages. */ public final boolean canGetRow() { @@ -157,27 +158,28 @@ public abstract class BPlusIO extends PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. + * @param pageSize Page size. * @return Max items count. */ -public abstract int getMaxCount(ByteBuffer buf); +public abstract int getMaxCount(long pageAddr, int pageSize); /** * Store the needed info about the row in the page. Leaf and inner pages can store different info. * - * @param buf Buffer. + * @param pageAddr Page address. * @param idx Index. * @param row Lookup or full row. * @param rowBytes Row bytes. * @throws
[5/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java index 4da44bc..e44838d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java @@ -86,17 +86,17 @@ public abstract class PagesList extends DataStructure { /** */ private final PageHandlercutTail = new PageHandler () { -@Override public Boolean run(Page page, PageIO pageIo, ByteBuffer buf, Void ignore, int bucket) +@Override public Boolean run(Page page, PageIO pageIo, long pageAddr, Void ignore, int bucket) throws IgniteCheckedException { -assert getPageId(buf) == page.id(); +assert getPageId(pageAddr) == page.id(); PagesListNodeIO io = (PagesListNodeIO)pageIo; -long tailId = io.getNextId(buf); +long tailId = io.getNextId(pageAddr); assert tailId != 0; -io.setNextId(buf, 0L); +io.setNextId(pageAddr, 0L); if (isWalDeltaRecordNeeded(wal, page)) wal.log(new PagesListSetNextRecord(cacheId, page.id(), 0L)); @@ -140,7 +140,7 @@ public abstract class PagesList extends DataStructure { if (metaPageId != 0L) { if (initNew) { try (Page page = page(metaPageId)) { -initPage(page, this, PagesListMetaIO.VERSIONS.latest(), wal); +initPage(pageMem, page, this, PagesListMetaIO.VERSIONS.latest(), wal); } } else { @@ -150,16 +150,16 @@ public abstract class PagesList extends DataStructure { while (nextPageId != 0) { try (Page page = page(nextPageId)) { -ByteBuffer buf = readLock(page); // No concurrent recycling on init. +long pageAddr = readLock(page); // No concurrent recycling on init. -assert buf != null; +assert pageAddr != 0L; try { -PagesListMetaIO io = PagesListMetaIO.VERSIONS.forPage(buf); +PagesListMetaIO io = PagesListMetaIO.VERSIONS.forPage(pageAddr); -io.getBucketsData(buf, bucketsData); +io.getBucketsData(pageAddr, bucketsData); -long next0 = io.getNextMetaPageId(buf); +long next0 = io.getNextMetaPageId(pageAddr); assert next0 != nextPageId : "Loop detected [next=" + U.hexLong(next0) + ", cur=" + U.hexLong(nextPageId) + ']'; @@ -167,7 +167,7 @@ public abstract class PagesList extends DataStructure { nextPageId = next0; } finally { -readUnlock(page, buf); +readUnlock(page, pageAddr); } } } @@ -199,7 +199,7 @@ public abstract class PagesList extends DataStructure { assert metaPageId != 0; Page curPage = null; -ByteBuffer curBuf = null; +long curPageAddr = 0L; PagesListMetaIO curIo = null; long nextPageId = metaPageId; @@ -212,39 +212,39 @@ public abstract class PagesList extends DataStructure { int tailIdx = 0; while (tailIdx < tails.length) { -int written = curPage != null ? curIo.addTails(curBuf, bucket, tails, tailIdx) : 0; +int written = curPage != null ? curIo.addTails(pageMem.pageSize(), curPageAddr, bucket, tails, tailIdx) : 0; if (written == 0) { if (nextPageId == 0L) { nextPageId = allocatePageNoReuse(); if (curPage != null) { -curIo.setNextMetaPageId(curBuf, nextPageId); +curIo.setNextMetaPageId(curPageAddr, nextPageId); -releaseAndClose(curPage, curBuf); +releaseAndClose(curPage, curPageAddr); curPage = null; } curPage = page(nextPageId); -
[7/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comparison - reduced size of data tree search row Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db65ddd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db65ddd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db65ddd Branch: refs/heads/ignite-3477 Commit: 7db65ddd16beae5f5bf95f67c638d5ae1c58653c Parents: cb60e38 Author: sboikovAuthored: Tue Jan 17 14:45:51 2017 +0300 Committer: sboikov Committed: Tue Jan 17 14:45:53 2017 +0300 -- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectImpl.java | 5 + .../binary/BinaryObjectOffheapImpl.java | 5 + .../apache/ignite/internal/pagemem/Page.java| 11 +- .../ignite/internal/pagemem/PageMemory.java | 9 +- .../ignite/internal/pagemem/PageUtils.java | 185 ++ .../pagemem/impl/PageMemoryNoStoreImpl.java | 134 ++-- .../internal/pagemem/impl/PageNoStoreImpl.java | 91 +-- .../delta/DataPageInsertFragmentRecord.java | 8 +- .../wal/record/delta/DataPageInsertRecord.java | 8 +- .../wal/record/delta/DataPageRemoveRecord.java | 8 +- .../delta/DataPageSetFreeListPageRecord.java| 8 +- .../wal/record/delta/FixCountRecord.java| 8 +- .../record/delta/FixLeftmostChildRecord.java| 8 +- .../pagemem/wal/record/delta/FixRemoveId.java | 8 +- .../wal/record/delta/InitNewPageRecord.java | 8 +- .../wal/record/delta/InnerReplaceRecord.java| 4 +- .../pagemem/wal/record/delta/InsertRecord.java | 5 +- .../pagemem/wal/record/delta/MergeRecord.java | 3 +- .../wal/record/delta/MetaPageAddRootRecord.java | 8 +- .../wal/record/delta/MetaPageCutRootRecord.java | 7 +- .../wal/record/delta/MetaPageInitRecord.java| 14 +- .../record/delta/MetaPageInitRootRecord.java| 9 +- .../delta/MetaPageUpdateLastAllocatedIndex.java | 10 +- ...aPageUpdateLastSuccessfulFullSnapshotId.java | 8 +- .../MetaPageUpdateLastSuccessfulSnapshotId.java | 8 +- .../delta/MetaPageUpdateNextSnapshotId.java | 8 +- .../MetaPageUpdatePartitionDataRecord.java | 12 +- .../wal/record/delta/NewRootInitRecord.java | 6 +- .../wal/record/delta/PageDeltaRecord.java | 7 +- .../delta/PageListMetaResetCountRecord.java | 8 +- .../record/delta/PagesListAddPageRecord.java| 8 +- .../delta/PagesListInitNewPageRecord.java | 10 +- .../record/delta/PagesListRemovePageRecord.java | 8 +- .../record/delta/PagesListSetNextRecord.java| 8 +- .../delta/PagesListSetPreviousRecord.java | 8 +- .../pagemem/wal/record/delta/RecycleRecord.java | 6 +- .../pagemem/wal/record/delta/RemoveRecord.java | 12 +- .../pagemem/wal/record/delta/ReplaceRecord.java | 7 +- .../record/delta/SplitExistingPageRecord.java | 8 +- .../record/delta/SplitForwardPageRecord.java| 3 +- .../record/delta/TrackingPageDeltaRecord.java | 10 +- .../internal/processors/cache/CacheObject.java | 7 + .../processors/cache/CacheObjectAdapter.java| 40 +- .../cache/CacheObjectByteArrayImpl.java | 5 + .../cache/IgniteCacheOffheapManagerImpl.java| 372 +++ .../processors/cache/database/CacheDataRow.java | 13 +- .../cache/database/CacheDataRowAdapter.java | 72 ++- .../cache/database/CacheSearchRow.java | 40 ++ .../cache/database/DataStructure.java | 36 +- .../IgniteCacheDatabaseSharedManager.java | 2 +- .../cache/database/MetadataStorage.java | 149 +++-- .../cache/database/freelist/FreeListImpl.java | 61 +- .../cache/database/freelist/PagesList.java | 212 +++ .../database/freelist/io/PagesListMetaIO.java | 71 +-- .../database/freelist/io/PagesListNodeIO.java | 117 ++-- .../cache/database/tree/BPlusTree.java | 616 ++- .../cache/database/tree/io/BPlusIO.java | 201 +++--- .../cache/database/tree/io/BPlusInnerIO.java| 71 ++- .../cache/database/tree/io/BPlusLeafIO.java | 11 +- .../cache/database/tree/io/BPlusMetaIO.java | 79 +-- .../cache/database/tree/io/CacheVersionIO.java | 46 ++ .../cache/database/tree/io/DataPageIO.java | 545 .../cache/database/tree/io/DataPagePayload.java | 64 ++ .../cache/database/tree/io/IOVersions.java | 12 +- .../cache/database/tree/io/PageIO.java | 110 +++- .../cache/database/tree/io/PageMetaIO.java | 118 ++-- .../database/tree/io/PagePartitionMetaIO.java | 67 +- .../database/tree/reuse/ReuseListImpl.java | 2 +- .../cache/database/tree/util/PageHandler.java | 135 ++-- .../database/tree/util/PageLockListener.java|
[4/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java index aef7217..e91dda9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.database.tree; import java.io.Externalizable; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -126,15 +125,15 @@ public abstract class BPlusTreeextends DataStructure implements return null; try (Page page = page(pageId)) { -ByteBuffer buf = readLock(page); // No correctness guaranties. +long pageAddr = readLock(page); // No correctness guaranties. try { -BPlusIO io = io(buf); +BPlusIO io = io(pageAddr); if (io.isLeaf()) return null; -int cnt = io.getCount(buf); +int cnt = io.getCount(pageAddr); assert cnt >= 0 : cnt; @@ -144,12 +143,12 @@ public abstract class BPlusTree extends DataStructure implements res = new ArrayList<>(cnt + 1); for (int i = 0; i < cnt; i++) -res.add(inner(io).getLeft(buf, i)); +res.add(inner(io).getLeft(pageAddr, i)); -res.add(inner(io).getRight(buf, cnt - 1)); +res.add(inner(io).getRight(pageAddr, cnt - 1)); } else { -long left = inner(io).getLeft(buf, 0); +long left = inner(io).getLeft(pageAddr, 0); res = left == 0 ? Collections.emptyList() : Collections.singletonList(left); } @@ -157,7 +156,7 @@ public abstract class BPlusTree extends DataStructure implements return res; } finally { -readUnlock(page, buf); +readUnlock(page, pageAddr); } } catch (IgniteCheckedException e) { @@ -173,15 +172,15 @@ public abstract class BPlusTree extends DataStructure implements return ""; try (Page page = page(pageId)) { -ByteBuffer buf = readLock(page); // No correctness guaranties. +long pageAddr = readLock(page); // No correctness guaranties. try { -BPlusIO io = io(buf); +BPlusIO io = io(pageAddr); -return printPage(io, buf, keys); +return printPage(io, pageAddr, keys); } finally { -readUnlock(page, buf); +readUnlock(page, pageAddr); } } catch (IgniteCheckedException e) { @@ -192,17 +191,17 @@ public abstract class BPlusTree extends DataStructure implements /** */ private final GetPageHandler askNeighbor = new GetPageHandler() { -@Override public Result run0(Page page, ByteBuffer buf, BPlusIO io, Get g, int isBack) { +@Override public Result run0(Page page, long pageAddr, BPlusIO io, Get g, int isBack) { assert !io.isLeaf(); // Inner page. boolean back = isBack == TRUE.ordinal(); -long res = doAskNeighbor(io, buf, back); +long res = doAskNeighbor(io, pageAddr, back); if (back) { assert g.getClass() == Remove.class; -if (io.getForward(buf) != g.backId) // See how g.backId is setup in removeDown for this check. +if (io.getForward(pageAddr) != g.backId) // See how g.backId is setup in removeDown for this check. return RETRY; g.backId = res; @@ -219,25 +218,25 @@ public abstract class BPlusTree extends DataStructure implements /** */ private final GetPageHandler search = new GetPageHandler() { -@Override public Result run0(Page page, ByteBuffer buf, BPlusIO io, Get g, int lvl) +@Override public Result run0(Page page, long pageAddr, BPlusIO io, Get g, int lvl) throws IgniteCheckedException { // Check
[6/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java index 8ec5f8f..418d28b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitExistingPageRecord.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta; -import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.processors.cache.database.tree.io.BPlusIO; import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO; import org.apache.ignite.internal.util.tostring.GridToStringExclude; @@ -50,10 +50,10 @@ public class SplitExistingPageRecord extends PageDeltaRecord { } /** {@inheritDoc} */ -@Override public void applyDelta(ByteBuffer buf) throws IgniteCheckedException { -BPlusIO io = PageIO.getBPlusIO(buf); +@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws IgniteCheckedException { +BPlusIO io = PageIO.getBPlusIO(pageAddr); -io.splitExistingPage(buf, mid, fwdId); +io.splitExistingPage(pageAddr, mid, fwdId); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java index b4487fa..39f2669 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/SplitForwardPageRecord.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.pagemem.wal.record.delta; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.pagemem.PageMemory; /** * Split forward page record. @@ -79,7 +80,7 @@ public class SplitForwardPageRecord extends PageDeltaRecord { } /** {@inheritDoc} */ -@Override public void applyDelta(ByteBuffer fwdBuf) throws IgniteCheckedException { +@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws IgniteCheckedException { throw new IgniteCheckedException("Split forward page record should not be logged."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java index 9d00d77..7cd0948 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/TrackingPageDeltaRecord.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.pagemem.wal.record.delta; -import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.processors.cache.database.tree.io.TrackingPageIO; /** @@ -70,8 +70,12 @@ public class TrackingPageDeltaRecord extends PageDeltaRecord { } /** {@inheritDoc} */ -@Override public void applyDelta(ByteBuffer buf) throws IgniteCheckedException { -TrackingPageIO.VERSIONS.forPage(buf).markChanged(buf, pageIdToMark, nextSnapshotId, lastSuccessfulSnapshotId, buf.capacity()); +@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws IgniteCheckedException { + TrackingPageIO.VERSIONS.forPage(pageAddr).markChanged(pageMem.pageBuffer(pageAddr), +pageIdToMark, +nextSnapshotId, +lastSuccessfulSnapshotId, +pageMem.pageSize()); } /** {@inheritDoc} */
[1/7] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cache key comp
Repository: ignite Updated Branches: refs/heads/ignite-3477 cb60e3865 -> 7db65ddd1 http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java index 5371856..cf67041 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java @@ -34,7 +34,7 @@ import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryDistr */ public class IgniteDistributedJoinTestSuite extends TestSuite { /** - * + * @return Suite. */ public static TestSuite suite() { TestSuite suite = new TestSuite("Distributed Joins Test Suite.");
[09/15] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2
Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c31bc1a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c31bc1a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c31bc1a Branch: refs/heads/ignite-gg-11810-1 Commit: 6c31bc1a59b56de5328af3d9c160e35dd7e52c34 Parents: 8f69186 6e5bfea Author: Alexey GoncharukAuthored: Mon Jan 16 21:10:08 2017 +0300 Committer: Alexey Goncharuk Committed: Mon Jan 16 21:10:08 2017 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../cache/DynamicCacheChangeRequest.java| 8 +++--- .../processors/cache/GridCacheProcessor.java| 9 --- .../ignite/spi/discovery/tcp/ServerImpl.java| 1 - .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 .../query/h2/opt/GridH2TableSelfTest.java | 8 +- 11 files changed, 56 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java --
[11/15] ignite git commit: IGNITE-4545 Added cache for router hostnames. - Fixes #1428.
IGNITE-4545 Added cache for router hostnames. - Fixes #1428. Signed-off-by: Andrey Novikov(cherry picked from commit 27ba69b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0ac987d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0ac987d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0ac987d Branch: refs/heads/ignite-gg-11810-1 Commit: b0ac987d3202f5796c101bfc1998e4d4dcfb2bab Parents: 393eb94 Author: Andrey Novikov Authored: Mon Jan 16 11:22:34 2017 +0700 Committer: Andrey Novikov Committed: Tue Jan 17 13:45:33 2017 +0700 -- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 2 files changed, 49 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b0ac987d/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java index 12baee0..f714e7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -85,6 +85,9 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo /** Class logger. */ private final Logger log; +/** All local enabled MACs. */ +private final Collection macs; + /** NIO server. */ private GridNioServer srv; @@ -166,6 +169,8 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo if (marshId == null && cfg.getMarshaller() == null) throw new GridClientException("Failed to start client (marshaller is not configured)."); +macs = U.allLocalMACs(); + if (cfg.getProtocol() == GridClientProtocol.TCP) { try { IgniteLogger gridLog = new JavaLogger(false); @@ -316,7 +321,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo } boolean sameHost = node.attributes().isEmpty() || -F.containsAny(U.allLocalMACs(), node.attribute(ATTR_MACS).toString().split(", ")); +F.containsAny(macs, node.attribute(ATTR_MACS).toString().split(", ")); Collection srvs = new LinkedHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b0ac987d/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java index effd5b3..97aa586 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Set; @@ -61,12 +60,18 @@ public class GridClientTopology { /** Cached last error prevented topology from update. */ private GridClientException lastError; +/** Router addresses from configuration. */ +private final String routers; + /** * Set of router addresses to infer direct connectivity * when client is working in router connection mode. * {@code null} when client is working in direct connection node. */ -private final Set routerAddrs; +private final Set routerAddrs; + +/** List of all known local MACs */ +private final Collection macsCache; /** Protocol. */ private final GridClientProtocol prot; @@ -96,8 +101,38 @@ public class GridClientTopology { metricsCache = cfg.isEnableMetricsCache(); attrCache = cfg.isEnableAttributesCache(); prot = cfg.getProtocol(); -routerAddrs = (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) ? -new HashSet<>(cfg.getRouters()) : null; + +if (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) { +
[06/15] ignite git commit: ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved
ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/166d6371 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/166d6371 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/166d6371 Branch: refs/heads/ignite-gg-11810-1 Commit: 166d63713c259f0b5882c41dffd3bf66d47da0fd Parents: e1b84b4 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 17:38:49 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 17:38:49 2017 +0300 -- .../processors/cache/DynamicCacheChangeRequest.java | 8 .../internal/processors/cache/GridCacheProcessor.java | 9 + .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index a3116ad..1e5ab88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@ -35,7 +35,7 @@ public class DynamicCacheChangeRequest implements Serializable { private static final long serialVersionUID = 0L; /** */ -private UUID requestId; +private UUID reqId; /** Start ID. */ private IgniteUuid deploymentId; @@ -95,8 +95,8 @@ public class DynamicCacheChangeRequest implements Serializable { * @param cacheName Cache stop name. * @param initiatingNodeId Initiating node ID. */ -public DynamicCacheChangeRequest(UUID requestId, String cacheName, UUID initiatingNodeId) { -this.requestId = requestId; +public DynamicCacheChangeRequest(UUID reqId, String cacheName, UUID initiatingNodeId) { +this.reqId = reqId; this.cacheName = cacheName; this.initiatingNodeId = initiatingNodeId; } @@ -105,7 +105,7 @@ public class DynamicCacheChangeRequest implements Serializable { * @return Request ID. */ public UUID requestId() { -return requestId; +return reqId; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 1e5fcc1..7f4fb99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2041,8 +2041,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (desc == null) continue; - -DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(UUID.randomUUID(), cache.name(), null); +// requestId must be null because on different node will be different byte [] and we get duplicate discovery data +// see TcpDiscoveryNodeAddedMessage#addDiscoveryData 'Arrays.equals(curData, discoDataEntry.getValue())' +DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null, cache.name(), null); req.startCacheConfiguration(desc.cacheConfiguration()); @@ -2068,7 +2069,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (DynamicCacheDescriptor desc : registeredCaches.values()) { DynamicCacheChangeRequest req = new DynamicCacheChangeRequest( -UUID.randomUUID(), desc.cacheConfiguration().getName(), null); +null, desc.cacheConfiguration().getName(), null); req.startCacheConfiguration(desc.cacheConfiguration()); @@ -2083,7 +2084,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (DynamicCacheDescriptor desc : registeredTemplates.values()) { DynamicCacheChangeRequest req = new DynamicCacheChangeRequest( -UUID.randomUUID(), desc.cacheConfiguration().getName(), null); +null,
[08/15] ignite git commit: ignite-gg-8.0.2.ea2 fix query test
ignite-gg-8.0.2.ea2 fix query test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e5bfea3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e5bfea3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e5bfea3 Branch: refs/heads/ignite-gg-11810-1 Commit: 6e5bfea3b71068bc4c4487e68d1d9ced4069005a Parents: e9bb1d9 Author: Dmitriy GovorukhinAuthored: Mon Jan 16 21:09:04 2017 +0300 Committer: Dmitriy Govorukhin Committed: Mon Jan 16 21:09:04 2017 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../query/h2/opt/GridH2TreeIndex.java | 26 .../query/h2/opt/GridH2TableSelfTest.java | 8 +- .../query/h2/sql/GridQueryParsingTest.java | 4 +-- 4 files changed, 27 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index b464127..b47ed15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -2381,7 +2381,8 @@ public class IgnitionEx { grid = null; -stopExecutors(log); +if (log != null) +stopExecutors(log); log = null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/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 4fa8b0f..0f93f52 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 @@ -499,8 +499,8 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator find(GridSearchRowPointer lower, GridSearchRowPointer upper) throws IgniteCheckedException { -if (lower == null || upper == null) -throw new NullPointerException(); -NavigableMap subMap = -tree.subMap(lower, false, upper, false); +Collection rows; -return new GridCursorIteratorWrapper<>(subMap.values().iterator()); +if (lower == null && upper == null) +rows = tree.values(); +else if (lower != null && upper == null) +rows = tree.tailMap(lower).values(); +else if (lower == null) +rows = tree.headMap(upper).values(); +else +rows = tree.subMap(lower, true, upper, true).values(); + +return new GridCursorIteratorWrapper<>(rows.iterator()); } /** {@inheritDoc} */ @@ -532,16 +538,16 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparatorhttp://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java index 5daf415..dcb1840 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java @@ -70,6 +70,9 @@ public class GridH2TableSelfTest extends GridCommonAbstractTest { /** */ private static final String PK_NAME = "__GG_PK_"; +/** Hash. */ +private static final String HASH = "__GG_HASH"; + /** */ private static final String STR_IDX_NAME = "__GG_IDX_"; @@ -105,6 +108,7 @@ public class GridH2TableSelfTest extends GridCommonAbstractTest { IndexColumn x = tbl.indexColumn(3, SortOrder.DESCENDING); idxs.add(new GridH2TreeIndex(PK_NAME, tbl, true, F.asList(id))); +idxs.add(new GridH2TreeIndex(HASH,
[03/15] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2
Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/049247d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/049247d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/049247d3 Branch: refs/heads/ignite-gg-11810-1 Commit: 049247d373d2b0197a36f133b21575462145f635 Parents: 79a546a 2254d37 Author: Alexey GoncharukAuthored: Fri Jan 13 19:06:12 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Jan 13 19:06:12 2017 +0300 -- .../main/resources/META-INF/classnames.properties | 2 -- .../internal/ClusterNodeMetricsSelfTest.java | 2 ++ .../GridDeploymentMessageCountSelfTest.java| 3 +++ .../processors/cache/ClusterStateAbstractTest.java | 3 ++- .../IgniteCacheExpiryPolicyAbstractTest.java | 6 ++ .../testsuites/IgniteComputeGridTestSuite.java | 1 - .../main/resources/META-INF/classnames.properties | 16 +--- .../query/IgniteSqlSplitterSelfTest.java | 2 +- .../testsuites/IgniteDistributedJoinTestSuite.java | 17 + 9 files changed, 28 insertions(+), 24 deletions(-) --
[01/15] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477
Repository: ignite Updated Branches: refs/heads/ignite-gg-11810-1 329c5cb4d -> fcfd62ace Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81435cfa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81435cfa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81435cfa Branch: refs/heads/ignite-gg-11810-1 Commit: 81435cfad1c462eda79e2ed985294828c20984a2 Parents: 42c9da6 90f846a Author: sboikovAuthored: Fri Jan 13 12:06:09 2017 +0300 Committer: sboikov Committed: Fri Jan 13 12:06:09 2017 +0300 -- .../main/resources/META-INF/classnames.properties | 2 -- .../expiry/IgniteCacheExpiryPolicyAbstractTest.java | 6 ++ .../main/resources/META-INF/classnames.properties | 16 +--- 3 files changed, 3 insertions(+), 21 deletions(-) --
ignite git commit: Merge master into ignite-3477
Repository: ignite Updated Branches: refs/heads/ignite-3477 4538818a3 -> cb60e3865 Merge master into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb60e386 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb60e386 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb60e386 Branch: refs/heads/ignite-3477 Commit: cb60e3865acb738f7f23124ba4f3e41c0dd63cfa Parents: 4538818 Author: Alexey GoncharukAuthored: Tue Jan 17 13:48:56 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:48:56 2017 +0300 -- .../processors/platform/utils/PlatformConfigurationUtils.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/cb60e386/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index 33571ad..5fcd2eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -21,12 +21,12 @@ import java.lang.management.ManagementFactory; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collection; -import java.util.Set; -import java.util.HashSet; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import javax.cache.configuration.Factory; import javax.cache.expiry.ExpiryPolicy; import org.apache.ignite.binary.BinaryArrayIdentityResolver; @@ -58,13 +58,12 @@ import org.apache.ignite.configuration.TransactionConfiguration; import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction; +import org.apache.ignite.internal.processors.platform.cache.expiry.PlatformExpiryPolicyFactory; import org.apache.ignite.platform.dotnet.PlatformDotNetAffinityFunction; import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration; import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration; import org.apache.ignite.platform.dotnet.PlatformDotNetCacheStoreFactoryNative; import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration; -import org.apache.ignite.internal.processors.platform.cache.expiry.PlatformExpiryPolicyFactory; -import org.apache.ignite.platform.dotnet.*; import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpiMBean;
[4/5] ignite git commit: IGNITE-4045 .NET: Support DML API - fix code analysis warnings
IGNITE-4045 .NET: Support DML API - fix code analysis warnings Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b711a32 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b711a32 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b711a32 Branch: refs/heads/ignite-3477 Commit: 7b711a3248b0dafdcea195766b50be4d44656f7f Parents: b7908d7 Author: Pavel TupitsynAuthored: Mon Jan 16 19:50:35 2017 +0300 Committer: Pavel Tupitsyn Committed: Mon Jan 16 19:50:35 2017 +0300 -- .../Apache.Ignite.Core.csproj | 1 + .../Binary/BinaryArrayEqualityComparer.cs | 2 +- .../Binary/BinaryEqualityComparerSerializer.cs | 2 +- .../Impl/Binary/DateTimeHolder.cs | 22 +++- .../Impl/Binary/Io/IBinaryStream.cs | 16 - .../Impl/Binary/Io/IBinaryStreamProcessor.cs| 36 6 files changed, 60 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index 42ccdd4..d58c872 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -185,6 +185,7 @@ + http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs index 09f7f0f..4e29a91 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs @@ -26,7 +26,7 @@ namespace Apache.Ignite.Core.Binary /// /// Compares binary object equality using underlying byte array. /// -public class BinaryArrayEqualityComparer : IEqualityComparer, IBinaryEqualityComparer, +public sealed class BinaryArrayEqualityComparer : IEqualityComparer, IBinaryEqualityComparer, IBinaryStreamProcessor , int> { /// http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs index aa4795e..bb26076 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs @@ -92,7 +92,7 @@ namespace Apache.Ignite.Core.Impl.Binary }; default: -throw new ArgumentOutOfRangeException(); +throw new ArgumentOutOfRangeException("reader", type, "Invalid EqualityComparer type code"); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs index 6adb847..21c56a9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs @@ -69,7 +69,7 @@ namespace Apache.Ignite.Core.Impl.Binary public override bool Equals(object obj) { if (ReferenceEquals(null, obj)) return false; -return obj is DateTimeHolder && _item.Equals(((DateTimeHolder) obj)._item); +return obj is DateTimeHolder && Equals((DateTimeHolder) obj); } /** */ @@ -77,5 +77,25 @@ namespace Apache.Ignite.Core.Impl.Binary { return _item.GetHashCode(); } + +/** */ +public static bool operator ==(DateTimeHolder left, DateTimeHolder right) +{ +return left.Equals(right); +} +
[1/5] ignite git commit: IGNITE-4514: Hadoop: fixed intermittent intermittent failure in HadoopCommandLineTest.testHiveCommandLine. This closes #1397.
Repository: ignite Updated Branches: refs/heads/ignite-3477 ca373d786 -> 4538818a3 IGNITE-4514: Hadoop: fixed intermittent intermittent failure in HadoopCommandLineTest.testHiveCommandLine. This closes #1397. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6d42c2a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6d42c2a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6d42c2a Branch: refs/heads/ignite-3477 Commit: d6d42c2a17b7cf53a71d59931b2cf838bd8116c9 Parents: 82dd912 Author: Ivan VeselovskiyAuthored: Mon Jan 16 16:46:20 2017 +0300 Committer: devozerov Committed: Mon Jan 16 16:46:20 2017 +0300 -- .../processors/hadoop/impl/v2/HadoopV2TaskContext.java| 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d42c2a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java index d328550..5229590 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java @@ -42,7 +42,6 @@ import org.apache.hadoop.util.ReflectionUtils; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.hadoop.io.PartiallyRawComparator; import org.apache.ignite.hadoop.io.TextPartiallyRawComparator; -import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader; import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils; import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit; import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit; @@ -508,12 +507,6 @@ public class HadoopV2TaskContext extends HadoopTaskContext { FileSystem fs; try { -// This assertion uses .startsWith() instead of .equals() because task class loaders may -// be reused between tasks of the same job. -assert ((HadoopClassLoader)getClass().getClassLoader()).name() -.startsWith(HadoopClassLoader.nameForTask(taskInfo(), true)); - -// We also cache Fs there, all them will be cleared explicitly upon the Job end. fs = fileSystemForMrUserWithCaching(jobDir.toUri(), jobConf(), fsMap); } catch (IOException e) {
[5/5] ignite git commit: Merge master into ignite-3477
Merge master into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4538818a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4538818a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4538818a Branch: refs/heads/ignite-3477 Commit: 4538818a36143a66dd4aaa3b9b4f819bce271545 Parents: ca373d7 7b711a3 Author: Alexey GoncharukAuthored: Tue Jan 17 13:48:22 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:48:22 2017 +0300 -- .../utils/PlatformConfigurationUtils.java | 128 +++- .../hadoop/impl/v2/HadoopV2TaskContext.java | 7 - .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 159 ++ .../BinaryBuilderSelfTestArrayIdentity.cs | 34 +++ .../Binary/BinaryEqualityComparerTest.cs| 279 + .../Binary/IO/BinaryStreamsTest.cs | 19 ++ .../Cache/CacheConfigurationTest.cs | 5 +- .../Cache/Query/CacheDmlQueriesTest.cs | 296 +++ .../IgniteConfigurationSerializerTest.cs| 46 ++- .../IgniteConfigurationTest.cs | 28 ++ .../Apache.Ignite.Core.csproj | 5 + .../Binary/BinaryArrayEqualityComparer.cs | 149 ++ .../Binary/BinaryConfiguration.cs | 24 ++ .../Binary/BinaryTypeConfiguration.cs | 14 + .../Cache/Configuration/QueryEntity.cs | 33 ++- .../Cache/Configuration/QueryField.cs | 6 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 85 -- .../IgniteConfigurationSection.xsd | 19 ++ .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 28 +- .../Binary/BinaryEqualityComparerSerializer.cs | 99 +++ .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 + .../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +- .../Impl/Binary/BinaryObject.cs | 31 +- .../Impl/Binary/BinaryObjectBuilder.cs | 62 +++- .../Impl/Binary/BinaryObjectHeader.cs | 21 +- .../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 ++ .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 6 +- .../Impl/Binary/BinaryWriter.cs | 11 +- .../Impl/Binary/DateTimeHolder.cs | 35 ++- .../Impl/Binary/IBinaryEqualityComparer.cs | 53 .../Impl/Binary/IBinaryTypeDescriptor.cs| 5 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Io/BinaryStreamBase.cs | 13 + .../Impl/Binary/Io/IBinaryStream.cs | 11 +- .../Impl/Binary/Io/IBinaryStreamProcessor.cs| 36 +++ .../Impl/Binary/Marshaller.cs | 22 +- .../Impl/Binary/SerializableObjectHolder.cs | 16 + .../Common/IgniteConfigurationXmlSerializer.cs | 5 +- .../Impl/Memory/PlatformMemoryStream.cs | 16 + 41 files changed, 1845 insertions(+), 160 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4538818a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java -- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index 8202e4a,c0fde97..33571ad --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@@ -17,20 -17,15 +17,26 @@@ package org.apache.ignite.internal.processors.platform.utils; +import java.lang.management.ManagementFactory; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; ++import java.util.Set; ++import java.util.HashSet; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.cache.configuration.Factory; +import javax.cache.expiry.ExpiryPolicy; + import org.apache.ignite.binary.BinaryArrayIdentityResolver; + import org.apache.ignite.binary.BinaryFieldIdentityResolver; + import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; + import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; import
[3/5] ignite git commit: IGNITE-4045 .NET: Support DML API
IGNITE-4045 .NET: Support DML API This closes #1309 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7908d7a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7908d7a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7908d7a Branch: refs/heads/ignite-3477 Commit: b7908d7a65f07615f2ff183e107c5002658bd511 Parents: d6d42c2 Author: Pavel TupitsynAuthored: Mon Jan 16 17:48:08 2017 +0300 Committer: Pavel Tupitsyn Committed: Mon Jan 16 17:48:08 2017 +0300 -- .../utils/PlatformConfigurationUtils.java | 128 +++- .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 159 ++ .../BinaryBuilderSelfTestArrayIdentity.cs | 34 +++ .../Binary/BinaryEqualityComparerTest.cs| 279 + .../Binary/IO/BinaryStreamsTest.cs | 19 ++ .../Cache/CacheConfigurationTest.cs | 5 +- .../Cache/Query/CacheDmlQueriesTest.cs | 296 +++ .../IgniteConfigurationSerializerTest.cs| 46 ++- .../IgniteConfigurationTest.cs | 28 ++ .../Apache.Ignite.Core.csproj | 4 + .../Binary/BinaryArrayEqualityComparer.cs | 149 ++ .../Binary/BinaryConfiguration.cs | 24 ++ .../Binary/BinaryTypeConfiguration.cs | 14 + .../Cache/Configuration/QueryEntity.cs | 33 ++- .../Cache/Configuration/QueryField.cs | 6 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 85 -- .../IgniteConfigurationSection.xsd | 19 ++ .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 28 +- .../Binary/BinaryEqualityComparerSerializer.cs | 99 +++ .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 + .../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +- .../Impl/Binary/BinaryObject.cs | 31 +- .../Impl/Binary/BinaryObjectBuilder.cs | 62 +++- .../Impl/Binary/BinaryObjectHeader.cs | 21 +- .../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 ++ .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 6 +- .../Impl/Binary/BinaryWriter.cs | 11 +- .../Impl/Binary/DateTimeHolder.cs | 15 +- .../Impl/Binary/IBinaryEqualityComparer.cs | 53 .../Impl/Binary/IBinaryTypeDescriptor.cs| 5 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Io/BinaryStreamBase.cs | 13 + .../Impl/Binary/Io/IBinaryStream.cs | 25 ++ .../Impl/Binary/Marshaller.cs | 22 +- .../Impl/Binary/SerializableObjectHolder.cs | 16 + .../Common/IgniteConfigurationXmlSerializer.cs | 5 +- .../Impl/Memory/PlatformMemoryStream.cs | 16 + 39 files changed, 1803 insertions(+), 152 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index f845675..c0fde97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -17,8 +17,12 @@ package org.apache.ignite.internal.processors.platform.utils; +import org.apache.ignite.binary.BinaryArrayIdentityResolver; +import org.apache.ignite.binary.BinaryFieldIdentityResolver; +import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; +import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMemoryMode; @@ -68,6 +72,8 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.HashSet; /** * Configuration utils. @@ -428,14 +434,25 @@ public class PlatformConfigurationUtils { // Fields int cnt = in.readInt(); +Set keyFields = new HashSet<>(cnt); if (cnt > 0) { LinkedHashMap fields = new LinkedHashMap<>(cnt); -for (int i = 0; i < cnt; i++) -
[2/5] ignite git commit: IGNITE-4045 .NET: Support DML API
http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs index 08789b6..ce9fcf6 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs @@ -157,8 +157,6 @@ { IgniteArgumentCheck.NotNull(configuration, "configuration"); -CopyLocalProperties(configuration); - using (var stream = IgniteManager.Memory.Allocate().GetStream()) { var marsh = new Marshaller(configuration.BinaryConfiguration); @@ -171,6 +169,8 @@ ReadCore(marsh.StartUnmarshal(stream)); } + +CopyLocalProperties(configuration); } /// @@ -255,12 +255,37 @@ writer.WriteBoolean(false); // Binary config -var isCompactFooterSet = BinaryConfiguration != null && BinaryConfiguration.CompactFooterInternal != null; +if (BinaryConfiguration != null) +{ +writer.WriteBoolean(true); -writer.WriteBoolean(isCompactFooterSet); +if (BinaryConfiguration.CompactFooterInternal != null) +{ +writer.WriteBoolean(true); +writer.WriteBoolean(BinaryConfiguration.CompactFooter); +} +else +{ +writer.WriteBoolean(false); +} + +// Send only descriptors with non-null EqualityComparer to preserve old behavior where +// remote nodes can have no BinaryConfiguration. +var types = writer.Marshaller.GetUserTypeDescriptors().Where(x => x.EqualityComparer != null).ToList(); + +writer.WriteInt(types.Count); -if (isCompactFooterSet) -writer.WriteBoolean(BinaryConfiguration.CompactFooter); +foreach (var type in types) +{ + writer.WriteString(BinaryUtils.SimpleTypeName(type.TypeName)); +writer.WriteBoolean(type.IsEnum); +BinaryEqualityComparerSerializer.Write(writer, type.EqualityComparer); +} +} +else +{ +writer.WriteBoolean(false); +} // User attributes var attrs = UserAttributes; @@ -361,7 +386,28 @@ if (r.ReadBoolean()) { BinaryConfiguration = BinaryConfiguration ?? new BinaryConfiguration(); -BinaryConfiguration.CompactFooter = r.ReadBoolean(); + +if (r.ReadBoolean()) +BinaryConfiguration.CompactFooter = r.ReadBoolean(); + +var typeCount = r.ReadInt(); + +if (typeCount > 0) +{ +var types = new List(typeCount); + +for (var i = 0; i < typeCount; i++) +{ +types.Add(new BinaryTypeConfiguration +{ +TypeName = r.ReadString(), +IsEnum = r.ReadBoolean(), +EqualityComparer = BinaryEqualityComparerSerializer.Read(r) +}); +} + +BinaryConfiguration.TypeConfigurations = types; +} } // User attributes @@ -402,17 +448,15 @@ /// The binary reader. private void Read(BinaryReader binaryReader) { -var r = binaryReader; - -CopyLocalProperties(r.Marshaller.Ignite.Configuration); +ReadCore(binaryReader); -ReadCore(r); +CopyLocalProperties(binaryReader.Marshaller.Ignite.Configuration); // Misc -IgniteHome = r.ReadString(); +IgniteHome = binaryReader.ReadString(); -JvmInitialMemoryMb = (int) (r.ReadLong()/1024/2014); -JvmMaxMemoryMb = (int) (r.ReadLong()/1024/2014); +JvmInitialMemoryMb = (int) (binaryReader.ReadLong()/1024/2014); +JvmMaxMemoryMb = (int) (binaryReader.ReadLong()/1024/2014); // Local data (not from reader) JvmDllPath = Process.GetCurrentProcess().Modules.OfType() @@ -426,9 +470,16 @@ private void CopyLocalProperties(IgniteConfiguration cfg) { GridName = cfg.GridName; -BinaryConfiguration = cfg.BinaryConfiguration == null -? null -: new BinaryConfiguration(cfg.BinaryConfiguration); + +if (BinaryConfiguration
[09/50] [abbrv] ignite git commit: IGNITE-3430 .NET: Refactor transactional tests to a separate class
IGNITE-3430 .NET: Refactor transactional tests to a separate class Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/864af7eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/864af7eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/864af7eb Branch: refs/heads/ignite-3477 Commit: 864af7eb48f19b8d6350332100f741fcdccdb5ad Parents: 06ef846 Author: Pavel TupitsynAuthored: Wed Dec 28 13:55:26 2016 +0300 Committer: Pavel Tupitsyn Committed: Wed Dec 28 13:55:26 2016 +0300 -- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Cache/CacheAbstractTest.cs | 625 --- .../Cache/CacheAbstractTransactionalTest.cs | 556 + .../Cache/CacheLocalAtomicTest.cs | 5 - .../Cache/CacheLocalTest.cs | 6 +- .../CachePartitionedAtomicNearEnabledTest.cs| 5 - .../Cache/CachePartitionedAtomicTest.cs | 5 - .../Cache/CachePartitionedNearEnabledTest.cs| 7 +- .../Cache/CachePartitionedTest.cs | 7 +- .../Cache/CacheReplicatedAtomicTest.cs | 5 - .../Cache/CacheReplicatedTest.cs| 7 +- 11 files changed, 561 insertions(+), 668 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/864af7eb/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index f440c25..5948593 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -71,6 +71,7 @@ + http://git-wip-us.apache.org/repos/asf/ignite/blob/864af7eb/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs index 821a179..250f974 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs @@ -1917,621 +1917,6 @@ namespace Apache.Ignite.Core.Tests.Cache } /// -/// Simple cache lock test (while is ignored). -/// -[Test] -public void TestLockSimple() -{ -if (!LockingEnabled()) -return; - -var cache = Cache(); - -const int key = 7; - -Action checkLock = lck => -{ -using (lck) -{ -Assert.Throws(lck.Exit); // can't exit if not entered - -lck.Enter(); - -Assert.IsTrue(cache.IsLocalLocked(key, true)); -Assert.IsTrue(cache.IsLocalLocked(key, false)); - -lck.Exit(); - -Assert.IsFalse(cache.IsLocalLocked(key, true)); -Assert.IsFalse(cache.IsLocalLocked(key, false)); - -Assert.IsTrue(lck.TryEnter()); - -Assert.IsTrue(cache.IsLocalLocked(key, true)); -Assert.IsTrue(cache.IsLocalLocked(key, false)); - -lck.Exit(); -} - -Assert.Throws(lck.Enter); // Can't enter disposed lock -}; - -checkLock(cache.Lock(key)); -checkLock(cache.LockAll(new[] {key, 1, 2, 3})); -} - -[Test] -[Ignore("IGNITE-835")] -public void TestLock() -{ -if (!LockingEnabled()) -return; - -var cache = Cache(); - -const int key = 7; - -// Lock -CheckLock(cache, key, () => cache.Lock(key)); - -// LockAll -CheckLock(cache, key, () => cache.LockAll(new[] { key, 2, 3, 4, 5 })); -} - -/// -/// Internal lock test routine. -/// -/// Cache. -/// Key. -/// Function to get the lock. -private static void CheckLock(ICache cache, int key, Func getLock) -{ -var sharedLock = getLock(); - -using (sharedLock) -{ -Assert.Throws(() => sharedLock.Exit()); // can't exit if not entered - -sharedLock.Enter(); - -try -
[08/50] [abbrv] ignite git commit: IGNITE-3875: Introduced separate thread pool for data streamer. This closes #1173. This closes #1383.
IGNITE-3875: Introduced separate thread pool for data streamer. This closes #1173. This closes #1383. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d82d6a0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d82d6a0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d82d6a0 Branch: refs/heads/ignite-3477 Commit: 7d82d6a06b5e9f1f8cd2909b865e37d46b8da03f Parents: 7e73d02 Author: devozerovAuthored: Wed Dec 28 12:58:11 2016 +0300 Committer: devozerov Committed: Wed Dec 28 12:58:11 2016 +0300 -- .../configuration/IgniteConfiguration.java | 31 ++ .../ignite/internal/GridKernalContext.java | 7 ++ .../ignite/internal/GridKernalContextImpl.java | 12 +++ .../apache/ignite/internal/IgniteKernal.java| 3 + .../org/apache/ignite/internal/IgnitionEx.java | 19 .../managers/communication/GridIoManager.java | 2 + .../managers/communication/GridIoPolicy.java| 3 + .../closure/GridClosureProcessor.java | 2 +- .../datastreamer/DataStreamProcessor.java | 60 --- .../datastreamer/DataStreamerImpl.java | 37 ++- .../internal/processors/pool/PoolProcessor.java | 5 + .../DataStreamProcessorSelfTest.java| 104 +++ .../junits/GridTestKernalContext.java | 12 +-- 13 files changed, 249 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d82d6a0/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index dcd8a80..e0ff9b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -148,6 +148,9 @@ public class IgniteConfiguration { /** Default core size of public thread pool. */ public static final int DFLT_PUBLIC_THREAD_CNT = Math.max(8, AVAILABLE_PROC_CNT); +/** Default size of data streamer thread pool. */ +public static final int DFLT_DATA_STREAMER_POOL_SIZE = DFLT_PUBLIC_THREAD_CNT; + /** Default keep alive time for public thread pool. */ @Deprecated public static final long DFLT_PUBLIC_KEEP_ALIVE_TIME = 0; @@ -251,6 +254,9 @@ public class IgniteConfiguration { /** IGFS pool size. */ private int igfsPoolSize = AVAILABLE_PROC_CNT; +/** Data stream pool size. */ +private int dataStreamerPoolSize = DFLT_DATA_STREAMER_POOL_SIZE; + /** Utility cache pool size. */ private int utilityCachePoolSize = DFLT_SYSTEM_CORE_THREAD_CNT; @@ -514,6 +520,7 @@ public class IgniteConfiguration { clockSyncFreq = cfg.getClockSyncFrequency(); clockSyncSamples = cfg.getClockSyncSamples(); consistentId = cfg.getConsistentId(); +dataStreamerPoolSize = cfg.getDataStreamerThreadPoolSize(); deployMode = cfg.getDeploymentMode(); discoStartupDelay = cfg.getDiscoveryStartupDelay(); failureDetectionTimeout = cfg.getFailureDetectionTimeout(); @@ -837,6 +844,17 @@ public class IgniteConfiguration { } /** + * Size of thread pool that is in charge of processing data stream messages. + * + * If not provided, executor service will have size {@link #DFLT_DATA_STREAMER_POOL_SIZE}. + * + * @return Thread pool size to be used for data stream messages. + */ +public int getDataStreamerThreadPoolSize() { +return dataStreamerPoolSize; +} + +/** * Default size of thread pool that is in charge of processing utility cache messages. * * If not provided, executor service will have size {@link #DFLT_SYSTEM_CORE_THREAD_CNT}. @@ -960,6 +978,19 @@ public class IgniteConfiguration { } /** + * Set thread pool size that will be used to process data stream messages. + * + * @param poolSize Executor service to use for data stream messages. + * @see IgniteConfiguration#getDataStreamerThreadPoolSize() + * @return {@code this} for chaining. + */ +public IgniteConfiguration setDataStreamerThreadPoolSize(int poolSize) { +dataStreamerPoolSize = poolSize; + +return this; +} + +/** * Sets default thread pool size that will be used to process utility cache messages. * * @param poolSize Default executor service size to use for utility cache messages.
[19/50] [abbrv] ignite git commit: For communication spi disabled pairedConnections by default, implemented NIO sessions balancing for this mode.
For communication spi disabled pairedConnections by default, implemented NIO sessions balancing for this mode. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da5b68cc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da5b68cc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da5b68cc Branch: refs/heads/ignite-3477 Commit: da5b68cc89ba6eeff25beb66e3a4d8c2b9871ab3 Parents: 864a95e Author: sboikovAuthored: Thu Dec 29 15:46:59 2016 +0300 Committer: sboikov Committed: Thu Dec 29 15:46:59 2016 +0300 -- .../ignite/internal/util/nio/GridNioServer.java | 159 --- .../communication/tcp/TcpCommunicationSpi.java | 20 +-- .../tcp/TcpCommunicationSpiMBean.java | 5 +- ...mmunicationBalancePairedConnectionsTest.java | 28 .../IgniteCommunicationBalanceTest.java | 25 ++- ...cMessageRecoveryNoPairedConnectionsTest.java | 47 -- ...micMessageRecoveryPairedConnectionsTest.java | 47 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- 8 files changed, 250 insertions(+), 87 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/da5b68cc/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index bc1f173..a59adba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -227,6 +227,9 @@ public class GridNioServer { /** */ private final IgniteRunnable balancer; +/** */ +private final boolean readWriteSelectorsAssign; + /** * @param addr Address. * @param port Port. @@ -250,7 +253,7 @@ public class GridNioServer { * @param writerFactory Writer factory. * @param skipRecoveryPred Skip recovery predicate. * @param msgQueueLsnr Message queue size listener. - * @param balancing NIO sessions balancing flag. + * @param readWriteSelectorsAssign If {@code true} then in/out connections are assigned to even/odd workers. * @param filters Filters for this server. * @throws IgniteCheckedException If failed. */ @@ -275,7 +278,7 @@ public class GridNioServer { GridNioMessageWriterFactory writerFactory, IgnitePredicate skipRecoveryPred, IgniteBiInClosure msgQueueLsnr, -boolean balancing, +boolean readWriteSelectorsAssign, GridNioFilter... filters ) throws IgniteCheckedException { if (port != -1) @@ -300,6 +303,7 @@ public class GridNioServer { this.sndQueueLimit = sndQueueLimit; this.msgQueueLsnr = msgQueueLsnr; this.selectorSpins = selectorSpins; +this.readWriteSelectorsAssign = readWriteSelectorsAssign; filterChain = new GridNioFilterChain<>(log, lsnr, new HeadFilter(), filters); @@ -359,10 +363,16 @@ public class GridNioServer { IgniteRunnable balancer0 = null; -if (balancing && balancePeriod > 0) { +if (balancePeriod > 0) { boolean rndBalance = IgniteSystemProperties.getBoolean(IGNITE_IO_BALANCE_RANDOM_BALANCE, false); -balancer0 = rndBalance ? new RandomBalancer() : new SizeBasedBalancer(balancePeriod); +if (rndBalance) +balancer0 = new RandomBalancer(); +else { +balancer0 = readWriteSelectorsAssign ? +new ReadWriteSizeBasedBalancer(balancePeriod) : +new SizeBasedBalancer(balancePeriod); +} } this.balancer = balancer0; @@ -823,21 +833,31 @@ public class GridNioServer { int balanceIdx; if (workers > 1) { -if (req.accepted()) { -balanceIdx = readBalanceIdx; +if (readWriteSelectorsAssign) { +if (req.accepted()) { +balanceIdx = readBalanceIdx; -readBalanceIdx += 2; +readBalanceIdx += 2; -if (readBalanceIdx >= workers) -readBalanceIdx = 0; +if (readBalanceIdx >= workers) +readBalanceIdx = 0; +} +else { +balanceIdx = writeBalanceIdx; + +writeBalanceIdx += 2; + +if (writeBalanceIdx >= workers) +writeBalanceIdx = 1; +} } else {
[38/50] [abbrv] ignite git commit: ignite-4293 Do not need store deserialized value for BinaryMarshaller
ignite-4293 Do not need store deserialized value for BinaryMarshaller Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d10946b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d10946b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d10946b8 Branch: refs/heads/ignite-3477 Commit: d10946b8b107dee499a5798a4679ab5d14499764 Parents: abc8b90 Author: Alexandr KuramshinAuthored: Fri Jan 13 12:26:39 2017 +0300 Committer: sboikov Committed: Fri Jan 13 12:26:39 2017 +0300 -- .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 5 ++--- .../java/org/apache/ignite/cache/store/jdbc/model/Person.java | 2 +- .../processors/cache/CacheEntryProcessorCopySelfTest.java | 6 -- .../processors/cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java | 5 + 5 files changed, 9 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 208ec62..614c612 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -244,9 +244,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme CacheMemoryMode memMode = ccfg.getMemoryMode(); -boolean storeVal = ctx.config().isPeerClassLoadingEnabled() || -GridQueryProcessor.isEnabled(ccfg) || -!ccfg.isCopyOnRead(); +boolean storeVal = !ccfg.isCopyOnRead() || (!isBinaryEnabled(ccfg) && +(GridQueryProcessor.isEnabled(ccfg) || ctx.config().isPeerClassLoadingEnabled())); CacheObjectContext res = new CacheObjectContext(ctx, ccfg.getName(), http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java index ddf309b..52ddfc8 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java @@ -196,7 +196,7 @@ public class Person implements Serializable { @Override public String toString() { return "Person [id=" + id + ", orgId=" + orgId + -", birthday=" + birthday.getTime() + +", birthday=" + (birthday == null ? null : birthday.getTime()) + ", name=" + name + "]"; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java index 21395e6..f44889b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -93,8 +94,9 @@ public class CacheEntryProcessorCopySelfTest extends GridCommonAbstractTest { doTest(true, false, OLD_VAL, 1); // One deserialization due to copyOnRead == true. -// Additional deserialization in case p2p enabled due to
[23/50] [abbrv] ignite git commit: IGNITE-4519 updating versions for gce and jcloud
IGNITE-4519 updating versions for gce and jcloud Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2774d879 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2774d879 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2774d879 Branch: refs/heads/ignite-3477 Commit: 2774d879a72b0eeced862cc9a3fbd5d9c5ff2d72 Parents: 6c1cd16 Author: chandresh.pancholiAuthored: Thu Jan 5 02:31:13 2017 +0530 Committer: chandresh.pancholi Committed: Thu Jan 5 02:31:13 2017 +0530 -- modules/cloud/pom.xml | 6 +++--- modules/gce/pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2774d879/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 5ac1990..8d806f4 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -33,7 +33,7 @@ http://ignite.apache.org -1.9.0 +2.0.0 @@ -52,13 +52,13 @@ org.apache.jclouds.labs google-compute-engine -${jcloud.version} +1.9.3 org.apache.jclouds.labs docker -${jcloud.version} +1.9.3 http://git-wip-us.apache.org/repos/asf/ignite/blob/2774d879/modules/gce/pom.xml -- diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml index b235d82..89f9a8b 100644 --- a/modules/gce/pom.xml +++ b/modules/gce/pom.xml @@ -44,13 +44,13 @@ com.google.api-client google-api-client -1.19.1 +1.22.0 com.google.apis google-api-services-storage -v1-rev32-1.20.0 +v1-rev92-1.22.0
[40/50] [abbrv] ignite git commit: Added more metrics to Flume IgniteSink.
Added more metrics to Flume IgniteSink. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6045a246 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6045a246 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6045a246 Branch: refs/heads/ignite-3477 Commit: 6045a2469a4d2e23cad918b44e002c7de237abcb Parents: e304b48 Author: shromanAuthored: Sat Jan 14 21:14:34 2017 +0900 Committer: shroman Committed: Sat Jan 14 21:14:34 2017 +0900 -- .../main/java/org/apache/ignite/stream/flume/IgniteSink.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6045a246/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java -- diff --git a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java index e6e7e90..083e833 100644 --- a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java +++ b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java @@ -85,7 +85,7 @@ public class IgniteSink extends AbstractSink implements Configurable { } /** - * Starts a grid and initializes na event transformer. + * Starts a grid and initializes an event transformer. */ @SuppressWarnings("unchecked") @Override synchronized public void start() { @@ -109,9 +109,13 @@ public class IgniteSink extends AbstractSink implements Configurable { catch (Exception e) { log.error("Failed to start grid", e); +sinkCounter.incrementConnectionFailedCount(); + throw new FlumeException("Failed to start grid", e); } +sinkCounter.incrementConnectionCreatedCount(); + super.start(); } @@ -122,6 +126,7 @@ public class IgniteSink extends AbstractSink implements Configurable { if (ignite != null) ignite.close(); +sinkCounter.incrementConnectionClosedCount(); sinkCounter.stop(); super.stop();
[17/50] [abbrv] ignite git commit: IGNITE-4167: Changed IGNITE_TO_STRING_INCLUDE_SENSITIVE default value to "true".
IGNITE-4167: Changed IGNITE_TO_STRING_INCLUDE_SENSITIVE default value to "true". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c38eb28 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c38eb28 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c38eb28 Branch: refs/heads/ignite-3477 Commit: 6c38eb28623271a3604ee8d966deb88677a3adb1 Parents: 5494dfb Author: devozerovAuthored: Thu Dec 29 12:20:20 2016 +0300 Committer: devozerov Committed: Thu Dec 29 12:20:20 2016 +0300 -- .../util/tostring/GridToStringBuilder.java| 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c38eb28/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java index 333f95e..6807b3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java @@ -17,6 +17,13 @@ package org.apache.ignite.internal.util.tostring; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; + import java.io.Externalizable; import java.io.InputStream; import java.io.OutputStream; @@ -34,12 +41,8 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.ignite.IgniteException; -import org.apache.ignite.IgniteSystemProperties; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.SB; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE; /** * Provides auto-generation framework for {@code toString()} output. @@ -87,7 +90,8 @@ public class GridToStringBuilder { public static final int MAX_COL_SIZE = 100; /** {@link IgniteSystemProperties#IGNITE_TO_STRING_INCLUDE_SENSITIVE} */ -public static final boolean INCLUDE_SENSITIVE = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE, false); +public static final boolean INCLUDE_SENSITIVE = +IgniteSystemProperties.getBoolean(IGNITE_TO_STRING_INCLUDE_SENSITIVE, true); /** */ private static ThreadLocal threadCache = new ThreadLocal () {
[11/50] [abbrv] ignite git commit: IGNITE-3961: IGFS: Added IgfsSecondaryFileSystem.affintiy() method. This closes #1114. This closes #1252.
IGNITE-3961: IGFS: Added IgfsSecondaryFileSystem.affintiy() method. This closes #1114. This closes #1252. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2df39a80 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2df39a80 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2df39a80 Branch: refs/heads/ignite-3477 Commit: 2df39a80d80e2575be61a902ccd48615796fcde9 Parents: a61b0ea Author: tledkov-gridgainAuthored: Wed Dec 28 16:47:24 2016 +0300 Committer: devozerov Committed: Wed Dec 28 16:47:24 2016 +0300 -- .../igfs/IgfsGroupDataBlocksKeyMapper.java | 17 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 18 ++ .../local/LocalIgfsSecondaryFileSystem.java | 96 ++- .../processors/igfs/IgfsBaseBlockKey.java | 42 +++ .../internal/processors/igfs/IgfsBlockKey.java | 26 +- .../processors/igfs/IgfsBlockLocationImpl.java | 55 .../processors/igfs/IgfsDataManager.java| 12 +- .../internal/processors/igfs/IgfsImpl.java | 12 +- .../processors/igfs/IgfsKernalContextAware.java | 32 --- .../igfs/IgfsSecondaryFileSystemImpl.java | 7 + .../local/LocalFileSystemBlockKey.java | 103 +++ .../LocalFileSystemPositionedReadable.java | 65 + ...fsSecondaryFileSystemPositionedReadable.java | 65 - .../processors/resource/GridResourceIoc.java| 6 +- .../resource/GridResourceProcessor.java | 31 ++- .../ignite/resources/FileSystemResource.java| 62 + .../processors/igfs/IgfsAbstractSelfTest.java | 2 +- .../igfs/IgfsDualAbstractSelfTest.java | 14 +- ...fsLocalSecondaryFileSystemProxySelfTest.java | 81 ++ ...gfsSecondaryFileSystemInjectionSelfTest.java | 270 +++ .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 21 +- ...doopIgfsSecondaryFileSystemDelegateImpl.java | 61 - .../impl/igfs/Hadoop1OverIgfsProxyTest.java | 67 + .../testsuites/IgniteHadoopTestSuite.java | 2 + 25 files changed, 1031 insertions(+), 139 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2df39a80/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java index b35b692..09143d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java @@ -18,9 +18,10 @@ package org.apache.ignite.igfs; import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper; -import org.apache.ignite.internal.processors.igfs.IgfsBlockKey; +import org.apache.ignite.internal.processors.igfs.IgfsBaseBlockKey; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; /** * {@code IGFS} class providing ability to group file's data blocks together on one node. @@ -84,15 +85,17 @@ public class IgfsGroupDataBlocksKeyMapper extends GridCacheDefaultAffinityKeyMap /** {@inheritDoc} */ @Override public Object affinityKey(Object key) { -if (key != null && IgfsBlockKey.class.equals(key.getClass())) { -IgfsBlockKey blockKey = (IgfsBlockKey)key; +if (key instanceof IgfsBaseBlockKey) { +IgfsBaseBlockKey blockKey = (IgfsBaseBlockKey)key; -if (blockKey.affinityKey() != null) -return blockKey.affinityKey(); +IgniteUuid affKey = blockKey.affinityKey(); -long grpId = blockKey.getBlockId() / grpSize; +if (affKey != null) +return affKey; -return blockKey.getFileId().hashCode() + (int)(grpId ^ (grpId >>> 32)); +long grpId = blockKey.blockId() / grpSize; + +return blockKey.fileHash() + (int)(grpId ^ (grpId >>> 32)); } return super.affinityKey(key); http://git-wip-us.apache.org/repos/asf/ignite/blob/2df39a80/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java index 37c9c7d..76ba454 100644 ---
[24/50] [abbrv] ignite git commit: IGNITE-4516: Hadoop: implemented optional compression for remote shuffle output. This closes #1399.
IGNITE-4516: Hadoop: implemented optional compression for remote shuffle output. This closes #1399. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d62542b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d62542b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d62542b9 Branch: refs/heads/ignite-3477 Commit: d62542b9bbfff5a221915f2bd1d23ecfee9814cf Parents: 2774d87 Author: devozerovAuthored: Thu Jan 5 11:30:42 2017 +0300 Committer: devozerov Committed: Thu Jan 5 11:30:42 2017 +0300 -- .../processors/hadoop/HadoopJobProperty.java| 7 +++ .../shuffle/HadoopDirectShuffleMessage.java | 34 +++- .../hadoop/shuffle/HadoopShuffleJob.java| 57 +--- .../shuffle/direct/HadoopDirectDataOutput.java | 14 + .../direct/HadoopDirectDataOutputContext.java | 48 +++-- .../direct/HadoopDirectDataOutputState.java | 14 - .../hadoop/impl/HadoopTeraSortTest.java | 32 +-- 7 files changed, 188 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d62542b9/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java index 4398acd..4dd3bf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java @@ -103,6 +103,13 @@ public enum HadoopJobProperty { SHUFFLE_MSG_SIZE("ignite.shuffle.message.size"), /** + * Whether shuffle message should be compressed with GZIP. + * + * Defaults to {@code false}. + */ +SHUFFLE_MSG_GZIP("ignite.shuffle.message.gzip"), + +/** * Whether to stripe mapper output for remote reducers. * * Defaults to {@code false}. http://git-wip-us.apache.org/repos/asf/ignite/blob/d62542b9/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java index e81dc5f..f596100 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java @@ -57,6 +57,9 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { @GridDirectTransient private transient int bufLen; +/** Data length. */ +private int dataLen; + /** * Default constructor. */ @@ -72,8 +75,9 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { * @param cnt Count. * @param buf Buffer. * @param bufLen Buffer length. + * @param dataLen Data length. */ -public HadoopDirectShuffleMessage(HadoopJobId jobId, int reducer, int cnt, byte[] buf, int bufLen) { +public HadoopDirectShuffleMessage(HadoopJobId jobId, int reducer, int cnt, byte[] buf, int bufLen, int dataLen) { assert jobId != null; this.jobId = jobId; @@ -81,6 +85,7 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { this.cnt = cnt; this.buf = buf; this.bufLen = bufLen; +this.dataLen = dataLen; } /** @@ -111,6 +116,13 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { return buf; } +/** + * @return Data length. + */ +public int dataLength() { +return dataLen; +} + /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); @@ -147,6 +159,12 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { writer.incrementState(); +case 4: +if (!writer.writeInt("dataLen", dataLen)) +return false; + +writer.incrementState(); + } return true; @@ -194,6 +212,14 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage { reader.incrementState(); +case 4: +
[27/50] [abbrv] ignite git commit: IGNITE-4461: Hadoop: added automatic resolution of "raw" comparator for Text class.
IGNITE-4461: Hadoop: added automatic resolution of "raw" comparator for Text class. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f406887c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f406887c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f406887c Branch: refs/heads/ignite-3477 Commit: f406887c274550317e1b6fbbe1bb302f53a5eaad Parents: beb242b Author: devozerovAuthored: Thu Jan 5 14:48:06 2017 +0300 Committer: devozerov Committed: Thu Jan 5 14:48:35 2017 +0300 -- .../hadoop/impl/v2/HadoopV2TaskContext.java | 64 ++-- 1 file changed, 46 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f406887c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java index e9cae1c..d328550 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java @@ -41,6 +41,7 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ReflectionUtils; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.hadoop.io.PartiallyRawComparator; +import org.apache.ignite.hadoop.io.TextPartiallyRawComparator; import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader; import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils; import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit; @@ -76,6 +77,8 @@ import java.io.File; import java.io.IOException; import java.security.PrivilegedExceptionAction; import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; import java.util.UUID; import java.util.concurrent.Callable; @@ -99,6 +102,9 @@ public class HadoopV2TaskContext extends HadoopTaskContext { private static final HadoopLazyConcurrentMap fsMap = createHadoopLazyConcurrentMap(); +/** Default partial comparator mappings. */ +private static final Map PARTIAL_COMPARATORS = new HashMap<>(); + /** * This method is called with reflection upon Job finish with class loader of each task. * This will clean up all the Fs created for specific task. @@ -111,24 +117,6 @@ public class HadoopV2TaskContext extends HadoopTaskContext { fsMap.close(); } -/** - * Check for combiner grouping support (available since Hadoop 2.3). - */ -static { -boolean ok; - -try { - JobContext.class.getDeclaredMethod("getCombinerKeyGroupingComparator"); - -ok = true; -} -catch (NoSuchMethodException ignore) { -ok = false; -} - -COMBINE_KEY_GROUPING_SUPPORTED = ok; -} - /** Flag is set if new context-object code is used for running the mapper. */ private final boolean useNewMapper; @@ -153,6 +141,23 @@ public class HadoopV2TaskContext extends HadoopTaskContext { /** Counters for task. */ private final HadoopCounters cntrs = new HadoopCountersImpl(); +static { +boolean ok; + +try { + JobContext.class.getDeclaredMethod("getCombinerKeyGroupingComparator"); + +ok = true; +} +catch (NoSuchMethodException ignore) { +ok = false; +} + +COMBINE_KEY_GROUPING_SUPPORTED = ok; + +PARTIAL_COMPARATORS.put(Text.class.getName(), TextPartiallyRawComparator.class.getName()); +} + /** * @param taskInfo Task info. * @param job Job. @@ -181,6 +186,8 @@ public class HadoopV2TaskContext extends HadoopTaskContext { // For map-reduce jobs prefer local writes. jobConf.setBooleanIfUnset(PARAM_IGFS_PREFER_LOCAL_WRITES, true); +initializePartiallyRawComparator(jobConf); + jobCtx = new JobContextImpl(jobConf, new JobID(jobId.globalId().toString(), jobId.localId())); useNewMapper = jobConf.getUseNewMapper(); @@ -447,6 +454,7 @@ public class HadoopV2TaskContext extends HadoopTaskContext { } /** {@inheritDoc} */ +@SuppressWarnings("unchecked") @Override public Comparator groupComparator() { Comparator res; @@ -581,4 +589,24 @@ public class HadoopV2TaskContext extends HadoopTaskContext { throw
[16/50] [abbrv] ignite git commit: IGNITE-4458: Hadoop: "striped" shuffle mode is default from now on. This closes #1390.
IGNITE-4458: Hadoop: "striped" shuffle mode is default from now on. This closes #1390. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f743465 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f743465 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f743465 Branch: refs/heads/ignite-3477 Commit: 1f743465d6875ef48b1835d03a78a0dbaf339bf6 Parents: a9b1fc2 Author: tledkov-gridgainAuthored: Thu Dec 29 11:14:10 2016 +0300 Committer: devozerov Committed: Thu Dec 29 11:14:10 2016 +0300 -- .../ignite/internal/processors/hadoop/HadoopJobProperty.java | 2 +- .../internal/processors/hadoop/shuffle/HadoopShuffleJob.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1f743465/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java index 4398acd..a3115bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobProperty.java @@ -105,7 +105,7 @@ public enum HadoopJobProperty { /** * Whether to stripe mapper output for remote reducers. * - * Defaults to {@code false}. + * Defaults to {@code true}. */ SHUFFLE_MAPPER_STRIPED_OUTPUT("ignite.shuffle.mapper.striped.output"), http://git-wip-us.apache.org/repos/asf/ignite/blob/1f743465/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java index 1c546a1..7713d6d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java @@ -169,7 +169,7 @@ public class HadoopShuffleJob implements AutoCloseable { this.embedded = embedded; // No stripes for combiner. -boolean stripeMappers0 = get(job.info(), SHUFFLE_MAPPER_STRIPED_OUTPUT, false); +boolean stripeMappers0 = get(job.info(), SHUFFLE_MAPPER_STRIPED_OUTPUT, true); if (stripeMappers0) { if (job.info().hasCombiner()) {
[48/50] [abbrv] ignite git commit: Merge branch ignite-gg-8.0.2.ea2 into ignite-db-x
Merge branch ignite-gg-8.0.2.ea2 into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0ee73fb0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0ee73fb0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0ee73fb0 Branch: refs/heads/ignite-3477 Commit: 0ee73fb097a6d0e15fbfd6ae8acedac46c45a640 Parents: 53e2cd2 b0ac987 Author: Alexey GoncharukAuthored: Tue Jan 17 13:06:46 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:06:46 2017 +0300 -- .gitignore |1 + README.md |8 + RELEASE_NOTES.txt | 22 + assembly/dependencies-fabric-lgpl.xml |1 + assembly/dependencies-fabric.xml|1 + assembly/release-base.xml |5 + assembly/release-fabric-base.xml|1 + bin/control.bat | 229 ++ bin/control.sh | 180 + bin/ignite.sh |9 + config/dotnet/default-dotnet.xml| 45 + examples/pom-standalone.xml |6 + examples/pom.xml|2 +- examples/redis/redis-example.php| 82 + examples/redis/redis-example.py | 62 + examples/schema-import/pom.xml |2 +- .../ignite/examples/ExampleNodeStartup.java |2 +- .../examples/datagrid/CachePutGetExample.java |2 +- .../examples/datagrid/CacheQueryDmlExample.java | 163 + .../scalar/examples/ScalarJvmCloudExample.scala |2 +- .../CacheExamplesMultiNodeSelfTest.java |7 + .../ignite/examples/CacheExamplesSelfTest.java |8 + modules/aop/pom.xml |2 +- modules/apache-license-gen/pom.xml |2 +- modules/aws/pom.xml |2 +- modules/benchmarks/pom.xml |2 +- .../jmh/misc/JmhIncrementBenchmark.java | 95 + modules/camel/pom.xml |2 +- modules/cassandra/pom.xml | 16 +- modules/cassandra/serializers/README.txt|7 +- modules/cassandra/serializers/pom.xml |4 +- modules/cassandra/store/pom.xml |4 +- .../store/cassandra/CassandraCacheStore.java|6 + .../store/cassandra/datasource/DataSource.java |9 + modules/clients/pom.xml | 12 +- .../clients/src/test/config/jdbc-bin-config.xml | 54 + .../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 263 ++ .../JdbcAbstractUpdateStatementSelfTest.java| 37 + ...BinaryMarshallerInsertStatementSelfTest.java | 37 + ...cBinaryMarshallerMergeStatementSelfTest.java | 37 + .../jdbc2/JdbcDeleteStatementSelfTest.java | 49 + .../jdbc2/JdbcInsertStatementSelfTest.java | 122 + .../jdbc2/JdbcMergeStatementSelfTest.java | 91 + .../internal/jdbc2/JdbcNoDefaultCacheTest.java | 40 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 18 + .../rest/ChangeStateCommandHandlerTest.java | 125 + .../rest/ClientMemcachedProtocolSelfTest.java |4 +- .../JettyRestProcessorAbstractSelfTest.java | 11 +- .../rest/RestProcessorMultiStartSelfTest.java | 48 +- .../rest/protocols/tcp/MockNioSession.java | 11 + .../tcp/redis/RedisProtocolSelfTest.java| 101 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java |5 + modules/cloud/pom.xml |2 +- modules/codegen/pom.xml |2 +- .../ignite/codegen/MessageCodeGenerator.java|2 + modules/core/pom.xml|2 +- .../src/main/java/org/apache/ignite/Ignite.java |8 +- .../java/org/apache/ignite/IgniteCache.java |9 + .../apache/ignite/IgniteCheckedException.java | 12 + .../java/org/apache/ignite/IgniteLogger.java|6 +- .../java/org/apache/ignite/IgniteServices.java | 16 + .../apache/ignite/IgniteSystemProperties.java | 58 + .../binary/BinaryAbstractIdentityResolver.java | 53 + .../binary/BinaryArrayIdentityResolver.java | 224 ++ .../binary/BinaryFieldIdentityResolver.java | 307 ++ .../ignite/binary/BinaryIdentityResolver.java | 42 + .../ignite/binary/BinaryTypeConfiguration.java | 27 +- .../org/apache/ignite/cache/QueryEntity.java| 27 + .../rendezvous/RendezvousAffinityFunction.java | 80 +- .../ignite/cache/query/SqlFieldsQuery.java |2 +- .../cache/store/CacheLoadOnlyStoreAdapter.java |6 +- .../ignite/cache/store/CacheStoreAdapter.java |6 + .../cache/store/jdbc/CacheJdbcPojoStore.java| 19 +-
[37/50] [abbrv] ignite git commit: IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419.
IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abc8b909 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abc8b909 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abc8b909 Branch: refs/heads/ignite-3477 Commit: abc8b9091e9eda8cc43f398939bf1fb6035f7a3f Parents: 1f358db Author: Alexander PaschenkoAuthored: Thu Jan 12 10:50:14 2017 +0300 Committer: devozerov Committed: Thu Jan 12 10:50:14 2017 +0300 -- .../processors/query/GridQueryProcessor.java | 2 +- ...IgniteCacheAbstractInsertSqlQuerySelfTest.java | 14 +++--- .../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +++--- .../cache/IgniteCacheInsertSqlQuerySelfTest.java | 18 ++ .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 14 +++--- .../cache/IgniteCacheUpdateSqlQuerySelfTest.java | 4 ++-- 6 files changed, 30 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 58f94f4..3286bac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -2147,7 +2147,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { if (!(obj instanceof BinaryObjectBuilder)) throw new UnsupportedOperationException("Individual properties can be set for binary builders only"); -setValue0((BinaryObjectBuilder) obj, name(), propVal, type()); +setValue0((BinaryObjectBuilder) obj, propName, propVal, type()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java index df4259e..86d01c7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java @@ -151,7 +151,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm LinkedHashMap flds = new LinkedHashMap<>(); flds.put("id", Integer.class.getName()); -flds.put("name", String.class.getName()); +flds.put("firstName", String.class.getName()); s2p.setFields(flds); @@ -172,7 +172,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm LinkedHashMap flds = new LinkedHashMap<>(); flds.put("id", Integer.class.getName()); -flds.put("name", String.class.getName()); +flds.put("firstName", String.class.getName()); i2p.setFields(flds); @@ -194,7 +194,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm flds.put("key", Integer.class.getName()); flds.put("id", Integer.class.getName()); -flds.put("name", String.class.getName()); +flds.put("firstName", String.class.getName()); k2p.setFields(flds); @@ -216,7 +216,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm flds.put("Id", Integer.class.getName()); flds.put("id", Integer.class.getName()); -flds.put("name", String.class.getName()); +flds.put("firstName", String.class.getName()); flds.put("IntVal", Integer.class.getName()); k22p.setFields(flds); @@ -240,7 +240,7 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm flds.put("key", Integer.class.getName()); flds.put("strKey", String.class.getName()); flds.put("id", Integer.class.getName()); -flds.put("name",
[31/50] [abbrv] ignite git commit: IGNITE-4470 Added support for log file configuration via environmental variable IGNITE_ODBC_LOG_PATH
IGNITE-4470 Added support for log file configuration via environmental variable IGNITE_ODBC_LOG_PATH This closes #1384 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/825fe9cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/825fe9cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/825fe9cd Branch: refs/heads/ignite-3477 Commit: 825fe9cd64ded64068c573d7e3c3901efae6283f Parents: 9e8e979 Author: Sergey KalashnikovAuthored: Tue Jan 10 15:57:05 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 15:57:05 2017 +0300 -- modules/platforms/cpp/odbc/Makefile.am | 3 +- modules/platforms/cpp/odbc/include/Makefile.am | 3 +- .../ignite/odbc/config/connection_info.h| 2 - .../cpp/odbc/include/ignite/odbc/log.h | 123 ++ .../odbc/include/ignite/odbc/meta/column_meta.h | 2 - .../cpp/odbc/include/ignite/odbc/utility.h | 19 +-- .../odbc/os/linux/src/system/socket_client.cpp | 9 +- .../odbc/os/win/src/system/socket_client.cpp| 9 +- .../src/system/ui/dsn_configuration_window.cpp | 18 +- .../cpp/odbc/os/win/src/system_dsn.cpp | 17 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 + .../cpp/odbc/project/vs/odbc.vcxproj.filters| 6 + .../cpp/odbc/src/config/connection_info.cpp | 3 - modules/platforms/cpp/odbc/src/connection.cpp | 19 ++- .../odbc/src/diagnostic/diagnosable_adapter.cpp | 3 +- modules/platforms/cpp/odbc/src/entry_points.cpp | 52 +++--- modules/platforms/cpp/odbc/src/log.cpp | 83 + .../platforms/cpp/odbc/src/meta/column_meta.cpp | 4 - modules/platforms/cpp/odbc/src/odbc.cpp | 167 ++- .../odbc/src/query/column_metadata_query.cpp| 13 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 23 ++- .../cpp/odbc/src/query/table_metadata_query.cpp | 12 +- modules/platforms/cpp/odbc/src/statement.cpp| 11 +- modules/platforms/cpp/odbc/src/utility.cpp | 18 +- 24 files changed, 412 insertions(+), 209 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/Makefile.am -- diff --git a/modules/platforms/cpp/odbc/Makefile.am b/modules/platforms/cpp/odbc/Makefile.am index 1eb42d1..de6f75a 100644 --- a/modules/platforms/cpp/odbc/Makefile.am +++ b/modules/platforms/cpp/odbc/Makefile.am @@ -79,7 +79,8 @@ libignite_odbc_la_SOURCES = \ src/column.cpp \ src/statement.cpp \ src/type_traits.cpp \ -src/utility.cpp +src/utility.cpp \ +src/log.cpp clean-local: $(RM) *.gcno *.gcda http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/Makefile.am -- diff --git a/modules/platforms/cpp/odbc/include/Makefile.am b/modules/platforms/cpp/odbc/include/Makefile.am index 073dcaa..36d8e25 100644 --- a/modules/platforms/cpp/odbc/include/Makefile.am +++ b/modules/platforms/cpp/odbc/include/Makefile.am @@ -53,7 +53,8 @@ noinst_HEADERS = \ ignite/odbc/cursor.h \ ignite/odbc/common_types.h \ ignite/odbc/result_page.h \ -ignite/odbc/type_traits.h +ignite/odbc/type_traits.h \ +ignite/odbc/log.h uninstall-hook: if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h -- diff --git a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h index e0ed152..d421952 100644 --- a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h +++ b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h @@ -40,7 +40,6 @@ namespace ignite /** Info type. */ typedef unsigned short InfoType; -#ifdef ODBC_DEBUG /** * Convert type to string containing its name. * Debug function. @@ -48,7 +47,6 @@ namespace ignite * @return Null-terminated string containing types name. */ static const char* InfoTypeToString(InfoType type); -#endif /** * Constructor. http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/ignite/odbc/log.h -- diff --git a/modules/platforms/cpp/odbc/include/ignite/odbc/log.h
[14/50] [abbrv] ignite git commit: IGNITE-4462: IGFS: removed grid name from HadoopIgfsEndpoint. This closes #1368.
IGNITE-4462: IGFS: removed grid name from HadoopIgfsEndpoint. This closes #1368. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e691d80 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e691d80 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e691d80 Branch: refs/heads/ignite-3477 Commit: 2e691d80ea4870c3e7b5b127792b66c920f72c39 Parents: 2df39a8 Author: tledkov-gridgainAuthored: Thu Dec 29 11:00:01 2016 +0300 Committer: devozerov Committed: Thu Dec 29 11:00:01 2016 +0300 -- .../igfs/common/IgfsHandshakeRequest.java | 17 - .../internal/igfs/common/IgfsMarshaller.java| 2 -- .../processors/igfs/IgfsIpcHandler.java | 4 --- .../mapreduce/IgniteHadoopMapReducePlanner.java | 6 ++-- .../IgniteHadoopWeightedMapReducePlanner.java | 5 +-- .../hadoop/igfs/HadoopIgfsEndpoint.java | 38 +--- .../hadoop/impl/igfs/HadoopIgfsOutProc.java | 24 ++--- .../hadoop/impl/igfs/HadoopIgfsWrapper.java | 33 + .../impl/HadoopAbstractMapReduceTest.java | 2 +- .../hadoop/impl/HadoopAbstractSelfTest.java | 3 +- .../impl/HadoopTaskExecutionSelfTest.java | 19 +- .../client/HadoopClientProtocolSelfTest.java| 2 +- .../impl/igfs/Hadoop1DualAbstractTest.java | 7 ++-- .../igfs/HadoopFIleSystemFactorySelfTest.java | 6 ++-- ...Igfs20FileSystemLoopbackPrimarySelfTest.java | 2 +- ...oopIgfs20FileSystemShmemPrimarySelfTest.java | 2 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java| 6 ++-- ...oopSecondaryFileSystemConfigurationTest.java | 4 +-- .../hadoop/impl/igfs/IgfsEventsTestSuite.java | 4 +-- .../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +-- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 32 - ...niteHadoopFileSystemLoggerStateSelfTest.java | 6 ++-- ...condaryFileSystemInitializationSelfTest.java | 4 +-- 24 files changed, 104 insertions(+), 130 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java index 21da5b1..1335ca8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java @@ -25,9 +25,6 @@ import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.HANDSHAKE; * Handshake request. */ public class IgfsHandshakeRequest extends IgfsMessage { -/** Expected Grid name. */ -private String gridName; - /** Expected IGFS name. */ private String igfsName; @@ -45,20 +42,6 @@ public class IgfsHandshakeRequest extends IgfsMessage { } /** - * @return Grid name. - */ -public String gridName() { -return gridName; -} - -/** - * @param gridName Grid name. - */ -public void gridName(String gridName) { -this.gridName = gridName; -} - -/** * @return IGFS name. */ public String igfsName() { http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java index 91656fd..859069a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java @@ -97,7 +97,6 @@ public class IgfsMarshaller { IgfsHandshakeRequest req = (IgfsHandshakeRequest)msg; -U.writeString(out, req.gridName()); U.writeString(out, req.igfsName()); U.writeString(out, req.logDirectory()); @@ -214,7 +213,6 @@ public class IgfsMarshaller { case HANDSHAKE: { IgfsHandshakeRequest req = new IgfsHandshakeRequest(); -req.gridName(U.readString(in)); req.igfsName(U.readString(in)); req.logDirectory(U.readString(in));
[32/50] [abbrv] ignite git commit: IGNITE-4532 .NET: Fix build warnings
IGNITE-4532 .NET: Fix build warnings Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87fbb275 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87fbb275 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87fbb275 Branch: refs/heads/ignite-3477 Commit: 87fbb275eb9d11084485e6b4314b5bf7f8d42a1a Parents: 825fe9c Author: Pavel TupitsynAuthored: Tue Jan 10 16:02:26 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 16:02:26 2017 +0300 -- .../platforms/cpp/common/project/vs/common.vcxproj | 1 + modules/platforms/cpp/jni/project/vs/jni.vcxproj| 1 + .../Apache.Ignite.AspNet.Tests.csproj | 7 ++- .../Apache.Ignite.AspNet.csproj | 5 + .../Apache.Ignite.Benchmarks.csproj | 5 + .../Apache.Ignite.Core.Tests.TestDll.csproj | 5 + .../Apache.Ignite.Core.Tests.csproj | 5 + .../dotnet/Apache.Ignite.Core.Tests/TestUtils.cs| 1 - .../Apache.Ignite.Core/Apache.Ignite.Core.csproj| 16 .../Impl/Unmanaged/UnmanagedUtils.cs| 4 ++-- .../Apache.Ignite.EntityFramework.Tests.csproj | 5 + .../Apache.Ignite.EntityFramework.csproj| 9 +++-- .../Impl/ArrayDbDataReader.cs | 5 + .../Impl/DataReaderResult.cs| 2 ++ .../Impl/DbCommandInfo.cs | 11 +++ .../Impl/DbCommandProxy.cs | 1 + .../Apache.Ignite.Linq/Apache.Ignite.Linq.csproj| 5 + .../Apache.Ignite.Log4Net.csproj| 5 + .../Apache.Ignite.Log4Net/IgniteLog4NetLogger.cs| 16 .../Apache.Ignite.NLog/Apache.Ignite.NLog.csproj| 5 + modules/platforms/dotnet/Apache.Ignite.sln | 3 +++ .../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 + .../Apache.Ignite.Examples.csproj | 3 +++ .../Apache.Ignite.ExamplesDll.csproj| 4 .../Services/MapService.cs | 2 -- 25 files changed, 107 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/cpp/common/project/vs/common.vcxproj -- diff --git a/modules/platforms/cpp/common/project/vs/common.vcxproj b/modules/platforms/cpp/common/project/vs/common.vcxproj index 99fd551..b4431f8 100644 --- a/modules/platforms/cpp/common/project/vs/common.vcxproj +++ b/modules/platforms/cpp/common/project/vs/common.vcxproj @@ -97,6 +97,7 @@ Disabled _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions) $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories) + ProgramDatabase Windows http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/cpp/jni/project/vs/jni.vcxproj -- diff --git a/modules/platforms/cpp/jni/project/vs/jni.vcxproj b/modules/platforms/cpp/jni/project/vs/jni.vcxproj index f080a68..cb03197 100644 --- a/modules/platforms/cpp/jni/project/vs/jni.vcxproj +++ b/modules/platforms/cpp/jni/project/vs/jni.vcxproj @@ -97,6 +97,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions) $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories) + ProgramDatabase Windows http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj index aed74db..628942d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj @@ -21,7 +21,8 @@ prompt 4 true -AllRules.ruleset +MinimumRecommendedRules.ruleset +true pdbonly @@ -30,6 +31,7 @@ TRACE prompt 4 +true true @@ -37,6 +39,9 @@ Apache.Ignite.AspNet.Tests.snk + + None +
[33/50] [abbrv] ignite git commit: .NET: Fix flaky tests - improve assertions
.NET: Fix flaky tests - improve assertions Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4d67d2a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4d67d2a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4d67d2a Branch: refs/heads/ignite-3477 Commit: c4d67d2ab737c398c9158dfeb67dc979f5c052af Parents: 87fbb27 Author: Pavel TupitsynAuthored: Tue Jan 10 16:07:36 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 16:07:36 2017 +0300 -- .../dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs | 2 ++ .../platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c4d67d2a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs index 250f974..1239794 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs @@ -309,6 +309,8 @@ namespace Apache.Ignite.Core.Tests.Cache Ignition.Start(cfg); } + +Assert.AreEqual(GridCount(), GetIgnite(0).GetCluster().GetNodes().Count); } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/c4d67d2a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs index 82c6742..8b57c81 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs @@ -56,6 +56,8 @@ namespace Apache.Ignite.Core.Tests _grid1 = Ignition.Start(Configuration("config\\compute\\compute-grid1.xml")); _grid2 = Ignition.Start(Configuration("config\\compute\\compute-grid2.xml")); _grid3 = Ignition.Start(Configuration("config\\compute\\compute-grid3.xml")); + +Assert.AreEqual(3, _grid1.GetCluster().GetNodes().Count); } /// @@ -556,7 +558,9 @@ namespace Apache.Ignite.Core.Tests Func resultFunc, int expectedRepeat) { // check if expected message count has been received; Wait returns false if there were none. -Assert.IsTrue(ReceivedEvent.Wait(MessageTimeout)); +Assert.IsTrue(ReceivedEvent.Wait(MessageTimeout), +string.Format("expectedMessages: {0}, expectedRepeat: {1}, remaining: {2}", +expectedMessages, expectedRepeat, ReceivedEvent.CurrentCount)); expectedMessages = expectedMessages.SelectMany(x => Enumerable.Repeat(x, expectedRepeat));
[18/50] [abbrv] ignite git commit: Removed duplicated benchmark.
Removed duplicated benchmark. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/864a95e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/864a95e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/864a95e1 Branch: refs/heads/ignite-3477 Commit: 864a95e13f1262f14351df0883d0a1abd1bf70c7 Parents: 8372e69 Author: sboikovAuthored: Thu Dec 29 14:45:08 2016 +0300 Committer: sboikov Committed: Thu Dec 29 14:45:08 2016 +0300 -- .../yardstick/cache/IgniteIoTestBenchmark.java | 73 1 file changed, 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/864a95e1/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteIoTestBenchmark.java -- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteIoTestBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteIoTestBenchmark.java deleted file mode 100644 index bee45e0..000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteIoTestBenchmark.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteException; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.yardstick.IgniteAbstractBenchmark; -import org.yardstickframework.BenchmarkConfiguration; -import org.yardstickframework.BenchmarkUtils; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * - */ -public class IgniteIoTestBenchmark extends IgniteAbstractBenchmark { -/** */ -private List targetNodes; - -/** */ -private IgniteKernal ignite; - -/** {@inheritDoc} */ -@Override public void setUp(BenchmarkConfiguration cfg) throws Exception { -super.setUp(cfg); - -ignite = (IgniteKernal)ignite(); - -targetNodes = new ArrayList<>(); - -ClusterNode loc = ignite().cluster().localNode(); - -Collection nodes = ignite().cluster().forServers().nodes(); - -for (ClusterNode node : nodes) { -if (!loc.equals(node)) -targetNodes.add(node); -} - -if (targetNodes.isEmpty()) -throw new IgniteException("Failed to find remote server nodes [nodes=" + nodes + ']'); - -BenchmarkUtils.println(cfg, "Initialized target nodes: " + targetNodes + ']'); -} - -/** {@inheritDoc} */ -@Override public boolean test(Map ctx) throws Exception { -ClusterNode node = targetNodes.get(nextRandom(targetNodes.size())); - -ignite.sendIoTest(node, null, false).get(); - -return true; -} -}
[35/50] [abbrv] ignite git commit: IGNITE-3886 .NET: Fix build script to use latest build tools
IGNITE-3886 .NET: Fix build script to use latest build tools This fixes C++ compilation issue with retargeted projects Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff0caf81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff0caf81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff0caf81 Branch: refs/heads/ignite-3477 Commit: ff0caf810f3bb76f284555dd37f93706c9edf1e7 Parents: 58188e8 Author: Pavel TupitsynAuthored: Tue Jan 10 17:49:07 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 17:49:07 2017 +0300 -- modules/platforms/dotnet/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0caf81/modules/platforms/dotnet/build.ps1 -- diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1 index be7e638..4b5d937 100644 --- a/modules/platforms/dotnet/build.ps1 +++ b/modules/platforms/dotnet/build.ps1 @@ -127,7 +127,7 @@ else { # 2) Build .NET # Detect MSBuild 4.0+ -for ($i=4; $i -le 20; $i++) { +for ($i=20; $i -ge 4; $i--) { $regKey = "HKLM:\software\Microsoft\MSBuild\ToolsVersions\$i.0" if (Test-Path $regKey) { break } }
[36/50] [abbrv] ignite git commit: updated 'setCollocated' flag documentation
updated 'setCollocated' flag documentation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f358db1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f358db1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f358db1 Branch: refs/heads/ignite-3477 Commit: 1f358db1eb3c9a28dd1a66042539796c1ef5ac45 Parents: ff0caf8 Author: Denis MagdaAuthored: Wed Jan 11 13:43:39 2017 -0800 Committer: Denis Magda Committed: Wed Jan 11 13:43:39 2017 -0800 -- .../java/org/apache/ignite/cache/query/SqlFieldsQuery.java | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1f358db1/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java index 9b17e78..eac8cfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java @@ -164,6 +164,12 @@ public class SqlFieldsQuery extends Query { /** * Sets flag defining if this query is collocated. * + * Collocation flag is used for optimization purposes of queries with GROUP BY statements. + * Whenever Ignite executes a distributed query, it sends sub-queries to individual cluster members. + * If you know in advance that the elements of your query selection are collocated together on the same node and + * you group by collocated key (primary or affinity key), then Ignite can make significant performance and network + * optimizations by grouping data on remote nodes. + * * @param collocated Flag value. * @return {@code this} For chaining. */
[21/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.8.2'
Merge remote-tracking branch 'remotes/community/ignite-1.8.2' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72f03ea7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72f03ea7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72f03ea7 Branch: refs/heads/ignite-3477 Commit: 72f03ea7d8bc92de624817655e21f05c268a3399 Parents: 228d97b da5b68c Author: sboikovAuthored: Fri Dec 30 15:13:06 2016 +0300 Committer: sboikov Committed: Fri Dec 30 15:13:06 2016 +0300 -- .../ignite/internal/util/nio/GridNioServer.java | 159 --- .../communication/tcp/TcpCommunicationSpi.java | 20 +-- .../tcp/TcpCommunicationSpiMBean.java | 5 +- ...mmunicationBalancePairedConnectionsTest.java | 28 .../IgniteCommunicationBalanceTest.java | 25 ++- ...cMessageRecoveryNoPairedConnectionsTest.java | 47 -- ...micMessageRecoveryPairedConnectionsTest.java | 47 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- .../yardstick/cache/IgniteIoTestBenchmark.java | 73 - 9 files changed, 250 insertions(+), 160 deletions(-) --
[28/50] [abbrv] ignite git commit: .NET: Fix non-ascii chars in AssemblyInfo
.NET: Fix non-ascii chars in AssemblyInfo Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2e6007b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2e6007b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2e6007b Branch: refs/heads/ignite-3477 Commit: d2e6007b905b6c19cd87786a039229156d10c013 Parents: f406887 Author: Pavel TupitsynAuthored: Mon Jan 9 12:40:42 2017 +0300 Committer: Pavel Tupitsyn Committed: Mon Jan 9 12:40:42 2017 +0300 -- .../dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs | 2 +- .../dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs | 2 +- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs index f5fa618..1bca0e8 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs index d72c9db..0926a46 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index cc833ea..1fc6c59 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership.
[26/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6090ebdf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6090ebdf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6090ebdf Branch: refs/heads/ignite-3477 Commit: 6090ebdfcd0ea3840b0d32cb10197b43615e1e89 Parents: 1f74346 beb242b Author: devozerovAuthored: Thu Jan 5 12:23:06 2017 +0300 Committer: devozerov Committed: Thu Jan 5 12:23:06 2017 +0300 -- modules/cloud/pom.xml | 6 +- .../java/org/apache/ignite/IgniteLogger.java| 4 +- .../apache/ignite/IgniteSystemProperties.java | 13 + .../ignite/cache/affinity/AffinityKey.java | 4 +- .../org/apache/ignite/events/CacheEvent.java| 6 +- .../ignite/events/CacheQueryReadEvent.java | 8 +- .../ignite/internal/binary/BinaryContext.java | 4 +- .../internal/binary/BinaryEnumObjectImpl.java | 10 +- .../ignite/internal/binary/BinaryMetadata.java | 5 +- .../internal/binary/BinaryObjectExImpl.java | 8 +- .../ignite/internal/binary/BinaryTypeProxy.java | 15 +- .../ignite/internal/binary/BinaryUtils.java | 4 +- .../cache/CacheInvokeDirectResult.java | 2 +- .../processors/cache/CacheInvokeResult.java | 2 +- .../processors/cache/CacheLazyEntry.java| 4 +- .../processors/cache/CacheObjectAdapter.java| 7 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheMvccCandidate.java | 9 +- .../processors/cache/GridCacheReturn.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/near/GridNearLockFuture.java| 2 +- .../cache/query/GridCacheQueryAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 13 +- .../cache/query/GridCacheQueryRequest.java | 2 + .../cache/query/GridCacheSqlQuery.java | 4 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 30 +- .../cache/store/GridCacheWriteBehindStore.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../GridCacheVersionConflictContext.java| 2 +- .../closure/GridClosureProcessor.java | 4 +- .../continuous/GridContinuousMessage.java | 2 +- .../datastructures/CollocatedSetItemKey.java| 2 +- .../GridCacheAtomicLongValue.java | 2 + .../GridCacheAtomicSequenceImpl.java| 2 + .../GridCacheAtomicSequenceValue.java | 2 + .../GridCacheCountDownLatchValue.java | 3 + .../datastructures/GridCacheSetItemKey.java | 2 +- .../processors/hadoop/HadoopJobProperty.java| 7 + .../shuffle/HadoopDirectShuffleMessage.java | 34 +- .../internal/processors/job/GridJobWorker.java | 7 +- .../odbc/OdbcQueryExecuteRequest.java | 6 +- .../platform/PlatformNativeException.java | 3 +- .../processors/query/GridQueryProcessor.java| 35 +- .../processors/rest/GridRestResponse.java | 2 +- .../internal/util/future/GridFutureAdapter.java | 2 +- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../ignite/internal/util/nio/GridNioServer.java | 159 - .../util/tostring/GridToStringBuilder.java | 656 +-- .../util/tostring/GridToStringInclude.java | 12 +- .../util/tostring/GridToStringThreadLocal.java | 12 +- .../query/VisorQueryScanSubstringFilter.java| 5 +- .../internal/visor/query/VisorQueryUtils.java | 60 ++ .../communication/tcp/TcpCommunicationSpi.java | 20 +- .../tcp/TcpCommunicationSpiMBean.java | 5 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 3 + .../roundrobin/RoundRobinLoadBalancingSpi.java | 16 +- .../resources/META-INF/classnames.properties| 1 + .../internal/binary/BinaryEnumsSelfTest.java| 18 + ...mmunicationBalancePairedConnectionsTest.java | 28 + .../IgniteCommunicationBalanceTest.java | 25 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 7 +- ...cMessageRecoveryNoPairedConnectionsTest.java | 47 -- ...micMessageRecoveryPairedConnectionsTest.java | 47 ++ .../cache/query/IndexingSpiQuerySelfTest.java | 199 +- .../tostring/GridToStringBuilderSelfTest.java | 33 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- modules/gce/pom.xml | 4 +- .../hadoop/impl/igfs/HadoopIgfsJclLogger.java | 9 +- .../hadoop/shuffle/HadoopShuffleJob.java| 57 +- .../shuffle/direct/HadoopDirectDataOutput.java | 14 + .../direct/HadoopDirectDataOutputContext.java | 48 +- .../direct/HadoopDirectDataOutputState.java
[29/50] [abbrv] ignite git commit: IGNITE-4412 fix NLogLoggerTest thread safety issue
IGNITE-4412 fix NLogLoggerTest thread safety issue This closes #1401 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf118aad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf118aad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf118aad Branch: refs/heads/ignite-3477 Commit: bf118aad8d8251144062d97c476fbe5f817d8018 Parents: d2e6007 Author: Sergey StronchinskiyAuthored: Mon Jan 9 15:36:11 2017 +0300 Committer: Pavel Tupitsyn Committed: Mon Jan 9 15:36:11 2017 +0300 -- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Log/ConcurrentMemoryTarget.cs | 73 .../Log/NLogLoggerTest.cs | 5 +- 3 files changed, 76 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index 5948593..55adfe4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -77,6 +77,7 @@ + http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs new file mode 100644 index 000..66bdbe2 --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Tests.Log +{ +using System.Collections.Generic; +using System.Linq; +using global::NLog; +using global::NLog.Targets; + +/// +/// NLog target which supports logging from multiple threads. +/// +public class ConcurrentMemoryTarget : TargetWithLayout +{ +/// Object used for locking. +private readonly object _locker = new object(); + +/// Logs. +private readonly IList _logs; + +/// +/// Initializes a new instance of the class. +/// +public ConcurrentMemoryTarget() +{ +_logs = new List(); +Name = "ConcurrentMemoryTarget"; +} + +/// +/// Gets the collection of logs gathered in the . +/// +public IEnumerable Logs +{ +get +{ +lock (_locker) +{ +return _logs.ToList(); +} +} +} + +/// +/// Renders the logging event message and adds it to the internal ArrayList of log messages. +/// +/// The logging event. +protected override void Write(LogEventInfo logEvent) +{ +lock (_locker) +{ +var msg = Layout.Render(logEvent); + +_logs.Add(msg); +} +} +} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs index 7806ecd..2743353 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs +++
[43/50] [abbrv] ignite git commit: IGNITE-4424 REPLICATED cache isn't synced across nodes
IGNITE-4424 REPLICATED cache isn't synced across nodes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82dd9128 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82dd9128 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82dd9128 Branch: refs/heads/ignite-3477 Commit: 82dd912889b0dfca213edb1374c1fa0ed79411fd Parents: 27ba69b Author: Anton VinogradovAuthored: Fri Dec 30 13:41:34 2016 +0300 Committer: Anton Vinogradov Committed: Mon Jan 16 12:18:14 2017 +0300 -- .../GridNearAtomicAbstractUpdateFuture.java | 34 ++- .../GridNearAtomicSingleUpdateFuture.java | 44 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 ++--- .../AtomicPutAllChangingTopologyTest.java | 212 +++ .../IgniteCacheFailoverTestSuite.java | 3 + 5 files changed, 284 insertions(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java index 2fbabaa..c92e0f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java @@ -212,14 +212,18 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt // Cannot remap. remapCnt = 1; -map(topVer); +GridCacheVersion futVer = addAtomicFuture(topVer); + +if (futVer != null) +map(topVer, futVer); } } /** * @param topVer Topology version. + * @param futVer Future version */ -protected abstract void map(AffinityTopologyVersion topVer); +protected abstract void map(AffinityTopologyVersion topVer, GridCacheVersion futVer); /** * Maps future on ready topology. @@ -302,7 +306,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt * @param req Request. * @param e Error. */ -protected void onSendError(GridNearAtomicAbstractUpdateRequest req, IgniteCheckedException e) { +protected final void onSendError(GridNearAtomicAbstractUpdateRequest req, IgniteCheckedException e) { synchronized (mux) { GridNearAtomicUpdateResponse res = new GridNearAtomicUpdateResponse(cctx.cacheId(), req.nodeId(), @@ -314,4 +318,28 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt onResult(req.nodeId(), res, true); } } + +/** + * Adds future prevents topology change before operation complete. + * Should be invoked before topology lock released. + * + * @param topVer Topology version. + * @return Future version in case future added. + */ +protected final GridCacheVersion addAtomicFuture(AffinityTopologyVersion topVer) { +GridCacheVersion futVer = cctx.versions().next(topVer); + +synchronized (mux) { +assert this.futVer == null : this; +assert this.topVer == AffinityTopologyVersion.ZERO : this; + +this.topVer = topVer; +this.futVer = futVer; +} + +if (storeFuture() && !cctx.mvcc().addAtomicFuture(futVer, this)) +return null; + +return futVer; +} } http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index bd231cf..7376aff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -348,14 +348,7 @@ public class
[13/50] [abbrv] ignite git commit: IGNITE-4442 Implemented cache affinity configuration.
IGNITE-4442 Implemented cache affinity configuration. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4a1e6ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4a1e6ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4a1e6ca Branch: refs/heads/ignite-3477 Commit: f4a1e6ca86bcc6054ca6066107ad58b6b19d665a Parents: 828b9b6 Author: Vasiliy SiskoAuthored: Thu Dec 29 14:48:45 2016 +0700 Committer: Andrey Novikov Committed: Thu Dec 29 14:48:45 2016 +0700 -- modules/web-console/backend/app/mongo.js| 19 + .../generator/AbstractTransformer.js| 5 ++ .../modules/configuration/generator/Beans.js| 4 + .../generator/ConfigurationGenerator.js | 36 + .../states/configuration/caches/affinity.jade | 82 .../states/configuration/caches/memory.jade | 4 +- .../frontend/views/configuration/caches.jade| 1 + 7 files changed, 149 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a1e6ca/modules/web-console/backend/app/mongo.js -- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index 58ab119..dd71f3a 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -140,6 +140,25 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose cacheMode: {type: String, enum: ['PARTITIONED', 'REPLICATED', 'LOCAL']}, atomicityMode: {type: String, enum: ['ATOMIC', 'TRANSACTIONAL']}, +affinity: { +kind: {type: String, enum: ['Default', 'Rendezvous', 'Fair', 'Custom']}, +Rendezvous: { +affinityBackupFilter: String, +partitions: Number, +excludeNeighbors: Boolean +}, +Fair: { +affinityBackupFilter: String, +partitions: Number, +excludeNeighbors: Boolean +}, +Custom: { +className: String +} +}, + +affinityMapper: String, + nodeFilter: { kind: {type: String, enum: ['Default', 'Exclude', 'IGFS', 'OnNodes', 'Custom']}, Exclude: { http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a1e6ca/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js -- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js index f5afe59..40d937e 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js @@ -211,6 +211,11 @@ export default class AbstractTransformer { } // Generate cache memory group. +static cacheAffinity(cache) { +return this.toSection(this.generator.cacheAffinity(cache)); +} + +// Generate cache memory group. static cacheMemory(cache) { return this.toSection(this.generator.cacheMemory(cache)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a1e6ca/modules/web-console/frontend/app/modules/configuration/generator/Beans.js -- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Beans.js b/modules/web-console/frontend/app/modules/configuration/generator/Beans.js index ca19342..0972eac 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/Beans.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/Beans.js @@ -116,6 +116,10 @@ export class Bean extends EmptyBean { return this._property(this.arguments, 'int', model, null, _.nonNil); } +boolConstructorArgument(model) { +return this._property(this.arguments, 'boolean', model, null, _.nonNil); +} + classConstructorArgument(model) { return this._property(this.arguments, 'java.lang.Class', model, null, _.nonEmpty); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a1e6ca/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js -- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index
[07/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e73d022 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e73d022 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e73d022 Branch: refs/heads/ignite-3477 Commit: 7e73d0223a3f09cbe0b7094a2c04bdf9d63ca9be Parents: c5882a8 06ef846 Author: devozerovAuthored: Wed Dec 28 12:54:47 2016 +0300 Committer: devozerov Committed: Wed Dec 28 12:54:47 2016 +0300 -- modules/platforms/cpp/binary/Makefile.am| 2 +- .../ignite/impl/binary/binary_type_manager.h| 2 +- .../src/impl/binary/binary_type_manager.cpp | 6 +- .../binary/src/impl/interop/interop_memory.cpp | 2 +- modules/platforms/cpp/common/Makefile.am| 2 +- .../include/ignite/common/dynamic_size_array.h | 2 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel | 2 +- modules/platforms/cpp/core-test/Makefile.am | 2 +- .../cpp/core-test/src/cache_query_test.cpp | 8 +- .../cpp/core-test/src/reference_test.cpp| 14 +- modules/platforms/cpp/core/Makefile.am | 2 +- .../cache/query/continuous/continuous_query.h | 8 +- .../include/ignite/cache/query/query_cursor.h | 4 +- .../query/continuous/continuous_query_impl.h| 8 +- .../core/include/ignite/impl/handle_registry.h | 2 +- .../cpp/core/include/ignite/impl/operations.h | 4 +- .../cpp/core/src/impl/cache/cache_impl.cpp | 5 +- .../cpp/core/src/impl/handle_registry.cpp | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- .../cpp/examples/odbc-example/Makefile.am | 2 +- .../cpp/examples/putget-example/Makefile.am | 2 +- .../cpp/examples/query-example/Makefile.am | 2 +- modules/platforms/cpp/ignite/Makefile.am| 2 +- modules/platforms/cpp/jni/Makefile.am | 2 +- modules/platforms/cpp/jni/src/java.cpp | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 2 +- .../cpp/odbc-test/config/queries-default.xml| 1 + .../odbc-test/include/sql_test_suite_fixture.h | 3 + .../platforms/cpp/odbc-test/include/test_type.h | 20 +- .../platforms/cpp/odbc-test/src/column_test.cpp | 189 +++ .../odbc-test/src/sql_test_suite_fixture.cpp| 17 ++ .../cpp/odbc-test/src/sql_types_test.cpp| 131 + modules/platforms/cpp/odbc/Makefile.am | 2 +- .../cpp/odbc/include/ignite/odbc/utility.h | 9 +- .../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- .../cpp/odbc/install/ignite-odbc-x86.wxs| 2 +- modules/platforms/cpp/odbc/src/column.cpp | 28 ++- .../cpp/odbc/src/config/connection_info.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 2 + modules/platforms/cpp/odbc/src/odbc.cpp | 5 +- modules/platforms/cpp/odbc/src/utility.cpp | 15 ++ .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Examples/Example.cs | 5 +- .../Examples/ExamplesTest.cs| 107 --- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 26 ++- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../examples/Apache.Ignite.Examples/App.config | 2 + .../DataStructures/AtomicSequenceExample.cs | 26 +-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 62 files changed, 612 insertions(+), 141 deletions(-) --
[30/50] [abbrv] ignite git commit: IGNITE-4493: ODBC: Added missing diagnostic records for error cases
IGNITE-4493: ODBC: Added missing diagnostic records for error cases This closes #1396 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e8e9798 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e8e9798 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e8e9798 Branch: refs/heads/ignite-3477 Commit: 9e8e9798dae8b92cfbf4d940856dec35d3e30f54 Parents: bf118aa Author: Sergey KalashnikovAuthored: Tue Jan 10 11:10:56 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 11:10:56 2017 +0300 -- .../cpp/odbc-test/src/api_robustness_test.cpp | 113 +++- .../cpp/odbc/include/ignite/odbc/common_types.h | 29 ++- .../cpp/odbc/include/ignite/odbc/statement.h| 143 +++ modules/platforms/cpp/odbc/src/connection.cpp | 2 +- .../odbc/src/diagnostic/diagnostic_record.cpp | 38 modules/platforms/cpp/odbc/src/odbc.cpp | 118 - modules/platforms/cpp/odbc/src/statement.cpp| 176 --- 7 files changed, 484 insertions(+), 135 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e8e9798/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp -- diff --git a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp index 13a5ea6..0b6df93 100644 --- a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp +++ b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp @@ -50,7 +50,7 @@ using ignite::impl::binary::BinaryUtils; /** * Test setup fixture. */ -struct ApiRobustnessTestSuiteFixture +struct ApiRobustnessTestSuiteFixture { void Prepare() { @@ -206,6 +206,33 @@ struct ApiRobustnessTestSuiteFixture // Operation is not supported. However, there should be no crash. BOOST_CHECK(ret == SQL_ERROR); + +CheckSQLStatementDiagnosticError("HY106"); +} + +void CheckSQLDiagnosticError(int16_t handleType, SQLHANDLE handle, const std::string& expectSqlState) +{ +SQLCHAR state[ODBC_BUFFER_SIZE]; +SQLINTEGER nativeError = 0; +SQLCHAR message[ODBC_BUFFER_SIZE]; +SQLSMALLINT messageLen = 0; + +SQLRETURN ret = SQLGetDiagRec(handleType, handle, 1, state, , message, sizeof(message), ); + +const std::string sqlState = reinterpret_cast (state); +BOOST_REQUIRE_EQUAL(ret, SQL_SUCCESS); +BOOST_REQUIRE_EQUAL(sqlState, expectSqlState); +BOOST_REQUIRE(messageLen > 0); +} + +void CheckSQLStatementDiagnosticError(const std::string& expectSqlState) +{ +CheckSQLDiagnosticError(SQL_HANDLE_STMT, stmt, expectSqlState); +} + +void CheckSQLConnectionDiagnosticError(const std::string& expectSqlState) +{ +CheckSQLDiagnosticError(SQL_HANDLE_DBC, dbc, expectSqlState); } /** @@ -234,6 +261,43 @@ struct ApiRobustnessTestSuiteFixture SQLHSTMT stmt; }; +SQLSMALLINT unsupportedC[] = { +SQL_C_INTERVAL_YEAR, +SQL_C_INTERVAL_MONTH, +SQL_C_INTERVAL_DAY, +SQL_C_INTERVAL_HOUR, +SQL_C_INTERVAL_MINUTE, +SQL_C_INTERVAL_SECOND, +SQL_C_INTERVAL_YEAR_TO_MONTH, +SQL_C_INTERVAL_DAY_TO_HOUR, +SQL_C_INTERVAL_DAY_TO_MINUTE, +SQL_C_INTERVAL_DAY_TO_SECOND, +SQL_C_INTERVAL_HOUR_TO_MINUTE, +SQL_C_INTERVAL_HOUR_TO_SECOND, +SQL_C_INTERVAL_MINUTE_TO_SECOND +}; + +SQLSMALLINT unsupportedSql[] = { +SQL_WVARCHAR, +SQL_WLONGVARCHAR, +SQL_REAL, +SQL_NUMERIC, +SQL_TYPE_TIME, +SQL_INTERVAL_MONTH, +SQL_INTERVAL_YEAR, +SQL_INTERVAL_YEAR_TO_MONTH, +SQL_INTERVAL_DAY, +SQL_INTERVAL_HOUR, +SQL_INTERVAL_MINUTE, +SQL_INTERVAL_SECOND, +SQL_INTERVAL_DAY_TO_HOUR, +SQL_INTERVAL_DAY_TO_MINUTE, +SQL_INTERVAL_DAY_TO_SECOND, +SQL_INTERVAL_HOUR_TO_MINUTE, +SQL_INTERVAL_HOUR_TO_SECOND, +SQL_INTERVAL_MINUTE_TO_SECOND +}; + BOOST_FIXTURE_TEST_SUITE(ApiRobustnessTestSuite, ApiRobustnessTestSuiteFixture) BOOST_AUTO_TEST_CASE(TestSQLDriverConnect) @@ -516,6 +580,19 @@ BOOST_AUTO_TEST_CASE(TestSQLBindCol) ODBC_FAIL_ON_ERROR(ret, SQL_HANDLE_STMT, stmt); +//Unsupported data types +for(int i = 0; i < sizeof(unsupportedC)/sizeof(unsupportedC[0]); ++i) +{ +ret = SQLBindCol(stmt, 1, unsupportedC[i], , sizeof(ind1), ); +BOOST_REQUIRE_EQUAL(ret, SQL_ERROR); +CheckSQLStatementDiagnosticError("HY003"); +} + +// Size is negative. +ret = SQLBindCol(stmt, 1, SQL_C_SLONG, , -1, ); +BOOST_REQUIRE_EQUAL(ret, SQL_ERROR); +
[42/50] [abbrv] ignite git commit: IGNITE-4545 Added cache for router hostnames. - Fixes #1428.
IGNITE-4545 Added cache for router hostnames. - Fixes #1428. Signed-off-by: Andrey NovikovProject: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27ba69b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27ba69b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27ba69b5 Branch: refs/heads/ignite-3477 Commit: 27ba69b55f645a022f2e84cc4db76309b02850e3 Parents: 79401b2 Author: Andrey Novikov Authored: Mon Jan 16 11:22:34 2017 +0700 Committer: Andrey Novikov Committed: Mon Jan 16 11:22:34 2017 +0700 -- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 2 files changed, 49 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java index 12baee0..f714e7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -85,6 +85,9 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo /** Class logger. */ private final Logger log; +/** All local enabled MACs. */ +private final Collection macs; + /** NIO server. */ private GridNioServer srv; @@ -166,6 +169,8 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo if (marshId == null && cfg.getMarshaller() == null) throw new GridClientException("Failed to start client (marshaller is not configured)."); +macs = U.allLocalMACs(); + if (cfg.getProtocol() == GridClientProtocol.TCP) { try { IgniteLogger gridLog = new JavaLogger(false); @@ -316,7 +321,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo } boolean sameHost = node.attributes().isEmpty() || -F.containsAny(U.allLocalMACs(), node.attribute(ATTR_MACS).toString().split(", ")); +F.containsAny(macs, node.attribute(ATTR_MACS).toString().split(", ")); Collection srvs = new LinkedHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java index effd5b3..97aa586 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Set; @@ -61,12 +60,18 @@ public class GridClientTopology { /** Cached last error prevented topology from update. */ private GridClientException lastError; +/** Router addresses from configuration. */ +private final String routers; + /** * Set of router addresses to infer direct connectivity * when client is working in router connection mode. * {@code null} when client is working in direct connection node. */ -private final Set routerAddrs; +private final Set routerAddrs; + +/** List of all known local MACs */ +private final Collection macsCache; /** Protocol. */ private final GridClientProtocol prot; @@ -96,8 +101,38 @@ public class GridClientTopology { metricsCache = cfg.isEnableMetricsCache(); attrCache = cfg.isEnableAttributesCache(); prot = cfg.getProtocol(); -routerAddrs = (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) ? -new HashSet<>(cfg.getRouters()) : null; + +if (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) { +routers = cfg.getRouters().toString(); +
[20/50] [abbrv] ignite git commit: Fixed JavaDoc for RoundRobinLoadBalancingSpi
Fixed JavaDoc for RoundRobinLoadBalancingSpi Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/228d97ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/228d97ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/228d97ba Branch: refs/heads/ignite-3477 Commit: 228d97bab116a513ed03f4f7f48ddeb1ef5b6577 Parents: f4a1e6c Author: Valentin KulichenkoAuthored: Thu Dec 29 12:21:34 2016 -0800 Committer: Valentin Kulichenko Committed: Thu Dec 29 12:21:34 2016 -0800 -- .../roundrobin/RoundRobinLoadBalancingSpi.java | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/228d97ba/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java index 069641b..b0e2c78 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java @@ -51,15 +51,13 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED; /** * This SPI iterates through nodes in round-robin fashion and pick the next * sequential node. Two modes of operation are supported: per-task and global - * (see {@link #setPerTask(boolean)} configuration). + * (see {@link #setPerTask(boolean)} configuration). Global mode is used be default. * - * When configured in per-task mode, implementation will pick a random starting - * node at the beginning of every task execution and then sequentially iterate through all - * nodes in topology starting from the picked node. This is the default configuration - * and should fit most of the use cases as it provides a fairly well-distributed - * split and also ensures that jobs within a single task are spread out across - * nodes to the maximum. For cases when split size is equal to the number of nodes, - * this mode guarantees that all nodes will participate in the split. + * When configured in per-task mode, implementation will pick a random node at the + * beginning of every task execution and then sequentially iterate through all + * nodes in topology starting from the picked node. For cases when split size + * is equal to the number of nodes, this mode guarantees that all nodes will + * participate in the split. * * When configured in global mode, a single sequential queue of nodes is maintained for * all tasks and the next node in the queue is picked every time. In this mode (unlike in @@ -336,4 +334,4 @@ public class RoundRobinLoadBalancingSpi extends IgniteSpiAdapter implements Load @Override public String toString() { return S.toString(RoundRobinLoadBalancingSpi.class, this); } -} \ No newline at end of file +}
[47/50] [abbrv] ignite git commit: IGNITE-4503: Hadoop: added boundary checks to HadoopDirectDataInput. This closes # 1416.
IGNITE-4503: Hadoop: added boundary checks to HadoopDirectDataInput. This closes # 1416. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1365421 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1365421 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1365421 Branch: refs/heads/ignite-3477 Commit: f1365421c299b754a10edf8b6f156aeeb5ff0ce1 Parents: d14e072 Author: tledkov-gridgainAuthored: Mon Jan 16 16:57:27 2017 +0300 Committer: devozerov Committed: Mon Jan 16 16:57:27 2017 +0300 -- .../shuffle/direct/HadoopDirectDataInput.java | 41 +++- 1 file changed, 39 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f1365421/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java index 6f0e2b0..8031c9f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.hadoop.shuffle.direct; +import java.io.EOFException; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.internal.SB; import org.jetbrains.annotations.NotNull; @@ -59,6 +60,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public void readFully(@NotNull byte[] b, int off, int len) throws IOException { +checkRange(len); + System.arraycopy(buf, pos, b, off, len); pos += len; @@ -66,9 +69,16 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public int skipBytes(int n) throws IOException { -pos += n; +if (n < 0) +throw new IllegalArgumentException(); + +assert pos <= buf.length; + +int toSkip = Math.min(buf.length - pos, n); -return n; +pos += toSkip; + +return toSkip; } /** {@inheritDoc} */ @@ -78,6 +88,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public byte readByte() throws IOException { +checkRange(1); + byte res = GridUnsafe.getByte(buf, BYTE_ARR_OFF + pos); pos += 1; @@ -92,6 +104,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public short readShort() throws IOException { +checkRange(2); + short res = GridUnsafe.getShort(buf, BYTE_ARR_OFF + pos); pos += 2; @@ -106,6 +120,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public char readChar() throws IOException { +checkRange(2); + char res = GridUnsafe.getChar(buf, BYTE_ARR_OFF + pos); pos += 2; @@ -115,6 +131,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public int readInt() throws IOException { +checkRange(4); + int res = GridUnsafe.getInt(buf, BYTE_ARR_OFF + pos); pos += 4; @@ -124,6 +142,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public long readLong() throws IOException { +checkRange(8); + long res = GridUnsafe.getLong(buf, BYTE_ARR_OFF + pos); pos += 8; @@ -133,6 +153,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public float readFloat() throws IOException { +checkRange(4); + float res = GridUnsafe.getFloat(buf, BYTE_ARR_OFF + pos); pos += 4; @@ -142,6 +164,8 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { /** {@inheritDoc} */ @Override public double readDouble() throws IOException { +checkRange(8); + double res = GridUnsafe.getDouble(buf, BYTE_ARR_OFF + pos); pos += 8; @@ -193,4 +217,17 @@ public class HadoopDirectDataInput extends InputStream implements DataInput { return new String(bytes,
[04/50] [abbrv] ignite git commit: 1.8.0-SNAPSHOT
1.8.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5494dfb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5494dfb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5494dfb8 Branch: refs/heads/ignite-3477 Commit: 5494dfb8dd222bf7aee8214b6bb201d3ae8a1ec5 Parents: 5769f44 Author: Ignite TeamcityAuthored: Tue Dec 27 14:50:58 2016 +0300 Committer: Ignite Teamcity Committed: Tue Dec 27 14:50:58 2016 +0300 -- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel| 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs | 2 +- .../dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs| 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs | 4 ++-- .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++-- .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++-- 18 files changed, 31 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5494dfb8/modules/platforms/cpp/configure.ac -- diff --git a/modules/platforms/cpp/configure.ac b/modules/platforms/cpp/configure.ac index 9dc9f52..500bdbf 100644 --- a/modules/platforms/cpp/configure.ac +++ b/modules/platforms/cpp/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++], [1.8.0.14218], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++], [1.8.0.16695], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) http://git-wip-us.apache.org/repos/asf/ignite/blob/5494dfb8/modules/platforms/cpp/configure.acrel -- diff --git a/modules/platforms/cpp/configure.acrel b/modules/platforms/cpp/configure.acrel index 036f124..984aa38 100644 --- a/modules/platforms/cpp/configure.acrel +++ b/modules/platforms/cpp/configure.acrel @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++], [1.6.0.8653], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) +AC_INIT([Apache Ignite C++], [1.8.0.16695], [d...@ignite.apache.org], [ignite], [ignite.apache.org]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) http://git-wip-us.apache.org/repos/asf/ignite/blob/5494dfb8/modules/platforms/cpp/examples/configure.ac -- diff --git a/modules/platforms/cpp/examples/configure.ac b/modules/platforms/cpp/examples/configure.ac index 82a3727..6f08490 100644 --- a/modules/platforms/cpp/examples/configure.ac +++ b/modules/platforms/cpp/examples/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Apache Ignite C++ Examples], [1.8.0.14218], [d...@ignite.apache.org], [ignite-examples], [ignite.apache.org]) +AC_INIT([Apache Ignite C++ Examples], [1.8.0.16695], [d...@ignite.apache.org], [ignite-examples], [ignite.apache.org]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) http://git-wip-us.apache.org/repos/asf/ignite/blob/5494dfb8/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs -- diff --git a/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs b/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs index cb6ab54..2c12d9a 100644 --- a/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs +++ b/modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs @@ -21,7 +21,7 @@ + Language='1033' Codepage='1252' Version='1.8.0.16695'>
[25/50] [abbrv] ignite git commit: Merge branch 'ignite-1.7.5'
Merge branch 'ignite-1.7.5' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/core/src/main/resources/META-INF/classnames.properties # modules/platforms/cpp/configure.ac # modules/platforms/cpp/configure.acrel # modules/platforms/cpp/examples/configure.ac # modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs # modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs # modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs # modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb242bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb242bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb242bc Branch: refs/heads/ignite-3477 Commit: beb242bc22aa7ca6c068fd59a09965fa5967177e Parents: d62542b 6c38eb2 Author: devozerovAuthored: Thu Jan 5 11:44:55 2017 +0300 Committer: devozerov Committed: Thu Jan 5 11:44:55 2017 +0300 -- .../java/org/apache/ignite/IgniteLogger.java| 4 +- .../apache/ignite/IgniteSystemProperties.java | 13 + .../ignite/cache/affinity/AffinityKey.java | 4 +- .../org/apache/ignite/events/CacheEvent.java| 6 +- .../ignite/events/CacheQueryReadEvent.java | 8 +- .../ignite/internal/binary/BinaryContext.java | 4 +- .../internal/binary/BinaryEnumObjectImpl.java | 10 +- .../ignite/internal/binary/BinaryMetadata.java | 5 +- .../internal/binary/BinaryObjectExImpl.java | 8 +- .../ignite/internal/binary/BinaryTypeProxy.java | 15 +- .../ignite/internal/binary/BinaryUtils.java | 4 +- .../cache/CacheInvokeDirectResult.java | 2 +- .../processors/cache/CacheInvokeResult.java | 2 +- .../processors/cache/CacheLazyEntry.java| 4 +- .../processors/cache/CacheObjectAdapter.java| 7 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheMvccCandidate.java | 9 +- .../processors/cache/GridCacheReturn.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/near/GridNearLockFuture.java| 2 +- .../cache/query/GridCacheQueryAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 13 +- .../cache/query/GridCacheQueryRequest.java | 2 + .../cache/query/GridCacheSqlQuery.java | 4 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 30 +- .../cache/store/GridCacheWriteBehindStore.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../GridCacheVersionConflictContext.java| 2 +- .../closure/GridClosureProcessor.java | 4 +- .../continuous/GridContinuousMessage.java | 2 +- .../datastructures/CollocatedSetItemKey.java| 2 +- .../GridCacheAtomicLongValue.java | 2 + .../GridCacheAtomicSequenceImpl.java| 2 + .../GridCacheAtomicSequenceValue.java | 2 + .../GridCacheCountDownLatchValue.java | 3 + .../datastructures/GridCacheSetItemKey.java | 2 +- .../internal/processors/job/GridJobWorker.java | 7 +- .../odbc/OdbcQueryExecuteRequest.java | 6 +- .../platform/PlatformNativeException.java | 3 +- .../processors/query/GridQueryProcessor.java| 35 +-
[49/50] [abbrv] ignite git commit: Merge branch ignite-2.0 into ignite-db-x
Merge branch ignite-2.0 into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f258b9d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f258b9d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f258b9d Branch: refs/heads/ignite-3477 Commit: 6f258b9dd0c2d3aad6d30e09282da8b953d27a58 Parents: 0ee73fb f136542 Author: Alexey GoncharukAuthored: Tue Jan 17 13:14:17 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:14:17 2017 +0300 -- modules/cloud/pom.xml | 6 +- .../java/org/apache/ignite/IgniteLogger.java| 4 +- .../apache/ignite/IgniteSystemProperties.java | 13 + .../ignite/cache/affinity/AffinityKey.java | 4 +- .../ignite/cache/query/SqlFieldsQuery.java | 6 + .../configuration/HadoopConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 31 + .../org/apache/ignite/events/CacheEvent.java| 6 +- .../ignite/events/CacheQueryReadEvent.java | 8 +- .../apache/ignite/hadoop/HadoopInputSplit.java | 54 ++ .../org/apache/ignite/hadoop/HadoopJob.java | 74 +++ .../ignite/hadoop/HadoopMapReducePlan.java | 80 +++ .../ignite/hadoop/HadoopMapReducePlanner.java | 40 ++ .../igfs/IgfsGroupDataBlocksKeyMapper.java | 17 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 28 + .../local/LocalIgfsSecondaryFileSystem.java | 130 +++- .../ignite/internal/GridKernalContext.java | 7 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../apache/ignite/internal/IgniteKernal.java| 3 + .../org/apache/ignite/internal/IgnitionEx.java | 19 + .../internal/binary/BinaryEnumObjectImpl.java | 10 +- .../ignite/internal/binary/BinaryMetadata.java | 5 +- .../internal/binary/BinaryObjectExImpl.java | 8 +- .../igfs/common/IgfsHandshakeRequest.java | 17 - .../internal/igfs/common/IgfsMarshaller.java| 2 - .../managers/communication/GridIoManager.java | 2 + .../managers/communication/GridIoPolicy.java| 3 + .../cache/CacheInvokeDirectResult.java | 2 +- .../processors/cache/CacheInvokeResult.java | 2 +- .../processors/cache/CacheLazyEntry.java| 4 +- .../processors/cache/CacheObjectAdapter.java| 7 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheMvccCandidate.java | 9 +- .../processors/cache/GridCacheReturn.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../GridNearAtomicAbstractUpdateFuture.java | 34 +- .../GridNearAtomicSingleUpdateFuture.java | 38 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 +- .../distributed/near/GridNearLockFuture.java| 2 +- .../cache/query/GridCacheQueryAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 13 +- .../cache/query/GridCacheQueryRequest.java | 2 + .../cache/query/GridCacheSqlQuery.java | 6 +- .../continuous/CacheContinuousQueryEvent.java | 10 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 30 +- .../cache/store/GridCacheWriteBehindStore.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../GridCacheVersionConflictContext.java| 2 +- .../IgniteCacheObjectProcessorImpl.java | 5 +- .../closure/GridClosureProcessor.java | 6 +- .../continuous/GridContinuousMessage.java | 2 +- .../datastreamer/DataStreamProcessor.java | 60 +- .../datastreamer/DataStreamerImpl.java | 37 +- .../datastructures/CollocatedSetItemKey.java| 2 +- .../GridCacheAtomicLongValue.java | 2 + .../GridCacheAtomicSequenceImpl.java| 2 + .../GridCacheAtomicSequenceValue.java | 2 + .../GridCacheCountDownLatchValue.java | 3 + .../datastructures/GridCacheSetItemKey.java | 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 4 +- .../processors/hadoop/HadoopFileBlock.java | 1 + .../processors/hadoop/HadoopInputSplit.java | 54 -- .../internal/processors/hadoop/HadoopJob.java | 107 --- .../internal/processors/hadoop/HadoopJobEx.java | 140 .../processors/hadoop/HadoopJobInfo.java| 54 +- .../processors/hadoop/HadoopJobProperty.java| 9 +- .../processors/hadoop/HadoopMapReducePlan.java | 80 --- .../hadoop/HadoopMapReducePlanner.java | 40 -- .../processors/hadoop/HadoopTaskContext.java| 6 +- .../processors/hadoop/HadoopTaskInfo.java | 1 + .../hadoop/counter/HadoopCounterWriter.java | 4 +- .../shuffle/HadoopDirectShuffleMessage.java | 34 +-
[50/50] [abbrv] ignite git commit: Merge ignite-3477 into ignite-db-x
Merge ignite-3477 into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca373d78 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca373d78 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca373d78 Branch: refs/heads/ignite-3477 Commit: ca373d78694db25f0c6d233f4802d77fb3a7f654 Parents: 6f258b9 e7e0d87 Author: Alexey GoncharukAuthored: Tue Jan 17 13:43:42 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:43:42 2017 +0300 -- .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../internal/managers/GridManagerAdapter.java | 3 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../cache/GridCacheConcurrentMapImpl.java | 7 +- .../processors/cache/GridCacheMapEntry.java | 8 ++ .../GridCachePartitionExchangeManager.java | 115 +-- .../cache/GridCacheSharedContext.java | 23 +++- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 9 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../dht/GridPartitionedGetFuture.java | 4 +- .../dht/GridPartitionedSingleGetFuture.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 60 +- .../dht/preloader/GridDhtForceKeysFuture.java | 10 +- .../GridDhtPartitionsExchangeFuture.java| 30 ++--- .../dht/preloader/GridDhtPreloader.java | 2 +- .../extras/GridCacheAttributesEntryExtras.java | 4 +- .../GridCacheAttributesMvccEntryExtras.java | 2 +- ...dCacheAttributesMvccObsoleteEntryExtras.java | 2 +- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 4 +- .../GridCacheAttributesMvccTtlEntryExtras.java | 4 +- .../GridCacheAttributesObsoleteEntryExtras.java | 2 +- ...idCacheAttributesObsoleteTtlEntryExtras.java | 4 +- .../GridCacheAttributesTtlEntryExtras.java | 4 +- .../GridCacheMvccObsoleteEntryExtras.java | 2 +- .../GridCacheMvccObsoleteTtlEntryExtras.java| 4 +- .../extras/GridCacheMvccTtlEntryExtras.java | 3 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 3 +- .../cache/extras/GridCacheTtlEntryExtras.java | 2 +- .../util/GridCursorIteratorWrapper.java | 24 +++- .../cache/CacheConfigurationLeakTest.java | 4 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 28 ++--- .../GridCacheValueBytesPreloadingSelfTest.java | 17 +-- ...CacheLoadingConcurrentGridStartSelfTest.java | 2 + ...tractPartitionedByteArrayValuesSelfTest.java | 1 + ...GridCachePreloadRestartAbstractSelfTest.java | 12 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +- .../GridCacheReplicatedPreloadSelfTest.java | 25 ++-- .../testsuites/IgniteCacheTestSuite2.java | 15 +-- .../testsuites/IgniteCacheTestSuite3.java | 13 ++- ...niteCachePartitionedFieldsQuerySelfTest.java | 8 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 +- .../query/h2/opt/GridH2TableSelfTest.java | 6 +- .../IgniteCacheQuerySelfTestSuite2.java | 5 +- modules/yardstick/config/ignite-base-config.xml | 2 +- .../yardstick/cache/IgniteGetAllBenchmark.java | 42 +++ .../yardstick/cache/IgniteGetBenchmark.java | 38 +- .../cache/jdbc/JdbcAbstractBenchmark.java | 17 +++ .../yardstick/cache/jdbc/JdbcPutBenchmark.java | 17 +++ .../cache/jdbc/JdbcPutGetBenchmark.java | 17 +++ .../jdbc/JdbcPutIndexedValue8Benchmark.java | 17 +++ .../cache/jdbc/JdbcSqlQueryBenchmark.java | 17 +++ .../cache/jdbc/JdbcSqlQueryJoinBenchmark.java | 17 +++ 53 files changed, 472 insertions(+), 218 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca373d78/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[25/50] [abbrv] ignite git commit: .NET: Improve exception messages for binary misconfiguration and missing assemblies
.NET: Improve exception messages for binary misconfiguration and missing assemblies Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e304b48b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e304b48b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e304b48b Branch: refs/heads/ignite-gg-11810-1 Commit: e304b48b92fe75027442b7f7cfb46b421d58ae49 Parents: d10946b Author: Pavel TupitsynAuthored: Fri Jan 13 16:49:48 2017 +0300 Committer: Pavel Tupitsyn Committed: Fri Jan 13 16:49:48 2017 +0300 -- .../Apache.Ignite.Core/Impl/Binary/BinaryReader.cs | 16 1 file changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e304b48b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs -- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs index 100091f..d9facc3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs @@ -697,10 +697,18 @@ namespace Apache.Ignite.Core.Impl.Binary if (desc.Type == null) { if (desc is BinarySurrogateTypeDescriptor) -throw new BinaryObjectException("Unknown type ID: " + hdr.TypeId); - -throw new BinaryObjectException("No matching type found for object [typeId=" + -desc.TypeId + ", typeName=" + desc.TypeName + ']'); +{ +throw new BinaryObjectException(string.Format( +"Unknown type ID: {0}. " + +"This usually indicates missing BinaryConfiguration." + +"Make sure that all nodes have the same BinaryConfiguration.", hdr.TypeId)); +} + +throw new BinaryObjectException(string.Format( +"No matching type found for object [typeId={0}, typeName={1}]." + +"This usually indicates that assembly with specified type is not loaded on a node." + +"When using Apache.Ignite.exe, make sure to load assemblies with -assembly parameter.", +desc.TypeId, desc.TypeName)); } // Preserve old frame.
[44/50] [abbrv] ignite git commit: ignite-3477 PageMemory optimizations - use page address instead of ByteBuffer to work with page memory - got rid of pages pin/unpin - do not copy byte array for cach
http://git-wip-us.apache.org/repos/asf/ignite/blob/7db65ddd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java index aa2d368..f6ac905 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java @@ -20,6 +20,8 @@ package org.apache.ignite.internal.processors.cache.database.tree.io; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.pagemem.Page; +import org.apache.ignite.internal.pagemem.PageMemory; +import org.apache.ignite.internal.pagemem.PageUtils; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManagerImpl; import org.apache.ignite.internal.processors.cache.database.MetadataStorage; @@ -36,10 +38,10 @@ import org.apache.ignite.internal.processors.cache.database.tree.util.PageLockLi * 1. IO should not have any `public static` methods. *We have versioned IOs and any static method will mean that it have to always work in backward *compatible way between all the IO versions. The base class {@link PageIO} has - *static methods (like {@code {@link #getPageId(ByteBuffer)}}) intentionally: + *static methods (like {@code {@link #getPageId(long)}}) intentionally: *this base format can not be changed between versions. * - * 2. IO must correctly override {@link #initNewPage(ByteBuffer, long)} method and call super. + * 2. IO must correctly override {@link #initNewPage(long, long, int)} method and call super. *We have logic that relies on this behavior. * * 3. Page IO type ID constant must be declared in this class to have a list of all the @@ -58,7 +60,7 @@ import org.apache.ignite.internal.processors.cache.database.tree.util.PageLockLi * * 7. It is almost always preferable to read or write (especially write) page contents using *static methods on {@link PageHandler}. To just initialize new page use - *{@link PageHandler#initPage(Page, PageLockListener, PageIO, IgniteWriteAheadLogManager)} + *{@link PageHandler#initPage(PageMemory, Page, PageLockListener, PageIO, IgniteWriteAheadLogManager)} *method with needed IO instance. */ public abstract class PageIO { @@ -164,6 +166,7 @@ public abstract class PageIO { } /** + * @param buf Buffer. * @return Page type. */ public static int getType(ByteBuffer buf) { @@ -171,13 +174,21 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page addres. + * @return Page type. + */ +public static int getType(long pageAddr) { +return PageUtils.getShort(pageAddr, TYPE_OFF) & 0x; +} + +/** + * @param pageAddr Page address. * @param type Type. */ -public static void setType(ByteBuffer buf, int type) { -buf.putShort(TYPE_OFF, (short)type); +public static void setType(long pageAddr, int type) { +PageUtils.putShort(pageAddr, TYPE_OFF, (short)type); -assert getType(buf) == type; +assert getType(pageAddr) == type; } /** @@ -189,13 +200,21 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. + * @return Version. + */ +public static int getVersion(long pageAddr) { +return PageUtils.getShort(pageAddr, VER_OFF) & 0x; +} + +/** + * @param pageAddr Page address. * @param ver Version. */ -public static void setVersion(ByteBuffer buf, int ver) { -buf.putShort(VER_OFF, (short)ver); +private static void setVersion(long pageAddr, int ver) { +PageUtils.putShort(pageAddr, VER_OFF, (short)ver); -assert getVersion(buf) == ver; +assert getVersion(pageAddr) == ver; } /** @@ -207,13 +226,37 @@ public abstract class PageIO { } /** - * @param buf Buffer. + * @param pageAddr Page address. + * @return Page ID. + */ +public static long getPageId(long pageAddr) { +return PageUtils.getLong(pageAddr, PAGE_ID_OFF); +} + +/** + * @param pageAddr Page address. * @param pageId Page ID. */ -public static void setPageId(ByteBuffer buf, long pageId) { -buf.putLong(PAGE_ID_OFF, pageId); +public static void setPageId(long pageAddr, long pageId) { +PageUtils.putLong(pageAddr, PAGE_ID_OFF, pageId); + +assert getPageId(pageAddr) == pageId; +} + +/** +
[07/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.8.2'
Merge remote-tracking branch 'remotes/community/ignite-1.8.2' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72f03ea7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72f03ea7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72f03ea7 Branch: refs/heads/ignite-gg-11810-1 Commit: 72f03ea7d8bc92de624817655e21f05c268a3399 Parents: 228d97b da5b68c Author: sboikovAuthored: Fri Dec 30 15:13:06 2016 +0300 Committer: sboikov Committed: Fri Dec 30 15:13:06 2016 +0300 -- .../ignite/internal/util/nio/GridNioServer.java | 159 --- .../communication/tcp/TcpCommunicationSpi.java | 20 +-- .../tcp/TcpCommunicationSpiMBean.java | 5 +- ...mmunicationBalancePairedConnectionsTest.java | 28 .../IgniteCommunicationBalanceTest.java | 25 ++- ...cMessageRecoveryNoPairedConnectionsTest.java | 47 -- ...micMessageRecoveryPairedConnectionsTest.java | 47 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- .../yardstick/cache/IgniteIoTestBenchmark.java | 73 - 9 files changed, 250 insertions(+), 160 deletions(-) --
[21/50] [abbrv] ignite git commit: IGNITE-3886 .NET: Fix build script to use latest build tools
IGNITE-3886 .NET: Fix build script to use latest build tools This fixes C++ compilation issue with retargeted projects Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff0caf81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff0caf81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff0caf81 Branch: refs/heads/ignite-gg-11810-1 Commit: ff0caf810f3bb76f284555dd37f93706c9edf1e7 Parents: 58188e8 Author: Pavel TupitsynAuthored: Tue Jan 10 17:49:07 2017 +0300 Committer: Pavel Tupitsyn Committed: Tue Jan 10 17:49:07 2017 +0300 -- modules/platforms/dotnet/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0caf81/modules/platforms/dotnet/build.ps1 -- diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1 index be7e638..4b5d937 100644 --- a/modules/platforms/dotnet/build.ps1 +++ b/modules/platforms/dotnet/build.ps1 @@ -127,7 +127,7 @@ else { # 2) Build .NET # Detect MSBuild 4.0+ -for ($i=4; $i -le 20; $i++) { +for ($i=20; $i -ge 4; $i--) { $regKey = "HKLM:\software\Microsoft\MSBuild\ToolsVersions\$i.0" if (Test-Path $regKey) { break } }
[41/50] [abbrv] ignite git commit: Merge master into ignite-3477
Merge master into ignite-3477 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4538818a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4538818a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4538818a Branch: refs/heads/ignite-gg-11810-1 Commit: 4538818a36143a66dd4aaa3b9b4f819bce271545 Parents: ca373d7 7b711a3 Author: Alexey GoncharukAuthored: Tue Jan 17 13:48:22 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 17 13:48:22 2017 +0300 -- .../utils/PlatformConfigurationUtils.java | 128 +++- .../hadoop/impl/v2/HadoopV2TaskContext.java | 7 - .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 159 ++ .../BinaryBuilderSelfTestArrayIdentity.cs | 34 +++ .../Binary/BinaryEqualityComparerTest.cs| 279 + .../Binary/IO/BinaryStreamsTest.cs | 19 ++ .../Cache/CacheConfigurationTest.cs | 5 +- .../Cache/Query/CacheDmlQueriesTest.cs | 296 +++ .../IgniteConfigurationSerializerTest.cs| 46 ++- .../IgniteConfigurationTest.cs | 28 ++ .../Apache.Ignite.Core.csproj | 5 + .../Binary/BinaryArrayEqualityComparer.cs | 149 ++ .../Binary/BinaryConfiguration.cs | 24 ++ .../Binary/BinaryTypeConfiguration.cs | 14 + .../Cache/Configuration/QueryEntity.cs | 33 ++- .../Cache/Configuration/QueryField.cs | 6 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 85 -- .../IgniteConfigurationSection.xsd | 19 ++ .../Apache.Ignite.Core/Impl/Binary/Binary.cs| 28 +- .../Binary/BinaryEqualityComparerSerializer.cs | 99 +++ .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 + .../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +- .../Impl/Binary/BinaryObject.cs | 31 +- .../Impl/Binary/BinaryObjectBuilder.cs | 62 +++- .../Impl/Binary/BinaryObjectHeader.cs | 21 +- .../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 ++ .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 6 +- .../Impl/Binary/BinaryWriter.cs | 11 +- .../Impl/Binary/DateTimeHolder.cs | 35 ++- .../Impl/Binary/IBinaryEqualityComparer.cs | 53 .../Impl/Binary/IBinaryTypeDescriptor.cs| 5 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Io/BinaryStreamBase.cs | 13 + .../Impl/Binary/Io/IBinaryStream.cs | 11 +- .../Impl/Binary/Io/IBinaryStreamProcessor.cs| 36 +++ .../Impl/Binary/Marshaller.cs | 22 +- .../Impl/Binary/SerializableObjectHolder.cs | 16 + .../Common/IgniteConfigurationXmlSerializer.cs | 5 +- .../Impl/Memory/PlatformMemoryStream.cs | 16 + 41 files changed, 1845 insertions(+), 160 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4538818a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java -- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index 8202e4a,c0fde97..33571ad --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@@ -17,20 -17,15 +17,26 @@@ package org.apache.ignite.internal.processors.platform.utils; +import java.lang.management.ManagementFactory; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; ++import java.util.Set; ++import java.util.HashSet; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.cache.configuration.Factory; +import javax.cache.expiry.ExpiryPolicy; + import org.apache.ignite.binary.BinaryArrayIdentityResolver; + import org.apache.ignite.binary.BinaryFieldIdentityResolver; + import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; + import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; import