natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into trunk

This commit is contained in:
Sam Tunnicliffe 2015-10-28 09:41:01 +00:00
parent 5995de3b63 5bc3c4b6d5
commit 81183d6e2f
8 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -5,6 +5,7 @@
3.0
* Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)
* Fix batches on multiple tables (CASSANDRA-10554)
* Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569)
* Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)

2
src/java/org/apache/cassandra/db/ReadCommand.java
View File

@ -340,7 +340,7 @@ public abstract class ReadCommand extends MonitorableImpl implements ReadQuery
Index.Searcher searcher = index == null ? null : index.searcherFor(this);
if (index != null)
Tracing.trace("Executing read on {}.{} using index {}", cfs.metadata.ksName, cfs.metadata.cfName, index.getIndexName());
Tracing.trace("Executing read on {}.{} using index {}", cfs.metadata.ksName, cfs.metadata.cfName, index.getIndexMetadata().name);
UnfilteredPartitionIterator resultIterator = searcher == null
? queryStorage(cfs, executionController)

6
src/java/org/apache/cassandra/index/Index.java
View File

@ -143,12 +143,6 @@ public interface Index
*/
public void register(IndexRegistry registry);
/**
* Return an identifier for the index. This should be unique across all indexes on a given base table
* @return the name of the index
*/
public String getIndexName();
/**
* If the index implementation uses a local table to store its index data this method should return a
* handle to it. If not, an empty Optional should be returned. Typically, this is useful for the built-in

23
src/java/org/apache/cassandra/index/SecondaryIndexManager.java
View File

@ -159,7 +159,10 @@ public class SecondaryIndexManager implements IndexRegistry
{
Index index = createInstance(indexDef);
index.register(this);
final Callable<?> initialBuildTask = index.getInitializationTask();
// if the index didn't register itself, we can probably assume that no initialization needs to happen
final Callable<?> initialBuildTask = indexes.containsKey(indexDef.name)
? index.getInitializationTask()
: null;
return initialBuildTask == null
? Futures.immediateFuture(null)
: asyncExecutor.submit(initialBuildTask);
@ -223,7 +226,7 @@ public class SecondaryIndexManager implements IndexRegistry
public void rebuildIndexesBlocking(Collection<SSTableReader> sstables, Set<String> indexNames)
{
Set<Index> toRebuild = indexes.values().stream()
.filter(index -> indexNames.contains(index.getIndexName()))
.filter(index -> indexNames.contains(index.getIndexMetadata().name))
.filter(Index::shouldBuildBlocking)
.collect(Collectors.toSet());
if (toRebuild.isEmpty())
@ -232,11 +235,11 @@ public class SecondaryIndexManager implements IndexRegistry
return;
}
toRebuild.forEach(indexer -> markIndexRemoved(indexer.getIndexName()));
toRebuild.forEach(indexer -> markIndexRemoved(indexer.getIndexMetadata().name));
buildIndexesBlocking(sstables, toRebuild);
toRebuild.forEach(indexer -> markIndexBuilt(indexer.getIndexName()));
toRebuild.forEach(indexer -> markIndexBuilt(indexer.getIndexMetadata().name));
}
public void buildAllIndexesBlocking(Collection<SSTableReader> sstables)
@ -256,7 +259,7 @@ public class SecondaryIndexManager implements IndexRegistry
Refs<SSTableReader> sstables = viewFragment.refs)
{
buildIndexesBlocking(sstables, Collections.singleton(index));
markIndexBuilt(index.getIndexName());
markIndexBuilt(index.getIndexMetadata().name);
}
}
}
@ -338,7 +341,7 @@ public class SecondaryIndexManager implements IndexRegistry
return;
logger.info("Submitting index build of {} for data in {}",
indexes.stream().map(Index::getIndexName).collect(Collectors.joining(",")),
indexes.stream().map(i -> i.getIndexMetadata().name).collect(Collectors.joining(",")),
sstables.stream().map(SSTableReader::toString).collect(Collectors.joining(",")));
SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs,
@ -349,7 +352,7 @@ public class SecondaryIndexManager implements IndexRegistry
flushIndexesBlocking(indexes);
logger.info("Index build of {} complete",
indexes.stream().map(Index::getIndexName).collect(Collectors.joining(",")));
indexes.stream().map(i -> i.getIndexMetadata().name).collect(Collectors.joining(",")));
}
private void markIndexBuilt(String indexName)
@ -461,7 +464,7 @@ public class SecondaryIndexManager implements IndexRegistry
{
Set<String> allIndexNames = new HashSet<>();
indexes.values().stream()
.map(Index::getIndexName)
.map(i -> i.getIndexMetadata().name)
.forEach(allIndexNames::add);
return SystemKeyspace.getBuiltIndexes(baseCfs.keyspace.getName(), allIndexNames);
}
@ -618,9 +621,9 @@ public class SecondaryIndexManager implements IndexRegistry
if (Tracing.isTracing())
{
Tracing.trace("Index mean cardinalities are {}. Scanning with {}.",
searchableIndexes.stream().map(i -> i.getIndexName() + ':' + i.getEstimatedResultRows())
searchableIndexes.stream().map(i -> i.getIndexMetadata().name + ':' + i.getEstimatedResultRows())
.collect(Collectors.joining(",")),
selected.getIndexName());
selected.getIndexMetadata().name);
}
return selected;
}

19
src/java/org/apache/cassandra/index/internal/CassandraIndex.java
View File

@ -160,11 +160,6 @@ public abstract class CassandraIndex implements Index
return metadata;
}
public String getIndexName()
{
return metadata.name;
}
public Optional<ColumnFamilyStore> getBackingTable()
{
return indexCfs == null ? Optional.empty() : Optional.of(indexCfs);
@ -583,7 +578,7 @@ public abstract class CassandraIndex implements Index
throw new InvalidRequestException(String.format(
"Cannot index value of size %d for index %s on %s.%s(%s) (maximum allowed size=%d)",
value.remaining(),
getIndexName(),
metadata.name,
baseCfs.metadata.ksName,
baseCfs.metadata.cfName,
indexedColumn.name.toString(),
@ -634,17 +629,17 @@ public abstract class CassandraIndex implements Index
private boolean isBuilt()
{
return SystemKeyspace.isIndexBuilt(baseCfs.keyspace.getName(), getIndexName());
return SystemKeyspace.isIndexBuilt(baseCfs.keyspace.getName(), metadata.name);
}
private void markBuilt()
{
SystemKeyspace.setIndexBuilt(baseCfs.keyspace.getName(), getIndexName());
SystemKeyspace.setIndexBuilt(baseCfs.keyspace.getName(), metadata.name);
}
private void markRemoved()
{
SystemKeyspace.setIndexRemoved(baseCfs.keyspace.getName(), getIndexName());
SystemKeyspace.setIndexRemoved(baseCfs.keyspace.getName(), metadata.name);
}
private boolean isPrimaryKeyIndex()
@ -672,13 +667,13 @@ public abstract class CassandraIndex implements Index
logger.info("No SSTable data for {}.{} to build index {} from, marking empty index as built",
baseCfs.metadata.ksName,
baseCfs.metadata.cfName,
getIndexName());
metadata.name);
markBuilt();
return;
}
logger.info("Submitting index build of {} for data in {}",
getIndexName(),
metadata.name,
getSSTableNames(sstables));
SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs,
@ -689,7 +684,7 @@ public abstract class CassandraIndex implements Index
indexCfs.forceBlockingFlush();
markBuilt();
}
logger.info("Index build of {} complete", getIndexName());
logger.info("Index build of {} complete", metadata.name);
}
private static String getSSTableNames(Collection<SSTableReader> sstables)

2
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
View File

@ -480,7 +480,7 @@ public class RangeTombstoneTest
StubIndex index = (StubIndex)cfs.indexManager.listIndexes()
.stream()
.filter(i -> "test_index".equals(i.getIndexName()))
.filter(i -> "test_index".equals(i.getIndexMetadata().name))
.findFirst()
.orElseThrow(() -> new RuntimeException(new AssertionError("Index not found")));
index.reset();

5
test/unit/org/apache/cassandra/index/StubIndex.java
View File

@ -151,11 +151,6 @@ public class StubIndex implements Index
return indexMetadata;
}
public String getIndexName()
{
return indexMetadata != null ? indexMetadata.name : "default_test_index_name";
}
public void register(IndexRegistry registry){
registry.registerIndex(this);
}

20
test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
View File

@ -105,12 +105,6 @@ public class CustomCassandraIndex implements Index
return metadata;
}
public String getIndexName()
{
// should return metadata.name, see CASSANDRA-10127
return indexCfs.name;
}
public Optional<ColumnFamilyStore> getBackingTable()
{
return indexCfs == null ? Optional.empty() : Optional.of(indexCfs);
@ -564,7 +558,7 @@ public class CustomCassandraIndex implements Index
throw new InvalidRequestException(String.format(
"Cannot index value of size %d for index %s on %s.%s(%s) (maximum allowed size=%d)",
value.remaining(),
getIndexName(),
metadata.name,
baseCfs.metadata.ksName,
baseCfs.metadata.cfName,
indexedColumn.name.toString(),
@ -615,17 +609,17 @@ public class CustomCassandraIndex implements Index
private boolean isBuilt()
{
return SystemKeyspace.isIndexBuilt(baseCfs.keyspace.getName(), getIndexName());
return SystemKeyspace.isIndexBuilt(baseCfs.keyspace.getName(), metadata.name);
}
private void markBuilt()
{
SystemKeyspace.setIndexBuilt(baseCfs.keyspace.getName(), getIndexName());
SystemKeyspace.setIndexBuilt(baseCfs.keyspace.getName(), metadata.name);
}
private void markRemoved()
{
SystemKeyspace.setIndexRemoved(baseCfs.keyspace.getName(), getIndexName());
SystemKeyspace.setIndexRemoved(baseCfs.keyspace.getName(), metadata.name);
}
private boolean isPrimaryKeyIndex()
@ -653,13 +647,13 @@ public class CustomCassandraIndex implements Index
logger.info("No SSTable data for {}.{} to build index {} from, marking empty index as built",
baseCfs.metadata.ksName,
baseCfs.metadata.cfName,
getIndexName());
metadata.name);
markBuilt();
return;
}
logger.info("Submitting index build of {} for data in {}",
getIndexName(),
metadata.name,
getSSTableNames(sstables));
SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs,
@ -670,7 +664,7 @@ public class CustomCassandraIndex implements Index
indexCfs.forceBlockingFlush();
markBuilt();
}
logger.info("Index build of {} complete", getIndexName());
logger.info("Index build of {} complete", metadata.name);
}
private static String getSSTableNames(Collection<SSTableReader> sstables)