Author: jbellis
Date: Wed Jun 24 19:25:04 2009
New Revision: 788143
URL: http://svn.apache.org/viewvc?rev=788143&view=rev
Log:
r/m recycle cf and undocumented/incomplete Loader code using it
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/ColumnFamilyType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/ColumnType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/CustomLoader.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/FieldCollection.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/Importer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/KeyType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/Loader.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/ObjectFactory.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/PreLoad.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/SuperColumnType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/TimestampType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/loader/ValueType.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/AdminTool.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.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=788143&r1=788142&r2=788143&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
Wed Jun 24 19:25:04 2009
@@ -467,12 +467,8 @@
// Hardcoded system table
Table.TableMetadata tmetadata =
Table.TableMetadata.instance(Table.SYSTEM_TABLE);
- /* Add the LocationInfo column family to this map. */
tmetadata.add(SystemTable.cfName_, cfId++);
- /* Add the recycle column family to this map. */
- tmetadata.add(Table.recycleBin_, cfId++);
- /* Add the Hints column family to this map. */
- tmetadata.add(Table.HINTS_CF, cfId++,
ColumnFamily.getColumnType("Super"));
+ tmetadata.add(HintedHandOffManager.HINTS_CF, cfId++,
ColumnFamily.getColumnType("Super"));
}
public static int getGcGraceInSeconds()
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=788143&r1=788142&r2=788143&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Wed Jun 24 19:25:04 2009
@@ -195,7 +195,7 @@
}
}
MinorCompactionManager.instance().submit(ColumnFamilyStore.this);
- if (table_.equals(Table.SYSTEM_TABLE) &&
columnFamily_.equals(Table.HINTS_CF))
+ if (table_.equals(Table.SYSTEM_TABLE) &&
columnFamily_.equals(HintedHandOffManager.HINTS_CF))
{
HintedHandOffManager.instance().submit(this);
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=788143&r1=788142&r2=788143&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Wed Jun 24 19:25:04 2009
@@ -55,6 +55,7 @@
private static Logger logger_ =
Logger.getLogger(HintedHandOffManager.class);
final static long intervalInMins_ = 60;
private ScheduledExecutorService executor_ = new
DebuggableScheduledThreadPoolExecutor(1, new
ThreadFactoryImpl("HINTED-HANDOFF-POOL"));
+ public static final String HINTS_CF = "HintsColumnFamily";
public static HintedHandOffManager instance()
@@ -101,7 +102,7 @@
private static void deleteEndPoint(String endpointAddress, String
tableName, String key, long timestamp) throws IOException
{
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, tableName);
- rm.delete(Table.HINTS_CF + ":" + key + ":" + endpointAddress,
timestamp);
+ rm.delete(HINTS_CF + ":" + key + ":" + endpointAddress, timestamp);
rm.apply();
}
@@ -157,7 +158,7 @@
// 7. I guess we r done
for (String tableName : DatabaseDescriptor.getTables())
{
- ColumnFamily hintColumnFamily =
ColumnFamilyStore.removeDeleted(hintStore.getColumnFamily(tableName,
Table.HINTS_CF, new IdentityFilter()), Integer.MAX_VALUE);
+ ColumnFamily hintColumnFamily =
ColumnFamilyStore.removeDeleted(hintStore.getColumnFamily(tableName, HINTS_CF,
new IdentityFilter()), Integer.MAX_VALUE);
if (hintColumnFamily == null)
{
continue;
@@ -198,7 +199,7 @@
Table systemTable = Table.open(Table.SYSTEM_TABLE);
for (String tableName : DatabaseDescriptor.getTables())
{
- ColumnFamily hintedColumnFamily = systemTable.get(tableName,
Table.HINTS_CF);
+ ColumnFamily hintedColumnFamily = systemTable.get(tableName,
HINTS_CF);
if (hintedColumnFamily == null)
{
continue;
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=788143&r1=788142&r2=788143&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
Wed Jun 24 19:25:04 2009
@@ -118,7 +118,7 @@
void addHints(String hint) throws IOException
{
- String cfName = Table.HINTS_CF + ":" + hint;
+ String cfName = HintedHandOffManager.HINTS_CF + ":" + hint;
add(cfName, ArrayUtils.EMPTY_BYTE_ARRAY, System.currentTimeMillis());
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=788143&r1=788142&r2=788143&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Wed
Jun 24 19:25:04 2009
@@ -53,8 +53,6 @@
public class Table
{
public static final String SYSTEM_TABLE = "system";
- public static final String recycleBin_ = "RecycleColumnFamily";
- public static final String HINTS_CF = "HintsColumnFamily";
private static Logger logger_ = Logger.getLogger(Table.class);
@@ -716,33 +714,11 @@
for (ColumnFamily columnFamily : row.getColumnFamilies())
{
- if (columnFamily.name().equals(Table.recycleBin_))
- {
- Collection<IColumn> columns =
columnFamily.getAllColumns();
- for(IColumn column : columns)
- {
- ColumnFamilyStore cfStore =
columnFamilyStores_.get(column.name());
- if(column.timestamp() == 1)
- {
- cfStore.forceFlushBinary();
- }
- else if(column.timestamp() == 2)
- {
- cfStore.forceCompaction(null, null,
BasicUtilities.byteArrayToLong(column.value()), null);
- }
- else if(column.timestamp() == 3)
- {
- cfStore.forceFlush();
- }
- else if(column.timestamp() == 4)
- {
- cfStore.forceCleanup();
- }
- else
- {
- cfStore.applyBinary(key, column.value());
- }
- }
+ Collection<IColumn> columns = columnFamily.getAllColumns();
+ for(IColumn column : columns)
+ {
+ ColumnFamilyStore cfStore =
columnFamilyStores_.get(column.name());
+ cfStore.applyBinary(key, column.value());
}
}
row.clear();
