Skip to content

improve tombstone printing for CASSANDRA-11655 #2

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
clohfink wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

improve tombstone printing for CASSANDRA-11655 #2

Show file tree
Hide file tree
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
112 changes: 75 additions & 37 deletions src/java/org/apache/cassandra/tools/JsonTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.ByteBuffer;
import java.time.Instant;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import org.apache.cassandra.config.CFMetaData;
Expand All @@ -18,6 +20,8 @@
import org.apache.cassandra.db.marshal.CollectionType;
import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.db.rows.Cell;
import org.apache.cassandra.db.rows.ColumnData;
import org.apache.cassandra.db.rows.ComplexColumnData;
import org.apache.cassandra.db.rows.RangeTombstoneBoundMarker;
import org.apache.cassandra.db.rows.RangeTombstoneBoundaryMarker;
import org.apache.cassandra.db.rows.RangeTombstoneMarker;
Expand Down Expand Up @@ -51,37 +55,40 @@ public final class JsonTransformer

private final ISSTableScanner currentScanner;

private boolean rawTime = false;

private long currentPosition = 0;

private JsonTransformer(JsonGenerator json, ISSTableScanner currentScanner, CFMetaData metadata)
private JsonTransformer(JsonGenerator json, ISSTableScanner currentScanner, boolean rawTime, CFMetaData metadata)
{
this.json = json;
this.metadata = metadata;
this.currentScanner = currentScanner;
this.rawTime = rawTime;

DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
prettyPrinter.indentObjectsWith(objectIndenter);
prettyPrinter.indentArraysWith(arrayIndenter);
json.setPrettyPrinter(prettyPrinter);
}

public static void toJson(ISSTableScanner currentScanner, Stream<UnfilteredRowIterator> partitions, CFMetaData metadata, OutputStream out)
public static void toJson(ISSTableScanner currentScanner, Stream<UnfilteredRowIterator> partitions, boolean rawTime, CFMetaData metadata, OutputStream out)
throws IOException
{
try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, "UTF-8")))
{
JsonTransformer transformer = new JsonTransformer(json, currentScanner, metadata);
JsonTransformer transformer = new JsonTransformer(json, currentScanner, rawTime, metadata);
json.writeStartArray();
partitions.forEach(transformer::serializePartition);
json.writeEndArray();
}
}

public static void keysToJson(ISSTableScanner currentScanner, Stream<DecoratedKey> keys, CFMetaData metadata, OutputStream out) throws IOException
public static void keysToJson(ISSTableScanner currentScanner, Stream<DecoratedKey> keys, boolean rawTime, CFMetaData metadata, OutputStream out) throws IOException
{
try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, "UTF-8")))
{
JsonTransformer transformer = new JsonTransformer(json, currentScanner, metadata);
JsonTransformer transformer = new JsonTransformer(json, currentScanner, rawTime, metadata);
json.writeStartArray();
keys.forEach(transformer::serializePartitionKey);
json.writeEndArray();
Expand Down Expand Up @@ -165,16 +172,7 @@ private void serializePartition(UnfilteredRowIterator partition)

if (!partition.partitionLevelDeletion().isLive())
{
json.writeFieldName("deletion_info");
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("deletion_time");
json.writeNumber(partition.partitionLevelDeletion().markedForDeleteAt());
json.writeFieldName("tstamp");
json.writeNumber(partition.partitionLevelDeletion().localDeletionTime());
json.writeEndObject();
objectIndenter.setCompact(false);
json.writeEndObject();
serializeDeletion(partition.partitionLevelDeletion());
}
else
{
Expand Down Expand Up @@ -236,13 +234,12 @@ private void serializeRow(Row row)
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("tstamp");
json.writeNumber(liveInfo.timestamp());
json.writeString(dateString(TimeUnit.MICROSECONDS, liveInfo.timestamp()));
if (liveInfo.isExpiring())
{
json.writeFieldName("ttl");
json.writeNumber(liveInfo.ttl());
json.writeNumberField("ttl", liveInfo.ttl());
json.writeFieldName("expires_at");
json.writeNumber(liveInfo.localExpirationTime());
json.writeString(dateString(TimeUnit.SECONDS, liveInfo.localExpirationTime()));
json.writeFieldName("expired");
json.writeBoolean(liveInfo.localExpirationTime() < (System.currentTimeMillis() / 1000));
}
Expand All @@ -253,19 +250,14 @@ private void serializeRow(Row row)
// If this is a deletion, indicate that, otherwise write cells.
if (!row.deletion().isLive())
{
json.writeFieldName("deletion_info");
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("deletion_time");
json.writeNumber(row.deletion().time().markedForDeleteAt());
json.writeFieldName("tstamp");
json.writeNumber(row.deletion().time().localDeletionTime());
json.writeEndObject();
objectIndenter.setCompact(false);
serializeDeletion(row.deletion().time());
}
json.writeFieldName("cells");
json.writeStartArray();
row.cells().forEach(c -> serializeCell(c, liveInfo));
for (ColumnData cd : row)
{
serializeColumnData(cd, liveInfo);
}
json.writeEndArray();
json.writeEndObject();
}
Expand Down Expand Up @@ -348,14 +340,48 @@ private void serializeDeletion(DeletionTime deletion) throws IOException
json.writeFieldName("deletion_info");
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("deletion_time");
json.writeNumber(deletion.markedForDeleteAt());
json.writeFieldName("tstamp");
json.writeNumber(deletion.localDeletionTime());
json.writeFieldName("marked_deleted");
json.writeString(dateString(TimeUnit.MICROSECONDS, deletion.markedForDeleteAt()));
json.writeFieldName("local_delete_time");
json.writeString(dateString(TimeUnit.SECONDS, deletion.localDeletionTime()));
json.writeEndObject();
objectIndenter.setCompact(false);
}

