Skip to content

Commit 9819b90

Browse files
author
sunhongtao
committed
perf: format kafka topic
1 parent 4c5cd68 commit 9819b90

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎blockchain/service/http_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ func (h *HttpHandler) SendRawTx(ctx *gin.Context) {
434434

435435
defer func(backup map[string]any, chainCode int64) {
436436
bs, _ := json.Marshal(backup)
437-
msg := &kafka.Message{Topic: fmt.Sprintf("%v_%v", h.kafkaCfg.Topic, chainCode), Partition: h.kafkaCfg.Partition, Key: []byte(fmt.Sprintf("%v", time.Now().UnixNano())), Value: bs}
437+
msg := &kafka.Message{Topic: fmt.Sprintf("%v-%v", h.kafkaCfg.Topic, chainCode), Partition: h.kafkaCfg.Partition, Key: []byte(fmt.Sprintf("%v", time.Now().UnixNano())), Value: bs}
438438
h.sendCh <- []*kafka.Message{msg}
439439
}(backup, blockChainCode)
440440

‎collect/service/cmd/cmd.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ func (c *Cmd) HandlerBlock(block *collect.BlockInterface) (*kafka.Message, error
785785
}
786786
r = b
787787
}
788-
return &kafka.Message{Topic: k.Topic, Partition: k.Partition, Time: time.Now(), Key: []byte(block.BlockHash), Value: r}, nil
788+
return &kafka.Message{Topic: fmt.Sprintf("%v-%v", c.chain.BlockChainCode, k.Topic), Partition: k.Partition, Time: time.Now(), Key: []byte(block.BlockHash), Value: r}, nil
789789
}
790790

791791
func (c *Cmd) HandlerTx(tx *collect.TxInterface) (*kafka.Message, error) {
@@ -808,7 +808,7 @@ func (c *Cmd) HandlerTx(tx *collect.TxInterface) (*kafka.Message, error) {
808808
r = b
809809
}
810810

811-
return &kafka.Message{Topic: k.Topic, Partition: k.Partition, Time: time.Now(), Key: []byte(tx.TxHash), Value: r}, nil
811+
return &kafka.Message{Topic: fmt.Sprintf("%v-%v", c.chain.BlockChainCode, k.Topic), Partition: k.Partition, Time: time.Now(), Key: []byte(tx.TxHash), Value: r}, nil
812812
}
813813

814814
func (c *Cmd) HandlerReceipt(receipt *collect.ReceiptInterface) (*kafka.Message, error) {
@@ -835,7 +835,7 @@ func (c *Cmd) HandlerReceipt(receipt *collect.ReceiptInterface) (*kafka.Message,
835835
}
836836
r = b
837837
}
838-
return &kafka.Message{Topic: k.Topic, Partition: k.Partition, Time: time.Now(), Key: []byte(receipt.TransactionHash), Value: r}, nil
838+
return &kafka.Message{Topic: fmt.Sprintf("%v-%v", c.chain.BlockChainCode, k.Topic), Partition: k.Partition, Time: time.Now(), Key: []byte(receipt.TransactionHash), Value: r}, nil
839839
}
840840

