You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/05/15 13:16:51 UTC
[1/2] cassandra git commit: Fix ColumnFamilySplit length field not
being serialized
Repository: cassandra
Updated Branches:
refs/heads/trunk 5012463b6 -> 5c54f42ff
Fix ColumnFamilySplit length field not being serialized
patch by Philip Thompson; reviewed by Mike Adamson for CASSANDRA-9380
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81b0acb2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81b0acb2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81b0acb2
Branch: refs/heads/trunk
Commit: 81b0acb2a9a67dd122087a00d2ec70e2b48b0a38
Parents: 5012463
Author: Philip Thompson <pt...@gmail.com>
Authored: Fri May 15 14:12:58 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 15 14:12:58 2015 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/hadoop/ColumnFamilySplit.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81b0acb2/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
index 0ebadc0..3625685 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.mapreduce.InputSplit;
import java.io.DataInput;
import java.io.DataOutput;
+import java.io.EOFException;
import java.io.IOException;
import java.util.Arrays;
@@ -84,6 +85,7 @@ public class ColumnFamilySplit extends InputSplit implements Writable, org.apach
{
out.writeUTF(endpoint);
}
+ out.writeLong(length);
}
public void readFields(DataInput in) throws IOException
@@ -96,6 +98,14 @@ public class ColumnFamilySplit extends InputSplit implements Writable, org.apach
{
dataNodes[i] = in.readUTF();
}
+ try
+ {
+ length = in.readLong();
+ }
+ catch (EOFException e)
+ {
+ //We must be deserializing in a mixed-version cluster.
+ }
}
@Override
[2/2] cassandra git commit: Quote keyspace names in ACFIP
Posted by al...@apache.org.
Quote keyspace names in ACFIP
patch by Philip Thompson; reviewed by Mike Adamson for CASSANDRA-9390
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c54f42f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c54f42f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c54f42f
Branch: refs/heads/trunk
Commit: 5c54f42ffa72ee940eb74ec2ee8805e4edad5eff
Parents: 81b0acb
Author: Philip Thompson <pt...@gmail.com>
Authored: Fri May 15 14:15:13 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 15 14:15:13 2015 +0300
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c54f42f/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 2ef4cf4..f37504b 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -240,7 +240,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
Map<TokenRange, Set<Host>> map = new HashMap<>();
Metadata metadata = session.getCluster().getMetadata();
for (TokenRange tokenRange : metadata.getTokenRanges())
- map.put(tokenRange, metadata.getReplicas(keyspace, tokenRange));
+ map.put(tokenRange, metadata.getReplicas('"' + keyspace + '"', tokenRange));
return map;
}