You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/12/22 03:34:34 UTC
[01/15] cassandra git commit: cqlsh copy-from: encode column names to
avoid primary key parsing errors
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 6bce8b027 -> f4fd0928e
refs/heads/cassandra-3.0 11f7ba948 -> b0f85b96d
refs/heads/cassandra-3.11 958ba452e -> b98767868
refs/heads/cassandra-3.X a224b2f6e -> f6b4ab417
refs/heads/trunk 634f495ba -> 72934d5df
cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4fd0928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4fd0928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4fd0928
Branch: refs/heads/cassandra-2.2
Commit: f4fd0928e6bc56600b7fd4d2469353c8f9d9da7d
Parents: 6bce8b0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 14 09:19:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:17:39 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bed875..8a7ae42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 4bc76e9..d22f2fe 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1759,9 +1759,10 @@ class ImportConversion(object):
# these functions are used for non-prepared statements to protect values with quotes if required
self.protectors = [self._get_protector(t) for t in self.coltypes]
- def _get_protector(self, t):
+ @staticmethod
+ def _get_protector(t):
if t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet'):
- return lambda v: unicode(protect_value(v), self.encoding)
+ return lambda v: protect_value(v)
else:
return lambda v: v
@@ -2136,7 +2137,7 @@ class ImportProcess(ChildProcess):
ChildProcess.__init__(self, params=params, target=self.run)
self.skip_columns = params['skip_columns']
- self.valid_columns = params['valid_columns']
+ self.valid_columns = [c.encode(self.encoding) for c in params['valid_columns']]
self.skip_column_indexes = [i for i, c in enumerate(self.columns) if c in self.skip_columns]
options = params['options']
[05/15] cassandra git commit: cqlsh copy-from: encode column names to
avoid primary key parsing errors
Posted by st...@apache.org.
cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4fd0928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4fd0928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4fd0928
Branch: refs/heads/cassandra-3.X
Commit: f4fd0928e6bc56600b7fd4d2469353c8f9d9da7d
Parents: 6bce8b0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 14 09:19:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:17:39 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bed875..8a7ae42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 4bc76e9..d22f2fe 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1759,9 +1759,10 @@ class ImportConversion(object):
# these functions are used for non-prepared statements to protect values with quotes if required
self.protectors = [self._get_protector(t) for t in self.coltypes]
- def _get_protector(self, t):
+ @staticmethod
+ def _get_protector(t):
if t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet'):
- return lambda v: unicode(protect_value(v), self.encoding)
+ return lambda v: protect_value(v)
else:
return lambda v: v
@@ -2136,7 +2137,7 @@ class ImportProcess(ChildProcess):
ChildProcess.__init__(self, params=params, target=self.run)
self.skip_columns = params['skip_columns']
- self.valid_columns = params['valid_columns']
+ self.valid_columns = [c.encode(self.encoding) for c in params['valid_columns']]
self.skip_column_indexes = [i for i, c in enumerate(self.columns) if c in self.skip_columns]
options = params['options']
[13/15] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by st...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6b4ab41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6b4ab41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6b4ab41
Branch: refs/heads/cassandra-3.X
Commit: f6b4ab4170e83f36315ef9abda53b738fa57baf0
Parents: a224b2f b987678
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:20:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:20:58 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6b4ab41/CHANGES.txt
----------------------------------------------------------------------
[14/15] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by st...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6b4ab41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6b4ab41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6b4ab41
Branch: refs/heads/trunk
Commit: f6b4ab4170e83f36315ef9abda53b738fa57baf0
Parents: a224b2f b987678
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:20:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:20:58 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6b4ab41/CHANGES.txt
----------------------------------------------------------------------
[06/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@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/b0f85b96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f85b96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f85b96
Branch: refs/heads/trunk
Commit: b0f85b96dcbd215f5b582bac1cdefe0baf6004fb
Parents: 11f7ba9 f4fd092
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:19:32 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:19:32 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 487e1ac,8a7ae42..528ed65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
-2.2.9
+3.0.11
+ * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
+ * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
+ * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
+ * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
+ * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
+ * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
+ * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
+ * Thread local pools never cleaned up (CASSANDRA-13033)
+ * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
+ * CQL often queries static columns unnecessarily (CASSANDRA-12768)
+ * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@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/b0f85b96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f85b96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f85b96
Branch: refs/heads/cassandra-3.X
Commit: b0f85b96dcbd215f5b582bac1cdefe0baf6004fb
Parents: 11f7ba9 f4fd092
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:19:32 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:19:32 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 487e1ac,8a7ae42..528ed65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
-2.2.9
+3.0.11
+ * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
+ * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
+ * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
+ * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
+ * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
+ * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
+ * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
+ * Thread local pools never cleaned up (CASSANDRA-13033)
+ * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
+ * CQL often queries static columns unnecessarily (CASSANDRA-12768)
+ * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[02/15] cassandra git commit: cqlsh copy-from: encode column names to
avoid primary key parsing errors
Posted by st...@apache.org.
cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4fd0928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4fd0928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4fd0928
Branch: refs/heads/cassandra-3.0
Commit: f4fd0928e6bc56600b7fd4d2469353c8f9d9da7d
Parents: 6bce8b0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 14 09:19:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:17:39 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bed875..8a7ae42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 4bc76e9..d22f2fe 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1759,9 +1759,10 @@ class ImportConversion(object):
# these functions are used for non-prepared statements to protect values with quotes if required
self.protectors = [self._get_protector(t) for t in self.coltypes]
- def _get_protector(self, t):
+ @staticmethod
+ def _get_protector(t):
if t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet'):
- return lambda v: unicode(protect_value(v), self.encoding)
+ return lambda v: protect_value(v)
else:
return lambda v: v
@@ -2136,7 +2137,7 @@ class ImportProcess(ChildProcess):
ChildProcess.__init__(self, params=params, target=self.run)
self.skip_columns = params['skip_columns']
- self.valid_columns = params['valid_columns']
+ self.valid_columns = [c.encode(self.encoding) for c in params['valid_columns']]
self.skip_column_indexes = [i for i, c in enumerate(self.columns) if c in self.skip_columns]
options = params['options']
[15/15] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72934d5d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72934d5d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72934d5d
Branch: refs/heads/trunk
Commit: 72934d5df807eb4b1c0a307e09480e2ed2faf8a1
Parents: 634f495 f6b4ab4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:21:19 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:21:19 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72934d5d/CHANGES.txt
----------------------------------------------------------------------
[08/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@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/b0f85b96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f85b96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f85b96
Branch: refs/heads/cassandra-3.11
Commit: b0f85b96dcbd215f5b582bac1cdefe0baf6004fb
Parents: 11f7ba9 f4fd092
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:19:32 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:19:32 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 487e1ac,8a7ae42..528ed65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
-2.2.9
+3.0.11
+ * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
+ * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
+ * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
+ * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
+ * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
+ * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
+ * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
+ * Thread local pools never cleaned up (CASSANDRA-13033)
+ * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
+ * CQL often queries static columns unnecessarily (CASSANDRA-12768)
+ * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[10/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9876786
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9876786
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9876786
Branch: refs/heads/trunk
Commit: b98767868a546f334d58a559c210da67ffec8407
Parents: 958ba45 b0f85b9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:20:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:20:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b68fbfd,528ed65..74a9808
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -172,13 -66,6 +172,14 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[12/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9876786
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9876786
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9876786
Branch: refs/heads/cassandra-3.11
Commit: b98767868a546f334d58a559c210da67ffec8407
Parents: 958ba45 b0f85b9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:20:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:20:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b68fbfd,528ed65..74a9808
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -172,13 -66,6 +172,14 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[04/15] cassandra git commit: cqlsh copy-from: encode column names to
avoid primary key parsing errors
Posted by st...@apache.org.
cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4fd0928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4fd0928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4fd0928
Branch: refs/heads/cassandra-3.11
Commit: f4fd0928e6bc56600b7fd4d2469353c8f9d9da7d
Parents: 6bce8b0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 14 09:19:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:17:39 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bed875..8a7ae42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 4bc76e9..d22f2fe 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1759,9 +1759,10 @@ class ImportConversion(object):
# these functions are used for non-prepared statements to protect values with quotes if required
self.protectors = [self._get_protector(t) for t in self.coltypes]
- def _get_protector(self, t):
+ @staticmethod
+ def _get_protector(t):
if t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet'):
- return lambda v: unicode(protect_value(v), self.encoding)
+ return lambda v: protect_value(v)
else:
return lambda v: v
@@ -2136,7 +2137,7 @@ class ImportProcess(ChildProcess):
ChildProcess.__init__(self, params=params, target=self.run)
self.skip_columns = params['skip_columns']
- self.valid_columns = params['valid_columns']
+ self.valid_columns = [c.encode(self.encoding) for c in params['valid_columns']]
self.skip_column_indexes = [i for i, c in enumerate(self.columns) if c in self.skip_columns]
options = params['options']
[07/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@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/b0f85b96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f85b96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f85b96
Branch: refs/heads/cassandra-3.0
Commit: b0f85b96dcbd215f5b582bac1cdefe0baf6004fb
Parents: 11f7ba9 f4fd092
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:19:32 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:19:32 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 487e1ac,8a7ae42..528ed65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
-2.2.9
+3.0.11
+ * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
+ * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
+ * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
+ * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
+ * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
+ * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
+ * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
+ * Thread local pools never cleaned up (CASSANDRA-13033)
+ * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781)
+ * CQL often queries static columns unnecessarily (CASSANDRA-12768)
+ * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f85b96/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[03/15] cassandra git commit: cqlsh copy-from: encode column names to
avoid primary key parsing errors
Posted by st...@apache.org.
cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4fd0928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4fd0928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4fd0928
Branch: refs/heads/trunk
Commit: f4fd0928e6bc56600b7fd4d2469353c8f9d9da7d
Parents: 6bce8b0
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 14 09:19:58 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:17:39 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bed875..8a7ae42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
* Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
* Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
* Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4fd0928/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 4bc76e9..d22f2fe 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1759,9 +1759,10 @@ class ImportConversion(object):
# these functions are used for non-prepared statements to protect values with quotes if required
self.protectors = [self._get_protector(t) for t in self.coltypes]
- def _get_protector(self, t):
+ @staticmethod
+ def _get_protector(t):
if t in ('ascii', 'text', 'timestamp', 'date', 'time', 'inet'):
- return lambda v: unicode(protect_value(v), self.encoding)
+ return lambda v: protect_value(v)
else:
return lambda v: v
@@ -2136,7 +2137,7 @@ class ImportProcess(ChildProcess):
ChildProcess.__init__(self, params=params, target=self.run)
self.skip_columns = params['skip_columns']
- self.valid_columns = params['valid_columns']
+ self.valid_columns = [c.encode(self.encoding) for c in params['valid_columns']]
self.skip_column_indexes = [i for i, c in enumerate(self.columns) if c in self.skip_columns]
options = params['options']
[11/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9876786
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9876786
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9876786
Branch: refs/heads/cassandra-3.X
Commit: b98767868a546f334d58a559c210da67ffec8407
Parents: 958ba45 b0f85b9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Dec 22 11:20:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Dec 22 11:20:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b68fbfd,528ed65..74a9808
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -172,13 -66,6 +172,14 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9876786/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------