private void serializeColumnData(ColumnData cd, LivenessInfo liveInfo)
{
if (cd.column().isSimple())
{
serializeCell((Cell) cd, liveInfo);
}
else
{
ComplexColumnData complexData = (ComplexColumnData) cd;
if (!complexData.complexDeletion().isLive())
{
try
{
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("name");
AbstractType<?> type = cd.column().type;
json.writeString(cd.column().name.toCQLString());
serializeDeletion(complexData.complexDeletion());
objectIndenter.setCompact(true);
json.writeEndObject();
objectIndenter.setCompact(false);
}
catch (IOException e)
{
logger.error("Failure parsing ColumnData.", e);
}
}
for (Cell cell : complexData){
serializeCell(cell, liveInfo);
}
}
}

private void serializeCell(Cell cell, LivenessInfo liveInfo)
{
try
Expand All @@ -381,8 +407,13 @@ private void serializeCell(Cell cell, LivenessInfo liveInfo)
}
if (cell.isTombstone())
{
json.writeFieldName("deletion_time");
json.writeNumber(cell.localDeletionTime());
json.writeFieldName("deletion_info");
objectIndenter.setCompact(true);
json.writeStartObject();
json.writeFieldName("local_delete_time");
json.writeString(dateString(TimeUnit.SECONDS, cell.localDeletionTime()));
json.writeEndObject();
objectIndenter.setCompact(false);
}
else
{
Expand All @@ -392,14 +423,14 @@ private void serializeCell(Cell cell, LivenessInfo liveInfo)
if (liveInfo.isEmpty() || cell.timestamp() != liveInfo.timestamp())
{
json.writeFieldName("tstamp");
json.writeNumber(cell.timestamp());
json.writeString(dateString(TimeUnit.MICROSECONDS, cell.timestamp()));
}
if (cell.isExpiring() && (liveInfo.isEmpty() || cell.ttl() != liveInfo.ttl()))
{
json.writeFieldName("ttl");
json.writeNumber(cell.ttl());
json.writeFieldName("expires_at");
json.writeNumber(cell.localDeletionTime());
json.writeString(dateString(TimeUnit.SECONDS, cell.localDeletionTime()));
json.writeFieldName("expired");
json.writeBoolean(!cell.isLive((int) (System.currentTimeMillis() / 1000)));
}
Expand All @@ -412,6 +443,13 @@ private void serializeCell(Cell cell, LivenessInfo liveInfo)
}
}

private String dateString(TimeUnit from, long time)
{
long secs = from.toSeconds(time);
long offset = Math.floorMod(from.toNanos(time), 1000_000_000L); // nanos per sec
return rawTime? Long.toString(time) : Instant.ofEpochSecond(secs, offset).toString();
}

/**
* A specialized {@link Indenter} that enables a 'compact' mode which puts all subsequent json values on the same
* line. This is manipulated via {@link CompactIndenter#setCompact(boolean)}
Expand Down
11 changes: 9 additions & 2 deletions src/java/org/apache/cassandra/tools/SSTableExport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public class SSTableExport
private static final String DEBUG_OUTPUT_OPTION = "d";
private static final String EXCLUDE_KEY_OPTION = "x";
private static final String ENUMERATE_KEYS_OPTION = "e";
private static final String RAW_TIMESTAMPS = "t";

private static final Options options = new Options();
private static CommandLine cmd;
Expand All @@ -80,6 +81,9 @@ public class SSTableExport

Option debugOutput = new Option(DEBUG_OUTPUT_OPTION, false, "CQL row per line internal representation");
options.addOption(debugOutput);

Option rawTimestamps = new Option(RAW_TIMESTAMPS, false, "Print raw timestamps instead of iso8601 date strings");
options.addOption(rawTimestamps);
}

/**
Expand Down Expand Up @@ -180,7 +184,10 @@ public static void main(String[] args) throws ConfigurationException
CFMetaData metadata = metadataFromSSTable(desc);
if (cmd.hasOption(ENUMERATE_KEYS_OPTION))
{
JsonTransformer.keysToJson(null, iterToStream(new KeyIterator(desc, metadata)), metadata, System.out);
JsonTransformer.keysToJson(null, iterToStream(new KeyIterator(desc, metadata)),
cmd.hasOption(RAW_TIMESTAMPS),
metadata,
System.out);
}
else
{
Expand Down Expand Up @@ -233,7 +240,7 @@ public static void main(String[] args) throws ConfigurationException
}
else
{
JsonTransformer.toJson(currentScanner, partitions, metadata, System.out);
JsonTransformer.toJson(currentScanner, partitions, cmd.hasOption(RAW_TIMESTAMPS), metadata, System.out);
}
}
}
Expand Down