[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcd80487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd80487 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd80487 Branch: refs/heads/trunk Commit: bcd80487a4c4af3b5e76a6720b5032ae2d622a22 Parents: e2506f1 2ef11b4 Author: Dave Brosius Authored: Thu May 2 10:24:19 2013 -0400 Committer: Dave Brosius Committed: Thu May 2 10:24:19 2013 -0400 -- build.xml | 14 ++ 1 files changed, 10 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd80487/build.xml --
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
NEWS.txt
src/java/org/apache/cassandra/db/CollationController.java
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64cbd0c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64cbd0c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64cbd0c4
Branch: refs/heads/trunk
Commit: 64cbd0c4824d04f31a53792646a5c237c4257d34
Parents: 0439724 e580ef1
Author: Sylvain Lebresne
Authored: Mon Mar 25 20:21:11 2013 +0100
Committer: Sylvain Lebresne
Committed: Mon Mar 25 20:21:11 2013 +0100
--
CHANGES.txt|2 ++
NEWS.txt |7 +++
.../apache/cassandra/db/CollationController.java |3 +--
.../org/apache/cassandra/db/ColumnFamilyStore.java |7 ++-
.../cassandra/db/compaction/CompactionManager.java |5 -
.../cassandra/io/sstable/SSTableMetadata.java |7 +--
.../apache/cassandra/io/sstable/SSTableReader.java |8 ++--
.../apache/cassandra/service/StorageService.java |4 ++--
.../cassandra/service/StorageServiceMBean.java |2 +-
src/java/org/apache/cassandra/tools/NodeCmd.java |5 -
src/java/org/apache/cassandra/tools/NodeProbe.java |4 ++--
.../org/apache/cassandra/tools/NodeToolHelp.yaml |5 +++--
12 files changed, 31 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64cbd0c4/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64cbd0c4/NEWS.txt
--
diff --cc NEWS.txt
index 6b94011,b53411b..1e1df9d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,25 -13,11 +13,32 @@@ by version X, but the inverse is not ne
Upgrading
-
+- Replication and strategy options do not accept unknown options anymore.
+ This was already the case for CQL3 in 1.2 but this is now the case for
+ thrift too.
+- reduce_cache_sizes_at, reduce_cache_capacity_to, and
+ flush_largest_memtables_at options have been removed from
cassandra.yaml.
+- CacheServiceMBean.reduceCacheSizes() has been removed.
+ Use CacheServiceMBean.set{Key,Row}CacheCapacityInMB() instead.
+- authority option in cassandra.yaml has been deprecated since 1.2.0,
+ but it has been completely removed in 2.0. Please use 'authorizer'
option.
+- ASSUME command has been removed from cqlsh. Use CQL3 blobAsType() and
+ typeAsBlob() conversion functions instead.
+ See https://cassandra.apache.org/doc/cql3/CQL.html#blobFun for details.
+
+Operations
+--
+- Major compactions, cleanup, scrub, and upgradesstables will interrupt
+ any in-progress compactions (but not repair validations) when invoked.
+
+
++1.2.4
++=
+ - 'nodetool upgradesstables' now only upgrade/rewrite sstables that are
not
+ on the current version (which is usually what you want). Use the new -a
+ flag to recover the old behavior of rewriting all sstables.
+
+
1.2.3
=
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64cbd0c4/src/java/org/apache/cassandra/db/CollationController.java
--
diff --cc src/java/org/apache/cassandra/db/CollationController.java
index eb065d6,dafcdd3..5e477a8
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@@ -203,12 -205,14 +203,11 @@@ public class CollationControlle
}
/**
- * remove columns from @param filter where we already have data in @param
returnCF newer than @param sstableTimestamp
+ * remove columns from @param filter where we already have data in @param
container newer than @param sstableTimestamp
*/
-private void reduceNameFilter(QueryFilter filter, ColumnFamily returnCF,
long sstableTimestamp)
+private void reduceNameFilter(QueryFilter filter, ColumnFamily container,
long sstableTimestamp)
{
- // MIN_VALUE means we don't know any information
- if (container == null || sstableTimestamp == Long.MIN_VALUE)
-AbstractColumnContainer container = filter.path.superColumnName ==
null
- ? returnCF
- : (SuperColumn)
returnCF.getColumn(filter.path.superColumnName);
+ if (container == null)
return;
for (Iterator iterator = ((NamesQueryFilter)
filter.fi
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/cassandra-1.1 3346771a0 -> ffc9bece4
refs/heads/cassandra-1.2 f07804e0d -> c67e501f1
refs/heads/trunk 585619443 -> b06c45a96
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b06c45a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b06c45a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b06c45a9
Branch: refs/heads/trunk
Commit: b06c45a96d9bd3f3c0807e87bfbccf8f1a9e2459
Parents: 5856194 c67e501
Author: Yuki Morishita
Authored: Thu Mar 14 16:01:06 2013 -0500
Committer: Yuki Morishita
Committed: Thu Mar 14 16:01:06 2013 -0500
--
CHANGES.txt|1 +
build.xml |2 +-
debian/changelog |6
.../org/apache/cassandra/db/ColumnFamilyStore.java |6
.../org/apache/cassandra/db/MeteredFlusher.java|2 +-
.../apache/cassandra/service/CassandraDaemon.java |3 ++
.../org/apache/cassandra/MethodComparator.java | 21 +
.../apache/cassandra/OrderedJUnit4ClassRunner.java | 23 ++-
8 files changed, 55 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/build.xml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 8c4b017,c14ffeb..4de1ebd
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -83,14 -80,8 +83,8 @@@ public class ColumnFamilyStore implemen
public static final ExecutorService postFlushExecutor = new
JMXEnabledThreadPoolExecutor("MemtablePostFlusher");
- static
- {
- // (can block if flush queue fills up, so don't put on scheduledTasks)
- StorageService.optionalTasks.scheduleWithFixedDelay(new
MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
- }
-
public final Table table;
-public final String columnFamily;
+public final String name;
public final CFMetaData metadata;
public final IPartitioner partitioner;
private final String mbeanName;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 7e1e07676 -> 33ce1e35f refs/heads/trunk 327ae1247 -> 73e8cb62f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73e8cb62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73e8cb62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73e8cb62 Branch: refs/heads/trunk Commit: 73e8cb62f1d5597cabad2c756d898d0fd5826c1a Parents: b13e77d 33ce1e3 Author: Jonathan Ellis Authored: Wed Feb 27 12:34:08 2013 -0600 Committer: Jonathan Ellis Committed: Wed Feb 27 12:34:08 2013 -0600 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/73e8cb62/CHANGES.txt --
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.1 05709f74e -> aba9a1774 refs/heads/cassandra-1.2 db7759a2c -> 7e1e07676 refs/heads/trunk c5f9ac87f -> 327ae1247 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/327ae124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/327ae124 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/327ae124 Branch: refs/heads/trunk Commit: 327ae1247ae395c977095a5ba54acf6ec9b92145 Parents: c5f9ac8 7e1e076 Author: Brandon Williams Authored: Wed Feb 27 10:38:12 2013 -0600 Committer: Brandon Williams Committed: Wed Feb 27 10:38:12 2013 -0600 -- CHANGES.txt|1 + NEWS.txt | 18 +++ .../apache/cassandra/cql3/PropertyDefinitions.java |7 +- .../apache/cassandra/service/MigrationManager.java |1 - 4 files changed, 20 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/327ae124/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/327ae124/src/java/org/apache/cassandra/service/MigrationManager.java --
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 75d0f7a3f -> 295d6af46 refs/heads/trunk d216b0d28 -> 7590b0267 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7590b026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7590b026 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7590b026 Branch: refs/heads/trunk Commit: 7590b0267714456b29b8f0de50dddf9be96f0bcb Parents: baca0bc 295d6af Author: Jonathan Ellis Authored: Tue Feb 5 15:45:55 2013 +0100 Committer: Jonathan Ellis Committed: Tue Feb 5 15:45:55 2013 +0100 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7590b026/CHANGES.txt --
[7/7] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 677e247bb -> 9852a9360 refs/heads/trunk acf306227 -> d495727d9 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d495727d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d495727d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d495727d Branch: refs/heads/trunk Commit: d495727d9b7cd9a2de29984f1a2ca8b7037857b7 Parents: acf3062 9852a93 Author: Brandon Williams Authored: Fri Jan 4 12:12:07 2013 -0600 Committer: Brandon Williams Committed: Fri Jan 4 12:12:07 2013 -0600 -- CHANGES.txt|1 + .../org/apache/cassandra/gms/GossipDigestAck.java |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d495727d/CHANGES.txt --
