Updated Branches: refs/heads/trunk 3aaa0295c -> 79c6ecccc
Remove CF.resolve() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79c6eccc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79c6eccc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79c6eccc Branch: refs/heads/trunk Commit: 79c6ecccc0760c2c19d3e83f5815307690ec0bdf Parents: 3aaa029 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Feb 13 11:44:21 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Feb 13 11:44:21 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamily.java | 8 -------- src/java/org/apache/cassandra/db/Mutation.java | 2 +- .../cassandra/db/index/composites/CompositesSearcher.java | 2 +- test/unit/org/apache/cassandra/db/RowTest.java | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c6eccc/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index 66e8e33..3437410 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -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(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c6eccc/src/java/org/apache/cassandra/db/Mutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java index bb7dcef..3663380 100644 --- a/src/java/org/apache/cassandra/db/Mutation.java +++ b/src/java/org/apache/cassandra/db/Mutation.java @@ -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); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c6eccc/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java index fad3d50..41c9f41 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java @@ -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(); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c6eccc/test/unit/org/apache/cassandra/db/RowTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index 4a686c5..9a91285 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -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()); }