You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/10/22 08:30:38 UTC
[1/3] git commit: Backport CASSANDRA-6196 to 1.2
Updated Branches:
refs/heads/trunk db9bc6929 -> 0bff97a2c
Backport CASSANDRA-6196 to 1.2
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12413ad1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12413ad1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12413ad1
Branch: refs/heads/trunk
Commit: 12413ad1f848aacb3314d279fb4db7e2b293d066
Parents: a9b403e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 22 14:21:38 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 22 14:22:13 2013 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 2 +-
pylib/cqlshlib/cql3handling.py | 88 +------------------------------------
3 files changed, 3 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12413ad1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 117a200..4d07d78 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
1.2.12
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Fix altering column types (CASSANDRA-6185)
+ * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12413ad1/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 64e9b6f..5ccab3d 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -32,7 +32,7 @@ exit 1
from __future__ import with_statement
description = "CQL Shell for Apache Cassandra"
-version = "3.1.7"
+version = "3.1.8"
from StringIO import StringIO
from itertools import groupby
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12413ad1/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index c5b449f..b9265fd 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1017,92 +1017,6 @@ def create_ks_wat_completer(ctxt, cass):
return ['KEYSPACE']
return ['KEYSPACE', 'SCHEMA']
-@completer_for('oldPropSpec', 'optname')
-def create_ks_opt_completer(ctxt, cass):
- exist_opts = ctxt.get_binding('optname', ())
- try:
- stratopt = exist_opts.index('strategy_class')
- except ValueError:
- return ['strategy_class =']
- vals = ctxt.get_binding('optval')
- stratclass = dequote_value(vals[stratopt])
- if stratclass in CqlRuleSet.replication_factor_strategies:
- return ['strategy_options:replication_factor =']
- return [Hint('<strategy_option_name>')]
-
-@completer_for('oldPropSpec', 'optval')
-def create_ks_optval_completer(ctxt, cass):
- exist_opts = ctxt.get_binding('optname', (None,))
- if exist_opts[-1] == 'strategy_class':
- return map(escape_value, CqlRuleSet.replication_strategies)
- return [Hint('<option_value>')]
-
-@completer_for('newPropSpec', 'propname')
-def keyspace_properties_option_name_completer(ctxt, cass):
- optsseen = ctxt.get_binding('propname', ())
- if 'replication' not in optsseen:
- return ['replication']
- return ["durable_writes"]
-
-@completer_for('propertyValue', 'propsimpleval')
-def property_value_completer(ctxt, cass):
- optname = ctxt.get_binding('propname')[-1]
- if optname == 'durable_writes':
- return ["'true'", "'false'"]
- if optname == 'replication':
- return ["{'class': '"]
- return ()
-
-@completer_for('propertyValue', 'propmapkey')
-def keyspace_properties_map_key_completer(ctxt, cass):
- optname = ctxt.get_binding('propname')[-1]
- if optname != 'replication':
- return ()
- keysseen = map(dequote_value, ctxt.get_binding('propmapkey', ()))
- valsseen = map(dequote_value, ctxt.get_binding('propmapval', ()))
- for k, v in zip(keysseen, valsseen):
- if k == 'class':
- repclass = v
- break
- else:
- return ["'class'"]
- if repclass in CqlRuleSet.replication_factor_strategies:
- opts = set(('replication_factor',))
- elif repclass == 'NetworkTopologyStrategy':
- return [Hint('<dc_name>')]
- return map(escape_value, opts.difference(keysseen))
-
-@completer_for('propertyValue', 'propmapval')
-def keyspace_properties_map_value_completer(ctxt, cass):
- optname = ctxt.get_binding('propname')[-1]
- if optname != 'replication':
- return ()
- currentkey = dequote_value(ctxt.get_binding('propmapkey')[-1])
- if currentkey == 'class':
- return map(escape_value, CqlRuleSet.replication_strategies)
- return [Hint('<value>')]
-
-@completer_for('propertyValue', 'ender')
-def keyspace_properties_map_ender_completer(ctxt, cass):
- optname = ctxt.get_binding('propname')[-1]
- if optname != 'replication':
- return [',']
- keysseen = map(dequote_value, ctxt.get_binding('propmapkey', ()))
- valsseen = map(dequote_value, ctxt.get_binding('propmapval', ()))
- for k, v in zip(keysseen, valsseen):
- if k == 'class':
- repclass = v
- break
- else:
- return [',']
- if repclass in CqlRuleSet.replication_factor_strategies:
- opts = set(('replication_factor',))
- if 'replication_factor' not in keysseen:
- return [',']
- if repclass == 'NetworkTopologyStrategy' and len(keysseen) == 1:
- return [',']
- return ['}']
-
syntax_rules += r'''
<createColumnFamilyStatement> ::= "CREATE" wat=( "COLUMNFAMILY" | "TABLE" )
( ks=<nonSystemKeyspaceName> dot="." )? cf=<cfOrKsName>
@@ -1228,7 +1142,7 @@ def drop_index_completer(ctxt, cass):
return map(maybe_escape_name, cass.get_index_names())
syntax_rules += r'''
-<alterTableStatement> ::= "ALTER" ( "COLUMNFAMILY" | "TABLE" ) cf=<columnFamilyName>
+<alterTableStatement> ::= "ALTER" wat=( "COLUMNFAMILY" | "TABLE" ) cf=<columnFamilyName>
<alterInstructions>
;
<alterInstructions> ::= "ALTER" existcol=<cident> "TYPE" <storageType>
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bff97a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bff97a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bff97a2
Branch: refs/heads/trunk
Commit: 0bff97a2ca5ffd8d6168b7be424cc05fe9039830
Parents: db9bc69 dfb9765
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 22 14:30:28 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 22 14:30:28 2013 +0800
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bff97a2/CHANGES.txt
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfb97657
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb97657
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb97657
Branch: refs/heads/trunk
Commit: dfb976573dce07f856c7018c4b6f9b15dc604776
Parents: e7ec65f 12413ad
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 22 14:29:54 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 22 14:29:54 2013 +0800
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb97657/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 40d752c,4d07d78..e89ca41
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,10 +1,33 @@@
-1.2.12
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
- * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
+Merged from 1.2:
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
- * Fix altering column types (CASSANDRA-6185)
- * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
-
-
-1.2.11
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty
@@@ -62,44 -37,9 +61,45 @@@
* Fix validation of empty column names for compact tables (CASSANDRA-6152)
* Skip replaying mutations that pass CRC but fail to deserialize (CASSANDRA-6183)
* Rework token replacement to use replace_address (CASSANDRA-5916)
+ * Fix altering column types (CASSANDRA-6185)
++ * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
-1.2.10
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)