[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/dc79a865 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc79a865 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc79a865 Branch: refs/heads/trunk Commit: dc79a865316c25e386019a25ad83412fa82c29bb Parents: 07103dd 1d54fc3 Author: Sam Tunnicliffe s...@beobal.com Authored: Wed Jul 15 16:25:54 2015 +0100 Committer: Sam Tunnicliffe s...@beobal.com Committed: Wed Jul 15 16:25:54 2015 +0100 -- CHANGES.txt| 1 + .../apache/cassandra/transport/messages/CredentialsMessage.java| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc79a865/CHANGES.txt -- diff --cc CHANGES.txt index 1e21c8d,a755cb9..e950f3b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,6 +1,31 @@@ -2.0.17 +2.1.9 + * Complete CASSANDRA-8448 fix (CASSANDRA-9519) + * Handle corrupt files on startup (CASSANDRA-9686) + * Fix clientutil jar and tests (CASSANDRA-9760) + * (cqlsh) Allow the SSL protocol version to be specified through the + config file or environment variables (CASSANDRA-9544) +Merged from 2.0: + * Don't include auth credentials in debug log (CASSANDRA-9682) * Can't transition from write survey to normal mode (CASSANDRA-9740) + * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591) + * Fix growing pending background compaction (CASSANDRA-9662) + + +2.1.8 + * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing + COMPACT STORAGE tables with no clustering columns + * Warn when an extra-large partition is compacted (CASSANDRA-9643) + * Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656) + * Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700) + * Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681) + * Update internal python driver for cqlsh (CASSANDRA-9064) + * Fix IndexOutOfBoundsException when inserting tuple with too many + elements using the string literal notation (CASSANDRA-9559) + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540) + * Enable describe on indices (CASSANDRA-7814) + * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637) +Merged from 2.0: * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727) * Add listen_address to system.local (CASSANDRA-9603) * Bug fixes to resultset metadata construction (CASSANDRA-9636) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc79a865/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java --
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/58599a9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58599a9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58599a9a
Branch: refs/heads/trunk
Commit: 58599a9a0793e8ec9ebd73e3ce9616f81783ff2c
Parents: 30df089 f283ed2
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jul 8 12:06:51 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jul 8 12:06:51 2015 -0500
--
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 13 +
.../db/compaction/CompactionManager.java| 28 +++-
.../cassandra/metrics/CompactionMetrics.java| 6 ++---
.../db/compaction/CompactionsTest.java | 12 ++---
5 files changed, 24 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58599a9a/CHANGES.txt
--
diff --cc CHANGES.txt
index 0fbadbc,40bf463..bdc5dc2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,9 +1,26 @@@
-2.0.18
+2.1.9
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
+Merged from 2.0:
* Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Fix growing pending background compaction (CASSANDRA-9662)
-2.0.17
+2.1.8
+ * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
+ COMPACT STORAGE tables with no clustering columns
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers
(CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances
(CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
* Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58599a9a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58599a9a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 205f89e,5b5b39e..1e4c54a
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -181,19 -145,12 +176,16 @@@ public class CompactionManager implemen
logger.debug(Scheduling a background task check for {}.{} with {},
cfs.keyspace.getName(),
cfs.name,
- cfs.getCompactionStrategy().getClass().getSimpleName());
+ cfs.getCompactionStrategy().getName());
- ListFuture? futures = new ArrayListFuture?();
+ ListFuture? futures = new ArrayList();
-
// we must schedule it at least once, otherwise compaction will stop
for a CF until next flush
- do {
- if (executor.isShutdown())
- {
- logger.info(Executor has shut down, not submitting
background task);
- return Collections.emptyList();
- }
- compactingCF.add(cfs);
- futures.add(executor.submit(new BackgroundCompactionTask(cfs)));
- // if we have room for more compactions, then fill up executor
- } while (autoFill executor.getActiveCount() + futures.size()
executor.getMaximumPoolSize());
++if (executor.isShutdown())
++{
++logger.info(Executor has shut down, not submitting background
task);
++return Collections.emptyList();
++}
+ compactingCF.add(cfs);
+ futures.add(executor.submit(new BackgroundCompactionCandidate(cfs)));
return futures;
}
@@@ -206,15 -163,9 +198,15 @@@
return false;
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/fe7a7a7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe7a7a7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe7a7a7f Branch: refs/heads/trunk Commit: fe7a7a7f9f295138d78805c00ed4923c8f0d5ae1 Parents: 58599a9 7cebd0e Author: Yuki Morishita yu...@apache.org Authored: Wed Jul 8 12:21:08 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Wed Jul 8 12:21:08 2015 -0500 -- --
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
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/ca2f0223
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca2f0223
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca2f0223
Branch: refs/heads/trunk
Commit: ca2f022367ce01751805d28ff38d5e302f473313
Parents: aa8a7b5 62714a9
Author: Sam Tunnicliffe s...@beobal.com
Authored: Mon Jul 6 15:04:33 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Mon Jul 6 15:06:50 2015 +0100
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/transport/Client.java | 3 +++
.../org/apache/cassandra/transport/messages/AuthSuccess.java | 8 ++--
3 files changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/CHANGES.txt
--
diff --cc CHANGES.txt
index ad5ed3d,ca4d4b5..69cb32c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.0.17
+2.1.8
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers
(CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances
(CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
+ * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
* Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/src/java/org/apache/cassandra/transport/Client.java
--
diff --cc src/java/org/apache/cassandra/transport/Client.java
index c7c3103,4a50bde..8535dbd
--- a/src/java/org/apache/cassandra/transport/Client.java
+++ b/src/java/org/apache/cassandra/transport/Client.java
@@@ -32,6 -32,6 +32,7 @@@ import java.util.Map
import com.google.common.base.Splitter;
import org.apache.cassandra.auth.IAuthenticator;
++import org.apache.cassandra.config.Config;
import org.apache.cassandra.cql3.QueryOptions;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.marshal.Int32Type;
@@@ -233,6 -231,6 +234,8 @@@ public class Client extends SimpleClien
public static void main(String[] args) throws Exception
{
++Config.setClientMode(true);
++
// Print usage if no argument is specified.
if (args.length != 2)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
--
diff --cc src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
index 98f50db,20bbed4..8c1b5b1
--- a/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
+++ b/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
@@@ -33,11 -33,15 +33,15 @@@ public class AuthSuccess extends Messag
{
public static final Message.CodecAuthSuccess codec = new
Message.CodecAuthSuccess()
{
-public AuthSuccess decode(ChannelBuffer body, int version)
+public AuthSuccess decode(ByteBuf body, int version)
{
ByteBuffer b = CBUtil.readValue(body);
- byte[] token = new byte[b.remaining()];
- b.get(token);
+ byte[] token = null;
+ if (b != null)
+ {
+ token = new byte[b.remaining()];
+ b.get(token);
+ }
return new AuthSuccess(token);
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/7473877e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7473877e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7473877e
Branch: refs/heads/trunk
Commit: 7473877eeaec2772effcfcf855b378bc4ca92789
Parents: b757db1 2a294e4
Author: Sam Tunnicliffe s...@beobal.com
Authored: Thu Jul 2 11:22:18 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Thu Jul 2 11:25:28 2015 +0100
--
CHANGES.txt | 1 +
.../org/apache/cassandra/cql3/ResultSet.java| 2 +-
.../cql3/statements/ModificationStatement.java | 2 +-
.../cql3/statements/SelectStatement.java| 2 +-
.../cassandra/cql3/statements/Selection.java| 67 ++--
.../cql3/statements/SelectionColumnMapping.java | 52 +-
.../statements/SelectionColumnMappingTest.java | 170 ---
7 files changed, 246 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7473877e/CHANGES.txt
--
diff --cc CHANGES.txt
index 25f7c1d,07de84c..b316aa5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-2.0.17
+2.1.8
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
+ * Bug fixes to resultset metadata construction (CASSANDRA-9636)
* Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)
* Avoid ballot clash in Paxos (CASSANDRA-9649)
* Improve trace messages for RR (CASSANDRA-9479)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7473877e/src/java/org/apache/cassandra/cql3/ResultSet.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7473877e/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --cc
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 3838909,c731cd4..876c5e4
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -598,7 -672,9 +598,7 @@@ public abstract class ModificationState
Selection selection;
if (columnsWithConditions == null)
{
- selection = Selection.wildcard(cfm);
-selection = Selection.wildcard(cfDef, false, null);
++selection = Selection.wildcard(cfm, false, null);
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7473877e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 6fea8cb,aaf9579..7241088
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -1506,8 -1537,8 +1506,8 @@@ public class SelectStatement implement
throw new InvalidRequestException(Only COUNT(*) and COUNT(1)
operations are currently supported.);
Selection selection = selectClause.isEmpty()
- ? Selection.wildcard(cfm)
-? Selection.wildcard(cfDef,
parameters.isCount, parameters.countAlias)
-: Selection.fromSelectors(cfDef,
selectClause);
++? Selection.wildcard(cfm, parameters.isCount,
parameters.countAlias)
+: Selection.fromSelectors(cfm, selectClause);
SelectStatement stmt = new SelectStatement(cfm,
boundNames.size(), parameters, selection, prepareLimit(boundNames));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7473877e/src/java/org/apache/cassandra/cql3/statements/Selection.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/Selection.java
index 83cbfe8,0bad973..d29b917
---
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/ca40d11c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca40d11c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca40d11c
Branch: refs/heads/trunk
Commit: ca40d11c72225d036f864d40c251a74e0803fdc2
Parents: 921eb7e 3623ea4
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Jul 2 13:06:18 2015 -0700
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jul 2 13:07:41 2015 -0700
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 3 ++-
src/java/org/apache/cassandra/db/SystemKeyspace.java | 5 +++--
3 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca40d11c/CHANGES.txt
--
diff --cc CHANGES.txt
index 78e23fb,e453958..ad5ed3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.0.17
+2.1.8
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers
(CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances
(CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
+ * Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
* Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)
* Avoid ballot clash in Paxos (CASSANDRA-9649)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca40d11c/src/java/org/apache/cassandra/config/CFMetaData.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca40d11c/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 7081abf,e78e7de..2185c6c
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -123,49 -118,27 +123,50 @@@ public class SystemKeyspac
for (String cfname : Arrays.asList(SystemKeyspace.SCHEMA_KEYSPACES_CF,
SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF,
SystemKeyspace.SCHEMA_COLUMNS_CF,
- SystemKeyspace.SCHEMA_TRIGGERS_CF))
-processInternal(String.format(DELETE FROM system.%s WHERE
keyspace_name = '%s', cfname, ksmd.name));
+ SystemKeyspace.SCHEMA_TRIGGERS_CF,
+
SystemKeyspace.SCHEMA_USER_TYPES_CF))
+{
+executeOnceInternal(String.format(DELETE FROM system.%s USING
TIMESTAMP ? WHERE keyspace_name = ?, cfname),
+timestamp,
+ksmd.name);
+}
// (+1 to timestamp to make sure we don't get shadowed by the
tombstones we just added)
-ksmd.toSchema(FBUtilities.timestampMicros() + 1).apply();
+ksmd.toSchema(timestamp + 1).apply();
}
-// Starting with 2.0 (CASSANDRA-5125) we keep all the 'aliases' in
system.schema_columns together with the regular columns,
-// but only for the newly-created tables. This migration is for the
pre-2.0 created tables.
-private static void copyAllAliasesToColumnsProper()
+private static void setupVersion()
{
- String req = INSERT INTO system.%s (key, release_version,
cql_version, thrift_version, native_protocol_version, data_center, rack,
partitioner, rpc_address, broadcast_address) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,
?);
-for (UntypedResultSet.Row row : processInternal(String.format(SELECT
* FROM system.%s, SCHEMA_COLUMNFAMILIES_CF)))
++String req = INSERT INTO system.%s (key, release_version,
cql_version, thrift_version, native_protocol_version, data_center, rack,
partitioner, rpc_address, broadcast_address, listen_address) VALUES (?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?);
+
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/ResultSet.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83944f82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83944f82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83944f82 Branch: refs/heads/trunk Commit: 83944f82b8897d4cd1613d046028b296474e2cd7 Parents: c1702b0 80d46b8 Author: Sam Tunnicliffe s...@beobal.com Authored: Tue Jun 16 15:20:11 2015 +0100 Committer: Sam Tunnicliffe s...@beobal.com Committed: Tue Jun 16 15:20:11 2015 +0100 -- CHANGES.txt | 5 + src/java/org/apache/cassandra/cql3/ResultSet.java | 8 2 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83944f82/CHANGES.txt -- diff --cc CHANGES.txt index 928eb55,7f507c2..022d868 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,44 -1,6 +1,49 @@@ -2.0.16: ++2.1.7 ++Merged from 2.0 + * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571) - * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564) ++ ++ +2.1.6 + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083) + * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487) + * Use ProtocolError code instead of ServerError code for native protocol + error responses to unsupported protocol versions (CASSANDRA-9451) + * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504) + * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071) + * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) + * Consistent error message when a table mixes counter and non-counter + columns (CASSANDRA-9492) + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: * Don't accumulate more range than necessary in RangeTombstone.Tracker (CASSANDRA-9486) * Add broadcast and rpc addresses to system.local (CASSANDRA-9436) * Always mark sstable suspect when corrupted (CASSANDRA-9478) http://git-wip-us.apache.org/repos/asf/cassandra/blob/83944f82/src/java/org/apache/cassandra/cql3/ResultSet.java -- diff --cc src/java/org/apache/cassandra/cql3/ResultSet.java index e463b29,659ed50..4ff513b --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@@ -300,13 -281,14 +300,13 @@@ public class ResultSe return true; } -public Metadata setHasMorePages(PagingState pagingState) +
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/374ef3c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/374ef3c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/374ef3c7 Branch: refs/heads/trunk Commit: 374ef3c7a7bed81e5ad550649d96f8f9b1a96310 Parents: 83944f8 ec52e77 Author: Benedict Elliott Smith bened...@apache.org Authored: Tue Jun 16 16:33:10 2015 +0100 Committer: Benedict Elliott Smith bened...@apache.org Committed: Tue Jun 16 16:33:10 2015 +0100 -- CHANGES.txt | 2 ++ .../apache/cassandra/db/ColumnFamilyStore.java | 24 .../db/compaction/CompactionManager.java| 7 +- .../cassandra/service/CassandraDaemon.java | 20 4 files changed, 36 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/374ef3c7/CHANGES.txt -- diff --cc CHANGES.txt index 022d868,6d031f6..858f13c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,49 -1,7 +1,51 @@@ +2.1.7 +Merged from 2.0 + 2.0.16: + * Periodically submit background compaction tasks (CASSANDRA-9592) * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571) - * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564) + + +2.1.6 + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083) + * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487) + * Use ProtocolError code instead of ServerError code for native protocol + error responses to unsupported protocol versions (CASSANDRA-9451) + * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504) + * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071) + * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) + * Consistent error message when a table mixes counter and non-counter + columns (CASSANDRA-9492) + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: * Don't accumulate more range than necessary in RangeTombstone.Tracker (CASSANDRA-9486) * Add broadcast and rpc addresses to system.local (CASSANDRA-9436) * Always mark sstable suspect when corrupted (CASSANDRA-9478) http://git-wip-us.apache.org/repos/asf/cassandra/blob/374ef3c7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/374ef3c7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/212a2c19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/212a2c19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/212a2c19 Branch: refs/heads/trunk Commit: 212a2c1949b9aaa71d482d72984ff137759e28b7 Parents: 9ecab2b 3ddd17b Author: Sam Tunnicliffe s...@beobal.com Authored: Tue Jun 9 08:15:21 2015 +0100 Committer: Sam Tunnicliffe s...@beobal.com Committed: Tue Jun 9 08:15:21 2015 +0100 -- --
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 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/14a33247 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14a33247 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14a33247 Branch: refs/heads/trunk Commit: 14a332470cbf8a3d0a2deb88b078a057db94f39a Parents: 40c3ad6 63819cb Author: Sam Tunnicliffe s...@beobal.com Authored: Mon Jun 1 18:12:50 2015 +0100 Committer: Sam Tunnicliffe s...@beobal.com Committed: Mon Jun 1 18:12:50 2015 +0100 -- CHANGES.txt | 1 + doc/cql3/CQL.textile | 211 ++ 2 files changed, 212 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14a33247/CHANGES.txt -- diff --cc CHANGES.txt index 75eb752,d23661d..71ce442 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ -2.0.16: +2.1.6 + * Consistent error message when a table mixes counter and non-counter + columns (CASSANDRA-9492) + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: + * Add database users and permissions to CQL3 documentation (CASSANDRA-7558) * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969) * Fix bad condition in RangeTombstoneList (CASSANDRA-9485) * Fix potential StackOverflow when setting CrcCheckChance over JMX (CASSANDRA-9488) http://git-wip-us.apache.org/repos/asf/cassandra/blob/14a33247/doc/cql3/CQL.textile --
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/434d27b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/434d27b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/434d27b8 Branch: refs/heads/trunk Commit: 434d27b8ae1a4ca6074cba3b37607bdef495d18e Parents: e0ea4fb 3e4ed96 Author: Yuki Morishita yu...@apache.org Authored: Tue May 26 13:26:48 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Tue May 26 13:26:48 2015 -0500 -- --
[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/4e269111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e269111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e269111
Branch: refs/heads/trunk
Commit: 4e2691110bde17a54a1b378d5727cc6dcd156300
Parents: f3ca368 2beb66e
Author: Yuki Morishita yu...@apache.org
Authored: Tue May 26 12:16:34 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue May 26 12:16:34 2015 -0500
--
.../cassandra/streaming/messages/IncomingFileMessage.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e269111/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
--
diff --cc
src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 9866d1e,99662d0..494af85
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@@ -53,11 -52,18 +53,19 @@@ public class IncomingFileMessage extend
// This can be caused by network/node failure thus we are not
retrying
throw eof;
}
-catch (Throwable e)
+catch (Throwable t)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
-Throwable cause = e;
++Throwable cause = t;
+ while ((cause = cause.getCause()) != null)
+ {
+if (cause instanceof IOException)
+throw (IOException) cause;
+ }
+JVMStabilityInspector.inspectThrowable(t);
// Otherwise, we can retry
-session.doRetry(header, e);
+session.doRetry(header, t);
return null;
}
}
