Fixed Auto allocate issue

Author: rollno748

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.di.jmeter.ecsv</groupId>
 	<artifactId>di-extended-csv</artifactId>
-	<version>1.0</version>
+	<version>1.1</version>
 
 	<properties>
 		<jmeter-version>5.4.1</jmeter-version>

src/main/java/com/di/jmeter/config/ExtendedCsvDataSet.java

@@ -27,6 +27,7 @@
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.threads.JMeterContext;
+import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jorphan.util.JMeterStopThreadException;
 import org.apache.jorphan.util.JOrphanUtils;
@@ -87,7 +88,7 @@ public void iterationStart(LoopIterationEvent iterEvent) {
 				}catch (IOException e){
 					LOGGER.error(e.toString());
 				}
-				LOGGER.debug("Sequential");
+				LOGGER.debug("Sequential :: " + lineValues);
 				break;
 			case ExtendedCsvDataSetBeanInfo.UNIQUE:
 				try{
@@ -100,7 +101,7 @@ public void iterationStart(LoopIterationEvent iterEvent) {
 				}catch (IOException e){
 					LOGGER.error(e.toString());
 				}
-				LOGGER.debug("Unique");
+				LOGGER.debug("Unique :: " + lineValues);
 				break;
 			case ExtendedCsvDataSetBeanInfo.RANDOM:
 				try{
@@ -113,10 +114,10 @@ public void iterationStart(LoopIterationEvent iterEvent) {
 				}catch(IOException e){
 					LOGGER.error(e.toString());
 				}
-				LOGGER.info("debug");
+				LOGGER.debug("Random :: " + lineValues);
 				break;
 			default:
-				LOGGER.info("Default");
+				LOGGER.debug("Invalid selection on Select row");
 				throw new JMeterStopThreadException("Invalid selection :" + getFilename() + " detected for Extended CSV DataSet:"
 						+ getName() + " configured to Select Row Parameter :" + getSelectRow());
 		}
@@ -141,7 +142,7 @@ public void iterationStart(LoopIterationEvent iterEvent) {
 				}
 				break;
 			default:
-				LOGGER.info("Default");
+				LOGGER.debug("Invalid selection on Update Value");
 				throw new JMeterStopThreadException("Invalid selection :" + getFilename() + " detected for Extended CSV DataSet:"
 						+ getName() + " configured to Select Row Parameter :" + getUpdateValue());
 		}
@@ -150,13 +151,14 @@ public void iterationStart(LoopIterationEvent iterEvent) {
 	private void initBlockFeatures(String filename, JMeterContext context, ExtFileServer fServer, boolean autoAllocate, String blockSize) throws IOException{
 		int blockSizeInt;
 		String threadName = context.getThread().getThreadName();
-		//Integer.parseInt(context.getThread().getThreadName().substring(context.getThread().getThreadName().lastIndexOf('-') + 1)))
-		if(ExtFileServer.getListSize() < 1){
+
+		if(fServer.getListSize() < 1){
 			fServer.reserveFile(filename, getFileEncoding(), alias, ignoreFirstLine);
-			fServer.loadCsv(filename, isIgnoreFirstLine());
+			fServer.loadCsv(filename, ignoreFirstLine);
 		}
+
 		if(autoAllocate){
-			blockSizeInt = ExtFileServer.getListSize() / context.getThreadGroup().getNumberOfThreads();
+			blockSizeInt = ExtFileServer.getListSize() / JMeterContextService.getTotalThreads();
 		}else{
 			blockSizeInt = Integer.parseInt(blockSize);
 		}
@@ -186,7 +188,7 @@ private void initVars(ExtFileServer server, final JMeterContext context, String
 			String header = server.reserveFile(fileName, getFileEncoding(), alias, true);
 			try {
 				variables = CSVSaveService.csvSplitString(header, delim.charAt(0));
-				firstLineIsNames = true;
+				firstLineIsNames = true;ignoreFirstLine = true;
 			} catch (IOException e) {
 				throw new IllegalArgumentException("Could not split CSV header line from file:" + fileName, e);
 			}
@@ -253,7 +255,10 @@ public String getVariableNames() {
 	}
 
 	public void setVariableNames(String variableNames) {
-		this.variableNames = variableNames;
+//		this.variableNames = variableNames;
+		if(!ignoreFirstLine){
+			this.variableNames = variableNames;
+		}
 	}
 
 	public String getDelimiter() {

src/main/java/com/di/jmeter/utils/CSVFileReader.java

@@ -34,16 +34,6 @@ public static CSVFileReader getInstance(){
         return instance;
     }
 
-
-
-    public static int getAutoAllocateBlockSize() {
-        return autoAllocateBlockSize;
-    }
-
-    public static void setAutoAllocateBlockSize(int autoAllocateBlockSize) {
-        CSVFileReader.autoAllocateBlockSize = autoAllocateBlockSize;
-    }
-
     public static List<String> getList() {
         return list;
     }
@@ -52,10 +42,6 @@ public static int getListSize(){
         return list.size();
     }
 
-    public static void setList(List<String> list) {
-        CSVFileReader.list = list;
-    }
-
     public static void addToList(String line){
         CSVFileReader.list.add(line);
     }
@@ -64,4 +50,7 @@ public String getFromList(int index) {
         return CSVFileReader.list.get(index);
     }
 
+    public static void removeList() {
+        CSVFileReader.list.clear();
+    }
 }

src/main/java/com/di/jmeter/utils/ExtFileServer.java

@@ -268,7 +268,7 @@ public synchronized String reserveFile(String filename, String charsetName, Stri
             files.put(alias, fileEntry);
             if (hasHeader) {
                 try {
-                    fileEntry.headerLine = readLine(alias, false);
+                    fileEntry.headerLine = readLine(alias, true);
                     if (fileEntry.headerLine == null) {
                         fileEntry.exception = new EOFException("File is empty: " + fileEntry.file);
                     }
@@ -591,8 +591,6 @@ public void setScriptName(String scriptName) {
         this.scriptName = scriptName;
     }
 
-
-
     public synchronized String readSequential(String filename, boolean ignoreFirstLine, String updateValue, String ooValue) throws IOException {
         boolean recycle = false;
         if(ooValue.equalsIgnoreCase("recycle.continueCyclic")){
@@ -609,9 +607,6 @@ public synchronized String readSequential(String filename, boolean ignoreFirstLi
     public synchronized String getRandomLine(String filename, boolean recycle, boolean ignoreFirstLine) throws IOException {
         CSVFileReader fileReader = CSVFileReader.getInstance();
         SecureRandom random = new SecureRandom();
-        if(fileReader.getListSize() == 0){
-            this.loadCsv(filename, ignoreFirstLine);
-        }
         return fileReader.getFromList(random.nextInt(fileReader.getList().size()));
     }
 
@@ -676,6 +671,10 @@ public synchronized void loadCsv(String filename, boolean ignoreFirstLine) throw
         }
     }
 
+    public static void removeList(){
+        CSVFileReader.removeList();
+    }
+
     public static int getListSize(){
         return CSVFileReader.getListSize();
     }