Add error if concatenating unsorted mcap files

foxglove · Nov 15, 2023 · df18340 · df18340
1 parent 5dc836c
commit df18340
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/go/cli/mcap/cmd/concat.go b/go/cli/mcap/cmd/concat.go
@@ -97,7 +97,8 @@ func (m *mcapConcatenator) addMetadata(w *mcap.Writer, metadata *mcap.Metadata)
 func (m *mcapConcatenator) addChannel(w *mcap.Writer, inputID int, channel *mcap.Channel) (uint16, error) {
 	outputSchemaID, ok := m.outputSchemaID(inputID, channel.SchemaID)
 	if !ok {
-		return 0, fmt.Errorf("unknown schema on channel %d for input %d topic %s", channel.ID, inputID, channel.Topic)
+		return 0, fmt.Errorf("unknown schema on channel %d for input %d topic %s",
+			channel.ID, inputID, channel.Topic)
 	}
 	key := channelID{inputID, channel.ID}
 	newChannel := &mcap.Channel{
@@ -243,6 +244,10 @@ func (m *mcapConcatenator) concatenateInputs(w io.Writer, inputs []namedReader)
 				return fmt.Errorf("error on input %s: %w", inputName, err)
 			}
 
+			if newMessage.LogTime < timestampOffset {
+				return fmt.Errorf("timestamp %d is less than offset %d, sort input files before concatenating", newMessage.LogTime, timestampOffset)
+			}
+
 			newMessage.LogTime -= timestampOffset
 			lastTimestamp = newMessage.LogTime