You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/06/05 23:57:49 UTC
[1/2] git commit: Fix rare potential NPE in HHOM page size calculation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 00b5c36cc -> 1e77219f7
Fix rare potential NPE in HHOM page size calculation
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7354
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e49abaf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e49abaf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e49abaf
Branch: refs/heads/cassandra-2.0
Commit: 1e49abaf9cbc0833146f30c32ab574cd892aa0a4
Parents: dc73f21
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jun 5 18:50:04 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jun 6 00:54:49 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/HintedHandOffManager.java | 19 +++++++++----------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e49abaf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 40eee1b..a6ea188 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * Fix rare potential NPE in HHOM page size calculation (CASSANDRA-7354)
* Fix handling of empty counter replication mutations (CASSANDRA-7144)
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
* Set keepalive on MessagingService connections (CASSANDRA-7170)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e49abaf/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index a7a3e06..58702df 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -431,20 +431,19 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
}
}
+ // read less columns (mutations) per page if they are very large
private int calculatePageSize()
{
- // read less columns (mutations) per page if they are very large
int meanColumnCount = hintStore.getMeanColumns();
- if (meanColumnCount > 0)
- {
- int averageColumnSize = (int) (hintStore.getMeanRowSize() / meanColumnCount);
- // page size of 1 does not allow actual paging b/c of >= behavior on startColumn
- return Math.max(2, Math.min(PAGE_SIZE, DatabaseDescriptor.getInMemoryCompactionLimit() / averageColumnSize));
- }
- else
- {
+ if (meanColumnCount <= 0)
return PAGE_SIZE;
- }
+
+ int averageColumnSize = (int) (hintStore.getMeanRowSize() / meanColumnCount);
+ if (averageColumnSize <= 0)
+ return PAGE_SIZE;
+
+ // page size of 1 does not allow actual paging b/c of >= behavior on startColumn
+ return Math.max(2, Math.min(PAGE_SIZE, DatabaseDescriptor.getInMemoryCompactionLimit() / averageColumnSize));
}
/**
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e77219f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e77219f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e77219f
Branch: refs/heads/cassandra-2.0
Commit: 1e77219f78860e1b2d622faaf99d1989628e2672
Parents: 00b5c36 1e49aba
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Jun 6 00:56:50 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Jun 6 00:56:50 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/HintedHandOffManager.java | 19 +++++++++----------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e77219f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0d716a6,a6ea188..38a3e4b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,8 +1,64 @@@
-1.2.17
+2.0.9
+ * Add per-CF range read request latency metrics (CASSANDRA-7338)
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
+ * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+Merged from 1.2:
+ * Fix rare potential NPE in HHOM page size calculation (CASSANDRA-7354)
- * Fix handling of empty counter replication mutations (CASSANDRA-7144)
+ * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
- * Set keepalive on MessagingService connections (CASSANDRA-7170)
+ * Fix handling of empty counter replication mutations (CASSANDRA-7144)
+
+
+2.0.8
+ * Always reallocate buffers in HSHA (CASSANDRA-6285)
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
+ * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
+ * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
+ * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
+ * Fix disabling autocompaction (CASSANDRA-7187)
+ * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
+ * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
+ * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
+ * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
+ * Fix the InvertedIndex trigger example (CASSANDRA-7211)
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
+ * Make batchlog replica selection rack-aware (CASSANDRA-6551)
+ * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
+ * Set JMX RMI port to 7199 (CASSANDRA-7087)
+ * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
+ * Log a warning for large batches (CASSANDRA-6487)
+ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+ * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
+ * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
+ * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
+ * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
+ * Re-add parameter columns to tracing session (CASSANDRA-6942)
+ * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
+ * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
+ * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
+ * reduce garbage on codec flag deserialization (CASSANDRA-7244)
+ * Proper null handle for IF with map element access (CASSANDRA-7155)
+ * Improve compaction visibility (CASSANDRA-7242)
+ * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
+ * Invalid key cache entries on DROP (CASSANDRA-6525)
+ * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
+Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
* Add Google Compute Engine snitch (CASSANDRA-7132)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e77219f/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------