-
Notifications
You must be signed in to change notification settings - Fork 0
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 #80 from brotherlogic/add_mongo_client
Ensure we use the redis client
- Loading branch information
Showing
4 changed files
with
178 additions
and
61 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # For most projects, this workflow file will not need changing; you simply need | ||
| # to commit it to your repository. | ||
| # | ||
| # You may wish to alter this file to override the set of languages analyzed, | ||
| # or to provide custom queries or build logic. | ||
| name: "CodeQL" | ||
|
|
||
| on: | ||
| pull_request: | ||
| # The branches below must be a subset of the branches above | ||
| branches: [main] | ||
|
|
||
| jobs: | ||
| analyze: | ||
| name: Analyze | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| # Override automatic language detection by changing the below list | ||
| # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] | ||
| language: ['go'] | ||
| # Learn more... | ||
| # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
|
|
||
| # Initializes the CodeQL tools for scanning. | ||
| - name: Initialize CodeQL | ||
| uses: github/codeql-action/init@v1 | ||
| with: | ||
| languages: ${{ matrix.language }} | ||
| # If you wish to specify custom queries, you can do so here or in a config file. | ||
| # By default, queries listed here will override any specified in a config file. | ||
| # Prefix the list here with "+" to use these queries and those in the config file. | ||
| # queries: ./path/to/local/query, your-org/your-repo/queries@main | ||
|
|
||
| # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). | ||
| # If this step fails, then you should remove it and run the build manually (see below) | ||
| - name: Autobuild | ||
| uses: github/codeql-action/autobuild@v1 | ||
|
|
||
| # ℹ️ Command-line programs to run using the OS shell. | ||
| # 📚 https://git.io/JvXDl | ||
|
|
||
| # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines | ||
| # and modify them (or add more) to build your code if your project | ||
| # uses a compiled language | ||
|
|
||
| #- run: | | ||
| # make bootstrap | ||
| # make release | ||
|
|
||
| - name: Perform CodeQL Analysis | ||
| uses: github/codeql-action/analyze@v1 |
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,82 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "strings" | ||
| "time" | ||
|
|
||
| pb "github.com/brotherlogic/rstore/proto" | ||
| "github.com/redis/go-redis/v9" | ||
| "google.golang.org/grpc/codes" | ||
| "google.golang.org/grpc/status" | ||
| "google.golang.org/protobuf/types/known/anypb" | ||
| ) | ||
|
|
||
| type redisClient struct { | ||
| rdb *redis.Client | ||
| } | ||
|
|
||
| func (r *redisClient) Read(ctx context.Context, req *pb.ReadRequest) (*pb.ReadResponse, error) { | ||
| /*if val, ok := s.cache[req.GetKey()]; ok { | ||
| return &pb.ReadResponse{Value: &anypb.Any{Value: val}}, nil | ||
| }*/ | ||
| cmd := r.rdb.Get(ctx, req.GetKey()) | ||
| result, err := cmd.Bytes() | ||
|
|
||
| if err == redis.Nil { | ||
| return nil, status.Errorf(codes.NotFound, "key %v was not found", req.GetKey()) | ||
| } | ||
|
|
||
| if err != nil { | ||
| log.Printf("remote err on read: %v", err) | ||
| } | ||
| return &pb.ReadResponse{Value: &anypb.Any{Value: result}}, err | ||
| } | ||
|
|
||
| func (r *redisClient) Write(ctx context.Context, req *pb.WriteRequest) (*pb.WriteResponse, error) { | ||
| err := r.rdb.Set(ctx, req.GetKey(), req.GetValue().GetValue(), 0).Err() | ||
| if err != nil { | ||
| log.Printf("remote err on write: %v", err) | ||
| } else { | ||
| //s.cache[req.GetKey()] = req.GetValue().GetValue() | ||
| } | ||
| return &pb.WriteResponse{}, err | ||
| } | ||
|
|
||
| func (r *redisClient) GetKeys(ctx context.Context, req *pb.GetKeysRequest) (*pb.GetKeysResponse, error) { | ||
| var akeys []string | ||
| t := time.Now() | ||
| defer func(t time.Time) { | ||
| log.Printf("Completed %v in %v", req.GetPrefix(), time.Since(t)) | ||
| }(t) | ||
| iter := r.rdb.Scan(ctx, 0, fmt.Sprintf("%v*", req.GetPrefix()), 1000).Iterator() | ||
|
|
||
| for iter.Next(ctx) { | ||
| key := iter.Val() | ||
| if req.GetAllKeys() || strings.Count(key, "/") == strings.Count(req.GetPrefix(), "/") { | ||
| valid := true | ||
| for _, suffix := range req.GetAvoidSuffix() { | ||
| if strings.HasSuffix(key, suffix) { | ||
| valid = false | ||
| } | ||
| } | ||
| if valid { | ||
| akeys = append(akeys, key) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if err := iter.Err(); err != nil { | ||
| log.Printf("Failed to read keys (%v) in %v", req.GetPrefix(), time.Since(t)) | ||
| return nil, fmt.Errorf("database error reading keys %w", err) | ||
| } | ||
|
|
||
| log.Printf("returning %v items (%v)", len(akeys), req.GetPrefix()) | ||
| return &pb.GetKeysResponse{Keys: akeys}, nil | ||
| } | ||
|
|
||
| func (r *redisClient) Delete(ctx context.Context, req *pb.DeleteRequest) (*pb.DeleteResponse, error) { | ||
| return &pb.DeleteResponse{}, r.rdb.Del(ctx, req.GetKey()).Err() | ||
| } |