ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-45' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Date Fri, 20 Mar 2015 15:48:23 GMT
Merge branches 'ignite-45' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-45

Conflicts:
	examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
	modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
	modules/core/src/main/java/org/apache/ignite/streamer/index/tree/StreamerTreeIndexProvider.java
	modules/core/src/test/java/org/apache/ignite/loadtests/streamer/IndexUpdater.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/2fbaa428
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2fbaa428
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2fbaa428

Branch: refs/heads/ignite-525
Commit: 2fbaa428033e12d35f57292bba7f9b21e446ddc9
Parents: fbe025f 4477cdb
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Mar 20 16:58:38 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Mar 20 16:58:38 2015 +0700

----------------------------------------------------------------------
 LICENSE.txt                                     |   26 -
 NOTICE.txt                                      |   11 -
 .../apache/ignite/examples/ExamplesUtils.java   |   18 -
 .../streaming/StreamingCheckInExample.java      |  580 ------
 .../streaming/StreamingNodeStartup.java         |   35 -
 .../StreamingPopularNumbersExample.java         |  167 --
 .../streaming/StreamingPriceBarsExample.java    |  451 -----
 .../StreamingRunningAverageExample.java         |  247 ---
 .../ignite/examples/streaming/package-info.java |   22 -
 modules/core/pom.xml                            |    2 +-
 .../src/main/java/com/romix/scala/None.java     |   27 -
 .../src/main/java/com/romix/scala/Option.java   |   42 -
 .../src/main/java/com/romix/scala/Some.java     |   38 -
 .../scala/collection/concurrent/BasicNode.java  |   32 -
 .../scala/collection/concurrent/CNodeBase.java  |   49 -
 .../romix/scala/collection/concurrent/Gen.java  |   29 -
 .../scala/collection/concurrent/INodeBase.java  |   47 -
 .../scala/collection/concurrent/ListMap.java    |  247 ---
 .../scala/collection/concurrent/MainNode.java   |   51 -
 .../romix/scala/collection/concurrent/Pair.java |   54 -
 .../scala/collection/concurrent/TrieMap.java    | 1826 ------------------
 .../src/main/java/org/apache/ignite/Ignite.java |   17 -
 .../java/org/apache/ignite/IgniteStreamer.java  |  154 --
 .../org/apache/ignite/cluster/ClusterGroup.java |    9 -
 .../configuration/IgniteConfiguration.java      |   23 -
 .../ignite/internal/GridKernalContext.java      |    8 -
 .../ignite/internal/GridKernalContextImpl.java  |   12 -
 .../apache/ignite/internal/IgniteKernal.java    |   26 -
 .../org/apache/ignite/internal/IgnitionEx.java  |   12 -
 .../internal/cluster/ClusterGroupAdapter.java   |   40 -
 .../cluster/IgniteClusterAsyncImpl.java         |    5 -
 .../communication/GridIoMessageFactory.java     |   16 -
 .../GridDeploymentPerLoaderStore.java           |    1 -
 .../GridDeploymentPerVersionStore.java          |    1 -
 .../streamer/GridStreamProcessor.java           |  347 ----
 .../streamer/GridStreamerAttributes.java        |  127 --
 .../streamer/GridStreamerCancelRequest.java     |  110 --
 .../streamer/GridStreamerContextDelegate.java   |  102 -
 .../streamer/GridStreamerContextImpl.java       |  201 --
 .../streamer/GridStreamerExecutionBatch.java    |  175 --
 .../streamer/GridStreamerExecutionRequest.java  |  293 ---
 .../streamer/GridStreamerResponse.java          |  144 --
 .../GridStreamerRouteFailedException.java       |   36 -
 .../GridStreamerStageExecutionFuture.java       |  340 ----
 .../streamer/GridStreamerWindowIterator.java    |   40 -
 .../processors/streamer/IgniteStreamerEx.java   |   94 -
 .../processors/streamer/IgniteStreamerImpl.java | 1375 -------------
 .../streamer/StreamerMBeanAdapter.java          |  116 --
 .../streamer/StreamerMetricsAdapter.java        |  272 ---
 .../streamer/StreamerMetricsHolder.java         |  424 ----
 .../streamer/StreamerStageMBeanAdapter.java     |  101 -
 .../streamer/StreamerStageMetricsAdapter.java   |  135 --
 .../streamer/StreamerStageMetricsHolder.java    |  167 --
 .../streamer/StreamerStageWrapper.java          |   90 -
 .../streamer/StreamerWindowMetricsAdapter.java  |   65 -
 .../streamer/StreamerWindowMetricsHolder.java   |   50 -
 .../processors/streamer/package-info.java       |   22 -
 .../task/GridStreamerBroadcastTask.java         |  137 --
 .../streamer/task/GridStreamerQueryTask.java    |  140 --
 .../streamer/task/GridStreamerReduceTask.java   |  144 --
 .../ignite/internal/util/IgniteUtils.java       |   23 -
 .../visor/node/VisorGridConfiguration.java      |   12 -
 .../visor/node/VisorNodeDataCollectorJob.java   |   37 +-
 .../node/VisorNodeDataCollectorJobResult.java   |   28 -
 .../visor/node/VisorNodeDataCollectorTask.java  |    6 -
 .../node/VisorNodeDataCollectorTaskResult.java  |   43 +-
 .../internal/visor/streamer/VisorStreamer.java  |  104 -
 .../streamer/VisorStreamerConfiguration.java    |  177 --
 .../visor/streamer/VisorStreamerMetrics.java    |  350 ----
 .../streamer/VisorStreamerMetricsResetTask.java |   75 -
 .../visor/streamer/VisorStreamerResetTask.java  |   75 -
 .../streamer/VisorStreamerStageMetrics.java     |  277 ---
 .../ignite/streamer/StreamerConfiguration.java  |  249 ---
 .../apache/ignite/streamer/StreamerContext.java |  142 --
 .../ignite/streamer/StreamerEventRouter.java    |   55 -
 .../streamer/StreamerEventRouterAdapter.java    |   60 -
 .../streamer/StreamerFailureListener.java       |   44 -
 .../apache/ignite/streamer/StreamerMBean.java   |  169 --
 .../apache/ignite/streamer/StreamerMetrics.java |  209 --
 .../apache/ignite/streamer/StreamerStage.java   |   61 -
 .../ignite/streamer/StreamerStageMBean.java     |  114 --
 .../ignite/streamer/StreamerStageMetrics.java   |   93 -
 .../apache/ignite/streamer/StreamerWindow.java  |  206 --
 .../ignite/streamer/StreamerWindowMBean.java    |   58 -
 .../ignite/streamer/StreamerWindowMetrics.java  |   44 -
 .../ignite/streamer/index/StreamerIndex.java    |  305 ---
 .../streamer/index/StreamerIndexEntry.java      |   57 -
 .../streamer/index/StreamerIndexPolicy.java     |   50 -
 .../streamer/index/StreamerIndexProvider.java   |  107 -
 .../index/StreamerIndexProviderAdapter.java     |  796 --------
 .../index/StreamerIndexProviderMBean.java       |   74 -
 .../streamer/index/StreamerIndexUpdateSync.java |   77 -
 .../streamer/index/StreamerIndexUpdater.java    |   88 -
 .../index/hash/StreamerHashIndexProvider.java   |  500 -----
 .../streamer/index/hash/package-info.java       |   21 -
 .../ignite/streamer/index/package-info.java     |   21 -
 .../index/tree/StreamerTreeIndexProvider.java   |  956 ---------
 .../streamer/index/tree/package-info.java       |   21 -
 .../apache/ignite/streamer/package-info.java    |   21 -
 .../router/StreamerAffinityEventRouter.java     |  150 --
 .../StreamerCacheAffinityEventRouter.java       |   70 -
 .../router/StreamerLocalEventRouter.java        |   46 -
 .../router/StreamerRandomEventRouter.java       |   89 -
 .../router/StreamerRoundRobinEventRouter.java   |   53 -
 .../ignite/streamer/router/package-info.java    |   21 -
 .../window/StreamerBoundedSizeBatchWindow.java  |  804 --------
 .../window/StreamerBoundedSizeSortedWindow.java |  218 ---
 .../window/StreamerBoundedSizeWindow.java       |  144 --
 .../StreamerBoundedSizeWindowAdapter.java       |  357 ----
 .../window/StreamerBoundedTimeBatchWindow.java  |  906 ---------
 .../window/StreamerBoundedTimeWindow.java       |  462 -----
 .../window/StreamerUnboundedWindow.java         |  111 --
 .../streamer/window/StreamerWindowAdapter.java  |  537 -----
 .../ignite/streamer/window/package-info.java    |   21 -
 .../java/org/pcollections/AmortizedPQueue.java  |  156 --
 .../main/java/org/pcollections/ConsPStack.java  |  225 ---
 .../src/main/java/org/pcollections/Empty.java   |   47 -
 .../main/java/org/pcollections/HashPMap.java    |  175 --
 .../java/org/pcollections/HashTreePBag.java     |   47 -
 .../java/org/pcollections/HashTreePMap.java     |   52 -
 .../java/org/pcollections/HashTreePSet.java     |   46 -
 .../src/main/java/org/pcollections/IntTree.java |  320 ---
 .../main/java/org/pcollections/IntTreePMap.java |  165 --
 .../src/main/java/org/pcollections/MapPBag.java |  143 --
 .../src/main/java/org/pcollections/MapPSet.java |  101 -
 .../main/java/org/pcollections/OrderedPSet.java |   85 -
 .../src/main/java/org/pcollections/PBag.java    |   23 -
 .../main/java/org/pcollections/PCollection.java |   56 -
 .../src/main/java/org/pcollections/PMap.java    |   49 -
 .../main/java/org/pcollections/POrderedSet.java |   25 -
 .../src/main/java/org/pcollections/PQueue.java  |   38 -
 .../main/java/org/pcollections/PSequence.java   |   73 -
 .../src/main/java/org/pcollections/PSet.java    |   23 -
 .../src/main/java/org/pcollections/PStack.java  |   51 -
 .../src/main/java/org/pcollections/PVector.java |   45 -
 .../org/pcollections/SimpleImmutableEntry.java  |  146 --
 .../main/java/org/pcollections/TreePVector.java |  155 --
 .../resources/META-INF/classnames.properties    |    2 -
 .../streamer/GridStreamerEvictionSelfTest.java  |  163 --
 .../streamer/GridStreamerFailoverSelfTest.java  |  267 ---
 .../GridStreamerLifecycleAwareSelfTest.java     |  212 --
 .../streamer/GridStreamerSelfTest.java          |  796 --------
 .../processors/streamer/GridTestStage.java      |   52 -
 .../streamer/GridTestStreamerEventRouter.java   |   49 -
 .../ignite/internal/processors/streamer/SC.java |   31 -
 .../GridImmutableCollectionsPerfomanceTest.java |  120 --
 .../ignite/lang/utils/GridPCollectionsTest.java |   54 -
 .../ignite/lang/utils/GridTrieMapSelfTest.java  |  242 ---
 .../ignite/loadtests/streamer/EventClosure.java |   60 -
 .../streamer/GridStreamerBenchmark.java         |  140 --
 .../streamer/GridStreamerIndexLoadTest.java     |  179 --
 .../loadtests/streamer/GridStreamerLoad.java    |   62 -
 .../ignite/loadtests/streamer/IndexUpdater.java |   46 -
 .../ignite/loadtests/streamer/QueryClosure.java |  107 -
 .../loadtests/streamer/average/TestAverage.java |   70 -
 .../loadtests/streamer/average/TestStage.java   |   63 -
 .../marshaller/GridMarshallerAbstractTest.java  |   56 -
 .../index/GridStreamerIndexSelfTest.java        |  686 -------
 .../window/GridStreamerWindowSelfTest.java      |  911 ---------
 .../ignite/testframework/junits/IgniteMock.java |   10 -
 .../ignite/testsuites/IgniteBasicTestSuite.java |    3 -
 .../testsuites/IgniteStreamerSelfTestSuite.java |   46 -
 .../org/apache/ignite/IgniteSpringBean.java     |   14 -
 pom.xml                                         |    4 +-
 164 files changed, 13 insertions(+), 26044 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 934c0a9,4cbd11a..c1d31af
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@@ -544,14 -528,9 +544,9 @@@ public class ClusterGroupAdapter implem
      }
  
      /** {@inheritDoc} */
