You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/07/02 10:29:20 UTC
[1/3] git commit: Fix compilation with java 6 (JAVA-7147 regression)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 4112a7fa2 -> 34252003b
Fix compilation with java 6 (JAVA-7147 regression)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/135513cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/135513cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/135513cf
Branch: refs/heads/cassandra-2.0
Commit: 135513cf9b95edadf7ab52be8b05c2d83019f3cd
Parents: 73e1eff
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 10:23:19 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 10:23:19 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/CloudstackSnitch.java | 3 +--
src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 7 +++----
src/java/org/apache/cassandra/utils/FBUtilities.java | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/135513cf/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
index 57c973b..eb671d7 100644
--- a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
+++ b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
@@ -27,7 +27,6 @@ import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.URL;
import java.net.URI;
-import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@@ -137,7 +136,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
byte[] b = new byte[cl];
is = new DataInputStream(new BufferedInputStream(conn.getInputStream()));
is.readFully(b);
- return new String(b, StandardCharsets.UTF_8);
+ return new String(b, FBUtilities.UTF_8);
}
finally
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/135513cf/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
index 86f3f02..acc4885 100644
--- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
+++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
@@ -74,7 +74,6 @@ import org.apache.cassandra.io.util.FileUtils;
*/
public class ByteBufferUtil
{
- private static final Charset UTF_8 = Charset.forName("UTF-8");
public static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
public static int compareUnsigned(ByteBuffer o1, ByteBuffer o2)
@@ -121,7 +120,7 @@ public class ByteBufferUtil
*/
public static String string(ByteBuffer buffer) throws CharacterCodingException
{
- return string(buffer, UTF_8);
+ return string(buffer, FBUtilities.UTF_8);
}
/**
@@ -135,7 +134,7 @@ public class ByteBufferUtil
*/
public static String string(ByteBuffer buffer, int position, int length) throws CharacterCodingException
{
- return string(buffer, position, length, UTF_8);
+ return string(buffer, position, length, FBUtilities.UTF_8);
}
/**
@@ -228,7 +227,7 @@ public class ByteBufferUtil
*/
public static ByteBuffer bytes(String s)
{
- return ByteBuffer.wrap(s.getBytes(UTF_8));
+ return ByteBuffer.wrap(s.getBytes(FBUtilities.UTF_8));
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/135513cf/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java
index 8cb6dae..437b6a8 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -27,6 +27,7 @@ import java.net.SocketException;
import java.net.URL;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
@@ -63,6 +64,8 @@ import org.codehaus.jackson.map.ObjectMapper;
public class FBUtilities
{
+ public static final Charset UTF_8 = Charset.forName("UTF-8");
+
private static final Logger logger = LoggerFactory.getLogger(FBUtilities.class);
private static ObjectMapper jsonMapper = new ObjectMapper(new JsonFactory());
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34252003
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34252003
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34252003
Branch: refs/heads/cassandra-2.0
Commit: 34252003bfbcad4f216e40d3ba6a54a2e6eca155
Parents: 4112a7f 04250f2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 10:29:10 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 10:29:10 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/34252003/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ff8a7a2,1a79e8d..6b93631
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,8 +1,45 @@@
-1.2.18
- * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
- * Fix compilation with java 6 broke by CASSANDRA-7147
+2.0.10
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
++Merged from 1.2:
-1.2.17
+
+2.0.9
+ * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * Add per-CF range read request latency metrics (CASSANDRA-7338)
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
+ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
+ * Swap local and global default read repair chances (CASSANDRA-7320)
+ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
+ * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
+ * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
+ * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+ * Account for range tombstones in min/max column names (CASSANDRA-7235)
+ * Improve sub range repair validation (CASSANDRA-7317)
+ * Accept subtypes for function results, type casts (CASSANDRA-6766)
+ * Support DISTINCT for static columns and fix behaviour when DISTINC is
+ not use (CASSANDRA-7305).
+ * Refuse range queries with strict bounds on compact tables since they
+ are broken (CASSANDRA-7059)
+Merged from 1.2:
+ * Expose global ColumnFamily metrics (CASSANDRA-7273)
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
* Expose global ColumnFamily metrics (CASSANDRA-7273)
* Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
[2/3] git commit: Changelog
Posted by sl...@apache.org.
Changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04250f2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04250f2e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04250f2e
Branch: refs/heads/cassandra-2.0
Commit: 04250f2e5c2f0e2b5fcacdbbfb9c62e25dbcc440
Parents: 135513c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 10:26:44 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 10:26:44 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04250f2e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bc44f26..1a79e8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.2.18
* Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
+ * Fix compilation with java 6 broke by CASSANDRA-7147
1.2.17
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)