svn commit: r1170333 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java

[jb...@apache.org]

Author: jbellis
Date: Tue Sep 13 20:28:12 2011
New Revision: 1170333

URL: http://svn.apache.org/viewvc?rev=1170333&view=rev
Log:
revert CASSANDRA-2388 (again)

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1170333&r1=1170332&r2=1170333&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Sep 13 20:28:12 2011
@@ -1,5 +1,6 @@
 0.7.10
  * Fix divide by zero error in GCInspector (CASSANDRA-3164)
+ * revert CASSANDRA-2388
 
 
 0.7.9
@@ -8,7 +9,7 @@
  * prune index scan resultset back to original request for lazy
    resultset expansion case (CASSANDRA-2964)
  * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker
-    has not (CASSANDRA-2388)
+   has not (CASSANDRA-2388)
  * avoid retaining references to dropped CFS objects in 
    CompactionManager.estimatedCompactions (CASSANDRA-2708)
  * remove gossip state when a new IP takes over a token (CASSANDRA-3071)

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java?rev=1170333&r1=1170332&r2=1170333&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java Tue Sep 13 20:28:12 2011
@@ -138,6 +138,8 @@ public class ColumnFamilyRecordReader ex
         return true;
     }
 
+    // we don't use endpointsnitch since we are trying to support hadoop nodes that are
+    // not necessarily on Cassandra machines, too.  This should be adequate for single-DC clusters, at least.
     private String getLocation()
     {
         InetAddress[] localAddresses;
@@ -168,7 +170,7 @@ public class ColumnFamilyRecordReader ex
                 }
             }
         }
-        throw new UnsupportedOperationException("no local connection available");
+        return split.getLocations()[0];
     }
 
     private class RowIterator extends AbstractIterator<Pair<ByteBuffer, SortedMap<ByteBuffer, IColumn>>>