Merge pull request #639 from afumagalli98/638

Added three decimals to oracle memory advisor fields

Author: afumagalli98

marshal/oracle/memory_advisor.go

@@ -18,8 +18,10 @@ package oracle
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"strings"
 
+	"github.com/ercole-io/ercole-agent/v2/marshal"
 	"github.com/ercole-io/ercole/v2/model"
 )
 
@@ -54,15 +56,45 @@ func MemoryAdvisor(cmdOutput []byte) (*model.OracleDatabaseMemoryAdvisor, error)
 			switch splitted[0] {
 			case "MEMORY_SIZE_LOWER_GB":
 				res.AutomaticMemoryManagement = true
-				res.MemorySizeLowerGb = splitted[1]
+
+				val, err := marshal.TrimParseUnsafeFloat64Pointer(splitted[1], marshal.TrimParseFloat64)
+				if err != nil {
+					return nil, err
+				}
+
+				if val == nil {
+					res.MemorySizeLowerGb = "N/A"
+				} else {
+					res.MemorySizeLowerGb = fmt.Sprintf("%.3f", *val)
+				}
 
 			case "PGA_TARGET_AGGREGATE_LOWER_GB":
 				res.AutomaticMemoryManagement = false
-				res.PgaTargetAggregateLowerGb = splitted[1]
+
+				val, err := marshal.TrimParseUnsafeFloat64Pointer(splitted[1], marshal.TrimParseFloat64)
+				if err != nil {
+					return nil, err
+				}
+
+				if val == nil {
+					res.PgaTargetAggregateLowerGb = "N/A"
+				} else {
+					res.PgaTargetAggregateLowerGb = fmt.Sprintf("%.3f", *val)
+				}
 
 			case "SGA_SIZE_LOWER_GB":
 				res.AutomaticMemoryManagement = false
-				res.SgaSizeLowerGb = splitted[1]
+
+				val, err := marshal.TrimParseUnsafeFloat64Pointer(splitted[1], marshal.TrimParseFloat64)
+				if err != nil {
+					return nil, err
+				}
+
+				if val == nil {
+					res.SgaSizeLowerGb = "N/A"
+				} else {
+					res.SgaSizeLowerGb = fmt.Sprintf("%.3f", *val)
+				}
 			}
 		}
 	}

marshal/oracle/memory_advisor_test.go

@@ -26,7 +26,7 @@ import (
 const (
 	testMemoryAdvisorData01 = `
 BEGINOUTPUT
-MEMORY_SIZE_LOWER_GB|||1.078
+MEMORY_SIZE_LOWER_GB|||.078
 ENDOUTPUT
 `
 	testMemoryAdvisorData02 = `
@@ -40,7 +40,7 @@ ENDOUTPUT
 func TestMemoryAdvisor_Output01(t *testing.T) {
 	expected := &model.OracleDatabaseMemoryAdvisor{
 		AutomaticMemoryManagement: true,
-		MemorySizeLowerGb:         "1.078",
+		MemorySizeLowerGb:         "0.078",
 	}
 
 	actual, err := MemoryAdvisor([]byte(testMemoryAdvisorData01))
@@ -52,7 +52,7 @@ func TestMemoryAdvisor_Output01(t *testing.T) {
 func TestMemoryAdvisor_Output02(t *testing.T) {
 	expected := &model.OracleDatabaseMemoryAdvisor{
 		AutomaticMemoryManagement: false,
-		PgaTargetAggregateLowerGb: "7.5",
+		PgaTargetAggregateLowerGb: "7.500",
 		SgaSizeLowerGb:            "N/A",
 	}