Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

process visibility task #117

Merged
merged 4 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion engine/immediate_task_concurrent_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,18 @@

func (w *immediateTaskConcurrentProcessor) processVisibilityTask(
ctx context.Context, task data_models.ImmediateTask) error {
return nil
if task.ImmediateTaskInfo.VisibilityInfo == nil {
return fmt.Errorf("visibility info is not set")
}

Check warning on line 163 in engine/immediate_task_concurrent_processor.go

View check run for this annotation

Codecov / codecov/patch

engine/immediate_task_concurrent_processor.go#L162-L163

Added lines #L162 - L163 were not covered by tests
return w.visibilityStore.RecordProcessExecutionStatus(ctx, data_models.RecordProcessExecutionStatusRequest{
Namespace: task.ImmediateTaskInfo.VisibilityInfo.Namespace,
ProcessId: task.ImmediateTaskInfo.VisibilityInfo.ProcessId,
ProcessExecutionId: task.ProcessExecutionId,
ProcessType: task.ImmediateTaskInfo.VisibilityInfo.ProcessType,
Status: task.ImmediateTaskInfo.VisibilityInfo.Status,
StartTime: task.ImmediateTaskInfo.VisibilityInfo.StartTime,
CloseTime: task.ImmediateTaskInfo.VisibilityInfo.CloseTime,
})
}

func (w *immediateTaskConcurrentProcessor) processWaitUntilTask(
Expand Down
11 changes: 11 additions & 0 deletions extensions/data_models_row.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,15 @@ type (
Key string
Value types.JSONText
}

ExecutionVisibilityRow struct {
Namespace string
ProcessId string
ProcessExecutionId uuid.UUID
ProcessExecutionIdString string
ProcessTypeName string
Status data_models.ProcessExecutionStatus
StartTime time.Time
CloseTime time.Time
}
)
27 changes: 27 additions & 0 deletions extensions/postgres/non_transactional.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,30 @@ func (d dbSession) SelectLocalAttributes(
err = d.db.SelectContext(ctx, &rows, query, args...)
return rows, err
}

const insertProcessExecutionStartQuery = `INSERT INTO xcherry_sys_executions_visibility
(namespace, process_id, process_execution_id, process_type_name, status, start_time)
VALUES (:namespace, :process_id, :process_execution_id_string, :process_type_name, :status, :start_time)`

func (d dbSession) InsertProcessExecutionStartForVisibility(
ctx context.Context, row extensions.ExecutionVisibilityRow,
) error {
row.StartTime = ToPostgresDateTime(row.StartTime)
row.ProcessExecutionIdString = row.ProcessExecutionId.String()
_, err := d.db.NamedExecContext(ctx, insertProcessExecutionStartQuery, row)
return err
}

const updateProcessExecutionStatusQuery = `UPDATE xcherry_sys_executions_visibility
SET status = :status, close_time = :close_time
WHERE namespace = :namespace AND process_execution_id = :process_execution_id_string
`

func (d dbSession) UpdateProcessExecutionStatusForVisibility(
ctx context.Context, row extensions.ExecutionVisibilityRow,
) error {
row.CloseTime = ToPostgresDateTime(row.CloseTime)
row.ProcessExecutionIdString = row.ProcessExecutionId.String()
_, err := d.db.NamedExecContext(ctx, updateProcessExecutionStatusQuery, row)
return err
}
12 changes: 6 additions & 6 deletions extensions/postgres/schema/xcherry_sys_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ CREATE TABLE xcherry_sys_local_attributes(
PRIMARY KEY (process_execution_id, key)
);

