Refs #2144, remove calcCacheMu field in the File data structure (#1440)

- Increase unit test time out to 1 hour

Author: Kingson4Wu

.github/workflows/go.yml

@@ -38,7 +38,7 @@ jobs:
         GOARCH=arm64 GOOS=android go build .
 
     - name: Test
-      run: env GO111MODULE=on go test -v -timeout 50m -race ./... -coverprofile='coverage.txt' -covermode=atomic
+      run: env GO111MODULE=on go test -v -timeout 60m -race ./... -coverprofile='coverage.txt' -covermode=atomic
 
     - name: Codecov
       uses: codecov/codecov-action@v5

adjust.go

@@ -75,7 +75,7 @@ func (f *File) adjustHelper(sheet string, dir adjustDirection, num, offset int)
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	sheetID := f.getSheetID(sheet)
 	if dir == rows {
 		err = f.adjustRowDimensions(sheet, ws, num, offset)

calc.go

@@ -840,13 +840,9 @@ type formulaFuncs struct {
 //	ZTEST
 func (f *File) CalcCellValue(sheet, cell string, opts ...Options) (result string, err error) {
 	cacheKey := fmt.Sprintf("%s!%s", sheet, cell)
-	f.calcCacheMu.RLock()
 	if cachedResult, found := f.calcCache.Load(cacheKey); found {
-		f.calcCacheMu.RUnlock()
 		return cachedResult.(string), nil
 	}
-	f.calcCacheMu.RUnlock()
-
 	options := f.getOptions(opts...)
 	var (
 		rawCellValue = options.RawCellValue
@@ -870,27 +866,21 @@ func (f *File) CalcCellValue(sheet, cell string, opts ...Options) (result string
 		if precision > 15 {
 			result, err = f.formattedValue(&xlsxC{S: styleIdx, V: strings.ToUpper(strconv.FormatFloat(decimal, 'G', 15, 64))}, rawCellValue, CellTypeNumber)
 			if err == nil {
-				f.calcCacheMu.Lock()
 				f.calcCache.Store(cacheKey, result)
-				f.calcCacheMu.Unlock()
 			}
 			return
 		}
 		if !strings.HasPrefix(result, "0") {
 			result, err = f.formattedValue(&xlsxC{S: styleIdx, V: strings.ToUpper(strconv.FormatFloat(decimal, 'f', -1, 64))}, rawCellValue, CellTypeNumber)
 		}
 		if err == nil {
-			f.calcCacheMu.Lock()
 			f.calcCache.Store(cacheKey, result)
-			f.calcCacheMu.Unlock()
 		}
 		return
 	}
 	result, err = f.formattedValue(&xlsxC{S: styleIdx, V: token.Value()}, rawCellValue, CellTypeInlineString)
 	if err == nil {
-		f.calcCacheMu.Lock()
 		f.calcCache.Store(cacheKey, result)
-		f.calcCacheMu.Unlock()
 	}
 	return
 }
@@ -1335,13 +1325,6 @@ func calcDiv(rOpd, lOpd formulaArg, opdStack *Stack) error {
 	return nil
 }
 
-// clearCalcCache clear all calculation cache.
-func (f *File) clearCalcCache() {
-	f.calcCacheMu.Lock()
-	f.calcCache.Clear()
-	f.calcCacheMu.Unlock()
-}
-
 // calculate evaluate basic arithmetic operations.
 func calculate(opdStack *Stack, opt efp.Token) error {
 	if opt.TValue == "-" && opt.TType == efp.TokenTypeOperatorPrefix {

cell.go

@@ -182,7 +182,7 @@ func (c *xlsxC) hasValue() bool {
 
 // removeFormula delete formula for the cell.
 func (f *File) removeFormula(c *xlsxC, ws *xlsxWorksheet, sheet string) error {
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	if c.F != nil && c.Vm == nil {
 		sheetID := f.getSheetID(sheet)
 		if err := f.deleteCalcChain(sheetID, c.R); err != nil {
@@ -795,7 +795,7 @@ func (f *File) SetCellFormula(sheet, cell, formula string, opts ...FormulaOpts)
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	if formula == "" {
 		ws.deleteSharedFormula(c)
 		c.F = nil
@@ -1371,7 +1371,7 @@ func (f *File) SetCellRichText(sheet, cell string, runs []RichTextRun) error {
 	if si.R, err = setRichText(runs); err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	for idx, strItem := range sst.SI {
 		if reflect.DeepEqual(strItem, si) {
 			c.T, c.V = "s", strconv.Itoa(idx)

excelize.go

@@ -42,7 +42,6 @@ type File struct {
 	tempFiles        sync.Map
 	xmlAttr          sync.Map
 	calcCache        sync.Map
-	calcCacheMu      sync.RWMutex
 	CalcChain        *xlsxCalcChain
 	CharsetReader    func(charset string, input io.Reader) (rdr io.Reader, err error)
 	Comments         map[string]*xlsxComments

merge.go

@@ -115,7 +115,7 @@ func (f *File) UnmergeCell(sheet, topLeftCell, bottomRightCell string) error {
 	if err = ws.mergeOverlapCells(); err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	i := 0
 	for _, mergeCell := range ws.MergeCells.Cells {
 		if rect2, _ := rangeRefToCoordinates(mergeCell.Ref); isOverlap(rect1, rect2) {

pivotTable.go

@@ -163,7 +163,7 @@ func (f *File) AddPivotTable(opts *PivotTableOptions) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	pivotTableID := f.countPivotTables() + 1
 	pivotCacheID := f.countPivotCache() + 1
 
@@ -1062,7 +1062,7 @@ func (f *File) DeletePivotTable(sheet, name string) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	pivotTableCaches := map[string]int{}
 	pivotTables, _ := f.getPivotTables()
 	for _, sheetPivotTables := range pivotTables {

sheet.go

@@ -384,7 +384,7 @@ func (f *File) SetSheetName(source, target string) error {
 	if target == source {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	wb, _ := f.workbookReader()
 	for k, v := range wb.Sheets.Sheet {
 		if v.Name == source {
@@ -580,7 +580,7 @@ func (f *File) DeleteSheet(sheet string) error {
 	if idx, _ := f.GetSheetIndex(sheet); f.SheetCount == 1 || idx == -1 {
 		return nil
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	wb, _ := f.workbookReader()
 	wbRels, _ := f.relsReader(f.getWorkbookRelsPath())
 	activeSheetName := f.GetSheetName(f.GetActiveSheetIndex())
@@ -769,7 +769,7 @@ func (f *File) copySheet(from, to int) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	worksheet := &xlsxWorksheet{}
 	deepcopy.Copy(worksheet, sheet)
 	toSheetID := strconv.Itoa(f.getSheetID(f.GetSheetName(to)))
@@ -1773,7 +1773,7 @@ func (f *File) SetDefinedName(definedName *DefinedName) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	d := xlsxDefinedName{
 		Name:    definedName.Name,
 		Comment: definedName.Comment,
@@ -1816,7 +1816,7 @@ func (f *File) DeleteDefinedName(definedName *DefinedName) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	if wb.DefinedNames != nil {
 		for idx, dn := range wb.DefinedNames.DefinedName {
 			scope := "Workbook"

table.go

@@ -118,7 +118,7 @@ func (f *File) AddTable(sheet string, table *Table) error {
 		return err
 	}
 	f.addSheetNameSpace(sheet, SourceRelationship)
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	if err = f.addTable(sheet, tableXML, coordinates[0], coordinates[1], coordinates[2], coordinates[3], tableID, options); err != nil {
 		return err
 	}
@@ -178,7 +178,7 @@ func (f *File) DeleteTable(name string) error {
 	if err != nil {
 		return err
 	}
-	f.clearCalcCache()
+	f.calcCache.Clear()
 	for sheet, tables := range tbls {
 		for _, table := range tables {
 			if table.Name != name {