ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [29/30] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
Date Mon, 29 May 2017 07:18:45 GMT
Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
#	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e1ff140
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e1ff140
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e1ff140

Branch: refs/heads/ignite-5075-pds
Commit: 1e1ff140d9fae1698818ed3ae11786024eceae3e
Parents: d1e3f8c 32b43db
Author: sboikov <sboikov@gridgain.com>
Authored: Mon May 29 10:17:55 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon May 29 10:17:55 2017 +0300

----------------------------------------------------------------------
 doap_Ignite.rdf                                 |   2 +
 .../src/main/java/org/apache/ignite/Ignite.java |  18 +-
 .../java/org/apache/ignite/IgniteBinary.java    |  23 +-
 .../org/apache/ignite/binary/BinaryObject.java  |   8 +
 .../org/apache/ignite/binary/BinaryType.java    |   5 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  26 ++
 .../configuration/CacheConfiguration.java       |   5 +-
 .../MemoryPolicyConfiguration.java              |  96 +++++-
 .../org/apache/ignite/internal/IgniteEx.java    |  27 ++
 .../apache/ignite/internal/IgniteKernal.java    |  38 ++-
 .../binary/BinaryCachingMetadataHandler.java    |   5 +
 .../internal/binary/BinaryClassDescriptor.java  |   4 +-
 .../ignite/internal/binary/BinaryContext.java   |  60 +++-
 .../internal/binary/BinaryEnumObjectImpl.java   |  30 +-
 .../internal/binary/BinaryFieldAccessor.java    |  10 +
 .../ignite/internal/binary/BinaryMetadata.java  |  93 +++++-
 .../internal/binary/BinaryMetadataHandler.java  |   9 +
 .../binary/BinaryNoopMetadataHandler.java       |   5 +
 .../internal/binary/BinaryObjectExImpl.java     |   5 +
 .../internal/binary/BinaryReaderExImpl.java     |  18 ++
 .../ignite/internal/binary/BinaryTypeImpl.java  |  15 +
 .../ignite/internal/binary/BinaryTypeProxy.java |   6 +
 .../ignite/internal/binary/BinaryUtils.java     | 104 +++++-
 .../internal/binary/BinaryWriterExImpl.java     |  18 +-
 .../internal/binary/GridBinaryMarshaller.java   |   3 +
 .../binary/builder/BinaryBuilderSerializer.java |  10 +-
 .../binary/builder/BinaryObjectBuilderImpl.java |   2 +-
 .../affinity/GridAffinityProcessor.java         |   2 +-
 .../cache/CacheAffinitySharedManager.java       |   2 +-
 .../cache/CacheGroupInfrastructure.java         | 168 +++++++++-
 .../processors/cache/ClusterCachesInfo.java     |  16 +-
 .../processors/cache/ExchangeActions.java       |   2 +-
 .../cache/GridCacheAffinityManager.java         |   2 +-
 .../processors/cache/GridCacheContext.java      |   8 -
 .../processors/cache/GridCacheMapEntry.java     |  49 +--
 .../processors/cache/GridCacheProcessor.java    |  58 ++--
 .../binary/CacheObjectBinaryProcessor.java      |  21 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  72 ++++-
 .../cache/binary/IgniteBinaryImpl.java          |  26 ++
 .../cache/database/CacheDataRowAdapter.java     |   8 +-
 .../IgniteCacheDatabaseSharedManager.java       |  40 +++
 .../cache/database/MemoryMetricsImpl.java       |  31 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   4 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  11 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   1 -
 .../continuous/CacheContinuousQueryManager.java |  47 ++-
 .../query/continuous/CounterSkipContext.java    |  56 ++++
 .../processors/cacheobject/NoOpBinary.java      |  12 +
 .../platform/PlatformContextImpl.java           |  29 +-
 .../binary/PlatformBinaryProcessor.java         |  25 ++
 .../processors/query/GridQueryProcessor.java    |  52 +++
 .../internal/processors/query/QueryUtils.java   |  29 +-
 .../handlers/cache/GridCacheCommandHandler.java |   8 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   4 +-
 .../internal/binary/BinaryEnumsSelfTest.java    | 146 ++++++++-
 .../binary/TestCachingMetadataHandler.java      |   5 +
 .../processors/cache/IgniteCacheGroupsTest.java |  96 ++++++
 ...iteMarshallerCacheClassNameConflictTest.java |   9 +-
 .../cache/MemoryPolicyConfigValidationTest.java |  62 +++-
 .../processors/igfs/IgfsIgniteMock.java         |  24 ++
 .../platform/PlatformComputeEchoTask.java       |  13 +
 .../ignite/testframework/GridTestUtils.java     |   6 +-
 .../config/GridTestProperties.java              |   3 +-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../junits/multijvm/IgniteProcessProxy.java     |  18 ++
 .../ignite/testsuites/IgniteBasicTestSuite.java |  13 +-
 .../testsuites/IgniteBinaryBasicTestSuite.java  |  75 +----
 ...iteBinarySimpleNameMapperBasicTestSuite.java |   3 +-
 .../collections/HadoopSkipListSelfTest.java     |  37 ---
 .../query/h2/ddl/DdlStatementsProcessor.java    |  55 +++-
 .../query/h2/sql/GridSqlCreateTable.java        | 153 +++++++++
 .../query/h2/sql/GridSqlDropTable.java          |  79 +++++
 .../query/h2/sql/GridSqlQueryParser.java        | 260 +++++++++++++++
 .../cache/index/H2DynamicTableSelfTest.java     | 320 +++++++++++++++++++
 .../query/h2/sql/GridQueryParsingTest.java      | 284 +++++++++++++++-
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../Binary/BinaryBuilderSelfTest.cs             |  88 ++++-
 .../Cache/Query/CacheLinqTest.cs                |  70 +++-
 .../Compute/ComputeApiTest.cs                   |  25 ++
 .../Binary/BinaryTypeConfiguration.cs           |   3 +-
 .../dotnet/Apache.Ignite.Core/Binary/IBinary.cs |  24 ++
 .../Apache.Ignite.Core/Binary/IBinaryObject.cs  |   8 +
 .../Apache.Ignite.Core/Binary/IBinaryType.cs    |   6 +
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |  67 +++-
 .../Impl/Binary/BinaryEnum.cs                   |  11 +-
 .../Impl/Binary/BinaryObject.cs                 |  13 +-
 .../Impl/Binary/BinaryProcessor.cs              |  65 +++-
 .../Impl/Binary/BinaryReader.cs                 |  10 +-
 .../Impl/Binary/BinarySystemHandlers.cs         |  25 +-
 .../Impl/Binary/BinaryUtils.cs                  |  19 ++
 .../Impl/Binary/BinaryWriter.cs                 |   4 +-
 .../Impl/Binary/Marshaller.cs                   |  88 ++---
 .../Impl/Binary/Metadata/BinaryType.cs          | 179 ++++++++++-
 .../Impl/Binary/Metadata/BinaryTypeHolder.cs    |  44 ++-
 .../Apache.Ignite.Linq.csproj                   |   3 +
 .../Apache.Ignite.Linq/CacheExtensions.cs       |  65 ++++
 .../Impl/CacheFieldsQueryExecutor.cs            |  39 ---
 .../Impl/CacheQueryExpressionVisitor.cs         |  12 +-
 .../Impl/CacheQueryModelVisitor.cs              |  73 +++--
 .../Apache.Ignite.Linq/Impl/CacheQueryParser.cs |  21 +-
 .../Impl/CacheQueryableBase.cs                  |  14 +-
 .../Impl/Dml/RemoveAllExpressionNode.cs         |  88 +++++
 .../Impl/Dml/RemoveAllResultOperator.cs         |  61 ++++
 .../Impl/ICacheQueryableInternal.cs             |   6 -
 .../Apache.Ignite.Linq/Impl/MethodVisitor.cs    |   7 +-
 .../dotnet/Apache.Ignite.Linq/Impl/QueryData.cs |  17 +-
 .../dotnet/Apache.Ignite.sln.DotSettings        |   1 +
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |   1 -
 .../Apache.Ignite/Service/ServiceDescription.cs |  32 --
 .../org/apache/ignite/IgniteSpringBean.java     |   7 +
 .../yardstick/IgniteBenchmarkArguments.java     |  22 ++
 .../org/apache/ignite/yardstick/IgniteNode.java |   5 +
 .../cache/IgniteCacheAbstractBenchmark.java     | 113 +++++++
 .../yardstick/cache/IgniteGetAllBenchmark.java  |   3 +
 .../cache/IgniteGetAllPutAllTxBenchmark.java    |   2 +
 .../cache/IgniteGetAndPutBenchmark.java         |   2 +
 .../cache/IgniteGetAndPutTxBenchmark.java       |   2 +
 .../yardstick/cache/IgniteGetBenchmark.java     |  18 +-
 .../IgniteGetEntriesPutAllTxBenchmark.java      |   2 +
 .../yardstick/cache/IgniteInvokeBenchmark.java  |   2 +
 .../cache/IgniteInvokeTxBenchmark.java          |   2 +
 .../IgniteInvokeWithInjectionBenchmark.java     |   2 +
 .../yardstick/cache/IgnitePutAllBenchmark.java  |   2 +
 .../IgnitePutAllSerializableTxBenchmark.java    |   2 +
 .../yardstick/cache/IgnitePutBenchmark.java     |   2 +
 .../cache/IgnitePutGetBatchBenchmark.java       |   2 +
 .../yardstick/cache/IgnitePutGetBenchmark.java  |   2 +
 .../cache/IgnitePutGetEntryBenchmark.java       |   2 +
 .../cache/IgnitePutGetEntryTxBenchmark.java     |   2 +
 .../cache/IgnitePutGetTxBatchBenchmark.java     |   2 +
 .../cache/IgnitePutGetTxBenchmark.java          |   2 +
 ...IgnitePutIfAbsentIndexedValue1Benchmark.java |   2 +
 .../cache/IgnitePutIndexedValue1Benchmark.java  |   2 +
 .../cache/IgnitePutIndexedValue2Benchmark.java  |   2 +
 .../cache/IgnitePutIndexedValue8Benchmark.java  |   2 +
 .../IgnitePutRandomValueSizeBenchmark.java      |   2 +
 .../cache/IgnitePutRemoveBenchmark.java         |   2 +
 .../yardstick/cache/IgnitePutTxBenchmark.java   |   2 +
 .../cache/IgnitePutTxImplicitBenchmark.java     |   2 +
 .../cache/IgnitePutTxPrimaryOnlyBenchmark.java  |   2 +
 .../IgnitePutTxSkipLocalBackupBenchmark.java    |   2 +
 .../cache/IgnitePutValue8Benchmark.java         |   2 +
 .../IgniteReplaceIndexedValue1Benchmark.java    |   2 +
 .../cache/IgniteSqlQueryBenchmark.java          |  16 +-
 .../IgniteSqlQueryDistributedJoinBenchmark.java |  24 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |  14 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |   8 +-
 .../IgniteSqlQueryPutSeparatedBenchmark.java    |   4 +
 .../IgniteCacheRandomOperationBenchmark.java    |  42 ++-
 .../apache/ignite/yardstick/io/FileUtils.java   |  64 ++++
 150 files changed, 4073 insertions(+), 608 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index fcddf6b,3a380a3..0417dfa
