Yingyi Bu has submitted this change and it was merged. Change subject: Miscellaneous minor cleanups. ......................................................................
Miscellaneous minor cleanups. Change-Id: I08911bc62c573da483174a71b71949162ca229f2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1815 Sonar-Qube: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivity.java M hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/base/AbstractOperatorDescriptor.java M hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java 4 files changed, 17 insertions(+), 17 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; No violations found; No violations found; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java index 38e7fbe..20f128d 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java @@ -50,7 +50,8 @@ * @author yingyib */ public class ActivityClusterGraphRewriter { - private static String ONE_TO_ONE_CONNECTOR = "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor"; + private static final String ONE_TO_ONE_CONNECTOR = "org.apache.hyracks.dataflow.std.connectors." + + "OneToOneConnectorDescriptor"; /** * rewrite an activity cluster graph to eliminate @@ -63,7 +64,7 @@ public void rewrite(ActivityClusterGraph acg) { acg.getActivityMap().clear(); acg.getConnectorMap().clear(); - Map<IActivity, SuperActivity> invertedActivitySuperActivityMap = new HashMap<IActivity, SuperActivity>(); + Map<IActivity, SuperActivity> invertedActivitySuperActivityMap = new HashMap<>(); for (Entry<ActivityClusterId, ActivityCluster> entry : acg.getActivityClusterMap().entrySet()) { rewriteIntraActivityCluster(entry.getValue(), invertedActivitySuperActivityMap); } @@ -82,18 +83,18 @@ private void rewriteInterActivityCluster(ActivityCluster ac, Map<IActivity, SuperActivity> invertedActivitySuperActivityMap) { Map<ActivityId, Set<ActivityId>> blocked2BlockerMap = ac.getBlocked2BlockerMap(); - Map<ActivityId, ActivityId> invertedAid2SuperAidMap = new HashMap<ActivityId, ActivityId>(); + Map<ActivityId, ActivityId> invertedAid2SuperAidMap = new HashMap<>(); for (Entry<IActivity, SuperActivity> entry : invertedActivitySuperActivityMap.entrySet()) { invertedAid2SuperAidMap.put(entry.getKey().getActivityId(), entry.getValue().getActivityId()); } - Map<ActivityId, Set<ActivityId>> replacedBlocked2BlockerMap = new HashMap<ActivityId, Set<ActivityId>>(); + Map<ActivityId, Set<ActivityId>> replacedBlocked2BlockerMap = new HashMap<>(); for (Entry<ActivityId, Set<ActivityId>> entry : blocked2BlockerMap.entrySet()) { ActivityId blocked = entry.getKey(); ActivityId replacedBlocked = invertedAid2SuperAidMap.get(blocked); Set<ActivityId> blockers = entry.getValue(); Set<ActivityId> replacedBlockers = null; if (blockers != null) { - replacedBlockers = new HashSet<ActivityId>(); + replacedBlockers = new HashSet<>(); for (ActivityId blocker : blockers) { replacedBlockers.add(invertedAid2SuperAidMap.get(blocker)); ActivityCluster dependingAc = ac.getActivityClusterGraph().getActivityMap() @@ -131,9 +132,9 @@ Map<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>> connectorActivityMap = ac .getConnectorActivityMap(); ActivityClusterGraph acg = ac.getActivityClusterGraph(); - Map<ActivityId, IActivity> startActivities = new HashMap<ActivityId, IActivity>(); - Map<ActivityId, SuperActivity> superActivities = new HashMap<ActivityId, SuperActivity>(); - Map<ActivityId, Queue<IActivity>> toBeExpendedMap = new HashMap<ActivityId, Queue<IActivity>>(); + Map<ActivityId, IActivity> startActivities = new HashMap<>(); + Map<ActivityId, SuperActivity> superActivities = new HashMap<>(); + Map<ActivityId, Queue<IActivity>> toBeExpendedMap = new HashMap<>(); /** * Build the initial super activities @@ -234,8 +235,8 @@ Map<ConnectorDescriptorId, IConnectorDescriptor> connMap = ac.getConnectorMap(); Map<ConnectorDescriptorId, RecordDescriptor> connRecordDesc = ac.getConnectorRecordDescriptorMap(); - Map<SuperActivity, Integer> superActivityProducerPort = new HashMap<SuperActivity, Integer>(); - Map<SuperActivity, Integer> superActivityConsumerPort = new HashMap<SuperActivity, Integer>(); + Map<SuperActivity, Integer> superActivityProducerPort = new HashMap<>(); + Map<SuperActivity, Integer> superActivityConsumerPort = new HashMap<>(); for (Entry<ActivityId, SuperActivity> entry : superActivities.entrySet()) { superActivityProducerPort.put(entry.getValue(), 0); superActivityConsumerPort.put(entry.getValue(), 0); @@ -305,7 +306,7 @@ */ for (Entry<ActivityId, SuperActivity> entry : superActivities.entrySet()) { List<IConnectorDescriptor> connIds = newActivityCluster.getActivityOutputMap().get(entry.getKey()); - if (connIds == null || connIds.size() == 0) { + if (connIds == null || connIds.isEmpty()) { newActivityCluster.addRoot(entry.getValue()); } } @@ -343,7 +344,7 @@ SuperActivity superActivity = new SuperActivity(acg.getActivityClusterGraph(), acg.getId(), activityId); superActivities.put(activityId, superActivity); superActivity.addActivity(activity); - Queue<IActivity> toBeExpended = new LinkedList<IActivity>(); + Queue<IActivity> toBeExpended = new LinkedList<>(); toBeExpended.add(activity); toBeExpendedMap.put(activityId, toBeExpended); invertedActivitySuperActivityMap.put(activity, superActivity); diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivity.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivity.java index 28e098f..476a744 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivity.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/runtime/SuperActivity.java @@ -25,7 +25,6 @@ import java.util.Map.Entry; import org.apache.commons.lang3.tuple.Pair; - import org.apache.hyracks.api.context.IHyracksTaskContext; import org.apache.hyracks.api.dataflow.ActivityId; import org.apache.hyracks.api.dataflow.IActivity; @@ -58,7 +57,7 @@ public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, final IRecordDescriptorProvider recordDescProvider, final int partition, final int nPartitions) throws HyracksDataException { - final Map<ActivityId, IActivity> startActivities = new HashMap<ActivityId, IActivity>(); + final Map<ActivityId, IActivity> startActivities = new HashMap<>(); Map<ActivityId, IActivity> activities = getActivityMap(); for (Entry<ActivityId, IActivity> entry : activities.entrySet()) { /** diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/base/AbstractOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/base/AbstractOperatorDescriptor.java index a83273a..e338961 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/base/AbstractOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/base/AbstractOperatorDescriptor.java @@ -18,8 +18,6 @@ */ package org.apache.hyracks.dataflow.std.base; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.constraints.IConstraintAcceptor; import org.apache.hyracks.api.dataflow.IOperatorDescriptor; @@ -27,6 +25,9 @@ import org.apache.hyracks.api.dataflow.value.RecordDescriptor; import org.apache.hyracks.api.job.IOperatorDescriptorRegistry; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + public abstract class AbstractOperatorDescriptor implements IOperatorDescriptor { private static final long serialVersionUID = 1L; diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java index f1a777b..d3120bb 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.PrintStream; import java.nio.ByteBuffer; -import java.util.logging.Logger; import org.apache.hyracks.api.comm.IFrame; import org.apache.hyracks.api.comm.IFrameWriter; -- To view, visit https://asterix-gerrit.ics.uci.edu/1815 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08911bc62c573da483174a71b71949162ca229f2 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Yingyi Bu <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
