Fix extracting ttl from query response

fimanishi · Jan 15, 2025 · 331fb17 · 331fb17
1 parent 08db89e
commit 331fb17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common/persistence/nosql/nosqlplugin/cassandra/tasks.go b/common/persistence/nosql/nosqlplugin/cassandra/tasks.go
@@ -444,7 +444,7 @@ PopulateTasks:
 		}
 
 		// Extract the TTL value
-		ttlValue, ttlExists := task["task"].(map[string]interface{})["ttl"]
+		ttlValue, ttlExists := task["ttl"]
 
 		// Check if TTL is null or an integer
 		var ttl *int

diff --git a/common/persistence/nosql/nosqlplugin/cassandra/tasks_test.go b/common/persistence/nosql/nosqlplugin/cassandra/tasks_test.go
@@ -994,23 +994,23 @@ func TestSelectTasks(t *testing.T) {
 							"domain_id":        &fakeUUID{uuid: "domain1"},
 							"workflow_id":      "wid1",
 							"schedule_id":      int64(42),
-							"ttl":              2,
 							"created_time":     ts,
 							"run_id":           &fakeUUID{uuid: "runid1"},
 							"partition_config": map[string]string{},
 						},
+						"ttl": 2,
 					},
 					{
 						"task_id": int64(2),
 						"task": map[string]interface{}{
 							"domain_id":        &fakeUUID{uuid: "domain1"},
 							"workflow_id":      "wid1",
 							"schedule_id":      int64(45),
-							"ttl":              nil,
 							"created_time":     ts,
 							"run_id":           &fakeUUID{uuid: "runid1"},
 							"partition_config": map[string]string{},
 						},
+						"ttl": nil,
 					},
 					{
 						"missing_task_id": int64(1), // missing task_id so this row will be skipped
@@ -1021,23 +1021,23 @@ func TestSelectTasks(t *testing.T) {
 							"domain_id":        &fakeUUID{uuid: "domain1"},
 							"workflow_id":      "wid1",
 							"schedule_id":      int64(48),
-							"ttl":              4,
 							"created_time":     ts,
 							"run_id":           &fakeUUID{uuid: "runid1"},
 							"partition_config": map[string]string{},
 						},
+						"ttl": 4,
 					},
 					{
 						"task_id": int64(4), // this will be skipped because filter.BatchSize is reached
 						"task": map[string]interface{}{
 							"domain_id":        &fakeUUID{uuid: "domain1"},
 							"workflow_id":      "wid1",
 							"schedule_id":      int64(51),
-							"ttl":              5,
 							"created_time":     ts,
 							"run_id":           &fakeUUID{uuid: "runid1"},
 							"partition_config": map[string]string{},
 						},
+						"ttl": 5,
 					},
 				},
 			},