cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [8/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 25 Aug 2015 15:04:01 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

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


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

Branch: refs/heads/trunk
Commit: 65ee15f98b22732870d3aaa965187547e7cba28f
Parents: 02219a0 134bcda
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Aug 25 10:03:22 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Aug 25 10:03:22 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                    |  4 +++-
 pylib/cqlshlib/cql3handling.py | 41 ++++++++++---------------------------
 pylib/cqlshlib/cqlhandling.py  | 12 ++---------
 3 files changed, 16 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65ee15f9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 14f48cb,97d8b8b..124821f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,6 +1,41 @@@
 -2.2.1
 +3.0.0-beta2
 + * 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:
 + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
 + * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
-  * add CLEAR cqlsh command (CASSANDRA-10086)
+  * (cqlsh) add CLEAR command (CASSANDRA-10086)
   * Support string literals as Role names for compatibility (CASSANDRA-10135)
++Merged from 2.1:
++ * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
 +
 +
 +3.0.0-beta1
 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
 + * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
 + * Rewrite hinted handoff (CASSANDRA-6230)
 + * Fix query on static compact tables (CASSANDRA-10093)
 + * Fix race during construction of commit log (CASSANDRA-10049)
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 + * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
 + * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
 +Merged from 2.2:
   * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
   * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
   * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65ee15f9/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 44a1e23,7c68001..ef3c545
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -33,24 -33,10 +33,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):
-     keywords = set((
-         'select', 'from', 'where', 'and', 'key', 'insert', 'update', 'with',
-         'limit', 'using', 'use', 'set',
-         'begin', 'apply', 'batch', 'truncate', 'delete', 'in', 'create',
-         'function', 'aggregate', 'keyspace', 'schema', 'columnfamily', 'table', 'index',
'on', 'drop',
-         'primary', 'into', 'values', 'date', 'time', 'timestamp', 'ttl', 'alter', 'add',
'type',
-         'compact', 'storage', 'order', 'by', 'asc', 'desc', 'clustering',
-         'token', 'writetime', 'map', 'list', 'to', 'custom', 'if', 'not',
-         'materialized', 'view'
-     ))
- 
-     unreserved_keywords = set((
-         'key', 'clustering', 'ttl', 'compact', 'storage', 'type', 'values', 'custom', 'exists'
-     ))
  
      columnfamily_layout_options = (
          ('bloom_filter_fp_chance', None),
@@@ -1361,7 -1332,7 +1342,7 @@@ def rolename_completer(ctxt, cass)
          return "'%s'" % name
  
      # disable completion for CREATE ROLE.
--    if ctxt.matched[0][0] == 'K_CREATE':
++    if ctxt.matched[0][0] == 'create':
          return [Hint('<rolename>')]
  
      session = cass.session


Mime
View raw message