svn commit: r996546 - in /cassandra/trunk/src/java/org/apache/cassandra/io: CompactionIterator.java LazilyCompactedRow.java PrecompactedRow.java sstable/SSTableIdentityIterator.java

[jbellis]

Author: jbellis
Date: Mon Sep 13 14:11:40 2010
New Revision: 996546

URL: http://svn.apache.org/viewvc?rev=996546&view=rev
Log:
inline public final variables of SSTII.  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java
    cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
    cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java
    
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java?rev=996546&r1=996545&r2=996546&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java 
Mon Sep 13 14:11:40 2010
@@ -124,7 +124,7 @@ public class CompactionIterator extends 
         long rowSize = 0;
         for (SSTableIdentityIterator row : rows)
         {
-            rowSize += row.getDataSize();
+            rowSize += row.dataSize;
         }
 
         if (rowSize > DatabaseDescriptor.getInMemoryCompactionLimit())

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java?rev=996546&r1=996545&r2=996546&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java 
Mon Sep 13 14:11:40 2010
@@ -70,7 +70,7 @@ public class LazilyCompactedRow extends 
         Set<SSTable> sstables = new HashSet<SSTable>();
         for (SSTableIdentityIterator row : rows)
         {
-            sstables.add(row.getSSTable());
+            sstables.add(row.sstable);
             ColumnFamily cf = row.getColumnFamily();
 
             if (emptyColumnFamily == null)
@@ -94,7 +94,7 @@ public class LazilyCompactedRow extends 
         if (rows.size() == 1 && !shouldPurge)
         {
             SSTableIdentityIterator row = rows.get(0);
-            out.writeLong(row.getDataSize());
+            out.writeLong(row.dataSize);
             row.echoData(out);
             return;
         }
@@ -148,7 +148,7 @@ public class LazilyCompactedRow extends 
     {
         int n = 0;
         for (SSTableIdentityIterator row : rows)
-            n += row.getColumnCount();
+            n += row.columnCount;
         return n;
     }
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java?rev=996546&r1=996545&r2=996546&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java Mon 
Sep 13 14:11:40 2010
@@ -62,7 +62,7 @@ public class PrecompactedRow extends Abs
         Set<SSTable> sstables = new HashSet<SSTable>();
         for (SSTableIdentityIterator row : rows)
         {
-            sstables.add(row.getSSTable());
+            sstables.add(row.sstable);
         }
         boolean shouldPurge = major || !cfStore.isKeyInRemainingSSTables(key, 
sstables);
 
@@ -101,7 +101,7 @@ public class PrecompactedRow extends Abs
             try
             {
                 rows.get(0).echoData(buffer);
-                columnCount = rows.get(0).getColumnCount();
+                columnCount = rows.get(0).columnCount;
             }
             catch (IOException e)
             {

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java?rev=996546&r1=996545&r2=996546&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
 Mon Sep 13 14:11:40 2010
@@ -34,12 +34,12 @@ public class SSTableIdentityIterator imp
     private final DecoratedKey key;
     private final long finishedAt;
     private final BufferedRandomAccessFile file;
-    private final SSTableReader sstable;
+    public final SSTableReader sstable;
     private final long dataStart;
-    private final long dataSize;
+    public final long dataSize;
 
     private final ColumnFamily columnFamily;
-    private final int columnCount;
+    public final int columnCount;
     private final long columnPosition;
 
     /**
@@ -87,11 +87,6 @@ public class SSTableIdentityIterator imp
         return columnFamily;
     }
 
-    public SSTableReader getSSTable()
-    {
-        return sstable;
-    }
-
     public boolean hasNext()
     {
         return file.getFilePointer() < finishedAt;
@@ -124,11 +119,6 @@ public class SSTableIdentityIterator imp
         return file.getPath();
     }
 
-    public long getDataSize()
-    {
-        return dataSize;
-    }
-
     public void echoData(DataOutput out) throws IOException
     {
         file.seek(dataStart);
@@ -138,11 +128,6 @@ public class SSTableIdentityIterator imp
         }
     }
 
-    public int getColumnCount()
-    {
-        return columnCount;
-    }
-
     public ColumnFamily getColumnFamilyWithColumns() throws IOException
     {
         file.seek(columnPosition - 4); // seek to before column count int