ignite-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	voze...@apache.org
Subject	[06/58] [abbrv] incubator-ignite git commit: sprint-1 - Renamed events.
Date	Fri, 06 Feb 2015 20:47:28 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/events/SecureSessionEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/SecureSessionEvent.java b/modules/core/src/main/java/org/apache/ignite/events/SecureSessionEvent.java new file mode 100644 index 0000000..53f1ee5 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/events/SecureSessionEvent.java @@ -0,0 +1,154 @@ +/* + * 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.events; + +import org.apache.ignite.cluster.; +import org.apache.ignite.internal.util.typedef.internal.; +import org.apache.ignite.plugin.security.; + +import java.util.; + +/* + * Grid secure session validation event. + * <p> + * Grid events are used for notification about what happens within the grid. Note that by + * design GridGain keeps all events generated on the local node locally and it provides + * APIs for performing a distributed queries across multiple nodes: + * <ul> + * <li> + * {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} - + * asynchronously querying events occurred on the nodes specified, including remote nodes. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} - + * querying only local events stored on this local node. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} - + * listening to local grid events (events from remote nodes not included). + * </li> + * </ul> + * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}. + * <h1 class="header">Events and Performance</h1> + * Note that by default all events in GridGain are enabled and therefore generated and stored + * by whatever event storage SPI is configured. GridGain can and often does generate thousands events per seconds + * under the load and therefore it creates a significant additional load on the system. If these events are + * not needed by the application this load is unnecessary and leads to significant performance degradation. + * <p> + * It is <b>highly recommended</b> to enable only those events that your application logic requires + * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in GridGain configuration. Note that certain + * events are required for GridGain's internal operations and such events will still be generated but not stored by + * event storage SPI if they are disabled in GridGain configuration. + * @see EventType#EVT_SECURE_SESSION_VALIDATION_FAILED + * @see EventType#EVT_SECURE_SESSION_VALIDATION_SUCCEEDED + / +public class SecureSessionEvent extends EventAdapter { + /* / + private static final long serialVersionUID = 0L; + + /* Subject type. / + private GridSecuritySubjectType subjType; + + /* Subject ID. / + private UUID subjId; + + /* {@inheritDoc} / + @Override public String shortDisplay() { + return name() + ": subjType=" + subjType; + } + + /* + * No-arg constructor. + / + public SecureSessionEvent() { + // No-op. + } + + /* + * Creates secure session event with given parameters. + * + * @param node Node. + * @param msg Optional message. + * @param type Event type. + / + public SecureSessionEvent(ClusterNode node, String msg, int type) { + super(node, msg, type); + } + + /* + * Creates secure session event with given parameters. + * + * @param node Node. + * @param msg Optional message. + * @param type Event type. + * @param subjType Subject type. + * @param subjId Subject ID. + / + public SecureSessionEvent(ClusterNode node, String msg, int type, GridSecuritySubjectType subjType, + UUID subjId) { + super(node, msg, type); + + this.subjType = subjType; + this.subjId = subjId; + } + + /* + * Gets subject type that triggered the event. + * + * @return Subject type that triggered the event. + / + public GridSecuritySubjectType subjectType() { + return subjType; + } + + /* + * Gets subject ID that triggered the event. + * + * @return Subject ID that triggered the event. + / + public UUID subjectId() { + return subjId; + } + + /* + * Sets subject type that triggered the event. + * + * @param subjType Subject type to set. + / + public void subjectType(GridSecuritySubjectType subjType) { + this.subjType = subjType; + } + + /* + * Sets subject ID that triggered the event. + * + * @param subjId Subject ID to set. + / + public void subjectId(UUID subjId) { + this.subjId = subjId; + } + + /* {@inheritDoc} / + @Override public String toString() { + return S.toString(SecureSessionEvent.class, this, + "nodeId8", U.id8(node().id()), + "msg", message(), + "type", name(), + "tstamp", timestamp()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java new file mode 100644 index 0000000..adb9708 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java @@ -0,0 +1,104 @@ +/ + * 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.events; + +import org.apache.ignite.cluster.; +import org.apache.ignite.internal.util.typedef.internal.; +import org.jetbrains.annotations.; + +/** + * Grid swap space event. + * <p> + * Grid events are used for notification about what happens within the grid. Note that by + * design GridGain keeps all events generated on the local node locally and it provides + * APIs for performing a distributed queries across multiple nodes: + * <ul> + * <li> + * {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} - + * asynchronously querying events occurred on the nodes specified, including remote nodes. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} - + * querying only local events stored on this local node. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} - + * listening to local grid events (events from remote nodes not included). + * </li> + * </ul> + * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}. + * <h1 class="header">Events and Performance</h1> + * Note that by default all events in GridGain are enabled and therefore generated and stored + * by whatever event storage SPI is configured. GridGain can and often does generate thousands events per seconds + * under the load and therefore it creates a significant additional load on the system. If these events are + * not needed by the application this load is unnecessary and leads to significant performance degradation. + * <p> + * It is <b>highly recommended</b> to enable only those events that your application logic requires + * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in GridGain configuration. Note that certain + * events are required for GridGain's internal operations and such events will still be generated but not stored by + * event storage SPI if they are disabled in GridGain configuration. + * @see EventType#EVT_SWAP_SPACE_DATA_READ + * @see EventType#EVT_SWAP_SPACE_DATA_STORED + * @see EventType#EVT_SWAP_SPACE_DATA_REMOVED + * @see EventType#EVT_SWAP_SPACE_CLEARED + * @see EventType#EVT_SWAP_SPACE_DATA_EVICTED + / +public class SwapSpaceEvent extends EventAdapter { + /* / + private static final long serialVersionUID = 0L; + + /* Swap space name. / + private String space; + + /* + * Creates swap space event. + * + * @param node Node. + * @param msg Optional message. + * @param type Event type. + * @param space Swap space name ({@code null} for default space). + / + public SwapSpaceEvent(ClusterNode node, String msg, int type, @Nullable String space) { + super(node, msg, type); + + this.space = space; + } + + /* + * Gets swap space name. + * + * @return Swap space name or {@code null} for default space. + / + @Nullable public String space() { + return space; + } + + /* {@inheritDoc} / + @Override public String shortDisplay() { + return name() + ": space=" + space; + } + + /* {@inheritDoc} / + @Override public String toString() { + return S.toString(SwapSpaceEvent.class, this, + "nodeId8", U.id8(node().id()), + "msg", message(), + "type", name(), + "tstamp", timestamp()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java new file mode 100644 index 0000000..8ca310e --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java @@ -0,0 +1,168 @@ +/ + * 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.events; + +import org.apache.ignite.cluster.; +import org.apache.ignite.internal.util.typedef.internal.; +import org.apache.ignite.lang.; +import org.jetbrains.annotations.; + +import java.util.; + +/** + * Grid task event. + * <p> + * Grid events are used for notification about what happens within the grid. Note that by + * design GridGain keeps all events generated on the local node locally and it provides + * APIs for performing a distributed queries across multiple nodes: + * <ul> + * <li> + * {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} - + * asynchronously querying events occurred on the nodes specified, including remote nodes. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} - + * querying only local events stored on this local node. + * </li> + * <li> + * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} - + * listening to local grid events (events from remote nodes not included). + * </li> + * </ul> + * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}. + * <h1 class="header">Events and Performance</h1> + * Note that by default all events in GridGain are enabled and therefore generated and stored + * by whatever event storage SPI is configured. GridGain can and often does generate thousands events per seconds + * under the load and therefore it creates a significant additional load on the system. If these events are + * not needed by the application this load is unnecessary and leads to significant performance degradation. + * <p> + * It is <b>highly recommended</b> to enable only those events that your application logic requires + * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in GridGain configuration. Note that certain + * events are required for GridGain's internal operations and such events will still be generated but not stored by + * event storage SPI if they are disabled in GridGain configuration. + * @see EventType#EVT_TASK_FAILED + * @see EventType#EVT_TASK_FINISHED + * @see EventType#EVT_TASK_REDUCED + * @see EventType#EVT_TASK_STARTED + * @see EventType#EVT_TASK_SESSION_ATTR_SET + * @see EventType#EVT_TASK_TIMEDOUT + * @see EventType#EVTS_TASK_EXECUTION + / +public class TaskEvent extends EventAdapter { + /* / + private static final long serialVersionUID = 0L; + + /* / + private final String taskName; + + /* / + private final String taskClsName; + + /* / + private final IgniteUuid sesId; + + /* / + private final boolean internal; + + /* / + private final UUID subjId; + + /* {@inheritDoc} / + @Override public String shortDisplay() { + return name() + ": taskName=" + taskName; + } + + /* + * Creates task event with given parameters. + * + * @param node Node. + * @param msg Optional message. + * @param type Event type. + * @param sesId Task session ID. + * @param taskName Task name. + * @param subjId Subject ID. + / + public TaskEvent(ClusterNode node, String msg, int type, IgniteUuid sesId, String taskName, String taskClsName, + boolean internal, @Nullable UUID subjId) { + super(node, msg, type); + + this.sesId = sesId; + this.taskName = taskName; + this.taskClsName = taskClsName; + this.internal = internal; + this.subjId = subjId; + } + + /* + * Gets name of the task that triggered the event. + * + * @return Name of the task that triggered the event. + / + public String taskName() { + return taskName; + } + + /* + * Gets name of task class that triggered this event. + * + * @return Name of task class that triggered the event. + / + public String taskClassName() { + return taskClsName; + } + + /* + * Gets session ID of the task that triggered the event. + * + * @return Session ID of the task that triggered the event. + / + public IgniteUuid taskSessionId() { + return sesId; + } + + /* + * Returns {@code true} if task is created by GridGain and is used for system needs. + * + * @return {@code True} if task is created by GridGain and is used for system needs. + / + public boolean internal() { + return internal; + } + + /* + * Gets security subject ID initiated this task event, if available. This property + * is not available for GridEventType#EVT_TASK_SESSION_ATTR_SET task event. + * <p> + * Subject ID will be set either to node ID or client ID initiated + * task execution. + * + * @return Subject ID. + / + @Nullable public UUID subjectId() { + return subjId; + } + + /* {@inheritDoc} / + @Override public String toString() { + return S.toString(TaskEvent.class, this, + "nodeId8", U.id8(node().id()), + "msg", message(), + "type", name(), + "tstamp", timestamp()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java index af1ec94..539f4a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.; import java.io.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /** * Continuous routine handler for remote event listening. @@ -43,18 +43,18 @@ class GridEventConsumeHandler implements GridContinuousHandler { private static final long serialVersionUID = 0L; /** Default callback. / - private static final P2<UUID, IgniteEvent> DFLT_CALLBACK = new P2<UUID, IgniteEvent>() { - @Override public boolean apply(UUID uuid, IgniteEvent e) { + private static final P2<UUID, Event> DFLT_CALLBACK = new P2<UUID, Event>() { + @Override public boolean apply(UUID uuid, Event e) { return true; } }; /* Local callback. / @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") - private IgniteBiPredicate<UUID, IgniteEvent> cb; + private IgniteBiPredicate<UUID, Event> cb; /* Filter. / - private IgnitePredicate<IgniteEvent> filter; + private IgnitePredicate<Event> filter; /* Serialized filter. / private byte[] filterBytes; @@ -83,7 +83,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { @param filter Filter. * @param types Types. / - GridEventConsumeHandler(@Nullable IgniteBiPredicate<UUID, IgniteEvent> cb, @Nullable IgnitePredicate<IgniteEvent> filter, + GridEventConsumeHandler(@Nullable IgniteBiPredicate<UUID, Event> cb, @Nullable IgnitePredicate<Event> filter, @Nullable int[] types) { this.cb = cb == null ? DFLT_CALLBACK : cb; this.filter = filter; @@ -121,7 +121,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { final boolean loc = nodeId.equals(ctx.localNodeId()); lsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (filter == null \|\| filter.apply(evt)) { if (loc) { if (!cb.apply(nodeId, evt)) @@ -134,8 +134,8 @@ class GridEventConsumeHandler implements GridContinuousHandler { try { EventWrapper wrapper = new EventWrapper(evt); - if (evt instanceof IgniteCacheEvent) { - String cacheName = ((IgniteCacheEvent)evt).cacheName(); + if (evt instanceof CacheEvent) { + String cacheName = ((CacheEvent)evt).cacheName(); if (ctx.config().isPeerClassLoadingEnabled() && U.hasCache(node, cacheName)) { wrapper.p2pMarshal(ctx.config().getMarshaller()); @@ -308,7 +308,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { depInfo = (GridDeploymentInfo)in.readObject(); } else - filter = (IgnitePredicate<IgniteEvent>)in.readObject(); + filter = (IgnitePredicate<Event>)in.readObject(); types = (int[])in.readObject(); } @@ -321,7 +321,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { private static final long serialVersionUID = 0L; /* Event. / - private IgniteEvent evt; + private Event evt; /* Serialized event. / private byte[] bytes; @@ -342,7 +342,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { /* * @param evt Event. / - EventWrapper(IgniteEvent evt) { + EventWrapper(Event evt) { assert evt != null; this.evt = evt; @@ -374,7 +374,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { /* {@inheritDoc} / @Override public void prepare(GridDeploymentInfo depInfo) { - assert evt instanceof IgniteCacheEvent; + assert evt instanceof CacheEvent; this.depInfo = depInfo; } @@ -409,7 +409,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { depInfo = (GridDeploymentInfo)in.readObject(); } else - evt = (IgniteEvent)in.readObject(); + evt = (Event)in.readObject(); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java index c992ad7..d0e46a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java @@ -66,7 +66,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public <T extends IgniteEvent> List<T> remoteQuery(IgnitePredicate<T> p, long timeout, + @Override public <T extends Event> List<T> remoteQuery(IgnitePredicate<T> p, long timeout, @Nullable int... types) { A.notNull(p, "p"); @@ -84,13 +84,13 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public <T extends IgniteEvent> UUID remoteListen(@Nullable IgniteBiPredicate<UUID, T> locLsnr, + @Override public <T extends Event> UUID remoteListen(@Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) { return remoteListen(1, 0, true, locLsnr, rmtFilter, types); } /* {@inheritDoc} / - @Override public <T extends IgniteEvent> UUID remoteListen(int bufSize, long interval, + @Override public <T extends Event> UUID remoteListen(int bufSize, long interval, boolean autoUnsubscribe, @Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) { A.ensure(bufSize > 0, "bufSize > 0"); @@ -100,8 +100,8 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen try { return saveOrGet(ctx.continuous().startRoutine( - new GridEventConsumeHandler((IgniteBiPredicate<UUID, IgniteEvent>)locLsnr, - (IgnitePredicate<IgniteEvent>)rmtFilter, types), bufSize, interval, autoUnsubscribe, prj.predicate())); + new GridEventConsumeHandler((IgniteBiPredicate<UUID, Event>)locLsnr, + (IgnitePredicate<Event>)rmtFilter, types), bufSize, interval, autoUnsubscribe, prj.predicate())); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -129,7 +129,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public <T extends IgniteEvent> T waitForLocal(@Nullable IgnitePredicate<T> filter, + @Override public <T extends Event> T waitForLocal(@Nullable IgnitePredicate<T> filter, @Nullable int... types) { guard(); @@ -145,7 +145,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public <T extends IgniteEvent> Collection<T> localQuery(IgnitePredicate<T> p, @Nullable int... types) { + @Override public <T extends Event> Collection<T> localQuery(IgnitePredicate<T> p, @Nullable int... types) { A.notNull(p, "p"); guard(); @@ -159,7 +159,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public void recordLocal(IgniteEvent evt) { + @Override public void recordLocal(Event evt) { A.notNull(evt, "evt"); if (evt.type() <= 1000) @@ -177,7 +177,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public void localListen(IgnitePredicate<? extends IgniteEvent> lsnr, int[] types) { + @Override public void localListen(IgnitePredicate<? extends Event> lsnr, int[] types) { A.notNull(lsnr, "lsnr"); A.notEmpty(types, "types"); @@ -192,7 +192,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen } /* {@inheritDoc} / - @Override public boolean stopLocalListen(IgnitePredicate<? extends IgniteEvent> lsnr, @Nullable int... types) { + @Override public boolean stopLocalListen(IgnitePredicate<? extends Event> lsnr, @Nullable int... types) { A.notNull(lsnr, "lsnr"); guard(); @@ -265,7 +265,7 @@ public class IgniteEventsImpl extends AsyncSupportAdapter<IgniteEvents> implemen @param types Event types. * @return Compound predicate. / - private static <T extends IgniteEvent> IgnitePredicate<T> compoundPredicate(final IgnitePredicate<T> p, + private static <T extends Event> IgnitePredicate<T> compoundPredicate(final IgnitePredicate<T> p, @Nullable final int... types) { return F.isEmpty(types) ? p : http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index f0e8649..95ef79f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -364,7 +364,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan return true; } - @Override public void recordEvent(IgniteEvent evt) { + @Override public void recordEvent(Event evt) { A.notNull(evt, "evt"); if (ctx.event().isRecordable(evt.type())) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index 1fca7b5..1a7672e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -39,7 +39,7 @@ import java.io.; import java.util.; import java.util.concurrent.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridTopic.; import static org.jdk8.backport.ConcurrentLinkedHashMap.QueuePolicy.; @@ -352,7 +352,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { msg = "Checkpoint removed: " + key; } - ctx.event().record(new IgniteCheckpointEvent(ctx.discovery().localNode(), msg, type, key)); + ctx.event().record(new CheckpointEvent(ctx.discovery().localNode(), msg, type, key)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 4ccd7e9..f33c09c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -45,7 +45,7 @@ import java.util.concurrent.; import java.util.concurrent.atomic.; import java.util.concurrent.locks.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridTopic.; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.; import static org.apache.ignite.internal.util.nio.GridNioBackPressureControl.; @@ -192,10 +192,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa @Override public void onKernalStart0() throws IgniteCheckedException { discoLsnr = new GridLocalEventListener() { @SuppressWarnings({"TooBroadScope", "fallthrough"}) - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent : "Invalid event: " + evt; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent : "Invalid event: " + evt; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; UUID nodeId = discoEvt.eventNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java index db8c88a..8871a61 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java @@ -35,7 +35,7 @@ import org.apache.ignite.marshaller.; import java.io.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridTopic.; /** @@ -375,12 +375,12 @@ class GridDeploymentCommunication { final GridTuple<GridDeploymentResponse> res = F.t1(); GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; assert evt.type() == EVT_NODE_LEFT \|\| evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; UUID nodeId = discoEvt.eventNode().id(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java index 5f40cc1..56cf729 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java @@ -36,7 +36,7 @@ import java.util.; import java.util.Map.; import java.util.concurrent.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /* * Storage for local deployments. @@ -385,7 +385,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { String msg = (isTask ? "Task" : "Class") + " locally deployed: " + cls; if (recordEvt && ctx.event().isRecordable(isTask ? EVT_TASK_DEPLOYED : EVT_CLASS_DEPLOYED)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.message(msg); evt.node(ctx.discovery().localNode()); @@ -422,7 +422,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { if (recordEvt && ctx.event().isRecordable(isTask ? EVT_CLASS_DEPLOY_FAILED : EVT_TASK_DEPLOY_FAILED)) { String taskName = isTask ? U.getTaskName((Class<? extends ComputeTask<?, ?>>)cls) : null; - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.message(msg); evt.node(ctx.discovery().localNode()); @@ -452,7 +452,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { String msg = isTask ? "Task locally undeployed: " + cls : "Class locally undeployed: " + cls; if (ctx.event().isRecordable(isTask ? EVT_TASK_UNDEPLOYED : EVT_CLASS_UNDEPLOYED)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.message(msg); evt.node(ctx.discovery().localNode()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java index 423a882..e802dce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java @@ -32,7 +32,7 @@ import org.apache.ignite.spi.deployment.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /** * Deployment storage for {@link org.apache.ignite.configuration.DeploymentMode#PRIVATE} and @@ -66,10 +66,10 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { ctxLdr = U.detectClassLoader(getClass()); discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; - UUID nodeId = ((IgniteDiscoveryEvent)evt).eventNode().id(); + UUID nodeId = ((DiscoveryEvent)evt).eventNode().id(); if (evt.type() == EVT_NODE_LEFT \|\| evt.type() == EVT_NODE_FAILED) { @@ -444,7 +444,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { String msg = (isTask ? "Task" : "Class") + " was deployed in Private or Isolated mode: " + cls; if (recordEvt && ctx.event().isRecordable(isTask(cls) ? EVT_TASK_DEPLOYED : EVT_CLASS_DEPLOYED)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); // Record task event. evt.type(isTask ? EVT_TASK_DEPLOYED : EVT_CLASS_DEPLOYED); @@ -475,7 +475,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { "[cls=" + depCls.getValue() + ", alias=" + depCls.getKey() + ']'; if (evts.isRecordable(!isTask ? EVT_CLASS_UNDEPLOYED : EVT_TASK_UNDEPLOYED)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.node(sndNode); evt.message(msg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index afad644..19338b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -37,7 +37,7 @@ import java.util.; import java.util.concurrent.; import static org.apache.ignite.configuration.DeploymentMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /* * Deployment storage for {@link org.apache.ignite.configuration.DeploymentMode#SHARED} and @@ -84,12 +84,12 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { /** {@inheritDoc} / @Override public void start() throws IgniteCheckedException { discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; assert evt.type() == EVT_NODE_LEFT \|\| evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; Collection<SharedDeployment> undeployed = new LinkedList<>(); @@ -1208,7 +1208,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { int type = isTask ? EVT_TASK_DEPLOYED : EVT_CLASS_DEPLOYED; if (ctx.event().isRecordable(type)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.node(ctx.discovery().localNode()); evt.message(msg); @@ -1239,7 +1239,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { int type = isTask ? EVT_TASK_UNDEPLOYED : EVT_CLASS_UNDEPLOYED; if (ctx.event().isRecordable(type)) { - IgniteDeploymentEvent evt = new IgniteDeploymentEvent(); + DeploymentEvent evt = new DeploymentEvent(); evt.node(ctx.discovery().localNode()); evt.message(msg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index b612465e4..95b6424 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.managers.eventstorage.; import org.apache.ignite.internal.managers.security.; import org.apache.ignite.internal.processors.cache.; import org.apache.ignite.internal.processors.jobmetrics.; -import org.apache.ignite.internal.processors.service.; import org.apache.ignite.internal.util.; import org.apache.ignite.internal.util.future.; import org.apache.ignite.internal.util.lang.; @@ -52,7 +51,7 @@ import java.util.concurrent.atomic.; import java.util.zip.; import static java.util.concurrent.TimeUnit.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridNodeAttributes.; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.; @@ -150,7 +149,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { private long segChkFreq; /** Local node join to topology event. / - private GridFutureAdapterEx<IgniteDiscoveryEvent> locJoinEvt = new GridFutureAdapterEx<>(); + private GridFutureAdapterEx<DiscoveryEvent> locJoinEvt = new GridFutureAdapterEx<>(); /* GC CPU load. / private volatile double gcCpuLoad; @@ -284,7 +283,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { // If this is a local join event, just save it and do not notify listeners. if (type == EVT_NODE_JOINED && node.id().equals(locNode.id())) { - IgniteDiscoveryEvent discoEvt = new IgniteDiscoveryEvent(); + DiscoveryEvent discoEvt = new DiscoveryEvent(); discoEvt.node(ctx.discovery().localNode()); discoEvt.eventNode(node); @@ -1149,7 +1148,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } /* @return Event that represents a local node joined to topology. / - public IgniteDiscoveryEvent localJoinEvent() { + public DiscoveryEvent localJoinEvent() { try { return locJoinEvt.get(); } @@ -1285,7 +1284,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { /* * Method is called when any discovery event occurs. * - * @param type Discovery event type. See {@link org.apache.ignite.events.IgniteDiscoveryEvent} for more details. + * @param type Discovery event type. See {@link org.apache.ignite.events.DiscoveryEvent} for more details. * @param topVer Topology version. * @param node Remote node this event is connected with. * @param topSnapshot Topology snapshot. @@ -1294,7 +1293,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { assert node != null; if (ctx.event().isRecordable(type)) { - IgniteDiscoveryEvent evt = new IgniteDiscoveryEvent(); + DiscoveryEvent evt = new DiscoveryEvent(); evt.node(ctx.discovery().localNode()); evt.eventNode(node); @@ -1678,10 +1677,10 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } /** {@inheritDoc} / - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_JOINED \|\| evt.type() == EVT_NODE_LEFT \|\| evt.type() == EVT_NODE_FAILED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (discoEvt.topologyVersion() >= awaitVer) onDone(discoEvt.topologyVersion()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 1d5ed17..850040d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -41,7 +41,7 @@ import java.util.concurrent.; import java.util.concurrent.atomic.; import java.util.concurrent.locks.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridTopic.; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.; @@ -222,10 +222,10 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> /** {@inheritDoc} / @Override public void start() throws IgniteCheckedException { - Map<IgnitePredicate<? extends IgniteEvent>, int[]> evtLsnrs = ctx.config().getLocalEventListeners(); + Map<IgnitePredicate<? extends Event>, int[]> evtLsnrs = ctx.config().getLocalEventListeners(); if (evtLsnrs != null) { - for (IgnitePredicate<? extends IgniteEvent> lsnr : evtLsnrs.keySet()) + for (IgnitePredicate<? extends Event> lsnr : evtLsnrs.keySet()) addLocalEventListener(lsnr, evtLsnrs.get(lsnr)); } @@ -244,7 +244,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> * @param evt Event to record. / - public void record(IgniteEvent evt) { + public void record(Event evt) { assert evt != null; if (!enterBusy()) @@ -517,7 +517,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param lsnr User listener to add. * @param types Event types to subscribe listener for. / - public void addLocalEventListener(IgnitePredicate<? extends IgniteEvent> lsnr, int[] types) { + public void addLocalEventListener(IgnitePredicate<? extends Event> lsnr, int[] types) { try { ctx.resource().injectGeneric(lsnr); } @@ -619,7 +619,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param types Event types. * @return Returns {@code true} if removed. / - public boolean removeLocalEventListener(IgnitePredicate<? extends IgniteEvent> lsnr, @Nullable int... types) { + public boolean removeLocalEventListener(IgnitePredicate<? extends Event> lsnr, @Nullable int... types) { return removeLocalEventListener(new UserListenerWrapper(lsnr), types); } @@ -661,19 +661,19 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param types Event types to wait for. * @return Event future. / - public <T extends IgniteEvent> IgniteInternalFuture<T> waitForEvent(@Nullable final IgnitePredicate<T> p, + public <T extends Event> IgniteInternalFuture<T> waitForEvent(@Nullable final IgnitePredicate<T> p, @Nullable int... types) { final GridFutureAdapter<T> fut = new GridFutureAdapter<>(ctx); addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (p == null \|\| p.apply((T)evt)) { fut.onDone((T)evt); removeLocalEventListener(this); } } - }, F.isEmpty(types) ? IgniteEventType.EVTS_ALL : types); + }, F.isEmpty(types) ? EventType.EVTS_ALL : types); return fut; } @@ -687,14 +687,14 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @return Event. * @throws IgniteCheckedException Thrown in case of any errors. / - public IgniteEvent waitForEvent(long timeout, @Nullable Runnable c, - @Nullable final IgnitePredicate<? super IgniteEvent> p, int... types) throws IgniteCheckedException { + public Event waitForEvent(long timeout, @Nullable Runnable c, + @Nullable final IgnitePredicate<? super Event> p, int... types) throws IgniteCheckedException { assert timeout >= 0; - final GridFutureAdapter<IgniteEvent> fut = new GridFutureAdapter<>(ctx); + final GridFutureAdapter<Event> fut = new GridFutureAdapter<>(ctx); addLocalEventListener(new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (p == null \|\| p.apply(evt)) { fut.onDone(evt); @@ -717,7 +717,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> /* * @param evt Event to notify about. / - private void notifyListeners(IgniteEvent evt) { + private void notifyListeners(Event evt) { assert evt != null; notifyListeners(lsnrs.get(evt.type()), evt); @@ -727,7 +727,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param set Set of listeners. * @param evt Grid event. / - private void notifyListeners(@Nullable Collection<GridLocalEventListener> set, IgniteEvent evt) { + private void notifyListeners(@Nullable Collection<GridLocalEventListener> set, Event evt) { assert evt != null; if (!F.isEmpty(set)) { @@ -748,7 +748,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param p Grid event predicate. * @return Collection of grid events. / - public <T extends IgniteEvent> Collection<T> localEvents(IgnitePredicate<T> p) { + public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p) { assert p != null; return getSpi().localEvents(p); @@ -760,7 +760,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @param timeout Maximum time to wait for result, if {@code 0}, then wait until result is received. * @return Collection of events. / - public <T extends IgniteEvent> IgniteInternalFuture<List<T>> remoteEventsAsync(final IgnitePredicate<T> p, + public <T extends Event> IgniteInternalFuture<List<T>> remoteEventsAsync(final IgnitePredicate<T> p, final Collection<? extends ClusterNode> nodes, final long timeout) { assert p != null; assert nodes != null; @@ -789,7 +789,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> @throws IgniteCheckedException Thrown in case of any errors. / @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "deprecation"}) - private <T extends IgniteEvent> List<T> query(IgnitePredicate<T> p, Collection<? extends ClusterNode> nodes, + private <T extends Event> List<T> query(IgnitePredicate<T> p, Collection<? extends ClusterNode> nodes, long timeout) throws IgniteCheckedException { assert p != null; assert nodes != null; @@ -814,11 +814,11 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> uids.add(node.id()); GridLocalEventListener evtLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; synchronized (qryMux) { - uids.remove(((IgniteDiscoveryEvent)evt).eventNode().id()); + uids.remove(((DiscoveryEvent)evt).eventNode().id()); if (uids.isEmpty()) qryMux.notifyAll(); @@ -842,7 +842,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> try { if (res.eventsBytes() != null) - res.events(marsh.<Collection<IgniteEvent>>unmarshal(res.eventsBytes(), null)); + res.events(marsh.<Collection<Event>>unmarshal(res.eventsBytes(), null)); if (res.exceptionBytes() != null) res.exception(marsh.<Throwable>unmarshal(res.exceptionBytes(), null)); @@ -1032,9 +1032,9 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> Throwable ex = null; - IgnitePredicate<IgniteEvent> filter = null; + IgnitePredicate<Event> filter = null; - Collection<IgniteEvent> evts; + Collection<Event> evts; try { if (req.responseTopicBytes() != null) @@ -1108,24 +1108,24 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> / private class UserListenerWrapper implements GridLocalEventListener { /** / - private final IgnitePredicate<IgniteEvent> lsnr; + private final IgnitePredicate<Event> lsnr; /* * @param lsnr User listener predicate. / - private UserListenerWrapper(IgnitePredicate<? extends IgniteEvent> lsnr) { - this.lsnr = (IgnitePredicate<IgniteEvent>)lsnr; + private UserListenerWrapper(IgnitePredicate<? extends Event> lsnr) { + this.lsnr = (IgnitePredicate<Event>)lsnr; } /* * @return User listener. / - private IgnitePredicate<? extends IgniteEvent> listener() { + private IgnitePredicate<? extends Event> listener() { return lsnr; } /* {@inheritDoc} / - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (!lsnr.apply(evt)) removeLocalEventListener(this); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 3d242eb..37d1f19 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -48,7 +48,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter /* / @GridDirectTransient - private Collection<IgniteEvent> evts; + private Collection<Event> evts; /* / private byte[] evtsBytes; @@ -115,7 +115,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter @param evts Grid events. * @param ex Exception occurred during processing. / - GridEventStorageMessage(Collection<IgniteEvent> evts, Throwable ex) { + GridEventStorageMessage(Collection<Event> evts, Throwable ex) { this.evts = evts; this.ex = ex; @@ -165,14 +165,14 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter /* * @return Events. / - @Nullable Collection<IgniteEvent> events() { + @Nullable Collection<Event> events() { return evts != null ? Collections.unmodifiableCollection(evts) : null; } /* * @param evts Events. / - void events(@Nullable Collection<IgniteEvent> evts) { + void events(@Nullable Collection<Event> evts) { this.evts = evts; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java index 1194937..137b7b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java @@ -35,5 +35,5 @@ public interface GridLocalEventListener extends EventListener { * @param evt local grid event. / - public void onEvent(IgniteEvent evt); + public void onEvent(Event evt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java index e97cbc1..09b3c43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /* * @@ -94,7 +94,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> { } } - ctx.event().record(new IgniteSwapSpaceEvent(ctx.discovery().localNode(), msg, evtType, spaceName)); + ctx.event().record(new SwapSpaceEvent(ctx.discovery().localNode(), msg, evtType, spaceName)); } // Always notify grid cache processor. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 42c3b5d..ff44528 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -125,7 +125,7 @@ public class GridAffinityAssignmentCache { * @param discoEvt Discovery event that caused this topology version change. / @SuppressWarnings("IfMayBeConditional") - public List<List<ClusterNode>> calculate(long topVer, IgniteDiscoveryEvent discoEvt) { + public List<List<ClusterNode>> calculate(long topVer, DiscoveryEvent discoEvt) { if (log.isDebugEnabled()) log.debug("Calculating affinity [topVer=" + topVer + ", locNodeId=" + ctx.localNodeId() + ", discoEvt=" + discoEvt + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index 870dd4c..5ee9826 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -40,7 +40,7 @@ import java.util.; import java.util.concurrent.; import static org.apache.ignite.cache.CacheMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridClosureCallMode.; import static org.apache.ignite.internal.processors.affinity.GridAffinityUtils.; @@ -65,7 +65,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { /** Listener. / private final GridLocalEventListener lsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { int evtType = evt.type(); assert evtType == EVT_NODE_FAILED \|\| evtType == EVT_NODE_LEFT \|\| evtType == EVT_NODE_JOINED; @@ -73,13 +73,13 @@ public class GridAffinityProcessor extends GridProcessorAdapter { if (affMap.isEmpty()) return; // Skip empty affinity map. - final IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + final DiscoveryEvent discoEvt = (DiscoveryEvent)evt; // Clean up affinity functions if such cache no more exists. if (evtType == EVT_NODE_FAILED \|\| evtType == EVT_NODE_LEFT) { final Collection<String> caches = new HashSet<>(); - for (ClusterNode clusterNode : ((IgniteDiscoveryEvent)evt).topologyNodes()) + for (ClusterNode clusterNode : ((DiscoveryEvent)evt).topologyNodes()) caches.addAll(U.cacheNames(clusterNode)); final Collection<AffinityAssignmentKey> rmv = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java index 94b8431..c56355b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridCacheAffinityFunctionContextImpl.java @@ -35,7 +35,7 @@ public class GridCacheAffinityFunctionContextImpl implements CacheAffinityFuncti private List<List<ClusterNode>> prevAssignment; /* Discovery event that caused this topology change. / - private IgniteDiscoveryEvent discoEvt; + private DiscoveryEvent discoEvt; /* Topology version. / private long topVer; @@ -48,7 +48,7 @@ public class GridCacheAffinityFunctionContextImpl implements CacheAffinityFuncti @param topVer Topology version. / public GridCacheAffinityFunctionContextImpl(List<ClusterNode> topSnapshot, List<List<ClusterNode>> prevAssignment, - IgniteDiscoveryEvent discoEvt, long topVer, int backups) { + DiscoveryEvent discoEvt, long topVer, int backups) { this.topSnapshot = topSnapshot; this.prevAssignment = prevAssignment; this.discoEvt = discoEvt; @@ -72,7 +72,7 @@ public class GridCacheAffinityFunctionContextImpl implements CacheAffinityFuncti } /* {@inheritDoc} / - @Nullable @Override public IgniteDiscoveryEvent discoveryEvent() { + @Nullable @Override public DiscoveryEvent discoveryEvent() { return discoEvt; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index c637bca..2c1dc48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -62,7 +62,7 @@ import java.util.concurrent.locks.; import static java.util.Collections.; import static org.apache.ignite.IgniteSystemProperties.; import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.GridClosureCallMode.; import static org.apache.ignite.internal.processors.cache.CacheFlag.; import static org.apache.ignite.internal.processors.dr.GridDrType.; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index 8cb206b..35e50a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -159,7 +159,7 @@ public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V * @param topVer Topology version to calculate affinity for. * @param discoEvt Discovery event that causes this topology change. / - public List<List<ClusterNode>> calculateAffinity(long topVer, IgniteDiscoveryEvent discoEvt) { + public List<List<ClusterNode>> calculateAffinity(long topVer, DiscoveryEvent discoEvt) { assert !cctx.isLocal(); return aff.calculate(topVer, discoEvt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index 1fff42a8..e3f7597 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.; import java.util.concurrent.locks.; import static org.apache.ignite.configuration.DeploymentMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /** * Deployment manager for cache. @@ -94,10 +94,10 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap if (depEnabled) { discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED \|\| evt.type() == EVT_NODE_LEFT : "Unexpected event: " + evt; - UUID id = ((IgniteDiscoveryEvent)evt).eventNode().id(); + UUID id = ((DiscoveryEvent)evt).eventNode().id(); if (log.isDebugEnabled()) log.debug("Processing node departure: " + id); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index 627ee36..e1ff9c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /** * Cache event manager. @@ -174,7 +174,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> { "(try to increase topology history size configuration property of configured " + "discovery SPI): " + evtNodeId); - cctx.gridEvents().record(new IgniteCacheEvent(cctx.name(), cctx.localNode(), evtNode, + cctx.gridEvents().record(new CacheEvent(cctx.name(), cctx.localNode(), evtNode, "Cache event.", type, part, cctx.isNear(), key, xid, lockId, newVal, hasNewVal, oldVal, hasOldVal, subjId, cloClsName, taskName)); } @@ -219,7 +219,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> { if (!cctx.events().isRecordable(type)) LT.warn(log, null, "Added event without checking if event is recordable: " + U.gridEventName(type)); - cctx.gridEvents().record(new IgniteCachePreloadingEvent(cctx.name(), cctx.localNode(), + cctx.gridEvents().record(new CachePreloadingEvent(cctx.name(), cctx.localNode(), "Cache preloading event.", type, part, discoNode, discoType, discoTs)); } @@ -233,7 +233,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> { LT.warn(log, null, "Added event without checking if event is recordable: " + U.gridEventName(EVT_CACHE_PRELOAD_PART_UNLOADED)); - cctx.gridEvents().record(new IgniteCachePreloadingEvent(cctx.name(), cctx.localNode(), + cctx.gridEvents().record(new CachePreloadingEvent(cctx.name(), cctx.localNode(), "Cache unloading event.", EVT_CACHE_PRELOAD_PART_UNLOADED, part, null, 0, 0)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 1807701..12b7b2b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -53,7 +53,7 @@ import java.util.concurrent.locks.Lock; import static java.util.concurrent.TimeUnit.; import static org.apache.ignite.cache.CacheMemoryMode.; import static org.apache.ignite.cache.CacheMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.; import static org.jdk8.backport.ConcurrentLinkedDeque8.; @@ -172,11 +172,11 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V cctx.events().addListener( new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED \|\| evt.type() == EVT_NODE_LEFT \|\| evt.type() == EVT_NODE_JOINED; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; // Notify backup worker on each topology change. if (CU.affinityNode(cctx, discoEvt.eventNode())) @@ -210,10 +210,10 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V cctx.events().addListener( new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED \|\| evt.type() == EVT_NODE_LEFT; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; for (EvictionFuture fut : futs.values()) fut.onNodeLeft(discoEvt.eventNode().id()); @@ -257,7 +257,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V // Add dummy event to worker. ClusterNode locNode = cctx.localNode(); - IgniteDiscoveryEvent evt = new IgniteDiscoveryEvent(locNode, "Dummy event.", EVT_NODE_JOINED, locNode); + DiscoveryEvent evt = new DiscoveryEvent(locNode, "Dummy event.", EVT_NODE_JOINED, locNode); evt.topologySnapshot(locNode.order(), cctx.discovery().topology(locNode.order())); @@ -1366,7 +1366,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V / private class BackupWorker extends GridWorker { /* / - private final BlockingQueue<IgniteDiscoveryEvent> evts = new LinkedBlockingQueue<>(); + private final BlockingQueue<DiscoveryEvent> evts = new LinkedBlockingQueue<>(); /* / private final Collection<Integer> primaryParts = new HashSet<>(); @@ -1383,7 +1383,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V /* * @param evt New event. / - void addEvent(IgniteDiscoveryEvent evt) { + void addEvent(DiscoveryEvent evt) { assert evt != null; evts.add(evt); @@ -1401,7 +1401,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V cctx.affinity().affinityTopologyVersion())); while (!isCancelled()) { - IgniteDiscoveryEvent evt = evts.take(); + DiscoveryEvent evt = evts.take(); if (log.isDebugEnabled()) log.debug("Processing event: " + evt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 96ceb93..5e3edea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -45,7 +45,7 @@ import java.util.; import java.util.concurrent.; import java.util.concurrent.atomic.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.processors.cache.CacheFlag.; import static org.apache.ignite.internal.processors.dr.GridDrType.; import static org.apache.ignite.transactions.IgniteTxState.; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 672dfd4..3c24cab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -40,7 +40,7 @@ import java.io.; import java.util.; import java.util.concurrent.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.util.GridConcurrentFactory.; import static org.jdk8.backport.ConcurrentLinkedHashMap.QueuePolicy.; @@ -166,11 +166,11 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, /** Discovery listener. / @GridToStringExclude private final GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { - assert evt instanceof IgniteDiscoveryEvent; + @Override public void onEvent(Event evt) { + assert evt instanceof DiscoveryEvent; assert evt.type() == EVT_NODE_FAILED \|\| evt.type() == EVT_NODE_LEFT; - IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; + DiscoveryEvent discoEvt = (DiscoveryEvent)evt; if (log.isDebugEnabled()) log.debug("Processing node left [nodeId=" + discoEvt.eventNode().id() + "]"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index dd3c7f9..8f9fb92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -44,7 +44,7 @@ import java.util.concurrent.locks.; import static java.util.concurrent.TimeUnit.; import static org.apache.ignite.IgniteSystemProperties.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.; /* @@ -94,11 +94,11 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana /** Discovery listener. / private final GridLocalEventListener discoLsnr = new GridLocalEventListener() { - @Override public void onEvent(IgniteEvent evt) { + @Override public void onEvent(Event evt) { if (!enterBusy()) return; - IgniteDiscoveryEvent e = (IgniteDiscoveryEvent)evt; + DiscoveryEvent e = (DiscoveryEvent)evt; try { ClusterNode loc = cctx.localNode(); @@ -202,7 +202,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana GridDhtPartitionExchangeId exchId = exchangeId(loc.id(), startTopVer, EVT_NODE_JOINED); // Generate dummy discovery event for local node joining. - IgniteDiscoveryEvent discoEvt = cctx.discovery().localJoinEvent(); + DiscoveryEvent discoEvt = cctx.discovery().localJoinEvent(); assert discoEvt != null; @@ -538,7 +538,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana @return Exchange future. / GridDhtPartitionsExchangeFuture<K, V> exchangeFuture(GridDhtPartitionExchangeId exchId, - @Nullable IgniteDiscoveryEvent discoEvt) { + @Nullable DiscoveryEvent discoEvt) { GridDhtPartitionsExchangeFuture<K, V> fut; GridDhtPartitionsExchangeFuture<K, V> old = exchFuts.addx( @@ -811,7 +811,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana // Preload event notification. if (cacheCtx.events().isRecordable(EVT_CACHE_PRELOAD_STARTED)) { if (!cacheCtx.isReplicated() \|\| !startEvtFired) { - IgniteDiscoveryEvent discoEvt = exchFut.discoveryEvent(); + DiscoveryEvent discoEvt = exchFut.discoveryEvent(); cacheCtx.events().addPreloadEvent(-1, EVT_CACHE_PRELOAD_STARTED, discoEvt.eventNode(), discoEvt.type(), discoEvt.timestamp()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index a0b1ecb..6e33f30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -39,7 +39,7 @@ import java.util.; import java.util.concurrent.; import static org.apache.ignite.cache.CacheMemoryMode.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.; /* http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index 9f32d14..1e6c562 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.; import java.util.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; /** * Entry for distributed (replicated/partitioned) cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 60b87ab..af63307 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.; import java.util.concurrent.locks.; import static org.apache.ignite.IgniteSystemProperties.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index a1b7655..5cc6e76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -41,7 +41,7 @@ import java.io.; import java.util.; import java.util.concurrent.atomic.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.; import static org.apache.ignite.internal.processors.dr.GridDrType.; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 8d0a854..f328ef2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -39,7 +39,7 @@ import java.io.; import java.util.; import java.util.concurrent.atomic.; -import static org.apache.ignite.events.IgniteEventType.; +import static org.apache.ignite.events.EventType.; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.; import static org.apache.ignite.transactions.IgniteTxState.;
Mime	Unnamed text/plain (inline, 7-Bit, 89983 bytes)
	View raw message