Skip to content

CASSANDRA-21012: Allow CQLSSTableWriter to specify SSTable id type (legacy/uuid) #5093

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

Open
arvindKandpal-ksolves wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

CASSANDRA-21012: Allow CQLSSTableWriter to specify SSTable id type (legacy/uuid) #5093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96ea33b
CASSANDRA-21012: Allow CQLSSTableWriter to specify SSTable id type (l…
arvindKandpal-ksolves Sep 2, 2026
eb7a007
review
smiklosovic Sep 2, 2026
405d085
Merge pull request #2 from smiklosovic/CASSANDRA-21012
arvindKandpal-ksolves Sep 2, 2026
895b3e0
Remove unused builderFor method
arvindKandpal-ksolves Sep 3, 2026
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: 6 additions & 4 deletions src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,20 @@ public abstract class AbstractSSTableSimpleWriter implements Closeable
protected final RegularAndStaticColumns columns;
protected SSTableFormat<?, ?> format = DatabaseDescriptor.getSelectedSSTableFormat();
protected static final AtomicReference<SSTableId> id = new AtomicReference<>(SSTableIdFactory.instance.defaultBuilder().generator(Stream.empty()).get());
protected final SSTableId.Builder<? extends SSTableId> idBuilder;
protected boolean makeRangeAware = false;
protected final Collection<Index.Group> indexGroups;
protected Consumer<Collection<SSTableReader>> sstableProducedListener;
protected boolean openSSTableOnProduced = false;
protected CompressionDictionary compressionDictionary;
protected SSTable.Owner owner;

protected AbstractSSTableSimpleWriter(File directory, TableMetadataRef metadata, RegularAndStaticColumns columns)
protected AbstractSSTableSimpleWriter(File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, SSTableId.Builder<? extends SSTableId> idBuilder)
{
this.metadata = metadata;
this.directory = directory;
this.columns = columns;
this.idBuilder = idBuilder;
indexGroups = new ArrayList<>();
}

Expand Down Expand Up @@ -147,13 +149,13 @@ protected SSTableTxnWriter createWriter(SSTable.Owner owner) throws IOException
effectiveOwner);
}

private static Descriptor createDescriptor(File directory, final String keyspace, final String columnFamily, final SSTableFormat<?, ?> fmt) throws IOException
private Descriptor createDescriptor(File directory, final String keyspace, final String columnFamily, final SSTableFormat<?, ?> fmt) throws IOException
{
SSTableId nextGen = getNextId(directory, columnFamily);
return new Descriptor(directory, keyspace, columnFamily, nextGen, fmt);
}

