You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2022/02/02 01:46:44 UTC
Change in asterixdb[stabilization-5e11053887]: Merge branch 'gerrit/stabilization-02ea049d7a'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: I92fc9437db11351d904644bfed9b56b825d72e48
---
M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
2 files changed, 19 insertions(+), 21 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/04/15104/1
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
index adf87c4..2887721 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
@@ -27,13 +27,10 @@
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
-<<<<<<< HEAD (69d550 [NO ISSUE]: update azure dependencies)
import java.nio.file.StandardOpenOption;
-=======
import java.util.ArrayList;
import java.util.Collection;
import java.util.Objects;
->>>>>>> BRANCH (4ae6e5 Merge branch 'gerrit/stabilization-5949a1cb71')
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.exceptions.ErrorCode;
@@ -142,23 +139,6 @@
return files;
}
-<<<<<<< HEAD (69d550 [NO ISSUE]: update azure dependencies)
- public static void flushDirectory(File directory) throws IOException {
- flushDirectory(directory.toPath());
- }
-
- public static void flushDirectory(Path path) throws IOException {
- if (!Files.isDirectory(path)) {
- throw new IOException("Not a directory: " + path);
- }
- if (Files.getFileStore(path).supportsFileAttributeView("posix")) {
- try (FileChannel ch = FileChannel.open(path, StandardOpenOption.READ)) {
- ch.force(true);
- }
- } else {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("Unable to flush directory " + path);
-=======
/**
* Gets a collection of files matching {@code filter} by searching {@code root} directory and
* all of its subdirectories
@@ -187,7 +167,25 @@
} else {
files.add(file);
}
->>>>>>> BRANCH (4ae6e5 Merge branch 'gerrit/stabilization-5949a1cb71')
+ }
+ }
+ }
+
+ public static void flushDirectory(File directory) throws IOException {
+ flushDirectory(directory.toPath());
+ }
+
+ public static void flushDirectory(Path path) throws IOException {
+ if (!Files.isDirectory(path)) {
+ throw new IOException("Not a directory: " + path);
+ }
+ if (Files.getFileStore(path).supportsFileAttributeView("posix")) {
+ try (FileChannel ch = FileChannel.open(path, StandardOpenOption.READ)) {
+ ch.force(true);
+ }
+ } else {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Unable to flush directory " + path);
}
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5e11053887
Gerrit-Change-Id: I92fc9437db11351d904644bfed9b56b825d72e48
Gerrit-Change-Number: 15104
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-5e11053887]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: I92fc9437db11351d904644bfed9b56b825d72e48
---
M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
2 files changed, 19 insertions(+), 21 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/04/15104/1
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
index adf87c4..2887721 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/IoUtil.java
@@ -27,13 +27,10 @@
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
-<<<<<<< HEAD (69d550 [NO ISSUE]: update azure dependencies)
import java.nio.file.StandardOpenOption;
-=======
import java.util.ArrayList;
import java.util.Collection;
import java.util.Objects;
->>>>>>> BRANCH (4ae6e5 Merge branch 'gerrit/stabilization-5949a1cb71')
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.exceptions.ErrorCode;
@@ -142,23 +139,6 @@
return files;
}
-<<<<<<< HEAD (69d550 [NO ISSUE]: update azure dependencies)
- public static void flushDirectory(File directory) throws IOException {
- flushDirectory(directory.toPath());
- }
-
- public static void flushDirectory(Path path) throws IOException {
- if (!Files.isDirectory(path)) {
- throw new IOException("Not a directory: " + path);
- }
- if (Files.getFileStore(path).supportsFileAttributeView("posix")) {
- try (FileChannel ch = FileChannel.open(path, StandardOpenOption.READ)) {
- ch.force(true);
- }
- } else {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("Unable to flush directory " + path);
-=======
/**
* Gets a collection of files matching {@code filter} by searching {@code root} directory and
* all of its subdirectories
@@ -187,7 +167,25 @@
} else {
files.add(file);
}
->>>>>>> BRANCH (4ae6e5 Merge branch 'gerrit/stabilization-5949a1cb71')
+ }
+ }
+ }
+
+ public static void flushDirectory(File directory) throws IOException {
+ flushDirectory(directory.toPath());
+ }
+
+ public static void flushDirectory(Path path) throws IOException {
+ if (!Files.isDirectory(path)) {
+ throw new IOException("Not a directory: " + path);
+ }
+ if (Files.getFileStore(path).supportsFileAttributeView("posix")) {
+ try (FileChannel ch = FileChannel.open(path, StandardOpenOption.READ)) {
+ ch.force(true);
+ }
+ } else {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Unable to flush directory " + path);
}
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5e11053887
Gerrit-Change-Id: I92fc9437db11351d904644bfed9b56b825d72e48
Gerrit-Change-Number: 15104
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-5e11053887]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12942/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15104
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5e11053887
Gerrit-Change-Id: I92fc9437db11351d904644bfed9b56b825d72e48
Gerrit-Change-Number: 15104
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Comment-Date: Wed, 02 Feb 2022 05:38:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment