fix: test -> parquet support musn't trigger when parquet not required

InseeFr · Sep 12, 2024 · d6ed426 · d6ed426
1 parent 0820e4a
commit d6ed426
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/...java/fr/insee/arc/ws/services/importServlet/ImportStep1InitializeClientTablesService.java b/...java/fr/insee/arc/ws/services/importServlet/ImportStep1InitializeClientTablesService.java
@@ -72,7 +72,9 @@ public void execute(SendResponse resp) throws ArcException {
 		}
 
 		// drop tables from the client that had been requested from a former call
-		this.clientDao.dropPendingClientObjects();
+		this.clientDao.dropPendingClientTables();
+
+		executeIfParquetDeclared(() -> this.clientDao.deletePendingClientParquet());
 
 		// create the table that will track the data table which has been built and retrieved
 		createTrackTable();

diff --git a/.../src/main/java/fr/insee/arc/ws/services/importServlet/ImportStep3GetTableDataService.java b/.../src/main/java/fr/insee/arc/ws/services/importServlet/ImportStep3GetTableDataService.java
@@ -43,7 +43,10 @@ public void execute(SendResponse resp) throws ArcException {
 
 		if (this.clientDao.isWebServiceNotPending()) {
 			this.clientDao.dropTable(table);
-			this.clientDao.deleteParquet(table);
+
+			if (arcClientIdentifier.getFormat().isParquet())
+				this.clientDao.deleteParquet(table);
+
 			this.clientDao.deleteFromTrackTable(table.getTableName());
 
 			LoggerHelper.info(LOGGER, "Table " + table.getTableName() + " had been retrieved and dropped.");

diff --git a/arc-ws/src/main/java/fr/insee/arc/ws/services/importServlet/dao/ClientDao.java b/arc-ws/src/main/java/fr/insee/arc/ws/services/importServlet/dao/ClientDao.java
@@ -485,29 +485,14 @@ private String regExpClientTable()
 		return client + "_([0123456789]{13,})_.*";
 	}
 
-
-	/**
-	 * drop objects generated by a client for called
-	 * @throws ArcException
-	 */
-	public void dropPendingClientObjects() throws ArcException
-	{
-		LoggerHelper.info(LOGGER, "Dropping all client objects for client : "+this.client);
-
-		// drop tables from the client that had been requested from a former call
-		dropPendingClientTables();
-
-		// drop parquet files that had been requested from a former call
-		deletePendingParquet();
-	}
-
-
 	/**
 	 * drop tables on coordinator and executors if it exists
 	 * @throws ArcException
 	 */
-	private void dropPendingClientTables() throws ArcException
+	public void dropPendingClientTables() throws ArcException
 	{
+		LoggerHelper.info(LOGGER, "Dropping all pending tables for client : "+this.client);
+
 		dropPendingClientTables(0);
 
 		int numberOfExecutorNods = ArcDatabase.numberOfExecutorNods();
@@ -665,8 +650,11 @@ public void deleteParquet(TableToRetrieve table) throws ArcException {
 		FileUtilsArc.deleteIfExists(new File(ParquetDao.exportTablePath(table,getParquetDirectory())));
 	}
 
-	private void deletePendingParquet() throws ArcException
+	public void deletePendingClientParquet() throws ArcException
 	{
+
+		LoggerHelper.info(LOGGER, "Delete all pending parquet files for client : "+this.client);
+
 		File parquetDirectory = new File(getParquetDirectory());
 
 		if (!parquetDirectory.exists())