private static SSTableId getNextId(File directory, final String columnFamily) throws IOException
private SSTableId getNextId(File directory, final String columnFamily) throws IOException
{
while (true)
{
Expand All @@ -165,7 +167,7 @@ private static SSTableId getNextId(File directory, final String columnFamily) th
.map(d -> d.id);

SSTableId lastId = id.get();
SSTableId newId = SSTableIdFactory.instance.defaultBuilder().generator(Stream.concat(existingIds, Stream.of(lastId))).get();
SSTableId newId = idBuilder.generator(Stream.concat(existingIds, Stream.of(lastId))).get();
if (id.compareAndSet(lastId, newId))
return newId;
}
Expand Down
12 changes: 10 additions & 2 deletions src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ public static class Builder
private Consumer<Collection<SSTableReader>> sstableProducedListener;
private boolean openSSTableOnProduced = false;
private CompressionDictionary compressionDictionary = null;
private SSTableId.Builder<? extends SSTableId> idBuilder = null;

protected Builder()
{
Expand Down Expand Up @@ -671,6 +672,12 @@ public Builder withFormat(SSTableFormat<?, ?> format)
return this;
}

public Builder withSSTableIdBuilder(SSTableId.Builder<? extends SSTableId> idBuilder)
{
this.idBuilder = idBuilder;
return this;
}

/**
* Use specific compression dictionary upon writing the data.
*
Expand Down Expand Up @@ -799,9 +806,10 @@ public CQLSSTableWriter build()
ModificationStatement preparedModificationStatement = prepareModificationStatement();

TableMetadataRef ref = tableMetadata.ref;
SSTableId.Builder<? extends SSTableId> effectiveIdBuilder = idBuilder != null ? idBuilder : SSTableIdFactory.instance.defaultBuilder();
AbstractSSTableSimpleWriter writer = sorted
? new SSTableSimpleWriter(cfs, directory, ref, preparedModificationStatement.updatedColumns(), maxSSTableSizeInMiB)
: new SSTableSimpleUnsortedWriter(cfs, directory, ref, preparedModificationStatement.updatedColumns(), maxSSTableSizeInMiB);
? new SSTableSimpleWriter(cfs, directory, ref, preparedModificationStatement.updatedColumns(), maxSSTableSizeInMiB, effectiveIdBuilder)
: new SSTableSimpleUnsortedWriter(cfs, directory, ref, preparedModificationStatement.updatedColumns(), maxSSTableSizeInMiB, effectiveIdBuilder);

if (format != null)
writer.setSSTableFormatType(format);
Expand Down
9 changes: 7 additions & 2 deletions src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,17 @@ class SSTableSimpleUnsortedWriter extends AbstractSSTableSimpleWriter

public SSTableSimpleUnsortedWriter(File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB)
{
this(null, directory, metadata, columns, maxSSTableSizeInMiB);
this(null, directory, metadata, columns, maxSSTableSizeInMiB, SSTableIdFactory.instance.defaultBuilder());
}

SSTableSimpleUnsortedWriter(SSTable.Owner owner, File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB)
{
super(directory, metadata, columns);
this(owner, directory, metadata, columns, maxSSTableSizeInMiB, SSTableIdFactory.instance.defaultBuilder());
}

SSTableSimpleUnsortedWriter(SSTable.Owner owner, File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB, SSTableId.Builder<? extends SSTableId> idBuilder)
{
super(directory, metadata, columns, idBuilder);
this.maxSStableSizeInBytes = maxSSTableSizeInMiB * 1024L * 1024L;
this.header = new SerializationHeader(true, metadata.get(), columns, EncodingStats.NO_STATS);
this.helper = new SerializationHelper(this.header);
Expand Down
9 changes: 7 additions & 2 deletions src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class SSTableSimpleWriter extends AbstractSSTableSimpleWriter
*/
public SSTableSimpleWriter(File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB)
{
this(null, directory, metadata, columns, maxSSTableSizeInMiB);
this(null, directory, metadata, columns, maxSSTableSizeInMiB, SSTableIdFactory.instance.defaultBuilder());
}

/**
Expand All @@ -83,7 +83,12 @@ public SSTableSimpleWriter(File directory, TableMetadataRef metadata, RegularAnd
*/
protected SSTableSimpleWriter(SSTable.Owner owner, File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB)
{
super(directory, metadata, columns);
this(owner, directory, metadata, columns, maxSSTableSizeInMiB, SSTableIdFactory.instance.defaultBuilder());
}

protected SSTableSimpleWriter(SSTable.Owner owner, File directory, TableMetadataRef metadata, RegularAndStaticColumns columns, long maxSSTableSizeInMiB, SSTableId.Builder<? extends SSTableId> idBuilder)
{
super(directory, metadata, columns, idBuilder);
this.maxSSTableSizeInBytes = maxSSTableSizeInMiB * 1024L * 1024L;
this.owner = owner;
}
Expand Down
47 changes: 47 additions & 0 deletions test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,53 @@ public void testUnsortedWriterBti() throws Exception
testWritingSstableWithFormat(btiFormat);
}

@Test
public void testUUIDSSTableIdentifiers() throws Exception
{
String schema = "CREATE TABLE " + qualifiedTable + " ("
+ " k int PRIMARY KEY,"
+ " v int"
+ ")";
String insert = "INSERT INTO " + qualifiedTable + " (k, v) VALUES (?, ?)";
CQLSSTableWriter writer = CQLSSTableWriter.builder()
.inDirectory(dataDir)
.forTable(schema)
.withSSTableIdBuilder(UUIDBasedSSTableId.Builder.instance)
.using(insert).build();

writer.addRow(0, 1);
writer.close();

File[] dataFiles = dataDir.tryList((dir, name) -> name.contains("Data.db"));
assertEquals(1, dataFiles.length);

Descriptor descriptor = Descriptor.fromFile(dataFiles[0]);
assertTrue(UUIDBasedSSTableId.Builder.instance.isUniqueIdentifier(descriptor.id.toString()));
}

@Test
public void testDefaultSSTableIdentifiersAreLegacy() throws Exception
{
String schema = "CREATE TABLE " + qualifiedTable + " ("
+ " k int PRIMARY KEY,"
+ " v int"
+ ")";
String insert = "INSERT INTO " + qualifiedTable + " (k, v) VALUES (?, ?)";
CQLSSTableWriter writer = CQLSSTableWriter.builder()
.inDirectory(dataDir)
.forTable(schema)
.using(insert).build();

writer.addRow(0, 1);
writer.close();

File[] dataFiles = dataDir.tryList((dir, name) -> name.contains("Data.db"));
assertEquals(1, dataFiles.length);

Descriptor descriptor = Descriptor.fromFile(dataFiles[0]);
assertTrue(SequenceBasedSSTableId.Builder.instance.isUniqueIdentifier(descriptor.id.toString()));
}

private void testWritingSstableWithFormat(SSTableFormat<?, ?> format) throws Exception
{
try (AutoCloseable ignored = Util.switchPartitioner(ByteOrderedPartitioner.instance))
Expand Down