From 10a58a00fc3a136247682e82abacfcf163b7a5bb Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Mon, 22 May 2023 15:51:50 +0200
Subject: [PATCH] fix(backend): remove batchmetadeprecated

---
 backend/pkg/messages/iterator.go | 18 +-----------------
 backend/pkg/messages/reader.go   |  4 +---
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/backend/pkg/messages/iterator.go b/backend/pkg/messages/iterator.go
index 494bfe19f..4a39a7fce 100644
--- a/backend/pkg/messages/iterator.go
+++ b/backend/pkg/messages/iterator.go
@@ -41,7 +41,7 @@ func NewMessageIterator(messageHandler MessageHandler, messageFilter []int, auto
 		iter.filter = filter
 	}
 	iter.preFilter = map[int]struct{}{
-		MsgBatchMetadataDeprecated: {}, MsgBatchMetadata: {}, MsgBatchMeta: {}, MsgTimestamp: {},
+		MsgBatchMetadata: {}, MsgBatchMeta: {}, MsgTimestamp: {},
 		MsgSessionStart: {}, MsgSessionEnd: {}, MsgSetPageLocation: {},
 	}
 	return iter
@@ -128,22 +128,6 @@ func (i *messageIteratorImpl) zeroTsLog(msgType string) {
 
 func (i *messageIteratorImpl) preprocessing(msg Message) error {
 	switch m := msg.(type) {
-	case *BatchMetadataDeprecated:
-		if i.messageInfo.Index > 1 { // Might be several 0-0 BatchMeta in a row without an error though
-			return fmt.Errorf("batchMetadata found at the end of the batch, info: %s", i.batchInfo.Info())
-		}
-		if m.Version > 1 {
-			return fmt.Errorf("incorrect batch version: %d, skip current batch, info: %s", i.version, i.batchInfo.Info())
-		}
-		i.messageInfo.Index = m.PageNo<<32 + m.FirstIndex // 2^32  is the maximum count of messages per page (ha-ha)
-		i.messageInfo.Timestamp = uint64(m.Timestamp)
-		if m.Timestamp == 0 {
-			i.zeroTsLog("BatchMetadata")
-		}
-		i.messageInfo.Url = m.Location
-		i.version = m.Version
-		i.batchInfo.version = m.Version
-
 	case *BatchMetadata:
 		if i.messageInfo.Index > 1 { // Might be several 0-0 BatchMeta in a row without an error though
 			return fmt.Errorf("batchMetadata found at the end of the batch, info: %s", i.batchInfo.Info())
diff --git a/backend/pkg/messages/reader.go b/backend/pkg/messages/reader.go
index 62eaf5bcd..436876e55 100644
--- a/backend/pkg/messages/reader.go
+++ b/backend/pkg/messages/reader.go
@@ -89,15 +89,13 @@ func (m *messageReaderImpl) Parse() (err error) {
 			if err != nil {
 				return fmt.Errorf("read message err: %s", err)
 			}
-			if m.msgType == MsgBatchMeta || m.msgType == MsgBatchMetadata || m.msgType == MsgBatchMetadataDeprecated {
+			if m.msgType == MsgBatchMeta || m.msgType == MsgBatchMetadata {
 				if len(m.list) > 0 {
 					return fmt.Errorf("batch meta not at the start of batch")
 				}
 				switch message := msg.(type) {
 				case *BatchMetadata:
 					m.version = int(message.Version)
-				case *BatchMetadataDeprecated:
-					m.version = int(message.Version)
 				case *BatchMeta:
 					m.version = 0
 				}