return error if labels to be merged have no voxels

janelia-flyem · Apr 10, 2024 · a039fad · a039fad
1 parent 9163390
commit a039fad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/datatype/labelmap/mutate.go b/datatype/labelmap/mutate.go
@@ -105,6 +105,10 @@ func (d *Data) MergeLabels(v dvid.VersionID, op labels.MergeOp, info dvid.ModInf
 		return
 	}
 	delta.MergedVoxels = mergeIdx.NumVoxels()
+	if delta.MergedVoxels == 0 {
+		err = fmt.Errorf("can't merge labels with no voxels: %s", op.Merged)
+		return
+	}
 
 	jsonBytes, _ := json.Marshal(msginfo)
 	if err := d.PublishKafkaMsg(jsonBytes); err != nil {

diff --git a/datatype/labelmap/mutate_test.go b/datatype/labelmap/mutate_test.go
@@ -945,6 +945,11 @@ func TestMergeLabels(t *testing.T) {
 	if err := retrieved.equals(expected); err != nil {
 		t.Errorf("Merged label volume: %v\n", err)
 	}
+
+	// Make sure we can't merge the previously merged body again.
+	if err := testMerge.sendErr(t, uuid, "labels"); err == nil {
+		t.Fatalf("Expected error on re-merge of bodies, got none\n")
+	}
 }
 
 func TestSplitLabel(t *testing.T) {