abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/782
Change subject: Fix Number of LocalFS Readers
......................................................................
Fix Number of LocalFS Readers
This change makes the number of readers in localfs
adapter always equals to one. This is a temporary
change and is done to avoid sporadic failures for
decorrelation with unique id.
Change-Id: Id948bfd2c1a4e79863378ed98fb27f662fffba93
---
M
asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
M
asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
2 files changed, 4 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/82/782/1
diff --git
a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
index 08fce87..2c68fc8 100644
---
a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
+++
b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/LocalFSInputStreamFactory.java
@@ -27,7 +27,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.asterix.common.cluster.ClusterPartition;
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.external.api.AsterixInputStream;
import org.apache.asterix.external.api.IInputStreamFactory;
@@ -38,7 +37,6 @@
import org.apache.asterix.external.util.ExternalDataUtils;
import org.apache.asterix.external.util.FileSystemWatcher;
import org.apache.asterix.external.util.NodeResolverFactory;
-import org.apache.asterix.om.util.AsterixAppContextInfo;
import
org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -128,18 +126,11 @@
}
private void configurePartitionConstraint() throws AsterixException {
- Map<String, ClusterPartition[]> partitions =
AsterixAppContextInfo.getInstance().getMetadataProperties()
- .getNodePartitions();
List<String> locs = new ArrayList<>();
for (int i = 0; i < inputFileSplits.length; i++) {
String location = inputFileSplits[i].getNodeName();
if (!locs.contains(location)) {
- int numOfPartitions = partitions.get(location).length;
- int j = 0;
- while (j < numOfPartitions) {
- locs.add(location);
- j++;
- }
+ locs.add(location);
}
}
constraints = new
AlgebricksAbsolutePartitionConstraint(locs.toArray(new String[locs.size()]));
diff --git
a/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
b/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
index d6e9463..3c18c7e 100644
---
a/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
+++
b/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java
@@ -31,7 +31,7 @@
public class LocalFileSystemUtils {
- //TODO: replace this method by FileUtils.iterateFilesAndDirs(.)
+ // TODO: replace this method by FileUtils.iterateFilesAndDirs(.)
public static void traverse(final LinkedList<File> files, File root, final
String expression,
final LinkedList<Path> dirs) throws IOException {
if (!Files.exists(root.toPath())) {
@@ -40,7 +40,7 @@
if (!Files.isDirectory(root.toPath())) {
validateAndAdd(root.toPath(), expression, files);
}
- //FileUtils.iterateFilesAndDirs(directory, fileFilter, dirFilter)
+ // FileUtils.iterateFilesAndDirs(directory, fileFilter, dirFilter)
Files.walkFileTree(root.toPath(), new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(Path path,
BasicFileAttributes attrs) throws IOException {
@@ -51,7 +51,7 @@
if (dirs != null) {
dirs.add(path);
}
- //get immediate children files
+ // get immediate children files
File[] content = path.toFile().listFiles();
for (File file : content) {
if (!file.isDirectory()) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/782
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id948bfd2c1a4e79863378ed98fb27f662fffba93
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <[email protected]>
