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 2013/11/05 20:43:44 UTC
[1/6] git commit: show the host and port when failing to connect
Updated Branches:
refs/heads/cassandra-1.2 3d58c5ae1 -> cd7b05ffb
refs/heads/cassandra-2.0 91a81b7cb -> d38ca3252
refs/heads/trunk 470e3fe2d -> 5909b5f87
show the host and port when failing to connect
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd7b05ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd7b05ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd7b05ff
Branch: refs/heads/cassandra-1.2
Commit: cd7b05ffb6d2859eb4fbb9567d1fe38af3f39d27
Parents: 3d58c5a
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:40:50 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:40:50 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd7b05ff/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 16d03f9..8fd66ab 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -55,6 +55,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +93,12 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
public static Cassandra.Client createAuthenticatedClient(String location, int port, Configuration conf) throws Exception
{
logger.debug("Creating authenticated client for CF input format");
- TTransport transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ TTransport transport;
+ try {
+ transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ } catch (Exception e) {
+ throw new TTransportException("Failed to open a transport to " + location + ":" + port + ".", e);
+ }
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5909b5f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5909b5f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5909b5f8
Branch: refs/heads/trunk
Commit: 5909b5f87ec5fe3cea55402ccd618eb491d1c4f2
Parents: 470e3fe d38ca32
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:41:58 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:41:58 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5909b5f8/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
[4/6] 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
Conflicts:
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d38ca325
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d38ca325
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d38ca325
Branch: refs/heads/trunk
Commit: d38ca325218b75436d674c4ecaba564d2abc36eb
Parents: 91a81b7 cd7b05f
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:41:45 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:41:45 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38ca325/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 060469d,8fd66ab..274e43f
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@@ -60,7 -55,12 +60,8 @@@ import org.apache.thrift.TException
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+ import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<K, Y> implements org.apache.hadoop.mapred.InputFormat<K, Y>
{
[3/6] git commit: show the host and port when failing to connect
Posted by br...@apache.org.
show the host and port when failing to connect
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd7b05ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd7b05ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd7b05ff
Branch: refs/heads/trunk
Commit: cd7b05ffb6d2859eb4fbb9567d1fe38af3f39d27
Parents: 3d58c5a
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:40:50 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:40:50 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd7b05ff/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 16d03f9..8fd66ab 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -55,6 +55,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +93,12 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
public static Cassandra.Client createAuthenticatedClient(String location, int port, Configuration conf) throws Exception
{
logger.debug("Creating authenticated client for CF input format");
- TTransport transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ TTransport transport;
+ try {
+ transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ } catch (Exception e) {
+ throw new TTransportException("Failed to open a transport to " + location + ":" + port + ".", e);
+ }
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
[5/6] 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
Conflicts:
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d38ca325
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d38ca325
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d38ca325
Branch: refs/heads/cassandra-2.0
Commit: d38ca325218b75436d674c4ecaba564d2abc36eb
Parents: 91a81b7 cd7b05f
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:41:45 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:41:45 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38ca325/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 060469d,8fd66ab..274e43f
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@@ -60,7 -55,12 +60,8 @@@ import org.apache.thrift.TException
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+ import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<K, Y> implements org.apache.hadoop.mapred.InputFormat<K, Y>
{
[2/6] git commit: show the host and port when failing to connect
Posted by br...@apache.org.
show the host and port when failing to connect
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd7b05ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd7b05ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd7b05ff
Branch: refs/heads/cassandra-2.0
Commit: cd7b05ffb6d2859eb4fbb9567d1fe38af3f39d27
Parents: 3d58c5a
Author: Brandon Williams <br...@apache.org>
Authored: Tue Nov 5 13:40:50 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Nov 5 13:40:50 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd7b05ff/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 16d03f9..8fd66ab 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -55,6 +55,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +93,12 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
public static Cassandra.Client createAuthenticatedClient(String location, int port, Configuration conf) throws Exception
{
logger.debug("Creating authenticated client for CF input format");
- TTransport transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ TTransport transport;
+ try {
+ transport = ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, conf);
+ } catch (Exception e) {
+ throw new TTransportException("Failed to open a transport to " + location + ":" + port + ".", e);
+ }
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);