You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/03/27 03:18:21 UTC
svn commit: r758965 - in
/incubator/cassandra/trunk/src/org/apache/cassandra: cql/common/ db/
service/ test/
Author: jbellis
Date: Fri Mar 27 02:18:20 2009
New Revision: 758965
URL: http://svn.apache.org/viewvc?rev=758965&view=rev
Log:
rename getColumnFamilies -> getColumnFamilyMap. Add public Collection<ColumnFamily> getColumnFamilies
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/CommitLog.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/Row.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/SystemTable.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/Table.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/ReadResponseResolver.java
incubator/cassandra/trunk/src/org/apache/cassandra/test/DataImporter.java
incubator/cassandra/trunk/src/org/apache/cassandra/test/TestRunner.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java Fri Mar 27 02:18:20 2009
@@ -33,7 +33,6 @@
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
/**
* A Row Source Defintion (RSD) for doing a range query on a column map
@@ -112,7 +111,7 @@
List<Map<String, String>> rows = new LinkedList<Map<String, String>>();
if (row != null)
{
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap != null && cfMap.size() > 0)
{
ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java Fri Mar 27 02:18:20 2009
@@ -18,7 +18,6 @@
package org.apache.cassandra.cql.common;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
@@ -32,11 +31,8 @@
import org.apache.cassandra.db.Row;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.service.column_t;
-import org.apache.cassandra.service.superColumn_t;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
/**
* A Row Source Defintion (RSD) for doing a super column range query on a Super Column Family.
@@ -84,7 +80,7 @@
List<Map<String, String>> rows = new LinkedList<Map<String, String>>();
if (row != null)
{
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap != null && cfMap.size() > 0)
{
ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java Fri Mar 27 02:18:20 2009
@@ -33,7 +33,6 @@
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.db.*;
/**
* A Row Source Defintion (RSD) for looking up a unique column within a column family.
@@ -96,7 +95,7 @@
if (row != null)
{
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap != null && cfMap.size() > 0)
{
ColumnFamily cfamily = cfMap.get(cfMetaData_.cfName);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/CommitLog.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/CommitLog.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/CommitLog.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/CommitLog.java Fri Mar 27 02:18:20 2009
@@ -21,22 +21,18 @@
import java.io.*;
import java.util.*;
-import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.IFileReader;
import org.apache.cassandra.io.IFileWriter;
import org.apache.cassandra.io.SequenceFile;
-import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.FileUtils;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
/*
* Commit Log tracks every write operation into the system. The aim
@@ -376,7 +372,7 @@
try
{
Row row = Row.serializer().deserialize(bufIn);
- Map<String, ColumnFamily> columnFamilies = new HashMap<String, ColumnFamily>(row.getColumnFamilies());
+ Map<String, ColumnFamily> columnFamilies = new HashMap<String, ColumnFamily>(row.getColumnFamilyMap());
/* remove column families that have already been flushed */
Set<String> cNames = columnFamilies.keySet();
@@ -423,7 +419,7 @@
*/
private void updateHeader(Row row) throws IOException
{
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Table table = Table.open(table_);
Set<String> cNames = columnFamilies.keySet();
for ( String cName : cNames )
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java Fri Mar 27 02:18:20 2009
@@ -18,10 +18,8 @@
package org.apache.cassandra.db;
-import java.io.File;
import java.io.IOException;
import java.math.BigInteger;
-import java.net.InetAddress;
import java.util.Map;
import java.util.Random;
import java.util.Set;
@@ -31,14 +29,10 @@
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.DataOutputBuffer;
-import org.apache.cassandra.io.IFileWriter;
-import org.apache.cassandra.io.SequenceFile;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.BasicUtilities;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.GuidGenerator;
-import org.apache.cassandra.utils.HashingSchemes;
/**
@@ -190,7 +184,7 @@
else
{
/* we crashed and came back up need to bump generation # */
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cfNames = columnFamilies.keySet();
for ( String cfName : cfNames )
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/Row.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/Row.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/Row.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/Row.java Fri Mar 27 02:18:20 2009
@@ -18,9 +18,7 @@
package org.apache.cassandra.db;
-import java.io.DataInput;
import java.io.DataInputStream;
-import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -30,7 +28,6 @@
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -79,7 +76,14 @@
return columnFamilies_.get(cfName);
}
- public Map<String, ColumnFamily> getColumnFamilies()
+ public Collection<ColumnFamily> getColumnFamilies()
+ {
+ return columnFamilies_.values();
+ }
+
+ @Deprecated
+ // (use getColumnFamilies or getColumnFamilyNames)
+ public Map<String, ColumnFamily> getColumnFamilyMap()
{
return columnFamilies_;
}
@@ -113,7 +117,7 @@
*/
void merge(Row row)
{
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cfNames = columnFamilies.keySet();
for ( String cfName : cfNames )
@@ -135,7 +139,7 @@
*/
public void repair(Row row)
{
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cfNames = columnFamilies.keySet();
for ( String cfName : cfNames )
@@ -162,7 +166,7 @@
public Row diff(Row row)
{
Row rowDiff = new Row(key_);
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cfNames = columnFamilies.keySet();
for ( String cfName : cfNames )
@@ -170,15 +174,15 @@
ColumnFamily cf = columnFamilies_.get(cfName);
ColumnFamily cfDiff = null;
if ( cf == null )
- rowDiff.getColumnFamilies().put(cfName, columnFamilies.get(cfName));
+ rowDiff.getColumnFamilyMap().put(cfName, columnFamilies.get(cfName));
else
{
cfDiff = cf.diff(columnFamilies.get(cfName));
if(cfDiff != null)
- rowDiff.getColumnFamilies().put(cfName, cfDiff);
+ rowDiff.getColumnFamilyMap().put(cfName, cfDiff);
}
}
- if(rowDiff.getColumnFamilies().size() != 0)
+ if(rowDiff.getColumnFamilyMap().size() != 0)
return rowDiff;
else
return null;
@@ -225,7 +229,7 @@
public void serialize(Row row, DataOutputStream dos) throws IOException
{
dos.writeUTF(row.key());
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
int size = columnFamilies.size();
dos.writeInt(size);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java Fri Mar 27 02:18:20 2009
@@ -65,7 +65,7 @@
{
table_ = table;
key_ = row.key();
- Map<String, ColumnFamily> cfSet = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfSet = row.getColumnFamilyMap();
Set<String> keyset = cfSet.keySet();
for(String cfName : keyset)
{
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/SystemTable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/SystemTable.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/SystemTable.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/SystemTable.java Fri Mar 27 02:18:20 2009
@@ -18,25 +18,12 @@
package org.apache.cassandra.db;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
import java.io.IOException;
import java.math.BigInteger;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.IFileReader;
@@ -45,8 +32,6 @@
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -167,7 +152,7 @@
{
if ( systemRow_ != null )
{
- Map<String, ColumnFamily> columnFamilies = systemRow_.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = systemRow_.getColumnFamilyMap();
/* Retrieve the "LocationInfo" column family */
ColumnFamily columnFamily = columnFamilies.get(SystemTable.cfName_);
long oldTokenColumnTimestamp = columnFamily.getColumn(SystemTable.token_).timestamp();
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/Table.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/Table.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/Table.java Fri Mar 27 02:18:20 2009
@@ -19,18 +19,14 @@
package org.apache.cassandra.db;
import java.util.*;
-import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.cassandra.analytics.DBAnalyticsSource;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.continuations.Suspendable;
import org.apache.cassandra.dht.BootstrapInitiateMessage;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.DataInputBuffer;
@@ -52,9 +48,6 @@
import org.apache.cassandra.utils.FileUtils;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
-import org.apache.cassandra.service.*;
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -822,7 +815,7 @@
long start = System.currentTimeMillis();
CommitLog.CommitLogContext cLogCtx = CommitLog.open(table_).add(row);
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cNames = columnFamilies.keySet();
for ( String cName : cNames )
{
@@ -838,7 +831,7 @@
void applyNow(Row row) throws IOException
{
String key = row.key();
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cNames = columnFamilies.keySet();
for ( String cName : cNames )
@@ -861,7 +854,7 @@
void delete(Row row) throws IOException
{
String key = row.key();
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
/* Add row to commit log */
CommitLog.open(table_).add(row);
@@ -881,7 +874,7 @@
/* Add row to the commit log. */
long start = System.currentTimeMillis();
- Map<String, ColumnFamily> columnFamilies = row.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = row.getColumnFamilyMap();
Set<String> cNames = columnFamilies.keySet();
for ( String cName : cNames )
{
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java Fri Mar 27 02:18:20 2009
@@ -26,19 +26,13 @@
import com.facebook.fb303.FacebookBase;
import com.facebook.fb303.fb_status;
import java.io.*;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.net.*;
-import org.apache.cassandra.utils.*;
+
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql.common.CqlResult;
@@ -48,8 +42,6 @@
import org.apache.cassandra.db.Row;
import org.apache.cassandra.db.RowMutation;
import org.apache.cassandra.db.RowMutationMessage;
-import org.apache.cassandra.gms.FailureDetector;
-import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.net.EndPoint;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
@@ -121,7 +113,7 @@
{
throw new CassandraException("No row exists for key " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily " + columnFamily + " map is missing.....: " + " key:" + key );
@@ -163,7 +155,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily " + columnFamily_column + " map is missing.....: " + " key:" + key);
@@ -278,7 +270,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily " + columnFamily_column + " map is missing.....: " + " key:" + key);
@@ -346,7 +338,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily map is missing.....: "
@@ -418,7 +410,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily map is missing.....: "
@@ -684,7 +676,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily map is missing.....: "
@@ -759,7 +751,7 @@
throw new CassandraException("ERROR No row for this key .....: " + key);
}
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0)
{
logger_ .info("ERROR ColumnFamily map is missing.....: "
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/service/ReadResponseResolver.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/ReadResponseResolver.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/service/ReadResponseResolver.java Fri Mar 27 02:18:20 2009
@@ -141,7 +141,7 @@
continue;
// create the row mutation message based on the diff and schedule a read repair
RowMutation rowMutation = new RowMutation(table, key);
- Map<String, ColumnFamily> columnFamilies = diffRow.getColumnFamilies();
+ Map<String, ColumnFamily> columnFamilies = diffRow.getColumnFamilyMap();
Set<String> cfNames = columnFamilies.keySet();
for ( String cfName : cfNames )
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/test/DataImporter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/test/DataImporter.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/test/DataImporter.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/test/DataImporter.java Fri Mar 27 02:18:20 2009
@@ -20,12 +20,8 @@
import com.facebook.thrift.transport.TTransport;
import com.facebook.thrift.transport.TSocket;
-import com.facebook.thrift.transport.THttpClient;
-import com.facebook.thrift.transport.TFramedTransport;
import com.facebook.thrift.protocol.TBinaryProtocol;
-import org.apache.cassandra.db.*;
-import org.apache.cassandra.net.*;
-import org.apache.cassandra.service.*;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -33,25 +29,17 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.StringReader;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.StringTokenizer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
-import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
import org.apache.cassandra.concurrent.ThreadFactoryImpl;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.IColumn;
@@ -70,8 +58,7 @@
import org.apache.cassandra.service.batch_mutation_t;
import org.apache.cassandra.service.column_t;
import org.apache.cassandra.service.superColumn_t;
-import org.apache.cassandra.utils.BasicUtilities;
-import org.apache.cassandra.utils.LogUtil;
+
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
@@ -907,7 +894,7 @@
Thread.sleep(1000/requestsPerSecond_, 1000%requestsPerSecond_);
errorCount_++;
} else {
- Map<String, ColumnFamily> cfMap = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfMap = row.getColumnFamilyMap();
if (cfMap == null || cfMap.size() == 0) {
logger_
.debug("ERROR ColumnFamil map is missing.....: "
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/test/TestRunner.java?rev=758965&r1=758964&r2=758965&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/test/TestRunner.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/test/TestRunner.java Fri Mar 27 02:18:20 2009
@@ -17,65 +17,23 @@
*/
package org.apache.cassandra.test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.PriorityQueue;
-import java.util.Queue;
import java.util.Random;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import org.apache.cassandra.concurrent.ContinuationContext;
-import org.apache.cassandra.concurrent.ContinuationStage;
-import org.apache.cassandra.concurrent.ContinuationsExecutor;
-import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
-import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
-import org.apache.cassandra.concurrent.IStage;
-import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.concurrent.ThreadFactoryImpl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.cassandra.continuations.Suspendable;
import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.IColumn;
-import org.apache.cassandra.db.ReadMessage;
-import org.apache.cassandra.db.Row;
import org.apache.cassandra.db.RowMutation;
import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Row;
+import org.apache.cassandra.net.EndPoint;
+import org.apache.cassandra.io.IndexHelper;
import org.apache.cassandra.io.BufferedRandomAccessFile;
import org.apache.cassandra.io.DataInputBuffer;
-import org.apache.cassandra.io.DataOutputBuffer;
-import org.apache.cassandra.io.IFileWriter;
-import org.apache.cassandra.io.IndexHelper;
-import org.apache.cassandra.io.SequenceFile;
-import org.apache.cassandra.net.EndPoint;
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessageDeliveryTask;
-import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.service.OrderPreservingHashPartitioner;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.LogUtil;
-import org.apache.commons.javaflow.Continuation;
+
+
import org.apache.log4j.Logger;
@@ -210,7 +168,7 @@
String value = row.key() + System.getProperty("line.separator");
fos.write( value.getBytes() );
- Map<String, ColumnFamily> cfs = row.getColumnFamilies();
+ Map<String, ColumnFamily> cfs = row.getColumnFamilyMap();
Set<String> keys = cfs.keySet();
for ( String key : keys )