Support Treedata calculation condition (#521)

* don't report tree data engine error code 7005 (calc cond) as an error
qlik-oss · Jan 23, 2025 · 5fab651 · 5fab651
1 parent daadac8
commit 5fab651
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/session/appselection.go b/session/appselection.go
@@ -131,7 +131,7 @@ func NewAppSelection(appMode AppSelectionModeEnum, app string, list []string) (*
 }
 
 // getRoundAppListEntry returns round robin entry from appList, based on local counter
-func (appSelection *AppSelection) getRoundAppListEntry(sessionState *State, appList []string) string {
+func (appSelection *AppSelection) getRoundAppListEntry(appList []string) string {
 	appNumber := appSelection.listCounter.Inc() - 1
 	return appList[appNumber%uint64(len(appList))]
 }
@@ -217,14 +217,14 @@ func (appSelection *AppSelection) Select(sessionState *State) (*ArtifactEntry, e
 			return nil, errors.WithStack(err)
 		}
 	case AppModeRoundNameFromList:
-		app := appSelection.getRoundAppListEntry(sessionState, appSelection.AppList)
+		app := appSelection.getRoundAppListEntry(appSelection.AppList)
 		var err error
 		entry, err = sessionState.ArtifactMap.LookupAppTitle(app)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to find app with title<%s>", app)
 		}
 	case AppModeRoundGUIDFromList:
-		guid := appSelection.getRoundAppListEntry(sessionState, appSelection.AppList)
+		guid := appSelection.getRoundAppListEntry(appSelection.AppList)
 		var err error
 		entry, err = sessionState.ArtifactMap.LookupAppGUID(guid)
 		if err != nil {
@@ -249,14 +249,14 @@ func (appSelection *AppSelection) Select(sessionState *State) (*ArtifactEntry, e
 			return nil, errors.WithStack(err)
 		}
 	case AppModeRoundNameFromFile:
-		app := appSelection.getRoundAppListEntry(sessionState, appSelection.Filename.Rows())
+		app := appSelection.getRoundAppListEntry(appSelection.Filename.Rows())
 		var err error
 		entry, err = sessionState.ArtifactMap.LookupAppTitle(app)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to find app with title<%s>", app)
 		}
 	case AppModeRoundGUIDFromFile:
-		guid := appSelection.getRoundAppListEntry(sessionState, appSelection.Filename.Rows())
+		guid := appSelection.getRoundAppListEntry(appSelection.Filename.Rows())
 		var err error
 		entry, err = sessionState.ArtifactMap.LookupAppGUID(guid)
 		if err != nil {

diff --git a/session/objecthandling.go b/session/objecthandling.go
@@ -412,7 +412,7 @@ func UpdateObjectHyperCubeDataAsync(sessionState *State, actionState *action.Sta
 			return errors.Errorf("object<%s> has no hypercube", gob.GenericId)
 		}
 
-		if err := checkHyperCubeErrors(gob.GenericId, hypercube, sessionState.LogEntry); err != nil {
+		if err := checkHyperCubeErrors(gob.GenericId, hypercube); err != nil {
 			switch err.(type) {
 			case CalcEvalConditionFailedError:
 				sessionState.LogEntry.Logf(logger.WarningLevel, "object<%s>: %v", obj.ID, err)
@@ -476,7 +476,7 @@ func UpdateObjectHyperCubeReducedDataAsync(sessionState *State, actionState *act
 			return errors.Errorf("object<%s> has no hypercube", gob.GenericId)
 		}
 
-		if err := checkHyperCubeErrors(gob.GenericId, hypercube, sessionState.LogEntry); err != nil {
+		if err := checkHyperCubeErrors(gob.GenericId, hypercube); err != nil {
 			switch err.(type) {
 			case CalcEvalConditionFailedError:
 				sessionState.LogEntry.Logf(logger.WarningLevel, "object<%s>: %v", obj.ID, err)
@@ -529,7 +529,7 @@ func UpdateObjectHyperCubeBinnedDataAsync(sessionState *State, actionState *acti
 			return errors.Errorf("object<%s> has no hypercube", gob.GenericId)
 		}
 
-		if err := checkHyperCubeErrors(gob.GenericId, hypercube, sessionState.LogEntry); err != nil {
+		if err := checkHyperCubeErrors(gob.GenericId, hypercube); err != nil {
 			switch err.(type) {
 			case CalcEvalConditionFailedError:
 				sessionState.LogEntry.Logf(logger.WarningLevel, "object<%s>: %v", obj.ID, err)
@@ -613,7 +613,7 @@ func UpdateObjectHyperCubeStackDataAsync(sessionState *State, actionState *actio
 			return errors.Errorf("object<%s> has no hypercube", gob.GenericId)
 		}
 
-		if err := checkHyperCubeErrors(gob.GenericId, hypercube, sessionState.LogEntry); err != nil {
+		if err := checkHyperCubeErrors(gob.GenericId, hypercube); err != nil {
 			switch err.(type) {
 			case CalcEvalConditionFailedError:
 				sessionState.LogEntry.Logf(logger.WarningLevel, "object<%s>: %v", obj.ID, err)
@@ -683,7 +683,7 @@ func UpdateObjectHyperCubeContinuousDataAsync(sessionState *State, actionState *
 	sessionState.QueueRequest(func(ctx context.Context) error {
 		sessionState.LogEntry.LogDebugf("Get continuous data for object<%s>", gob.GenericId)
 		hypercube := obj.HyperCube()
-		if err := checkHyperCubeErrors(gob.GenericId, hypercube, sessionState.LogEntry); err != nil {
+		if err := checkHyperCubeErrors(gob.GenericId, hypercube); err != nil {
 			switch err.(type) {
 			case CalcEvalConditionFailedError:
 				sessionState.LogEntry.Logf(logger.WarningLevel, "object<%s>: %v", obj.ID, err)
@@ -750,6 +750,7 @@ func UpdateObjectHyperCubeTreeDataAsync(sessionState *State, actionState *action
 		treeNodes, err := gob.GetHyperCubeTreeData(ctx, requestDef.Path, &enigma.NxTreeDataOption{
 			TreeNodes: nodes,
 		})
+		err = checkEngineErr(err, sessionState, fmt.Sprintf("object<%s>.GetHyperCubeTreeData", gob.GenericId))
 		if err != nil {
 			return errors.WithStack(err)
 		}
@@ -762,7 +763,7 @@ func UpdateObjectHyperCubeTreeDataAsync(sessionState *State, actionState *action
 	}, actionState, true, fmt.Sprintf("failed to get tree data for object<%s>", gob.GenericId))
 }
 
-func checkHyperCubeErrors(id string, hypercube *enigmahandlers.HyperCube, logEntry *logger.LogEntry) error {
+func checkHyperCubeErrors(id string, hypercube *enigmahandlers.HyperCube) error {
 	if hypercube == nil {
 		return errors.Errorf("object<%s> has no hypercube", id)
 	}