Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
2f683af7
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2f683af7
编写于
3月 17, 2015
作者:
D
Dániel Bali
提交者:
Fabian Hueske
4月 07, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue where Windows paths were not recognized as absolute
Added Windows test cases to Path tests This closes #491
上级
5cd9e9d9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
5 deletion
+38
-5
flink-core/src/main/java/org/apache/flink/core/fs/Path.java
flink-core/src/main/java/org/apache/flink/core/fs/Path.java
+4
-5
flink-core/src/test/java/org/apache/flink/core/fs/PathTest.java
...core/src/test/java/org/apache/flink/core/fs/PathTest.java
+34
-0
未找到文件。
flink-core/src/main/java/org/apache/flink/core/fs/Path.java
浏览文件 @
2f683af7
...
...
@@ -30,7 +30,6 @@ import java.net.URISyntaxException;
import
org.apache.flink.core.io.IOReadableWritable
;
import
org.apache.flink.core.memory.DataInputView
;
import
org.apache.flink.core.memory.DataOutputView
;
import
org.apache.flink.util.OperatingSystem
;
import
org.apache.flink.util.StringUtils
;
/**
...
...
@@ -278,9 +277,6 @@ public class Path implements IOReadableWritable, Serializable {
* @return <code>true</code> if the path string contains a windows drive letter, <code>false</code> otherwise
*/
private
boolean
hasWindowsDrive
(
String
path
,
boolean
slashed
)
{
if
(!
OperatingSystem
.
isWindows
())
{
return
false
;
}
final
int
start
=
slashed
?
1
:
0
;
return
path
.
length
()
>=
start
+
2
&&
(!
slashed
||
path
.
charAt
(
0
)
==
'/'
)
...
...
@@ -316,7 +312,10 @@ public class Path implements IOReadableWritable, Serializable {
*/
public
boolean
isAbsolute
()
{
final
int
start
=
hasWindowsDrive
(
uri
.
getPath
(),
true
)
?
3
:
0
;
return
uri
.
getPath
().
startsWith
(
SEPARATOR
,
start
);
if
(
uri
.
getPath
().
length
()
>
start
)
{
return
uri
.
getPath
().
startsWith
(
SEPARATOR
,
start
);
}
return
true
;
}
/**
...
...
flink-core/src/test/java/org/apache/flink/core/fs/PathTest.java
浏览文件 @
2f683af7
...
...
@@ -63,6 +63,15 @@ public class PathTest {
assertEquals
(
"/my/path"
,
p
.
toUri
().
getPath
());
assertEquals
(
"file"
,
p
.
toUri
().
getScheme
());
p
=
new
Path
(
"C:/my/windows/path"
);
assertEquals
(
"/C:/my/windows/path"
,
p
.
toUri
().
getPath
());
p
=
new
Path
(
"file:/C:/my/windows/path"
);
assertEquals
(
"/C:/my/windows/path"
,
p
.
toUri
().
getPath
());
p
=
new
Path
(
"C:"
);
assertEquals
(
"/C:"
,
p
.
toUri
().
getPath
());
try
{
new
Path
((
String
)
null
);
fail
();
...
...
@@ -95,6 +104,15 @@ public class PathTest {
p
=
new
Path
(
"./my/rel/path"
);
assertFalse
(
p
.
isAbsolute
());
p
=
new
Path
(
"C:/my/abs/windows/path"
);
assertTrue
(
p
.
isAbsolute
());
p
=
new
Path
(
"file:/C:"
);
assertTrue
(
p
.
isAbsolute
());
p
=
new
Path
(
"C:"
);
assertTrue
(
p
.
isAbsolute
());
}
@Test
...
...
@@ -115,6 +133,12 @@ public class PathTest {
p
=
new
Path
(
"/"
);
assertEquals
(
""
,
p
.
getName
());
p
=
new
Path
(
"C:/my/windows/path"
);
assertEquals
(
"path"
,
p
.
getName
());
p
=
new
Path
(
"file:/C:/my/windows/path"
);
assertEquals
(
"path"
,
p
.
getName
());
}
@Test
...
...
@@ -134,6 +158,9 @@ public class PathTest {
p
=
new
Path
(
"/"
);
assertNull
(
p
.
getParent
());
p
=
new
Path
(
"C:/my/windows/path"
);
assertEquals
(
"/C:/my/windows"
,
p
.
getParent
().
toUri
().
getPath
());
}
@Test
...
...
@@ -147,6 +174,10 @@ public class PathTest {
p
=
p
.
suffix
(
"/abc"
);
assertEquals
(
"/my/path/abc"
,
p
.
toUri
().
getPath
());
p
=
new
Path
(
"C:/my/windows/path"
);
p
=
p
.
suffix
(
"/abc"
);
assertEquals
(
"/C:/my/windows/path/abc"
,
p
.
toUri
().
getPath
());
}
@Test
...
...
@@ -163,6 +194,9 @@ public class PathTest {
p
=
new
Path
(
"/"
);
assertEquals
(
0
,
p
.
depth
());
p
=
new
Path
(
"C:/my/windows/path"
);
assertEquals
(
4
,
p
.
depth
());
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录