cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 24 Mar 2015 16:42:51 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh


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

Branch: refs/heads/cassandra-2.1
Commit: 9d2b2730ebe3206bd594d07073e34fffa087fbf5
Parents: 6b979f3 061ea33
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Mar 24 11:42:38 2015 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Mar 24 11:42:38 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 bin/cqlsh   | 3 +++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d2b2730/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e85b622,2073b00..06a3c3f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,6 +1,63 @@@
 -2.0.14:
 +2.1.4
 + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * (cqlsh) Allow increasing CSV field size limit through
+    cqlshrc config option (CASSANDRA-8934)
   * Stop logging range tombstones when exceeding the threshold
     (CASSANDRA-8559)
   * Fix NullPointerException when nodetool getendpoints is run

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d2b2730/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index fdf6ce1,a165dca..a2ea41f
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -2117,19 -1961,13 +2117,21 @@@ def read_options(cmdlineargs, environme
                                                  DEFAULT_COMPLETEKEY)
      optvalues.color = option_with_default(configs.getboolean, 'ui', 'color')
      optvalues.time_format = raw_option_with_default(configs, 'ui', 'time_format',
 -                                                    DEFAULT_TIME_FORMAT)
 +                                                    DEFAULT_TIMESTAMP_FORMAT)
 +    optvalues.nanotime_format = raw_option_with_default(configs, 'ui', 'nanotime_format',
 +                                                    DEFAULT_NANOTIME_FORMAT)
 +    optvalues.date_format = raw_option_with_default(configs, 'ui', 'date_format',
 +                                                    DEFAULT_DATE_FORMAT)
      optvalues.float_precision = option_with_default(configs.getint, 'ui', 'float_precision',
                                                      DEFAULT_FLOAT_PRECISION)
+     optvalues.field_size_limit = option_with_default(configs.getint, 'csv', 'field_size_limit',
csv.field_size_limit())
 +    optvalues.max_trace_wait = option_with_default(configs.getfloat, 'tracing', 'max_trace_wait',
 +                                                   DEFAULT_MAX_TRACE_WAIT)
+ 
      optvalues.debug = False
      optvalues.file = None
 +    optvalues.ssl = False
 +
      optvalues.tty = sys.stdin.isatty()
      optvalues.cqlversion = option_with_default(configs.get, 'cql', 'version', DEFAULT_CQLVER)
      optvalues.execute = None


Mime
View raw message