cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [19/23] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 15 Jan 2018 14:07:53 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 685dde10e3a6b4a27936893840f536fa25ae9da5
Parents: 51bf518 503aec7
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Jan 15 06:01:38 2018 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Jan 15 06:03:22 2018 -0800

----------------------------------------------------------------------
 CHANGES.txt                    |  3 ++-
 bin/cqlsh.py                   |  8 ++++++--
 pylib/cqlshlib/copyutil.py     |  8 ++++----
 pylib/cqlshlib/cql3handling.py | 20 ++++++++++++++++++++
 pylib/cqlshlib/displaying.py   |  1 +
 pylib/cqlshlib/formatting.py   | 13 +++++++++++++
 pylib/cqlshlib/pylexotron.py   |  1 +
 pylib/cqlshlib/wcwidth.py      |  3 +++
 8 files changed, 50 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/685dde10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0453ddd,055a35d..8696653
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,67 -2,11 +25,68 @@@ Merged from 2.2
   * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
   * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
-- * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
+ Merged from 2.1:
+  * More PEP8 compliance for cqlsh (CASSANDRA-14021)
  
 -2.2.11
 +
 +3.0.15
 + * Improve TRUNCATE performance (CASSANDRA-13909)
 + * Implement short read protection on partition boundaries (CASSANDRA-13595)
 + * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries (CASSANDRA-13911)
 + * Filter header only commit logs before recovery (CASSANDRA-13918)
 + * AssertionError prepending to a list (CASSANDRA-13149)
 + * Fix support for SuperColumn tables (CASSANDRA-12373)
 + * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 + * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
 + * Improve short read protection performance (CASSANDRA-13794)
 + * Fix sstable reader to support range-tombstone-marker for multi-slices (CASSANDRA-13787)
 + * Fix short read protection for tables with no clustering columns (CASSANDRA-13880)
 + * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619)
 + * Prevent integer overflow of timestamps in CellTest and RowsTest (CASSANDRA-13866)
 + * Fix counter application order in short read protection (CASSANDRA-12872)
 + * Don't block RepairJob execution on validation futures (CASSANDRA-13797)
 + * Wait for all management tasks to complete before shutting down CLSM (CASSANDRA-13123)
 + * INSERT statement fails when Tuple type is used as clustering column with default DESC
order (CASSANDRA-13717)
 + * Fix pending view mutations handling and cleanup batchlog when there are local and remote
paired mutations (CASSANDRA-13069)
 + * Improve config validation and documentation on overflow and NPE (CASSANDRA-13622)
 + * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 + * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
 + * Better handle corrupt final commitlog segment (CASSANDRA-11995)
 + * StreamingHistogram is not thread safe (CASSANDRA-13756)
 + * Fix MV timestamp issues (CASSANDRA-11500)
 + * Better tolerate improperly formatted bcrypt hashes (CASSANDRA-13626) 
 + * Fix race condition in read command serialization (CASSANDRA-13363)
 + * Enable segement creation before recovering commitlogs (CASSANDRA-13587)
 + * Fix AssertionError in short read protection (CASSANDRA-13747)
 + * Don't skip corrupted sstables on startup (CASSANDRA-13620)
 + * Fix the merging of cells with different user type versions (CASSANDRA-13776)
 + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
 + * Potential AssertionError during ReadRepair of range tombstone and partition deletions
(CASSANDRA-13719)
 + * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
 + * Gossip thread slows down when using batch commit log (CASSANDRA-12966)
 + * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
 + * Fix digest calculation for counter cells (CASSANDRA-13750)
 + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump
to use type.toJSONString() (CASSANDRA-13573)
 + * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
 + * Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
 + * Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
 + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
 + * Fix invalid writetime for null cells (CASSANDRA-13711)
 + * Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
 + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize (Backport CASSANDRA-13329)
 + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696)
 + * Purge tombstones created by expired cells (CASSANDRA-13643)
 + * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482)
 + * Set test.runners based on cores and memory size (CASSANDRA-13078)
 + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 + * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
 + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
 +Merged from 2.2:
   * Safely handle empty buffers when outputting to JSON (CASSANDRA-13868)
   * Copy session properties on cqlsh.py do_login (CASSANDRA-13847)
   * Fix load over calculated issue in IndexSummaryRedistribution (CASSANDRA-13738)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/685dde10/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/685dde10/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 2a8b560,8224ad9..0f42e6e
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -34,8 -34,9 +34,9 @@@ class UnexpectedTableStructure(UserWarn
      def __str__(self):
          return 'Unexpected table structure; may not translate correctly to CQL. ' + self.msg
  
+ 
 -SYSTEM_KEYSPACES = ('system', 'system_traces', 'system_auth', 'system_distributed')
 -NONALTERBALE_KEYSPACES = ('system')
 +SYSTEM_KEYSPACES = ('system', 'system_schema', 'system_traces', 'system_auth', 'system_distributed')
 +NONALTERBALE_KEYSPACES = ('system', 'system_schema')
  
  
  class Cql3ParsingRuleSet(CqlParsingRuleSet):
@@@ -579,8 -571,8 +582,9 @@@ def ks_name_completer(ctxt, cass)
  def cf_ks_name_completer(ctxt, cass):
      return [maybe_escape_name(ks) + '.' for ks in cass.get_keyspace_names()]
  
+ 
  completer_for('columnFamilyName', 'ksname')(cf_ks_name_completer)
 +completer_for('materializedViewName', 'ksname')(cf_ks_name_completer)
  
  
  def cf_ks_dot_completer(ctxt, cass):
@@@ -589,8 -581,8 +593,9 @@@
          return ['.']
      return []
  
+ 
  completer_for('columnFamilyName', 'dot')(cf_ks_dot_completer)
 +completer_for('materializedViewName', 'dot')(cf_ks_dot_completer)
  
  
  @completer_for('columnFamilyName', 'cfname')
@@@ -607,19 -599,6 +612,20 @@@ def cf_name_completer(ctxt, cass)
      return map(maybe_escape_name, cfnames)
  
  
 +@completer_for('materializedViewName', 'mvname')
 +def mv_name_completer(ctxt, cass):
 +    ks = ctxt.get_binding('ksname', None)
 +    if ks is not None:
 +        ks = dequote_name(ks)
 +    try:
 +        mvnames = cass.get_materialized_view_names(ks)
 +    except Exception:
 +        if ks is None:
 +            return ()
 +        raise
 +    return map(maybe_escape_name, mvnames)
 +
++
  completer_for('userTypeName', 'ksname')(cf_ks_name_completer)
  
  completer_for('userTypeName', 'dot')(cf_ks_dot_completer)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/685dde10/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message