Updated Branches: refs/heads/trunk 362cc0535 -> e50d6af12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java deleted file mode 100644 index e112b1b..0000000 --- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java +++ /dev/null @@ -1,100 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ -package org.apache.cassandra.db; - -import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; - -import org.junit.Test; - -import static org.junit.Assert.assertNull; -import org.apache.cassandra.db.composites.*; -import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.db.marshal.CompositeType; -import static org.apache.cassandra.Util.getBytes; -import org.apache.cassandra.Util; -import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.utils.ByteBufferUtil; - -import com.google.common.util.concurrent.Uninterruptibles; - - -public class RemoveSubColumnTest extends SchemaLoader -{ - @Test - public void testRemoveSubColumn() - { - Keyspace keyspace = Keyspace.open("Keyspace1"); - ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super1"); - RowMutation rm; - DecoratedKey dk = Util.dk("key1"); - - // add data - rm = new RowMutation("Keyspace1", dk.key); - Util.addMutation(rm, "Super1", "SC1", 1, "asdf", 0); - rm.apply(); - store.forceBlockingFlush(); - - CellName cname = CellNames.compositeDense(ByteBufferUtil.bytes("SC1"), getBytes(1L)); - // remove - rm = new RowMutation("Keyspace1", dk.key); - rm.delete("Super1", cname, 1); - rm.apply(); - - ColumnFamily retrieved = store.getColumnFamily(QueryFilter.getIdentityFilter(dk, "Super1", System.currentTimeMillis())); - assert retrieved.getColumn(cname).isMarkedForDelete(System.currentTimeMillis()); - assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE)); - } - - @Test - public void testRemoveSubColumnAndContainer() - { - Keyspace keyspace = Keyspace.open("Keyspace1"); - ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super1"); - RowMutation rm; - DecoratedKey dk = Util.dk("key2"); - - // add data - rm = new RowMutation("Keyspace1", dk.key); - Util.addMutation(rm, "Super1", "SC1", 1, "asdf", 0); - rm.apply(); - store.forceBlockingFlush(); - - // remove the SC - ByteBuffer scName = ByteBufferUtil.bytes("SC1"); - CellName cname = CellNames.compositeDense(scName, getBytes(1L)); - rm = new RowMutation("Keyspace1", dk.key); - rm.deleteRange("Super1", SuperColumns.startOf(scName), SuperColumns.endOf(scName), 1); - rm.apply(); - - // Mark current time and make sure the next insert happens at least - // one second after the previous one (since gc resolution is the second) - QueryFilter filter = QueryFilter.getIdentityFilter(dk, "Super1", System.currentTimeMillis()); - Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); - - // remove the column itself - rm = new RowMutation("Keyspace1", dk.key); - rm.delete("Super1", cname, 2); - rm.apply(); - - ColumnFamily retrieved = store.getColumnFamily(filter); - assert retrieved.getColumn(cname).isMarkedForDelete(System.currentTimeMillis()); - assertNull(Util.cloneAndRemoveDeleted(retrieved, Integer.MAX_VALUE)); - } -} http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/RowCacheTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java index 6c3a620..238f61e 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java @@ -72,15 +72,15 @@ public class RowCacheTest extends SchemaLoader assert CacheService.instance.rowCache.size() == i + 1; assert cachedStore.containsCachedRow(key); // current key should be stored in the cache - // checking if column is read correctly after cache + // checking if cell is read correctly after cache ColumnFamily cf = cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis()); - Collection<Column> columns = cf.getSortedColumns(); + Collection<Cell> cells = cf.getSortedColumns(); - Column column = columns.iterator().next(); + Cell cell = cells.iterator().next(); - assert columns.size() == 1; - assert column.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i)); - assert column.value().equals(ByteBufferUtil.bytes("val" + i)); + assert cells.size() == 1; + assert cell.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i)); + assert cell.value().equals(ByteBufferUtil.bytes("val" + i)); } // insert 10 more keys @@ -93,15 +93,15 @@ public class RowCacheTest extends SchemaLoader cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis()); assert cachedStore.containsCachedRow(key); // cache should be populated with the latest rows read (old ones should be popped) - // checking if column is read correctly after cache + // checking if cell is read correctly after cache ColumnFamily cf = cachedStore.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false, 1, System.currentTimeMillis()); - Collection<Column> columns = cf.getSortedColumns(); + Collection<Cell> cells = cf.getSortedColumns(); - Column column = columns.iterator().next(); + Cell cell = cells.iterator().next(); - assert columns.size() == 1; - assert column.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i)); - assert column.value().equals(ByteBufferUtil.bytes("val" + i)); + assert cells.size() == 1; + assert cell.name().toByteBuffer().equals(ByteBufferUtil.bytes("col" + i)); + assert cell.value().equals(ByteBufferUtil.bytes("val" + i)); } // clear 100 rows from the cache http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/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 d770a6c..d5d22c0 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -67,7 +67,7 @@ public class RowTest extends SchemaLoader @Test public void testExpiringColumnExpiration() { - Column c = new ExpiringColumn(CellNames.simpleDense(ByteBufferUtil.bytes("one")), ByteBufferUtil.bytes("A"), 0, 1); + Cell c = new ExpiringCell(CellNames.simpleDense(ByteBufferUtil.bytes("one")), ByteBufferUtil.bytes("A"), 0, 1); assert !c.isMarkedForDelete(System.currentTimeMillis()); // Because we keep the local deletion time with a precision of a http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index a83d3c6..614858d 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -129,7 +129,7 @@ public class ScrubTest extends SchemaLoader * The test also assumes an ordered partitioner. * ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfs.metadata); - cf.addColumn(new Column(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L)); + cf.addColumn(new Cell(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L)); SSTableWriter writer = new SSTableWriter(cfs.getTempSSTablePath(new File(System.getProperty("corrupt-sstable-root"))), cfs.metadata.getIndexInterval(), http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java new file mode 100644 index 0000000..940a565 --- /dev/null +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java @@ -0,0 +1,230 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ +package org.apache.cassandra.db; + +import java.nio.ByteBuffer; +import java.util.Set; + +import org.junit.Test; + +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.db.composites.*; +import org.apache.cassandra.db.index.PerColumnSecondaryIndex; +import org.apache.cassandra.db.index.PerRowSecondaryIndex; +import org.apache.cassandra.db.index.SecondaryIndexSearcher; +import org.apache.cassandra.utils.ByteBufferUtil; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class SecondaryIndexCellSizeTest +{ + @Test + public void test64kColumn() + { + // a byte buffer more than 64k + ByteBuffer buffer = ByteBuffer.allocate(1024 * 65); + buffer.clear(); + + //read more than 64k + for (int i=0; i<1024*64/4 + 1; i++) + buffer.putInt(0); + + // for read + buffer.flip(); + Cell cell = new Cell(CellNames.simpleDense(ByteBufferUtil.bytes("test")), buffer, 0); + + SecondaryIndexCellSizeTest.MockRowIndex mockRowIndex = new SecondaryIndexCellSizeTest.MockRowIndex(); + SecondaryIndexCellSizeTest.MockColumnIndex mockColumnIndex = new SecondaryIndexCellSizeTest.MockColumnIndex(); + + assertTrue(mockRowIndex.validate(cell)); + assertFalse(mockColumnIndex.validate(cell)); + + // test less than 64k value + buffer.flip(); + buffer.clear(); + buffer.putInt(20); + buffer.flip(); + + assertTrue(mockRowIndex.validate(cell)); + assertTrue(mockColumnIndex.validate(cell)); + } + + private class MockRowIndex extends PerRowSecondaryIndex + { + @Override + public void init() + { + } + + @Override + public void validateOptions() throws ConfigurationException + { + } + + @Override + public String getIndexName() + { + return null; + } + + @Override + protected SecondaryIndexSearcher createSecondaryIndexSearcher(Set<ByteBuffer> columns) + { + return null; + } + + @Override + public void forceBlockingFlush() + { + } + + @Override + public long getLiveSize() + { + return 0; + } + + @Override + public ColumnFamilyStore getIndexCfs() + { + return null; + } + + @Override + public void removeIndex(ByteBuffer columnName) + { + } + + @Override + public void invalidate() + { + } + + @Override + public void truncateBlocking(long truncatedAt) + { + } + + public void index(ByteBuffer rowKey, ColumnFamily cf) + { + } + + public void index(ByteBuffer rowKey) + { + } + + public void delete(DecoratedKey key) + { + } + + @Override + public void reload() + { + } + + public boolean indexes(CellName name) + { + return true; + } + } + + + private class MockColumnIndex extends PerColumnSecondaryIndex + { + @Override + public void init() + { + } + + @Override + public void validateOptions() throws ConfigurationException + { + } + + @Override + public String getIndexName() + { + return null; + } + + @Override + protected SecondaryIndexSearcher createSecondaryIndexSearcher(Set<ByteBuffer> columns) + { + return null; + } + + @Override + public void forceBlockingFlush() + { + } + + @Override + public long getLiveSize() + { + return 0; + } + + @Override + public ColumnFamilyStore getIndexCfs() + { + return null; + } + + @Override + public void removeIndex(ByteBuffer columnName) + { + } + + @Override + public void invalidate() + { + } + + @Override + public void truncateBlocking(long truncatedAt) + { + } + + @Override + public void delete(ByteBuffer rowKey, Cell col) + { + } + + @Override + public void insert(ByteBuffer rowKey, Cell col) + { + } + + @Override + public void update(ByteBuffer rowKey, Cell col) + { + } + + @Override + public void reload() + { + } + + public boolean indexes(CellName name) + { + return true; + } + } +} http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java deleted file mode 100644 index 0dbc12a..0000000 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java +++ /dev/null @@ -1,230 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ -package org.apache.cassandra.db; - -import java.nio.ByteBuffer; -import java.util.Set; - -import org.junit.Test; - -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.db.composites.*; -import org.apache.cassandra.db.index.PerColumnSecondaryIndex; -import org.apache.cassandra.db.index.PerRowSecondaryIndex; -import org.apache.cassandra.db.index.SecondaryIndexSearcher; -import org.apache.cassandra.utils.ByteBufferUtil; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class SecondaryIndexColumnSizeTest -{ - @Test - public void test64kColumn() - { - // a byte buffer more than 64k - ByteBuffer buffer = ByteBuffer.allocate(1024 * 65); - buffer.clear(); - - //read more than 64k - for (int i=0; i<1024*64/4 + 1; i++) - buffer.putInt(0); - - // for read - buffer.flip(); - Column column = new Column(CellNames.simpleDense(ByteBufferUtil.bytes("test")), buffer, 0); - - SecondaryIndexColumnSizeTest.MockRowIndex mockRowIndex = new SecondaryIndexColumnSizeTest.MockRowIndex(); - SecondaryIndexColumnSizeTest.MockColumnIndex mockColumnIndex = new SecondaryIndexColumnSizeTest.MockColumnIndex(); - - assertTrue(mockRowIndex.validate(column)); - assertFalse(mockColumnIndex.validate(column)); - - // test less than 64k value - buffer.flip(); - buffer.clear(); - buffer.putInt(20); - buffer.flip(); - - assertTrue(mockRowIndex.validate(column)); - assertTrue(mockColumnIndex.validate(column)); - } - - private class MockRowIndex extends PerRowSecondaryIndex - { - @Override - public void init() - { - } - - @Override - public void validateOptions() throws ConfigurationException - { - } - - @Override - public String getIndexName() - { - return null; - } - - @Override - protected SecondaryIndexSearcher createSecondaryIndexSearcher(Set<ByteBuffer> columns) - { - return null; - } - - @Override - public void forceBlockingFlush() - { - } - - @Override - public long getLiveSize() - { - return 0; - } - - @Override - public ColumnFamilyStore getIndexCfs() - { - return null; - } - - @Override - public void removeIndex(ByteBuffer columnName) - { - } - - @Override - public void invalidate() - { - } - - @Override - public void truncateBlocking(long truncatedAt) - { - } - - public void index(ByteBuffer rowKey, ColumnFamily cf) - { - } - - public void index(ByteBuffer rowKey) - { - } - - public void delete(DecoratedKey key) - { - } - - @Override - public void reload() - { - } - - public boolean indexes(CellName name) - { - return true; - } - } - - - private class MockColumnIndex extends PerColumnSecondaryIndex - { - @Override - public void init() - { - } - - @Override - public void validateOptions() throws ConfigurationException - { - } - - @Override - public String getIndexName() - { - return null; - } - - @Override - protected SecondaryIndexSearcher createSecondaryIndexSearcher(Set<ByteBuffer> columns) - { - return null; - } - - @Override - public void forceBlockingFlush() - { - } - - @Override - public long getLiveSize() - { - return 0; - } - - @Override - public ColumnFamilyStore getIndexCfs() - { - return null; - } - - @Override - public void removeIndex(ByteBuffer columnName) - { - } - - @Override - public void invalidate() - { - } - - @Override - public void truncateBlocking(long truncatedAt) - { - } - - @Override - public void delete(ByteBuffer rowKey, Column col) - { - } - - @Override - public void insert(ByteBuffer rowKey, Column col) - { - } - - @Override - public void update(ByteBuffer rowKey, Column col) - { - } - - @Override - public void reload() - { - } - - public boolean indexes(CellName name) - { - return true; - } - } -} http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java index 7b7edfa..e3a6077 100644 --- a/test/unit/org/apache/cassandra/db/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java @@ -24,7 +24,6 @@ import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; @@ -377,21 +376,21 @@ public class SerializationsTest extends AbstractSerializationsTester private Statics() { - StandardCf.addColumn(new Column(cn("aaaa"))); - StandardCf.addColumn(new Column(cn("bbbb"), bb("bbbbb-value"))); - StandardCf.addColumn(new Column(cn("cccc"), bb("ccccc-value"), 1000L)); - StandardCf.addColumn(new DeletedColumn(cn("dddd"), 500, 1000)); - StandardCf.addColumn(new DeletedColumn(cn("eeee"), bb("eeee-value"), 1001)); - StandardCf.addColumn(new ExpiringColumn(cn("ffff"), bb("ffff-value"), 2000, 1000)); - StandardCf.addColumn(new ExpiringColumn(cn("gggg"), bb("gggg-value"), 2001, 1000, 2002)); - - SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("aaaa")))); - SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("bbbb")), bb("bbbbb-value"))); - SuperCf.addColumn(new Column(CellNames.compositeDense(SC, bb("cccc")), bb("ccccc-value"), 1000L)); - SuperCf.addColumn(new DeletedColumn(CellNames.compositeDense(SC, bb("dddd")), 500, 1000)); - SuperCf.addColumn(new DeletedColumn(CellNames.compositeDense(SC, bb("eeee")), bb("eeee-value"), 1001)); - SuperCf.addColumn(new ExpiringColumn(CellNames.compositeDense(SC, bb("ffff")), bb("ffff-value"), 2000, 1000)); - SuperCf.addColumn(new ExpiringColumn(CellNames.compositeDense(SC, bb("gggg")), bb("gggg-value"), 2001, 1000, 2002)); + StandardCf.addColumn(new Cell(cn("aaaa"))); + StandardCf.addColumn(new Cell(cn("bbbb"), bb("bbbbb-value"))); + StandardCf.addColumn(new Cell(cn("cccc"), bb("ccccc-value"), 1000L)); + StandardCf.addColumn(new DeletedCell(cn("dddd"), 500, 1000)); + StandardCf.addColumn(new DeletedCell(cn("eeee"), bb("eeee-value"), 1001)); + StandardCf.addColumn(new ExpiringCell(cn("ffff"), bb("ffff-value"), 2000, 1000)); + StandardCf.addColumn(new ExpiringCell(cn("gggg"), bb("gggg-value"), 2001, 1000, 2002)); + + SuperCf.addColumn(new Cell(CellNames.compositeDense(SC, bb("aaaa")))); + SuperCf.addColumn(new Cell(CellNames.compositeDense(SC, bb("bbbb")), bb("bbbbb-value"))); + SuperCf.addColumn(new Cell(CellNames.compositeDense(SC, bb("cccc")), bb("ccccc-value"), 1000L)); + SuperCf.addColumn(new DeletedCell(CellNames.compositeDense(SC, bb("dddd")), 500, 1000)); + SuperCf.addColumn(new DeletedCell(CellNames.compositeDense(SC, bb("eeee")), bb("eeee-value"), 1001)); + SuperCf.addColumn(new ExpiringCell(CellNames.compositeDense(SC, bb("ffff")), bb("ffff-value"), 2000, 1000)); + SuperCf.addColumn(new ExpiringCell(CellNames.compositeDense(SC, bb("gggg")), bb("gggg-value"), 2001, 1000, 2002)); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/TimeSortTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java index a4daf4f..f8e9dbc 100644 --- a/test/unit/org/apache/cassandra/db/TimeSortTest.java +++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import java.util.*; @@ -33,7 +32,6 @@ import org.apache.cassandra.Util; import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.utils.ByteBufferUtil; @@ -57,8 +55,8 @@ public class TimeSortTest extends SchemaLoader rm.apply(); ColumnFamily cf = cfStore.getColumnFamily(key, cellname(10), Composites.EMPTY, false, 1000, System.currentTimeMillis()); - Collection<Column> columns = cf.getSortedColumns(); - assert columns.size() == 1; + Collection<Cell> cells = cf.getSortedColumns(); + assert cells.size() == 1; } @Test @@ -98,14 +96,14 @@ public class TimeSortTest extends SchemaLoader // verify ColumnFamily cf = cfStore.getColumnFamily(key, cellname(0), Composites.EMPTY, false, 1000, System.currentTimeMillis()); - Collection<Column> columns = cf.getSortedColumns(); - assertEquals(12, columns.size()); - Iterator<Column> iter = columns.iterator(); - Column column; + Collection<Cell> cells = cf.getSortedColumns(); + assertEquals(12, cells.size()); + Iterator<Cell> iter = cells.iterator(); + Cell cell; for (int j = 0; j < 8; j++) { - column = iter.next(); - assert column.name().toByteBuffer().equals(getBytes(j)); + cell = iter.next(); + assert cell.name().toByteBuffer().equals(getBytes(j)); } TreeSet<CellName> columnNames = new TreeSet<CellName>(cfStore.getComparator()); columnNames.add(cellname(10)); @@ -124,10 +122,10 @@ public class TimeSortTest extends SchemaLoader { ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardLong1"); ColumnFamily cf = cfs.getColumnFamily(key, cellname(j * 2), Composites.EMPTY, false, 1000, System.currentTimeMillis()); - Collection<Column> columns = cf.getSortedColumns(); - assert columns.size() == 8 - j; + Collection<Cell> cells = cf.getSortedColumns(); + assert cells.size() == 8 - j; int k = j; - for (Column c : columns) + for (Cell c : cells) { assertEquals((k++) * 2, c.timestamp()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index c5f5483..03a8c71 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@ -23,11 +23,11 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.apache.cassandra.db.Cell; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.Column; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RowMutation; @@ -277,7 +277,7 @@ public class CompactionsPurgeTest extends SchemaLoader // Check that the second insert did went in ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(key, cfName, System.currentTimeMillis())); assertEquals(10, cf.getColumnCount()); - for (Column c : cf) + for (Cell c : cf) assert !c.isMarkedForDelete(System.currentTimeMillis()); } @@ -321,7 +321,7 @@ public class CompactionsPurgeTest extends SchemaLoader // Check that the second insert went in cf = cfs.getColumnFamily(filter); assertEquals(10, cf.getColumnCount()); - for (Column c : cf) + for (Cell c : cf) assert !c.isMarkedForDelete(System.currentTimeMillis()); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java index 7b422b2..a4fb875 100644 --- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java @@ -90,9 +90,9 @@ public class PerRowSecondaryIndexTest extends SchemaLoader ColumnFamily indexedRow = PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_ROW; assertNotNull(indexedRow); - for (Column column : indexedRow.getSortedColumns()) + for (Cell cell : indexedRow.getSortedColumns()) { - assertTrue(column.isMarkedForDelete(System.currentTimeMillis())); + assertTrue(cell.isMarkedForDelete(System.currentTimeMillis())); } assertTrue(Arrays.equals("k2".getBytes(), PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_KEY.array())); } @@ -108,9 +108,9 @@ public class PerRowSecondaryIndexTest extends SchemaLoader ColumnFamily indexedRow = PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_ROW; assertNotNull(indexedRow); - for (Column column : indexedRow.getSortedColumns()) + for (Cell cell : indexedRow.getSortedColumns()) { - assertTrue(column.isMarkedForDelete(System.currentTimeMillis())); + assertTrue(cell.isMarkedForDelete(System.currentTimeMillis())); } assertTrue(Arrays.equals("k3".getBytes(), PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_KEY.array())); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index b7452b1..ac85ccf 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -184,7 +184,7 @@ public class CompositeTypeTest extends SchemaLoader ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), cfName, System.currentTimeMillis())); - Iterator<Column> iter = cf.getSortedColumns().iterator(); + Iterator<Cell> iter = cf.getSortedColumns().iterator(); assert iter.next().name().toByteBuffer().equals(cname1); assert iter.next().name().toByteBuffer().equals(cname2); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index fd489ed..15b7650 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -183,7 +183,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("k"), cfName, System.currentTimeMillis())); - Iterator<Column> iter = cf.getSortedColumns().iterator(); + Iterator<Cell> iter = cf.getSortedColumns().iterator(); assert iter.next().name().toByteBuffer().equals(cname1); assert iter.next().name().toByteBuffer().equals(cname2); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java index 94cc2d4..385c06b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java @@ -32,7 +32,6 @@ import org.apache.cassandra.Util; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.metrics.RestorableMeter; -import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL; import static org.apache.cassandra.io.sstable.Downsampling.MIN_SAMPLING_LEVEL; @@ -78,9 +77,9 @@ public class IndexSummaryManagerTest extends SchemaLoader QueryFilter filter = QueryFilter.getIdentityFilter(key, cfs.getColumnFamilyName(), System.currentTimeMillis()); ColumnFamily row = cfs.getColumnFamily(filter); assertNotNull(row); - Column column = row.getColumn(Util.cellname("column")); - assertNotNull(column); - assertEquals(100, column.value().array().length); + Cell cell = row.getColumn(Util.cellname("cell")); + assertNotNull(cell); + assertEquals(100, cell.value().array().length); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java index b61dc4c..9aaeca5 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java @@ -92,9 +92,9 @@ public class SSTableSimpleWriterTest extends SchemaLoader ColumnFamily cf = Util.getColumnFamily(t, Util.dk("Key10"), cfname); assert cf.getColumnCount() == INC * NBCOL : "expecting " + (INC * NBCOL) + " columns, got " + cf.getColumnCount(); int i = 0; - for (Column c : cf) + for (Cell c : cf) { - assert toInt(c.name().toByteBuffer()) == i : "Column name should be " + i + ", got " + toInt(c.name().toByteBuffer()); + assert toInt(c.name().toByteBuffer()) == i : "Cell name should be " + i + ", got " + toInt(c.name().toByteBuffer()); assert c.value().equals(bytes("v")); assert c.timestamp() == 1; ++i; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java index f7687c1..561b36c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java @@ -36,11 +36,11 @@ public class SSTableUtils public static String KEYSPACENAME = "Keyspace1"; public static String CFNAME = "Standard1"; - public static ColumnFamily createCF(long mfda, int ldt, Column... cols) + public static ColumnFamily createCF(long mfda, int ldt, Cell... cols) { ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(KEYSPACENAME, CFNAME); cf.delete(new DeletionInfo(mfda, ldt)); - for (Column col : cols) + for (Cell col : cols) cf.addColumn(col); return cf; } @@ -98,9 +98,9 @@ public class SSTableUtils // iterate columns while (lhs.hasNext()) { - Column clhs = (Column)lhs.next(); + Cell clhs = (Cell)lhs.next(); assert rhs.hasNext() : "LHS contained more columns than RHS for " + lhs.getKey(); - Column crhs = (Column)rhs.next(); + Cell crhs = (Cell)rhs.next(); assertEquals("Mismatched columns for " + lhs.getKey(), clhs, crhs); } @@ -163,7 +163,7 @@ public class SSTableUtils for (String key : keys) { ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(ksname, cfname); - cf.addColumn(new Column(Util.cellname(key), ByteBufferUtil.bytes(key), 0)); + cf.addColumn(new Cell(Util.cellname(key), ByteBufferUtil.bytes(key), 0)); map.put(key, cf); } return write(map); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/service/QueryPagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java index 0d0efb9..9e28fe6 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -108,7 +108,7 @@ public class QueryPagerTest extends SchemaLoader return ""; StringBuilder sb = new StringBuilder(); - for (Column c : cf) + for (Cell c : cf) sb.append(" ").append(string(c.name())); return sb.toString(); } @@ -153,7 +153,7 @@ public class QueryPagerTest extends SchemaLoader assertNotNull(r.cf); assertEquals(toString(r.cf), names.length, r.cf.getColumnCount()); int i = 0; - for (Column c : r.cf) + for (Cell c : r.cf) { String expected = names[i++]; assertEquals("column " + i + " doesn't match: " + toString(r.cf), expected, string(c.name())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 1da33fc..412d9d0 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -229,7 +229,7 @@ public class StreamingTransferTest extends SchemaLoader long val = key.hashCode(); ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(keyspace.getName(), cfs.name); cf.addColumn(column(col, "v", timestamp)); - cf.addColumn(new Column(cellname("birthdate"), ByteBufferUtil.bytes(val), timestamp)); + cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(val), timestamp)); RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes(key), cf); logger.debug("Applying row to transfer " + rm); rm.apply(); @@ -320,8 +320,8 @@ public class StreamingTransferTest extends SchemaLoader state.writeElement(CounterId.fromInt(4), 4L, 2L); state.writeElement(CounterId.fromInt(6), 3L, 3L); state.writeElement(CounterId.fromInt(8), 2L, 4L); - cf.addColumn(new CounterColumn(cellname(col), state.context, timestamp)); - cfCleaned.addColumn(new CounterColumn(cellname(col), cc.clearAllDelta(state.context), timestamp)); + cf.addColumn(new CounterCell(cellname(col), state.context, timestamp)); + cfCleaned.addColumn(new CounterCell(cellname(col), cc.clearAllDelta(state.context), timestamp)); entries.put(key, cf); cleanedEntries.put(key, cfCleaned); @@ -453,7 +453,7 @@ public class StreamingTransferTest extends SchemaLoader { ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(keyspace.getName(), cfs.name); cf.addColumn(column(colName, "value", timestamp)); - cf.addColumn(new Column(cellname("birthdate"), ByteBufferUtil.bytes(new Date(timestamp).toString()), timestamp)); + cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(new Date(timestamp).toString()), timestamp)); RowMutation rm = new RowMutation("Keyspace1", ByteBufferUtil.bytes(key), cf); logger.debug("Applying row to transfer " + rm); rm.apply(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/tools/SSTableExportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java index c2de740..ea7516f 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -123,7 +123,7 @@ public class SSTableExportTest extends SchemaLoader int nowInSec = (int)(System.currentTimeMillis() / 1000) + 42; //live for 42 seconds // Add rowA cfamily.addColumn(Util.cellname("colA"), ByteBufferUtil.bytes("valA"), System.currentTimeMillis()); - cfamily.addColumn(new ExpiringColumn(Util.cellname("colExp"), ByteBufferUtil.bytes("valExp"), System.currentTimeMillis(), 42, nowInSec)); + cfamily.addColumn(new ExpiringCell(Util.cellname("colExp"), ByteBufferUtil.bytes("valExp"), System.currentTimeMillis(), 42, nowInSec)); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); @@ -216,7 +216,7 @@ public class SSTableExportTest extends SchemaLoader SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); // Add rowA - cfamily.addColumn(new CounterColumn(Util.cellname("colA"), 42, System.currentTimeMillis())); + cfamily.addColumn(new CounterCell(Util.cellname("colA"), 42, System.currentTimeMillis())); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); @@ -247,7 +247,7 @@ public class SSTableExportTest extends SchemaLoader SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); // Add rowA - cfamily.addColumn(new Column(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); + cfamily.addColumn(new Cell(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); writer.append(Util.dk("rowA"), cfamily); cfamily.clear(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/test/unit/org/apache/cassandra/tools/SSTableImportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java index fdfaa82..6434143 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java @@ -34,7 +34,6 @@ import org.apache.cassandra.Util; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.utils.ByteBufferUtil; @@ -56,11 +55,11 @@ public class SSTableImportTest extends SchemaLoader ColumnFamily cf = cloneForAdditions(iter); while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedColumn); - Column expCol = cf.getColumn(Util.cellname("colAC")); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); - assert expCol instanceof ExpiringColumn; - assert ((ExpiringColumn)expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; + assert expCol instanceof ExpiringCell; + assert ((ExpiringCell)expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; } private ColumnFamily cloneForAdditions(OnDiskAtomIterator iter) @@ -90,11 +89,11 @@ public class SSTableImportTest extends SchemaLoader ColumnFamily cf = cloneForAdditions(iter); while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedColumn); - Column expCol = cf.getColumn(Util.cellname("colAC")); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); - assert expCol instanceof ExpiringColumn; - assert ((ExpiringColumn)expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; + assert expCol instanceof ExpiringCell; + assert ((ExpiringCell)expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; } @Test @@ -112,8 +111,8 @@ public class SSTableImportTest extends SchemaLoader DeletionTime delTime = cf.deletionInfo().rangeCovering(cf.getComparator().make(ByteBufferUtil.bytes("superA"))); assertEquals("supercolumn deletion time did not match the expected time", new DeletionInfo(0, 0), new DeletionInfo(delTime)); - Column subColumn = cf.getColumn(Util.cellname("superA", "636f6c4141")); - assert subColumn.value().equals(hexToBytes("76616c75654141")); + Cell subCell = cf.getColumn(Util.cellname("superA", "636f6c4141")); + assert subCell.value().equals(hexToBytes("76616c75654141")); } @Test @@ -141,11 +140,11 @@ public class SSTableImportTest extends SchemaLoader while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedColumn); - Column expCol = cf.getColumn(Util.cellname("colAC")); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); - assert expCol instanceof ExpiringColumn; - assert ((ExpiringColumn) expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; + assert expCol instanceof ExpiringCell; + assert ((ExpiringCell) expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; } @Test @@ -165,11 +164,11 @@ public class SSTableImportTest extends SchemaLoader while (iter.hasNext()) cf.addAtom(iter.next()); assert cf.getColumn(Util.cellname("colAA")).value().equals(hexToBytes("76616c4141")); - assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedColumn); - Column expCol = cf.getColumn(Util.cellname("colAC")); + assert !(cf.getColumn(Util.cellname("colAA")) instanceof DeletedCell); + Cell expCol = cf.getColumn(Util.cellname("colAC")); assert expCol.value().equals(hexToBytes("76616c4143")); - assert expCol instanceof ExpiringColumn; - assert ((ExpiringColumn) expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; + assert expCol instanceof ExpiringCell; + assert ((ExpiringCell) expCol).getTimeToLive() == 42 && expCol.getLocalDeletionTime() == 2000000000; } @Test @@ -186,8 +185,8 @@ public class SSTableImportTest extends SchemaLoader OnDiskAtomIterator iter = qf.getSSTableColumnIterator(reader); ColumnFamily cf = cloneForAdditions(iter); while (iter.hasNext()) cf.addAtom(iter.next()); - Column c = cf.getColumn(Util.cellname("colAA")); - assert c instanceof CounterColumn: c; - assert ((CounterColumn) c).total() == 42; + Cell c = cf.getColumn(Util.cellname("colAA")); + assert c instanceof CounterCell : c; + assert ((CounterCell) c).total() == 42; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/tools/stress/README.txt ---------------------------------------------------------------------- diff --git a/tools/stress/README.txt b/tools/stress/README.txt index f39a8d7..9f745c1 100644 --- a/tools/stress/README.txt +++ b/tools/stress/README.txt @@ -30,8 +30,8 @@ Important options: -y or --family-type: Sets the ColumnFamily type. One of 'Standard' or 'Super'. If using super, you probably want to set the -u option also. - -c or --columns: - the number of columns per row, defaults to 5 + -c or --cells: + the number of cells per row, defaults to 5 -u or --supercolumns: use the number of supercolumns specified NOTE: you must set the -y option appropriately, or this option has no effect. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/tools/stress/src/org/apache/cassandra/stress/Session.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/Session.java b/tools/stress/src/org/apache/cassandra/stress/Session.java index c26c759..8d138f5 100644 --- a/tools/stress/src/org/apache/cassandra/stress/Session.java +++ b/tools/stress/src/org/apache/cassandra/stress/Session.java @@ -76,9 +76,9 @@ public class Session implements Serializable availableOptions.addOption("F", "num-different-keys", true, "Number of different keys (if < NUM-KEYS, the same key will re-used multiple times), default:NUM-KEYS"); availableOptions.addOption("N", "skip-keys", true, "Fraction of keys to skip initially, default:0"); availableOptions.addOption("t", "threads", true, "Number of threads to use, default:50"); - availableOptions.addOption("c", "columns", true, "Number of columns per key, default:5"); + availableOptions.addOption("c", "cells", true, "Number of cells per key, default:5"); availableOptions.addOption("S", "column-size", true, "Size of column values in bytes, default:34"); - availableOptions.addOption("C", "cardinality", true, "Number of unique values stored in columns, default:50"); + availableOptions.addOption("C", "cardinality", true, "Number of unique values stored in cells, default:50"); availableOptions.addOption("d", "nodes", true, "Host nodes (comma separated), default:locahost"); availableOptions.addOption("D", "nodesfile", true, "File containing host nodes (one per line)"); availableOptions.addOption("s", "stdev", true, "Standard Deviation Factor, default:0.1"); @@ -107,7 +107,7 @@ public class Session implements Serializable availableOptions.addOption("I", "compression", true, "Specify the compression to use for sstable, default:no compression"); availableOptions.addOption("Q", "query-names", true, "Comma-separated list of column names to retrieve from each row."); availableOptions.addOption("Z", "compaction-strategy", true, "CompactionStrategy to use."); - availableOptions.addOption("U", "comparator", true, "Column Comparator to use. Currently supported types are: TimeUUIDType, AsciiType, UTF8Type."); + availableOptions.addOption("U", "comparator", true, "Cell Comparator to use. Currently supported types are: TimeUUIDType, AsciiType, UTF8Type."); availableOptions.addOption("tf", "transport-factory", true, "Fully-qualified TTransportFactory class name for creating a connection. Note: For Thrift over SSL, use org.apache.cassandra.stress.SSLTransportFactory."); availableOptions.addOption("ns", "no-statistics", false, "Turn off the aggegate statistics that is normally output after completion."); availableOptions.addOption("ts", SSL_TRUSTSTORE, true, "SSL: full path to truststore"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d6af1/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java index 3572c36..d593e57 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java @@ -91,7 +91,7 @@ public class CqlInserter extends CQLOperation List<String> queryParms = new ArrayList<String>(); for (int i = 0; i < session.getColumnsPerKey(); i++) { - // Column value + // Cell value queryParms.add(getUnQuotedCqlBlob(values.get(i % values.size()).array(), session.cqlVersion.startsWith("3"))); }
