natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove CF.resolve()

This commit is contained in:
Aleksey Yeschenko 2014-02-13 11:44:21 +03:00
parent 3aaa0295c8
commit 79c6ecccc0
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/cassandra/db/ColumnFamily.java
View File

@ -389,14 +389,6 @@ public abstract class ColumnFamily implements Iterable<Cell>, IRowCacheEntry
return cf1.diff(cf2);
}
public void resolve(ColumnFamily cf)
{
// Row _does_ allow null CF objects :( seems a necessary evil for efficiency
if (cf == null)
return;
addAll(cf);
}
public ColumnStats getColumnStats()
{
long minTimestampSeen = deletionInfo().isLive() ? Long.MAX_VALUE : deletionInfo().minTimestamp();

2
src/java/org/apache/cassandra/db/Mutation.java
View File

@ -191,7 +191,7 @@ public class Mutation implements IMutation
// not in the case where it wasn't there indeed.
ColumnFamily cf = modifications.put(entry.getKey(), entry.getValue());
if (cf != null)
entry.getValue().resolve(cf);
entry.getValue().addAll(cf);
}
}

2
src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
View File

@ -274,7 +274,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
if (data == null)
data = ArrayBackedSortedColumns.factory.create(baseCfs.metadata);
data.resolve(newData);
data.addAll(newData);
columnsCount += dataFilter.lastCounted();
}
}

2
test/unit/org/apache/cassandra/db/RowTest.java
View File

@ -59,7 +59,7 @@ public class RowTest extends SchemaLoader
cf2.addColumn(column("one", "B", 1));
cf2.addColumn(column("two", "C", 1));
cf1.resolve(cf2);
cf1.addAll(cf2);
assert Arrays.equals(cf1.getColumn(CellNames.simpleDense(ByteBufferUtil.bytes("one"))).value().array(), "B".getBytes());
assert Arrays.equals(cf1.getColumn(CellNames.simpleDense(ByteBufferUtil.bytes("two"))).value().array(), "C".getBytes());
}