Skip to content

<fix>(precompiled): fix bfs isExist type judge logic. #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2023
Merged

<fix>(precompiled): fix bfs isExist type judge logic. #742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/main/java/org/fisco/bcos/sdk/v3/contract/precompiled/bfs/BFSService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,33 @@ public BFSInfo isExist(String absolutePath) throws ContractException {
bfsPrecompiled.list(
absolutePath, BigInteger.valueOf(offset), BigInteger.valueOf(limit));
if (list.getValue1().equals(BigInteger.ZERO)) {
if (list.getValue2().getValue().isEmpty()) {
if (list.getValue2().getValue().size() != 1) {
// directory
return new BFSInfo(child, BFSUtils.BFS_TYPE_DIR);
} else {
return BFSInfo.fromPrecompiledBfs(list.getValue2().getValue().get(0));
// if return size is 1
BFSPrecompiled.BfsInfo bfsInfo = list.getValue2().getValue().get(0);
if (child.equals(bfsInfo.fileName)) {
// if name == child
// if type == dir, return dir
// if type != dir, try to ls absolute+child again
// if childLs is empty, it means child is regular
// else it means child is dir
if (BFSUtils.BFS_TYPE_DIR.equals(bfsInfo.fileType)) {
return new BFSInfo(child, BFSUtils.BFS_TYPE_DIR);
} else {
Tuple2<BigInteger, DynamicArray<BFSPrecompiled.BfsInfo>> childList =
bfsPrecompiled.list(absolutePath + "/" + child);
if (childList.getValue2().getValue().isEmpty()) {
// not exist, it is regular file
return BFSInfo.fromPrecompiledBfs(bfsInfo);
} else {
return new BFSInfo(child, BFSUtils.BFS_TYPE_DIR);
}
}
} else {
return new BFSInfo(child, BFSUtils.BFS_TYPE_DIR);
}
}
} else if (list.getValue1().compareTo(BigInteger.ZERO) > 0) {
return new BFSInfo(child, BFSUtils.BFS_TYPE_DIR);
Expand Down