Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b127679 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b127679 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b127679 Branch: refs/heads/trunk Commit: 6b12767912c6b2e54a1abf1773aa68ccd638de81 Parents: 20c5ea0 04a2c24 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed May 6 12:51:14 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed May 6 12:54:44 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/UpdateStatement.java | 21 +- .../AbstractSimplePerColumnSecondaryIndex.java | 8 +- .../db/index/PerColumnSecondaryIndex.java | 5 + .../db/index/PerRowSecondaryIndex.java | 7 + .../cassandra/db/index/SecondaryIndex.java | 2 +- .../db/index/SecondaryIndexManager.java | 8 +- .../cassandra/thrift/CassandraServer.java | 6 +- .../cassandra/thrift/ThriftValidation.java | 18 +- .../cql3/IndexedValuesValidationTest.java | 103 +++++++-- .../db/SecondaryIndexCellSizeTest.java | 223 ------------------- .../cassandra/thrift/ThriftValidationTest.java | 20 +- 12 files changed, 145 insertions(+), 277 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ab92aa0,09bdfb1..dae32db --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,104 -1,5 +1,105 @@@ +3.0 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358) + * Disable memory mapping of hsperfdata file for JVM statistics (CASSANDRA-9242) + * Add pre-startup checks to detect potential incompatibilities (CASSANDRA-8049) + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304) + * Add user/role permissions for user-defined functions (CASSANDRA-7557) + * Allow cassandra config to be updated to restart daemon without unloading classes (CASSANDRA-9046) + * Don't initialize compaction writer before checking if iter is empty (CASSANDRA-9117) + * Don't execute any functions at prepare-time (CASSANDRA-9037) + * Share file handles between all instances of a SegmentedFile (CASSANDRA-8893) + * Make it possible to major compact LCS (CASSANDRA-7272) + * Make FunctionExecutionException extend RequestExecutionException + (CASSANDRA-9055) + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), fromJson() + functions (CASSANDRA-7970) + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920) + * Constrain internode message buffer sizes, and improve IO class hierarchy (CASSANDRA-8670) + * New tool added to validate all sstables in a node (CASSANDRA-5791) + * Push notification when tracing completes for an operation (CASSANDRA-7807) + * Delay "node up" and "node added" notifications until native protocol server is started (CASSANDRA-8236) + * Compressed Commit Log (CASSANDRA-6809) + * Optimise IntervalTree (CASSANDRA-8988) + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212) + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149) + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789) + * Add WriteFailureException to native protocol, notify coordinator of + write failures (CASSANDRA-8592) + * Convert SequentialWriter to nio (CASSANDRA-8709) + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 8761, 8850) + * Record client ip address in tracing sessions (CASSANDRA-8162) + * Indicate partition key columns in response metadata for prepared + statements (CASSANDRA-7660) + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759) + * Avoid memory allocation when searching index summary (CASSANDRA-8793) + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730) + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836) + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714) + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268) + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657) + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438) + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707) + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560) + * Support direct buffer decompression for reads (CASSANDRA-8464) + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039) + * Group sstables for anticompaction correctly (CASSANDRA-8578) + * Add ReadFailureException to native protocol, respond + immediately when replicas encounter errors while handling + a read request (CASSANDRA-7886) + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308) + * Allow mixing token and partition key restrictions (CASSANDRA-7016) + * Support index key/value entries on map collections (CASSANDRA-8473) + * Modernize schema tables (CASSANDRA-8261) + * Support for user-defined aggregation functions (CASSANDRA-8053) + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419) + * Refactor SelectStatement, return IN results in natural order instead + of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981) + * Support UDTs, tuples, and collections in user-defined + functions (CASSANDRA-7563) + * Fix aggregate fn results on empty selection, result column name, + and cqlsh parsing (CASSANDRA-8229) + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer + APIs (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any partition key column (CASSANDRA-7855) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063, 7813, 7708) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * Improve concurrency of repair (CASSANDRA-6455, 8208) + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614) + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096) + * Generalize progress reporting (CASSANDRA-8901) + * Resumable bootstrap streaming (CASSANDRA-8838, CASSANDRA-8942) + * Allow scrub for secondary index (CASSANDRA-5174) + * Save repair data to system table (CASSANDRA-5839) + * fix nodetool names that reference column families (CASSANDRA-8872) + 2.1.6 - * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) ++ * Validate the indexed column rather than the cell's contents. (CASSANDRA-9057) * Add support for top-k custom 2i queries (CASSANDRA-8717) * Fix error when dropping table during compaction (CASSANDRA-9251) * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java index 67958cf,06282ad..ad46a0f --- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java @@@ -118,12 -117,13 +119,13 @@@ public class UpdateStatement extends Mo } /** - * Checks that the value of the indexed columns is valid. + * Checks if the values of the indexed columns are valid. * + * @param key row key for the column family * @param cf the column family - * @throws InvalidRequestException if one of the values is invalid + * @throws InvalidRequestException if one of the values of the indexed columns is not valid */ - private void validateIndexedColumns(ColumnFamily cf) - private void validateIndexedColumns(ByteBuffer key, ColumnFamily cf) throws InvalidRequestException ++ private void validateIndexedColumns(ByteBuffer key, ColumnFamily cf) { SecondaryIndexManager indexManager = Keyspace.open(cfm.ksName).getColumnFamilyStore(cfm.cfId).indexManager; if (indexManager.hasIndexes()) @@@ -131,12 -131,15 +133,15 @@@ for (Cell cell : cf) { // Indexed values must be validated by any applicable index. See CASSANDRA-3057/4240/8081 for more details - if (!indexManager.validate(cell)) - throw invalidRequest("Can't index column value of size %d for index %s on %s.%s", - cell.value().remaining(), - cfm.getColumnDefinition(cell.name()).getIndexName(), - cfm.ksName, - cfm.cfName); + SecondaryIndex failedIndex = indexManager.validate(key, cell); + if (failedIndex != null) + { - throw new InvalidRequestException(String.format("Can't index column value of size %d for index %s on %s.%s", - cell.value().remaining(), - failedIndex.getIndexName(), - cfm.ksName, - cfm.cfName)); ++ throw invalidRequest(String.format("Can't index column value of size %d for index %s on %s.%s", ++ cell.value().remaining(), ++ failedIndex.getIndexName(), ++ cfm.ksName, ++ cfm.cfName)); + } } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/db/index/SecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java index 5df2c47,744fd89..c693f7c --- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java +++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java @@@ -20,46 -20,25 +20,45 @@@ package org.apache.cassandra.thrift * */ -import org.apache.cassandra.db.marshal.LongType; -import org.apache.cassandra.exceptions.*; ++import java.nio.ByteBuffer; ++import java.util.Arrays; ++ +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.*; -import org.apache.cassandra.db.marshal.AsciiType; +import org.apache.cassandra.db.marshal.*; - import org.apache.cassandra.exceptions.*; ++import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.locator.NetworkTopologyStrategy; +import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.utils.ByteBufferUtil; - import org.apache.thrift.TException; - - import java.io.IOException; - import java.util.Arrays; -import java.nio.ByteBuffer; -import java.util.Arrays; - --import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; ++import static org.junit.Assert.assertNotNull; -public class ThriftValidationTest extends SchemaLoader +public class ThriftValidationTest { + public static final String KEYSPACE1 = "MultiSliceTest"; + public static final String CF_STANDARD = "Standard1"; + public static final String CF_COUNTER = "Counter1"; + public static final String CF_UUID = "UUIDKeys"; + public static final String CF_STANDARDLONG3 = "StandardLong3"; + + @BeforeClass + public static void defineSchema() throws ConfigurationException + { + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, + SimpleStrategy.class, + KSMetaData.optsWithRF(1), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_UUID).keyValidator(UUIDType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLONG3, IntegerType.instance)); + } + @Test(expected=org.apache.cassandra.exceptions.InvalidRequestException.class) public void testValidateCommutativeWithStandard() throws org.apache.cassandra.exceptions.InvalidRequestException {
