You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/03/22 21:52:48 UTC
[01/13] cassandra git commit: Add -Dcassandra.start_gossip option to
skip starting gossip
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b06bcf73f -> c74df4017
refs/heads/cassandra-3.0 db10cb25c -> 842e7c3fb
refs/heads/cassandra-3.5 16d1c8116 -> 1ee550262
refs/heads/trunk e24da8f7f -> 207d08f86
Add -Dcassandra.start_gossip option to skip starting gossip
patch by slebresne; reviewed by brandon.williams for CASSANDRA-10809
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b06bcf73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b06bcf73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b06bcf73
Branch: refs/heads/trunk
Commit: b06bcf73fb50c8e887d4469042543a9d78f7848c
Parents: 42cd66a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 17 17:21:06 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Mar 18 10:53:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06bcf73/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa4a726..bcdf189 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
* Fix bloom filter sizing with LCS (CASSANDRA-11344)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06bcf73/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 0e716e8..9a0ba5d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -690,6 +690,12 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
replacing = DatabaseDescriptor.isReplacing();
+ if (!Boolean.parseBoolean(System.getProperty("cassandra.start_gossip", "true")))
+ {
+ logger.info("Not starting gossip as requested.");
+ return;
+ }
+
prepareToJoin();
// Has to be called after the host id has potentially changed in prepareToJoin().
@@ -703,7 +709,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
logger.warn("Error loading counter cache", t);
}
-
if (Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true")))
{
joinTokenRing(delay);
[03/13] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16d1c811
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16d1c811
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16d1c811
Branch: refs/heads/trunk
Commit: 16d1c81163ea67363cdd402dff828e4e4d425998
Parents: ef86d91 db10cb2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Mar 18 10:54:31 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Mar 18 10:54:31 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/13] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/842e7c3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/842e7c3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/842e7c3f
Branch: refs/heads/trunk
Commit: 842e7c3fbf93c7a0191c7314f00d84057634bf92
Parents: db10cb2 c74df40
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:21 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:21 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a077551,e4db50e..21eb3e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
-2.2.6
+3.0.5
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[07/13] cassandra git commit: cqlsh: COPY FROM should check that
explicit column names are valid
Posted by yu...@apache.org.
cqlsh: COPY FROM should check that explicit column names are valid
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c74df401
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c74df401
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c74df401
Branch: refs/heads/trunk
Commit: c74df401768fe25eb80f9d328cad974c8ab220ad
Parents: b06bcf7
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Mar 16 17:42:54 2016 +0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:49:20 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcdf189..e4db50e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 2755dd5..d08a4fd 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -152,6 +152,7 @@ class CopyTask(object):
self.shell = shell
self.ks = ks
self.table = table
+ self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.local_dc = shell.conn.metadata.get_host(shell.hostname).datacenter
self.fname = safe_normpath(fname)
self.protocol_version = protocol_version
@@ -386,6 +387,20 @@ class CopyTask(object):
debug=shell.debug
)
+ def validate_columns(self):
+ shell = self.shell
+
+ if not self.columns:
+ shell.printerr("No column specified")
+ return False
+
+ for c in self.columns:
+ if c not in self.table_meta.columns:
+ shell.printerr('Invalid column name %s' % (c,))
+ return False
+
+ return True
+
def update_params(self, params, i):
"""
Add the communication channels to the parameters to be passed to the worker process:
@@ -515,8 +530,7 @@ class ExportTask(CopyTask):
shell.printerr('Unrecognized COPY TO options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
ranges = self.get_ranges()
@@ -987,7 +1001,6 @@ class ImportTask(CopyTask):
options = self.options
self.skip_columns = [c.strip() for c in self.options.copy['skipcols'].split(',')]
self.valid_columns = [c for c in self.columns if c not in self.skip_columns]
- self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.receive_meter = RateMeter(log_fcn=self.printmsg,
update_interval=options.copy['reportfrequency'],
log_file=options.copy['ratefile'])
@@ -1001,6 +1014,22 @@ class ImportTask(CopyTask):
ret['valid_columns'] = self.valid_columns
return ret
+ def validate_columns(self):
+ if not CopyTask.validate_columns(self):
+ return False
+
+ shell = self.shell
+ if not self.valid_columns:
+ shell.printerr("No valid column specified")
+ return False
+
+ for c in self.table_meta.primary_key:
+ if c.name not in self.valid_columns:
+ shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
+ return False
+
+ return True
+
def run(self):
shell = self.shell
@@ -1008,15 +1037,9 @@ class ImportTask(CopyTask):
shell.printerr('Unrecognized COPY FROM options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.valid_columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
- for c in self.table_meta.primary_key:
- if c.name not in self.valid_columns:
- shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
- return 0
-
self.printmsg("\nStarting copy of %s.%s with columns %s." % (self.ks, self.table, self.valid_columns))
try:
[12/13] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ee55026
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ee55026
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ee55026
Branch: refs/heads/cassandra-3.5
Commit: 1ee550262b9b0c88b4082218e41c93d6c1520c98
Parents: 16d1c81 842e7c3
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:35 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:35 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ee55026/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ee55026/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[06/13] cassandra git commit: cqlsh: COPY FROM should check that
explicit column names are valid
Posted by yu...@apache.org.
cqlsh: COPY FROM should check that explicit column names are valid
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c74df401
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c74df401
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c74df401
Branch: refs/heads/cassandra-2.2
Commit: c74df401768fe25eb80f9d328cad974c8ab220ad
Parents: b06bcf7
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Mar 16 17:42:54 2016 +0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:49:20 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcdf189..e4db50e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 2755dd5..d08a4fd 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -152,6 +152,7 @@ class CopyTask(object):
self.shell = shell
self.ks = ks
self.table = table
+ self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.local_dc = shell.conn.metadata.get_host(shell.hostname).datacenter
self.fname = safe_normpath(fname)
self.protocol_version = protocol_version
@@ -386,6 +387,20 @@ class CopyTask(object):
debug=shell.debug
)
+ def validate_columns(self):
+ shell = self.shell
+
+ if not self.columns:
+ shell.printerr("No column specified")
+ return False
+
+ for c in self.columns:
+ if c not in self.table_meta.columns:
+ shell.printerr('Invalid column name %s' % (c,))
+ return False
+
+ return True
+
def update_params(self, params, i):
"""
Add the communication channels to the parameters to be passed to the worker process:
@@ -515,8 +530,7 @@ class ExportTask(CopyTask):
shell.printerr('Unrecognized COPY TO options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
ranges = self.get_ranges()
@@ -987,7 +1001,6 @@ class ImportTask(CopyTask):
options = self.options
self.skip_columns = [c.strip() for c in self.options.copy['skipcols'].split(',')]
self.valid_columns = [c for c in self.columns if c not in self.skip_columns]
- self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.receive_meter = RateMeter(log_fcn=self.printmsg,
update_interval=options.copy['reportfrequency'],
log_file=options.copy['ratefile'])
@@ -1001,6 +1014,22 @@ class ImportTask(CopyTask):
ret['valid_columns'] = self.valid_columns
return ret
+ def validate_columns(self):
+ if not CopyTask.validate_columns(self):
+ return False
+
+ shell = self.shell
+ if not self.valid_columns:
+ shell.printerr("No valid column specified")
+ return False
+
+ for c in self.table_meta.primary_key:
+ if c.name not in self.valid_columns:
+ shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
+ return False
+
+ return True
+
def run(self):
shell = self.shell
@@ -1008,15 +1037,9 @@ class ImportTask(CopyTask):
shell.printerr('Unrecognized COPY FROM options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.valid_columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
- for c in self.table_meta.primary_key:
- if c.name not in self.valid_columns:
- shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
- return 0
-
self.printmsg("\nStarting copy of %s.%s with columns %s." % (self.ks, self.table, self.valid_columns))
try:
[09/13] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/842e7c3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/842e7c3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/842e7c3f
Branch: refs/heads/cassandra-3.5
Commit: 842e7c3fbf93c7a0191c7314f00d84057634bf92
Parents: db10cb2 c74df40
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:21 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:21 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a077551,e4db50e..21eb3e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
-2.2.6
+3.0.5
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[11/13] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ee55026
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ee55026
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ee55026
Branch: refs/heads/trunk
Commit: 1ee550262b9b0c88b4082218e41c93d6c1520c98
Parents: 16d1c81 842e7c3
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:35 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:35 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ee55026/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ee55026/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[08/13] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/842e7c3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/842e7c3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/842e7c3f
Branch: refs/heads/cassandra-3.0
Commit: 842e7c3fbf93c7a0191c7314f00d84057634bf92
Parents: db10cb2 c74df40
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:21 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:21 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a077551,e4db50e..21eb3e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
-2.2.6
+3.0.5
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[04/13] cassandra git commit: cqlsh: COPY FROM should check that
explicit column names are valid
Posted by yu...@apache.org.
cqlsh: COPY FROM should check that explicit column names are valid
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c74df401
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c74df401
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c74df401
Branch: refs/heads/cassandra-3.5
Commit: c74df401768fe25eb80f9d328cad974c8ab220ad
Parents: b06bcf7
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Mar 16 17:42:54 2016 +0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:49:20 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcdf189..e4db50e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 2755dd5..d08a4fd 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -152,6 +152,7 @@ class CopyTask(object):
self.shell = shell
self.ks = ks
self.table = table
+ self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.local_dc = shell.conn.metadata.get_host(shell.hostname).datacenter
self.fname = safe_normpath(fname)
self.protocol_version = protocol_version
@@ -386,6 +387,20 @@ class CopyTask(object):
debug=shell.debug
)
+ def validate_columns(self):
+ shell = self.shell
+
+ if not self.columns:
+ shell.printerr("No column specified")
+ return False
+
+ for c in self.columns:
+ if c not in self.table_meta.columns:
+ shell.printerr('Invalid column name %s' % (c,))
+ return False
+
+ return True
+
def update_params(self, params, i):
"""
Add the communication channels to the parameters to be passed to the worker process:
@@ -515,8 +530,7 @@ class ExportTask(CopyTask):
shell.printerr('Unrecognized COPY TO options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
ranges = self.get_ranges()
@@ -987,7 +1001,6 @@ class ImportTask(CopyTask):
options = self.options
self.skip_columns = [c.strip() for c in self.options.copy['skipcols'].split(',')]
self.valid_columns = [c for c in self.columns if c not in self.skip_columns]
- self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.receive_meter = RateMeter(log_fcn=self.printmsg,
update_interval=options.copy['reportfrequency'],
log_file=options.copy['ratefile'])
@@ -1001,6 +1014,22 @@ class ImportTask(CopyTask):
ret['valid_columns'] = self.valid_columns
return ret
+ def validate_columns(self):
+ if not CopyTask.validate_columns(self):
+ return False
+
+ shell = self.shell
+ if not self.valid_columns:
+ shell.printerr("No valid column specified")
+ return False
+
+ for c in self.table_meta.primary_key:
+ if c.name not in self.valid_columns:
+ shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
+ return False
+
+ return True
+
def run(self):
shell = self.shell
@@ -1008,15 +1037,9 @@ class ImportTask(CopyTask):
shell.printerr('Unrecognized COPY FROM options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.valid_columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
- for c in self.table_meta.primary_key:
- if c.name not in self.valid_columns:
- shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
- return 0
-
self.printmsg("\nStarting copy of %s.%s with columns %s." % (self.ks, self.table, self.valid_columns))
try:
[05/13] cassandra git commit: cqlsh: COPY FROM should check that
explicit column names are valid
Posted by yu...@apache.org.
cqlsh: COPY FROM should check that explicit column names are valid
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c74df401
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c74df401
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c74df401
Branch: refs/heads/cassandra-3.0
Commit: c74df401768fe25eb80f9d328cad974c8ab220ad
Parents: b06bcf7
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Mar 16 17:42:54 2016 +0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:49:20 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcdf189..e4db50e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
* Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c74df401/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 2755dd5..d08a4fd 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -152,6 +152,7 @@ class CopyTask(object):
self.shell = shell
self.ks = ks
self.table = table
+ self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.local_dc = shell.conn.metadata.get_host(shell.hostname).datacenter
self.fname = safe_normpath(fname)
self.protocol_version = protocol_version
@@ -386,6 +387,20 @@ class CopyTask(object):
debug=shell.debug
)
+ def validate_columns(self):
+ shell = self.shell
+
+ if not self.columns:
+ shell.printerr("No column specified")
+ return False
+
+ for c in self.columns:
+ if c not in self.table_meta.columns:
+ shell.printerr('Invalid column name %s' % (c,))
+ return False
+
+ return True
+
def update_params(self, params, i):
"""
Add the communication channels to the parameters to be passed to the worker process:
@@ -515,8 +530,7 @@ class ExportTask(CopyTask):
shell.printerr('Unrecognized COPY TO options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
ranges = self.get_ranges()
@@ -987,7 +1001,6 @@ class ImportTask(CopyTask):
options = self.options
self.skip_columns = [c.strip() for c in self.options.copy['skipcols'].split(',')]
self.valid_columns = [c for c in self.columns if c not in self.skip_columns]
- self.table_meta = self.shell.get_table_meta(self.ks, self.table)
self.receive_meter = RateMeter(log_fcn=self.printmsg,
update_interval=options.copy['reportfrequency'],
log_file=options.copy['ratefile'])
@@ -1001,6 +1014,22 @@ class ImportTask(CopyTask):
ret['valid_columns'] = self.valid_columns
return ret
+ def validate_columns(self):
+ if not CopyTask.validate_columns(self):
+ return False
+
+ shell = self.shell
+ if not self.valid_columns:
+ shell.printerr("No valid column specified")
+ return False
+
+ for c in self.table_meta.primary_key:
+ if c.name not in self.valid_columns:
+ shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
+ return False
+
+ return True
+
def run(self):
shell = self.shell
@@ -1008,15 +1037,9 @@ class ImportTask(CopyTask):
shell.printerr('Unrecognized COPY FROM options: %s' % ', '.join(self.options.unrecognized.keys()))
return
- if not self.valid_columns:
- shell.printerr("No column specified")
+ if not self.validate_columns():
return 0
- for c in self.table_meta.primary_key:
- if c.name not in self.valid_columns:
- shell.printerr("Primary key column '%s' missing or skipped" % (c.name,))
- return 0
-
self.printmsg("\nStarting copy of %s.%s with columns %s." % (self.ks, self.table, self.valid_columns))
try:
[02/13] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/db10cb25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db10cb25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db10cb25
Branch: refs/heads/trunk
Commit: db10cb25c036175ac51474ea1e1169524d0e98a6
Parents: 1dbfa4b b06bcf7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Mar 18 10:54:16 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Mar 18 10:54:16 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/13] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/207d08f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/207d08f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/207d08f8
Branch: refs/heads/trunk
Commit: 207d08f86c5027a7dc332778b59e705adbab031f
Parents: e24da8f 1ee5502
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 22 15:50:42 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 22 15:50:42 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/207d08f8/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/207d08f8/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------