You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2019/02/03 05:24:11 UTC
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3143
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
---
M hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/43/3143/1
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
index c627d60..64881dc 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
@@ -262,20 +262,12 @@
register(channel);
final ISocketChannel serverChannel = socketChannelFactory.createServerChannel(channel);
channelKey = channel.register(selector, SelectionKey.OP_READ);
-<<<<<<< HEAD (4e1773 [NO ISSUE] Interval join tests written in SQL++)
if (serverChannel.requiresHandshake()) {
asyncHandshake(serverChannel, null, channelKey);
} else {
connectionReceived(serverChannel, channelKey);
}
- } catch (IOException e) {
-=======
- IPCHandle handle = new IPCHandle(system, null);
- handle.setKey(channelKey);
- channelKey.attach(handle);
- handle.setState(HandleState.CONNECT_RECEIVED);
} catch (Exception e) {
->>>>>>> BRANCH (04aebf [FUN][RT] Objects creation in array functions)
LOGGER.error("Failed to accept channel ", e);
close(channelKey, channel);
}
@@ -301,13 +293,7 @@
handle.setKey(channelKey);
channelKey.attach(handle);
}
-<<<<<<< HEAD (4e1773 [NO ISSUE] Interval join tests written in SQL++)
- } catch (IOException e) {
-=======
- handle.setKey(channelKey);
- channelKey.attach(handle);
} catch (Exception e) {
->>>>>>> BRANCH (04aebf [FUN][RT] Objects creation in array functions)
LOGGER.error("Failed to accept channel ", e);
close(channelKey, channel);
handle.setState(HandleState.CLOSED);
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5361/ (3/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/144/ (15/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3936/
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7857/
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10513/ (9/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3041/ (5/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/432/ (13/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Murtadha Hubail (Code Review)" <do...@asterixdb.incubator.apache.org>.
Murtadha Hubail has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Murtadha Hubail <mh...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/197/ (11/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5606/ (8/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5414/ (12/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4997/ (6/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/434/ (2/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5031/ (10/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1: Contrib+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3936/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5039/ (14/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Anon. E. Moose (Code Review)" <do...@asterixdb.incubator.apache.org>.
Anon. E. Moose #1000171 has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1: Contrib-2
Analytics Compatibility Tests Failed
https://goo.gl/gYeVUS : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8980/ (4/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4943/ (1/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Murtadha Hubail (Code Review)" <do...@asterixdb.incubator.apache.org>.
Murtadha Hubail has submitted this change and it was merged.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
---
M hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Murtadha Hubail: Looks good to me, approved
Objections:
Anon. E. Moose #1000171: Violations found
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
index c627d60..64881dc 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
@@ -262,20 +262,12 @@
register(channel);
final ISocketChannel serverChannel = socketChannelFactory.createServerChannel(channel);
channelKey = channel.register(selector, SelectionKey.OP_READ);
-<<<<<<< HEAD (4e1773 [NO ISSUE] Interval join tests written in SQL++)
if (serverChannel.requiresHandshake()) {
asyncHandshake(serverChannel, null, channelKey);
} else {
connectionReceived(serverChannel, channelKey);
}
- } catch (IOException e) {
-=======
- IPCHandle handle = new IPCHandle(system, null);
- handle.setKey(channelKey);
- channelKey.attach(handle);
- handle.setState(HandleState.CONNECT_RECEIVED);
} catch (Exception e) {
->>>>>>> BRANCH (04aebf [FUN][RT] Objects creation in array functions)
LOGGER.error("Failed to accept channel ", e);
close(channelKey, channel);
}
@@ -301,13 +293,7 @@
handle.setKey(channelKey);
channelKey.attach(handle);
}
-<<<<<<< HEAD (4e1773 [NO ISSUE] Interval join tests written in SQL++)
- } catch (IOException e) {
-=======
- handle.setKey(channelKey);
- channelKey.attach(handle);
} catch (Exception e) {
->>>>>>> BRANCH (04aebf [FUN][RT] Objects creation in array functions)
LOGGER.error("Failed to accept channel ", e);
close(channelKey, channel);
handle.setState(HandleState.CLOSED);
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Murtadha Hubail <mh...@apache.org>
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Anon. E. Moose (Code Review)" <do...@asterixdb.incubator.apache.org>.
Anon. E. Moose #1000171 has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Analytics Compatibility Compilation Successful
https://goo.gl/tC1diA : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7857/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '04aebfe' from 'stabilization-f69489' into 'mas...
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Merge commit '04aebfe' from 'stabilization-f69489' into 'master'
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5254/ (7/15)
--
To view, visit https://asterix-gerrit.ics.uci.edu/3143
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2d6ed58a6f11efff839bacab4bbe552d92eb9371
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No