Skip to content

CASSANDRA-18728 Fix handling legacy data: improper usage of column id… #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hanke580 wants to merge 1 commit into from
Closed

CASSANDRA-18728 Fix handling legacy data: improper usage of column id… #2731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.cassandra.db.rows.RowIterator;
import org.apache.cassandra.db.rows.UnfilteredRowIterators;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;

import static java.lang.String.format;
Expand Down Expand Up @@ -741,7 +742,14 @@ private static ColumnDefinition createColumnFromColumnRow(UntypedResultSet.Row r
AbstractType<?> comparator = isCQLTable
? UTF8Type.instance
: CompactTables.columnDefinitionComparator(rawKind, isSuper, rawComparator, rawSubComparator);
ColumnIdentifier name = ColumnIdentifier.getInterned(comparator.fromString(row.getString("column_name")), comparator);
ColumnIdentifier name;
if (comparator instanceof BytesType) {
// Do not intern at this time
String cName = row.getString("column_name");
name = new ColumnIdentifier(ByteBufferUtil.bytes(cName), cName);
} else {
name = ColumnIdentifier.getInterned(comparator.fromString(row.getString("column_name")), comparator);
}

AbstractType<?> validator = parseType(row.getString("validator"));

Expand Down