You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/06/27 20:36:43 UTC
[07/11] Rename Table to Keyspace
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index 2196f4d..f398862 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.gms.IFailureDetector;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
@@ -112,24 +112,24 @@ public class RangeStreamer
sourceFilters.add(filter);
}
- public void addRanges(String table, Collection<Range<Token>> ranges)
+ public void addRanges(String keyspaceName, Collection<Range<Token>> ranges)
{
- Multimap<Range<Token>, InetAddress> rangesForTable = getAllRangesWithSourcesFor(table, ranges);
+ Multimap<Range<Token>, InetAddress> rangesForKeyspace = getAllRangesWithSourcesFor(keyspaceName, ranges);
if (logger.isDebugEnabled())
{
- for (Map.Entry<Range<Token>, InetAddress> entry: rangesForTable.entries())
+ for (Map.Entry<Range<Token>, InetAddress> entry: rangesForKeyspace.entries())
logger.debug(String.format("%s: range %s exists on %s", description, entry.getKey(), entry.getValue()));
}
- for (Map.Entry<InetAddress, Collection<Range<Token>>> entry : getRangeFetchMap(rangesForTable, sourceFilters).asMap().entrySet())
+ for (Map.Entry<InetAddress, Collection<Range<Token>>> entry : getRangeFetchMap(rangesForKeyspace, sourceFilters).asMap().entrySet())
{
if (logger.isDebugEnabled())
{
for (Range r : entry.getValue())
- logger.debug(String.format("%s: range %s from source %s for table %s", description, r, entry.getKey(), table));
+ logger.debug(String.format("%s: range %s from source %s for keyspace %s", description, r, entry.getKey(), keyspaceName));
}
- toFetch.put(table, entry);
+ toFetch.put(keyspaceName, entry);
}
}
@@ -137,9 +137,9 @@ public class RangeStreamer
* Get a map of all ranges and their respective sources that are candidates for streaming the given ranges
* to us. For each range, the list of sources is sorted by proximity relative to the given destAddress.
*/
- private Multimap<Range<Token>, InetAddress> getAllRangesWithSourcesFor(String table, Collection<Range<Token>> desiredRanges)
+ private Multimap<Range<Token>, InetAddress> getAllRangesWithSourcesFor(String keyspaceName, Collection<Range<Token>> desiredRanges)
{
- AbstractReplicationStrategy strat = Table.open(table).getReplicationStrategy();
+ AbstractReplicationStrategy strat = Keyspace.open(keyspaceName).getReplicationStrategy();
Multimap<Range<Token>, InetAddress> rangeAddresses = strat.getRangeAddresses(metadata.cloneOnlyTokenMap());
Multimap<Range<Token>, InetAddress> rangeSources = ArrayListMultimap.create();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
index a80db89..b2316e8 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
@@ -306,7 +306,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap
private Column unthriftifyCounter(CounterColumn column)
{
- //CounterColumns read the counterID from the System table, so need the StorageService running and access
+ //CounterColumns read the counterID from the System keyspace, so need the StorageService running and access
//to cassandra.yaml. To avoid a Hadoop needing access to yaml return a regular Column.
return new Column(column.name, ByteBufferUtil.bytes(column.value), 0);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
index ac3affb..7ceaa95 100644
--- a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
+++ b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
@@ -35,7 +35,7 @@ public class SnappyCompressor implements ICompressor
static
{
if (!isAvailable())
- logger.warn("Cannot initialize native Snappy library. Compression on new tables will be disabled.");
+ logger.warn("Cannot initialize native Snappy library. Compression on new sstables will be disabled.");
}
public static SnappyCompressor create(Map<String, String> compressionOptions)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/io/sstable/SSTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTable.java b/src/java/org/apache/cassandra/io/sstable/SSTable.java
index 1112510..eaa4522 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTable.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTable.java
@@ -180,7 +180,7 @@ public abstract class SSTable
return descriptor.cfname;
}
- public String getTableName()
+ public String getKeyspaceName()
{
return descriptor.ksname;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 6c10d95..b1af7c2 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -61,7 +61,7 @@ import org.apache.cassandra.utils.*;
import static org.apache.cassandra.db.Directories.SECONDARY_INDEX_NAME_SEPARATOR;
/**
- * SSTableReaders are open()ed by Table.onStart; after that they are created by SSTableWriter.renameAndOpen.
+ * SSTableReaders are open()ed by Keyspace.onStart; after that they are created by SSTableWriter.renameAndOpen.
* Do not re-call open() on existing SSTable files; use the references kept by ColumnFamilyStore post-start instead.
*/
public class SSTableReader extends SSTable
@@ -79,7 +79,7 @@ public class SSTableReader extends SSTable
* The field is not serialized to disk, so relying on it for more than what truncate does is not advised.
*
* When a new sstable is flushed, maxDataAge is set to the time of creation.
- * When a sstable is created from compaction, maxDataAge is set to max of all merged tables.
+ * When a sstable is created from compaction, maxDataAge is set to max of all merged sstables.
*
* The age is in milliseconds since epoc and is local to this host.
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 879c9bc..bc98beb 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -307,7 +307,7 @@ public class SSTableWriter extends SSTable
metadata.getBloomFilterFpChance());
writeMetadata(descriptor, sstableMetadata);
- // save the table of components
+ // save the talbe of components
SSTable.appendTOC(descriptor, components);
// remove the 'tmp' marker from all components
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/io/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java
index 005d3bb..a0be773 100644
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.BlacklistedDirectories;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.io.FSError;
import org.apache.cassandra.io.FSReadError;
import org.apache.cassandra.io.FSWriteError;
@@ -398,7 +398,7 @@ public class FileUtils
{
File directory = BlacklistedDirectories.maybeMarkUnreadable(e.path);
if (directory != null)
- Table.removeUnreadableSSTables(directory);
+ Keyspace.removeUnreadableSSTables(directory);
}
break;
case ignore:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
index 87099c4..2a01fed 100644
--- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
+++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.ConsistencyLevel;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.RingPosition;
@@ -49,24 +49,24 @@ public abstract class AbstractReplicationStrategy
private static final Logger logger = LoggerFactory.getLogger(AbstractReplicationStrategy.class);
@VisibleForTesting
- final String tableName;
- private Table table;
+ final String keyspaceName;
+ private Keyspace keyspace;
public final Map<String, String> configOptions;
private final TokenMetadata tokenMetadata;
public IEndpointSnitch snitch;
- AbstractReplicationStrategy(String tableName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
+ AbstractReplicationStrategy(String keyspaceName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
{
- assert tableName != null;
+ assert keyspaceName != null;
assert snitch != null;
assert tokenMetadata != null;
this.tokenMetadata = tokenMetadata;
this.snitch = snitch;
this.tokenMetadata.register(this);
this.configOptions = configOptions == null ? Collections.<String, String>emptyMap() : configOptions;
- this.tableName = tableName;
- // lazy-initialize table itself since we don't create them until after the replication strategies
+ this.keyspaceName = keyspaceName;
+ // lazy-initialize keyspace itself since we don't create them until after the replication strategies
}
private final Map<Token, ArrayList<InetAddress>> cachedEndpoints = new NonBlockingHashMap<Token, ArrayList<InetAddress>>();
@@ -125,20 +125,20 @@ public abstract class AbstractReplicationStrategy
if (consistency_level == ConsistencyLevel.LOCAL_QUORUM)
{
// block for in this context will be localnodes block.
- return new DatacenterWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getTable(), callback, writeType);
+ return new DatacenterWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getKeyspace(), callback, writeType);
}
else if (consistency_level == ConsistencyLevel.EACH_QUORUM)
{
- return new DatacenterSyncWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getTable(), callback, writeType);
+ return new DatacenterSyncWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getKeyspace(), callback, writeType);
}
- return new WriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getTable(), callback, writeType);
+ return new WriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, getKeyspace(), callback, writeType);
}
- private Table getTable()
+ private Keyspace getKeyspace()
{
- if (table == null)
- table = Table.open(tableName);
- return table;
+ if (keyspace == null)
+ keyspace = Keyspace.open(keyspaceName);
+ return keyspace;
}
/**
@@ -222,7 +222,7 @@ public abstract class AbstractReplicationStrategy
return null;
}
- private static AbstractReplicationStrategy createInternal(String table,
+ private static AbstractReplicationStrategy createInternal(String keyspaceName,
Class<? extends AbstractReplicationStrategy> strategyClass,
TokenMetadata tokenMetadata,
IEndpointSnitch snitch,
@@ -234,7 +234,7 @@ public abstract class AbstractReplicationStrategy
try
{
Constructor<? extends AbstractReplicationStrategy> constructor = strategyClass.getConstructor(parameterTypes);
- strategy = constructor.newInstance(table, tokenMetadata, snitch, strategyOptions);
+ strategy = constructor.newInstance(keyspaceName, tokenMetadata, snitch, strategyOptions);
}
catch (Exception e)
{
@@ -243,7 +243,7 @@ public abstract class AbstractReplicationStrategy
return strategy;
}
- public static AbstractReplicationStrategy createReplicationStrategy(String table,
+ public static AbstractReplicationStrategy createReplicationStrategy(String keyspaceName,
Class<? extends AbstractReplicationStrategy> strategyClass,
TokenMetadata tokenMetadata,
IEndpointSnitch snitch,
@@ -251,7 +251,7 @@ public abstract class AbstractReplicationStrategy
{
try
{
- AbstractReplicationStrategy strategy = createInternal(table, strategyClass, tokenMetadata, snitch, strategyOptions);
+ AbstractReplicationStrategy strategy = createInternal(keyspaceName, strategyClass, tokenMetadata, snitch, strategyOptions);
// Because we used to not properly validate unrecognized options, we only log a warning if we find one.
try
@@ -273,13 +273,13 @@ public abstract class AbstractReplicationStrategy
}
}
- public static void validateReplicationStrategy(String table,
+ public static void validateReplicationStrategy(String keyspaceName,
Class<? extends AbstractReplicationStrategy> strategyClass,
TokenMetadata tokenMetadata,
IEndpointSnitch snitch,
Map<String, String> strategyOptions) throws ConfigurationException
{
- AbstractReplicationStrategy strategy = createInternal(table, strategyClass, tokenMetadata, snitch, strategyOptions);
+ AbstractReplicationStrategy strategy = createInternal(keyspaceName, strategyClass, tokenMetadata, snitch, strategyOptions);
strategy.validateExpectedOptions();
strategy.validateOptions();
}
@@ -319,7 +319,7 @@ public abstract class AbstractReplicationStrategy
for (String key : configOptions.keySet())
{
if (!expectedOptions.contains(key))
- throw new ConfigurationException(String.format("Unrecognized strategy option {%s} passed to %s for keyspace %s", key, getClass().getSimpleName(), tableName));
+ throw new ConfigurationException(String.format("Unrecognized strategy option {%s} passed to %s for keyspace %s", key, getClass().getSimpleName(), keyspaceName));
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index e00239e..dd1637d 100644
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@ -21,10 +21,10 @@ package org.apache.cassandra.locator;
import java.net.InetAddress;
import java.util.Map;
-import org.apache.cassandra.db.SystemTable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.EndpointState;
@@ -83,7 +83,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch//
if (psnitch == null)
{
if (savedEndpoints == null)
- savedEndpoints = SystemTable.loadDcRackInfo();
+ savedEndpoints = SystemKeyspace.loadDcRackInfo();
if (savedEndpoints.containsKey(endpoint))
return savedEndpoints.get(endpoint).get("data_center");
return DEFAULT_DC;
@@ -111,7 +111,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch//
if (psnitch == null)
{
if (savedEndpoints == null)
- savedEndpoints = SystemTable.loadDcRackInfo();
+ savedEndpoints = SystemKeyspace.loadDcRackInfo();
if (savedEndpoints.containsKey(endpoint))
return savedEndpoints.get(endpoint).get("rack");
return DEFAULT_RACK;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/LocalStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/LocalStrategy.java b/src/java/org/apache/cassandra/locator/LocalStrategy.java
index 39a391d..ae58203 100644
--- a/src/java/org/apache/cassandra/locator/LocalStrategy.java
+++ b/src/java/org/apache/cassandra/locator/LocalStrategy.java
@@ -31,9 +31,9 @@ import org.apache.cassandra.utils.FBUtilities;
public class LocalStrategy extends AbstractReplicationStrategy
{
- public LocalStrategy(String table, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
+ public LocalStrategy(String keyspaceName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
{
- super(table, tokenMetadata, snitch, configOptions);
+ super(keyspaceName, tokenMetadata, snitch, configOptions);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
index d354019..5e5ecb7 100644
--- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
+++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
@@ -50,9 +50,9 @@ public class NetworkTopologyStrategy extends AbstractReplicationStrategy
private final Map<String, Integer> datacenters;
private static final Logger logger = LoggerFactory.getLogger(NetworkTopologyStrategy.class);
- public NetworkTopologyStrategy(String table, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions) throws ConfigurationException
+ public NetworkTopologyStrategy(String keyspaceName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions) throws ConfigurationException
{
- super(table, tokenMetadata, snitch, configOptions);
+ super(keyspaceName, tokenMetadata, snitch, configOptions);
this.snitch = snitch;
Map<String, Integer> newDatacenters = new HashMap<String, Integer>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
index e184d24..b9bd767 100644
--- a/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
+++ b/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
@@ -37,9 +37,9 @@ import org.apache.cassandra.dht.Token;
*/
public class OldNetworkTopologyStrategy extends AbstractReplicationStrategy
{
- public OldNetworkTopologyStrategy(String table, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
+ public OldNetworkTopologyStrategy(String keyspaceName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
{
- super(table, tokenMetadata, snitch, configOptions);
+ super(keyspaceName, tokenMetadata, snitch, configOptions);
}
public List<InetAddress> calculateNaturalEndpoints(Token token, TokenMetadata metadata)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/SimpleStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SimpleStrategy.java b/src/java/org/apache/cassandra/locator/SimpleStrategy.java
index b19b1be..9a5062b 100644
--- a/src/java/org/apache/cassandra/locator/SimpleStrategy.java
+++ b/src/java/org/apache/cassandra/locator/SimpleStrategy.java
@@ -37,9 +37,9 @@ import org.apache.cassandra.dht.Token;
*/
public class SimpleStrategy extends AbstractReplicationStrategy
{
- public SimpleStrategy(String table, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
+ public SimpleStrategy(String keyspaceName, TokenMetadata tokenMetadata, IEndpointSnitch snitch, Map<String, String> configOptions)
{
- super(table, tokenMetadata, snitch, configOptions);
+ super(keyspaceName, tokenMetadata, snitch, configOptions);
}
public List<InetAddress> calculateNaturalEndpoints(Token token, TokenMetadata metadata)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 1f6682b..cf76718 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -656,13 +656,13 @@ public class TokenMetadata
return sortedTokens;
}
- private Multimap<Range<Token>, InetAddress> getPendingRangesMM(String table)
+ private Multimap<Range<Token>, InetAddress> getPendingRangesMM(String keyspaceName)
{
- Multimap<Range<Token>, InetAddress> map = pendingRanges.get(table);
+ Multimap<Range<Token>, InetAddress> map = pendingRanges.get(keyspaceName);
if (map == null)
{
map = HashMultimap.create();
- Multimap<Range<Token>, InetAddress> priorMap = pendingRanges.putIfAbsent(table, map);
+ Multimap<Range<Token>, InetAddress> priorMap = pendingRanges.putIfAbsent(keyspaceName, map);
if (priorMap != null)
map = priorMap;
}
@@ -670,15 +670,15 @@ public class TokenMetadata
}
/** a mutable map may be returned but caller should not modify it */
- public Map<Range<Token>, Collection<InetAddress>> getPendingRanges(String table)
+ public Map<Range<Token>, Collection<InetAddress>> getPendingRanges(String keyspaceName)
{
- return getPendingRangesMM(table).asMap();
+ return getPendingRangesMM(keyspaceName).asMap();
}
- public List<Range<Token>> getPendingRanges(String table, InetAddress endpoint)
+ public List<Range<Token>> getPendingRanges(String keyspaceName, InetAddress endpoint)
{
List<Range<Token>> ranges = new ArrayList<Range<Token>>();
- for (Map.Entry<Range<Token>, InetAddress> entry : getPendingRangesMM(table).entries())
+ for (Map.Entry<Range<Token>, InetAddress> entry : getPendingRangesMM(keyspaceName).entries())
{
if (entry.getValue().equals(endpoint))
{
@@ -688,9 +688,9 @@ public class TokenMetadata
return ranges;
}
- public void setPendingRanges(String table, Multimap<Range<Token>, InetAddress> rangeMap)
+ public void setPendingRanges(String keyspaceName, Multimap<Range<Token>, InetAddress> rangeMap)
{
- pendingRanges.put(table, rangeMap);
+ pendingRanges.put(keyspaceName, rangeMap);
}
public Token getPredecessor(Token token)
@@ -926,9 +926,9 @@ public class TokenMetadata
subscribers.remove(subscriber);
}
- public Collection<InetAddress> pendingEndpointsFor(Token token, String table)
+ public Collection<InetAddress> pendingEndpointsFor(Token token, String keyspaceName)
{
- Map<Range<Token>, Collection<InetAddress>> ranges = getPendingRanges(table);
+ Map<Range<Token>, Collection<InetAddress>> ranges = getPendingRanges(keyspaceName);
if (ranges.isEmpty())
return Collections.emptyList();
@@ -945,10 +945,10 @@ public class TokenMetadata
/**
* @deprecated retained for benefit of old tests
*/
- public Collection<InetAddress> getWriteEndpoints(Token token, String table, Collection<InetAddress> naturalEndpoints)
+ public Collection<InetAddress> getWriteEndpoints(Token token, String keyspaceName, Collection<InetAddress> naturalEndpoints)
{
ArrayList<InetAddress> endpoints = new ArrayList<InetAddress>();
- Iterables.addAll(endpoints, Iterables.concat(naturalEndpoints, pendingEndpointsFor(token, table)));
+ Iterables.addAll(endpoints, Iterables.concat(naturalEndpoints, pendingEndpointsFor(token, keyspaceName)));
return endpoints;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 7c7cfa6..bc27d6f 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -24,7 +24,7 @@ import com.yammer.metrics.core.Histogram;
import com.yammer.metrics.core.MetricName;
import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.io.sstable.SSTableMetadata;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.EstimatedHistogram;
@@ -162,7 +162,7 @@ public class ColumnFamilyMetrics
public Integer value()
{
// TODO this actually isn't a good measure of pending tasks
- return Table.switchLock.getQueueLength();
+ return Keyspace.switchLock.getQueueLength();
}
});
liveSSTableCount = Metrics.newGauge(factory.createMetricName("LiveSSTableCount"), new Gauge<Integer>()
@@ -322,7 +322,7 @@ public class ColumnFamilyMetrics
ColumnFamilyMetricNameFactory(ColumnFamilyStore cfs)
{
- this.keyspaceName = cfs.table.getName();
+ this.keyspaceName = cfs.keyspace.getName();
this.columnFamilyName = cfs.name;
isIndex = cfs.isIndex();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
index ae098ca..dd3803f 100644
--- a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
@@ -29,7 +29,7 @@ import com.yammer.metrics.core.MetricName;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.compaction.CompactionInfo;
import org.apache.cassandra.db.compaction.CompactionManager;
@@ -60,9 +60,9 @@ public class CompactionMetrics implements CompactionManager.CompactionExecutorSt
public Integer value()
{
int n = 0;
- for (String tableName : Schema.instance.getTables())
+ for (String keyspaceName : Schema.instance.getKeyspaces())
{
- for (ColumnFamilyStore cfs : Table.open(tableName).getColumnFamilyStores())
+ for (ColumnFamilyStore cfs : Keyspace.open(keyspaceName).getColumnFamilyStores())
n += cfs.getCompactionStrategy().getEstimatedRemainingTasks();
}
for (ThreadPoolExecutor collector : collectors)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index a12be19..1585342 100644
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
import org.apache.cassandra.db.HintedHandOffManager;
-import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.utils.UUIDGen;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@ public class HintedHandoffMetrics
if (diffrence == 0)
continue;
logger.warn("{} has {} dropped hints, because node is down past configured hint window.", entry.getKey(), diffrence);
- SystemTable.updateHintsDropped(entry.getKey(), UUIDGen.getTimeUUID(), (int) diffrence);
+ SystemKeyspace.updateHintsDropped(entry.getKey(), UUIDGen.getTimeUUID(), (int) diffrence);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/repair/RepairJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java
index be3744d..277075c 100644
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.db.SnapshotCommand;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.net.IAsyncCallback;
@@ -109,7 +109,7 @@ public class RepairJob
if (isSequential)
makeSnapshots(endpoints);
- this.gcBefore = Table.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(System.currentTimeMillis());
+ this.gcBefore = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily).gcBefore(System.currentTimeMillis());
for (InetAddress endpoint : allEndpoints)
treeRequests.add(endpoint);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index 3057a41..acc8aab 100644
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@ -18,7 +18,7 @@
package org.apache.cassandra.repair;
import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
@@ -43,7 +43,7 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage>
case VALIDATION_REQUEST:
ValidationRequest validationRequest = (ValidationRequest) message.payload;
// trigger read-only compaction
- ColumnFamilyStore store = Table.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily);
+ ColumnFamilyStore store = Keyspace.open(desc.keyspace).getColumnFamilyStore(desc.columnFamily);
Validator validator = new Validator(desc, message.from, validationRequest.gcBefore);
CompactionManager.instance.submitValidation(store, validator);
break;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
index 4670ce6..134894d 100644
--- a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
@@ -25,7 +25,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.Table;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.messages.SyncComplete;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index f944507..051085b 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.ReadCommand;
import org.apache.cassandra.db.ReadResponse;
import org.apache.cassandra.db.Row;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.exceptions.ReadTimeoutException;
import org.apache.cassandra.exceptions.UnavailableException;
import org.apache.cassandra.metrics.ReadRepairMetrics;
@@ -61,7 +61,7 @@ public abstract class AbstractReadExecutor
{
unfiltered = allReplicas;
this.endpoints = queryTargets;
- this.resolver = new RowDigestResolver(command.table, command.key);
+ this.resolver = new RowDigestResolver(command.ksName, command.key);
this.handler = new ReadCallback<ReadResponse, Row>(resolver, consistency_level, command, this.endpoints);
this.command = command;
this.cfs = cfs;
@@ -124,9 +124,9 @@ public abstract class AbstractReadExecutor
public static AbstractReadExecutor getReadExecutor(ReadCommand command, ConsistencyLevel consistency_level) throws UnavailableException
{
- Table table = Table.open(command.table);
- List<InetAddress> allReplicas = StorageProxy.getLiveSortedEndpoints(table, command.key);
- CFMetaData metaData = Schema.instance.getCFMetaData(command.table, command.cfName);
+ Keyspace keyspace = Keyspace.open(command.ksName);
+ List<InetAddress> allReplicas = StorageProxy.getLiveSortedEndpoints(keyspace, command.key);
+ CFMetaData metaData = Schema.instance.getCFMetaData(command.ksName, command.cfName);
ReadRepairDecision rrDecision = metaData.newReadRepairDecision();
@@ -134,14 +134,14 @@ public abstract class AbstractReadExecutor
ReadRepairMetrics.attempted.mark();
}
- List<InetAddress> queryTargets = consistency_level.filterForQuery(table, allReplicas, rrDecision);
+ List<InetAddress> queryTargets = consistency_level.filterForQuery(keyspace, allReplicas, rrDecision);
if (StorageService.instance.isClientMode())
{
return new DefaultReadExecutor(null, command, consistency_level, allReplicas, queryTargets);
}
- ColumnFamilyStore cfs = table.getColumnFamilyStore(command.cfName);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(command.cfName);
switch (metaData.getSpeculativeRetry().type)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/AbstractRowResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index b6204e2..2ebaaf1 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -33,14 +33,14 @@ public abstract class AbstractRowResolver implements IResponseResolver<ReadRespo
{
protected static final Logger logger = LoggerFactory.getLogger(AbstractRowResolver.class);
- protected final String table;
+ protected final String keyspaceName;
protected final Set<MessageIn<ReadResponse>> replies = new NonBlockingHashSet<MessageIn<ReadResponse>>();
protected final DecoratedKey key;
- public AbstractRowResolver(ByteBuffer key, String table)
+ public AbstractRowResolver(ByteBuffer key, String keyspaceName)
{
this.key = StorageService.getPartitioner().decorateKey(key);
- this.table = table;
+ this.keyspaceName = keyspaceName;
}
public boolean preprocess(MessageIn<ReadResponse> message)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index 1740ee2..95f9ac4 100644
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@ -25,7 +25,7 @@ import com.google.common.collect.Iterables;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ConsistencyLevel;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.net.IAsyncCallback;
@@ -35,7 +35,7 @@ import org.apache.cassandra.utils.SimpleCondition;
public abstract class AbstractWriteResponseHandler implements IAsyncCallback
{
private final SimpleCondition condition = new SimpleCondition();
- protected final Table table;
+ protected final Keyspace keyspace;
protected final long start;
protected final Collection<InetAddress> naturalEndpoints;
protected final ConsistencyLevel consistencyLevel;
@@ -47,14 +47,14 @@ public abstract class AbstractWriteResponseHandler implements IAsyncCallback
* @param pendingEndpoints
* @param callback A callback to be called when the write is successful.
*/
- protected AbstractWriteResponseHandler(Table table,
+ protected AbstractWriteResponseHandler(Keyspace keyspace,
Collection<InetAddress> naturalEndpoints,
Collection<InetAddress> pendingEndpoints,
ConsistencyLevel consistencyLevel,
Runnable callback,
WriteType writeType)
{
- this.table = table;
+ this.keyspace = keyspace;
this.pendingEndpoints = pendingEndpoints;
this.start = System.nanoTime();
this.consistencyLevel = consistencyLevel;
@@ -85,7 +85,7 @@ public abstract class AbstractWriteResponseHandler implements IAsyncCallback
{
// During bootstrap, we have to include the pending endpoints or we may fail the consistency level
// guarantees (see #833)
- return consistencyLevel.blockFor(table) + pendingEndpoints.size();
+ return consistencyLevel.blockFor(keyspace) + pendingEndpoints.size();
}
protected abstract int ackCount();
@@ -95,7 +95,7 @@ public abstract class AbstractWriteResponseHandler implements IAsyncCallback
public void assureSufficientLiveNodes() throws UnavailableException
{
- consistencyLevel.assureSufficientLiveNodes(table, Iterables.filter(Iterables.concat(naturalEndpoints, pendingEndpoints), isAlive));
+ consistencyLevel.assureSufficientLiveNodes(keyspace, Iterables.filter(Iterables.concat(naturalEndpoints, pendingEndpoints), isAlive));
}
protected void signal()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 53460b9..2f16b31 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -136,18 +136,18 @@ public class ActiveRepairService
/**
* Return all of the neighbors with whom we share the provided range.
*
- * @param table table to repair
+ * @param keyspaceName keyspace to repair
* @param toRepair token to repair
* @param isLocal need to use only nodes from local datacenter
*
* @return neighbors with whom we share the provided range
*/
- public static Set<InetAddress> getNeighbors(String table, Range<Token> toRepair, boolean isLocal)
+ public static Set<InetAddress> getNeighbors(String keyspaceName, Range<Token> toRepair, boolean isLocal)
{
StorageService ss = StorageService.instance;
- Map<Range<Token>, List<InetAddress>> replicaSets = ss.getRangeToAddressMap(table);
+ Map<Range<Token>, List<InetAddress>> replicaSets = ss.getRangeToAddressMap(keyspaceName);
Range<Token> rangeSuperSet = null;
- for (Range<Token> range : ss.getLocalRanges(table))
+ for (Range<Token> range : ss.getLocalRanges(keyspaceName))
{
if (range.contains(toRepair))
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7d22840..f49d549 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -227,14 +227,14 @@ public class CassandraDaemon
if (CacheService.instance == null) // should never happen
throw new RuntimeException("Failed to initialize Cache Service.");
- // check the system table to keep user from shooting self in foot by changing partitioner, cluster name, etc.
- // we do a one-off scrub of the system table first; we can't load the list of the rest of the tables,
- // until system table is opened.
- for (CFMetaData cfm : Schema.instance.getTableMetaData(Table.SYSTEM_KS).values())
- ColumnFamilyStore.scrubDataDirectories(Table.SYSTEM_KS, cfm.cfName);
+ // check the system keyspace to keep user from shooting self in foot by changing partitioner, cluster name, etc.
+ // we do a one-off scrub of the system keyspace first; we can't load the list of the rest of the keyspaces,
+ // until system keyspace is opened.
+ for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(Keyspace.SYSTEM_KS).values())
+ ColumnFamilyStore.scrubDataDirectories(Keyspace.SYSTEM_KS, cfm.cfName);
try
{
- SystemTable.checkHealth();
+ SystemKeyspace.checkHealth();
}
catch (ConfigurationException e)
{
@@ -245,16 +245,16 @@ public class CassandraDaemon
// load keyspace descriptions.
DatabaseDescriptor.loadSchemas();
- // clean up debris in the rest of the tables
- for (String table : Schema.instance.getTables())
+ // clean up debris in the rest of the keyspaces
+ for (String keyspaceName : Schema.instance.getKeyspaces())
{
- for (CFMetaData cfm : Schema.instance.getTableMetaData(table).values())
+ for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(keyspaceName).values())
{
- if (LegacyLeveledManifest.manifestNeedsMigration(table,cfm.cfName))
+ if (LegacyLeveledManifest.manifestNeedsMigration(keyspaceName,cfm.cfName))
{
try
{
- LegacyLeveledManifest.migrateManifests(table, cfm.cfName);
+ LegacyLeveledManifest.migrateManifests(keyspaceName, cfm.cfName);
}
catch (IOException e)
{
@@ -263,24 +263,24 @@ public class CassandraDaemon
}
}
- ColumnFamilyStore.scrubDataDirectories(table, cfm.cfName);
+ ColumnFamilyStore.scrubDataDirectories(keyspaceName, cfm.cfName);
}
}
// clean up compaction leftovers
- SetMultimap<Pair<String, String>, Integer> unfinishedCompactions = SystemTable.getUnfinishedCompactions();
+ SetMultimap<Pair<String, String>, Integer> unfinishedCompactions = SystemKeyspace.getUnfinishedCompactions();
for (Pair<String, String> kscf : unfinishedCompactions.keySet())
{
ColumnFamilyStore.removeUnfinishedCompactionLeftovers(kscf.left, kscf.right, unfinishedCompactions.get(kscf));
}
- SystemTable.discardCompactionsInProgress();
+ SystemKeyspace.discardCompactionsInProgress();
// initialize keyspaces
- for (String table : Schema.instance.getTables())
+ for (String keyspaceName : Schema.instance.getKeyspaces())
{
if (logger.isDebugEnabled())
- logger.debug("opening keyspace " + table);
+ logger.debug("opening keyspace " + keyspaceName);
// disable auto compaction until commit log replay ends
- for (ColumnFamilyStore cfs : Table.open(table).getColumnFamilyStores())
+ for (ColumnFamilyStore cfs : Keyspace.open(keyspaceName).getColumnFamilyStores())
{
for (ColumnFamilyStore store : cfs.concatWithIndexes())
{
@@ -315,9 +315,9 @@ public class CassandraDaemon
}
// enable auto compaction
- for (Table table : Table.all())
+ for (Keyspace keyspace : Keyspace.all())
{
- for (ColumnFamilyStore cfs : table.getColumnFamilyStores())
+ for (ColumnFamilyStore cfs : keyspace.getColumnFamilyStores())
{
for (final ColumnFamilyStore store : cfs.concatWithIndexes())
{
@@ -330,9 +330,9 @@ public class CassandraDaemon
{
public void run()
{
- for (Table table : Table.all())
+ for (Keyspace keyspaceName : Keyspace.all())
{
- for (ColumnFamilyStore cf : table.getColumnFamilyStores())
+ for (ColumnFamilyStore cf : keyspaceName.getColumnFamilyStores())
{
for (ColumnFamilyStore store : cf.concatWithIndexes())
CompactionManager.instance.submitBackground(store);
@@ -345,7 +345,7 @@ public class CassandraDaemon
// MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks
StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
- SystemTable.finishStartup();
+ SystemKeyspace.finishStartup();
// start server internals
StorageService.instance.registerDaemon(this);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index e911a3e..5f238c5 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.auth.*;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.db.SystemTable;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.exceptions.AuthenticationException;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.exceptions.UnauthorizedException;
@@ -56,13 +56,13 @@ public class ClientState
static
{
// We want these system cfs to be always readable since many tools rely on them (nodetool, cqlsh, bulkloader, etc.)
- String[] cfs = new String[] { SystemTable.LOCAL_CF,
- SystemTable.PEERS_CF,
- SystemTable.SCHEMA_KEYSPACES_CF,
- SystemTable.SCHEMA_COLUMNFAMILIES_CF,
- SystemTable.SCHEMA_COLUMNS_CF };
+ String[] cfs = new String[] { SystemKeyspace.LOCAL_CF,
+ SystemKeyspace.PEERS_CF,
+ SystemKeyspace.SCHEMA_KEYSPACES_CF,
+ SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF,
+ SystemKeyspace.SCHEMA_COLUMNS_CF };
for (String cf : cfs)
- READABLE_SYSTEM_RESOURCES.add(DataResource.columnFamily(Table.SYSTEM_KS, cf));
+ READABLE_SYSTEM_RESOURCES.add(DataResource.columnFamily(Keyspace.SYSTEM_KS, cf));
PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthenticator().protectedResources());
PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthorizer().protectedResources());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
index 4941d04..81ae1f3 100644
--- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.NetworkTopologyStrategy;
import org.apache.cassandra.net.MessageIn;
@@ -44,15 +44,15 @@ public class DatacenterSyncWriteResponseHandler extends AbstractWriteResponseHan
public DatacenterSyncWriteResponseHandler(Collection<InetAddress> naturalEndpoints,
Collection<InetAddress> pendingEndpoints,
ConsistencyLevel consistencyLevel,
- Table table,
+ Keyspace keyspace,
Runnable callback,
WriteType writeType)
{
// Response is been managed by the map so make it 1 for the superclass.
- super(table, naturalEndpoints, pendingEndpoints, consistencyLevel, callback, writeType);
+ super(keyspace, naturalEndpoints, pendingEndpoints, consistencyLevel, callback, writeType);
assert consistencyLevel == ConsistencyLevel.EACH_QUORUM;
- strategy = (NetworkTopologyStrategy) table.getReplicationStrategy();
+ strategy = (NetworkTopologyStrategy) keyspace.getReplicationStrategy();
for (String dc : strategy.getDatacenters())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
index e63ebd1..2455655 100644
--- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
@@ -21,7 +21,7 @@ import java.net.InetAddress;
import java.util.Collection;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.db.ConsistencyLevel;
@@ -37,11 +37,11 @@ public class DatacenterWriteResponseHandler extends WriteResponseHandler
public DatacenterWriteResponseHandler(Collection<InetAddress> naturalEndpoints,
Collection<InetAddress> pendingEndpoints,
ConsistencyLevel consistencyLevel,
- Table table,
+ Keyspace keyspace,
Runnable callback,
WriteType writeType)
{
- super(naturalEndpoints, pendingEndpoints, consistencyLevel, table, callback, writeType);
+ super(naturalEndpoints, pendingEndpoints, consistencyLevel, keyspace, callback, writeType);
assert consistencyLevel == ConsistencyLevel.LOCAL_QUORUM;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java
index cce674f..b24c3c1 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -292,7 +292,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber
{
protected void runMayThrow() throws IOException, ConfigurationException
{
- DefsTable.mergeSchema(schema);
+ DefsTables.mergeSchema(schema);
}
});
@@ -332,9 +332,9 @@ public class MigrationManager implements IEndpointStateChangeSubscriber
logger.debug("Truncating schema tables...");
// truncate schema tables
- SystemTable.schemaCFS(SystemTable.SCHEMA_KEYSPACES_CF).truncateBlocking();
- SystemTable.schemaCFS(SystemTable.SCHEMA_COLUMNFAMILIES_CF).truncateBlocking();
- SystemTable.schemaCFS(SystemTable.SCHEMA_COLUMNS_CF).truncateBlocking();
+ SystemKeyspace.schemaCFS(SystemKeyspace.SCHEMA_KEYSPACES_CF).truncateBlocking();
+ SystemKeyspace.schemaCFS(SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF).truncateBlocking();
+ SystemKeyspace.schemaCFS(SystemKeyspace.SCHEMA_COLUMNS_CF).truncateBlocking();
if (logger.isDebugEnabled())
logger.debug("Clearing local schema keyspace definitions...");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/MigrationTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/MigrationTask.java b/src/java/org/apache/cassandra/service/MigrationTask.java
index ac7c6be..df216ea 100644
--- a/src/java/org/apache/cassandra/service/MigrationTask.java
+++ b/src/java/org/apache/cassandra/service/MigrationTask.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.db.DefsTable;
+import org.apache.cassandra.db.DefsTables;
import org.apache.cassandra.db.RowMutation;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.net.IAsyncCallback;
@@ -63,7 +63,7 @@ class MigrationTask extends WrappedRunnable
{
try
{
- DefsTable.mergeSchema(message.payload);
+ DefsTables.mergeSchema(message.payload);
}
catch (IOException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
index 4aab87d..72ea69c 100644
--- a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
+++ b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
@@ -47,15 +47,15 @@ public class RangeSliceResponseResolver implements IResponseResolver<RangeSliceR
}
};
- private final String table;
+ private final String keyspaceName;
private final long timestamp;
private List<InetAddress> sources;
protected final Collection<MessageIn<RangeSliceReply>> responses = new ConcurrentLinkedQueue<MessageIn<RangeSliceReply>>();
public final List<AsyncOneResponse> repairResults = new ArrayList<AsyncOneResponse>();
- public RangeSliceResponseResolver(String table, long timestamp)
+ public RangeSliceResponseResolver(String keyspaceName, long timestamp)
{
- this.table = table;
+ this.keyspaceName = keyspaceName;
this.timestamp = timestamp;
}
@@ -160,7 +160,7 @@ public class RangeSliceResponseResolver implements IResponseResolver<RangeSliceR
}
// resolved can be null even if versions doesn't have all nulls because of the call to removeDeleted in resolveSuperSet
if (resolved != null)
- repairResults.addAll(RowDataResolver.scheduleRepairs(resolved, table, key, versions, versionSources));
+ repairResults.addAll(RowDataResolver.scheduleRepairs(resolved, keyspaceName, key, versions, versionSources));
versions.clear();
versionSources.clear();
return new Row(key, resolved);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/ReadCallback.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ReadCallback.java b/src/java/org/apache/cassandra/service/ReadCallback.java
index bd8b025..e50a1db 100644
--- a/src/java/org/apache/cassandra/service/ReadCallback.java
+++ b/src/java/org/apache/cassandra/service/ReadCallback.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ReadCommand;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.exceptions.ReadTimeoutException;
import org.apache.cassandra.exceptions.UnavailableException;
import org.apache.cassandra.metrics.ReadRepairMetrics;
@@ -55,22 +55,22 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag
private final IReadCommand command;
private final ConsistencyLevel consistencyLevel;
private final AtomicInteger received = new AtomicInteger(0);
- private final Table table; // TODO push this into ConsistencyLevel?
+ private final Keyspace keyspace; // TODO push this into ConsistencyLevel?
/**
* Constructor when response count has to be calculated and blocked for.
*/
public ReadCallback(IResponseResolver<TMessage, TResolved> resolver, ConsistencyLevel consistencyLevel, IReadCommand command, List<InetAddress> filteredEndpoints)
{
- this(resolver, consistencyLevel, consistencyLevel.blockFor(Table.open(command.getKeyspace())), command, Table.open(command.getKeyspace()), filteredEndpoints);
+ this(resolver, consistencyLevel, consistencyLevel.blockFor(Keyspace.open(command.getKeyspace())), command, Keyspace.open(command.getKeyspace()), filteredEndpoints);
if (logger.isTraceEnabled())
logger.trace(String.format("Blockfor is %s; setting up requests to %s", blockfor, StringUtils.join(this.endpoints, ",")));
}
- private ReadCallback(IResponseResolver<TMessage, TResolved> resolver, ConsistencyLevel consistencyLevel, int blockfor, IReadCommand command, Table table, List<InetAddress> endpoints)
+ private ReadCallback(IResponseResolver<TMessage, TResolved> resolver, ConsistencyLevel consistencyLevel, int blockfor, IReadCommand command, Keyspace keyspace, List<InetAddress> endpoints)
{
this.command = command;
- this.table = table;
+ this.keyspace = keyspace;
this.blockfor = blockfor;
this.consistencyLevel = consistencyLevel;
this.resolver = resolver;
@@ -80,7 +80,7 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag
public ReadCallback<TMessage, TResolved> withNewResolver(IResponseResolver<TMessage, TResolved> newResolver)
{
- return new ReadCallback<TMessage, TResolved>(newResolver, consistencyLevel, blockfor, command, table, endpoints);
+ return new ReadCallback<TMessage, TResolved>(newResolver, consistencyLevel, blockfor, command, keyspace, endpoints);
}
public boolean await(long timePastStart, TimeUnit unit)
@@ -157,7 +157,7 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag
public void assureSufficientLiveNodes() throws UnavailableException
{
- consistencyLevel.assureSufficientLiveNodes(table, endpoints);
+ consistencyLevel.assureSufficientLiveNodes(keyspace, endpoints);
}
public boolean isLatencyForSnitch()
@@ -186,7 +186,7 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag
ReadRepairMetrics.repairedBackground.mark();
ReadCommand readCommand = (ReadCommand) command;
- final RowDataResolver repairResolver = new RowDataResolver(readCommand.table, readCommand.key, readCommand.filter(), readCommand.timestamp);
+ final RowDataResolver repairResolver = new RowDataResolver(readCommand.ksName, readCommand.key, readCommand.filter(), readCommand.timestamp);
AsyncRepairCallback repairHandler = new AsyncRepairCallback(repairResolver, endpoints.size());
MessageOut<ReadCommand> message = ((ReadCommand) command).createMessage();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/RowDataResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RowDataResolver.java b/src/java/org/apache/cassandra/service/RowDataResolver.java
index 69cd381..00f8753 100644
--- a/src/java/org/apache/cassandra/service/RowDataResolver.java
+++ b/src/java/org/apache/cassandra/service/RowDataResolver.java
@@ -41,9 +41,9 @@ public class RowDataResolver extends AbstractRowResolver
private final IDiskAtomFilter filter;
private final long timestamp;
- public RowDataResolver(String table, ByteBuffer key, IDiskAtomFilter qFilter, long timestamp)
+ public RowDataResolver(String keyspaceName, ByteBuffer key, IDiskAtomFilter qFilter, long timestamp)
{
- super(key, table);
+ super(key, keyspaceName);
this.filter = qFilter;
this.timestamp = timestamp;
}
@@ -88,7 +88,7 @@ public class RowDataResolver extends AbstractRowResolver
// send updates to any replica that was missing part of the full row
// (resolved can be null even if versions doesn't have all nulls because of the call to removeDeleted in resolveSuperSet)
if (resolved != null)
- repairResults = scheduleRepairs(resolved, table, key, versions, endpoints);
+ repairResults = scheduleRepairs(resolved, keyspaceName, key, versions, endpoints);
}
else
{
@@ -105,7 +105,7 @@ public class RowDataResolver extends AbstractRowResolver
* For each row version, compare with resolved (the superset of all row versions);
* if it is missing anything, send a mutation to the endpoint it come from.
*/
- public static List<AsyncOneResponse> scheduleRepairs(ColumnFamily resolved, String table, DecoratedKey key, List<ColumnFamily> versions, List<InetAddress> endpoints)
+ public static List<AsyncOneResponse> scheduleRepairs(ColumnFamily resolved, String keyspaceName, DecoratedKey key, List<ColumnFamily> versions, List<InetAddress> endpoints)
{
List<AsyncOneResponse> results = new ArrayList<AsyncOneResponse>(versions.size());
@@ -116,7 +116,7 @@ public class RowDataResolver extends AbstractRowResolver
continue;
// create and send the row mutation message based on the diff
- RowMutation rowMutation = new RowMutation(table, key.key, diffCf);
+ RowMutation rowMutation = new RowMutation(keyspaceName, key.key, diffCf);
MessageOut repairMessage;
// use a separate verb here because we don't want these to be get the white glove hint-
// on-timeout behavior that a "real" mutation gets
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/RowDigestResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RowDigestResolver.java b/src/java/org/apache/cassandra/service/RowDigestResolver.java
index 7c4e394..bc4cf49 100644
--- a/src/java/org/apache/cassandra/service/RowDigestResolver.java
+++ b/src/java/org/apache/cassandra/service/RowDigestResolver.java
@@ -27,9 +27,9 @@ import org.apache.cassandra.net.MessageIn;
public class RowDigestResolver extends AbstractRowResolver
{
- public RowDigestResolver(String table, ByteBuffer key)
+ public RowDigestResolver(String keyspaceName, ByteBuffer key)
{
- super(key, table);
+ super(key, keyspaceName);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
index ca8ea02..a231737 100644
--- a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
+++ b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.UntypedResultSet;
-import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.slf4j.Logger;
@@ -74,7 +74,7 @@ class RangeTransfer implements Runnable
public void run()
{
- UntypedResultSet res = processInternal("SELECT * FROM system." + SystemTable.RANGE_XFERS_CF);
+ UntypedResultSet res = processInternal("SELECT * FROM system." + SystemKeyspace.RANGE_XFERS_CF);
if (res.size() < 1)
{
@@ -104,7 +104,7 @@ class RangeTransfer implements Runnable
{
LOG.debug("Removing queued entry for transfer of {}", token);
processInternal(String.format("DELETE FROM system.%s WHERE token_bytes = '%s'",
- SystemTable.RANGE_XFERS_CF,
+ SystemKeyspace.RANGE_XFERS_CF,
ByteBufferUtil.bytesToHex(tokenBytes)));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e96e585/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
index a24164f..718c79f 100644
--- a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.SnapshotCommand;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessageOut;
@@ -36,9 +36,9 @@ public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
{
SnapshotCommand command = message.payload;
if (command.clear_snapshot)
- Table.open(command.keyspace).clearSnapshot(command.snapshot_name);
+ Keyspace.open(command.keyspace).clearSnapshot(command.snapshot_name);
else
- Table.open(command.keyspace).getColumnFamilyStore(command.column_family).snapshot(command.snapshot_name);
+ Keyspace.open(command.keyspace).getColumnFamilyStore(command.column_family).snapshot(command.snapshot_name);
Tracing.trace("Enqueuing response to snapshot request {} to {}", command.snapshot_name, message.from);
MessagingService.instance().sendReply(new MessageOut(MessagingService.Verb.REQUEST_RESPONSE), id, message.from);
}