Compare commits

...

4 Commits

Author SHA1 Message Date
Mykhailo Hryb
09cfae4f4d fix(TDI-49793): release streams in tMap 2023-10-25 10:27:53 +03:00
Mykhailo Hryb
c132b1c740 Merge branch 'master' into mhryb/TDI-49793_release_streams_in_tMap 2023-10-24 17:48:00 +03:00
Mykhailo Hryb
27849b0e97 fix(TDI-49793): release streams in tMap 2023-09-20 10:42:18 +03:00
Mykhailo Hryb
362d7d4699 fix(TDI-49793): release streams in tMap 2023-09-20 09:52:09 +03:00
6 changed files with 29 additions and 11 deletions

View File

@@ -125,7 +125,13 @@
);
tHash_Lookup_<%=connectionName%>.initPut();
<% if(!isAllRows) { %>
if(globalMap.get( "tHash_Lookup_<%=connectionName%>" ) != null) {
org.talend.designer.components.lookup.persistent.PersistentSortedLookupManager<<%=connectionName%>Struct> tHash_Lookup_<%=connectionName%>_old =
(org.talend.designer.components.lookup.persistent.PersistentSortedLookupManager<<%=connectionName%>Struct>) globalMap.get( "tHash_Lookup_<%=connectionName%>" );
tHash_Lookup_<%=connectionName%>.setLookupCompleteList(tHash_Lookup_<%=connectionName%>_old.getLookupCompleteList());
}
<% } %>
globalMap.put("tHash_Lookup_<%=connectionName%>", tHash_Lookup_<%=connectionName%>);
<%

View File

@@ -46,7 +46,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar" REQUIRED="true"/>
<IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.6.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.6" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.6.jar" REQUIRED="true"/>
<IMPORT NAME="ApacheCommonsCollection32" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED="true" BundleID=""/>
<IMPORT NAME="Jboss_Marshalling" MODULE="jboss-marshalling-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final" REQUIRED="true"/>
<IMPORT NAME="Jboss_River" MODULE="jboss-marshalling-river-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final" REQUIRED="true"/>

View File

@@ -47,8 +47,8 @@
<IMPORTS>
<IMPORT
NAME="Advanced_Persistent_Lookup"
MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar"
MODULE="advancedPersistentLookupLib-1.6.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.6"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.6.jar"
REQUIRED="true"
/>
<IMPORT

View File

@@ -109,9 +109,9 @@
<IMPORT NAME="Talend_CSV" MODULE="talendcsv-1.1.0.jar" MVN="mvn:org.talend.components/talendcsv/1.1.0" UrlPath="platform:/plugin/org.talend.libraries.csv/lib/talendcsv-1.1.0.jar" REQUIRED="true" />
<IMPORT NAME="Advanced_Persistent_Lookup"
MODULE="advancedPersistentLookupLib-1.5.jar"
MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar"
MODULE="advancedPersistentLookupLib-1.6.jar"
MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.6"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.6.jar"
REQUIRED="true" />
<IMPORT NAME="ApacheCommonsCollection32"
MODULE="commons-collections-3.2.2.jar"

View File

@@ -84,9 +84,9 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Advanced_Persistent_Lookup"
MODULE="advancedPersistentLookupLib-1.5.jar"
MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar"
MODULE="advancedPersistentLookupLib-1.6.jar"
MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.6"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.6.jar"
REQUIRED="true" />
<IMPORT NAME="ApacheCommonsCollection32"
MODULE="commons-collections-3.2.2.jar"

View File

@@ -95,6 +95,16 @@ public class PersistentSortedLookupManager<B extends IPersistableComparableLooku
//
private ILookupManagerUnit<B>[] lookupList;
private List<ILookupManagerUnit<B>> lookupCompleteList = new ArrayList<>();
public List<ILookupManagerUnit<B>> getLookupCompleteList() {
return lookupCompleteList;
}
public void setLookupCompleteList(List<ILookupManagerUnit<B>> lookupCompleteList) {
this.lookupCompleteList = lookupCompleteList;
}
private int bufferSize = 10000000;
private IPersistableLookupRow<B>[] buffer = null;
@@ -382,6 +392,7 @@ public class PersistentSortedLookupManager<B extends IPersistableComparableLooku
}
lookupListSize = lookupList.length;
lookupCompleteList.addAll(Arrays.asList(lookupList));
}
private void writeDescriptors(DataOutputStream valuesDataOutputStream, ObjectOutputStream valuesObjectOutputStream)
@@ -535,11 +546,12 @@ public class PersistentSortedLookupManager<B extends IPersistableComparableLooku
}
public void endGet() throws IOException {
for (ILookupManagerUnit<B> orderedBeanLookup : lookupList) {
for (ILookupManagerUnit<B> orderedBeanLookup : lookupCompleteList) {
orderedBeanLookup.close();
}
clear();
lookupList = null;
lookupCompleteList = null;
}
public void clear() throws IOException {