You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/22 16:46:58 UTC
[01/10] git commit: Fix schema concurrency exceptions (backport of
#6841)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 3dad8ca60 -> 8b8042b03
refs/heads/cassandra-2.1 44f4e7901 -> c531f537f
refs/heads/trunk 47e81bf37 -> b7a1eb4ce
Fix schema concurrency exceptions (backport of #6841)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0547d16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0547d16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0547d16d
Branch: refs/heads/cassandra-2.1
Commit: 0547d16d5f5475e66c339ed779cf561c52869445
Parents: 8d1acd9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 22 09:15:29 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 22 09:17:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/commitlog/CommitLogAllocator.java | 2 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8cfffad..dc48131 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * Fix schema concurrency exceptions (CASSANDRA-6841)
* Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
(CASSANDRA-6822)
* Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
index d62d7ca..c668377 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
@@ -293,7 +293,7 @@ public class CommitLogAllocator
{
CommitLogSegment oldestSegment = activeSegments.peek();
- if (oldestSegment != null)
+ if (oldestSegment != null && oldestSegment != CommitLog.instance.activeSegment)
{
for (UUID dirtyCFId : oldestSegment.getDirtyCFIDs())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index c0c7918..bd50b60 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -22,10 +22,13 @@ import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.Checksum;
@@ -59,7 +62,7 @@ public class CommitLogSegment
static final int ENTRY_OVERHEAD_SIZE = 4 + 8 + 8;
// cache which cf is dirty in this segment to avoid having to lookup all ReplayPositions to decide if we can delete this segment
- private final HashMap<UUID, Integer> cfLastWrite = new HashMap<UUID, Integer>();
+ private final Map<UUID, Integer> cfLastWrite = new HashMap<UUID, Integer>();
public final long id;
@@ -316,7 +319,7 @@ public class CommitLogSegment
* @param cfId the column family ID that is now clean
* @param context the optional clean offset
*/
- public void markClean(UUID cfId, ReplayPosition context)
+ public synchronized void markClean(UUID cfId, ReplayPosition context)
{
Integer lastWritten = cfLastWrite.get(cfId);
@@ -329,15 +332,15 @@ public class CommitLogSegment
/**
* @return a collection of dirty CFIDs for this segment file.
*/
- public Collection<UUID> getDirtyCFIDs()
+ public synchronized Collection<UUID> getDirtyCFIDs()
{
- return cfLastWrite.keySet();
+ return new ArrayList<UUID>(cfLastWrite.keySet());
}
/**
* @return true if this segment is unused and safe to recycle or delete
*/
- public boolean isUnused()
+ public synchronized boolean isUnused()
{
return cfLastWrite.isEmpty();
}
@@ -357,7 +360,7 @@ public class CommitLogSegment
public String dirtyString()
{
StringBuilder sb = new StringBuilder();
- for (UUID cfId : cfLastWrite.keySet())
+ for (UUID cfId : getDirtyCFIDs())
{
CFMetaData m = Schema.instance.getCFMetaData(cfId);
sb.append(m == null ? "<deleted>" : m.cfName).append(" (").append(cfId).append("), ");
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
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/c531f537
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c531f537
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c531f537
Branch: refs/heads/cassandra-2.1
Commit: c531f537fe68610430218904876e30c9ceba21ee
Parents: 44f4e79 8b8042b
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:43:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:43:01 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c531f537/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
[04/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dad8ca6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dad8ca6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dad8ca6
Branch: refs/heads/trunk
Commit: 3dad8ca60c14a6c57a1a2830310b14d50d36b0c0
Parents: de720b4 0547d16
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 22 09:17:31 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 22 09:17:31 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/10] git commit: Don't NPE when username is supplied but password
isn't.
Posted by br...@apache.org.
Don't NPE when username is supplied but password isn't.
Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b8042b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8042b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8042b0
Branch: refs/heads/cassandra-2.0
Commit: 8b8042b032fd93103fa6c74fc4b751e0dd9a207b
Parents: 3dad8ca
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:42:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/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 03b1576..73bc25c 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -103,7 +103,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
// log in
client.set_keyspace(ConfigHelper.getInputKeyspace(conf));
- if (ConfigHelper.getInputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getInputKeyspaceUserName(conf) != null) && (ConfigHelper.getInputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getInputKeyspaceUserName(conf));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
index 3041829..96ca65d 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
@@ -124,7 +124,7 @@ public abstract class AbstractColumnFamilyOutputFormat<K, Y> extends OutputForma
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
- if (ConfigHelper.getOutputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getOutputKeyspaceUserName(conf) != null) && (ConfigHelper.getOutputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getOutputKeyspaceUserName(conf));
[07/10] git commit: Don't NPE when username is supplied but password
isn't.
Posted by br...@apache.org.
Don't NPE when username is supplied but password isn't.
Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b8042b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8042b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8042b0
Branch: refs/heads/trunk
Commit: 8b8042b032fd93103fa6c74fc4b751e0dd9a207b
Parents: 3dad8ca
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:42:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/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 03b1576..73bc25c 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -103,7 +103,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
// log in
client.set_keyspace(ConfigHelper.getInputKeyspace(conf));
- if (ConfigHelper.getInputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getInputKeyspaceUserName(conf) != null) && (ConfigHelper.getInputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getInputKeyspaceUserName(conf));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
index 3041829..96ca65d 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
@@ -124,7 +124,7 @@ public abstract class AbstractColumnFamilyOutputFormat<K, Y> extends OutputForma
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
- if (ConfigHelper.getOutputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getOutputKeyspaceUserName(conf) != null) && (ConfigHelper.getOutputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getOutputKeyspaceUserName(conf));
[02/10] git commit: Fix schema concurrency exceptions (backport of
#6841)
Posted by br...@apache.org.
Fix schema concurrency exceptions (backport of #6841)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0547d16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0547d16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0547d16d
Branch: refs/heads/trunk
Commit: 0547d16d5f5475e66c339ed779cf561c52869445
Parents: 8d1acd9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 22 09:15:29 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 22 09:17:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/commitlog/CommitLogAllocator.java | 2 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8cfffad..dc48131 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * Fix schema concurrency exceptions (CASSANDRA-6841)
* Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
(CASSANDRA-6822)
* Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
index d62d7ca..c668377 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
@@ -293,7 +293,7 @@ public class CommitLogAllocator
{
CommitLogSegment oldestSegment = activeSegments.peek();
- if (oldestSegment != null)
+ if (oldestSegment != null && oldestSegment != CommitLog.instance.activeSegment)
{
for (UUID dirtyCFId : oldestSegment.getDirtyCFIDs())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0547d16d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index c0c7918..bd50b60 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -22,10 +22,13 @@ import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.Checksum;
@@ -59,7 +62,7 @@ public class CommitLogSegment
static final int ENTRY_OVERHEAD_SIZE = 4 + 8 + 8;
// cache which cf is dirty in this segment to avoid having to lookup all ReplayPositions to decide if we can delete this segment
- private final HashMap<UUID, Integer> cfLastWrite = new HashMap<UUID, Integer>();
+ private final Map<UUID, Integer> cfLastWrite = new HashMap<UUID, Integer>();
public final long id;
@@ -316,7 +319,7 @@ public class CommitLogSegment
* @param cfId the column family ID that is now clean
* @param context the optional clean offset
*/
- public void markClean(UUID cfId, ReplayPosition context)
+ public synchronized void markClean(UUID cfId, ReplayPosition context)
{
Integer lastWritten = cfLastWrite.get(cfId);
@@ -329,15 +332,15 @@ public class CommitLogSegment
/**
* @return a collection of dirty CFIDs for this segment file.
*/
- public Collection<UUID> getDirtyCFIDs()
+ public synchronized Collection<UUID> getDirtyCFIDs()
{
- return cfLastWrite.keySet();
+ return new ArrayList<UUID>(cfLastWrite.keySet());
}
/**
* @return true if this segment is unused and safe to recycle or delete
*/
- public boolean isUnused()
+ public synchronized boolean isUnused()
{
return cfLastWrite.isEmpty();
}
@@ -357,7 +360,7 @@ public class CommitLogSegment
public String dirtyString()
{
StringBuilder sb = new StringBuilder();
- for (UUID cfId : cfLastWrite.keySet())
+ for (UUID cfId : getDirtyCFIDs())
{
CFMetaData m = Schema.instance.getCFMetaData(cfId);
sb.append(m == null ? "<deleted>" : m.cfName).append(" (").append(cfId).append("), ");
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7a1eb4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7a1eb4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7a1eb4c
Branch: refs/heads/trunk
Commit: b7a1eb4ce846e39bb834ebe5b094f85cd8762166
Parents: 47e81bf c531f53
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:43:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:43:11 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[03/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dad8ca6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dad8ca6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dad8ca6
Branch: refs/heads/cassandra-2.1
Commit: 3dad8ca60c14a6c57a1a2830310b14d50d36b0c0
Parents: de720b4 0547d16
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 22 09:17:31 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 22 09:17:31 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/10] git commit: Don't NPE when username is supplied but password
isn't.
Posted by br...@apache.org.
Don't NPE when username is supplied but password isn't.
Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b8042b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8042b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8042b0
Branch: refs/heads/cassandra-2.1
Commit: 8b8042b032fd93103fa6c74fc4b751e0dd9a207b
Parents: 3dad8ca
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:42:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/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 03b1576..73bc25c 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -103,7 +103,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
// log in
client.set_keyspace(ConfigHelper.getInputKeyspace(conf));
- if (ConfigHelper.getInputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getInputKeyspaceUserName(conf) != null) && (ConfigHelper.getInputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getInputKeyspaceUserName(conf));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
index 3041829..96ca65d 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
@@ -124,7 +124,7 @@ public abstract class AbstractColumnFamilyOutputFormat<K, Y> extends OutputForma
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
- if (ConfigHelper.getOutputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getOutputKeyspaceUserName(conf) != null) && (ConfigHelper.getOutputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getOutputKeyspaceUserName(conf));
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
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/c531f537
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c531f537
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c531f537
Branch: refs/heads/trunk
Commit: c531f537fe68610430218904876e30c9ceba21ee
Parents: 44f4e79 8b8042b
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:43:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:43:01 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c531f537/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------