--- 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
@@@ -1220,8 -1221,8 +1219,12 @@@ public class GridCacheProcessor extend
  
          cacheCtx.onStarted();
  
--        if (log.isInfoEnabled()){
-             log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null
? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName()
+ ", mode=" + cfg.getCacheMode() + ']');}
 -            log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null
? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName()
+ ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');}
++        if (log.isInfoEnabled()) {
++            log.info("Started cache [name=" + cfg.getName() +
++                (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
++                ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
++                ", mode=" + cfg.getCacheMode() + ", atomicity=" + cfg.getAtomicityMode()
+ ']');
++        }
      }
  
      /**
@@@ -2549,7 -2498,7 +2569,7 @@@
       * @param checkThreadTx If {@code true} checks that current thread does not have active
transactions.
       * @return Future that will be completed when cache is destroyed.
       */
-     public IgniteInternalFuture<?> dynamicDestroyCache(String cacheName, boolean checkThreadTx,
boolean restart) {
 -    public IgniteInternalFuture<Boolean> dynamicDestroyCache(String cacheName, boolean
checkThreadTx) {
++    public IgniteInternalFuture<Boolean> dynamicDestroyCache(String cacheName, boolean
checkThreadTx, boolean restart) {
          assert cacheName != null;
  
          if (checkThreadTx)

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/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/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
index 9349958,1cc8999..a1bb665
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
@@@ -35,13 -35,12 +35,16 @@@ import java.util.concurrent.atomic.Atom
  import java.util.concurrent.locks.Lock;
  import javax.cache.Cache;
  import javax.cache.CacheException;
 +import javax.cache.processor.EntryProcessorException;
 +import javax.cache.processor.MutableEntry;
 +import javax.cache.processor.EntryProcessorException;
 +import javax.cache.processor.MutableEntry;
  import javax.cache.configuration.Factory;
+ import javax.cache.event.CacheEntryUpdatedListener;
  import javax.cache.integration.CacheLoaderException;
  import javax.cache.integration.CacheWriterException;
+ import javax.cache.processor.EntryProcessorException;
+ import javax.cache.processor.MutableEntry;
  import org.apache.ignite.Ignite;
  import org.apache.ignite.IgniteCache;
  import org.apache.ignite.IgniteCheckedException;

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1e1ff140/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------


Mime
View raw message