You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/08/13 17:30:56 UTC
asterixdb git commit: [NO ISSUE][OTH] Cleanup Explicit Type
Specification
Repository: asterixdb
Updated Branches:
refs/heads/master d55da20ea -> b22b917a6
[NO ISSUE][OTH] Cleanup Explicit Type Specification
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: I781dfa768cfd4f820445f8d3f3748ced8bc6c591
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2886
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Contrib: Murtadha Hubail <mh...@apache.org>
Integration-Tests: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/b22b917a
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/b22b917a
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/b22b917a
Branch: refs/heads/master
Commit: b22b917a610717260aec89c81c0e0cb5057e98d5
Parents: d55da20
Author: Murtadha Hubail <mh...@apache.org>
Authored: Sun Aug 12 21:08:24 2018 -0700
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Mon Aug 13 10:30:45 2018 -0700
----------------------------------------------------------------------
.../hyracks/api/client/impl/ActivityClusterGraphBuilder.java | 4 ++--
.../main/java/org/apache/hyracks/api/job/ActivityCluster.java | 4 +---
.../main/java/org/apache/hyracks/api/job/JobSpecification.java | 4 +---
.../hyracks/control/cc/partitions/PartitionMatchMaker.java | 4 ++--
4 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b22b917a/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 3628e96..e4a3388 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
@@ -50,7 +50,7 @@ public class ActivityClusterGraphBuilder {
for (IConnectorDescriptor conn : inputList) {
ActivityId inTask = jag.getProducerActivity(conn.getConnectorId());
if (!eqSet.contains(inTask)) {
- return Pair.<ActivityId, ActivityId> of(t, inTask);
+ return Pair.of(t, inTask);
}
}
}
@@ -59,7 +59,7 @@ public class ActivityClusterGraphBuilder {
for (IConnectorDescriptor conn : outputList) {
ActivityId outTask = jag.getConsumerActivity(conn.getConnectorId());
if (!eqSet.contains(outTask)) {
- return Pair.<ActivityId, ActivityId> of(t, outTask);
+ return Pair.of(t, outTask);
}
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b22b917a/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 94e9c74..22240cb 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
@@ -110,9 +110,7 @@ public class ActivityCluster implements Serializable {
insertIntoIndexedMap(activityInputMap, consumerActivity.getActivityId(), consumerPort, connector);
insertIntoIndexedMap(activityOutputMap, producerActivity.getActivityId(), producerPort, connector);
connectorActivityMap.put(connector.getConnectorId(),
- Pair.<Pair<IActivity, Integer>, Pair<IActivity, Integer>> of(
- Pair.<IActivity, Integer> of(producerActivity, producerPort),
- Pair.<IActivity, Integer> of(consumerActivity, consumerPort)));
+ Pair.of(Pair.of(producerActivity, producerPort), Pair.of(consumerActivity, consumerPort)));
connectorRecordDescriptorMap.put(connector.getConnectorId(), recordDescriptor);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b22b917a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java
index b0a8017..829c550 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java
@@ -144,9 +144,7 @@ public class JobSpecification implements Serializable, IOperatorDescriptorRegist
insertIntoIndexedMap(opInputMap, consumerOp.getOperatorId(), consumerPort, conn);
insertIntoIndexedMap(opOutputMap, producerOp.getOperatorId(), producerPort, conn);
connectorOpMap.put(conn.getConnectorId(),
- Pair.<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>> of(
- Pair.<IOperatorDescriptor, Integer> of(producerOp, producerPort),
- Pair.<IOperatorDescriptor, Integer> of(consumerOp, consumerPort)));
+ Pair.of(Pair.of(producerOp, producerPort), Pair.of(consumerOp, consumerPort)));
}
public void setProperty(String name, Serializable value) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b22b917a/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 ad338e3..ac29b53 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
@@ -59,7 +59,7 @@ public class PartitionMatchMaker {
while (i.hasNext()) {
PartitionRequest req = i.next();
if (partitionDescriptor.getState().isAtLeast(req.getMinimumState())) {
- matches.add(Pair.<PartitionDescriptor, PartitionRequest> of(partitionDescriptor, req));
+ matches.add(Pair.of(partitionDescriptor, req));
i.remove();
matched = true;
if (!partitionDescriptor.isReusable()) {
@@ -95,7 +95,7 @@ public class PartitionMatchMaker {
while (i.hasNext()) {
PartitionDescriptor descriptor = i.next();
if (descriptor.getState().isAtLeast(partitionRequest.getMinimumState())) {
- match = Pair.<PartitionDescriptor, PartitionRequest> of(descriptor, partitionRequest);
+ match = Pair.of(descriptor, partitionRequest);
if (!descriptor.isReusable()) {
i.remove();
}