fix(pubsub/pstest): message ordering issue (googleapis#11603)

larryanz · hongalex · web-flow · commit 1d6ffc02cd21 · 2025-03-17T16:07:16.000-04:00
* fix: fix message ordering issue

* fix: remove script test

---------

Co-authored-by: Alex Hong &lt;9397363+hongalex@users.noreply.github.com&gt;
diff --git a/pubsub/pstest/fake.go b/pubsub/pstest/fake.go
@@ -1166,7 +1166,7 @@ func orderMsgs(msgs map[string]*message, enableMessageOrdering bool) map[string]
 		if orderingKey == "" {
 			orderingKey = id
 		}
-		if val, ok := orderingKeyMap[orderingKey]; !ok || m.proto.Message.PublishTime.AsTime().Before(val.m.proto.Message.PublishTime.AsTime()) {
+		if val, ok := orderingKeyMap[orderingKey]; !ok || m.publishTime.Before(val.m.publishTime) {
 			orderingKeyMap[orderingKey] = msg{m: m, id: id}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1166,7 +1166,7 @@ func orderMsgs(msgs map[string]*message, enableMessageOrdering bool) map[string]`
`1166`	`1166`	`if orderingKey == "" {`
`1167`	`1167`	`orderingKey = id`
`1168`	`1168`	`}`
`1169`		`- if val, ok := orderingKeyMap[orderingKey]; !ok \|\| m.proto.Message.PublishTime.AsTime().Before(val.m.proto.Message.PublishTime.AsTime()) {`
	`1169`	`+ if val, ok := orderingKeyMap[orderingKey]; !ok \|\| m.publishTime.Before(val.m.publishTime) {`
`1170`	`1170`	`orderingKeyMap[orderingKey] = msg{m: m, id: id}`
`1171`	`1171`	`}`
`1172`	`1172`	`}`