cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Fri, 01 Apr 2016 17:37:30 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5

Conflicts:
	CHANGES.txt
	pylib/cqlshlib/copyutil.py


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

Branch: refs/heads/trunk
Commit: 496418ce07705010c41b6674a564d90d9a2402bc
Parents: af9b9cd 98086b6
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Apr 1 12:32:01 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Apr 1 12:32:01 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                |   1 +
 bin/cqlsh.py               |   2 +-
 conf/cqlshrc.sample        |   2 +-
 pylib/cqlshlib/copyutil.py | 267 +++++++++++++++++++++++++---------------
 4 files changed, 168 insertions(+), 104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/496418ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 73d9ab5,482c41a..35e4884
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.5
 +3.5
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397)
 +Merged from 3.0:
+  * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
   * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
   * Upgrade ohc to 0.4.3
   * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/496418ce/bin/cqlsh.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/496418ce/conf/cqlshrc.sample
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/496418ce/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/copyutil.py
index 0cae396,53bbe09..3dd7485
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -278,8 -329,13 +329,14 @@@ class CopyTask(object)
          copy_options['ratefile'] = safe_normpath(opts.pop('ratefile', ''))
          copy_options['maxoutputsize'] = int(opts.pop('maxoutputsize', '-1'))
          copy_options['preparedstatements'] = bool(opts.pop('preparedstatements', 'true').lower()
== 'true')
 +        copy_options['ttl'] = int(opts.pop('ttl', -1))
  
+         # Hidden properties, they do not appear in the documentation but can be set in config
files
+         # or on the cmd line but w/o completion
+         copy_options['maxinflightmessages'] = int(opts.pop('maxinflightmessages', '512'))
+         copy_options['maxbackoffattempts'] = int(opts.pop('maxbackoffattempts', '12'))
+         copy_options['maxpendingchunks'] = int(opts.pop('maxpendingchunks', '24'))
+ 
          self.check_options(copy_options)
          return CopyOptions(copy=copy_options, dialect=dialect_options, unrecognized=opts)
  
@@@ -2033,7 -2087,9 +2091,10 @@@ class ImportProcess(ChildProcess)
          self.min_batch_size = options.copy['minbatchsize']
          self.max_batch_size = options.copy['maxbatchsize']
          self.use_prepared_statements = options.copy['preparedstatements']
 +        self.ttl = options.copy['ttl']
+         self.max_inflight_messages = options.copy['maxinflightmessages']
+         self.max_backoff_attempts = options.copy['maxbackoffattempts']
+ 
          self.dialect_options = options.dialect
          self._session = None
          self.query = None


Mime
View raw message