-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #351 from maxekman/feature-109/persistent-schedule…
…d-commands 109 / Add persistance to command scheduler
- Loading branch information
Showing
16 changed files
with
921 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright (c) 2021 - The Event Horizon authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package bson | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "go.mongodb.org/mongo-driver/bson" | ||
|
|
||
| eh "github.com/looplab/eventhorizon" | ||
| ) | ||
|
|
||
| // CommandCodec is a codec for marshaling and unmarshaling commands | ||
| // to and from bytes in BSON format. | ||
| type CommandCodec struct{} | ||
|
|
||
| // MarshalCommand marshals a command into bytes in BSON format. | ||
| func (_ CommandCodec) MarshalCommand(ctx context.Context, cmd eh.Command) ([]byte, error) { | ||
| c := command{ | ||
| CommandType: cmd.CommandType(), | ||
| Context: eh.MarshalContext(ctx), | ||
| } | ||
|
|
||
| var err error | ||
| if c.Command, err = bson.Marshal(cmd); err != nil { | ||
| return nil, fmt.Errorf("could not marshal command data: %w", err) | ||
| } | ||
|
|
||
| b, err := bson.Marshal(c) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not marshal command: %w", err) | ||
| } | ||
|
|
||
| return b, nil | ||
| } | ||
|
|
||
| // UnmarshalCommand unmarshals a command from bytes in BSON format. | ||
| func (_ CommandCodec) UnmarshalCommand(ctx context.Context, b []byte) (eh.Command, context.Context, error) { | ||
| var c command | ||
| if err := bson.Unmarshal(b, &c); err != nil { | ||
| return nil, nil, fmt.Errorf("could not unmarshal command: %w", err) | ||
| } | ||
|
|
||
| cmd, err := eh.CreateCommand(c.CommandType) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("could not create command: %w", err) | ||
| } | ||
|
|
||
| if err := bson.Unmarshal(c.Command, cmd); err != nil { | ||
| return nil, nil, fmt.Errorf("could not unmarshal command data: %w", err) | ||
| } | ||
|
|
||
| ctx = eh.UnmarshalContext(ctx, c.Context) | ||
|
|
||
| return cmd, ctx, nil | ||
| } | ||
|
|
||
| // command is the internal structure used on the wire only. | ||
| type command struct { | ||
| CommandType eh.CommandType `bson:"command_type"` | ||
| Command bson.Raw `bson:"command"` | ||
| Context map[string]interface{} `bson:"context"` | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright (c) 2021 - The Event Horizon authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package bson | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "testing" | ||
|
|
||
| "github.com/looplab/eventhorizon/codec" | ||
| ) | ||
|
|
||
| func TestCommandCodec(t *testing.T) { | ||
| c := &CommandCodec{} | ||
|
|
||
| expectedBytes, err := base64.StdEncoding.DecodeString("jQEAAAJjb21tYW5kX3R5cGUADQAAAENvZGVjQ29tbWFuZAADY29tbWFuZAA5AQAAAmlkACUAAAAxMGE3ZWMwZi03ZjJiLTQ2ZjUtYmNhMS04NzdiNmUzM2M5ZmQACGJvb2wAAQJzdHJpbmcABwAAAHN0cmluZwABbnVtYmVyAAAAAAAAAEVABHNsaWNlABcAAAACMAACAAAAYQACMQACAAAAYgAAA21hcAAUAAAAAmtleQAGAAAAdmFsdWUAAAl0aW1lAIA1U+AkAQAACXRpbWVyZWYAgDVT4CQBAAAKbnVsbHRpbWUAA3N0cnVjdAAvAAAACGJvb2wAAQJzdHJpbmcABwAAAHN0cmluZwABbnVtYmVyAAAAAAAAAEVAAANzdHJ1Y3RyZWYALwAAAAhib29sAAECc3RyaW5nAAcAAABzdHJpbmcAAW51bWJlcgAAAAAAAABFQAAKbnVsbHN0cnVjdAAAA2NvbnRleHQAHgAAAAJjb250ZXh0X29uZQAIAAAAdGVzdHZhbAAAAA==") | ||
| if err != nil { | ||
| t.Error("could not decode expected bytes:", err) | ||
| } | ||
|
|
||
| codec.CommandCodecAcceptanceTest(t, c, expectedBytes) | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright (c) 2021 - The Event Horizon authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package json | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| eh "github.com/looplab/eventhorizon" | ||
| ) | ||
|
|
||
| // CommandCodec is a codec for marshaling and unmarshaling commands | ||
| // to and from bytes in JSON format. | ||
| type CommandCodec struct{} | ||
|
|
||
| // MarshalCommand marshals a command into bytes in JSON format. | ||
| func (_ CommandCodec) MarshalCommand(ctx context.Context, cmd eh.Command) ([]byte, error) { | ||
| c := command{ | ||
| CommandType: cmd.CommandType(), | ||
| Context: eh.MarshalContext(ctx), | ||
| } | ||
|
|
||
| var err error | ||
| if c.Command, err = json.Marshal(cmd); err != nil { | ||
| return nil, fmt.Errorf("could not marshal command data: %w", err) | ||
| } | ||
|
|
||
| b, err := json.Marshal(c) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not marshal command: %w", err) | ||
| } | ||
|
|
||
| return b, nil | ||
| } | ||
|
|
||
| // UnmarshalCommand unmarshals a command from bytes in JSON format. | ||
| func (_ CommandCodec) UnmarshalCommand(ctx context.Context, b []byte) (eh.Command, context.Context, error) { | ||
| var c command | ||
| if err := json.Unmarshal(b, &c); err != nil { | ||
| return nil, nil, fmt.Errorf("could not unmarshal command: %w", err) | ||
| } | ||
|
|
||
| cmd, err := eh.CreateCommand(c.CommandType) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("could not create command: %w", err) | ||
| } | ||
|
|
||
| if err := json.Unmarshal(c.Command, &cmd); err != nil { | ||
| return nil, nil, fmt.Errorf("could not unmarshal command data: %w", err) | ||
| } | ||
|
|
||
| ctx = eh.UnmarshalContext(ctx, c.Context) | ||
|
|
||
| return cmd, ctx, nil | ||
| } | ||
|
|
||
| // command is the internal structure used on the wire only. | ||
| type command struct { | ||
| CommandType eh.CommandType `json:"command_type"` | ||
| Command json.RawMessage `json:"command"` | ||
| Context map[string]interface{} `json:"context"` | ||
| } |
Oops, something went wrong.