ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [21/23] ignite git commit: Merge branch 'master' into ignite-1282
Date Tue, 22 Sep 2015 15:00:01 GMT
Merge branch 'master' into ignite-1282

Conflicts:
	modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java


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

Branch: refs/heads/ignite-1513-final
Commit: 281b9f2d652ce9109523734ae3843f93feec285f
Parents: b711a5a 0a41ae5
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Sep 22 17:58:20 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Sep 22 17:58:20 2015 +0300

----------------------------------------------------------------------
 .../socket/WordsSocketStreamerServer.java       |   5 +-
 .../apache/ignite/cache/CacheAtomicityMode.java |  17 +-
 .../configuration/CacheConfiguration.java       |  21 +
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheMapEntry.java     |  51 +-
 .../processors/cache/GridCacheProcessor.java    |  10 +-
 .../cache/GridCacheSwapEntryImpl.java           |  31 +-
 .../processors/cache/GridCacheSwapManager.java  |  80 ++-
 .../datastreamer/DataStreamerImpl.java          |   2 -
 .../org/apache/ignite/stream/StreamAdapter.java | 104 +++-
 .../stream/StreamMultipleTupleExtractor.java    |  38 ++
 .../stream/StreamSingleTupleExtractor.java      |  40 ++
 .../ignite/stream/StreamTupleExtractor.java     |  20 +-
 .../ignite/stream/socket/SocketStreamer.java    |   3 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  65 +-
 .../IgniteCachePutRetryAbstractSelfTest.java    |  33 +
 ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 +++-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  13 +-
 .../stream/socket/SocketStreamerSelfTest.java   | 112 +++-
 .../processors/query/h2/IgniteH2Indexing.java   |  19 +-
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  54 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  11 +-
 .../query/h2/opt/GridH2RowDescriptor.java       |   5 +
 .../processors/query/h2/opt/GridH2Table.java    |  10 +-
 .../cache/CacheIndexStreamerTest.java           |  37 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   4 +-
 .../IgniteCacheWithIndexingTestSuite.java       |   2 +
 modules/mqtt/pom.xml                            | 114 ++++
 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++++++++++++++++++
 .../stream/mqtt/IgniteMqttStreamerTest.java     | 553 +++++++++++++++++
 .../mqtt/IgniteMqttStreamerTestSuite.java       |  34 ++
 pom.xml                                         |   1 +
 32 files changed, 2037 insertions(+), 189 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/281b9f2d/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 9fb56bc,44a3fa9..44f7e1b
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -17,10 -17,25 +17,17 @@@
  
  package org.apache.ignite.configuration;
  
+ import java.io.Serializable;
+ import java.util.Collection;
 -import java.util.HashSet;
+ import javax.cache.Cache;
+ import javax.cache.configuration.CompleteConfiguration;
+ import javax.cache.configuration.Factory;
+ import javax.cache.configuration.MutableConfiguration;
+ import javax.cache.expiry.ExpiryPolicy;
  import org.apache.ignite.Ignite;
  import org.apache.ignite.IgniteCache;
 -import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 -import org.apache.ignite.cache.CacheAtomicityMode;
 -import org.apache.ignite.cache.CacheEntryProcessor;
 -import org.apache.ignite.cache.CacheInterceptor;
 -import org.apache.ignite.cache.CacheMemoryMode;
 -import org.apache.ignite.cache.CacheMode;
 -import org.apache.ignite.cache.CacheRebalanceMode;
 -import org.apache.ignite.cache.CacheTypeMetadata;
 -import org.apache.ignite.cache.CacheWriteSynchronizationMode;
 +import org.apache.ignite.IgniteException;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.AffinityFunction;
  import org.apache.ignite.cache.affinity.AffinityKeyMapper;
  import org.apache.ignite.cache.eviction.EvictionFilter;

http://git-wip-us.apache.org/repos/asf/ignite/blob/281b9f2d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/281b9f2d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 268221e,c19a9b7..df383ef
--- a/pom.xml
+++ b/pom.xml
@@@ -75,7 -75,9 +75,8 @@@
          <module>modules/kafka</module>
          <module>modules/yarn</module>
          <module>modules/jms11</module>
+         <module>modules/mqtt</module>
          <module>modules/zookeeper</module>
 -        <module>modules/platform</module>
      </modules>
  
      <profiles>


Mime
View raw message