Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/BulkLoader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc0831c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc0831c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc0831c6
Branch: refs/heads/trunk
Commit: cc0831c608d14747b809027144710003cf38a98a
Parents: d469b4b ae380da
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Jan 20 00:46:52 2015 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Jan 20 00:46:52 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0831c6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ff62d2,6604783..494376d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,59 -1,8 +1,60 @@@
-2.0.13:
+2.1.3
+ * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
+ * Fix NPE when passing wrong argument in ALTER TABLE statement
(CASSANDRA-8355)
+ * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
+ * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
+ * Fix case-sensitivity of index name on CREATE and DROP INDEX
+ statements (CASSANDRA-8365)
+ * Better detection/logging for corruption in compressed sstables
(CASSANDRA-8192)
+ * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
+ * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
+ * Properly calculate expected write size during compaction (CASSANDRA-8532)
+ * Invalidate affected prepared statements when a table's columns
+ are altered (CASSANDRA-7910)
+ * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
+ * Fix regression in SSTableRewriter causing some rows to become unreadable
+ during compaction (CASSANDRA-8429)
+ * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
+ * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
+ is disabled (CASSANDRA-8288)
+ * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
+ * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
+ * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
+ * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
+ * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
+ * Disable mmap on Windows (CASSANDRA-6993)
+ * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
+ * Add auth support to cassandra-stress (CASSANDRA-7985)
+ * Fix ArrayIndexOutOfBoundsException when generating error message
+ for some CQL syntax errors (CASSANDRA-8455)
+ * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
+ * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
+ * Ensure memtable flush cannot expire commit log entries from its future
(CASSANDRA-8383)
+ * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries
(CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+ * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
+Merged from 2.0:
+ * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
-
-
-2.0.12:
* Use more efficient slice size for querying internal secondary
index tables (CASSANDRA-8550)
* Fix potentially returning deleted rows with range tombstone
(CASSANDRA-8558)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0831c6/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java
index 84870a0,8e9cfb3..f15c86d
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@@ -230,26 -201,10 +230,26 @@@ public class BulkLoade
}
}
- private int mbPerSec(long bytes, long timeInMs)
+ private int mbPerSec(long bytes, long timeInNano)
{
- double bytesPerMs = ((double)bytes) / timeInMs;
- return (int)((bytesPerMs * 1000) / (1024 * 1024));
+ double bytesPerNano = ((double)bytes) / timeInNano;
- return (int)((bytesPerNano * 1000 * 1000 * 1000) / (1024 * 2024));
++ return (int)((bytesPerNano * 1000 * 1000 * 1000) / (1024 * 1024));
+ }
+
+ private void printSummary(int connectionsPerHost)
+ {
+ long end = System.nanoTime();
+ long durationMS = ((end - start) / (1000000));
+ int average = mbPerSec(lastProgress, (end - start));
+ StringBuilder sb = new StringBuilder();
+ sb.append("\nSummary statistics: \n");
+ sb.append(String.format(" %-30s: %-10d%n", "Connections per
host: ", connectionsPerHost));
+ sb.append(String.format(" %-30s: %-10d%n", "Total files
transferred: ", totalFiles));
+ sb.append(String.format(" %-30s: %-10d%n", "Total bytes
transferred: ", lastProgress));
+ sb.append(String.format(" %-30s: %-10d%n", "Total duration
(ms): ", durationMS));
+ sb.append(String.format(" %-30s: %-10d%n", "Average transfer
rate (MB/s): ", + average));
+ sb.append(String.format(" %-30s: %-10d%n", "Peak transfer rate
(MB/s): ", + peak));
+ System.err.println(sb.toString());
}
}
