cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [1/2] cassandra git commit: Remove JVMStabilityInspector from hadoop code
Date Wed, 14 Jan 2015 17:49:11 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 2fc9f3292 -> c65a9f5c6


Remove JVMStabilityInspector from hadoop code

Patch by jmckenzie; reviewed by bwilliams as follow-up for CASSANDRA-8292


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

Branch: refs/heads/trunk
Commit: 2ff913767437ae919a72ec00c2437aa7ce904f6e
Parents: 7804a53
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Wed Jan 14 11:45:26 2015 -0600
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Wed Jan 14 11:45:26 2015 -0600

----------------------------------------------------------------------
 .../org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java    | 2 --
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java   | 2 --
 src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java   | 4 +---
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java   | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff91376/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
index a1b04f0..d6a873b 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
@@ -26,7 +26,6 @@ import java.util.*;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.thrift.*;
-import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.cassandra.utils.Pair;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
@@ -199,7 +198,6 @@ final class ColumnFamilyRecordWriter extends AbstractColumnFamilyRecordWriter<By
                     }
                     catch (Exception e)
                     {
-                        JVMStabilityInspector.inspectThrowable(e);
                         closeInternal();
                         if (!iter.hasNext())
                         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff91376/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index 702cae3..2096055 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -40,7 +40,6 @@ import org.apache.cassandra.hadoop.HadoopCompat;
 import org.apache.cassandra.thrift.*;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
 import org.apache.hadoop.util.Progressable;
@@ -255,7 +254,6 @@ class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String,
ByteB
                     }
                     catch (Exception e)
                     {
-                        JVMStabilityInspector.inspectThrowable(e);
                         closeInternal();
                         if (!iter.hasNext())
                         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff91376/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 6b22fac..1e6802b 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -35,7 +35,6 @@ import org.apache.cassandra.thrift.*;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.Hex;
-import org.apache.cassandra.utils.JVMStabilityInspector;
 import org.apache.hadoop.mapreduce.*;
 import org.apache.pig.Expression;
 import org.apache.pig.ResourceSchema;
@@ -237,7 +236,6 @@ public class CassandraStorage extends AbstractCassandraStorage
                 }
                 catch (Exception e)
                 {
-                    JVMStabilityInspector.inspectThrowable(e);
                     cql3Table = true;
                 }
                 if (hasColumn)
@@ -727,7 +725,7 @@ public class CassandraStorage extends AbstractCassandraStorage
     }
 
     /** get a list of column for the column family */
-    protected List<ColumnDef> getColumnMetadata(Cassandra.Client client) 
+    protected List<ColumnDef> getColumnMetadata(Cassandra.Client client)
     throws TException, CharacterCodingException, InvalidRequestException, ConfigurationException
     {   
         return getColumnMeta(client, true, true);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ff91376/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 3eb6823..7887085 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -378,7 +378,6 @@ public class CqlNativeStorage extends AbstractCassandraStorage
                 }
                 catch (Exception e)
                 {
-                    JVMStabilityInspector.inspectThrowable(e);
                     // no compact column at value_alias
                 }
             }


Mime
View raw message