You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/07/25 00:47:55 UTC
[39/41] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ca3e28c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ca3e28c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ca3e28c
Branch: refs/heads/cassandra-3.9
Commit: 7ca3e28cd562349058752f3095805076f88a303f
Parents: ed90148 c3bf2f4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Jul 25 08:42:41 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Jul 25 08:45:04 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 3 +-
bin/cqlsh.py | 50 ++++++++-----------
...andra-driver-internal-only-3.0.0-6af642d.zip | Bin 228893 -> 0 bytes
...driver-internal-only-3.5.0.post0-d8d0456.zip | Bin 0 -> 245487 bytes
pylib/cqlshlib/copyutil.py | 23 ++++++---
pylib/cqlshlib/test/run_cqlsh.py | 2 +
pylib/cqlshlib/test/test_cqlsh_output.py | 3 +-
pylib/cqlshlib/tracing.py | 2 +-
8 files changed, 44 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b86935,15898df..298dd57
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,39 -4,6 +7,40 @@@ Merged from 3.0
to connect with too low of a protocol version (CASSANDRA-11464)
* NullPointerExpception when reading/compacting table (CASSANDRA-11988)
* Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
+Merged from 2.2:
+ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
-
++Merged from 2.1:
++ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+
+3.8
+ * Fix hdr logging for single operation workloads (CASSANDRA-12145)
+ * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
+ * Increase size of flushExecutor thread pool (CASSANDRA-12071)
+ * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
+ * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
+ * Improve details in compaction log message (CASSANDRA-12080)
+ * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
+ * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993)
+ * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579)
+ * Move skip_stop_words filter before stemming (CASSANDRA-12078)
+ * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
+ * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
+ * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966)
+ * Add cross-DC latency metrics (CASSANDRA-11596)
+ * Allow terms in selection clause (CASSANDRA-10783)
+ * Add bind variables to trace (CASSANDRA-11719)
+ * Switch counter shards' clock to timestamps (CASSANDRA-9811)
+ * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
+ * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
+ * Support older ant versions (CASSANDRA-11807)
+ * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
+ * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
+ * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
+ * Faster streaming (CASSANDRA-9766)
+ * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
+ * Add repaired percentage metric (CASSANDRA-11503)
+ * Add Change-Data-Capture (CASSANDRA-8844)
+Merged from 3.0:
* Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
* Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
* Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/bin/cqlsh.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/copyutil.py
index e408c53,85d9cff..768a41a
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1466,9 -1464,7 +1470,8 @@@ class ExportProcess(ChildProcess)
def __init__(self, params):
ChildProcess.__init__(self, params=params, target=self.run)
options = params['options']
- self.encoding = options.copy['encoding']
- self.float_precision = options.copy['float_precision']
+ self.float_precision = options.copy['floatprecision']
+ self.double_precision = options.copy['doubleprecision']
self.nullval = options.copy['nullval']
self.max_requests = options.copy['maxrequests']
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/pylib/cqlshlib/test/run_cqlsh.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/test/run_cqlsh.py
index b011df4,b011df4..fa010fe
--- a/pylib/cqlshlib/test/run_cqlsh.py
+++ b/pylib/cqlshlib/test/run_cqlsh.py
@@@ -189,6 -189,6 +189,8 @@@ class ProcRunner
flags=0, ptty_timeout=None):
if not isinstance(until, re._pattern_type):
until = re.compile(until, flags)
++
++ cqlshlog.debug("Searching for %r" % (until.pattern,))
got = self.readbuf
self.readbuf = ''
with timing_out(timeout):
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/pylib/cqlshlib/test/test_cqlsh_output.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/test/test_cqlsh_output.py
index 9936f50,d905095..8dba651
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@@ -620,6 -620,6 +620,7 @@@ class TestCqlshOutput(BaseTestCase)
varintcol varint
) WITH bloom_filter_fp_chance = 0.01
AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
++ AND cdc = false
AND comment = ''
AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}
AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca3e28c/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------