Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30f39a23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30f39a23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30f39a23
Branch: refs/heads/trunk
Commit: 30f39a2312f3858f49a4a1e5d3a165455a012f03
Parents: d332c7e 72f2cc4
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Sep 11 16:48:43 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Sep 11 16:48:43 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 128 +++++++-------
pylib/cqlshlib/__init__.py | 1 -
pylib/cqlshlib/cql3handling.py | 83 ++++++++-
pylib/cqlshlib/cqlhandling.py | 10 +-
pylib/cqlshlib/displaying.py | 12 +-
pylib/cqlshlib/formatting.py | 42 +++--
pylib/cqlshlib/helptopics.py | 6 +-
pylib/cqlshlib/pylexotron.py | 55 +++++-
pylib/cqlshlib/saferscanner.py | 8 +-
pylib/cqlshlib/sslhandling.py | 4 +-
pylib/cqlshlib/util.py | 1 +
pylib/cqlshlib/wcwidth.py | 326 ++++++++++++++++++------------------
13 files changed, 414 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f39a23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f043230,cd29592..124b797
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,8 +1,41 @@@
-2.2.2
+3.0.0-rc1
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections
(CASSANDRA-9590)
+Merged from 2.2:
* Defer default role manager setup until all nodes are on 2.2+
(CASSANDRA-9761)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+Merged from 2.1:
++ * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066)
+ * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
+ * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
+ have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
+
+
+3.0.0-beta2
+ * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
+ * Fix backward compatibility issue due to AbstractBounds serialization bug
(CASSANDRA-9857)
+ * Fix startup error when upgrading nodes (CASSANDRA-10136)
+ * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation
(CASSANDRA-10147)
+ * Improve batchlog write patch (CASSANDRA-9673)
+ * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
+ * Require AbstractType.isByteOrderComparable declaration in constructor
(CASSANDRA-9901)
+ * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
+ * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
+ * Choose better poolingOptions for protocol v4 in cassandra-stress
(CASSANDRA-10182)
+ * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
+ * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
+ * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
+ * Fix double flushing of secondary index tables (CASSANDRA-10180)
+ * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
+ * Only use batchlog when paired materialized view replica is remote
(CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews
(CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
* Cancel transaction for sstables we wont redistribute index summary
for (CASSANDRA-10270)
- * Handle missing RoleManager in config after upgrade to 2.2
(CASSANDRA-10209)
* Retry snapshot deletion after compaction and gc on Windows
(CASSANDRA-10222)
* Fix failure to start with space in directory path on Windows
(CASSANDRA-10239)
* Fix repair hang when snapshot failed (CASSANDRA-10057)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f39a23/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index ef3c545,31b3061..2e4f88e
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -33,9 -34,10 +34,10 @@@ 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):
columnfamily_layout_options = (
