ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-454' into ignite-45-j8
Date Fri, 20 Mar 2015 16:54:50 GMT
Merge remote-tracking branch 'remotes/origin/ignite-454' into ignite-45-j8

Conflicts:
	examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
	examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
	examples/src/main/java8/org/apache/ignite/examples/java8/ComputeExample.java
	examples/src/main/java8/org/apache/ignite/examples/java8/MessagingExample.java
	examples/src/main/java8/org/apache/ignite/examples8/messaging/MessagingExample.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerMetricsHolder.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerStageMetricsHolder.java
	modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderAdapter.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java


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

Branch: refs/heads/ignite-45
Commit: 1b6740cb20f39f857af9d502bb478444dfa6ef9b
Parents: 0e5070c 8271e51
Author: avinogradov <avinogradov@gridgain.com>
Authored: Fri Mar 20 17:01:26 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Fri Mar 20 17:01:26 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml                                |  59 ++-
 .../datagrid/CacheContinuousQueryExample.java   |   2 +-
 .../java8/IgniteExamplesJ8SelfTestSuite.java    |  43 +++
 .../integration/ClientAbstractSelfTest.java     |   4 +-
 .../rest/RestBinaryProtocolSelfTest.java        |   2 +-
 .../rest/TaskCommandHandlerSelfTest.java        |   2 +-
 modules/core/pom.xml                            |   1 -
 .../cache/IgniteCacheEntryEventFilter.java      |  27 ++
 .../CacheIgfsPerBlockLruEvictionPolicy.java     |   2 +-
 .../ignite/cache/query/ContinuousQuery.java     |   7 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |   4 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |   7 +-
 .../ignite/events/CacheQueryReadEvent.java      |  10 +-
 .../processors/cache/GridCacheAdapter.java      |   4 +-
 .../cache/GridCacheConcurrentMap.java           |   8 +-
 .../CacheDataStructuresManager.java             |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   2 +-
 .../CacheContinuousQueryFilterEx.java           |   4 +-
 .../continuous/CacheContinuousQueryHandler.java |   9 +-
 .../continuous/CacheContinuousQueryManager.java |  18 +-
 .../processors/igfs/IgfsLocalMetrics.java       |  28 +-
 .../processors/job/GridJobProcessor.java        |  10 +-
 .../processors/rest/GridRestProcessor.java      |   2 +-
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java      |   6 +-
 .../unsafe/GridUnsafePartitionedMap.java        |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   8 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   |  20 +-
 .../jdk8/backport/ConcurrentLinkedDeque8.java   |   2 +-
 .../jdk8/backport/ConcurrentLinkedHashMap.java  |   4 +-
 .../main/java/org/jdk8/backport/LongAdder.java  | 235 ------------
 .../main/java/org/jdk8/backport/LongAdder8.java | 235 ++++++++++++
 .../main/java/org/jdk8/backport/Striped64.java  | 370 -------------------
 .../java/org/jdk8/backport/Striped64_8.java     | 370 +++++++++++++++++++
 .../resources/META-INF/classnames.properties    |   2 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |   4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  13 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  48 +--
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 .../DataStreamProcessorSelfTest.java            |   2 +-
 .../IgniteDataStreamerPerformanceTest.java      |   2 +-
 .../future/GridFutureListenPerformanceTest.java |   2 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |   8 +-
 .../ignite/jvmtest/BlockingQueueTest.java       |   2 +-
 .../lang/GridFutureListenPerformanceTest.java   |   2 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  |  14 +-
 .../GridCircularBufferPerformanceTest.java      |   8 +-
 .../colocation/GridTestCacheStore.java          |   3 +-
 .../communication/GridIoManagerBenchmark.java   |   2 +-
 .../communication/GridIoManagerBenchmark0.java  |   6 +-
 .../GridTcpCommunicationBenchmark.java          |   6 +-
 .../GridContinuousOperationsLoadTest.java       |   3 +-
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |   2 +-
 .../job/GridJobExecutionLoadTestClient.java     |   2 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |   2 +-
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |   4 +-
 .../OptimizedObjectStreamSelfTest.java          |  14 +-
 .../hadoop/v1/HadoopV1ReduceTask.java           |   5 +-
 .../hadoop/v2/HadoopV2ReduceTask.java           |   5 +-
 .../taskexecutor/HadoopExecutorServiceTest.java |   4 +-
 .../query/h2/opt/GridLuceneIndex.java           |   8 +-
 .../query/h2/sql/GridSqlQueryParser.java        |   4 +-
 .../cache/GridCacheQuerySimpleBenchmark.java    |   4 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   2 +-
 modules/schema-import/pom.xml                   |  26 +-
 pom.xml                                         |  13 +-
 66 files changed, 947 insertions(+), 790 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index 844ea53,dd13769..c12077e
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@@ -51,56 -49,54 +51,56 @@@ public class CacheContinuousQueryExampl
              System.out.println();
              System.out.println(">>> Cache continuous query example started.");
  
 -            IgniteCache<Integer, String> cache = ignite.jcache(CACHE_NAME);
 +            CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>();
  
 -            // Clean up caches on all nodes before run.
 -            cache.clear();
 +            cfg.setCacheMode(CacheMode.PARTITIONED);
 +            cfg.setName(CACHE_NAME);
  
 -            int keyCnt = 20;
 +            try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) {
 +                int keyCnt = 20;
  
 -            // These entries will be queried by initial predicate.
 -            for (int i = 0; i < keyCnt; i++)
 -                cache.put(i, Integer.toString(i));
 -
 -            // Create new continuous query.
 -            ContinuousQuery<Integer, String> qry = new ContinuousQuery<>();
 -
 -            qry.setInitialQuery(new ScanQuery<>(new IgniteBiPredicate<Integer,
String>() {
 -                @Override public boolean apply(Integer key, String val) {
 -                    return key > 10;
 -                }
 -            }));
 -
 -            // Callback that is called locally when update notifications are received.
 -            qry.setLocalListener(new CacheEntryUpdatedListener<Integer, String>()
{
 -                @Override public void onUpdated(Iterable<CacheEntryEvent<? extends
Integer, ? extends String>> evts) {
 -                    for (CacheEntryEvent<? extends Integer, ? extends String> e :
evts)
 -                        System.out.println("Updated entry [key=" + e.getKey() + ", val="
+ e.getValue() + ']');
 -                }
 -            });
 -
 -            // This filter will be evaluated remotely on all nodes.
 -            // Entry that pass this filter will be sent to the caller.
 -            qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Integer, String>()
{
 -                @Override public boolean evaluate(CacheEntryEvent<? extends Integer,
? extends String> e) {
 -                    return e.getKey() > 10;
 -                }
 -            });
 -
 -            // Execute query.
 -            try (QueryCursor<Cache.Entry<Integer, String>> cur = cache.query(qry))
{
 -                // Iterate through existing data.
 -                for (Cache.Entry<Integer, String> e : cur)
 -                    System.out.println("Queried existing entry [key=" + e.getKey() + ",
val=" + e.getValue() + ']');
 -
 -                // Add a few more keys and watch more query notifications.
 -                for (int i = keyCnt; i < keyCnt + 10; i++)
 +                // These entries will be queried by initial predicate.
 +                for (int i = 0; i < keyCnt; i++)
                      cache.put(i, Integer.toString(i));
  
 -                // Wait for a while while callback is notified about remaining puts.
 -                Thread.sleep(2000);
 +                // Create new continuous query.
 +                ContinuousQuery<Integer, String> qry = new ContinuousQuery<>();
 +
 +                qry.setInitialQuery(new ScanQuery<>(new IgniteBiPredicate<Integer,
String>() {
 +                    @Override public boolean apply(Integer key, String val) {
 +                        return key > 10;
 +                    }
 +                }));
 +
 +                // Callback that is called locally when update notifications are received.
 +                qry.setLocalListener(new CacheEntryUpdatedListener<Integer, String>()
{
 +                    @Override public void onUpdated(Iterable<CacheEntryEvent<? extends
Integer, ? extends String>> evts) {
 +                        for (CacheEntryEvent<? extends Integer, ? extends String>
e : evts)
 +                            System.out.println("Updated entry [key=" + e.getKey() + ", val="
+ e.getValue() + ']');
 +                    }
 +                });
 +
 +                // This filter will be evaluated remotely on all nodes.
 +                // Entry that pass this filter will be sent to the caller.
-                 qry.setRemoteFilter(new CacheEntryEventFilter<Integer, String>() {
++                qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Integer, String>()
{
 +                    @Override public boolean evaluate(CacheEntryEvent<? extends Integer,
? extends String> e) {
 +                        return e.getKey() > 10;
 +                    }
 +                });
 +
 +                // Execute query.
 +                try (QueryCursor<Cache.Entry<Integer, String>> cur = cache.query(qry))
{
 +                    // Iterate through existing data.
 +                    for (Cache.Entry<Integer, String> e : cur)
 +                        System.out.println("Queried existing entry [key=" + e.getKey() +
", val=" + e.getValue() + ']');
 +
 +                    // Add a few more keys and watch more query notifications.
 +                    for (int i = keyCnt; i < keyCnt + 10; i++)
 +                        cache.put(i, Integer.toString(i));
 +
 +                    // Wait for a while while callback is notified about remaining puts.
 +                    Thread.sleep(2000);
 +                }
              }
          }
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java
----------------------------------------------------------------------
diff --cc examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java
index 0000000,0000000..9c8e790
new file mode 100644
--- /dev/null
+++ b/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java
@@@ -1,0 -1,0 +1,43 @@@
++/*
++ * 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.testsuites;
++
++import junit.framework.*;
++import org.apache.ignite.testframework.*;
++
++import static org.apache.ignite.IgniteSystemProperties.*;
++
++/**
++ * Examples test suite.
++ * <p>
++ * Contains only Spring ignite examples tests.
++ */
++public class IgniteExamplesJ8SelfTestSuite extends TestSuite {
++    /**
++     * @return Suite.
++     * @throws Exception If failed.
++     */
++    public static TestSuite suite() throws Exception {
++        System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
++            GridTestUtils.getNextMulticastGroup(IgniteExamplesJ8SelfTestSuite.class));
++
++        TestSuite suite = new TestSuite("Ignite Examples Test Suite");
++
++        return suite;
++    }
++}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 37305d9,97963f1..22992f7
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@@ -567,10 -573,10 +567,10 @@@ public class CacheContinuousQueryManage
  
              CacheEntryUpdatedListener locLsnr = new JCacheQueryLocalListener(
                  locLsnrImpl,
 -                cctx.kernalContext().cache().jcache(cctx.name()));
 +                log);
  
