Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java46
1 files changed, 24 insertions, 22 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
index 584eae4c6e..a9caf0852f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
@@ -450,13 +450,13 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
}
CDOID tag = idHandler.getCDOID(resultSet, 2);
- Object value = getTypeMapping(accessor, tag).readValue(resultSet);
+ Object value = getTypeMapping(tag).readValue(resultSet);
if (TRACER.isEnabled())
{
TRACER.format("Read value for index {0} from result set: {1}", currentIndex, value); //$NON-NLS-1$
}
- list.set(currentIndex++, CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(accessor, tag), value));
+ list.set(currentIndex++, CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(tag), value));
valuesToRead--;
}
@@ -506,9 +506,9 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
}
}
- private void addFeature(IDBStoreAccessor accessor, CDOID tag)
+ private void addFeature(CDOID tag)
{
- EStructuralFeature modelFeature = getFeatureByTag(accessor, tag);
+ EStructuralFeature modelFeature = getFeatureByTag(tag);
ITypeMapping typeMapping = getMappingStrategy().createValueMapping(modelFeature);
String column = CDODBSchema.FEATUREMAP_VALUE + "_" + typeMapping.getDBType(); //$NON-NLS-1$
@@ -580,6 +580,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
baseReader = createBaseChunkReader(chunkReader.getAccessor(), chunkReader.getRevision().getID(),
chunkReader.getRevision().getBranch().getID());
}
+
if (TRACER.isEnabled())
{
TRACER.format(
@@ -594,12 +595,13 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
// now read value and set to chunk
CDOID tag = idHandler.getCDOID(resultSet, 2);
- Object value = getTypeMapping(chunkReader.getAccessor(), tag).readValue(resultSet);
+ Object value = getTypeMapping(tag).readValue(resultSet);
if (TRACER.isEnabled())
{
TRACER.format("ChunkReader read value for index {0} from result set: {1}", nextDBIndex, value); //$NON-NLS-1$
}
- chunk.add(i, CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(chunkReader.getAccessor(), tag), value));
+
+ chunk.add(i, CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(tag), value));
// advance DB cursor and read next available index
if (resultSet.next())
@@ -720,12 +722,12 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
* The feature's MetaID in CDO
* @return the column name where the values are stored
*/
- protected String getColumnName(IDBStoreAccessor accessor, CDOID tag)
+ protected String getColumnName(CDOID tag)
{
String column = tagMap.get(tag);
if (column == null)
{
- addFeature(accessor, tag);
+ addFeature(tag);
column = tagMap.get(tag);
}
@@ -739,12 +741,12 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
* The feature's MetaID in CDO
* @return the corresponding type mapping
*/
- protected ITypeMapping getTypeMapping(IDBStoreAccessor accessor, CDOID tag)
+ protected ITypeMapping getTypeMapping(CDOID tag)
{
ITypeMapping typeMapping = typeMappings.get(tag);
if (typeMapping == null)
{
- addFeature(accessor, tag);
+ addFeature(tag);
typeMapping = typeMappings.get(tag);
}
@@ -755,9 +757,9 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
* @param metaID
* @return the column name where the values are stored
*/
- private EStructuralFeature getFeatureByTag(IDBStoreAccessor accessor, CDOID tag)
+ private EStructuralFeature getFeatureByTag(CDOID tag)
{
- return (EStructuralFeature)getMappingStrategy().getStore().getMetaDataManager().getMetaInstance(accessor, tag);
+ return (EStructuralFeature)getMappingStrategy().getStore().getMetaDataManager().getMetaInstance(tag);
}
/**
@@ -765,9 +767,9 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
* The EStructuralFeature
* @return The feature's MetaID in CDO
*/
- protected CDOID getTagByFeature(IDBStoreAccessor accessor, EStructuralFeature feature, long created)
+ protected CDOID getTagByFeature(EStructuralFeature feature, long created)
{
- return getMappingStrategy().getStore().getMetaDataManager().getMetaID(accessor, feature, created);
+ return getMappingStrategy().getStore().getMetaDataManager().getMetaID(feature, created);
}
/**
@@ -1220,8 +1222,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
{
FeatureMap.Entry entry = (FeatureMap.Entry)value;
EStructuralFeature entryFeature = entry.getEStructuralFeature();
- CDOID tag = getTagByFeature(accessor, entryFeature, timestamp);
- String columnName = getColumnName(accessor, tag);
+ CDOID tag = getTagByFeature(entryFeature, timestamp);
+ String columnName = getColumnName(tag);
stmt = statementCache.getPreparedStatement(sqlInsert, ReuseProbability.HIGH);
@@ -1237,7 +1239,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
{
if (columnNames.get(i).equals(columnName))
{
- getTypeMapping(accessor, tag).setValue(stmt, column++, entry.getValue());
+ getTypeMapping(tag).setValue(stmt, column++, entry.getValue());
}
else
{
@@ -1280,8 +1282,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
{
FeatureMap.Entry entry = (FeatureMap.Entry)value;
EStructuralFeature entryFeature = entry.getEStructuralFeature();
- CDOID tag = getTagByFeature(accessor, entryFeature, timestamp);
- String columnName = getColumnName(accessor, tag);
+ CDOID tag = getTagByFeature(entryFeature, timestamp);
+ String columnName = getColumnName(tag);
stmt = statementCache.getPreparedStatement(sqlInsert, ReuseProbability.HIGH);
@@ -1297,7 +1299,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
{
if (columnNames.get(i).equals(columnName))
{
- getTypeMapping(accessor, tag).setValue(stmt, column++, entry.getValue());
+ getTypeMapping(tag).setValue(stmt, column++, entry.getValue());
}
else
{
@@ -1431,8 +1433,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
if (resultSet.next())
{
CDOID tag = idHandler.getCDOID(resultSet, 1);
- Object value = getTypeMapping(accessor, tag).readValue(resultSet);
- result = CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(accessor, tag), value);
+ Object value = getTypeMapping(tag).readValue(resultSet);
+ result = CDORevisionUtil.createFeatureMapEntry(getFeatureByTag(tag), value);
}
else
{

Back to the top