Change in asterixdb[master]: small refactoring

2016-08-23 Thread Till Westmann (Code Review) 
Till Westmann has submitted this change and it was merged.

Change subject: small refactoring
..


small refactoring

Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1052
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: abdullah alamoudi 
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
1 file changed, 21 insertions(+), 15 deletions(-)

Approvals:
  abdullah alamoudi: Looks good to me, approved
  Jenkins: Verified; Verified

Objections:
  Jenkins: Violations found



diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
index 4189dbf..10e9125 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
@@ -54,7 +54,7 @@
 protected final boolean sendMarker;
 protected boolean failed = false;
 private FeedRecordDataFlowController.DataflowMarker dataflowMarker;
-private Future result;
+private Future dataflowMarkerResult;
 
 public FeedRecordDataFlowController(IHyracksTaskContext ctx, 
FeedTupleForwarder tupleForwarder,
 @Nonnull FeedLogManager feedLogManager, int numOfOutputFields, 
@Nonnull IRecordDataParser dataParser,
@@ -69,12 +69,7 @@
 
 @Override
 public void start(IFrameWriter writer) throws HyracksDataException {
-ExecutorService executorService = sendMarker ? 
Executors.newSingleThreadExecutor() : null;
-if (sendMarker && dataflowMarker == null) {
-dataflowMarker = new 
DataflowMarker(recordReader.getProgressReporter(),
-TaskUtils. get(HyracksConstants.KEY_MESSAGE, 
ctx));
-result = executorService.submit(dataflowMarker);
-}
+startDataflowMarker();
 HyracksDataException hde = null;
 try {
 failed = false;
@@ -102,9 +97,7 @@
 LOGGER.warn("Failure while operating a feed source", e);
 throw new HyracksDataException(e);
 }
-if(dataflowMarker != null){
-dataflowMarker.stop();
-}
+stopDataflowMarker();
 try {
 tupleForwarder.close();
 } catch (Throwable th) {
@@ -117,8 +110,8 @@
 hde = 
ExternalDataExceptionUtils.suppressIntoHyracksDataException(hde, th);
 } finally {
 closeSignal();
-if (sendMarker && result != null) {
-result.cancel(true);
+if (sendMarker && dataflowMarkerResult != null) {
+dataflowMarkerResult.cancel(true);
 }
 }
 if (hde != null) {
@@ -149,6 +142,21 @@
 protected void addPrimaryKeys(ArrayTupleBuilder tb, IRawRecord record) throws IOException {
 }
 
+private void startDataflowMarker() {
+ExecutorService executorService = sendMarker ? 
Executors.newSingleThreadExecutor() : null;
+if (sendMarker && dataflowMarker == null) {
+dataflowMarker = new 
DataflowMarker(recordReader.getProgressReporter(),
+TaskUtils. get(HyracksConstants.KEY_MESSAGE, 
ctx));
+dataflowMarkerResult = executorService.submit(dataflowMarker);
+}
+}
+
+private void stopDataflowMarker() {
+if (dataflowMarker != null) {
+dataflowMarker.stop();
+}
+}
+
 private void closeSignal() {
 synchronized (closed) {
 closed.set(true);
@@ -166,9 +174,7 @@
 
 @Override
 public boolean stop() throws HyracksDataException {
-if (dataflowMarker != null) {
-dataflowMarker.stop();
-}
+stopDataflowMarker();
 HyracksDataException hde = null;
 if (recordReader.stop()) {
 if (failed) {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-Reviewer: abdullah alamoudi

Change in asterixdb[master]: small refactoring

2016-08-22 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has posted comments on this change.

Change subject: small refactoring
..


Patch Set 5: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-22 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 5: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/413/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-22 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 5:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2337/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-18 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 4: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/359/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/359/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 4:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2276/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-17 Thread Till Westmann (Code Review) 
Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1052

to look at the new patch set (#4).

Change subject: small refactoring
..

small refactoring

Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
1 file changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/52/1052/4
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi

Change in asterixdb[master]: small refactoring

2016-08-12 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2199/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-12 Thread Till Westmann (Code Review) 
Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1052

to look at the new patch set (#3).

Change subject: small refactoring
..

small refactoring

Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
1 file changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/52/1052/3
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi

Change in asterixdb[master]: small refactoring

2016-08-12 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 2:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/295/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-12 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2188/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: small refactoring

2016-08-12 Thread Till Westmann (Code Review) 
Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1052

to look at the new patch set (#2).

Change subject: small refactoring
..

small refactoring

Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedRecordDataFlowController.java
1 file changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/52/1052/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi

Change in asterixdb[master]: small refactoring

2016-08-05 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: small refactoring
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2120/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1052
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I37eab1645416e3aad6119bba527c5e3b4b98fddc
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No