-             CacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter(
-                 cfg.getCacheEntryEventFilterFactory() != null ? (CacheEntryEventFilter)cfg.getCacheEntryEventFilterFactory().create()
: null,
+             IgniteCacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter(
+                 cfg.getCacheEntryEventFilterFactory() != null ? (IgniteCacheEntryEventFilter)cfg.getCacheEntryEventFilterFactory().create()
: null,
                  types);
  
              routineId = executeQuery0(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --cc modules/core/src/main/resources/META-INF/classnames.properties
index f7aeb1e,d972ce9..9b54440
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@@ -1623,6 -1616,8 +1623,6 @@@ org.jdk8.backport.ConcurrentHashMap8$Se
  org.jdk8.backport.ConcurrentLinkedHashMap$QueuePolicy
  org.jdk8.backport.ConcurrentLinkedHashMap$Segment
  org.jdk8.backport.ConcurrentLinkedHashMap$WriteThroughEntry
- org.jdk8.backport.LongAdder
+ org.jdk8.backport.LongAdder8
  org.jdk8.backport.Striped64
  org.jdk8.backport.ThreadLocalRandom8
 -org.pcollections.MapPSet$In
 -org.pcollections.SimpleImmutableEntry

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index b07493d,ad0912d..7c0d8ac
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@@ -888,72 -937,9 +889,72 @@@ public abstract class IgniteCacheEntryL
      /**
       *
       */
 -    static class TestFilterFactory implements Factory<IgniteCacheEntryEventFilter<Integer,
Integer>> {
 +    private static class CreateUpdateRemoveExpireListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new CreateUpdateRemoveExpireListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class NoOpCreateUpdateListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new NoOpCreateUpdateListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class CreateUpdateListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new CreateUpdateListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class CreateListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new CreateListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class RemoveListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new RemoveListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class UpdateListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new UpdateListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class ExpireListenerFactory implements Factory<CacheEntryListener<Integer,
Integer>> {
 +        @Override public CacheEntryListener<Integer, Integer> create() {
 +            return new ExpireListener();
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
-     private static class TestFilterFactory implements Factory<CacheEntryEventFilter<Integer,
Integer>> {
++    private static class TestFilterFactory implements Factory<IgniteCacheEntryEventFilter<Integer,
Integer>> {
          /** {@inheritDoc} */
-         @Override public CacheEntryEventFilter<Integer, Integer> create() {
+         @Override public IgniteCacheEntryEventFilter<Integer, Integer> create() {
              return new TestFilter();
          }
      }
@@@ -961,47 -947,7 +962,47 @@@
      /**
       *
       */
 -    static class TestFilter implements IgniteCacheEntryEventFilter<Integer, Integer>
{
 +    private static class CreateListener implements CacheEntryCreatedListener<Integer,
Integer> {
 +        @Override public void onCreated(Iterable<CacheEntryEvent<? extends Integer,
? extends Integer>> evts) {
 +            for (CacheEntryEvent<? extends Integer, ? extends Integer> evt : evts)
 +                onEvent(evt);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class UpdateListener implements CacheEntryUpdatedListener<Integer,
Integer> {
 +        @Override public void onUpdated(Iterable<CacheEntryEvent<? extends Integer,
? extends Integer>> evts) {
 +            for (CacheEntryEvent<? extends Integer, ? extends Integer> evt : evts)
 +                onEvent(evt);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class RemoveListener implements CacheEntryRemovedListener<Integer,
Integer> {
 +        @Override public void onRemoved(Iterable<CacheEntryEvent<? extends Integer,
? extends Integer>> evts) {
 +            for (CacheEntryEvent<? extends Integer, ? extends Integer> evt : evts)
 +                onEvent(evt);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    private static class ExpireListener implements CacheEntryExpiredListener<Integer,
Integer> {
 +        @Override public void onExpired(Iterable<CacheEntryEvent<? extends Integer,
? extends Integer>> evts) {
 +            for (CacheEntryEvent<? extends Integer, ? extends Integer> evt : evts)
 +                onEvent(evt);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
-     private static class TestFilter implements CacheEntryEventFilter<Integer, Integer>
{
++    private static class TestFilter implements IgniteCacheEntryEventFilter<Integer, Integer>
{
          /** {@inheritDoc} */
          @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends
Integer> evt) {
              assert evt != null;
@@@ -1078,7 -1024,7 +1079,7 @@@
      /**
       *
       */
-     private static class ExceptionFilter implements CacheEntryEventFilter<Integer, Integer>
{
 -    static class ExceptionFilter implements IgniteCacheEntryEventFilter<Integer, Integer>
{
++    private static class ExceptionFilter implements IgniteCacheEntryEventFilter<Integer,
Integer> {
          /** {@inheritDoc} */
          @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends
Integer> evt) {
              throw new RuntimeException("Test filter error.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
index 642e98e,9590b87..a9e75d4
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java
@@@ -137,10 -138,10 +137,10 @@@ public class IgniteDataStreamerPerforma
              final IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(null);
  
              ldr.perNodeBufferSize(8192);
 -            ldr.updater(DataStreamerCacheUpdaters.<Integer, String>batchedSorted());
 +            ldr.receiver(DataStreamerCacheUpdaters.<Integer, String>batchedSorted());
              ldr.autoFlushFrequency(0);
  
-             final LongAdder cnt = new LongAdder();
+             final LongAdder8 cnt = new LongAdder8();
  
              long start = U.currentTimeMillis();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorServiceTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6740cb/pom.xml
----------------------------------------------------------------------


Mime
View raw message