http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/tools/WriteValueTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/tools/WriteValueTest.java b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/tools/WriteValueTest.java index 6770494..82be109 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/tools/WriteValueTest.java +++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/tools/WriteValueTest.java @@ -66,8 +66,8 @@ public class WriteValueTest { WriteValueTools.writeInt(i, baaos); byte[] goal = Integer.toString(i).getBytes(); if (baaos.size() != goal.length) { - throw new Exception("Expecting to write " + i + " in " + goal.length + " bytes, but found " + baaos.size() - + " bytes."); + throw new Exception( + "Expecting to write " + i + " in " + goal.length + " bytes, but found " + baaos.size() + " bytes."); } for (int k = 0; k < goal.length; k++) { if (goal[k] != baaos.getByteArray()[k]) { @@ -82,8 +82,8 @@ public class WriteValueTest { WriteValueTools.writeLong(x, baaos); byte[] goal = Long.toString(x).getBytes(); if (baaos.size() != goal.length) { - throw new Exception("Expecting to write " + x + " in " + goal.length + " bytes, but found " + baaos.size() - + " bytes."); + throw new Exception( + "Expecting to write " + x + " in " + goal.length + " bytes, but found " + baaos.size() + " bytes."); } for (int k = 0; k < goal.length; k++) { if (goal[k] != baaos.getByteArray()[k]) { @@ -100,8 +100,8 @@ public class WriteValueTest { WriteValueTools.writeUTF8StringWithQuotes(str, baaos); byte[] b = str.getBytes("UTF-8"); if (baaos.size() != b.length + 2) { - throw new Exception("Expecting to write " + b + " in " + b.length + " bytes, but found " + baaos.size() - + " bytes."); + throw new Exception( + "Expecting to write " + b + " in " + b.length + " bytes, but found " + baaos.size() + " bytes."); } if (baaos.getByteArray()[0] != '\"' || baaos.getByteArray()[baaos.size() - 1] != '\"') { throw new Exception("Missing quotes.");
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java index 2971b72..1df9824 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java +++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java @@ -65,8 +65,7 @@ public class AlgebricksHyracksIntegrationUtil { ncConfig1.setClusterListenAddress("127.0.0.1"); ncConfig1.setDataListenAddress("127.0.0.1"); ncConfig1.setResultListenAddress("127.0.0.1"); - ncConfig1.setIODevices(new String [] { joinPath(System.getProperty("user.dir"), "target", "data", - "device0") }); + ncConfig1.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device0") }); FileUtils.forceMkdir(new File(ncConfig1.getIODevices()[0])); nc1 = new NodeControllerService(ncConfig1); nc1.start(); @@ -77,8 +76,7 @@ public class AlgebricksHyracksIntegrationUtil { ncConfig2.setClusterListenAddress("127.0.0.1"); ncConfig2.setDataListenAddress("127.0.0.1"); ncConfig2.setResultListenAddress("127.0.0.1"); - ncConfig2.setIODevices(new String [] { joinPath(System.getProperty("user.dir"), "target", "data", - "device1") }); + ncConfig2.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device1") }); FileUtils.forceMkdir(new File(ncConfig1.getIODevices()[0])); nc2 = new NodeControllerService(ncConfig2); nc2.start(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java index cd6362f..e2cd923 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java @@ -118,10 +118,10 @@ public class ActivityClusterGraphBuilder { for (int i = 0; i < nActivityOutputs; ++i) { IConnectorDescriptor conn = aOutputs.get(i); ac.addConnector(conn); - Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>> pcPair = jag.getConnectorActivityMap() - .get(conn.getConnectorId()); - ac.connect(conn, activity, i, pcPair.getRight().getLeft(), pcPair.getRight().getRight(), jag - .getConnectorRecordDescriptorMap().get(conn.getConnectorId())); + Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>> pcPair = + jag.getConnectorActivityMap().get(conn.getConnectorId()); + ac.connect(conn, activity, i, pcPair.getRight().getLeft(), pcPair.getRight().getRight(), + jag.getConnectorRecordDescriptorMap().get(conn.getConnectorId())); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java index 64bcf6e..b4d5ba4 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java @@ -101,8 +101,8 @@ public class JobActivityGraphBuilder implements IActivityGraphBuilder { } public void finish() { - Map<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>> caMap = jag - .getConnectorActivityMap(); + Map<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>> caMap = + jag.getConnectorActivityMap(); connectorProducerMap .forEach((cdId, producer) -> caMap.put(cdId, Pair.of(producer, connectorConsumerMap.get(cdId)))); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameConstants.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameConstants.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameConstants.java index cd74659..04c27be 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameConstants.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameConstants.java @@ -43,7 +43,7 @@ public interface FrameConstants { /** * Indicate the total size of the meta data. */ - int META_DATA_LEN = SIZE_LEN + TUPLE_START_OFFSET; + int META_DATA_LEN = SIZE_LEN + TUPLE_START_OFFSET; boolean DEBUG_FRAME_IO = false; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameHelper.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameHelper.java index 68533c6..1242ba0 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/FrameHelper.java @@ -38,7 +38,8 @@ public class FrameHelper { } public static void serializeFrameSize(ByteBuffer outputFrame, int start, int numberOfMinFrame) { - IntSerDeUtils.putInt(outputFrame.array(), start + FrameConstants.META_DATA_FRAME_COUNT_OFFSET, numberOfMinFrame); + IntSerDeUtils.putInt(outputFrame.array(), start + FrameConstants.META_DATA_FRAME_COUNT_OFFSET, + numberOfMinFrame); } public static int deserializeNumOfMinFrame(ByteBuffer frame) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameTupleAppender.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameTupleAppender.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameTupleAppender.java index 64fa322..9a2db6f 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameTupleAppender.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/comm/IFrameTupleAppender.java @@ -33,11 +33,11 @@ public interface IFrameTupleAppender extends IFrameAppender { boolean append(IFrameTupleAccessor tupleAccessor, int tStartOffset, int tEndOffset) throws HyracksDataException; - boolean appendConcat(IFrameTupleAccessor accessor0, int tIndex0, IFrameTupleAccessor accessor1, - int tIndex1) throws HyracksDataException; + boolean appendConcat(IFrameTupleAccessor accessor0, int tIndex0, IFrameTupleAccessor accessor1, int tIndex1) + throws HyracksDataException; - boolean appendConcat(IFrameTupleAccessor accessor0, int tIndex0, int[] fieldSlots1, byte[] bytes1, - int offset1, int dataLen1) throws HyracksDataException; + boolean appendConcat(IFrameTupleAccessor accessor0, int tIndex0, int[] fieldSlots1, byte[] bytes1, int offset1, + int dataLen1) throws HyracksDataException; boolean appendProjection(IFrameTupleAccessor accessor, int tIndex, int[] fields) throws HyracksDataException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java index d42cbb3..402f02e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java @@ -60,38 +60,38 @@ public interface IApplicationConfig { } default long getLong(IOption option) { - return (long)get(option); + return (long) get(option); } default int getInt(IOption option) { - return (int)get(option); + return (int) get(option); } default short getShort(IOption option) { - return (short)get(option); + return (short) get(option); } default String getString(IOption option) { - return (String)get(option); + return (String) get(option); } default boolean getBoolean(IOption option) { - return (boolean)get(option); + return (boolean) get(option); } default Level getLoggingLevel(IOption option) { - return (Level)get(option); + return (Level) get(option); } default double getDouble(IOption option) { - return (double)get(option); + return (double) get(option); } - default String [] getStringArray(IOption option) { - return (String [])get(option); + default String[] getStringArray(IOption option) { + return (String[]) get(option); } default URL getURL(IOption option) { - return (URL)get(option); + return (URL) get(option); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java index ed6dcd0..5f11214 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java @@ -56,7 +56,9 @@ public interface IOption { /** * @return a true value indicates this option should not be advertised (e.g. command-line usage, documentation) */ - default boolean hidden() { return false; } + default boolean hidden() { + return false; + } default String cmdline() { return "-" + name().toLowerCase().replace("_", "-"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/constraints/PartitionConstraintHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/constraints/PartitionConstraintHelper.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/constraints/PartitionConstraintHelper.java index 95f5e1a..762fdee 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/constraints/PartitionConstraintHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/constraints/PartitionConstraintHelper.java @@ -26,8 +26,8 @@ import org.apache.hyracks.api.job.JobSpecification; public class PartitionConstraintHelper { public static void addPartitionCountConstraint(JobSpecification spec, IOperatorDescriptor op, int count) { - spec.addUserConstraint(new Constraint(new PartitionCountExpression(op.getOperatorId()), new ConstantExpression( - count))); + spec.addUserConstraint( + new Constraint(new PartitionCountExpression(op.getOperatorId()), new ConstantExpression(count))); } public static void addAbsoluteLocationConstraint(JobSpecification spec, IOperatorDescriptor op, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksCommonContext.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksCommonContext.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksCommonContext.java index 5afcf69..1206d8e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksCommonContext.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksCommonContext.java @@ -20,7 +20,7 @@ package org.apache.hyracks.api.context; import org.apache.hyracks.api.io.IIOManager; -public interface IHyracksCommonContext extends IHyracksFrameMgrContext{ +public interface IHyracksCommonContext extends IHyracksFrameMgrContext { public IIOManager getIoManager(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/value/JSONSerializable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/value/JSONSerializable.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/value/JSONSerializable.java index 23ae97b..8b514f0 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/value/JSONSerializable.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/value/JSONSerializable.java @@ -18,7 +18,6 @@ */ package org.apache.hyracks.api.dataflow.value; - import com.fasterxml.jackson.databind.node.ObjectNode; public interface JSONSerializable { @@ -27,5 +26,5 @@ public interface JSONSerializable { * * @return A om.createObjectNode instance representing this Java object. */ - public ObjectNode toJSON() ; + public ObjectNode toJSON(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/IODeviceHandle.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/IODeviceHandle.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/IODeviceHandle.java index 34c58f8..a2d28e1 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/IODeviceHandle.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/io/IODeviceHandle.java @@ -48,8 +48,7 @@ public class IODeviceHandle implements Serializable { public IODeviceHandle(File mount, String workspace) { this.mount = mount; this.workspace = workspace == null ? null - : workspace.endsWith(File.separator) ? workspace.substring(0, workspace.length() - 1) - : workspace; + : workspace.endsWith(File.separator) ? workspace.substring(0, workspace.length() - 1) : workspace; } public File getMount() { @@ -78,7 +77,7 @@ public class IODeviceHandle implements Serializable { * comma separated list of devices * @return */ - public static List<IODeviceHandle> getDevices(String [] ioDevices) { + public static List<IODeviceHandle> getDevices(String[] ioDevices) { List<IODeviceHandle> devices = new ArrayList<>(); for (String ioDevice : ioDevices) { String devPath = ioDevice.trim(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java index e5fad32..94e9c74 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java @@ -74,7 +74,8 @@ public class ActivityCluster implements Serializable { connectorRecordDescriptorMap = new HashMap<ConnectorDescriptorId, RecordDescriptor>(); activityInputMap = new HashMap<ActivityId, List<IConnectorDescriptor>>(); activityOutputMap = new HashMap<ActivityId, List<IConnectorDescriptor>>(); - connectorActivityMap = new HashMap<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>>(); + connectorActivityMap = + new HashMap<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>>(); blocked2blockerMap = new HashMap<ActivityId, Set<ActivityId>>(); dependencies = new ArrayList<ActivityCluster>(); } @@ -108,8 +109,7 @@ public class ActivityCluster implements Serializable { } insertIntoIndexedMap(activityInputMap, consumerActivity.getActivityId(), consumerPort, connector); insertIntoIndexedMap(activityOutputMap, producerActivity.getActivityId(), producerPort, connector); - connectorActivityMap.put( - connector.getConnectorId(), + connectorActivityMap.put(connector.getConnectorId(), Pair.<Pair<IActivity, Integer>, Pair<IActivity, Integer>> of( Pair.<IActivity, Integer> of(producerActivity, producerPort), Pair.<IActivity, Integer> of(consumerActivity, consumerPort))); @@ -187,7 +187,7 @@ public class ActivityCluster implements Serializable { vList.set(index, value); } - public JsonNode toJSON() { + public JsonNode toJSON() { ObjectMapper om = new ObjectMapper(); ArrayNode jans = om.createArrayNode(); ObjectNode jac = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterGraph.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterGraph.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterGraph.java index b64e2d5..5816c8f 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterGraph.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterGraph.java @@ -161,7 +161,7 @@ public class ActivityClusterGraph implements Serializable { return ac.getProducerActivity(cid); } - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode acgj = om.createObjectNode(); ArrayNode acl = om.createArrayNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java index d23b944..bfa126a 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java @@ -25,8 +25,8 @@ import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.exceptions.HyracksException; public interface IActivityClusterGraphGeneratorFactory extends Serializable { - public IActivityClusterGraphGenerator createActivityClusterGraphGenerator( - ICCServiceContext ccServiceCtx, Set<JobFlag> jobFlags) throws HyracksException; + public IActivityClusterGraphGenerator createActivityClusterGraphGenerator(ICCServiceContext ccServiceCtx, + Set<JobFlag> jobFlags) throws HyracksException; public JobSpecification getJobSpecification(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobActivityGraph.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobActivityGraph.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobActivityGraph.java index de2759c..19d8484 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobActivityGraph.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobActivityGraph.java @@ -55,7 +55,8 @@ public class JobActivityGraph implements Serializable { connectorRecordDescriptorMap = new HashMap<ConnectorDescriptorId, RecordDescriptor>(); activityInputMap = new HashMap<ActivityId, List<IConnectorDescriptor>>(); activityOutputMap = new HashMap<ActivityId, List<IConnectorDescriptor>>(); - connectorActivityMap = new HashMap<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>>(); + connectorActivityMap = + new HashMap<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>>(); blocked2blockerMap = new HashMap<ActivityId, Set<ActivityId>>(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobInfo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobInfo.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobInfo.java index 713219e..2073728 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobInfo.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobInfo.java @@ -33,7 +33,8 @@ public class JobInfo implements Serializable { private final Map<OperatorDescriptorId, Map<Integer, String>> operatorLocations; - public JobInfo(JobId jobId, JobStatus jobStatus, Map<OperatorDescriptorId, Map<Integer, String>> operatorLocations) { + public JobInfo(JobId jobId, JobStatus jobStatus, + Map<OperatorDescriptorId, Map<Integer, String>> operatorLocations) { this.jobId = jobId; this.operatorLocations = operatorLocations; this.status = jobStatus; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSerializerDeserializerContainer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSerializerDeserializerContainer.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSerializerDeserializerContainer.java index d8c9a9c..7f3194e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSerializerDeserializerContainer.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSerializerDeserializerContainer.java @@ -27,7 +27,8 @@ import org.apache.hyracks.api.deployment.DeploymentId; public class JobSerializerDeserializerContainer implements IJobSerializerDeserializerContainer { private IJobSerializerDeserializer defaultJobSerDe = new JobSerializerDeserializer(); - private Map<DeploymentId, IJobSerializerDeserializer> jobSerializerDeserializerMap = new ConcurrentHashMap<DeploymentId, IJobSerializerDeserializer>(); + private Map<DeploymentId, IJobSerializerDeserializer> jobSerializerDeserializerMap = + new ConcurrentHashMap<DeploymentId, IJobSerializerDeserializer>(); @Override public synchronized IJobSerializerDeserializer getJobSerializerDeserializer(DeploymentId deploymentId) { @@ -39,7 +40,8 @@ public class JobSerializerDeserializerContainer implements IJobSerializerDeseria } @Override - public synchronized void addJobSerializerDeserializer(DeploymentId deploymentId, IJobSerializerDeserializer jobSerDe) { + public synchronized void addJobSerializerDeserializer(DeploymentId deploymentId, + IJobSerializerDeserializer jobSerDe) { jobSerializerDeserializerMap.put(deploymentId, jobSerDe); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/ActivityClusterGraphRewriter.java ---------------------------------------------------------------------- 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 7cdb300..f3059c1 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 @@ -48,8 +48,8 @@ import org.apache.hyracks.api.rewriter.runtime.SuperActivity; * @author yingyib */ public class ActivityClusterGraphRewriter { - private static final 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 @@ -90,8 +90,8 @@ public class ActivityClusterGraphRewriter { replacedBlockers = new HashSet<>(); for (ActivityId blocker : blockers) { replacedBlockers.add(invertedAid2SuperAidMap.get(blocker)); - ActivityCluster dependingAc = ac.getActivityClusterGraph().getActivityMap() - .get(invertedAid2SuperAidMap.get(blocker)); + ActivityCluster dependingAc = + ac.getActivityClusterGraph().getActivityMap().get(invertedAid2SuperAidMap.get(blocker)); if (!ac.getDependencies().contains(dependingAc)) { ac.getDependencies().add(dependingAc); } @@ -122,8 +122,8 @@ public class ActivityClusterGraphRewriter { Map<ActivityId, IActivity> activities = ac.getActivityMap(); Map<ActivityId, List<IConnectorDescriptor>> activityInputMap = ac.getActivityInputMap(); Map<ActivityId, List<IConnectorDescriptor>> activityOutputMap = ac.getActivityOutputMap(); - Map<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>> connectorActivityMap = ac - .getConnectorActivityMap(); + Map<ConnectorDescriptorId, Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>>> connectorActivityMap = + ac.getConnectorActivityMap(); ActivityClusterGraph acg = ac.getActivityClusterGraph(); Map<ActivityId, IActivity> startActivities = new HashMap<>(); Map<ActivityId, SuperActivity> superActivities = new HashMap<>(); @@ -177,8 +177,8 @@ public class ActivityClusterGraphRewriter { List<IConnectorDescriptor> outputConnectors = activityOutputMap.get(expendingActivity.getActivityId()); if (outputConnectors != null) { for (IConnectorDescriptor outputConn : outputConnectors) { - Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>> endPoints = connectorActivityMap - .get(outputConn.getConnectorId()); + Pair<Pair<IActivity, Integer>, Pair<IActivity, Integer>> endPoints = + connectorActivityMap.get(outputConn.getConnectorId()); IActivity newActivity = endPoints.getRight().getLeft(); SuperActivity existingSuperActivity = invertedActivitySuperActivityMap.get(newActivity); if (outputConn.getClass().getName().contains(ONE_TO_ONE_CONNECTOR)) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/OneToOneConnectedActivityCluster.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/OneToOneConnectedActivityCluster.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/OneToOneConnectedActivityCluster.java index 68041bb..a93cb17 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/OneToOneConnectedActivityCluster.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/rewriter/OneToOneConnectedActivityCluster.java @@ -38,10 +38,14 @@ public class OneToOneConnectedActivityCluster extends ActivityCluster { private static final long serialVersionUID = 1L; - protected final Map<Integer, Pair<ActivityId, Integer>> clusterInputIndexMap = new HashMap<Integer, Pair<ActivityId, Integer>>(); - protected final Map<Integer, Pair<ActivityId, Integer>> clusterOutputIndexMap = new HashMap<Integer, Pair<ActivityId, Integer>>(); - protected final Map<Pair<ActivityId, Integer>, Integer> invertedClusterOutputIndexMap = new HashMap<Pair<ActivityId, Integer>, Integer>(); - protected final Map<Pair<ActivityId, Integer>, Integer> invertedClusterInputIndexMap = new HashMap<Pair<ActivityId, Integer>, Integer>(); + protected final Map<Integer, Pair<ActivityId, Integer>> clusterInputIndexMap = + new HashMap<Integer, Pair<ActivityId, Integer>>(); + protected final Map<Integer, Pair<ActivityId, Integer>> clusterOutputIndexMap = + new HashMap<Integer, Pair<ActivityId, Integer>>(); + protected final Map<Pair<ActivityId, Integer>, Integer> invertedClusterOutputIndexMap = + new HashMap<Pair<ActivityId, Integer>, Integer>(); + protected final Map<Pair<ActivityId, Integer>, Integer> invertedClusterInputIndexMap = + new HashMap<Pair<ActivityId, Integer>, Integer>(); public OneToOneConnectedActivityCluster(ActivityClusterGraph acg, ActivityClusterId id) { super(acg, id); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/topology/TopologyDefinitionParser.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/topology/TopologyDefinitionParser.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/topology/TopologyDefinitionParser.java index 57330af..0182e0c 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/topology/TopologyDefinitionParser.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/topology/TopologyDefinitionParser.java @@ -74,9 +74,10 @@ public class TopologyDefinitionParser { public void endElement(String uri, String localName, String qName) throws SAXException { if ("network-switch".equals(localName) || "terminal".equals(localName)) { ElementStackEntry e = stack.pop(); - NetworkEndpoint endpoint = e.type == EndpointType.NETWORK_SWITCH ? new NetworkSwitch(e.name, - e.properties, e.ports.toArray(new NetworkSwitch.Port[e.ports.size()])) : new NetworkTerminal( - e.name, e.properties); + NetworkEndpoint endpoint = e.type == EndpointType.NETWORK_SWITCH + ? new NetworkSwitch(e.name, e.properties, + e.ports.toArray(new NetworkSwitch.Port[e.ports.size()])) + : new NetworkTerminal(e.name, e.properties); stack.peek().ports.add(new NetworkSwitch.Port(endpoint)); } else if ("property".equals(localName)) { if (!inPropertyElement) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExecutionTimeProfiler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExecutionTimeProfiler.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExecutionTimeProfiler.java index e5eec11..f396be9 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExecutionTimeProfiler.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExecutionTimeProfiler.java @@ -31,7 +31,6 @@ public class ExecutionTimeProfiler { private StringBuilder sb; private Object lock1 = new Object(); - // [Key: Job, Value: [Key: Operator, Value: Duration of each operators]] private HashMap<String, LinkedHashMap<String, String>> spentTimePerJobMap; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExperimentProfilerUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExperimentProfilerUtils.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExperimentProfilerUtils.java index 2305573..abadde3 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExperimentProfilerUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ExperimentProfilerUtils.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.io.OutputStream; public class ExperimentProfilerUtils { - public static void printToOutputFile(StringBuffer sb, FileOutputStream fos) throws IllegalStateException, - IOException { + public static void printToOutputFile(StringBuffer sb, FileOutputStream fos) + throws IllegalStateException, IOException { fos.write(sb.toString().getBytes()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/OperatorExecutionTimeProfiler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/OperatorExecutionTimeProfiler.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/OperatorExecutionTimeProfiler.java index 55c7915..02a1226 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/OperatorExecutionTimeProfiler.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/OperatorExecutionTimeProfiler.java @@ -30,8 +30,8 @@ public class OperatorExecutionTimeProfiler { if (ExecutionTimeProfiler.PROFILE_MODE) { //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS"); try { - executionTimeProfiler = new ExecutionTimeProfiler(profileHomeDir + "executionTime-" - + Inet4Address.getLocalHost().getHostAddress() + ".txt"); + executionTimeProfiler = new ExecutionTimeProfiler( + profileHomeDir + "executionTime-" + Inet4Address.getLocalHost().getHostAddress() + ".txt"); } catch (UnknownHostException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SpatialIndexProfiler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SpatialIndexProfiler.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SpatialIndexProfiler.java index a1b40d0..899d3ee 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SpatialIndexProfiler.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SpatialIndexProfiler.java @@ -41,8 +41,9 @@ public class SpatialIndexProfiler { } falsePositivePerQuery.begin(); try { - cacheMissPerQuery = new ExperimentProfiler(PROFILE_HOME_DIR + "cacheMissPerQuery-" - + Inet4Address.getLocalHost().getHostAddress() + ".txt", 1); + cacheMissPerQuery = new ExperimentProfiler( + PROFILE_HOME_DIR + "cacheMissPerQuery-" + Inet4Address.getLocalHost().getHostAddress() + ".txt", + 1); } catch (UnknownHostException e) { // TODO Auto-generated catch block e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/job/JobIdFactoryTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/job/JobIdFactoryTest.java b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/job/JobIdFactoryTest.java index d16eb15..709f098 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/job/JobIdFactoryTest.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/test/java/org/apache/hyracks/api/job/JobIdFactoryTest.java @@ -74,7 +74,7 @@ public class JobIdFactoryTest { JobIdFactory factory = new JobIdFactory(ccId); AtomicLong theId = (AtomicLong) idField.get(factory); Assert.assertEquals(expected, theId.get()); - theId.set((((long)1 << 48) - 1) | expected); + theId.set((((long) 1 << 48) - 1) | expected); JobId jobId = factory.create(); Assert.assertEquals(ccId, jobId.getCcId()); Assert.assertEquals(JobId.MAX_ID, jobId.getIdOnly()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetDirectoryServiceInterfaceRemoteProxy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetDirectoryServiceInterfaceRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetDirectoryServiceInterfaceRemoteProxy.java index 4310cd0..7eeb913 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetDirectoryServiceInterfaceRemoteProxy.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetDirectoryServiceInterfaceRemoteProxy.java @@ -40,16 +40,16 @@ public class HyracksDatasetDirectoryServiceInterfaceRemoteProxy implements IHyra @Override public Status getDatasetResultStatus(JobId jobId, ResultSetId rsId) throws Exception { - HyracksClientInterfaceFunctions.GetDatasetResultStatusFunction gdrlf = new HyracksClientInterfaceFunctions.GetDatasetResultStatusFunction( - jobId, rsId); + HyracksClientInterfaceFunctions.GetDatasetResultStatusFunction gdrlf = + new HyracksClientInterfaceFunctions.GetDatasetResultStatusFunction(jobId, rsId); return (Status) rpci.call(ipcHandle, gdrlf); } @Override public DatasetDirectoryRecord[] getDatasetResultLocations(JobId jobId, ResultSetId rsId, DatasetDirectoryRecord[] knownRecords) throws Exception { - HyracksClientInterfaceFunctions.GetDatasetResultLocationsFunction gdrlf = new HyracksClientInterfaceFunctions.GetDatasetResultLocationsFunction( - jobId, rsId, knownRecords); + HyracksClientInterfaceFunctions.GetDatasetResultLocationsFunction gdrlf = + new HyracksClientInterfaceFunctions.GetDatasetResultLocationsFunction(jobId, rsId, knownRecords); return (DatasetDirectoryRecord[]) rpci.call(ipcHandle, gdrlf); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java index fc5708d..e7c9042 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java @@ -75,8 +75,7 @@ public class HyracksDatasetReader implements IHyracksDatasetReader { public HyracksDatasetReader(IHyracksDatasetDirectoryServiceConnection datasetDirectoryServiceConnection, ClientNetworkManager netManager, IHyracksCommonContext datasetClientCtx, JobId jobId, - ResultSetId resultSetId) - throws Exception { + ResultSetId resultSetId) throws Exception { this.datasetDirectoryServiceConnection = datasetDirectoryServiceConnection; this.netManager = netManager; this.datasetClientCtx = datasetClientCtx; @@ -105,8 +104,8 @@ public class HyracksDatasetReader implements IHyracksDatasetReader { private DatasetDirectoryRecord getRecord(int partition) throws Exception { while (knownRecords == null || knownRecords[partition] == null) { - knownRecords = datasetDirectoryServiceConnection - .getDatasetResultLocations(jobId, resultSetId, knownRecords); + knownRecords = + datasetDirectoryServiceConnection.getDatasetResultLocations(jobId, resultSetId, knownRecords); } return knownRecords[partition]; } @@ -157,7 +156,7 @@ public class HyracksDatasetReader implements IHyracksDatasetReader { readBuffer = resultChannel.getNextBuffer(); lastMonitor.notifyFrameRead(); if (readBuffer != null) { - if (readSize <=0) { + if (readSize <= 0) { int nBlocks = FrameHelper.deserializeNumOfMinFrame(readBuffer); frame.ensureFrameSize(frame.getMinSize() * nBlocks); frame.getBuffer().clear(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java index 5d0865c..9e87f52 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/impl/ClientCounterContext.java @@ -39,9 +39,9 @@ import org.apache.hyracks.control.common.job.profiling.counters.Counter; * @author yingyib */ public class ClientCounterContext implements IClusterCounterContext { - private static String[] RESET_COUNTERS = { Counters.NETWORK_IO_READ, Counters.NETWORK_IO_WRITE, - Counters.MEMORY_USAGE, Counters.MEMORY_MAX, Counters.DISK_READ, Counters.DISK_WRITE, - Counters.NUM_PROCESSOR }; + private static String[] RESET_COUNTERS = + { Counters.NETWORK_IO_READ, Counters.NETWORK_IO_WRITE, Counters.MEMORY_USAGE, Counters.MEMORY_MAX, + Counters.DISK_READ, Counters.DISK_WRITE, Counters.NUM_PROCESSOR }; private static String[] AGG_COUNTERS = { Counters.SYSTEM_LOAD }; private static int UPDATE_INTERVAL = 10000; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-client/src/test/java/org/apache/hyracks/client/stats/ClientCounterContextTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/test/java/org/apache/hyracks/client/stats/ClientCounterContextTest.java b/hyracks-fullstack/hyracks/hyracks-client/src/test/java/org/apache/hyracks/client/stats/ClientCounterContextTest.java index ee33a6d..8bac8e7 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/test/java/org/apache/hyracks/client/stats/ClientCounterContextTest.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/test/java/org/apache/hyracks/client/stats/ClientCounterContextTest.java @@ -37,9 +37,9 @@ public class ClientCounterContextTest { synchronized (this) { wait(20000); } - String[] counters = { Counters.MEMORY_USAGE, Counters.MEMORY_MAX, Counters.NETWORK_IO_READ, - Counters.NETWORK_IO_WRITE, Counters.SYSTEM_LOAD, Counters.NUM_PROCESSOR, Counters.DISK_READ, - Counters.DISK_WRITE }; + String[] counters = + { Counters.MEMORY_USAGE, Counters.MEMORY_MAX, Counters.NETWORK_IO_READ, Counters.NETWORK_IO_WRITE, + Counters.SYSTEM_LOAD, Counters.NUM_PROCESSOR, Counters.DISK_READ, Counters.DISK_WRITE }; for (String counterName : counters) { ICounter counter = ccContext.getCounter(counterName, false); System.out.println(counterName + ": " + counter.get()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java index ccf798a..e46aa7f 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java @@ -94,9 +94,8 @@ class ClientInterfaceIPCI implements IIPCI { case DESTROY_JOB: HyracksClientInterfaceFunctions.UndeployJobSpecFunction dsjf = (HyracksClientInterfaceFunctions.UndeployJobSpecFunction) fn; - ccs.getWorkQueue() - .schedule(new UndeployJobSpecWork(ccs, dsjf.getDeployedJobSpecId(), - new IPCResponder<>(handle, mid))); + ccs.getWorkQueue().schedule( + new UndeployJobSpecWork(ccs, dsjf.getDeployedJobSpecId(), new IPCResponder<>(handle, mid))); break; case CANCEL_JOB: HyracksClientInterfaceFunctions.CancelJobFunction cjf = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java index ad0cb61..06c92dd 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java @@ -101,8 +101,7 @@ class ClusterControllerIPCI implements IIPCI { case DEPLOYED_JOB_FAILURE: CCNCFunctions.ReportDeployedJobSpecFailureFunction rdjf = (CCNCFunctions.ReportDeployedJobSpecFailureFunction) fn; - ccs.getWorkQueue() - .schedule(new DeployedJobFailureWork(rdjf.getDeployedJobSpecId(), rdjf.getNodeId())); + ccs.getWorkQueue().schedule(new DeployedJobFailureWork(rdjf.getDeployedJobSpecId(), rdjf.getNodeId())); break; case REGISTER_PARTITION_PROVIDER: CCNCFunctions.RegisterPartitionProviderFunction rppf = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java index 1ec7485..a6edd70 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java @@ -171,8 +171,8 @@ public class ClusterControllerService implements IControllerService { final ClusterTopology topology = computeClusterTopology(ccConfig); ccContext = new ClusterControllerContext(topology); sweeper = new DeadNodeSweeper(); - datasetDirectoryService = new DatasetDirectoryService(ccConfig.getResultTTL(), - ccConfig.getResultSweepThreshold()); + datasetDirectoryService = + new DatasetDirectoryService(ccConfig.getResultTTL(), ccConfig.getResultSweepThreshold()); deploymentRunMap = new HashMap<>(); stateDumpRunMap = new HashMap<>(); @@ -208,9 +208,9 @@ public class ClusterControllerService implements IControllerService { clusterIPC = new IPCSystem(new InetSocketAddress(ccConfig.getClusterListenPort()), ccIPCI, new CCNCFunctions.SerializerDeserializer()); IIPCI ciIPCI = new ClientInterfaceIPCI(this, jobIdFactory); - clientIPC = new IPCSystem( - new InetSocketAddress(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort()), ciIPCI, - new JavaSerializationBasedPayloadSerializerDeserializer()); + clientIPC = + new IPCSystem(new InetSocketAddress(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort()), + ciIPCI, new JavaSerializationBasedPayloadSerializerDeserializer()); webServer = new WebServer(this, ccConfig.getConsoleListenPort()); clusterIPC.start(); clientIPC.start(); @@ -238,9 +238,9 @@ public class ClusterControllerService implements IControllerService { // Job manager is in charge of job lifecycle management. try { - Constructor<?> jobManagerConstructor = this.getClass().getClassLoader() - .loadClass(ccConfig.getJobManagerClass()) - .getConstructor(CCConfig.class, ClusterControllerService.class, IJobCapacityController.class); + Constructor<?> jobManagerConstructor = + this.getClass().getClassLoader().loadClass(ccConfig.getJobManagerClass()).getConstructor( + CCConfig.class, ClusterControllerService.class, IJobCapacityController.class); jobManager = (IJobManager) jobManagerConstructor.newInstance(ccConfig, this, jobCapacityController); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { @@ -272,8 +272,8 @@ public class ClusterControllerService implements IControllerService { private void connectNCs() { getNCServices().forEach((key, value) -> { - final TriggerNCWork triggerWork = new TriggerNCWork(ClusterControllerService.this, value.getHostString(), - value.getPort(), key); + final TriggerNCWork triggerWork = + new TriggerNCWork(ClusterControllerService.this, value.getHostString(), value.getPort(), key); executor.submit(triggerWork); }); } @@ -428,8 +428,8 @@ public class ClusterControllerService implements IControllerService { @Override public void getIPAddressNodeMap(Map<InetAddress, Set<String>> map) throws HyracksDataException { - GetIpAddressNodeNameMapWork ginmw = new GetIpAddressNodeNameMapWork( - ClusterControllerService.this.getNodeManager(), map); + GetIpAddressNodeNameMapWork ginmw = + new GetIpAddressNodeNameMapWork(ClusterControllerService.this.getNodeManager(), map); try { workQueue.scheduleAndSync(ginmw); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java index 1a3051e..0e22c25 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java @@ -38,9 +38,8 @@ public class DeployedJobSpecStore { } public void addDeployedJobSpecDescriptor(DeployedJobSpecId deployedJobSpecId, - ActivityClusterGraph activityClusterGraph, - JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints) - throws HyracksException { + ActivityClusterGraph activityClusterGraph, JobSpecification jobSpecification, + Set<Constraint> activityClusterGraphConstraints) throws HyracksException { if (deployedJobSpecDescriptorMap.get(deployedJobSpecId) != null) { throw HyracksException.create(ErrorCode.DUPLICATE_DEPLOYED_JOB, deployedJobSpecId); } @@ -80,8 +79,8 @@ public class DeployedJobSpecStore { private final Set<Constraint> activityClusterGraphConstraints; - private DeployedJobSpecDescriptor(ActivityClusterGraph activityClusterGraph, - JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints) { + private DeployedJobSpecDescriptor(ActivityClusterGraph activityClusterGraph, JobSpecification jobSpecification, + Set<Constraint> activityClusterGraphConstraints) { this.activityClusterGraph = activityClusterGraph; this.jobSpecification = jobSpecification; this.activityClusterGraphConstraints = activityClusterGraphConstraints; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java index 742e2e0..98cf67a 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java @@ -98,8 +98,7 @@ public class NodeManager implements INodeManager { } // Updates the node registry. if (nodeRegistry.containsKey(nodeId)) { - LOGGER.warn( - "Node with name " + nodeId + " has already registered; failing the node then re-registering."); + LOGGER.warn("Node with name " + nodeId + " has already registered; failing the node then re-registering."); removeDeadNode(nodeId); } else { try { @@ -150,8 +149,8 @@ public class NodeManager implements INodeManager { Set<String> deadNodes = new HashSet<>(); Set<JobId> affectedJobIds = new HashSet<>(); Iterator<Map.Entry<String, NodeControllerState>> nodeIterator = nodeRegistry.entrySet().iterator(); - long deadNodeNanosThreshold = TimeUnit.MILLISECONDS - .toNanos(ccConfig.getHeartbeatMaxMisses() * ccConfig.getHeartbeatPeriodMillis()); + long deadNodeNanosThreshold = + TimeUnit.MILLISECONDS.toNanos(ccConfig.getHeartbeatMaxMisses() * ccConfig.getHeartbeatPeriodMillis()); while (nodeIterator.hasNext()) { Map.Entry<String, NodeControllerState> entry = nodeIterator.next(); String nodeId = entry.getKey(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java index ea37cdd..3fe88bf 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java @@ -102,12 +102,10 @@ class ActivityClusterPlanner { ActivityCluster dAC = ac.getActivityClusterGraph().getActivityMap().get(danId); ActivityClusterPlan dACP = jobRun.getActivityClusterPlanMap().get(dAC.getId()); assert dACP != null : "IllegalStateEncountered: Dependent AC is being planned without a plan for " - + "dependency AC: Encountered no plan for ActivityID " - + danId; + + "dependency AC: Encountered no plan for ActivityID " + danId; Task[] dATasks = dACP.getActivityPlanMap().get(danId).getTasks(); assert dATasks != null : "IllegalStateEncountered: Dependent AC is being planned without a plan for" - + " dependency AC: Encountered no plan for ActivityID " - + danId; + + " dependency AC: Encountered no plan for ActivityID " + danId; assert dATasks.length == tasks.length : "Dependency activity partitioned differently from " + "dependent: " + dATasks.length + " != " + tasks.length; Task dTask = dATasks[i]; @@ -125,8 +123,8 @@ class ActivityClusterPlanner { private TaskCluster[] computeTaskClusters(ActivityCluster ac, JobRun jobRun, Map<ActivityId, ActivityPlan> activityPlanMap) { Set<ActivityId> activities = ac.getActivityMap().keySet(); - Map<TaskId, List<Pair<TaskId, ConnectorDescriptorId>>> taskConnectivity = computeTaskConnectivity(jobRun, - activityPlanMap, activities); + Map<TaskId, List<Pair<TaskId, ConnectorDescriptorId>>> taskConnectivity = + computeTaskConnectivity(jobRun, activityPlanMap, activities); TaskCluster[] taskClusters = ac.getActivityClusterGraph().isUseConnectorPolicyForScheduling() ? buildConnectorPolicyAwareTaskClusters(ac, activityPlanMap, taskConnectivity) @@ -139,13 +137,13 @@ class ActivityClusterPlanner { List<Pair<TaskId, ConnectorDescriptorId>> cInfoList = taskConnectivity.get(tid); if (cInfoList != null) { for (Pair<TaskId, ConnectorDescriptorId> p : cInfoList) { - Task targetTS = activityPlanMap.get(p.getLeft().getActivityId()).getTasks()[p.getLeft() - .getPartition()]; + Task targetTS = + activityPlanMap.get(p.getLeft().getActivityId()).getTasks()[p.getLeft().getPartition()]; TaskCluster targetTC = targetTS.getTaskCluster(); if (targetTC != tc) { ConnectorDescriptorId cdId = p.getRight(); - PartitionId pid = new PartitionId(jobRun.getJobId(), cdId, tid.getPartition(), p.getLeft() - .getPartition()); + PartitionId pid = new PartitionId(jobRun.getJobId(), cdId, tid.getPartition(), + p.getLeft().getPartition()); tc.getProducedPartitions().add(pid); targetTC.getRequiredPartitions().add(pid); partitionProducingTaskClusterMap.put(pid, tc); @@ -170,8 +168,8 @@ class ActivityClusterPlanner { Task[] tasks = ap.getTasks(); taskStates.addAll(Arrays.asList(tasks)); } - TaskCluster tc = new TaskCluster(new TaskClusterId(ac.getId(), 0), ac, taskStates.toArray(new Task[taskStates - .size()])); + TaskCluster tc = + new TaskCluster(new TaskClusterId(ac.getId(), 0), ac, taskStates.toArray(new Task[taskStates.size()])); for (Task t : tc.getTasks()) { t.setTaskCluster(tc); } @@ -209,8 +207,8 @@ class ActivityClusterPlanner { } for (int i = 0; i < nProducers; ++i) { c.indicateTargetPartitions(nProducers, nConsumers, i, targetBitmap); - List<Pair<TaskId, ConnectorDescriptorId>> cInfoList = taskConnectivity - .get(ac1TaskStates[i].getTaskId()); + List<Pair<TaskId, ConnectorDescriptorId>> cInfoList = + taskConnectivity.get(ac1TaskStates[i].getTaskId()); if (cInfoList == null) { cInfoList = new ArrayList<>(); taskConnectivity.put(ac1TaskStates[i].getTaskId(), cInfoList); @@ -358,9 +356,9 @@ class ActivityClusterPlanner { int[] fanouts = new int[nProducers]; if (c.allProducersToAllConsumers()) { - for (int i = 0; i < nProducers; ++i) { - fanouts[i] = nConsumers; - } + for (int i = 0; i < nProducers; ++i) { + fanouts[i] = nConsumers; + } } else { for (int i = 0; i < nProducers; ++i) { c.indicateTargetPartitions(nProducers, nConsumers, i, targetBitmap); @@ -402,8 +400,8 @@ class ActivityClusterPlanner { throw new HyracksException("No value found for " + lv); } if (!(value instanceof Number)) { - throw new HyracksException("Unexpected type of value bound to " + lv + ": " + value.getClass() + "(" - + value + ")"); + throw new HyracksException( + "Unexpected type of value bound to " + lv + ": " + value.getClass() + "(" + value + ")"); } int nParts = ((Number) value).intValue(); if (nParts <= 0) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java index 58f44ef..fa08420 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java @@ -98,8 +98,8 @@ public class JobRun implements IJobStatusConditionVariable { private Map<OperatorDescriptorId, Map<Integer, String>> operatorLocations; - private JobRun(DeploymentId deploymentId, JobId jobId, Set<JobFlag> jobFlags, - JobSpecification spec, ActivityClusterGraph acg) { + private JobRun(DeploymentId deploymentId, JobId jobId, Set<JobFlag> jobFlags, JobSpecification spec, + ActivityClusterGraph acg) { this.deploymentId = deploymentId; this.jobId = jobId; this.jobFlags = jobFlags; @@ -118,10 +118,9 @@ public class JobRun implements IJobStatusConditionVariable { //Run a deployed job spec public JobRun(ClusterControllerService ccs, DeploymentId deploymentId, JobId jobId, Set<JobFlag> jobFlags, DeployedJobSpecDescriptor deployedJobSpecDescriptor, Map<byte[], byte[]> jobParameters, - DeployedJobSpecId deployedJobSpecId) - throws HyracksException { - this(deploymentId, jobId, jobFlags, - deployedJobSpecDescriptor.getJobSpecification(), deployedJobSpecDescriptor.getActivityClusterGraph()); + DeployedJobSpecId deployedJobSpecId) throws HyracksException { + this(deploymentId, jobId, jobFlags, deployedJobSpecDescriptor.getJobSpecification(), + deployedJobSpecDescriptor.getActivityClusterGraph()); ccs.createOrGetJobParameterByteStore(jobId).setParameters(jobParameters); Set<Constraint> constaints = deployedJobSpecDescriptor.getActivityClusterGraphConstraints(); this.scheduler = new JobExecutor(ccs, this, constaints, deployedJobSpecId); @@ -252,7 +251,7 @@ public class JobRun implements IJobStatusConditionVariable { return connectorPolicyMap; } - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode result = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java index c5e51a6..6f5c5ad 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java @@ -49,7 +49,8 @@ public class PartitionMatchMaker { public List<Pair<PartitionDescriptor, PartitionRequest>> registerPartitionDescriptor( PartitionDescriptor partitionDescriptor) { - List<Pair<PartitionDescriptor, PartitionRequest>> matches = new ArrayList<Pair<PartitionDescriptor, PartitionRequest>>(); + List<Pair<PartitionDescriptor, PartitionRequest>> matches = + new ArrayList<Pair<PartitionDescriptor, PartitionRequest>>(); PartitionId pid = partitionDescriptor.getPartitionId(); boolean matched = false; List<PartitionRequest> requests = partitionRequests.get(pid); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestUtil.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestUtil.java index 69f0571..9430c0d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestUtil.java @@ -23,7 +23,8 @@ import java.net.URISyntaxException; public class JSONOutputRequestUtil { - private JSONOutputRequestUtil() {} + private JSONOutputRequestUtil() { + } public static URI uri(String host, String prefix, String path) throws URISyntaxException { String name = host; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/AbstractTaskLifecycleWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/AbstractTaskLifecycleWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/AbstractTaskLifecycleWork.java index 3babf00..d0c6567 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/AbstractTaskLifecycleWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/AbstractTaskLifecycleWork.java @@ -58,8 +58,8 @@ public abstract class AbstractTaskLifecycleWork extends AbstractHeartbeatWork { Map<ActivityId, ActivityCluster> activityClusterMap = run.getActivityClusterGraph().getActivityMap(); ActivityCluster ac = activityClusterMap.get(tid.getActivityId()); if (ac != null) { - Map<ActivityId, ActivityPlan> taskStateMap = run.getActivityClusterPlanMap().get(ac.getId()) - .getActivityPlanMap(); + Map<ActivityId, ActivityPlan> taskStateMap = + run.getActivityClusterPlanMap().get(ac.getId()).getActivityPlanMap(); Task[] taskStates = taskStateMap.get(tid.getActivityId()).getTasks(); if (taskStates != null && taskStates.length > tid.getPartition()) { Task ts = taskStates[tid.getPartition()]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/CliDeployBinaryWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/CliDeployBinaryWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/CliDeployBinaryWork.java index c0ecffb..4962607 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/CliDeployBinaryWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/CliDeployBinaryWork.java @@ -65,8 +65,8 @@ public class CliDeployBinaryWork extends SynchronizableWork { /** * Deploy for the cluster controller */ - DeploymentUtils.deploy(deploymentId, binaryURLs, ccs.getContext() - .getJobSerializerDeserializerContainer(), ccs.getServerContext(), false); + DeploymentUtils.deploy(deploymentId, binaryURLs, ccs.getContext().getJobSerializerDeserializerContainer(), + ccs.getServerContext(), false); /** * Deploy for the node controllers http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java index b44c58c..a7c3c2f 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java @@ -41,7 +41,7 @@ public class ClusterShutdownWork extends SynchronizableWork { private final IResultCallback<Boolean> callback; public ClusterShutdownWork(ClusterControllerService ncs, boolean terminateNCService, - IResultCallback<Boolean> callback) { + IResultCallback<Boolean> callback) { this.ccs = ncs; this.terminateNCService = terminateNCService; this.callback = callback; @@ -77,8 +77,8 @@ public class ClusterShutdownWork extends SynchronizableWork { /* * best effort - just exit, user will have to kill misbehaving NCs */ - LOGGER.error("Clean shutdown of NCs timed out- giving up; unresponsive nodes: " + - shutdownStatus.getRemainingNodes()); + LOGGER.error("Clean shutdown of NCs timed out- giving up; unresponsive nodes: " + + shutdownStatus.getRemainingNodes()); } callback.setValue(cleanShutdown); ccs.stop(terminateNCService); @@ -97,8 +97,8 @@ public class ClusterShutdownWork extends SynchronizableWork { LOGGER.info("Notifying NC " + nodeId + " to shutdown..."); ncState.getNodeController().shutdown(terminateNCService); } catch (Exception e) { - LOGGER.log(Level.INFO, - "Exception shutting down NC " + nodeId + " (possibly dead?), continuing shutdown...", e); + LOGGER.log(Level.INFO, "Exception shutting down NC " + nodeId + " (possibly dead?), continuing shutdown...", + e); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java index f7335a8..c51f3c5 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java @@ -59,8 +59,7 @@ public class DeployJobSpecWork extends SynchronizableWork { acggf.createActivityClusterGraphGenerator(ccServiceCtx, EnumSet.noneOf(JobFlag.class)); ActivityClusterGraph acg = acgg.initialize(); ccs.getDeployedJobSpecStore().addDeployedJobSpecDescriptor(deployedJobSpecId, acg, - acggf.getJobSpecification(), - acgg.getConstraints()); + acggf.getJobSpecification(), acgg.getConstraints()); byte[] acgBytes = JavaSerializationUtils.serialize(acg); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobInfoWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobInfoWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobInfoWork.java index 8fe6470..009e445 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobInfoWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobInfoWork.java @@ -40,8 +40,8 @@ public class GetJobInfoWork extends SynchronizableWork { protected void doRun() throws Exception { try { JobRun run = jobManager.get(jobId); - JobInfo info = (run != null) ? new JobInfo(run.getJobId(), run.getStatus(), run.getOperatorLocations()) - : null; + JobInfo info = + (run != null) ? new JobInfo(run.getJobId(), run.getStatus(), run.getOperatorLocations()) : null; callback.setValue(info); } catch (Exception e) { callback.setException(e); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java index 9c680c3..ccd8286 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java @@ -46,7 +46,7 @@ public class GetJobSummariesJSONWork extends SynchronizableWork { populateJSON(jobManager.getArchivedJobs()); } - private void populateJSON(Collection<JobRun> jobRuns) { + private void populateJSON(Collection<JobRun> jobRuns) { ObjectMapper om = new ObjectMapper(); for (JobRun run : jobRuns) { ObjectNode jo = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java index 6433223..517f56f 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java @@ -44,8 +44,8 @@ import org.apache.hyracks.control.common.work.IPCResponder; import org.apache.hyracks.control.common.work.SynchronizableWork; public class GetNodeDetailsJSONWork extends SynchronizableWork { - private static final Section [] CC_SECTIONS = { Section.CC, Section.COMMON }; - private static final Section [] NC_SECTIONS = { Section.NC, Section.COMMON }; + private static final Section[] CC_SECTIONS = { Section.CC, Section.COMMON }; + private static final Section[] NC_SECTIONS = { Section.NC, Section.COMMON }; private final INodeManager nodeManager; private final CCConfig ccConfig; @@ -153,7 +153,6 @@ public class GetNodeDetailsJSONWork extends SynchronizableWork { return o; } - public ObjectNode getDetail() { return detail; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java index e1b59e1..b064e52 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java @@ -42,7 +42,6 @@ public class GetThreadDumpWork extends AbstractWork { private final IResultCallback<String> callback; private final ThreadDumpRun run; - public GetThreadDumpWork(ClusterControllerService ccs, String nodeId, IResultCallback<String> callback) { this.ccs = ccs; this.nodeId = nodeId; @@ -83,8 +82,8 @@ public class GetThreadDumpWork extends AbstractWork { Thread.sleep(sleepTime); } if (ccs.removeThreadDumpRun(run.getRequestId()) != null) { - LOGGER.log(Level.WARN, "Timed out thread dump request " + run.getRequestId() - + " for node " + nodeId); + LOGGER.log(Level.WARN, + "Timed out thread dump request " + run.getRequestId() + " for node " + nodeId); callback.setException(new TimeoutException("Thread dump request for node " + nodeId + " timed out after " + TIMEOUT_SECS + " seconds.")); }
