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/11/06 00:41:46 UTC
[1/5] git commit: Abort liveRatio calculation if the memtable is
flushed patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-8164
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a9f65bcf2 -> 851502902
refs/heads/trunk 19c2d22e9 -> 8856934fc
Abort liveRatio calculation if the memtable is flushed
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-8164
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65f79900
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65f79900
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65f79900
Branch: refs/heads/trunk
Commit: 65f7990085230dd9da9bbae584c6502c8b6c8bf3
Parents: 89257bc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Nov 5 16:45:01 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Nov 5 16:45:01 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Memtable.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65f79900/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d5f607f..a469bbf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164)
* Correctly handle non-text column names in cql3 (CASSANDRA-8178)
* Fix deletion for indexes on primary key columns (CASSANDRA-8206)
* Add 'nodetool statusgossip' (CASSANDRA-8125)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/65f79900/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 0d55bb2..0b186dc 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -450,6 +450,12 @@ public class Memtable
{
deepSize += memtable.meter.measureDeep(entry.getKey()) + memtable.meter.measureDeep(entry.getValue());
objects += entry.getValue().getColumnCount();
+
+ if (memtable != cfs.getMemtableThreadSafe())
+ {
+ // this memtable is flushing or already flushed
+ return;
+ }
}
double newRatio = (double) deepSize / memtable.currentSize.get();
[3/5] git commit: (cqlsh) SELECT ... TOKEN() function broken in C*
2.1.1
Posted by mi...@apache.org.
(cqlsh) SELECT ... TOKEN() function broken in C* 2.1.1
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8258
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85150290
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85150290
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85150290
Branch: refs/heads/trunk
Commit: 8515029020dba0ac7ddda36832f3aa32a58ca738
Parents: a9f65bc
Author: Philip Thompson <pt...@gmail.com>
Authored: Wed Nov 5 15:31:10 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:31:10 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
pylib/cqlshlib/test/test_cql_parsing.py | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b9e10c..ee18be0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.2
+ * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
* Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index e12e7e1..b1179ca 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -206,7 +206,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<mapLiteral> ::= "{" <term> ":" <term> ( "," <term> ":" <term> )* "}"
;
-<functionName> ::= <identifier>
+<functionName> ::= <identifier> | "TOKEN"
;
<statementBody> ::= <useStatement>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/pylib/cqlshlib/test/test_cql_parsing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cql_parsing.py b/pylib/cqlshlib/test/test_cql_parsing.py
index 7e4e6f3..f88b839 100644
--- a/pylib/cqlshlib/test/test_cql_parsing.py
+++ b/pylib/cqlshlib/test/test_cql_parsing.py
@@ -18,10 +18,12 @@
# for Thrift connections, and $CQL_TEST_PORT to the associated port.
from .basecase import BaseTestCase, cqlsh
+from .cassconnect import get_test_keyspace, testrun_cqlsh, testcall_cqlsh
class TestCqlParsing(BaseTestCase):
def setUp(self):
- pass
+ self.cqlsh_runner = testrun_cqlsh(cqlver=cqlsh.DEFAULT_CQLVER, env={'COLUMNS': '100000'})
+ self.cqlsh = self.cqlsh_runner.__enter__()
def tearDown(self):
pass
@@ -85,3 +87,8 @@ class TestCqlParsing(BaseTestCase):
def test_parse_drop_index(self):
pass
+
+ def test_parse_select_token(self):
+ self.cqlsh.cmd_and_response('INSERT INTO has_all_types (num) VALUES (1);')
+ response = self.cqlsh.cmd_and_response("SELECT token(num) from has_all_types where num=1;")
+ self.assertIn('-4069959284402364209', response)
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
pylib/cqlshlib/cql3handling.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8856934f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8856934f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8856934f
Branch: refs/heads/trunk
Commit: 8856934fc8d062730f4b9c0a6adf1023bc331697
Parents: 19c2d22 8515029
Author: Mikhail Stepura <mi...@apache.org>
Authored: Wed Nov 5 15:37:43 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:37:43 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 3 ++-
pylib/cqlshlib/test/test_cql_parsing.py | 9 ++++++++-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8856934f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 736c659,ee18be0..f0ee602
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
+3.0
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.2
+ * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
* Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8856934f/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 6d333a4,b1179ca..b2999a7
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -209,7 -206,7 +209,8 @@@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n
<mapLiteral> ::= "{" <term> ":" <term> ( "," <term> ":" <term> )* "}"
;
- <functionName> ::= <identifier> ( ":" ":" <identifier> )?
-<functionName> ::= <identifier> | "TOKEN"
++<functionName> ::= <identifier> ( ":" ":" <identifier> )?
++ | "TOKEN"
;
<statementBody> ::= <useStatement>
[4/5] git commit: (cqlsh) SELECT ... TOKEN() function broken in C*
2.1.1
Posted by mi...@apache.org.
(cqlsh) SELECT ... TOKEN() function broken in C* 2.1.1
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8258
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85150290
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85150290
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85150290
Branch: refs/heads/cassandra-2.1
Commit: 8515029020dba0ac7ddda36832f3aa32a58ca738
Parents: a9f65bc
Author: Philip Thompson <pt...@gmail.com>
Authored: Wed Nov 5 15:31:10 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:31:10 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
pylib/cqlshlib/test/test_cql_parsing.py | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b9e10c..ee18be0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.2
+ * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
* Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index e12e7e1..b1179ca 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -206,7 +206,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<mapLiteral> ::= "{" <term> ":" <term> ( "," <term> ":" <term> )* "}"
;
-<functionName> ::= <identifier>
+<functionName> ::= <identifier> | "TOKEN"
;
<statementBody> ::= <useStatement>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85150290/pylib/cqlshlib/test/test_cql_parsing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cql_parsing.py b/pylib/cqlshlib/test/test_cql_parsing.py
index 7e4e6f3..f88b839 100644
--- a/pylib/cqlshlib/test/test_cql_parsing.py
+++ b/pylib/cqlshlib/test/test_cql_parsing.py
@@ -18,10 +18,12 @@
# for Thrift connections, and $CQL_TEST_PORT to the associated port.
from .basecase import BaseTestCase, cqlsh
+from .cassconnect import get_test_keyspace, testrun_cqlsh, testcall_cqlsh
class TestCqlParsing(BaseTestCase):
def setUp(self):
- pass
+ self.cqlsh_runner = testrun_cqlsh(cqlver=cqlsh.DEFAULT_CQLVER, env={'COLUMNS': '100000'})
+ self.cqlsh = self.cqlsh_runner.__enter__()
def tearDown(self):
pass
@@ -85,3 +87,8 @@ class TestCqlParsing(BaseTestCase):
def test_parse_drop_index(self):
pass
+
+ def test_parse_select_token(self):
+ self.cqlsh.cmd_and_response('INSERT INTO has_all_types (num) VALUES (1);')
+ response = self.cqlsh.cmd_and_response("SELECT token(num) from has_all_types where num=1;")
+ self.assertIn('-4069959284402364209', response)
[2/5] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9f65bcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9f65bcf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9f65bcf
Branch: refs/heads/trunk
Commit: a9f65bcf28e7abc2f30130ae2e8fb34cf5ee7a55
Parents: cea00e9 65f7990
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Nov 5 16:45:10 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Nov 5 16:45:10 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------