cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/6] git commit: merge from 1.1
Date Fri, 19 Apr 2013 13:35:39 GMT
merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 813a937b2f1e84a96d45a6ace35d8ec1de7bf68d
Parents: 83ff1da 7d36c1e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Apr 19 08:35:06 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Apr 19 08:35:06 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 src/java/org/apache/cassandra/db/Memtable.java     |   12 ++++++-
 .../org/apache/cassandra/utils/SlabAllocator.java  |   23 ++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 80c9b44,30a09c9..7fc93f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,11 +1,85 @@@
 -1.1.12
 +1.2.5
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
 + * Allow empty blob literals in CQL3 (CASSANDRA-5452)
 + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
 + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
 +Merged from 1.1
   * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
+  * Use allocator information to improve memtable memory usage estimate 
+    (CASSANDRA-5497)
 + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
  
  
 -1.1.11
 - * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366)
 + * Optimize min/max timestamp collection (CASSANDRA-5373)
 + * Invalid streamId in cql binary protocol when using invalid CL 
 +   (CASSANDRA-5164)
 + * Fix validation for IN where clauses with collections (CASSANDRA-5376)
 + * Copy resultSet on count query to avoid ConcurrentModificationException 
 +   (CASSANDRA-5382)
 + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
 + * Fix streaming compressed files when using encryption (CASSANDRA-5391)
 + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
 + * Fix writetime/ttl functions on null values (CASSANDRA-5341)
 + * Fix NPE during cql3 select with token() (CASSANDRA-5404)
 + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
 + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
 + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
 + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
 + * Fix potential incremental backups race (CASSANDRA-5410)
 + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
 + * Allow overriding superuser setup delay (CASSANDRA-5430)
 + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
 +Merged from 1.1:
 + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
 + * Fix cf name extraction from manifest in Directories.migrateFile() 
 +   (CASSANDRA-5242)
 + * Support pluggable internode authentication (CASSANDRA-5401)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol support to stress (CASSANDRA-4993)
 + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
 + * Fix repair -pr for vnodes (CASSANDRA-5329)
 + * Relax CL for auth queries for non-default users (CASSANDRA-5310)
 + * Fix AssertionError during repair (CASSANDRA-5245)
 + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
 +Merged from 1.1:
   * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
   * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
   * fix logging of "Found table data in data directories" when only system tables

http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 301c297,a713cac..282acd2
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -150,7 -120,18 +150,15 @@@ public class Memtabl
  
      public long getLiveSize()
      {
-         return (long) (currentSize.get() * cfs.liveRatio);
 -
 -        // 25% fudge factor on the base throughput * liveRatio calculation.  (Based on observed
 -        // pre-slabbing behavior -- not sure what accounts for this. May have changed with
introduction of slabbing.)
 -        long estimatedSize = (long) (currentSize.get() * cfs.liveRatio * 1.25);
++        long estimatedSize = (long) (currentSize.get() * cfs.liveRatio);
+ 
+         // cap the estimate at both ends by what the allocator can tell us
+         if (estimatedSize < allocator.getMinimumSize())
+             return allocator.getMinimumSize();
+         if (estimatedSize > allocator.getMaximumSize())
+             return allocator.getMaximumSize();
+ 
+         return estimatedSize;
      }
  
      public long getSerializedSize()
@@@ -228,7 -220,7 +236,7 @@@
                          cfs.liveRatio = (cfs.liveRatio + newRatio) / 2.0;
  
                      logger.info("{} liveRatio is {} (just-counted was {}).  calculation
took {}ms for {} columns",
--                                new Object[]{ cfs, cfs.liveRatio, newRatio, System.currentTimeMillis()
- start, objects });
++                                cfs, cfs.liveRatio, newRatio, System.currentTimeMillis()
- start, objects);
                      activelyMeasuring = null;
                  }
                  finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------


Mime
View raw message