-     @Override public final ClusterGroup forStreamer(@Nullable String streamerName, @Nullable
String... streamerNames) {
-         return forPredicate(new StreamersFilter(streamerName, streamerNames));
-     }
- 
-     /** {@inheritDoc} */
 -    @Override public ClusterGroup forCacheNodes(@Nullable String cacheName,
 -        Set<CacheDistributionMode> distributionModes) {
 -        return forPredicate(new CachesFilter(cacheName, distributionModes));
 +    @Override public ClusterGroup forCacheNodes(@Nullable String cacheName, boolean affNodes,
boolean nearNodes,
 +        boolean clientNodes) {
 +        return forPredicate(new CachesFilter(cacheName, affNodes, nearNodes, clientNodes));
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f7f6cb8,f095438..299d3ae
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@@ -6994,28 -6989,129 +6993,6 @@@ public abstract class IgniteUtils 
      }
  
      /**
-      * Checks if given node has specified streamer started.
 -     * Gets cache attributes from the given node for the given cache name.
 -     *
 -     * @param n Node.
 -     * @param cacheName Cache name.
 -     * @return Attributes.
 -     */
 -    @Nullable public static GridCacheAttributes cacheAttributes(ClusterNode n, @Nullable
String cacheName) {
 -        for (GridCacheAttributes a : cacheAttributes(n)) {
 -            if (F.eq(a.cacheName(), cacheName))
 -                return a;
 -        }
 -
 -        return null;
 -    }
 -
 -    /**
 -     * Gets view on all cache names started on the node.
 -     *
 -     * @param n Node to get cache names for.
 -     * @return Cache names for the node.
 -     */
 -    public static Collection<String> cacheNames(ClusterNode n) {
 -        return F.viewReadOnly(
 -            F.asList(n.<GridCacheAttributes[]>attribute(ATTR_CACHE)),
 -            new C1<GridCacheAttributes, String>() {
 -                @Override public String apply(GridCacheAttributes attrs) {
 -                    return attrs.cacheName();
 -                }
 -            });
 -    }
 -
 -    /**
 -     * Checks if given node has specified cache started.
--     *
--     * @param n Node to check.
-      * @param streamerName Streamer name to check.
-      * @return {@code True} if given node has specified streamer started.
 -     * @param cacheName Cache name to check.
 -     * @return {@code True} if given node has specified cache started.
--     */
-     public static boolean hasStreamer(ClusterNode n, @Nullable String streamerName) {
 -    public static boolean hasCache(ClusterNode n, @Nullable String cacheName) {
--        assert n != null;
--
-         GridStreamerAttributes[] attrs = n.attribute(ATTR_STREAMER);
 -        GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
--
-         if (attrs != null) {
-             for (GridStreamerAttributes attr : attrs) {
-                 if (F.eq(streamerName, attr.name()))
 -        if (caches != null)
 -            for (GridCacheAttributes attrs : caches)
 -                if (F.eq(cacheName, attrs.cacheName()))
--                    return true;
-             }
-         }
--
--        return false;
 -    }
 -
 -    /**
 -     * Checks if given node has at least one cache.
 -     *
 -     * @param n Node to check.
 -     * @return {@code True} if given node has specified cache started.
 -     */
 -    public static boolean hasCaches(ClusterNode n) {
 -        assert n != null;
 -
 -        GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
 -
 -        return !F.isEmpty(caches);
 -    }
 -
 -    /**
 -     * Gets cache mode or a cache on given node or {@code null} if cache is not
 -     * present on given node.
 -     *
 -     * @param n Node to check.
 -     * @param cacheName Cache to check.
 -     * @return Cache mode or {@code null} if cache is not found.
 -     */
 -    @Nullable public static CacheMode cacheMode(ClusterNode n, String cacheName) {
 -        GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
 -
 -        if (caches != null)
 -            for (GridCacheAttributes attrs : caches)
 -                if (F.eq(cacheName, attrs.cacheName()))
 -                    return attrs.cacheMode();
 -
 -        return null;
 -    }
 -
 -    /**
 -     * Gets cache mode or a cache on given node or {@code null} if cache is not
 -     * present on given node.
 -     *
 -     * @param n Node to check.
 -     * @param cacheName Cache to check.
 -     * @return Cache mode or {@code null} if cache is not found.
 -     */
 -    @Nullable public static CacheAtomicityMode atomicityMode(ClusterNode n, String cacheName)
{
 -        GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
 -
 -        if (caches != null)
 -            for (GridCacheAttributes attrs : caches)
 -                if (F.eq(cacheName, attrs.cacheName()))
 -                    return attrs.atomicityMode();
 -
 -        return null;
 -    }
 -
 -    /**
 -     * Gets cache distribution mode on given node or {@code null} if cache is not
 -     * present on given node.
 -     *
 -     * @param n Node to check.
 -     * @param cacheName Cache to check.
 -     * @return Cache distribution mode or {@code null} if cache is not found.
 -     */
 -    @Nullable public static CacheDistributionMode distributionMode(ClusterNode n, String
cacheName) {
 -        GridCacheAttributes[] caches = n.attribute(ATTR_CACHE);
 -
 -        if (caches != null)
 -            for (GridCacheAttributes attrs : caches)
 -                if (F.eq(cacheName, attrs.cacheName()))
 -                    return attrs.partitionedTaxonomy();
 -
 -        return null;
--    }
--
--    /**
       * Checks if given node has near cache enabled for the specified
       * partitioned cache.
       *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fbaa428/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------

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


Mime
View raw message