ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [09/14] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-950
Date Thu, 09 Jul 2015 01:47:13 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-950


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

Branch: refs/heads/ignite-950
Commit: 08f8fa7f20c75f5ff5bb906f0816b04f98062820
Parents: b10836d 0f1b31a
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Tue Jul 7 16:47:24 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Tue Jul 7 16:47:24 2015 -0700

----------------------------------------------------------------------
 bin/ignite.bat                                  |   8 +-
 bin/ignite.sh                                   |   6 +-
 bin/include/parseargs.bat                       |   1 +
 bin/include/parseargs.sh                        |   3 +
 dev-tools/slurp.sh                              |   2 +-
 modules/core/pom.xml                            |   4 +-
 .../cache/eviction/fifo/FifoEvictionPolicy.java |   5 -
 .../cache/eviction/lru/LruEvictionPolicy.java   |   5 -
 .../eviction/sorted/SortedEvictionPolicy.java   |  19 +-
 .../internal/interop/InteropIgnition.java       |  48 ++-
 .../internal/interop/InteropProcessor.java      |   7 +
 .../dht/GridPartitionedGetFuture.java           |  13 +-
 .../cache/query/GridCacheQueryAdapter.java      |  35 +-
 .../processors/query/GridQueryProcessor.java    |   5 +
 .../ignite/internal/util/IgniteUtils.java       |   6 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  26 ++
 .../startup/cmdline/CommandLineStartup.java     |   3 +-
 .../startup/cmdline/CommandLineTransformer.java |   9 +
 .../cache/CacheFutureExceptionSelfTest.java     | 171 +++++++++
 .../GridCachePartitionedFailoverSelfTest.java   |   5 +
 .../GridCachePartitionedNodeRestartTest.java    |   5 -
 ...ePartitionedOptimisticTxNodeRestartTest.java |   2 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |   5 -
 .../GridCacheReplicatedNodeRestartSelfTest.java |   5 -
 ...acheAtomicReplicatedNodeRestartSelfTest.java |  10 +
 ...heConcurrentEvictionConsistencySelfTest.java |  15 +-
 .../TcpDiscoveryNodeConsistentIdSelfTest.java   |  80 ++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |   2 +
 .../CacheAbstractQueryMetricsSelfTest.java      | 157 +++++++-
 .../cache/CacheLocalQueryMetricsSelfTest.java   |  33 ++
 ...titionedQueryMetricsDistributedSelfTest.java |  33 ++
 ...chePartitionedQueryMetricsLocalSelfTest.java |  33 ++
 .../CachePartitionedQueryMetricsSelfTest.java   |  32 --
 ...plicatedQueryMetricsDistributedSelfTest.java |  33 ++
 ...acheReplicatedQueryMetricsLocalSelfTest.java |  33 ++
 .../CacheReplicatedQueryMetricsSelfTest.java    |  32 --
 .../IgniteCacheQuerySelfTestSuite.java          |   7 +-
 modules/kafka/pom.xml                           | 116 ++++++
 .../ignite/stream/kafka/KafkaStreamer.java      | 220 +++++++++++
 .../kafka/IgniteKafkaStreamerSelfTestSuite.java |  37 ++
 .../stream/kafka/KafkaEmbeddedBroker.java       | 378 +++++++++++++++++++
 .../kafka/KafkaIgniteStreamerSelfTest.java      | 227 +++++++++++
 .../ignite/stream/kafka/SimplePartitioner.java  |  53 +++
 modules/mesos/pom.xml                           |   1 -
 modules/rest-http/pom.xml                       |  14 +-
 .../util/spring/IgniteSpringHelperImpl.java     |  72 +++-
 .../IgniteExcludeInConfigurationTest.java       |  78 ++++
 .../org/apache/ignite/spring/sprint-exclude.xml |  57 +++
 .../testsuites/IgniteSpringTestSuite.java       |   2 +
 modules/urideploy/pom.xml                       |   8 +-
 .../ignite/visor/commands/VisorConsole.scala    |   3 +-
 .../visor/commands/open/VisorOpenCommand.scala  | 319 ++++++++++++++++
 .../scala/org/apache/ignite/visor/visor.scala   | 230 +----------
 .../ignite/visor/VisorRuntimeBaseSpec.scala     |   2 +
 .../commands/kill/VisorKillCommandSpec.scala    |   1 +
 .../commands/start/VisorStartCommandSpec.scala  |   1 +
 .../commands/tasks/VisorTasksCommandSpec.scala  |   1 +
 .../commands/vvm/VisorVvmCommandSpec.scala      |   1 +
 modules/web/pom.xml                             |   6 +-
 parent/pom.xml                                  |   1 +
 pom.xml                                         |   1 +
 scripts/git-patch-prop.sh                       |   2 +-
 63 files changed, 2340 insertions(+), 390 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08f8fa7f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index d396d0b,2d7d0ce..ae7fa88
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -116,15 -116,15 +116,18 @@@ public class IgniteCacheQuerySelfTestSu
          suite.addTestSuite(H2CompareBigQueryTest.class);
  
          // Cache query metrics.
-         suite.addTestSuite(CachePartitionedQueryMetricsSelfTest.class);
-         suite.addTestSuite(CacheReplicatedQueryMetricsSelfTest.class);
+         suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class);
+         suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class);
+         suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class);
+         suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class);
+         suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class);
  
 -        //Unmarshallig query test.
 +        // Unmarshallig query test.
          suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class);
  
 +        // Optimized extended marshaller query tests
 +        suite.addTestSuite(IgniteCacheOptimizedMarshallerExtQuerySelfTest.class);
 +
          return suite;
      }
  }


Mime
View raw message