Better indexing for string properties to support path-based lookups

- Normal prefix-index has been shortened to 32 chars (from 64)
 - Added a fully indexed 'string_end' column of 16 characters
 - iBatis queries are optimized to pull short strings from the index
 - Long paths and NodeRefs are well-indexed using this approach


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-08-20 13:03:29 +00:00
parent f1e5670836
commit 33cb2a4d75
5 changed files with 91 additions and 41 deletions

View File

@@ -423,18 +423,6 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
*/
private class PropertyStringValueCallbackDAO extends EntityLookupCallbackDAOAdaptor<Long, String, Pair<String, Long>>
{
private final Pair<Long, String> convertEntityToPair(PropertyStringValueEntity entity)
{
if (entity == null)
{
return null;
}
else
{
return entity.getEntityPair();
}
}
public Pair<String, Long> getValueKey(String value)
{
return CrcHelper.getStringCrcPair(value, 128, true, true);
@@ -442,26 +430,40 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
public Pair<Long, String> createValue(String value)
{
PropertyStringValueEntity entity = createStringValue(value);
return convertEntityToPair(entity);
Long key = createStringValue(value);
return new Pair<Long, String>(key, value);
}
public Pair<Long, String> findByKey(Long key)
{
PropertyStringValueEntity entity = findStringValueById(key);
return convertEntityToPair(entity);
String value = findStringValueById(key);
if (value == null)
{
return null;
}
else
{
return new Pair<Long, String>(key, value);
}
}
public Pair<Long, String> findByValue(String value)
{
PropertyStringValueEntity entity = findStringValueByValue(value);
return convertEntityToPair(entity);
Long key = findStringValueByValue(value);
if (key == null)
{
return null;
}
else
{
return new Pair<Long, String>(key, value);
}
}
}
protected abstract PropertyStringValueEntity findStringValueById(Long id);
protected abstract PropertyStringValueEntity findStringValueByValue(String value);
protected abstract PropertyStringValueEntity createStringValue(String value);
protected abstract String findStringValueById(Long id);
protected abstract Long findStringValueByValue(String value);
protected abstract Long createStringValue(String value);
//================================
// 'alf_prop_double_value' accessors

View File

@@ -37,6 +37,7 @@ public class PropertyStringValueEntity
{
private Long id;
private String stringValue;
private String stringEnd;
public PropertyStringValueEntity()
{
@@ -81,6 +82,23 @@ public class PropertyStringValueEntity
{
return new Pair<Long, String>(id, stringValue);
}
/**
* Set the string and string-end values
*/
public void setValue(String value)
{
this.stringValue = value;
int len = stringValue.length();
if (len > 16)
{
stringEnd = stringValue.substring(len - 16);
}
else
{
stringEnd = stringValue;
}
}
public Long getId()
{
@@ -101,4 +119,14 @@ public class PropertyStringValueEntity
{
this.stringValue = stringValue;
}
public String getStringEnd()
{
return stringEnd;
}
public void setStringEnd(String stringEnd)
{
this.stringEnd = stringEnd;
}
}

View File

@@ -157,34 +157,34 @@ public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl
//================================
@Override
protected PropertyStringValueEntity findStringValueById(Long id)
protected String findStringValueById(Long id)
{
PropertyStringValueEntity entity = new PropertyStringValueEntity();
entity.setId(id);
entity = (PropertyStringValueEntity) template.queryForObject(
String value = (String) template.queryForObject(
SELECT_PROPERTY_STRING_VALUE_BY_ID,
entity);
// Done
return entity;
return value;
}
@SuppressWarnings("unchecked")
@Override
protected PropertyStringValueEntity findStringValueByValue(String value)
protected Long findStringValueByValue(String value)
{
PropertyStringValueEntity entity = new PropertyStringValueEntity();
entity.setStringValue(value);
entity.setValue(value);
List<PropertyStringValueEntity> results = (List<PropertyStringValueEntity>) template.queryForList(
SELECT_PROPERTY_STRING_VALUE_BY_VALUE,
entity);
// There double be several matches (if the database is case-insensitive), so find the first
// There could be several matches (if the database is case-insensitive), so find the first
// value that matches exactly.
for (PropertyStringValueEntity resultEntity : results)
{
if (value.equals(resultEntity.getStringValue()))
{
// Found a match
return resultEntity;
return resultEntity.getId();
}
}
// No real match
@@ -192,14 +192,13 @@ public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl
}
@Override
protected PropertyStringValueEntity createStringValue(String value)
protected Long createStringValue(String value)
{
PropertyStringValueEntity entity = new PropertyStringValueEntity();
entity.setStringValue(value);
entity.setValue(value);
Long id = (Long) template.insert(INSERT_PROPERTY_STRING_VALUE, entity);
entity.setId(id);
// Done
return entity;
return id;
}
//================================