NatsMsgMerger cleanup and misc

- Manually reverting b646f94.
- default nomad.hcl

Author: ffffwh

drivers/mysql/common/natsmgr.go

@@ -12,8 +12,6 @@ type NatsMsgMerger struct {
 	buf    *bytes.Buffer
 	iSeg   uint32 // index of segment
 	logger hclog.Logger
-	lastLen int
-	lastiSeg uint32
 }
 
 func NewNatsMsgMerger(logger hclog.Logger) *NatsMsgMerger {
@@ -43,7 +41,6 @@ func (nmm *NatsMsgMerger) Handle(data []byte) (segmentFinished bool, err error)
 			}
 			nmm.logger.Debug("NatsMsgMerger.Handle found big msg segment", "iSeg", iSeg, "lenData", lenData)
 			nmm.buf = bytes.NewBuffer(data[:lenData-4])
-			nmm.lastiSeg = iSeg
 		}
 		nmm.iSeg += 1
 	} else {
@@ -59,7 +56,6 @@ func (nmm *NatsMsgMerger) Handle(data []byte) (segmentFinished bool, err error)
 			nmm.buf.Write(data[:lenData-4])
 			nmm.iSeg += 1
 		}
-		nmm.lastiSeg = iSeg
 		if lenData < g.NatsMaxMsg+4 {
 			segmentFinished = true
 		} else {
@@ -68,7 +64,6 @@ func (nmm *NatsMsgMerger) Handle(data []byte) (segmentFinished bool, err error)
 		nmm.logger.Debug("NatsMsgMerger.Handle found big msg segment", "iSeg", iSeg, "lenData", lenData,
 			"isLast", segmentFinished)
 	}
-	nmm.lastLen = len(data)
 	return segmentFinished, nil
 }
 

etc/dtle/nomad.hcl

@@ -1,5 +1,5 @@
-name = "nomad0" # rename for each node
-datacenter = "dc1"
+name = "nomad0" # Rename for each node.
+datacenter = "dc1" # Do NOT change. Unused nomad feature.
 data_dir  = "INSTALL_PREFIX_MAGIC/var/lib/nomad"
 plugin_dir = "INSTALL_PREFIX_MAGIC/usr/share/dtle/nomad-plugin"
 
@@ -9,7 +9,7 @@ log_file = "INSTALL_PREFIX_MAGIC/var/log/nomad/"
 disable_update_check = true
 
 bind_addr = "0.0.0.0"
-# change ports if multiple nodes run on a same machine
+# Change ports if multiple nodes run on the same machine.
 ports {
   http = 4646
   rpc  = 4647
@@ -54,7 +54,7 @@ consul {
 
 plugin "dtle" {
   config {
-    log_level = "Info" # repeat nomad log level here
+    log_level = "Info" # Repeat nomad log level here.
     data_dir = "INSTALL_PREFIX_MAGIC/var/lib/nomad"
     nats_bind = "127.0.0.1:8193"
     nats_advertise = "127.0.0.1:8193"