/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.cassandra.cql3;

import java.util.Locale;
import java.nio.ByteBuffer;

import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.utils.ByteBufferUtil;

import org.apache.cassandra.cql3.statements.RawSelector;

/**
 * Represents an identifer for a CQL column definition.
 */
public class ColumnIdentifier implements RawSelector, Comparable<ColumnIdentifier>
{
    public final ByteBuffer key;
    private final String text;

    public ColumnIdentifier(String rawText, boolean keepCase)
    {
        this.text = keepCase ? rawText : rawText.toLowerCase(Locale.US);
        this.key = ByteBufferUtil.bytes(this.text);
    }

    public ColumnIdentifier(ByteBuffer key, AbstractType type)
    {
        this.key = key;
        this.text = type.getString(key);
    }

    @Override
    public final int hashCode()
    {
        return key.hashCode();
    }

    @Override
    public final boolean equals(Object o)
    {
        if(!(o instanceof ColumnIdentifier))
            return false;
        ColumnIdentifier that = (ColumnIdentifier)o;
        return key.equals(that.key);
    }

    @Override
    public String toString()
    {
        return text;
    }

    public int compareTo(ColumnIdentifier other)
    {
        return key.compareTo(other.key);
    }
}

@@ -1171,38 +1171,8 @@
 ctor
-, Comparable%3CColumnIdentifier%3E
 %0A%7B%0A 
@@ -1491,16 +1491,19 @@
 ractType
+%3C?%3E
  type)%0A 
@@ -1978,110 +1978,7 @@
    %7D
-%0A%0A    public int compareTo(ColumnIdentifier other)%0A    %7B%0A        return key.compareTo(other.key);%0A    %7D
 %0A%7D%0A

Remove unused (and slightly broken) ColumnIdentifier.compareTo