You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/10/28 10:45:02 UTC
[1/3] cassandra git commit: Secondary indexes which aren't registered
are not initialized
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 27ca4915e -> 5bc3c4b6d
refs/heads/trunk 5995de3b6 -> 81183d6e2
Secondary indexes which aren't registered are not initialized
This commit also removes Index::getIndexName in favour of accessing
IndexMetadata.name directly
Patch by Sam Tunnicliffe; reviewed by Sergio Bossa for CASSANDRA-10595
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bc3c4b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bc3c4b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bc3c4b6
Branch: refs/heads/cassandra-3.0
Commit: 5bc3c4b6d5fe10f08395bfb2f860d90b0a0e2ed8
Parents: 27ca491
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Oct 26 18:37:18 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Oct 28 09:38:43 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 6 -----
.../cassandra/index/SecondaryIndexManager.java | 23 +++++++++++---------
.../index/internal/CassandraIndex.java | 19 ++++++----------
.../apache/cassandra/db/RangeTombstoneTest.java | 2 +-
.../org/apache/cassandra/index/StubIndex.java | 5 -----
.../index/internal/CustomCassandraIndex.java | 20 ++++++-----------
8 files changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b81b6e..dd7949e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 4d9b65b..2eb1d1d 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -337,7 +337,7 @@ public abstract class ReadCommand 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, orderGroup)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/Index.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/Index.java b/src/java/org/apache/cassandra/index/Index.java
index 3ceec13..0f4ecbd 100644
--- a/src/java/org/apache/cassandra/index/Index.java
+++ b/src/java/org/apache/cassandra/index/Index.java
@@ -144,12 +144,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
* Index implementations.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 87b47d9..7d866df 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -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;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
index 93f5d61..7b9d18f 100644
--- a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
+++ b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
@@ -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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 95f38c1..a6ee48f 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/index/StubIndex.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/index/StubIndex.java b/test/unit/org/apache/cassandra/index/StubIndex.java
index 05c860a..834ff87 100644
--- a/test/unit/org/apache/cassandra/index/StubIndex.java
+++ b/test/unit/org/apache/cassandra/index/StubIndex.java
@@ -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);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
index cbcf069..2dc9535 100644
--- a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
+++ b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
@@ -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)
[2/3] cassandra git commit: Secondary indexes which aren't registered
are not initialized
Posted by sa...@apache.org.
Secondary indexes which aren't registered are not initialized
This commit also removes Index::getIndexName in favour of accessing
IndexMetadata.name directly
Patch by Sam Tunnicliffe; reviewed by Sergio Bossa for CASSANDRA-10595
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bc3c4b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bc3c4b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bc3c4b6
Branch: refs/heads/trunk
Commit: 5bc3c4b6d5fe10f08395bfb2f860d90b0a0e2ed8
Parents: 27ca491
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Oct 26 18:37:18 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Oct 28 09:38:43 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 6 -----
.../cassandra/index/SecondaryIndexManager.java | 23 +++++++++++---------
.../index/internal/CassandraIndex.java | 19 ++++++----------
.../apache/cassandra/db/RangeTombstoneTest.java | 2 +-
.../org/apache/cassandra/index/StubIndex.java | 5 -----
.../index/internal/CustomCassandraIndex.java | 20 ++++++-----------
8 files changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b81b6e..dd7949e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 4d9b65b..2eb1d1d 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -337,7 +337,7 @@ public abstract class ReadCommand 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, orderGroup)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/Index.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/Index.java b/src/java/org/apache/cassandra/index/Index.java
index 3ceec13..0f4ecbd 100644
--- a/src/java/org/apache/cassandra/index/Index.java
+++ b/src/java/org/apache/cassandra/index/Index.java
@@ -144,12 +144,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
* Index implementations.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index 87b47d9..7d866df 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -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;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
index 93f5d61..7b9d18f 100644
--- a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
+++ b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
@@ -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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 95f38c1..a6ee48f 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/index/StubIndex.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/index/StubIndex.java b/test/unit/org/apache/cassandra/index/StubIndex.java
index 05c860a..834ff87 100644
--- a/test/unit/org/apache/cassandra/index/StubIndex.java
+++ b/test/unit/org/apache/cassandra/index/StubIndex.java
@@ -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);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bc3c4b6/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
index cbcf069..2dc9535 100644
--- a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
+++ b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
@@ -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)
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81183d6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81183d6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81183d6e
Branch: refs/heads/trunk
Commit: 81183d6e2ff2501b43c68b0add16e7b4120cd2d4
Parents: 5995de3 5bc3c4b
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Oct 28 09:41:01 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Oct 28 09:41:01 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 6 -----
.../cassandra/index/SecondaryIndexManager.java | 23 +++++++++++---------
.../index/internal/CassandraIndex.java | 19 ++++++----------
.../apache/cassandra/db/RangeTombstoneTest.java | 2 +-
.../org/apache/cassandra/index/StubIndex.java | 5 -----
.../index/internal/CustomCassandraIndex.java | 20 ++++++-----------
8 files changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 90db555,dd7949e..238d6b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+3.2
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index f50a8cf,2eb1d1d..6675428
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -340,11 -337,11 +340,11 @@@ public abstract class ReadCommand exten
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, orderGroup)
- : searcher.search(orderGroup);
+ ? queryStorage(cfs, executionController)
+ : searcher.search(executionController);
try
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/src/java/org/apache/cassandra/index/Index.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/test/unit/org/apache/cassandra/index/StubIndex.java
----------------------------------------------------------------------