Skip to content

Fix files missing from large directories #25

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

Open
buttercookie42 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix files missing from large directories #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ef68b1
Fix off-by-one error in SearchContext.restartAt(FileInfo) code
buttercookie42 Nov 2, 2024
5882813
Avoid leaking unclosed DirectoryStreams from searches
buttercookie42 Nov 4, 2024
43a548f
Have FileInfo.resetInfo() and copyFrom() handle the short name, too
buttercookie42 Nov 4, 2024
517f074
Cache most recently retrieved FileInfo object to speed up directory l…
buttercookie42 Nov 3, 2024
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
2 changes: 2 additions & 0 deletions src/main/java/org/filesys/server/filesys/FileInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,7 @@ public final FileType isFileType() {
*/
public final void resetInfo() {
m_name = "";
m_shortName = null;
m_path = null;

m_size = 0L;
Expand Down Expand Up @@ -666,6 +667,7 @@ public final void resetInfo() {
*/
public final void copyFrom(FileInfo finfo) {
m_name = finfo.getFileName();
m_shortName = finfo.getShortName();
m_path = finfo.getPath();

m_size = finfo.getSize();
Expand Down
57 changes: 51 additions & 6 deletions src/main/java/org/filesys/smb/server/disk/JavaNIOSearchContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public class JavaNIOSearchContext extends SearchContext {
private Iterator<Path> m_pathIter;
private int m_idx;

// Help speed up a common restartAt(FileInfo info) call pattern
private FileInfo m_cachedFileInfo;
private boolean m_restartFromCache;

// File attributes
private int m_attr;

Expand Down Expand Up @@ -74,6 +78,11 @@ public int getResumeId() {
return m_idx;
}

private void resetIndex() {
m_idx = 0;
m_cachedFileInfo = null;
}

/**
* Determine if there are more files to return for this search
*
Expand All @@ -87,7 +96,7 @@ public boolean hasMoreFiles() {
else if (m_stream == null || m_pathIter == null)
return false;
else if ( m_pathIter != null)
return m_pathIter.hasNext();
return m_pathIter.hasNext() || m_restartFromCache && m_cachedFileInfo != null;
return true;
}

Expand All @@ -104,7 +113,7 @@ public final void initSinglePathSearch( Path singlePath) {

// Indicate this is a single file/folder search
setSingleFileSearch( true);
m_idx = 0;
resetIndex();

m_stream = null;
m_pathIter = null;
Expand All @@ -131,7 +140,7 @@ public final void initWildcardSearch( Path folderPath, int attr, WildCard wildCa

// Indicate a multi-file search
setSingleFileSearch( false);
m_idx = 0;
resetIndex();

// Start the folder search
m_stream = Files.newDirectoryStream(m_root);
Expand Down Expand Up @@ -223,6 +232,11 @@ public boolean nextFileInfo(FileInfo info) {
infoValid = true;
}
}
else if (m_restartFromCache == true && m_cachedFileInfo != null) {
m_restartFromCache = false;
info.copyFrom(m_cachedFileInfo);
infoValid = true;
}
else if (m_pathIter != null && m_pathIter.hasNext()) {

// Find the next file/folder that matches the search attributes
Expand Down Expand Up @@ -329,11 +343,14 @@ else if (fname.equalsIgnoreCase("Desktop.ini") ||

// Indicate that the file information is valid
infoValid = true;

m_cachedFileInfo = info;
}
}
}
catch ( IOException ex) {
infoValid = false;
m_cachedFileInfo = null;
}

// Return the file information valid state
Expand All @@ -355,6 +372,10 @@ public String nextFileName() {
else
return null;
}
else if (m_restartFromCache == true && m_cachedFileInfo != null) {
m_restartFromCache = false;
return m_cachedFileInfo.getFileName();
}
else if ( m_pathIter != null && m_pathIter.hasNext()) {

// Find the next matching file name
Expand Down Expand Up @@ -390,14 +411,15 @@ public boolean restartAt(int resumeId) {

// Restart the iteration and skip to the required position
try {
m_stream.close();
m_stream = Files.newDirectoryStream(m_root);
m_pathIter = m_stream.iterator();
}
catch ( IOException ex) {
return false;
}

m_idx = 0;
resetIndex();

while ( m_pathIter.hasNext() && m_idx != resumeId) {
m_pathIter.next();
Expand All @@ -420,11 +442,18 @@ public boolean restartAt(FileInfo info) {
boolean restartOK = false;

if (m_stream != null) {
if (m_cachedFileInfo != null && m_cachedFileInfo == info) {
// Avoid expensively reiterating the whole directory if we're asked to merely go
// back to the immediately previously retrieved entry.
m_restartFromCache = true;
return true;
}

// Restart the stream iterator and find the required restart path
m_idx = 0;
resetIndex();

try {
m_stream.close();
m_stream = Files.newDirectoryStream(m_root);
m_pathIter = m_stream.iterator();
}
Expand All @@ -438,7 +467,8 @@ public boolean restartAt(FileInfo info) {
while ( curPath != null && restartOK == false) {

if ( curPath.getFileName().toString().equalsIgnoreCase(info.getFileName())) {
restartOK = true;
// Rewind by one, so the next call to nextFileInfo will return the correct item
restartOK = restartAt(m_idx - 1);
}
else {
curPath = m_pathIter.next();
Expand Down Expand Up @@ -485,4 +515,19 @@ public final void setRelativePath(String relPath) {
if (m_relPath != null && m_relPath.endsWith(FileName.DOS_SEPERATOR_STR) == false)
m_relPath = m_relPath + FileName.DOS_SEPERATOR_STR;
}

/**
* Close the search.
*/
public void closeSearch() {
if (m_stream != null) {
try {
m_stream.close();
}
catch (IOException unused) {
}
}
super.closeSearch();
}

}