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

Add documentation for 7017

This commit is contained in:
Sylvain Lebresne 2016-04-07 12:00:00 +02:00
parent 2fbddbd992
commit e1e692a754
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/cql3/CQL.textile
View File

@ -1029,6 +1029,7 @@ bc(syntax)..
FROM <tablename>
( WHERE <where-clause> )?
( ORDER BY <order-by> )?
( PER PARTITION LIMIT <integer> )?
( LIMIT <integer> )?
( ALLOW FILTERING )?
@ -1147,9 +1148,9 @@ The @ORDER BY@ option allows to select the order of the returned results. It tak
* if the table has been defined without any specific @CLUSTERING ORDER@, then then allowed orderings are the order induced by the clustering columns and the reverse of that one.
* otherwise, the orderings allowed are the order of the @CLUSTERING ORDER@ option and the reversed one.
h4(#selectLimit). @LIMIT@
h4(#selectLimit). @LIMIT@ and @PER PARTITION LIMIT@
The @LIMIT@ option to a @SELECT@ statement limits the number of rows returned by a query.
The @LIMIT@ option to a @SELECT@ statement limits the number of rows returned by a query, while the @PER PARTITION LIMIT@ option limits the number of rows returned for a given partition by the query. Note that both type of limit can used in the same statement.
h4(#selectAllowFiltering). @ALLOW FILTERING@
@ -2315,6 +2316,7 @@ h3. 3.4.2
* "@INSERT/UPDATE options@":#updateOptions for tables having a default_time_to_live specifying a TTL of 0 will remove the TTL from the inserted or updated values
* "@ALTER TABLE@":#alterTableStmt @ADD@ and @DROP@ now allow mutiple columns to be added/removed
* New "@PER PARTITION LIMIT@":#selectLimit option (see "CASSANDRA-7017":https://issues.apache.org/jira/browse/CASSANDRA-7017).
h3. 3.4.1

2
src/java/org/apache/cassandra/cql3/QueryProcessor.java
View File

@ -59,7 +59,7 @@ import org.github.jamm.MemoryMeter;
public class QueryProcessor implements QueryHandler
{
public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.4.0");
public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.4.2");
public static final QueryProcessor instance = new QueryProcessor();

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

@ -857,7 +857,7 @@ public class SelectStatement implements CQLStatement
isReversed,
orderingComparator,
prepareLimit(boundNames, limit, keyspace(), limitReceiver()),
prepareLimit(boundNames, perPartitionLimit, keyspace(), limitReceiver()));
prepareLimit(boundNames, perPartitionLimit, keyspace(), perPartitionLimitReceiver()));
return new ParsedStatement.Prepared(stmt, boundNames, boundNames.getPartitionKeyBindIndexes(cfm));
}
@ -1055,6 +1055,11 @@ public class SelectStatement implements CQLStatement
return new ColumnSpecification(keyspace(), columnFamily(), new ColumnIdentifier("[limit]", true), Int32Type.instance);
}
private ColumnSpecification perPartitionLimitReceiver()
{
return new ColumnSpecification(keyspace(), columnFamily(), new ColumnIdentifier("[per_partition_limit]", true), Int32Type.instance);
}
@Override
public String toString()
{