You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/04 08:32:31 UTC
[1/6] git commit: Issue a warning after 3 empty lines in statement
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 2e955d481 -> e9bdb6a95
refs/heads/cassandra-2.1 b2fad3662 -> a5266bc07
refs/heads/trunk e5f08867e -> f3945bce7
Issue a warning after 3 empty lines in statement
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9bdb6a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9bdb6a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9bdb6a9
Branch: refs/heads/cassandra-2.0
Commit: e9bdb6a95c45dc4fc328a5c3a036bb1622857049
Parents: 2e955d4
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 2 15:57:57 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:26:40 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8570784..f4e14d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 6fa3afe..020bd2a 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -519,6 +519,7 @@ class Shell(cmd.Cmd):
self.show_line_nums = True
self.stdin = stdin
self.query_out = sys.stdout
+ self.empty_lines = 0
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
@@ -703,6 +704,7 @@ class Shell(cmd.Cmd):
def reset_statement(self):
self.reset_prompt()
self.statement.truncate(0)
+ self.empty_lines = 0;
def reset_prompt(self):
if self.current_keyspace is None:
@@ -711,11 +713,16 @@ class Shell(cmd.Cmd):
self.set_prompt(self.keyspace_prompt % self.current_keyspace)
def set_continue_prompt(self):
+ if self.empty_lines >=3:
+ self.set_prompt("Statements are terminated with a ';'. You can press CTRL-C to cancel an imcomplete statement.")
+ self.empty_lines = 0
+ return
if self.current_keyspace is None:
self.set_prompt(self.continue_prompt)
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
+ self.empty_lines += 1
@contextmanager
def prepare_loop(self):
[3/6] git commit: Issue a warning after 3 empty lines in statement
Posted by mi...@apache.org.
Issue a warning after 3 empty lines in statement
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9bdb6a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9bdb6a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9bdb6a9
Branch: refs/heads/trunk
Commit: e9bdb6a95c45dc4fc328a5c3a036bb1622857049
Parents: 2e955d4
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 2 15:57:57 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:26:40 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8570784..f4e14d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 6fa3afe..020bd2a 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -519,6 +519,7 @@ class Shell(cmd.Cmd):
self.show_line_nums = True
self.stdin = stdin
self.query_out = sys.stdout
+ self.empty_lines = 0
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
@@ -703,6 +704,7 @@ class Shell(cmd.Cmd):
def reset_statement(self):
self.reset_prompt()
self.statement.truncate(0)
+ self.empty_lines = 0;
def reset_prompt(self):
if self.current_keyspace is None:
@@ -711,11 +713,16 @@ class Shell(cmd.Cmd):
self.set_prompt(self.keyspace_prompt % self.current_keyspace)
def set_continue_prompt(self):
+ if self.empty_lines >=3:
+ self.set_prompt("Statements are terminated with a ';'. You can press CTRL-C to cancel an imcomplete statement.")
+ self.empty_lines = 0
+ return
if self.current_keyspace is None:
self.set_prompt(self.continue_prompt)
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
+ self.empty_lines += 1
@contextmanager
def prepare_loop(self):
[2/6] git commit: Issue a warning after 3 empty lines in statement
Posted by mi...@apache.org.
Issue a warning after 3 empty lines in statement
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9bdb6a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9bdb6a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9bdb6a9
Branch: refs/heads/cassandra-2.1
Commit: e9bdb6a95c45dc4fc328a5c3a036bb1622857049
Parents: 2e955d4
Author: Mikhail Stepura <mi...@apache.org>
Authored: Fri May 2 15:57:57 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:26:40 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8570784..f4e14d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
* Re-add parameter columns to tracing session (CASSANDRA-6942)
* Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9bdb6a9/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 6fa3afe..020bd2a 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -519,6 +519,7 @@ class Shell(cmd.Cmd):
self.show_line_nums = True
self.stdin = stdin
self.query_out = sys.stdout
+ self.empty_lines = 0
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
@@ -703,6 +704,7 @@ class Shell(cmd.Cmd):
def reset_statement(self):
self.reset_prompt()
self.statement.truncate(0)
+ self.empty_lines = 0;
def reset_prompt(self):
if self.current_keyspace is None:
@@ -711,11 +713,16 @@ class Shell(cmd.Cmd):
self.set_prompt(self.keyspace_prompt % self.current_keyspace)
def set_continue_prompt(self):
+ if self.empty_lines >=3:
+ self.set_prompt("Statements are terminated with a ';'. You can press CTRL-C to cancel an imcomplete statement.")
+ self.empty_lines = 0
+ return
if self.current_keyspace is None:
self.set_prompt(self.continue_prompt)
else:
spaces = ' ' * len(str(self.current_keyspace))
self.set_prompt(self.keyspace_continue_prompt % spaces)
+ self.empty_lines += 1
@contextmanager
def prepare_loop(self):
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/a5266bc0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5266bc0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5266bc0
Branch: refs/heads/trunk
Commit: a5266bc077a02cf01b63de5accfc91789a3450a5
Parents: b2fad36 e9bdb6a
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat May 3 23:30:22 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:30:22 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5266bc0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b8dfe6,f4e14d8..5332c65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,18 +1,8 @@@
-2.0.8
+2.1.0-rc1
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+Merged from 2.0:
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5266bc0/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index 9ba74ca,020bd2a..3f543da
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -515,10 -519,7 +515,11 @@@ class Shell(cmd.Cmd)
self.show_line_nums = True
self.stdin = stdin
self.query_out = sys.stdout
+ self.consistency_level = cassandra.ConsistencyLevel.ONE
+ #Python driver returns BLOBs as string, but we expect them as buffer()
+ cassandra.cqltypes.BytesType.deserialize = staticmethod(cassandra.cqltypes.BytesType.validate)
+ cassandra.cqltypes.CassandraType.support_empty_values = True
+ self.empty_lines = 0
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/a5266bc0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5266bc0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5266bc0
Branch: refs/heads/cassandra-2.1
Commit: a5266bc077a02cf01b63de5accfc91789a3450a5
Parents: b2fad36 e9bdb6a
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat May 3 23:30:22 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:30:22 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5266bc0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b8dfe6,f4e14d8..5332c65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,18 +1,8 @@@
-2.0.8
+2.1.0-rc1
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+Merged from 2.0:
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5266bc0/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index 9ba74ca,020bd2a..3f543da
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -515,10 -519,7 +515,11 @@@ class Shell(cmd.Cmd)
self.show_line_nums = True
self.stdin = stdin
self.query_out = sys.stdout
+ self.consistency_level = cassandra.ConsistencyLevel.ONE
+ #Python driver returns BLOBs as string, but we expect them as buffer()
+ cassandra.cqltypes.BytesType.deserialize = staticmethod(cassandra.cqltypes.BytesType.validate)
+ cassandra.cqltypes.CassandraType.support_empty_values = True
+ self.empty_lines = 0
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3945bce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3945bce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3945bce
Branch: refs/heads/trunk
Commit: f3945bce7a5ff47be95d0ebea4cd3d24d993da51
Parents: e5f0886 a5266bc
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat May 3 23:31:03 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat May 3 23:31:03 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3945bce/CHANGES.txt
----------------------------------------------------------------------