>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18351 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: Ia97d6afc9f854fa76ed1591ac083f3a34ca26281
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ApplicationMessageWork.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
M
hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java
7 files changed, 16 insertions(+), 45 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/51/18351/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index 70e69bd..4d654d5 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -90,12 +90,8 @@
// *** IJobLifecycleListener
@Override
-<<<<<<< HEAD (aca87d [ASTERIXDB-3343][API] Return new list when getting
completed)
public void notifyJobCreation(JobId jobId, JobSpecification
jobSpecification,
IJobCapacityController.JobSubmissionStatus status) throws
HyracksDataException {
-=======
- public void notifyJobCreation(JobId jobId, JobSpecification
jobSpecification) throws HyracksDataException {
->>>>>>> BRANCH (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
Object property =
jobSpecification.getProperty(ACTIVE_ENTITY_PROPERTY_NAME);
if (!(property instanceof EntityId)) {
if (property != null) {
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
index afa1f3e..0b8a689 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java
@@ -82,12 +82,7 @@
@Override
public String toString() {
-<<<<<<< HEAD (aca87d [ASTERIXDB-3343][API] Return new list when getting
completed)
- return "CancelQueryRequest{from='" + nodeId + "', reqId=" + reqId + ",
uuid='" + uuid + "', contextId='"
- + contextId + "'}";
-=======
return String.format("%s(id=%s, uuid=%s, contextId=%s, node=%s)",
getClass().getSimpleName(), reqId, uuid,
contextId, nodeId);
->>>>>>> BRANCH (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
}
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
index 99ac0d5..a711b73 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryResponse.java
@@ -51,10 +51,6 @@
@Override
public String toString() {
-<<<<<<< HEAD (aca87d [ASTERIXDB-3343][API] Return new list when getting
completed)
- return "CancelQueryResponse{reqId=" + reqId + ", status=" + status +
'}';
-=======
return String.format("%s(id=%s, status=%s)",
getClass().getSimpleName(), reqId, status);
->>>>>>> BRANCH (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java
index f4ab208..6630ba7 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java
@@ -67,11 +67,6 @@
return getName() + ": nodeID: " + nodeId;
}
- @Override
- public Level logLevel() {
- return Level.TRACE;
- }
-
private static void notifyMessageBroker(ICCServiceContext ctx, IMessage
msg, String nodeId) {
final ExecutorService executor =
ctx.getControllerService().getExecutor();
executor.execute(() -> {
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ApplicationMessageWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ApplicationMessageWork.java
index 3c3e99d..f386a89 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ApplicationMessageWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/ApplicationMessageWork.java
@@ -68,9 +68,4 @@
public String toString() {
return getName() + ": nodeId: " + nodeId;
}
-
- @Override
- public Level logLevel() {
- return Level.TRACE;
- }
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
index 498e26b..ed53a7e 100644
---
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
+++
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
@@ -409,14 +409,7 @@
writer.open();
state.hybridHJ.initProbe(probComp);
-<<<<<<< HEAD (aca87d [ASTERIXDB-3343][API] Return new list when getting
completed)
state.hybridHJ.setOperatorStats(stats);
-
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("OptimizedHybridHashJoin is starting the
probe phase.");
- }
-=======
->>>>>>> BRANCH (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
}
@Override
@@ -489,12 +482,7 @@
// Re-throw the whatever is caught.
throw e;
} finally {
-<<<<<<< HEAD (aca87d [ASTERIXDB-3343][API] Return new list when getting
completed)
- try {
- logProbeComplete();
- } finally {
- writer.close();
- }
+ writer.close();
}
}
@@ -503,15 +491,6 @@
this.stats = stats;
}
- private void logProbeComplete() {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("OptimizedHybridHashJoin closed its probe
phase");
-=======
- writer.close();
->>>>>>> BRANCH (5b4e88 Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
- }
- }
-
//The buildSideReader should be always the original
buildSideReader, so should the probeSideReader
private void joinPartitionPair(RunFileReader buildSideReader,
RunFileReader probeSideReader,
int buildSizeInTuple, int probeSizeInTuple, int level)
throws HyracksDataException {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18351
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: Ia97d6afc9f854fa76ed1591ac083f3a34ca26281
Gerrit-Change-Number: 18351
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