841841
func (c *Cmd) Stop() {

‎common/chain/chain.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ import (
99
)
1010

1111
// dev
12-
var defaultChainCode = map[string]map[int64]int8{
13-
"ETH": {200: 1, 2001: 1},
14-
"POLYGON": {201: 1, 2011: 1},
15-
"BSC": {202: 1},
16-
"TRON": {205: 1},
17-
"BTC": {300: 1},
18-
"FIL": {301: 1},
19-
"XRP": {310: 1},
20-
}
21-
22-
// main
2312
//var defaultChainCode = map[string]map[int64]int8{
24-
// "ETH": {60: 1, 6001: 1},
25-
// "POLYGON": {62: 1, 6201: 1},
26-
// "BSC": {2510: 1, 2610: 1},
27-
// "TRON": {195: 1, 198: 1},
28-
// "BTC": {0: 1, 1: 1},
29-
// "FIL": {2307: 1},
30-
// "XRP": {144: 1},
13+
// "ETH": {200: 1, 2001: 1},
14+
// "POLYGON": {201: 1, 2011: 1},
15+
// "BSC": {202: 1},
16+
// "TRON": {205: 1},
17+
// "BTC": {300: 1},
18+
// "FIL": {301: 1},
19+
// "XRP": {310: 1},
3120
//}
3221

22+
// main
23+
var defaultChainCode = map[string]map[int64]int8{
24+
"ETH": {60: 1, 6001: 1},
25+
"POLYGON": {62: 1, 6201: 1},
26+
"BSC": {2510: 1, 2610: 1},
27+
"TRON": {195: 1, 198: 1},
28+
"BTC": {0: 1, 1: 1},
29+
"FIL": {2307: 1},
30+
"XRP": {144: 1},
31+
}
32+
3333
func LoadConfig(path string) (string, error) {
3434
f, err := os.OpenFile(path, os.O_RDONLY, os.ModeAppend)
3535
if err != nil {

‎store/service/store_service.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (s *StoreHandler) ReadBackupTxFromKafka(blockChain int64, kafkaCfg map[stri
7070
Kafka := kafkaCfg["BackupTx"]
7171
broker := fmt.Sprintf("%v:%v", Kafka.Host, Kafka.Port)
7272
group := fmt.Sprintf("gr_store_backuptx_%v", Kafka.Group)
73-
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v_%v", Kafka.Topic, blockChain), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
73+
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v-%v", Kafka.Topic, blockChain), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
7474
}()
7575

7676
list := make([]*store.BackupTx, 0, 20)
@@ -120,7 +120,7 @@ func (s *StoreHandler) ReadSubTxFromKafka(blockChain int64, kafkaCfg map[string]
120120
Kafka := kafkaCfg["SubTx"]
121121
broker := fmt.Sprintf("%v:%v", Kafka.Host, Kafka.Port)
122122
group := fmt.Sprintf("gr_store_subtx_%v", Kafka.Group)
123-
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: Kafka.Topic, Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
123+
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v-%v", blockChain, Kafka.Topic), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
124124
}()
125125

126126
list := make([]*store.SubTx, 0, 20)
@@ -170,7 +170,7 @@ func (s *StoreHandler) ReadTxFromKafka(blockChain int64, kafkaCfg map[string]*co
170170
Kafka := kafkaCfg["Tx"]
171171
broker := fmt.Sprintf("%v:%v", Kafka.Host, Kafka.Port)
172172
group := fmt.Sprintf("gr_store_tx_%v", Kafka.Group)
173-
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: Kafka.Topic, Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
173+
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v-%v", blockChain, Kafka.Topic), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
174174
}()
175175

176176
list := make([]*store.Tx, 0, 20)
@@ -221,7 +221,7 @@ func (s *StoreHandler) ReadBlockFromKafka(blockChain int64, kafkaCfg map[string]
221221
Kafka := kafkaCfg["Block"]
222222
broker := fmt.Sprintf("%v:%v", Kafka.Host, Kafka.Port)
223223
group := fmt.Sprintf("gr_store_block_%v", Kafka.Group)
224-
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: Kafka.Topic, Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
224+
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v-%v", blockChain, Kafka.Topic), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
225225
}()
226226

227227
list := make([]*store.Block, 0, 20)
@@ -269,7 +269,7 @@ func (s *StoreHandler) ReadReceiptFromKafka(blockChain int64, kafkaCfg map[strin
269269
Kafka := kafkaCfg["Receipt"]
270270
broker := fmt.Sprintf("%v:%v", Kafka.Host, Kafka.Port)
271271
group := fmt.Sprintf("gr_store_receipt_%v", Kafka.Group)
272-
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: Kafka.Topic, Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
272+
s.kafka.Read(&kafkaClient.Config{Brokers: []string{broker}, Topic: fmt.Sprintf("%v-%v", blockChain, Kafka.Topic), Group: group, Partition: Kafka.Partition, StartOffset: Kafka.StartOffset}, receiver, ctx2)
273273
}()
274274

275275
list := make([]*store.Receipt, 0, 20)

‎store/service/ws_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func (ws *WsHandler) sendMessage(SubKafkaConfig *config.KafkaConfig, kafkaConfig
427427
//save to kafka
428428
if len(pushMp) > 0 && SubKafkaConfig != nil {
429429
r, _ := json.Marshal(tx)
430-
m := &kafka.Message{Topic: SubKafkaConfig.Topic, Key: []byte(uuid.New().String()), Value: r}
430+
m := &kafka.Message{Topic: fmt.Sprintf("%v-%v", blockChain, SubKafkaConfig.Topic), Key: []byte(uuid.New().String()), Value: r}
431431
bufferMessage = append(bufferMessage, m)
432432
}
433433

0 commit comments

Comments
 (0)