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

Don't allow secondary indexes on materialized views 

This commit also fixes a problem with AlterViewStatement not updating
view options correctly.

Patch by Sam Tunnicliffe and Paulo Motta; reviewed by Aleksey Yeschenko
for CASSANDRA-9921
This commit is contained in:
Sam Tunnicliffe 2015-09-17 13:00:52 +01:00
parent 1b823ec2c1
commit 106b1cdabe
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/cassandra-driver-core-3.0.0-alpha3-7b60bed-SNAPSHOT-shaded.jar → lib/cassandra-driver-core-3.0.0-alpha3-b6aa814-SNAPSHOT-shaded.jar
View File

Binary file not shown.

7
src/java/org/apache/cassandra/cql3/statements/AlterViewStatement.java
View File

@ -61,22 +61,21 @@ public class AlterViewStatement extends SchemaAlteringStatement
if (!meta.isView())
throw new InvalidRequestException("Cannot use ALTER MATERIALIZED VIEW on Table");
ViewDefinition view = Schema.instance.getView(keyspace(), columnFamily());
ViewDefinition viewCopy = view.copy();
ViewDefinition viewCopy = Schema.instance.getView(keyspace(), columnFamily()).copy();
if (attrs == null)
throw new InvalidRequestException("ALTER MATERIALIZED VIEW WITH invoked, but no parameters found");
attrs.validate();
TableParams params = attrs.asAlteredTableParams(view.metadata.params);
TableParams params = attrs.asAlteredTableParams(viewCopy.metadata.params);
if (params.gcGraceSeconds == 0)
{
throw new InvalidRequestException("Cannot alter gc_grace_seconds of a materialized view to 0, since this " +
"value is used to TTL undelivered updates. Setting gc_grace_seconds too " +
"low might cause undelivered updates to expire before being replayed.");
}
view.metadata.params(params);
viewCopy.metadata.params(params);
MigrationManager.announceViewUpdate(viewCopy, isLocalOnly);
return true;

3
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
View File

@ -78,6 +78,9 @@ public class CreateIndexStatement extends SchemaAlteringStatement
if (cfm.isCounter())
throw new InvalidRequestException("Secondary indexes are not supported on counter tables");
if (cfm.isView())
throw new InvalidRequestException("Secondary indexes are not supported on materialized views");
if (cfm.isCompactTable() && !cfm.isStaticCompactTable())
throw new InvalidRequestException("Secondary indexes are not supported on COMPACT STORAGE tables that have clustering columns");