[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/cql3/Cql.g
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a42e28d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a42e28d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a42e28d
Branch: refs/heads/trunk
Commit: 9a42e28d9fdf26ab43633ea1daec968232c06d64
Parents: b0280cb 17186d8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Aug 24 03:26:51 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Aug 24 03:26:51 2013 +0300
--
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++--
2 files changed, 7 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a42e28d/pylib/cqlshlib/cql3handling.py
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a42e28d/src/java/org/apache/cassandra/cql3/Cql.g
--
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index 0035c41,f59be51..b4816ce
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -305,21 -289,13 +305,13 @@@ insertStatement returns [UpdateStatemen
}
;
-usingClause[Attributes attrs]
+usingClause[Attributes.Raw attrs]
- : K_USING usingClauseObjective[attrs] ( K_AND?
usingClauseObjective[attrs] )*
- ;
-
- usingClauseDelete[Attributes.Raw attrs]
- : K_USING usingClauseDeleteObjective[attrs] ( K_AND?
usingClauseDeleteObjective[attrs] )*
- ;
-
- usingClauseDeleteObjective[Attributes.Raw attrs]
- : K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+ : K_USING usingClauseObjective[attrs] ( K_AND usingClauseObjective[attrs]
)*
;
-usingClauseObjective[Attributes attrs]
-: K_TIMESTAMP ts=INTEGER { attrs.timestamp = Long.valueOf($ts.text); }
-| K_TTL t=INTEGER { attrs.timeToLive = Integer.valueOf($t.text); }
+usingClauseObjective[Attributes.Raw attrs]
- : usingClauseDeleteObjective[attrs]
++: K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+| K_TTL t=intValue { attrs.timeToLive = t; }
;
/**
@@@ -388,6 -349,10 +380,10 @@@ deleteOp returns [Operation.RawDeletio
| c=cident '[' t=term ']' { $op = new Operation.ElementDeletion(c, t); }
;
-usingClauseDelete[Attributes attrs]
-: K_USING K_TIMESTAMP ts=INTEGER { attrs.timestamp =
Long.valueOf($ts.text); }
++usingClauseDelete[Attributes.Raw attrs]
++: K_USING K_TIMESTAMP ts=intValue { attrs.timestamp = ts; }
+ ;
+
/**
* BEGIN BATCH
* UPDATE CF SET name1 = value1 WHERE KEY = keyname1;
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af9c7074 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af9c7074 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af9c7074 Branch: refs/heads/trunk Commit: af9c7074ffb443e254e627690c5faa365f08866a Parents: 624a7a0 ddb501d Author: Dave Brosius dbros...@apache.org Authored: Thu Aug 22 21:16:53 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Thu Aug 22 21:16:53 2013 -0400 -- bin/nodetool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af9c7074/bin/nodetool --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd471824 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd471824 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd471824 Branch: refs/heads/trunk Commit: cd47182458623fb7b0c5b447a5f8a5eff33beac9 Parents: 7a300c2 55fed33 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 21 12:15:59 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 21 12:15:59 2013 +0200 -- doc/cql3/CQL.textile | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd471824/doc/cql3/CQL.textile -- diff --cc doc/cql3/CQL.textile index ba90994,bb9a632..c87b9a5 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -500,11 -487,9 +502,11 @@@ WHERE movie = 'Serenity' UPDATE UserActions SET total = total + 2 WHERE user = B70DE1D0-9908-4AE3-BE34-5573E5B09F14 AND action = 'click'; p. - The @UPDATE@ statement writes one or more columns for a given row in a table. The @where-clause@ is used to select the row to update and must include all columns composing the @PRIMARY KEY@. Other columns values are specified through @assignment@ after the @SET@ keyword. + The @UPDATE@ statement writes one or more columns for a given row in a table. The @where-clause@ is used to select the row to update and must include all columns composing the @PRIMARY KEY@ (the @IN@ relation is only supported for the last column of the partition key). Other columns values are specified through @assignment@ after the @SET@ keyword. -Note that unlike in SQL, @UPDATE@ does not check the prior existence of the row: the row is created if none existed before, and updated otherwise. Furthermore, there is no mean to know which of creation or update happened. In fact, the semantic of @INSERT@ and @UPDATE@ are identical. +Note that unlike in SQL, @UPDATE@ does not check the prior existence of the row by default: the row is created if none existed before, and updated otherwise. Furthermore, there is no mean to know which of creation or update happened. + +It is however possible to use the conditions on some columns through @IF@, in which case the row will not be updated unless such condition are met. But please note that using @IF@ conditions will incur a non negligible performance cost (internally, Paxos will be used) so this should be used sparingly. In an @UPDATE@ statement, all updates within the same partition key are applied atomically and in isolation.
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26d05352
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26d05352
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26d05352
Branch: refs/heads/cassandra-2.0
Commit: 26d05352e28ca2549a3c041d849f53e60703c80d
Parents: 8f367fd dd65e88
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 21 18:42:56 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 21 18:42:56 2013 +0300
--
CHANGES.txt | 4 +--
src/java/org/apache/cassandra/cql3/Cql.g| 37 +---
.../apache/cassandra/cql3/QueryProcessor.java | 9 ++---
3 files changed, 23 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/src/java/org/apache/cassandra/cql3/Cql.g
--
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index b55600b,218c541..0035c41
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -421,10 -390,10 +421,10 @@@ batchStatement returns [BatchStatement.
: K_BEGIN
( K_UNLOGGED { type = BatchStatement.Type.UNLOGGED; } | K_COUNTER {
type = BatchStatement.Type.COUNTER; } )?
K_BATCH ( usingClause[attrs] )?
- s1=batchStatementObjective ';'? { statements.add(s1); } (
sN=batchStatementObjective ';'? { statements.add(sN); } )*
+ ( s=batchStatementObjective ';'? { statements.add(s); } )+
K_APPLY K_BATCH
{
- return new BatchStatement(type, statements, attrs);
+ return new BatchStatement.Parsed(type, attrs, statements);
}
;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/26d05352/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/372af085 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/372af085 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/372af085 Branch: refs/heads/trunk Commit: 372af0854f02b9ed824d98da6caf03277af16af8 Parents: 5fe46e1 4bc8c89 Author: Dave Brosius dbros...@apache.org Authored: Wed Aug 21 21:50:30 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Wed Aug 21 21:50:30 2013 -0400 -- lib/licenses/commons-collections-3.2.1.txt | 202 lib/licenses/jetty-6.1.21.txt | 202 lib/licenses/jetty-util-6.1.21.txt | 202 3 files changed, 606 deletions(-) --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed6a5b93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed6a5b93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed6a5b93 Branch: refs/heads/trunk Commit: ed6a5b935d164bb1e0a106886f09dca47517f556 Parents: 372af08 9bb4d93 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Wed Aug 21 19:23:53 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Wed Aug 21 19:23:53 2013 -0700 -- .../cassandra/utils/obs/OffHeapBitSet.java | 5 ++- .../apache/cassandra/utils/BloomFilterTest.java | 36 2 files changed, 40 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6a5b93/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6a5b93/test/unit/org/apache/cassandra/utils/BloomFilterTest.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a7d9f87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a7d9f87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a7d9f87 Branch: refs/heads/trunk Commit: 3a7d9f873e82a3245e377664b9ac23b28c9fe682 Parents: df9d61c 1df9823 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 20 16:47:26 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 20 16:47:26 2013 +0200 -- CHANGES.txt | 11 +++ src/java/org/apache/cassandra/db/DefsTables.java | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a7d9f87/CHANGES.txt -- diff --cc CHANGES.txt index 83966d7,7ecf602..e2c9b10 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,8 +1,36 @@@ -1.2.9 +2.0.0 +Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) ++ * Don't announce schema version until we've loaded the changes locally ++ (CASSANDRA-5904) + + +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns + (CASSANDRA-5856) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) @@@ -42,6 -16,17 +44,15 @@@ * Future-proof inter-major-version schema migrations (CASSANDRA-5845) * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table (CASSANDRA-5718) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns +(CASSANDRA-5856) - * Don't announce schema version until we've loaded the changes locally - (CASSANDRA-5904) + Merged from 1.1: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + + + 1.2.8 * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) * cqlsh: add collections support to COPY (CASSANDRA-5698) * retry important messages for any IOException (CASSANDRA-5804) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a7d9f87/src/java/org/apache/cassandra/db/DefsTables.java -- diff --cc src/java/org/apache/cassandra/db/DefsTables.java index 99b81d3,000..bc2b36d mode 100644,00..100644 --- a/src/java/org/apache/cassandra/db/DefsTables.java +++ b/src/java/org/apache/cassandra/db/DefsTables.java @@@ -1,460 -1,0 +1,459 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33fda2db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33fda2db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33fda2db
Branch: refs/heads/trunk
Commit: 33fda2db610202d7ed8e75afe6a0ac8e30003834
Parents: 3a7d9f8 dbb55eb
Author: Dave Brosius dbros...@apache.org
Authored: Tue Aug 20 17:52:43 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Tue Aug 20 17:52:43 2013 -0400
--
CHANGES.txt| 3 +++
src/java/org/apache/cassandra/db/ColumnFamilyStore.java| 6 --
src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++--
src/java/org/apache/cassandra/tools/NodeCmd.java | 5 -
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
6 files changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a23db0c,9339132..3ef9d4b
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2076,15 -2149,15 +2076,15 @@@ public class StorageService extends Not
}
}
- public void scrub(String keyspaceName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException
-public void scrub(boolean disableSnapshot, String tableName, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
++public void scrub(boolean disableSnapshot, String keyspaceName, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
{
-for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false,
tableName, columnFamilies))
+for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false,
keyspaceName, columnFamilies))
- cfStore.scrub();
+ cfStore.scrub(disableSnapshot);
}
-public void upgradeSSTables(String tableName, boolean
excludeCurrentVersion, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
+public void upgradeSSTables(String keyspaceName, boolean
excludeCurrentVersion, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
{
-for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, true,
tableName, columnFamilies))
+for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, true,
keyspaceName, columnFamilies))
cfStore.sstablesRewrite(excludeCurrentVersion);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index a84bcf4,15f2113..0eb2f49
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -229,9 -234,9 +229,9 @@@ public interface StorageServiceMBean ex
* Scrub (deserialize + reserialize at the latest version, skipping bad
rows if any) the given keyspace.
* If columnFamilies array is empty, all CFs are scrubbed.
*
-- * Scrubbed CFs will be snapshotted first.
++ * Scrubbed CFs will be snapshotted first, if disableSnapshot is false
*/
- public void scrub(String keyspaceName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException;
-public void scrub(boolean disableSnapshot, String tableName, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException;
++public void scrub(boolean disableSnapshot, String keyspaceName, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException;
/**
* Rewrite all sstables to the latest version.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/tools/NodeCmd.java
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea7bc142 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea7bc142 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea7bc142 Branch: refs/heads/trunk Commit: ea7bc14225387c3a9a985d06a8aba652315a86f1 Parents: 33fda2d fcc51ea Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Tue Aug 20 15:53:23 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Tue Aug 20 15:53:23 2013 -0700 -- .../org/apache/cassandra/utils/obs/OffHeapBitSet.java| 11 +-- src/java/org/apache/cassandra/utils/obs/OpenBitSet.java | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea7bc142/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea7bc142/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/667ec27a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/667ec27a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/667ec27a Branch: refs/heads/trunk Commit: 667ec27a2601233e6eddb6da8e7f2725d8f680f4 Parents: ea7bc14 08d22df Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Tue Aug 20 16:23:58 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Tue Aug 20 16:23:58 2013 -0700 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/667ec27a/CHANGES.txt --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21771dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21771dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21771dfb
Branch: refs/heads/trunk
Commit: 21771dfbd441afe855887b573001d9433b7f9b5c
Parents: 0ad0031 3529ac7
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Aug 17 18:47:14 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Aug 17 18:47:14 2013 +0300
--
CHANGES.txt | 2 ++
.../cql3/statements/SelectStatement.java| 32
2 files changed, 14 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21771dfb/CHANGES.txt
--
diff --cc CHANGES.txt
index 8aed84e,60e5cdc..5c2b924
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,7 +1,29 @@@
-1.2.9
- * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
- (CASSANDRA-5800)
- * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
+ * fix CAS contention timeout (CASSANDRA-5830)
+ * fix HsHa to respect max frame size (CASSANDRA-4573)
+ * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
+ * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
+Merged from 1.2:
+ * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
+ * cqlsh: add support for multiline comments (CASSANDRA-5798)
++ * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
++ (CASSANDRA-5856)
+
+
+2.0.0-rc1
+ * improve DecimalSerializer performance (CASSANDRA-5837)
+ * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
+ * fix schema-related trigger issues (CASSANDRA-5774)
+ * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
+ * Fix assertion error during repair (CASSANDRA-5801)
+ * Fix range tombstone bug (CASSANDRA-5805)
+ * DC-local CAS (CASSANDRA-5797)
+ * Add a native_protocol_version column to the system.local table
(CASSANRDA-5819)
+ * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
+ * Fix buffer underflow on socket close (CASSANDRA-5792)
+Merged from 1.2:
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21771dfb/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 5aced28,44a1e64..2ac94df
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -409,11 -362,7 +403,7 @@@ public class SelectStatement implement
slices = l.toArray(new ColumnSlice[l.size()]);
}
- SliceQueryFilter filter = new SliceQueryFilter(slices,
-isReversed,
-limit,
-toGroup);
- return filter;
-return new SliceQueryFilter(slices, isReversed, getLimit(),
toGroup, multiplier);
++return new SliceQueryFilter(slices, isReversed, limit, toGroup);
}
else
{
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ad0031f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad0031f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad0031f Branch: refs/heads/trunk Commit: 0ad0031fd8b871b51538cfd10b65933f26a9f783 Parents: 7e02052 4140977 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 16 21:50:18 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 16 21:50:18 2013 +0300 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad0031f/CHANGES.txt -- diff --cc CHANGES.txt index 5b6d62c,f44cdb9..8aed84e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,7 +1,27 @@@ -1.2.9 - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases - (CASSANDRA-5800) - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831) +2.0.0-rc2 + * enable vnodes by default (CASSANDRA-5869) + * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) + * Fix (some) 2i on composite components omissions (CASSANDRA-5851) + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880) +Merged from 1.2: + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) ++ * cqlsh: add support for multiline comments (CASSANDRA-5798) + + +2.0.0-rc1 + * improve DecimalSerializer performance (CASSANDRA-5837) + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822) + * Fix buffer underflow on socket close (CASSANDRA-5792) +Merged from 1.2: * fix bulk-loading compressed sstables (CASSANDRA-5820) * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad0031f/pylib/cqlshlib/cql3handling.py --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c606bb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c606bb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c606bb8
Branch: refs/heads/trunk
Commit: 1c606bb8afaeca049eb610b6c9075e9efaea032b
Parents: 9a28df0 cb0a0cd
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 12 12:39:46 2013 +0200
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 12 12:39:46 2013 +0200
--
pylib/cqlshlib/cql3handling.py | 4
src/java/org/apache/cassandra/config/CFMetaData.java | 2 --
2 files changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c606bb8/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index ce8f9c6,ca95766..3c63d09
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -439,15 -501,11 +439,11 @@@ def cf_prop_val_completer(ctxt, cass)
if this_opt in ('replicate_on_write', 'populate_io_cache_on_flush'):
return ['yes', 'no']
if this_opt in ('min_compaction_threshold', 'max_compaction_threshold',
-'gc_grace_seconds'):
+'gc_grace_seconds', 'index_interval'):
return [Hint('integer')]
- if this_opt == 'default_read_consistency':
- return [cl for cl in CqlRuleSet.consistency_levels if cl != 'ANY']
- if this_opt == 'default_write_consistency':
- return CqlRuleSet.consistency_levels
return [Hint('option_value')]
-def cf_new_prop_val_mapkey_completer(ctxt, cass):
+def cf_prop_val_mapkey_completer(ctxt, cass):
optname = ctxt.get_binding('propname')[-1]
for cql3option, _, subopts in CqlRuleSet.columnfamily_layout_map_options:
if optname == cql3option:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c606bb8/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 2da2361,33e3f00..9d116f9
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -88,84 -79,79 +88,82 @@@ public final class CFMetaDat
public final static boolean DEFAULT_POPULATE_IO_CACHE_ON_FLUSH = false;
// Note that this is the default only for user created tables
-public final static String DEFAULT_COMPRESSOR =
SnappyCompressor.isAvailable() ? SnappyCompressor.class.getCanonicalName() :
null;
-
-@Deprecated
-public static final CFMetaData OldStatusCf =
newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_STATUS_CF, 0, unused,
BytesType.instance, null);
-@Deprecated
-public static final CFMetaData OldHintsCf =
newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_HINTS_CF, 1, unused,
BytesType.instance, BytesType.instance);
-@Deprecated
-public static final CFMetaData OldMigrationsCf =
newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, unused,
TimeUUIDType.instance, null);
-@Deprecated
-public static final CFMetaData OldSchemaCf =
newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, unused,
UTF8Type.instance, null);
-
-public static final CFMetaData IndexCf = compile(5, CREATE TABLE \ +
SystemTable.INDEX_CF + \ (
-+ table_name text,
-+ index_name text,
-+ PRIMARY KEY
(table_name, index_name)
-+ ) WITH COMPACT
STORAGE AND COMMENT='indexes that have been completed');
-
-public static final CFMetaData CounterIdCf = compile(6, CREATE TABLE \
+ SystemTable.COUNTER_ID_CF + \ (
-+ key text,
-+ id timeuuid,
-+ PRIMARY KEY
(key, id)
-+ ) WITH COMPACT
STORAGE AND COMMENT='counter node IDs');
-
-// new-style schema
-public static final CFMetaData SchemaKeyspacesCf = compile(8, CREATE
TABLE + SystemTable.SCHEMA_KEYSPACES_CF + (
- +
keyspace_name text PRIMARY KEY,
- +
durable_writes boolean,
-
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: src/java/org/apache/cassandra/db/SystemKeyspace.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17160542 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17160542 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17160542 Branch: refs/heads/trunk Commit: 1716054231398f3804f6d08ab877cc09df190532 Parents: a347900 44925ac Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 12 19:18:28 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 12 19:18:28 2013 +0200 -- src/java/org/apache/cassandra/config/CFMetaData.java | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17160542/src/java/org/apache/cassandra/config/CFMetaData.java -- diff --cc src/java/org/apache/cassandra/config/CFMetaData.java index 9d116f9,33e3f00..430d26d --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@@ -88,82 -79,79 +88,81 @@@ public final class CFMetaDat public final static boolean DEFAULT_POPULATE_IO_CACHE_ON_FLUSH = false; // Note that this is the default only for user created tables -public final static String DEFAULT_COMPRESSOR = SnappyCompressor.isAvailable() ? SnappyCompressor.class.getCanonicalName() : null; - -@Deprecated -public static final CFMetaData OldStatusCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_STATUS_CF, 0, unused, BytesType.instance, null); -@Deprecated -public static final CFMetaData OldHintsCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_HINTS_CF, 1, unused, BytesType.instance, BytesType.instance); -@Deprecated -public static final CFMetaData OldMigrationsCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, unused, TimeUUIDType.instance, null); -@Deprecated -public static final CFMetaData OldSchemaCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, unused, UTF8Type.instance, null); - -public static final CFMetaData IndexCf = compile(5, CREATE TABLE \ + SystemTable.INDEX_CF + \ ( -+ table_name text, -+ index_name text, -+ PRIMARY KEY (table_name, index_name) -+ ) WITH COMPACT STORAGE AND COMMENT='indexes that have been completed'); - -public static final CFMetaData CounterIdCf = compile(6, CREATE TABLE \ + SystemTable.COUNTER_ID_CF + \ ( -+ key text, -+ id timeuuid, -+ PRIMARY KEY (key, id) -+ ) WITH COMPACT STORAGE AND COMMENT='counter node IDs'); - -// new-style schema -public static final CFMetaData SchemaKeyspacesCf = compile(8, CREATE TABLE + SystemTable.SCHEMA_KEYSPACES_CF + ( - + keyspace_name text PRIMARY KEY, - + durable_writes boolean, - + strategy_class text, - + strategy_options text - + ) WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640); - -public static final CFMetaData SchemaColumnFamiliesCf = compile(9, CREATE TABLE + SystemTable.SCHEMA_COLUMNFAMILIES_CF + ( - + keyspace_name text, - + columnfamily_name text, - + id int, - + type text, - + comparator text, - + subcomparator text, - + comment text, - + read_repair_chance double, -
