cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 29 Oct 2014 23:20:08 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3ca6880
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ca6880
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3ca6880

Branch: refs/heads/cassandra-2.1
Commit: f3ca6880b6e5e46eacb50d1f640878ef8f1b76e6
Parents: 6f1b749 62386f1
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Oct 29 18:19:40 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Oct 29 18:19:40 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +
 .../io/sstable/SSTableDeletingTask.java         |  4 +-
 .../cassandra/db/ColumnFamilyMetricTest.java    | 74 ++++++++++++++++++++
 3 files changed, 79 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ca6880/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 274d07a,4387d81..2333b89
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,99 -3,12 +12,102 @@@ Merged from 2.0
   * Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
   * Throw ConfigurationException when hsha is used with the default
     rpc_max_threads setting of 'unlimited' (CASSANDRA-8116)
+  * Allow concurrent writing of the same table in the same JVM using
+    CQLSSTableWriter (CASSANDRA-7463)
+  * Fix totalDiskSpaceUsed calculation (CASSANDRA-8205)
  
  
 -2.0.11:
 +2.1.1
 + * Fix spin loop in AtomicSortedColumns (CASSANDRA-7546)
 + * Dont notify when replacing tmplink files (CASSANDRA-8157)
 + * Fix validation with multiple CONTAINS clause (CASSANDRA-8131)
 + * Fix validation of collections in TriggerExecutor (CASSANDRA-8146)
 + * Fix IllegalArgumentException when a list of IN values containing tuples
 +   is passed as a single arg to a prepared statement with the v1 or v2
 +   protocol (CASSANDRA-8062)
 + * Fix ClassCastException in DISTINCT query on static columns with
 +   query paging (CASSANDRA-8108)
 + * Fix NPE on null nested UDT inside a set (CASSANDRA-8105)
 + * Fix exception when querying secondary index on set items or map keys
 +   when some clustering columns are specified (CASSANDRA-8073)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future (CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
 + * Shutdown JVM on OOM (CASSANDRA-7507)
 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
 + * Don't duplicate sstables smaller than split size when using
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction (CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 + * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
 + * Fix snapshot repair error on indexed tables (CASSANDRA-8020)
 + * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
 + * Stream to private IP when available (CASSANDRA-8084)
 +Merged from 2.0:
   * Reject conditions on DELETE unless full PK is given (CASSANDRA-6430)
   * Properly reject the token function DELETE (CASSANDRA-7747)
   * Force batchlog replay before decommissioning a node (CASSANDRA-7446)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ca6880/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
index 785e23b,ec20fe5..d95dff7
--- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
@@@ -51,17 -50,8 +50,16 @@@ public class SSTableDeletingTask implem
      public SSTableDeletingTask(SSTableReader referent)
      {
          this.referent = referent;
 -        this.desc = referent.descriptor;
 -        this.components = referent.components;
 +        if (referent.openReason == SSTableReader.OpenReason.EARLY)
 +        {
 +            this.desc = referent.descriptor.asType(Descriptor.Type.TEMPLINK);
 +            this.components = Sets.newHashSet(Component.DATA, Component.PRIMARY_INDEX);
 +        }
 +        else
 +        {
 +            this.desc = referent.descriptor;
 +            this.components = referent.components;
 +        }
-         this.size = referent.bytesOnDisk();
      }
  
      public void setTracker(DataTracker tracker)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ca6880/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index 0000000,da58ea4..e3e81d8
mode 000000,100644..100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@@ -1,0 -1,73 +1,74 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package org.apache.cassandra.db;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.Collection;
+ 
+ import org.junit.Test;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.io.sstable.SSTableReader;
+ import org.apache.cassandra.utils.ByteBufferUtil;
+ 
+ import static org.junit.Assert.assertEquals;
++import static org.apache.cassandra.Util.cellname;
+ 
+ public class ColumnFamilyMetricTest extends SchemaLoader
+ {
+     @Test
+     public void testSizeMetric()
+     {
+         Keyspace keyspace = Keyspace.open("Keyspace1");
+         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
+         store.disableAutoCompaction();
+ 
+         store.truncateBlocking();
+ 
+         assertEquals(0, store.metric.liveDiskSpaceUsed.count());
+         assertEquals(0, store.metric.totalDiskSpaceUsed.count());
+ 
+         for (int j = 0; j < 10; j++)
+         {
+             ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
 -            RowMutation rm = new RowMutation("Keyspace1", key);
 -            rm.add("Standard1", ByteBufferUtil.bytes("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER,
j);
++            Mutation rm = new Mutation("Keyspace1", key);
++            rm.add("Standard2", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+             rm.apply();
+         }
+         store.forceBlockingFlush();
+         Collection<SSTableReader> sstables = store.getSSTables();
+         long size = 0;
+         for (SSTableReader reader : sstables)
+         {
+             size += reader.bytesOnDisk();
+         }
+ 
+         // size metrics should show the sum of all SSTable sizes
+         assertEquals(size, store.metric.liveDiskSpaceUsed.count());
+         assertEquals(size, store.metric.totalDiskSpaceUsed.count());
+ 
+         store.truncateBlocking();
+ 
+         // after truncate, size metrics should be down to 0
+         assertEquals(0, store.metric.liveDiskSpaceUsed.count());
+         assertEquals(0, store.metric.totalDiskSpaceUsed.count());
+ 
+         store.enableAutoCompaction();
+     }
+ 
+ }


Mime
View raw message