midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase max row to 5000 and treat max row loaded the same as all loaded. Minor cleanup.

This commit is contained in:
Heng Sin Low 2011-02-08 11:43:11 +08:00
parent 564457e4ab
commit 10c54e9e1c
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
org.adempiere.base/src/org/compiere/model/MLookup.java
View File

@ -93,7 +93,7 @@ public final class MLookup extends Lookup implements Serializable
/** Inactive Marker End */ /** Inactive Marker End */
public static final String INACTIVE_E = "~"; public static final String INACTIVE_E = "~";
/** Number of max rows to load */ /** Number of max rows to load */
private static final int MAX_ROWS = 10000; private static final int MAX_ROWS = 5000;
/** Indicator for Null */ /** Indicator for Null */
private static Integer MINUS_ONE = new Integer(-1); private static Integer MINUS_ONE = new Integer(-1);
@ -198,32 +198,6 @@ public final class MLookup extends Lookup implements Serializable
return retValue; return retValue;
} }
// Always check for parents - not if we SQL was validated and completely loaded
if (!m_info.IsParent && m_info.IsValidated && m_allLoaded)
{
log.finer(m_info.KeyColumn + ": <NULL> - " + key // + "(" + key.getClass()
+ "; Size=" + m_lookup.size());
// log.finest( m_lookup.keySet().toString(), "ContainsKey = " + m_lookup.containsKey(key));
// also for new values and inactive ones
return getDirect(key, false, true); // cache locally
}
log.finest (m_info.KeyColumn + ": " + key
+ "; Size=" + m_lookup.size() + "; Validated=" + m_info.IsValidated
+ "; All Loaded=" + m_allLoaded + "; HasInactive=" + m_hasInactive);
// never loaded
if (!m_allLoaded
&& m_lookup.size() == 0
&& !m_info.IsCreadedUpdatedBy
&& !m_info.IsParent
&& getDisplayType() != DisplayType.Search)
{
m_loader = new MLoader();
m_loader.run(); // sync!
retValue = (NamePair)m_lookup.get(key);
if (retValue != null)
return retValue;
}
// Try to get it directly // Try to get it directly
boolean cacheLocal = m_info.IsValidated ; boolean cacheLocal = m_info.IsValidated ;
return getDirect(key, false, cacheLocal); // do NOT cache return getDirect(key, false, cacheLocal); // do NOT cache
@ -448,6 +422,8 @@ public final class MLookup extends Lookup implements Serializable
return null; return null;
if (key.equals(m_directNullKey)) if (key.equals(m_directNullKey))
return null; return null;
if (key.toString().trim().length() == 0)
return null;
// //
NamePair directValue = null; NamePair directValue = null;
if (m_lookupDirect != null) // Lookup cache if (m_lookupDirect != null) // Lookup cache
@ -737,11 +713,13 @@ public final class MLookup extends Lookup implements Serializable
boolean isNumber = m_info.KeyColumn.endsWith("_ID"); boolean isNumber = m_info.KeyColumn.endsWith("_ID");
m_hasInactive = false; m_hasInactive = false;
int rows = 0; int rows = 0;
PreparedStatement pstmt = null;
ResultSet rs = null;
try try
{ {
// SELECT Key, Value, Name, IsActive FROM ... // SELECT Key, Value, Name, IsActive FROM ...
PreparedStatement pstmt = DB.prepareStatement(sql, null); pstmt = DB.prepareStatement(sql, null);
ResultSet rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
// Get first ... rows // Get first ... rows
m_allLoaded = true; m_allLoaded = true;
@ -750,7 +728,6 @@ public final class MLookup extends Lookup implements Serializable
if (rows++ > MAX_ROWS) if (rows++ > MAX_ROWS)
{ {
log.warning(m_info.KeyColumn + ": Loader - Too many records"); log.warning(m_info.KeyColumn + ": Loader - Too many records");
m_allLoaded = false;
break; break;
} }
// check for interrupted every 10 rows // check for interrupted every 10 rows
@ -779,12 +756,14 @@ public final class MLookup extends Lookup implements Serializable
} }
// log.fine( m_info.KeyColumn + ": " + name); // log.fine( m_info.KeyColumn + ": " + name);
} }
rs.close();
pstmt.close();
} }
catch (SQLException e) catch (SQLException e)
{ {
log.log(Level.SEVERE, m_info.KeyColumn + ", " + m_info.Column_ID + " : Loader - " + sql, e); log.log(Level.SEVERE, m_info.KeyColumn + ", " + m_info.Column_ID + " : Loader - " + sql, e);
m_allLoaded = false;
}
finally {
DB.close(rs, pstmt);
} }
int size = m_lookup.size(); int size = m_lookup.size();
log.finer(m_info.KeyColumn log.finer(m_info.KeyColumn