CREATE TABLE xcherry_executions_visibility (
CREATE TABLE xcherry_sys_executions_visibility (
namespace VARCHAR(31) NOT NULL,
process_id VARCHAR(255) NOT NULL,
process_execution_id uuid NOT NULL,
Expand All @@ -92,12 +92,12 @@ CREATE TABLE xcherry_executions_visibility (
PRIMARY KEY (namespace, process_execution_id)
);

CREATE INDEX by_start_time ON xcherry_executions_visibility (namespace, start_time DESC, process_execution_id);
CREATE INDEX by_start_time ON xcherry_sys_executions_visibility (namespace, start_time DESC, process_execution_id);

CREATE INDEX by_type_start_time ON xcherry_executions_visibility (namespace, process_type_name, start_time DESC, process_execution_id);
CREATE INDEX by_type_start_time ON xcherry_sys_executions_visibility (namespace, process_type_name, start_time DESC, process_execution_id);

CREATE INDEX by_process_id_start_time ON xcherry_executions_visibility (namespace, process_id, start_time DESC, process_execution_id);
CREATE INDEX by_process_id_start_time ON xcherry_sys_executions_visibility (namespace, process_id, start_time DESC, process_execution_id);

CREATE INDEX by_status_start_time ON xcherry_executions_visibility (namespace, status, start_time DESC, process_execution_id);
CREATE INDEX by_status_start_time ON xcherry_sys_executions_visibility (namespace, status, start_time DESC, process_execution_id);

CREATE INDEX by_status_type_start_time ON xcherry_executions_visibility (namespace, status, process_type_name, start_time DESC, process_execution_id);
CREATE INDEX by_status_type_start_time ON xcherry_sys_executions_visibility (namespace, status, process_type_name, start_time DESC, process_execution_id);
8 changes: 8 additions & 0 deletions extensions/sql_db_interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ type nonTransactionalCRUD interface {
SelectLocalAttributes(
ctx context.Context, processExecutionId uuid.UUID, keys []string,
) ([]LocalAttributeRow, error)

InsertProcessExecutionStartForVisibility(
ctx context.Context, row ExecutionVisibilityRow,
) error

UpdateProcessExecutionStatusForVisibility(
ctx context.Context, row ExecutionVisibilityRow,
) error
}

type ErrorChecker interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ type RecordProcessExecutionStatusRequest struct {
ProcessExecutionId uuid.UUID
ProcessType string
Status ProcessExecutionStatus
StartTime int64
EndTime int64
StartTime *int64
CloseTime *int64
}
15 changes: 9 additions & 6 deletions persistence/data_models/visibility_info_json.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@

package data_models

import "github.com/xcherryio/xcherry/common/uuid"

type VisibilityInfoJson struct {
Namespace string
ProcessId string
ProcessType string
Status ProcessExecutionStatus
StartTime int64
EndTime int64
Namespace string `json:"namespace"`
ProcessId string `json:"processId"`
ProcessExecutionId uuid.UUID `json:"processExecutionId"`
ProcessType string `json:"processType"`
Status ProcessExecutionStatus `json:"status"`
StartTime *int64 `json:"startTime"`
CloseTime *int64 `json:"closeTime"`
}
5 changes: 3 additions & 2 deletions persistence/process/complete_execute.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package process
import (
"context"
"fmt"
"github.com/xcherryio/xcherry/common/ptr"
"time"

"github.com/xcherryio/xcherry/persistence/data_models"
Expand Down Expand Up @@ -166,8 +167,8 @@ func (p sqlProcessStoreImpl) doCompleteExecuteExecutionTx(
request.Prepare.Info.ProcessType,
request.ProcessExecutionId,
prcRow.Status,
-1,
time.Now().Unix(),
nil,
ptr.Any(time.Now().Unix()),
)
if err != nil {
return nil, err
Expand Down
17 changes: 9 additions & 8 deletions persistence/process/record_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@ func (p sqlProcessStoreImpl) AddVisibilityTaskRecordProcessExecutionStatus(
processType string,
processExecutionId uuid.UUID,
status data_models.ProcessExecutionStatus,
startTime int64,
endTime int64) error {
startTime *int64,
endTime *int64) error {

visibilityTaskInfo := data_models.ImmediateTaskInfoJson{
VisibilityInfo: &data_models.VisibilityInfoJson{
Namespace: namespace,
ProcessId: processId,
ProcessType: processType,
Status: status,
StartTime: startTime,
EndTime: endTime,
Namespace: namespace,
ProcessId: processId,
ProcessType: processType,
ProcessExecutionId: processExecutionId,
Status: status,
StartTime: startTime,
CloseTime: endTime,
},
}

Expand Down
13 changes: 7 additions & 6 deletions persistence/process/sqltest/base_basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ func SQLBasicTest(t *testing.T, ass *assert.Assertions, store persistence.Proces
"-0",
data_models.ImmediateTaskInfoJson{
VisibilityInfo: &data_models.VisibilityInfoJson{
Namespace: namespace,
ProcessId: processId,
ProcessType: testProcessType,
Status: data_models.ProcessExecutionStatusRunning,
StartTime: -1,
EndTime: -1,
Namespace: namespace,
ProcessId: processId,
ProcessType: testProcessType,
ProcessExecutionId: prcExeId,
Status: data_models.ProcessExecutionStatusRunning,
StartTime: nil,
CloseTime: nil,
},
})

Expand Down
9 changes: 5 additions & 4 deletions persistence/process/start_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package process
import (
"context"
"fmt"
"github.com/xcherryio/xcherry/common/ptr"
"time"

"github.com/xcherryio/apis/goapi/xcapi"
Expand Down Expand Up @@ -318,8 +319,8 @@ func (p sqlProcessStoreImpl) applyTerminateIfRunningPolicy(
request.Request.ProcessType,
processExecutionRowForUpdate.ProcessExecutionId,
data_models.ProcessExecutionStatusTerminated,
-1,
time.Now().Unix())
nil,
ptr.Any(time.Now().Unix()))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -518,8 +519,8 @@ func (p sqlProcessStoreImpl) insertProcessExecution(
request.Request.ProcessType,
processExecutionId,
data_models.ProcessExecutionStatusRunning,
startTime.Unix(),
-1)
ptr.Any(startTime.Unix()),
nil)
if err != nil {
return hasNewImmediateTask, err
}
Expand Down
5 changes: 3 additions & 2 deletions persistence/process/stop_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package process
import (
"context"
"github.com/xcherryio/apis/goapi/xcapi"
"github.com/xcherryio/xcherry/common/ptr"
"github.com/xcherryio/xcherry/persistence/data_models"
"time"

Expand Down Expand Up @@ -116,8 +117,8 @@ func (p sqlProcessStoreImpl) doStopProcessTx(
procExecInfoJson.ProcessType,
curProcExecRow.ProcessExecutionId,
status,
-1,
time.Now().Unix(),
nil,
ptr.Any(time.Now().Unix()),
)
if err != nil {
return nil, err
Expand Down
29 changes: 27 additions & 2 deletions persistence/visibility/visibility_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@

import (
"context"
"fmt"
"github.com/xcherryio/xcherry/common/log"
"github.com/xcherryio/xcherry/config"
"github.com/xcherryio/xcherry/extensions"
"github.com/xcherryio/xcherry/persistence"
"github.com/xcherryio/xcherry/persistence/data_models"
"time"
)

type sqlVisibilityStoreImpl struct {
Expand All @@ -31,6 +33,29 @@

func (p sqlVisibilityStoreImpl) RecordProcessExecutionStatus(
ctx context.Context, req data_models.RecordProcessExecutionStatusRequest) error {
// TODO: add implementation
return nil
if req.Status == data_models.ProcessExecutionStatusUndefined {
return fmt.Errorf("process status is undefined")
}

Check warning on line 38 in persistence/visibility/visibility_store.go

View check run for this annotation

Codecov / codecov/patch

persistence/visibility/visibility_store.go#L37-L38

Added lines #L37 - L38 were not covered by tests

if req.Status == data_models.ProcessExecutionStatusRunning {
if req.StartTime == nil {
return fmt.Errorf("start time is required for recording visibility for running process")
}

Check warning on line 43 in persistence/visibility/visibility_store.go

View check run for this annotation

Codecov / codecov/patch

persistence/visibility/visibility_store.go#L42-L43

Added lines #L42 - L43 were not covered by tests
return p.session.InsertProcessExecutionStartForVisibility(ctx, extensions.ExecutionVisibilityRow{
Namespace: req.Namespace,
ProcessId: req.ProcessId,
ProcessExecutionId: req.ProcessExecutionId,
ProcessTypeName: req.ProcessType,
Status: req.Status,
StartTime: time.Unix(*req.StartTime, 0),
})
}
return p.session.UpdateProcessExecutionStatusForVisibility(ctx, extensions.ExecutionVisibilityRow{
Namespace: req.Namespace,
ProcessId: req.ProcessId,
ProcessExecutionId: req.ProcessExecutionId,
ProcessTypeName: req.ProcessType,
Status: req.Status,
CloseTime: time.Unix(*req.CloseTime, 0),
})
}
Loading