Skip to content

Fix: store rowCount per-file to prevent cross-file index corruption #32

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
amitgour1996 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: store rowCount per-file to prevent cross-file index corruption #32

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
34 changes: 31 additions & 3 deletions src/main/java/com/di/jmeter/utils/FileServerExtended.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ public class FileServerExtended {
BASE_PREFIX_DEFAULT);

private File base;
/**
* @deprecated Use per-file row count via {@link #getRowCount(String)} instead.
* Retained only for backward compatibility with callers that do not pass an alias.
*/
@Deprecated
private static int rowCount;
private static final ThreadLocal<Integer> endPos = new ThreadLocal<>();
private static final ThreadLocal<Integer> startPos = new ThreadLocal<>();
Expand Down Expand Up @@ -534,6 +539,7 @@ private static class FileEntry{
private final File file;
private Closeable inputOutputObject;
private final String charSetEncoding;
private int rowCount;

FileEntry(File f, Closeable o, String e) {
file = f;
Expand Down Expand Up @@ -594,7 +600,11 @@ public void calculateRowCount(String filename, boolean ignoreFirstLine) {
log.error(e.toString());

}
this.setRowCount(ignoreFirstLine ? count-1 : count );
int effectiveCount = ignoreFirstLine ? count - 1 : count;
// Store per-file row count
fileEntry.rowCount = effectiveCount;
// Also update global static for backward compatibility
this.setRowCount(effectiveCount);
}

/**
Expand Down Expand Up @@ -628,7 +638,8 @@ public static void setReadPosition(String threadName, int blockSize, boolean ign
public synchronized String readRandom(String filename, boolean ignoreFirstLine) throws IOException {
Random rand = new Random();
int startPos = ignoreFirstLine ? 1 : 0;
int randPos = rand.nextInt(((rowCount -1) - startPos) + 1) + startPos;
int fileRowCount = getRowCount(filename);
int randPos = rand.nextInt(((fileRowCount - 1) - startPos) + 1) + startPos;
return readIndexed(filename, randPos);
}

Expand All @@ -646,7 +657,8 @@ public synchronized String readRandom(String filename, boolean ignoreFirstLine)
*/
public synchronized String readUnique(String filename, boolean ignoreFirstLine, String ooValue, int currPos, int startPos, int endPos) throws IOException {
String line = null;
if(currPos < getRowCount()){
int fileRowCount = getRowCount(filename);
if(currPos < fileRowCount){
line = readIndexed(filename, currPos);
}
if(ooValue.equalsIgnoreCase("Continue Cyclic")){
Expand Down Expand Up @@ -799,6 +811,22 @@ public String[] csvReadLine(String line, char delimiter) throws IOException {
public static int getRowCount() {
return rowCount;
}

/**
* Get the row count for a specific file by its alias.
* Falls back to the global static rowCount if the file is not found.
*
* @param alias the file alias used when reserving the file
* @return the row count for that specific file
*/
public int getRowCount(String alias) {
FileEntry fileEntry = files.get(alias);
if (fileEntry != null && fileEntry.rowCount > 0) {
return fileEntry.rowCount;
}
return rowCount;
}

public static void setRowCount(int count) {
FileServerExtended.rowCount = count;
}
Expand Down