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 2017/03/07 16:12:53 UTC
Change in asterixdb[master]: Fix Windows Startup Regression
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1556
Change subject: Fix Windows Startup Regression
......................................................................
Fix Windows Startup Regression
- Fix error in regex when using Windows file separator (i.e. backslash)
preventing server start
- Added tests to prevent future regressions of the same
Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
---
M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
2 files changed, 50 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/56/1556/1
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
index d44f1b4..d4aa599 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
@@ -19,14 +19,20 @@
package org.apache.hyracks.util.file;
import java.io.File;
+import java.util.regex.Pattern;
public class FileUtil {
private FileUtil() {
}
public static String joinPath(String... elements) {
- return String.join(File.separator, elements)
- .replaceAll("([^:])(" + File.separator + ")+", "$1$2")
- .replaceAll(File.separator + "$", "");
+ return joinPath(File.separatorChar, elements);
+ }
+
+ static String joinPath(char separatorChar, String... elements) {
+ final String separator = Pattern.quote(String.valueOf(separatorChar));
+ return String.join(separator, elements)
+ .replaceAll("([^:])(" + separator + ")+", "$1$2")
+ .replaceAll(separator + "$", "");
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
new file mode 100644
index 0000000..b595fd0
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.util.file;
+
+import static org.apache.hyracks.util.file.FileUtil.joinPath;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileUtilTest {
+
+ @Test
+ public void testUnixPaths() {
+ Assert.assertEquals("/tmp/far/baz/lala", joinPath('/', "/tmp//far/baz////lala"));
+ Assert.assertEquals("tmp/far/bar", joinPath('/',"tmp//far/bar"));
+ Assert.assertEquals("/tmp/far/bar", joinPath('/',"/tmp//far/bar/"));
+ }
+
+ @Test
+ public void testWindozePaths() {
+ Assert.assertEquals("C:\\temp\\far\\baz\\lala", joinPath('\\', "C:\\temp\\\\far\\baz\\\\\\\\lala"));
+ Assert.assertEquals("\\\\myserver\\tmp\\far\\baz\\lala", joinPath('\\', "\\\\myserver\\tmp\\\\far\\baz\\\\\\\\lala"));
+ Assert.assertEquals("C:\\temp\\far\\baz\\lala", joinPath('\\', "C:\\temp\\\\far\\baz\\\\\\\\lala\\"));
+ }
+}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 3:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4572/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4571/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 3:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/730/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has uploaded a new patch set (#2).
Change subject: Fix Windows Startup Regression
......................................................................
Fix Windows Startup Regression
- Fix error in regex when using Windows file separator (i.e. backslash)
preventing server start
- Added tests to prevent future regressions of the same
Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
---
M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
2 files changed, 51 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/56/1556/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 3:
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/730/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Fix Windows Startup Regression
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.
Change subject: Fix Windows Startup Regression
......................................................................
Fix Windows Startup Regression
- Fix error in regex when using Windows file separator (i.e. backslash)
preventing server start
- Added tests to prevent future regressions of the same
Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1556
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
2 files changed, 60 insertions(+), 3 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified; No violations found
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
index d44f1b4..d6e175e 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
@@ -19,14 +19,27 @@
package org.apache.hyracks.util.file;
import java.io.File;
+import java.util.regex.Pattern;
public class FileUtil {
+
private FileUtil() {
}
public static String joinPath(String... elements) {
- return String.join(File.separator, elements)
- .replaceAll("([^:])(" + File.separator + ")+", "$1$2")
- .replaceAll(File.separator + "$", "");
+ return joinPath(File.separatorChar, elements);
+ }
+
+ static String joinPath(char separatorChar, String... elements) {
+ final String separator = String.valueOf(separatorChar);
+ final String escapedSeparator = Pattern.quote(separator);
+ String joined = String.join(separator, elements);
+ if (separatorChar == '\\') {
+ // preserve leading double-slash on windows (UNC)
+ return joined.replaceAll("([^" + escapedSeparator + "])(" + escapedSeparator + ")+", "$1$2")
+ .replaceAll(escapedSeparator + "$", "");
+ } else {
+ return joined.replaceAll("(" + escapedSeparator + ")+", "$1").replaceAll(escapedSeparator + "$", "");
+ }
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
new file mode 100644
index 0000000..8d6c631
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.util.file;
+
+import static org.apache.hyracks.util.file.FileUtil.joinPath;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileUtilTest {
+
+ @Test
+ public void testUnixPaths() {
+ Assert.assertEquals("/tmp/far/baz/lala", joinPath('/', "/tmp/", "/", "far", "baz/", "///lala"));
+ Assert.assertEquals("tmp/far/bar", joinPath('/', "tmp//far", "bar"));
+ Assert.assertEquals("/tmp/far/bar", joinPath('/', "/tmp/", "far", "bar/"));
+ Assert.assertEquals("/tmp/far/bar", joinPath('/', "/" + "/tmp/", "far", "bar/"));
+ }
+
+ @Test
+ public void testWindozePaths() {
+ Assert.assertEquals("C:\\temp\\far\\baz\\lala",
+ joinPath('\\', "C:\\", "temp\\", "\\far", "\\baz\\", "\\", "\\", "\\lala"));
+ Assert.assertEquals("\\\\myserver\\tmp\\far\\baz\\lala",
+ joinPath('\\', "\\\\myserver\\tmp\\\\far\\baz\\\\\\\\lala"));
+ Assert.assertEquals("C:\\temp\\far\\baz\\lala", joinPath('\\', "C:\\temp\\\\far\\baz\\\\\\\\lala\\"));
+ }
+}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[master]: Fix Windows Startup Regression
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Till Westmann, Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1556
to look at the new patch set (#3).
Change subject: Fix Windows Startup Regression
......................................................................
Fix Windows Startup Regression
- Fix error in regex when using Windows file separator (i.e. backslash)
preventing server start
- Added tests to prevent future regressions of the same
Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
---
M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/file/FileUtil.java
A hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/file/FileUtilTest.java
2 files changed, 60 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/56/1556/3
--
To view, visit https://asterix-gerrit.ics.uci.edu/1556
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie83930572d79a587b85c3de2b2a3191c5e8bf77f
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>