>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
3 files changed, 19 insertions(+), 13 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 4ca43c5..ffa6c87 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -171,17 +171,12 @@
AlgebricksAbsolutePartitionConstraint getClusterLocations();
/**
-<<<<<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
- * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
-=======
* @return the constraint representing all the partitions of the cluster
sorted by node name
*/
AlgebricksAbsolutePartitionConstraint getSortedClusterLocations();
/**
- * @param excludePendingRemoval
- * true, if the desired set shouldn't have pending removal nodes
->>>>>>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
+ * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
* @return the set of participant nodes
*/
Set<String> getParticipantNodes(boolean excludePendingRemoval);
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
index 95d06d4..ac8859b 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
@@ -70,9 +70,8 @@
public void configure(IServiceContext ctx, Map<String, String>
configuration, IWarningCollector warningCollector,
IExternalFilterEvaluatorFactory filterEvaluatorFactory) throws
AlgebricksException, HyracksDataException {
this.configuration = configuration;
-<<<<<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
- this.partitionConstraint =
- ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager().getClusterLocations();
+ this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
+ .getSortedClusterLocations();
this.filterEvaluatorFactory = filterEvaluatorFactory;
}
@@ -81,10 +80,6 @@
IExternalFilterValueEmbedder valueEmbedder =
filterEvaluatorFactory.createValueEmbedder(context.getWarningCollector());
return new ExternalStreamRuntimeDataContext(context, partition,
valueEmbedder);
-=======
- this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
- .getSortedClusterLocations();
->>>>>>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
}
public static class PartitionWorkLoadBasedOnSize implements Serializable {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
Gerrit-Change-Number: 18125
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
