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/JobletCleanupNotificationWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java index b3b33c9..cc37f9c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java @@ -58,8 +58,8 @@ public class JobletCleanupNotificationWork extends AbstractHeartbeatWork { } Set<String> cleanupPendingNodes = run.getCleanupPendingNodeIds(); if (!cleanupPendingNodes.remove(nodeId)) { - LOGGER.log(Level.WARN, () -> nodeId + " not in pending cleanup nodes set: " + cleanupPendingNodes + - " for job " + jobId); + LOGGER.log(Level.WARN, + () -> nodeId + " not in pending cleanup nodes set: " + cleanupPendingNodes + " for job " + jobId); return; } INodeManager nodeManager = ccs.getNodeManager();
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/RegisterNodeWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterNodeWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterNodeWork.java index 04a34af..77ecbee 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterNodeWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterNodeWork.java @@ -56,9 +56,8 @@ public class RegisterNodeWork extends SynchronizableWork { Map<IOption, Object> ncConfiguration = new HashMap<>(); try { LOGGER.log(Level.WARN, "Registering INodeController: id = " + id); - NodeControllerRemoteProxy nc = - new NodeControllerRemoteProxy(ccs.getCcId(), - ccs.getClusterIPC().getReconnectingHandle(reg.getNodeControllerAddress())); + NodeControllerRemoteProxy nc = new NodeControllerRemoteProxy(ccs.getCcId(), + ccs.getClusterIPC().getReconnectingHandle(reg.getNodeControllerAddress())); NodeControllerState state = new NodeControllerState(nc, reg); INodeManager nodeManager = ccs.getNodeManager(); nodeManager.addNode(id, state); 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/RegisterPartitionAvailibilityWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java index edc57fb..23a81af 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java @@ -49,8 +49,8 @@ public class RegisterPartitionAvailibilityWork extends AbstractWork { return; } PartitionMatchMaker pmm = run.getPartitionMatchMaker(); - List<Pair<PartitionDescriptor, PartitionRequest>> matches = pmm - .registerPartitionDescriptor(partitionDescriptor); + List<Pair<PartitionDescriptor, PartitionRequest>> matches = + pmm.registerPartitionDescriptor(partitionDescriptor); for (Pair<PartitionDescriptor, PartitionRequest> match : matches) { try { PartitionUtils.reportPartitionMatch(ccs, pid, match); 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/ShutdownNCServiceWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java index aef331f..ad8882d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java @@ -47,6 +47,7 @@ public class ShutdownNCServiceWork extends SynchronizableWork { this.ncPort = ncPort; this.ncId = ncId; } + @Override public final void doRun() { LOGGER.info("Connecting to NC service '" + ncId + "' at " + ncHost + ":" + ncPort); 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/TriggerNCWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java index 2f80f5b..aa7a4fe 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java @@ -54,6 +54,7 @@ public class TriggerNCWork extends AbstractWork { this.ncPort = ncPort; this.ncId = ncId; } + @Override public final void run() { ccs.getExecutor().execute(() -> { @@ -68,8 +69,8 @@ public class TriggerNCWork extends AbstractWork { return; // QQQ Should probably have an ACK here } catch (IOException e) { - LOGGER.log(Level.WARN, "Failed to contact NC service at " + ncHost + ":" + ncPort - + "; will retry", e); + LOGGER.log(Level.WARN, "Failed to contact NC service at " + ncHost + ":" + ncPort + "; will retry", + e); } try { Thread.sleep(5000); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/application/ConfigManagerApplicationConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/application/ConfigManagerApplicationConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/application/ConfigManagerApplicationConfig.java index 92e90e7..44f57fa 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/application/ConfigManagerApplicationConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/application/ConfigManagerApplicationConfig.java @@ -42,17 +42,17 @@ public class ConfigManagerApplicationConfig implements IApplicationConfig, Seria @Override public String getString(String section, String key) { - return (String)get(section, key); + return (String) get(section, key); } @Override public int getInt(String section, String key) { - return (int)get(section, key); + return (int) get(section, key); } @Override public long getLong(String section, String key) { - return (long)get(section, key); + return (long) get(section, key); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java index 2307185..9cf84dd 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java @@ -40,8 +40,7 @@ public interface IClusterController { void unregisterNode(String nodeId) throws Exception; - void notifyTaskComplete(JobId jobId, TaskAttemptId taskId, String nodeId, TaskProfile statistics) - throws Exception; + void notifyTaskComplete(JobId jobId, TaskAttemptId taskId, String nodeId, TaskProfile statistics) throws Exception; void notifyTaskFailure(JobId jobId, TaskAttemptId taskId, String nodeId, List<Exception> exceptions) throws Exception; @@ -66,8 +65,8 @@ public interface IClusterController { void sendApplicationMessageToCC(byte[] data, DeploymentId deploymentId, String nodeId) throws Exception; - void registerResultPartitionLocation(JobId jobId, ResultSetId rsId, boolean orderedResult, - boolean emptyResult, int partition, int nPartitions, NetworkAddress networkAddress) throws Exception; + void registerResultPartitionLocation(JobId jobId, ResultSetId rsId, boolean orderedResult, boolean emptyResult, + int partition, int nPartitions, NetworkAddress networkAddress) throws Exception; void reportResultPartitionWriteCompletion(JobId jobId, ResultSetId rsId, int partition) throws Exception; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java index ef3b27c..9ec55f4 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java @@ -37,8 +37,8 @@ import org.apache.hyracks.control.common.job.TaskAttemptDescriptor; public interface INodeController { void startTasks(DeploymentId deploymentId, JobId jobId, byte[] planBytes, - List<TaskAttemptDescriptor> taskDescriptors, Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies, - Set<JobFlag> flags, Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId) + List<TaskAttemptDescriptor> taskDescriptors, Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies, + Set<JobFlag> flags, Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId) throws Exception; void abortTasks(JobId jobId, List<TaskAttemptId> tasks) throws Exception; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java index 67ea33f..986ca96 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java @@ -69,8 +69,8 @@ public class ConfigManager implements IConfigManager, Serializable { private HashSet<IOption> registeredOptions = new HashSet<>(); private HashMap<IOption, Object> definedMap = new HashMap<>(); private HashMap<IOption, Object> defaultMap = new HashMap<>(); - private CompositeMap<IOption, Object> configurationMap = new CompositeMap<>(definedMap, defaultMap, - new NoOpMapMutator()); + private CompositeMap<IOption, Object> configurationMap = + new CompositeMap<>(definedMap, defaultMap, new NoOpMapMutator()); private EnumMap<Section, Map<String, IOption>> sectionMap = new EnumMap<>(Section.class); @SuppressWarnings("squid:S1948") // TreeMap is serializable, and therefore so is its synchronized map private Map<String, Map<IOption, Object>> nodeSpecificMap = Collections.synchronizedMap(new TreeMap<>()); @@ -474,8 +474,7 @@ public class ConfigManager implements IConfigManager, Serializable { } }); extensionOptions.forEach((extension, options) -> { - options.forEach(option -> ini - .add(extension, option.getKey(), option.getValue())); + options.forEach(option -> ini.add(extension, option.getKey(), option.getValue())); }); return ini; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigUtils.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigUtils.java index adf1774..4fa9b56 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigUtils.java @@ -150,25 +150,23 @@ public class ConfigUtils { return value; } - public static String getString(Ini ini, org.apache.hyracks.api.config.Section section, - IOption option, String defaultValue) { + public static String getString(Ini ini, org.apache.hyracks.api.config.Section section, IOption option, + String defaultValue) { return getString(ini, section.sectionName(), option.ini(), defaultValue); } public static void addConfigToJSON(ObjectNode o, IApplicationConfig cfg, - org.apache.hyracks.api.config.Section... sections) { + org.apache.hyracks.api.config.Section... sections) { ArrayNode configArray = o.putArray("config"); for (org.apache.hyracks.api.config.Section section : cfg.getSections(Arrays.asList(sections)::contains)) { ObjectNode sectionNode = configArray.addObject(); Map<String, Object> sectionConfig = getSectionOptionsForJSON(cfg, section, option -> true); - sectionNode.put("section", section.sectionName()) - .putPOJO("properties", sectionConfig); + sectionNode.put("section", section.sectionName()).putPOJO("properties", sectionConfig); } } public static Map<String, Object> getSectionOptionsForJSON(IApplicationConfig cfg, - org.apache.hyracks.api.config.Section section, - Predicate<IOption> selector) { + org.apache.hyracks.api.config.Section section, Predicate<IOption> selector) { Map<String, Object> sectionConfig = new TreeMap<>(); for (IOption option : cfg.getOptions(section)) { if (selector.test(option)) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionTypes.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionTypes.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionTypes.java index 42ed1e7..3807a00 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionTypes.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionTypes.java @@ -37,8 +37,7 @@ public class OptionTypes { } long result1 = StorageUtil.getByteValue(s); if (result1 > Integer.MAX_VALUE || result1 < Integer.MIN_VALUE) { - throw new IllegalArgumentException( - "The given value: " + result1 + " is not within the int range."); + throw new IllegalArgumentException("The given value: " + result1 + " is not within the int range."); } return (int) result1; } @@ -50,12 +49,12 @@ public class OptionTypes { @Override public String serializeToHumanReadable(Object value) { - return value + " (" + StorageUtil.toHumanReadableSize((int)value) + ")"; + return value + " (" + StorageUtil.toHumanReadableSize((int) value) + ")"; } @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (int)value); + node.put(fieldName, (int) value); } }; @@ -72,12 +71,12 @@ public class OptionTypes { @Override public String serializeToHumanReadable(Object value) { - return value + " (" + StorageUtil.toHumanReadableSize((long)value) + ")"; + return value + " (" + StorageUtil.toHumanReadableSize((long) value) + ")"; } @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (long)value); + node.put(fieldName, (long) value); } }; @@ -88,7 +87,7 @@ public class OptionTypes { if (Integer.highestOneBit(value) > 16) { throw new IllegalArgumentException("The given value " + s + " is too big for a short"); } - return (short)value; + return (short) value; } @Override @@ -98,7 +97,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (short)value); + node.put(fieldName, (short) value); } }; @@ -115,7 +114,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (int)value); + node.put(fieldName, (int) value); } }; @@ -132,7 +131,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (double)value); + node.put(fieldName, (double) value); } }; @@ -149,7 +148,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (String)value); + node.put(fieldName, (String) value); } }; @@ -166,7 +165,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (long)value); + node.put(fieldName, (long) value); } }; @@ -183,7 +182,7 @@ public class OptionTypes { @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, (boolean)value); + node.put(fieldName, (boolean) value); } }; @@ -207,12 +206,12 @@ public class OptionTypes { @Override public String serializeToJSON(Object value) { - return value == null ? null : ((Level)value).name(); + return value == null ? null : ((Level) value).name(); } @Override public String serializeToIni(Object value) { - return ((Level)value).name(); + return ((Level) value).name(); } @Override @@ -221,25 +220,25 @@ public class OptionTypes { } }; - public static final IOptionType<String []> STRING_ARRAY = new IOptionType<String []>() { + public static final IOptionType<String[]> STRING_ARRAY = new IOptionType<String[]>() { @Override - public String [] parse(String s) { + public String[] parse(String s) { return s == null ? null : s.split("\\s*,\\s*"); } @Override - public Class<String []> targetType() { - return String [].class; + public Class<String[]> targetType() { + return String[].class; } @Override public String serializeToIni(Object value) { - return String.join(",", (String [])value); + return String.join(",", (String[]) value); } @Override public void serializeJSONField(String fieldName, Object value, ObjectNode node) { - node.put(fieldName, value == null ? null : StringUtils.join((String [])value, ',')); + node.put(fieldName, value == null ? null : StringUtils.join((String[]) value, ',')); } }; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java index 85731b6..13e4504 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java @@ -60,17 +60,14 @@ public class CCConfig extends ControllerConfig { RESULT_TTL(LONG, 86400000L), // TODO(mblow): add time unit RESULT_SWEEP_THRESHOLD(LONG, 60000L), // TODO(mblow): add time unit @SuppressWarnings("RedundantCast") // not redundant- false positive from IDEA - ROOT_DIR(STRING, (Function<IApplicationConfig, String>) appConfig -> - FileUtil.joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), - "ClusterControllerService"), "<value of " + ControllerConfig.Option.DEFAULT_DIR.cmdline() + - ">/ClusterControllerService"), + ROOT_DIR(STRING, (Function<IApplicationConfig, String>) appConfig -> FileUtil.joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), "ClusterControllerService"), "<value of " + ControllerConfig.Option.DEFAULT_DIR.cmdline() + ">/ClusterControllerService"), CLUSTER_TOPOLOGY(STRING), JOB_QUEUE_CLASS(STRING, "org.apache.hyracks.control.cc.scheduler.FIFOJobQueue"), JOB_QUEUE_CAPACITY(INTEGER, 4096), JOB_MANAGER_CLASS(STRING, "org.apache.hyracks.control.cc.job.JobManager"), ENFORCE_FRAME_WRITER_PROTOCOL(BOOLEAN, false), CORES_MULTIPLIER(INTEGER, 3), - CONTROLLER_ID(SHORT, (short)0x0000); + CONTROLLER_ID(SHORT, (short) 0x0000); private final IOptionType parser; private Object defaultValue; @@ -93,7 +90,7 @@ public class CCConfig extends ControllerConfig { } <T> Option(IOptionType<T> parser, Function<IApplicationConfig, T> defaultValue, - String defaultValueDescription) { + String defaultValueDescription) { this.parser = parser; this.defaultValue = defaultValue; this.defaultValueDescription = defaultValueDescription; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java index 19c89e0..8ecd312 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java @@ -33,6 +33,7 @@ import org.apache.hyracks.util.file.FileUtil; public class ControllerConfig implements Serializable { private static final long serialVersionUID = 1L; + public enum Option implements IOption { CONFIG_FILE(OptionTypes.STRING, "Specify path to master configuration file", null), CONFIG_FILE_URL(OptionTypes.URL, "Specify URL to master configuration file", null), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java index 95c063f..519bafc 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java @@ -50,7 +50,7 @@ public class NCConfig extends ControllerConfig { NCSERVICE_PORT(INTEGER, 9090), CLUSTER_ADDRESS(STRING, (String) null), CLUSTER_PORT(INTEGER, 1099), - CLUSTER_CONTROLLER_ID(SHORT, (short)0x0000), + CLUSTER_CONTROLLER_ID(SHORT, (short) 0x0000), CLUSTER_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS), CLUSTER_PUBLIC_PORT(INTEGER, CLUSTER_LISTEN_PORT), NODE_ID(STRING, (String) null), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java index 89d6e78..75ef0b7 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java @@ -75,11 +75,10 @@ public final class NodeRegistration implements Serializable { private final long maxJobId; public NodeRegistration(InetSocketAddress ncAddress, String nodeId, NCConfig ncConfig, NetworkAddress dataPort, - NetworkAddress datasetPort, String osName, String arch, String osVersion, int nProcessors, - String vmName, String vmVersion, String vmVendor, String classpath, String libraryPath, - String bootClasspath, List<String> inputArguments, Map<String, String> systemProperties, - HeartbeatSchema hbSchema, NetworkAddress messagingPort, NodeCapacity capacity, int pid, - long maxJobId) { + NetworkAddress datasetPort, String osName, String arch, String osVersion, int nProcessors, String vmName, + String vmVersion, String vmVendor, String classpath, String libraryPath, String bootClasspath, + List<String> inputArguments, Map<String, String> systemProperties, HeartbeatSchema hbSchema, + NetworkAddress messagingPort, NodeCapacity capacity, int pid, long maxJobId) { this.ncAddress = ncAddress; this.nodeId = nodeId; this.ncConfig = ncConfig; @@ -184,7 +183,9 @@ public final class NodeRegistration implements Serializable { return messagingPort; } - public int getPid() { return pid; } + public int getPid() { + return pid; + } public long getMaxJobId() { return maxJobId; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java index 1b790b7..4a44356 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java @@ -23,5 +23,6 @@ public class ServiceConstants { START_NC, TERMINATE } + public static final String NC_SERVICE_MAGIC_COOKIE = "hyncmagic2"; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/deployment/DeploymentUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/deployment/DeploymentUtils.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/deployment/DeploymentUtils.java index bb65f7f..4d8c137 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/deployment/DeploymentUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/deployment/DeploymentUtils.java @@ -119,8 +119,8 @@ public class DeploymentUtils { throws HyracksException { try { IJobSerializerDeserializerContainer jobSerDeContainer = serviceCtx.getJobSerializerDeserializerContainer(); - IJobSerializerDeserializer jobSerDe = deploymentId == null ? null - : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); + IJobSerializerDeserializer jobSerDe = + deploymentId == null ? null : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); return jobSerDe == null ? JavaSerializationUtils.deserialize(bytes) : jobSerDe.deserialize(bytes); } catch (Exception e) { throw new HyracksException(e); @@ -140,8 +140,8 @@ public class DeploymentUtils { throws HyracksException { try { IJobSerializerDeserializerContainer jobSerDeContainer = serviceCtx.getJobSerializerDeserializerContainer(); - IJobSerializerDeserializer jobSerDe = deploymentId == null ? null - : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); + IJobSerializerDeserializer jobSerDe = + deploymentId == null ? null : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); return jobSerDe == null ? JavaSerializationUtils.loadClass(className) : jobSerDe.loadClass(className); } catch (ClassNotFoundException | IOException e) { throw new HyracksException(e); @@ -159,8 +159,8 @@ public class DeploymentUtils { public static ClassLoader getClassLoader(DeploymentId deploymentId, IServiceContext appCtx) throws HyracksException { IJobSerializerDeserializerContainer jobSerDeContainer = appCtx.getJobSerializerDeserializerContainer(); - IJobSerializerDeserializer jobSerDe = deploymentId == null ? null - : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); + IJobSerializerDeserializer jobSerDe = + deploymentId == null ? null : jobSerDeContainer.getJobSerializerDeserializer(deploymentId); return jobSerDe == null ? DeploymentUtils.class.getClassLoader() : jobSerDe.getClassLoader(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java index e4e2dbe..0fdafe3 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java @@ -80,16 +80,14 @@ public class ClusterControllerRemoteProxy implements IClusterController { @Override public void notifyTaskComplete(JobId jobId, TaskAttemptId taskId, String nodeId, TaskProfile statistics) throws Exception { - NotifyTaskCompleteFunction fn = new NotifyTaskCompleteFunction(jobId, taskId, - nodeId, statistics); + NotifyTaskCompleteFunction fn = new NotifyTaskCompleteFunction(jobId, taskId, nodeId, statistics); ipcHandle.send(-1, fn, null); } @Override public void notifyTaskFailure(JobId jobId, TaskAttemptId taskId, String nodeId, List<Exception> exceptions) throws Exception { - NotifyTaskFailureFunction fn = new NotifyTaskFailureFunction(jobId, taskId, nodeId, - exceptions); + NotifyTaskFailureFunction fn = new NotifyTaskFailureFunction(jobId, taskId, nodeId, exceptions); ipcHandle.send(-1, fn, null); } @@ -101,8 +99,7 @@ public class ClusterControllerRemoteProxy implements IClusterController { @Override public void notifyDeployBinary(DeploymentId deploymentId, String nodeId, DeploymentStatus status) throws Exception { - NotifyDeployBinaryFunction fn = new NotifyDeployBinaryFunction(deploymentId, nodeId, - status); + NotifyDeployBinaryFunction fn = new NotifyDeployBinaryFunction(deploymentId, nodeId, status); ipcHandle.send(-1, fn, null); } @@ -120,37 +117,34 @@ public class ClusterControllerRemoteProxy implements IClusterController { @Override public void registerPartitionProvider(PartitionDescriptor partitionDescriptor) throws Exception { - RegisterPartitionProviderFunction fn = new RegisterPartitionProviderFunction( - partitionDescriptor); + RegisterPartitionProviderFunction fn = new RegisterPartitionProviderFunction(partitionDescriptor); ipcHandle.send(-1, fn, null); } @Override public void registerPartitionRequest(PartitionRequest partitionRequest) throws Exception { - RegisterPartitionRequestFunction fn = new RegisterPartitionRequestFunction( - partitionRequest); + RegisterPartitionRequestFunction fn = new RegisterPartitionRequestFunction(partitionRequest); ipcHandle.send(-1, fn, null); } @Override public void sendApplicationMessageToCC(byte[] data, DeploymentId deploymentId, String nodeId) throws Exception { - SendApplicationMessageFunction fn = new SendApplicationMessageFunction(data, - deploymentId, nodeId); + SendApplicationMessageFunction fn = new SendApplicationMessageFunction(data, deploymentId, nodeId); ipcHandle.send(-1, fn, null); } @Override public void registerResultPartitionLocation(JobId jobId, ResultSetId rsId, boolean orderedResult, boolean emptyResult, int partition, int nPartitions, NetworkAddress networkAddress) throws Exception { - RegisterResultPartitionLocationFunction fn = new RegisterResultPartitionLocationFunction( - jobId, rsId, orderedResult, emptyResult, partition, nPartitions, networkAddress); + RegisterResultPartitionLocationFunction fn = new RegisterResultPartitionLocationFunction(jobId, rsId, + orderedResult, emptyResult, partition, nPartitions, networkAddress); ipcHandle.send(-1, fn, null); } @Override public void reportResultPartitionWriteCompletion(JobId jobId, ResultSetId rsId, int partition) throws Exception { - ReportResultPartitionWriteCompletionFunction fn = new ReportResultPartitionWriteCompletionFunction( - jobId, rsId, partition); + ReportResultPartitionWriteCompletionFunction fn = + new ReportResultPartitionWriteCompletionFunction(jobId, rsId, partition); ipcHandle.send(-1, fn, null); } @@ -167,8 +161,7 @@ public class ClusterControllerRemoteProxy implements IClusterController { @Override public void notifyStateDump(String nodeId, String stateDumpId, String state) throws Exception { - StateDumpResponseFunction fn = new StateDumpResponseFunction(nodeId, stateDumpId, - state); + StateDumpResponseFunction fn = new StateDumpResponseFunction(nodeId, stateDumpId, state); ipcHandle.send(-1, fn, null); } @@ -180,8 +173,7 @@ public class ClusterControllerRemoteProxy implements IClusterController { @Override public void notifyThreadDump(String nodeId, String requestId, String threadDumpJSON) throws Exception { - ThreadDumpResponseFunction tdrf = new ThreadDumpResponseFunction(nodeId, requestId, - threadDumpJSON); + ThreadDumpResponseFunction tdrf = new ThreadDumpResponseFunction(nodeId, requestId, threadDumpJSON); ipcHandle.send(-1, tdrf, null); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java index a09a8bc..429cb26 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java @@ -65,8 +65,8 @@ public class NodeControllerRemoteProxy implements INodeController { List<TaskAttemptDescriptor> taskDescriptors, Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies, Set<JobFlag> flags, Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId) throws Exception { - StartTasksFunction stf = new StartTasksFunction(deploymentId, jobId, planBytes, - taskDescriptors, connectorPolicies, flags, jobParameters, deployedJobSpecId); + StartTasksFunction stf = new StartTasksFunction(deploymentId, jobId, planBytes, taskDescriptors, + connectorPolicies, flags, jobParameters, deployedJobSpecId); ipcHandle.send(-1, stf, null); } @@ -84,8 +84,7 @@ public class NodeControllerRemoteProxy implements INodeController { @Override public void reportPartitionAvailability(PartitionId pid, NetworkAddress networkAddress) throws Exception { - ReportPartitionAvailabilityFunction rpaf = new ReportPartitionAvailabilityFunction( - pid, networkAddress); + ReportPartitionAvailabilityFunction rpaf = new ReportPartitionAvailabilityFunction(pid, networkAddress); ipcHandle.send(-1, rpaf, null); } @@ -127,8 +126,7 @@ public class NodeControllerRemoteProxy implements INodeController { @Override public void sendApplicationMessageToNC(byte[] data, DeploymentId deploymentId, String nodeId) throws Exception { - SendApplicationMessageFunction fn = new SendApplicationMessageFunction(data, - deploymentId, nodeId); + SendApplicationMessageFunction fn = new SendApplicationMessageFunction(data, deploymentId, nodeId); ipcHandle.send(-1, fn, null); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java index 90dfc8c..bd98200 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java @@ -45,7 +45,7 @@ public abstract class AbstractProfile implements IWritable, Serializable { return counters; } - public abstract ObjectNode toJSON() ; + public abstract ObjectNode toJSON(); protected void populateCounters(ObjectNode jo) { ObjectMapper om = new ObjectMapper(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java index 64d074b..c4eff85 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java @@ -62,7 +62,7 @@ public class JobProfile extends AbstractProfile { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java index 5bdb1b5..687874c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java @@ -62,7 +62,7 @@ public class JobletProfile extends AbstractProfile { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/TaskProfile.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/TaskProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/TaskProfile.java index 3b54887..f977654 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/TaskProfile.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/TaskProfile.java @@ -70,7 +70,7 @@ public class TaskProfile extends AbstractProfile { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java index eae2eb6..e210963 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -public class ShutdownRun implements IShutdownStatusConditionVariable{ +public class ShutdownRun implements IShutdownStatusConditionVariable { private final Set<String> shutdownNodeIds = new TreeSet<>(); private boolean shutdownSuccess = false; @@ -60,7 +60,7 @@ public class ShutdownRun implements IShutdownStatusConditionVariable{ return shutdownSuccess; } - public synchronized Set<String> getRemainingNodes(){ + public synchronized Set<String> getRemainingNodes() { return shutdownNodeIds; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java index dbcba99..8ed7c9e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java @@ -116,9 +116,8 @@ public class WorkQueue { break; } if (DEBUG) { - LOGGER.log(Level.TRACE, - "Dequeue (" + WorkQueue.this.hashCode() + "): " + dequeueCount.incrementAndGet() + "/" - + enqueueCount); + LOGGER.log(Level.TRACE, "Dequeue (" + WorkQueue.this.hashCode() + "): " + + dequeueCount.incrementAndGet() + "/" + enqueueCount); } if (LOGGER.isEnabled(r.logLevel())) { LOGGER.log(r.logLevel(), "Executing: " + r); @@ -141,8 +140,7 @@ public class WorkQueue { if (waitedDelta > 0 || blockedDelta > 0) { LOGGER.warn("Work " + r + " waited " + waitedDelta + " times (~" + (after.getWaitedTime() - before.getWaitedTime()) + "ms), blocked " + blockedDelta - + " times (~" + (after.getBlockedTime() - before.getBlockedTime()) + "ms)" - ); + + " times (~" + (after.getBlockedTime() - before.getBlockedTime()) + "ms)"); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java index 24d72f8..0e74a4c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java @@ -302,8 +302,8 @@ public class NodeControllerService implements IControllerService { messagingNetManager.start(); } - final InetSocketAddress ccAddress = new InetSocketAddress(ncConfig.getClusterAddress(), - ncConfig.getClusterPort()); + final InetSocketAddress ccAddress = + new InetSocketAddress(ncConfig.getClusterAddress(), ncConfig.getClusterPort()); this.primaryCcs = addCc(ncConfig.getClusterControllerId(), ccAddress); workQueue.start(); @@ -390,8 +390,8 @@ public class NodeControllerService implements IControllerService { NetworkAddress messagingAddress = messagingNetManager != null ? messagingNetManager.getPublicNetworkAddress() : null; int allCores = osMXBean.getAvailableProcessors(); - nodeRegistration = new NodeRegistration(ncAddress, id, ncConfig, netAddress, datasetAddress, - osMXBean.getName(), osMXBean.getArch(), osMXBean.getVersion(), allCores, runtimeMXBean.getVmName(), + nodeRegistration = new NodeRegistration(ncAddress, id, ncConfig, netAddress, datasetAddress, osMXBean.getName(), + osMXBean.getArch(), osMXBean.getVersion(), allCores, runtimeMXBean.getVmName(), runtimeMXBean.getVmVersion(), runtimeMXBean.getVmVendor(), runtimeMXBean.getClassPath(), runtimeMXBean.getLibraryPath(), runtimeMXBean.getBootClassPath(), runtimeMXBean.getInputArguments(), runtimeMXBean.getSystemProperties(), hbSchema, messagingAddress, application.getCapacity(), @@ -403,8 +403,8 @@ public class NodeControllerService implements IControllerService { // Start heartbeat generator. if (!heartbeatThreads.containsKey(ccs)) { - Thread heartbeatThread = new Thread(new HeartbeatTask(ccs, nodeParameters.getHeartbeatPeriod()), - id + "-Heartbeat"); + Thread heartbeatThread = + new Thread(new HeartbeatTask(ccs, nodeParameters.getHeartbeatPeriod()), id + "-Heartbeat"); heartbeatThread.setPriority(Thread.MAX_PRIORITY); heartbeatThread.setDaemon(true); heartbeatThread.start(); @@ -529,7 +529,6 @@ public class NodeControllerService implements IControllerService { return jpbs; } - public void storeActivityClusterGraph(DeployedJobSpecId deployedJobSpecId, ActivityClusterGraph acg) throws HyracksException { if (deployedJobSpecActivityClusterGraphMap.get(deployedJobSpecId.getId()) != null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java index 07bb504..6e5a58e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java @@ -460,6 +460,7 @@ public class Task implements IHyracksTaskContext, ICounterContext, Runnable { public byte[] getJobParameter(byte[] name, int start, int length) throws HyracksException { return ncs.createOrGetJobParameterByteStore(joblet.getJobId()).getParameterValue(name, start, length); } + public Set<JobFlag> getJobFlags() { return jobFlags; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionReader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionReader.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionReader.java index 24edeb2..8c4fcb0 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionReader.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/DatasetPartitionReader.java @@ -89,9 +89,8 @@ public class DatasetPartitionReader { } private long read(long offset, ByteBuffer buffer) throws HyracksDataException { - return datasetMemoryManager != null ? - resultState.read(datasetMemoryManager, offset, buffer) : - resultState.read(offset, buffer); + return datasetMemoryManager != null ? resultState.read(datasetMemoryManager, offset, buffer) + : resultState.read(offset, buffer); } private void close() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/ResultState.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/ResultState.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/ResultState.java index afce266..43e3409 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/ResultState.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/dataset/ResultState.java @@ -214,7 +214,7 @@ public class ResultState implements IStateObject { initReadFileHandle(); } readSize = ioManager.syncRead(readFileHandle, offset, buffer); - if (readSize < 0){ + if (readSize < 0) { throw new HyracksDataException("Premature end of file"); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/profiling/IOCounterDefault.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/profiling/IOCounterDefault.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/profiling/IOCounterDefault.java index 5380911..1f8669d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/profiling/IOCounterDefault.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/io/profiling/IOCounterDefault.java @@ -19,7 +19,7 @@ package org.apache.hyracks.control.nc.io.profiling; -public class IOCounterDefault implements IIOCounter{ +public class IOCounterDefault implements IIOCounter { @Override public long getReads() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializedPartitionWriter.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializedPartitionWriter.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializedPartitionWriter.java index 4787a50..54ac5e5 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializedPartitionWriter.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializedPartitionWriter.java @@ -97,8 +97,8 @@ public class MaterializedPartitionWriter implements IFrameWriter { } if (!failed) { manager.registerPartition(pid, ctx.getJobletContext().getJobId().getCcId(), taId, - new MaterializedPartition(ctx, fRef, executor, ctx.getIoManager()), - PartitionState.COMMITTED, taId.getAttempt() == 0 ? false : true); + new MaterializedPartition(ctx, fRef, executor, ctx.getIoManager()), PartitionState.COMMITTED, + taId.getAttempt() == 0 ? false : true); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java index 147606d..a782bca 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java @@ -99,8 +99,8 @@ public class MaterializingPipelinedPartition implements IFrameWriter, IPartition fRefCopy = fRef; } writer.open(); - IFileHandle readHandle = fRefCopy == null ? null : - ioManager.open(fRefCopy, IIOManager.FileReadWriteMode.READ_ONLY, + IFileHandle readHandle = fRefCopy == null ? null + : ioManager.open(fRefCopy, IIOManager.FileReadWriteMode.READ_ONLY, IIOManager.FileSyncMode.METADATA_ASYNC_DATA_ASYNC); try { if (readHandle == null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java index bb69eec..9ee4a9e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/PartitionManager.java @@ -138,8 +138,7 @@ public class PartitionManager { } public void updatePartitionState(CcId ccId, PartitionId pid, TaskAttemptId taId, IPartition partition, - PartitionState state) - throws HyracksDataException { + PartitionState state) throws HyracksDataException { PartitionDescriptor desc = new PartitionDescriptor(pid, ncs.getId(), taId, partition.isReusable()); desc.setState(state); try { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/profiling/ConnectorReceiverProfilingFrameReader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/profiling/ConnectorReceiverProfilingFrameReader.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/profiling/ConnectorReceiverProfilingFrameReader.java index 45e1236..0dc1fb6 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/profiling/ConnectorReceiverProfilingFrameReader.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/profiling/ConnectorReceiverProfilingFrameReader.java @@ -36,8 +36,8 @@ public class ConnectorReceiverProfilingFrameReader implements IFrameReader { this.reader = reader; this.openCounter = ctx.getCounterContext().getCounter(cdId + ".receiver." + receiverIndex + ".open", true); this.closeCounter = ctx.getCounterContext().getCounter(cdId + ".receiver." + receiverIndex + ".close", true); - this.frameCounter = ctx.getCounterContext() - .getCounter(cdId + ".receiver." + receiverIndex + ".nextFrame", true); + this.frameCounter = + ctx.getCounterContext().getCounter(cdId + ".receiver." + receiverIndex + ".nextFrame", true); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/resources/memory/FrameManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/resources/memory/FrameManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/resources/memory/FrameManager.java index 4dc6bc9..38ae95b 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/resources/memory/FrameManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/resources/memory/FrameManager.java @@ -51,8 +51,7 @@ public class FrameManager implements IHyracksFrameMgrContext { } if (bytes > FrameConstants.MAX_FRAMESIZE) { throw new HyracksDataException( - "Unable to allocate frame larger than:" + FrameConstants.MAX_FRAMESIZE - + " bytes"); + "Unable to allocate frame larger than:" + FrameConstants.MAX_FRAMESIZE + " bytes"); } ByteBuffer buffer = ByteBuffer.allocate(bytes); FrameHelper.serializeFrameSize(buffer, bytes / minFrameSize); @@ -67,8 +66,8 @@ public class FrameManager implements IHyracksFrameMgrContext { return allocateFrame(newSizeInBytes); } else { if (newSizeInBytes > FrameConstants.MAX_FRAMESIZE) { - throw new HyracksDataException("Unable to allocate frame of size bigger than: " - + FrameConstants.MAX_FRAMESIZE + " bytes"); + throw new HyracksDataException( + "Unable to allocate frame of size bigger than: " + FrameConstants.MAX_FRAMESIZE + " bytes"); } ByteBuffer buffer = allocateFrame(newSizeInBytes); int limit = Math.min(newSizeInBytes, tobeDeallocate.capacity()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployBinaryWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployBinaryWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployBinaryWork.java index d1385ec..dfda463 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployBinaryWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployBinaryWork.java @@ -54,8 +54,8 @@ public class DeployBinaryWork extends AbstractWork { public void run() { DeploymentStatus status; try { - DeploymentUtils.deploy(deploymentId, binaryURLs, ncs.getContext() - .getJobSerializerDeserializerContainer(), ncs.getServerContext(), true); + DeploymentUtils.deploy(deploymentId, binaryURLs, ncs.getContext().getJobSerializerDeserializerContainer(), + ncs.getServerContext(), true); status = DeploymentStatus.SUCCEED; } catch (Exception e) { status = DeploymentStatus.FAIL; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ReportPartitionAvailabilityWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ReportPartitionAvailabilityWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ReportPartitionAvailabilityWork.java index 3871302..cfd69ce 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ReportPartitionAvailabilityWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ReportPartitionAvailabilityWork.java @@ -50,9 +50,13 @@ public class ReportPartitionAvailabilityWork extends AbstractWork { Map<JobId, Joblet> jobletMap = ncs.getJobletMap(); Joblet ji = jobletMap.get(pid.getJobId()); if (ji != null) { - PartitionChannel channel = new PartitionChannel(pid, new NetworkInputChannel(ncs.getNetworkManager(), - new InetSocketAddress(InetAddress.getByAddress(networkAddress.lookupIpAddress()), - networkAddress.getPort()), pid, 5)); + PartitionChannel channel = + new PartitionChannel(pid, + new NetworkInputChannel(ncs.getNetworkManager(), + new InetSocketAddress( + InetAddress.getByAddress(networkAddress.lookupIpAddress()), + networkAddress.getPort()), + pid, 5)); ji.reportPartitionAvailability(channel); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCServiceConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCServiceConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCServiceConfig.java index 10fa679..32f6bf3 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCServiceConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCServiceConfig.java @@ -35,20 +35,16 @@ public class NCServiceConfig { * If an option is specified both in the config file and on the command line, the config file * version will take precedence. */ - @Option(name = "-config-file", required = false, - usage = "Local NC configuration file (default: none)") + @Option(name = "-config-file", required = false, usage = "Local NC configuration file (default: none)") public String configFile = null; - @Option(name = "-address", required = false, - usage = "Address to listen on for connections from CC (default: all addresses)") + @Option(name = "-address", required = false, usage = "Address to listen on for connections from CC (default: all addresses)") public String address = null; - @Option(name = "-port", required = false, - usage = "Port to listen on for connections from CC (default: 9090)") + @Option(name = "-port", required = false, usage = "Port to listen on for connections from CC (default: 9090)") public int port = 9090; - @Option(name = "-logdir", required = false, - usage = "Directory to log NC output ('-' for stdout of NC service; default: $app.home/logs)") + @Option(name = "-logdir", required = false, usage = "Directory to log NC output ('-' for stdout of NC service; default: $app.home/logs)") public String logdir = null; private Ini ini = null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/ByteArrayPointable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/ByteArrayPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/ByteArrayPointable.java index 2ce5291..98700a3 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/ByteArrayPointable.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/ByteArrayPointable.java @@ -88,8 +88,8 @@ public class ByteArrayPointable extends AbstractPointable implements IHashable, int thisArrayStart = this.getContentStartOffset(); int thatArrayStart = thatStart + getNumberBytesToStoreMeta(thatArrayLen); - for (int thisIndex = 0, thatIndex = 0; - thisIndex < thisArrayLen && thatIndex < thatArrayLen; ++thisIndex, ++thatIndex) { + for (int thisIndex = 0, thatIndex = 0; thisIndex < thisArrayLen + && thatIndex < thatArrayLen; ++thisIndex, ++thatIndex) { if (this.bytes[thisArrayStart + thisIndex] != thatBytes[thatArrayStart + thatIndex]) { return (0xff & this.bytes[thisArrayStart + thisIndex]) - (0xff & thatBytes[thatArrayStart + thatIndex]); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java index 0850b04..86a6f9c 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java @@ -512,8 +512,8 @@ public final class UTF8StringPointable extends AbstractPointable implements IHas boolean isLetter = Character.isLetter(originalChar); // Make the first character into upper case while the later ones into lower case. - char resultChar = toUpperCase && isLetter ? Character.toUpperCase(originalChar) : (isLetter ? Character - .toLowerCase(originalChar) : originalChar); + char resultChar = toUpperCase && isLetter ? Character.toUpperCase(originalChar) + : (isLetter ? Character.toLowerCase(originalChar) : originalChar); builder.appendChar(resultChar); byteIndex += src.charSize(srcStart + byteIndex); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java index 1996b4e..c5b8e8a 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java @@ -119,7 +119,6 @@ public class BinaryHashSet { return putFindInternal(key, false, keyArray, increaseFoundCount); } - // Put an entry or find an entry private int putFindInternal(BinaryEntry key, boolean isInsert, byte[] keyArray, boolean increaseFoundCount) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/UTF8StringBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/UTF8StringBuilder.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/UTF8StringBuilder.java index fe04146..2300c06 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/UTF8StringBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/UTF8StringBuilder.java @@ -33,7 +33,8 @@ public class UTF8StringBuilder extends AbstractVarLenObjectBuilder { } } - public void appendUtf8StringPointable(UTF8StringPointable src, int byteStartOffset, int byteLength) throws IOException { + public void appendUtf8StringPointable(UTF8StringPointable src, int byteStartOffset, int byteLength) + throws IOException { out.write(src.getByteArray(), byteStartOffset, byteLength); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/ByteArrayPointableTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/ByteArrayPointableTest.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/ByteArrayPointableTest.java index fbc7aea..f7146df 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/ByteArrayPointableTest.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/ByteArrayPointableTest.java @@ -27,8 +27,8 @@ public class ByteArrayPointableTest { @Test public void testCompareTo() throws Exception { - ByteArrayPointable byteArrayPointable = ByteArrayPointable - .generatePointableFromPureBytes(new byte[] { 1, 2, 3, 4 }); + ByteArrayPointable byteArrayPointable = + ByteArrayPointable.generatePointableFromPureBytes(new byte[] { 1, 2, 3, 4 }); testEqual(byteArrayPointable, ByteArrayPointable.generatePointableFromPureBytes(new byte[] { 1, 2, 3, 4 })); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java index 93b2290..302e7a0 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java @@ -34,8 +34,8 @@ import org.junit.Test; public class UTF8StringPointableTest { public static UTF8StringPointable STRING_EMPTY = generateUTF8Pointable(UTF8StringSample.EMPTY_STRING); public static UTF8StringPointable STRING_UTF8_MIX = generateUTF8Pointable(UTF8StringSample.STRING_UTF8_MIX); - public static UTF8StringPointable STRING_UTF8_MIX_LOWERCASE = generateUTF8Pointable( - UTF8StringSample.STRING_UTF8_MIX_LOWERCASE); + public static UTF8StringPointable STRING_UTF8_MIX_LOWERCASE = + generateUTF8Pointable(UTF8StringSample.STRING_UTF8_MIX_LOWERCASE); public static UTF8StringPointable STRING_LEN_127 = generateUTF8Pointable(UTF8StringSample.STRING_LEN_127); public static UTF8StringPointable STRING_LEN_128 = generateUTF8Pointable(UTF8StringSample.STRING_LEN_128); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/util/UTF8StringCharacterIteratorTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/util/UTF8StringCharacterIteratorTest.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/util/UTF8StringCharacterIteratorTest.java index fc8a6ab..c001ab3 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/util/UTF8StringCharacterIteratorTest.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/util/UTF8StringCharacterIteratorTest.java @@ -49,7 +49,7 @@ public class UTF8StringCharacterIteratorTest { } @Test - public void testIterator(){ + public void testIterator() { testEachIterator(UTF8StringSample.EMPTY_STRING); testEachIterator(UTF8StringSample.STRING_UTF8_MIX); testEachIterator(UTF8StringSample.STRING_LEN_128); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameFixedFieldAppender.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameFixedFieldAppender.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameFixedFieldAppender.java index 8765bf1..5dc1fa3 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameFixedFieldAppender.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameFixedFieldAppender.java @@ -76,9 +76,9 @@ public class FrameFixedFieldAppender extends AbstractFrameAppender implements IF IntSerDeUtils.putInt(array, tupleDataEndOffset + currentField * 4, lastFieldEndOffset); if (++currentField == fieldCount) { tupleDataEndOffset += fieldCount * 4 + lastFieldEndOffset; - IntSerDeUtils - .putInt(array, FrameHelper.getTupleCountOffset(frame.getFrameSize()) - 4 * (tupleCount + 1), - tupleDataEndOffset); + IntSerDeUtils.putInt(array, + FrameHelper.getTupleCountOffset(frame.getFrameSize()) - 4 * (tupleCount + 1), + tupleDataEndOffset); ++tupleCount; IntSerDeUtils.putInt(array, FrameHelper.getTupleCountOffset(frame.getFrameSize()), tupleCount); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameTupleAppenderAccessor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameTupleAppenderAccessor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameTupleAppenderAccessor.java index b464f8e..4a324ff 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameTupleAppenderAccessor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/FrameTupleAppenderAccessor.java @@ -47,9 +47,8 @@ public class FrameTupleAppenderAccessor extends FrameTupleAppender implements IF @Override public int getTupleStartOffset(int tupleIndex) { - int offset = tupleIndex == 0 ? - FrameConstants.TUPLE_START_OFFSET : - IntSerDeUtils.getInt(getBuffer().array(), tupleCountOffset - 4 * tupleIndex); + int offset = tupleIndex == 0 ? FrameConstants.TUPLE_START_OFFSET + : IntSerDeUtils.getInt(getBuffer().array(), tupleCountOffset - 4 * tupleIndex); return offset; } @@ -65,8 +64,8 @@ public class FrameTupleAppenderAccessor extends FrameTupleAppender implements IF @Override public int getFieldStartOffset(int tupleIndex, int fIdx) { - return fIdx == 0 ? 0 : IntSerDeUtils.getInt(getBuffer().array(), - getTupleStartOffset(tupleIndex) + (fIdx - 1) * 4); + return fIdx == 0 ? 0 + : IntSerDeUtils.getInt(getBuffer().array(), getTupleStartOffset(tupleIndex) + (fIdx - 1) * 4); } @Override
