-
-
Notifications
You must be signed in to change notification settings - Fork 530
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into nicktobey/lazy-load
- Loading branch information
Showing
54 changed files
with
1,596 additions
and
785 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,5 +16,5 @@ | |
| package doltversion | ||
|
|
||
| const ( | ||
| Version = "1.47.2" | ||
| Version = "1.48.0" | ||
| ) | ||
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,150 @@ | ||
| // Copyright 2025 Dolthub, Inc. | ||
| // | ||
| // 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 actions | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "sort" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" | ||
| "github.com/dolthub/dolt/go/libraries/doltcore/env" | ||
| "github.com/dolthub/dolt/go/libraries/utils/filesys" | ||
| "github.com/dolthub/dolt/go/store/types" | ||
| ) | ||
|
|
||
| const ( | ||
| testHomeDir = "/user/bheni" | ||
| workingDir = "/user/bheni/datasets/addresses" | ||
| credsDir = "creds" | ||
|
|
||
| configFile = "config.json" | ||
| GlobalConfigFile = "config_global.json" | ||
| ) | ||
|
|
||
| func testHomeDirFunc() (string, error) { | ||
| return testHomeDir, nil | ||
| } | ||
|
|
||
| func createTestEnv() (*env.DoltEnv, *filesys.InMemFS) { | ||
| initialDirs := []string{testHomeDir, workingDir} | ||
| initialFiles := map[string][]byte{} | ||
|
|
||
| fs := filesys.NewInMemFS(initialDirs, initialFiles, workingDir) | ||
| dEnv := env.Load(context.Background(), testHomeDirFunc, fs, doltdb.InMemDoltDB, "test") | ||
|
|
||
| return dEnv, fs | ||
| } | ||
|
|
||
| func TestVisitResolvedTag(t *testing.T) { | ||
| dEnv, _ := createTestEnv() | ||
| ctx := context.Background() | ||
|
|
||
| // Initialize repo | ||
| err := dEnv.InitRepo(ctx, types.Format_Default, "test user", "[email protected]", "main") | ||
| require.NoError(t, err) | ||
|
|
||
| // Create a tag | ||
| tagName := "test-tag" | ||
| tagMsg := "test tag message" | ||
| err = CreateTag(ctx, dEnv, tagName, "main", TagProps{TaggerName: "test user", TaggerEmail: "[email protected]", Description: tagMsg}) | ||
| require.NoError(t, err) | ||
|
|
||
| // Visit the tag and verify its properties | ||
| var foundTag *doltdb.Tag | ||
| err = VisitResolvedTag(ctx, dEnv.DoltDB, tagName, func(tag *doltdb.Tag) error { | ||
| foundTag = tag | ||
| return nil | ||
| }) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, foundTag) | ||
| require.Equal(t, tagName, foundTag.Name) | ||
| require.Equal(t, tagMsg, foundTag.Meta.Description) | ||
|
|
||
| // Test visiting non-existent tag | ||
| err = VisitResolvedTag(ctx, dEnv.DoltDB, "non-existent-tag", func(tag *doltdb.Tag) error { | ||
| return nil | ||
| }) | ||
| require.Equal(t, doltdb.ErrTagNotFound, err) | ||
| } | ||
|
|
||
| func TestIterResolvedTagsPaginated(t *testing.T) { | ||
| dEnv, _ := createTestEnv() | ||
| ctx := context.Background() | ||
|
|
||
| // Initialize repo | ||
| err := dEnv.InitRepo(ctx, types.Format_Default, "test user", "[email protected]", "main") | ||
| require.NoError(t, err) | ||
|
|
||
| expectedTagNames := make([]string, DefaultPageSize*2) | ||
| // Create multiple tags with different timestamps | ||
| tagNames := make([]string, DefaultPageSize*2) | ||
| for i := range tagNames { | ||
| tagName := fmt.Sprintf("tag-%d", i) | ||
| err = CreateTag(ctx, dEnv, tagName, "main", TagProps{ | ||
| TaggerName: "test user", | ||
| TaggerEmail: "[email protected]", | ||
| Description: fmt.Sprintf("test tag %s", tagName), | ||
| }) | ||
| time.Sleep(2 * time.Millisecond) | ||
| require.NoError(t, err) | ||
| tagNames[i] = tagName | ||
| expectedTagNames[i] = tagName | ||
| } | ||
|
|
||
| // Sort expected tag names to ensure they are in the correct order | ||
| sort.Strings(expectedTagNames) | ||
|
|
||
| // Test first page | ||
| var foundTags []string | ||
| pageToken, err := IterResolvedTagsPaginated(ctx, dEnv.DoltDB, "", func(tag *doltdb.Tag) (bool, error) { | ||
| foundTags = append(foundTags, tag.Name) | ||
| return false, nil | ||
| }) | ||
| require.NoError(t, err) | ||
| require.NotEmpty(t, pageToken) // Should have next page | ||
| require.Equal(t, DefaultPageSize, len(foundTags)) // Default page size tags returned | ||
| require.Equal(t, expectedTagNames[:DefaultPageSize], foundTags) | ||
|
|
||
| // Test second page | ||
| var secondPageTags []string | ||
| nextPageToken, err := IterResolvedTagsPaginated(ctx, dEnv.DoltDB, pageToken, func(tag *doltdb.Tag) (bool, error) { | ||
| secondPageTags = append(secondPageTags, tag.Name) | ||
| return false, nil | ||
| }) | ||
|
|
||
| require.NoError(t, err) | ||
| require.Empty(t, nextPageToken) // Should be no more pages | ||
| require.Equal(t, DefaultPageSize, len(secondPageTags)) // Remaining tags | ||
| require.Equal(t, expectedTagNames[DefaultPageSize:], secondPageTags) | ||
|
|
||
| // Verify all tags were found | ||
| allFoundTags := append(foundTags, secondPageTags...) | ||
| require.Equal(t, len(tagNames), len(allFoundTags)) | ||
| require.Equal(t, expectedTagNames, allFoundTags) | ||
|
|
||
| // Test early termination | ||
| var earlyTermTags []string | ||
| _, err = IterResolvedTagsPaginated(ctx, dEnv.DoltDB, "", func(tag *doltdb.Tag) (bool, error) { | ||
| earlyTermTags = append(earlyTermTags, tag.Name) | ||
| return true, nil // Stop after first tag | ||
| }) | ||
| require.NoError(t, err) | ||
| require.Equal(t, 1, len(earlyTermTags)) | ||
| } |
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
Oops, something went wrong.