Author: jbellis
Date: Thu Jan 7 05:47:40 2010
New Revision: 896757
URL: http://svn.apache.org/viewvc?rev=896757&view=rev
Log:
r/m unused code. patch by jbellis
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java?rev=896757&r1=896756&r2=896757&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java Thu
Jan 7 05:47:40 2010
@@ -93,11 +93,6 @@
return value;
}
- public byte[] value(byte[] key)
- {
- throw new UnsupportedOperationException("This operation is unsupported
on simple columns.");
- }
-
public Collection<IColumn> getSubColumns()
{
throw new UnsupportedOperationException("This operation is unsupported
on simple columns.");
@@ -113,11 +108,6 @@
return timestamp;
}
- public long timestamp(byte[] key)
- {
- throw new UnsupportedOperationException("This operation is unsupported
on simple columns.");
- }
-
public boolean isMarkedForDelete()
{
return isMarkedForDelete;
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=896757&r1=896756&r2=896757&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
Thu Jan 7 05:47:40 2010
@@ -42,12 +42,10 @@
{
/* The column serializer for this Column Family. Create based on config. */
private static ColumnFamilySerializer serializer_ = new
ColumnFamilySerializer();
- public static final short utfPrefix_ = 2;
private static Logger logger_ = Logger.getLogger( ColumnFamily.class );
private static Map<String, String> columnTypes_ = new HashMap<String,
String>();
String type_;
- private String table_;
static
{
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java?rev=896757&r1=896756&r2=896757&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java Thu
Jan 7 05:47:40 2010
@@ -35,9 +35,7 @@
public int size();
public int serializedSize();
public long timestamp();
- public long timestamp(byte[] columnName);
public byte[] value();
- public byte[] value(byte[] columnName);
public Collection<IColumn> getSubColumns();
public IColumn getSubColumn(byte[] columnName);
public void addColumn(IColumn column);
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=896757&r1=896756&r2=896757&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
Thu Jan 7 05:47:40 2010
@@ -137,15 +137,6 @@
throw new UnsupportedOperationException("This operation is not
supported for Super Columns.");
}
- public long timestamp(byte[] columnName)
- {
- IColumn column = columns_.get(columnName);
- assert column instanceof Column;
- if ( column != null )
- return column.timestamp();
- throw new IllegalArgumentException("Timestamp was requested for a
column that does not exist.");
- }
-
public long mostRecentLiveChangeAt()
{
long max = Long.MIN_VALUE;
@@ -164,18 +155,9 @@
throw new UnsupportedOperationException("This operation is not
supported for Super Columns.");
}
- public byte[] value(byte[] columnName)
- {
- IColumn column = columns_.get(columnName);
- if ( column != null )
- return column.value();
- throw new IllegalArgumentException("Value was requested for a column
that does not exist.");
- }
-
public void addColumn(IColumn column)
{
- if (!(column instanceof Column))
- throw new UnsupportedOperationException("A super column can
only contain simple columns.");
+ assert column instanceof Column : "A super column can only contain
simple columns";
byte[] name = column.name();
IColumn oldColumn = columns_.putIfAbsent(name, column);
if (oldColumn != null)
