cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: Allow concurrent use of CQLBulkOutputFormat patch by Paul Pak; reviewed by Piotr Kolaczkowski for CASSANDRA-7776
Date Thu, 09 Oct 2014 16:10:35 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 145213470 -> 708adca7d
  refs/heads/trunk 50734f207 -> 7892b8355


Allow concurrent use of CQLBulkOutputFormat
patch by Paul Pak; reviewed by Piotr Kolaczkowski for CASSANDRA-7776


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/708adca7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/708adca7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/708adca7

Branch: refs/heads/cassandra-2.1
Commit: 708adca7d702ce2466e80c4bf83f3c5b7cecca46
Parents: 1452134
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Oct 9 11:10:20 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Oct 9 11:10:20 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/708adca7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8d64d34..417e8c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
  * Shutdown JVM on OOM (CASSANDRA-7507)
  * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
  * Don't duplicate sstables smaller than split size when using

http://git-wip-us.apache.org/repos/asf/cassandra/blob/708adca7/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
index 7a75bb4..0a7b9f1 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.exceptions.InvalidRequestException;
@@ -150,7 +151,7 @@ public class CqlBulkRecordWriter extends AbstractBulkRecordWriter<Object,
List<B
     
     private File getColumnFamilyDirectory() throws IOException
     {
-        File dir = new File(String.format("%s%s%s%s%s", getOutputLocation(), File.separator,
keyspace, File.separator, columnFamily));
+        File dir = new File(String.format("%s%s%s%s%s-%s", getOutputLocation(), File.separator,
keyspace, File.separator, columnFamily, UUID.randomUUID().toString()));
         
         if (!dir.exists() && !dir.mkdirs())
         {


Mime
View raw message