Author: jbellis
Date: Thu Aug 13 22:16:01 2009
New Revision: 804045
URL: http://svn.apache.org/viewvc?rev=804045&view=rev
Log:
Fixes for saving Token in SystemTable. patch by jbellis and Sammy Yu for
CASSANDRA-362
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=804045&r1=804044&r2=804045&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Thu Aug 13 22:16:01 2009
@@ -513,10 +513,12 @@
}
// Hardcoded system tables
+ tables_.add(Table.SYSTEM_TABLE);
Map<String, CFMetaData> systemMetadata = new HashMap<String,
CFMetaData>();
CFMetaData data = new CFMetaData();
- data.comparator = new AsciiType();
+ data.columnType = "Standard";
+ data.comparator = new UTF8Type();
systemMetadata.put(SystemTable.LOCATION_CF, data);
data = new CFMetaData();
@@ -524,8 +526,8 @@
data.comparator = new UTF8Type();
data.subcolumnComparator = new BytesType();
systemMetadata.put(HintedHandOffManager.HINTS_CF, data);
-
- tableToCFMetaDataMap_.put("system", systemMetadata);
+ tableToCFMetaDataMap_.put(Table.SYSTEM_TABLE, systemMetadata);
+ tableKeysCachedFractions_.put(Table.SYSTEM_TABLE, 0.01);
/* make sure we have a directory for each table */
createTableDirectories();
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java?rev=804045&r1=804044&r2=804045&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java
Thu Aug 13 22:16:01 2009
@@ -289,12 +289,6 @@
/* remove column families that have already been flushed */
for (ColumnFamily columnFamily : columnFamilies)
{
- /* TODO: Remove this to not process Hints */
- if
(!DatabaseDescriptor.isApplicationColumnFamily(columnFamily.name()))
- {
- row.removeColumnFamily(columnFamily);
- continue;
- }
int id = table.getColumnFamilyId(columnFamily.name());
if (!clHeader.isDirty(id) || reader.getFilePointer() <
clHeader.getPosition(id))
{
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java?rev=804045&r1=804044&r2=804045&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
Thu Aug 13 22:16:01 2009
@@ -27,9 +27,10 @@
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.utils.BasicUtilities;
-import org.apache.cassandra.db.filter.NamesQueryFilter;
+import org.apache.cassandra.db.filter.IdentityQueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.filter.NamesQueryFilter;
/**
* Author : Avinash Lakshman ( [email protected]) & Prashant Malik (
[email protected] )
@@ -88,7 +89,7 @@
{
/* Read the system table to retrieve the storage ID and the generation
*/
Table table = Table.open(Table.SYSTEM_TABLE);
- QueryFilter filter = new NamesQueryFilter(LOCATION_KEY, new
QueryPath(LOCATION_CF), GENERATION);
+ QueryFilter filter = new IdentityQueryFilter(LOCATION_KEY, new
QueryPath(LOCATION_CF));
ColumnFamily cf =
table.getColumnFamilyStore(LOCATION_CF).getColumnFamily(filter);
IPartitioner p = StorageService.getPartitioner();
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java?rev=804045&r1=804044&r2=804045&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
Thu Aug 13 22:16:01 2009
@@ -333,10 +333,7 @@
public ColumnFamily makeColumnFamily()
{
- return new ColumnFamily(getColumnFamilyName(),
-
DatabaseDescriptor.getColumnType(getTableName(), getColumnFamilyName()),
- getColumnComparator(),
-
DatabaseDescriptor.getSubComparator(getTableName(), getColumnFamilyName()));
+ return ColumnFamily.create(getTableName(), getColumnFamilyName());
}
public static void deleteAll() throws IOException
