structurize (normage) exclusion rule

Author: Nolife999

arc-core/src/main/java/fr/insee/arc/core/service/engine/normage/NormageEngine.java

@@ -151,6 +151,7 @@ public void execute() throws Exception {
 
 		} else {
 
+			
 			// split structure blocks
 			String[] ss=jointure.split(XMLComplexeHandlerCharger.JOINXML_STRUCTURE_BLOCK);
 
@@ -218,6 +219,14 @@ public void execute() throws Exception {
 
 	}
 
+	
+	
+	private String normalizeTag (String tag)
+	{
+		return " "+"i_"+tag.toUpperCase()+" ";
+		
+	}
+	
 	@SuppressWarnings("unused")
 	private String optimisation96(String jointure, int subjoinNumber) {
 		StaticLoggerDispatcher.info("optimisation96()", LOGGER);
@@ -272,10 +281,6 @@ private String optimisation96(String jointure, int subjoinNumber) {
 
 		}
 
-		// r=r+"INSERT INTO "+this.tableNormageOKTemp+" SELECT "+fieldsToBeInserted+"
-		// FROM {table_destination}; \n ";
-
-		// bug mémoire : analyze sur les tables générées;
 		StringBuilder analyze = new StringBuilder();
 
 		Pattern p = Pattern.compile("create temporary table ([^ ]+) as ");
@@ -1627,6 +1632,40 @@ private String appliquerRegleReduction(HashMap<String, ArrayList<String>> regle,
 		return jointure;
 	}
 
+	
+	private Integer excludeFileonTimeOut(HashMap<String, ArrayList<String>> regle)
+	{
+		for (int j = 0; j < regle.get("id_regle").size(); j++) {
+			String type = regle.get("id_classe").get(j);
+			if (type.equals("exclusion")) {			
+				return Integer.parseInt(regle.get("rubrique").get(j));
+			}
+		}
+		return null;
+	}
+	
+
+	private String applyQueryPlanParametersOnJointure(String query, Integer statementTimeOut)
+	{
+		return applyQueryPlanParametersOnJointure(new PreparedStatementBuilder(query), statementTimeOut).getQuery().toString();
+	}
+	
+	
+	private PreparedStatementBuilder applyQueryPlanParametersOnJointure(PreparedStatementBuilder query, Integer statementTimeOut)
+	{
+		PreparedStatementBuilder r=new PreparedStatementBuilder();
+		
+		r.append("set enable_nestloop=off;\n");
+		r.append((statementTimeOut==null)?"":"set statement_timeout="+statementTimeOut.toString()+";\n");
+		r.append("commit;");
+		r.append(query);
+		r.append("set enable_nestloop=on;\n");
+		r.append("reset statement_timeout;");
+		
+		r.setQuery(new StringBuilder(r.getQuery().toString().replace(" insert into ", "commit; insert into ")));
+		return r;
+	}
+	
 	/**
 	 * execute query with partition if needed
 	 * @param regle
@@ -1658,9 +1697,7 @@ private void executerJointure(HashMap<String, ArrayList<String>> regle, String n
 
 		// No partition found; normal execution
 		UtilitaireDao.get("arc").executeImmediate(connection,
-				"set enable_nestloop=off;\n"
-				+ replaceQueryParameters(jointure, norme, validite, periodicite, jointure, validiteText, id_source)
-				+ "set enable_nestloop=on;\n"
+				applyQueryPlanParametersOnJointure(replaceQueryParameters(jointure, norme, validite, periodicite, jointure, validiteText, id_source),null)
 				);
 
 	}
@@ -1694,6 +1731,8 @@ private void executerJointureWithPartition(HashMap<String, ArrayList<String>> re
 	String partitionTableName="";
 	String partitionIdentifier=" m_"+element+" ";
 
+	Integer statementTimeOut=excludeFileonTimeOut(regle);
+	
 	if (blocCreate.contains(partitionIdentifier))
 	{
 		// get the tablename
@@ -1725,19 +1764,19 @@ private void executerJointureWithPartition(HashMap<String, ArrayList<String>> re
 	// partition if and only if enough records
 	if (total>=minSize)
 	{	
+		
 		String partitionTableNameWithAllRecords="all_"+partitionTableName;
 
 		// rename the table to split
 		StringBuilder bloc3=new StringBuilder("alter table "+partitionTableName+" rename to "+partitionTableNameWithAllRecords+";");
 		UtilitaireDao.get("arc").executeImmediate(connection,bloc3);
 
 		PreparedStatementBuilder bloc4=new PreparedStatementBuilder();
-		bloc4.append("\n set enable_nestloop=off;\n");
 		bloc4.append("\n drop table if exists "+partitionTableName+";");
 		bloc4.append("\n create temporary table "+partitionTableName+" as select * from "+partitionTableNameWithAllRecords+" where "+partitionIdentifier+">=?::int and "+partitionIdentifier+"<?::int;");
 		bloc4.append(blocInsert);
-		bloc4.append("\n set enable_nestloop=on;\n");
-
+		
+		bloc4=applyQueryPlanParametersOnJointure(bloc4, statementTimeOut);
 
 		// iterate through chunks
 		int iterate=1;
@@ -1753,14 +1792,9 @@ private void executerJointureWithPartition(HashMap<String, ArrayList<String>> re
 
 	}
 	else
+		// no partitions needed
 	{
-		StringBuilder bloc3=new StringBuilder();
-		
-		bloc3.append("\n set enable_nestloop=off;\n");
-		bloc3.append(blocInsert);
-		bloc3.append("\n set enable_nestloop=on;\n");
-		
-		UtilitaireDao.get("arc").executeImmediate(connection,bloc3);
+		UtilitaireDao.get("arc").executeImmediate(connection,applyQueryPlanParametersOnJointure(blocInsert,statementTimeOut));
 	}
 	}
 

arc-core/src/main/resources/BdD/script_global_phase_normage.sql

@@ -25,7 +25,9 @@ CREATE TABLE IF NOT EXISTS arc.ext_type_normage
 ); 
 INSERT INTO arc.ext_type_normage values ('relation','1'),('cartesian','2'),('suppression','3'),('unicité','4') ON CONFLICT DO NOTHING;
 INSERT INTO arc.ext_type_normage values ('reduction','5') ON CONFLICT DO NOTHING;
-INSERT INTO arc.ext_type_normage values ('partition','5') ON CONFLICT DO NOTHING;
+INSERT INTO arc.ext_type_normage values ('partition','6') ON CONFLICT DO NOTHING;
+INSERT INTO arc.ext_type_normage values ('exclusion','7') ON CONFLICT DO NOTHING;
+
 
 do $$ begin CREATE TRIGGER tg_insert_normage BEFORE INSERT ON arc.ihm_normage_regle FOR EACH ROW EXECUTE PROCEDURE arc.insert_controle(); exception when others then end; $$;