[GITEA] Vendor rupture dependency

- The [rupture](https://github.com/ethantkoenig/rupture) dependency was
essentially outdated in the sense it was using old version of
dependencies.
- The usage by Forgejo was rather a small portion, so that portion is
now vendored (with its tests).
- Removes old dependencies from go.sum (less dependencies is better for
reviewing what the heck we're importing). Just to note that they were
likely not being used by Go's build process (according to
https://go.dev/ref/mod#minimal-version-selection), so it's really a
matter of formal cleaning up dependencies we don't use and therefor
don't want to download and be in our go.sum.

(cherry picked from commit aa72a5f009b5027b2324106343f91b466ba46293)

Conflicts:
	go.sum
	https://codeberg.org/forgejo/forgejo/pulls/2148
(cherry picked from commit fbe8d65f0b1836b2e771991b4d5d12f1bfa938ed)
(cherry picked from commit e18debcb6a9476f60d364e847265b4ac7fb76c8e)

Conflicts:
	go.sum
	https://codeberg.org/forgejo/forgejo/pulls/2245
(cherry picked from commit 8c43c2ada82102a0df44fd874c4f5fe3a36ef758)
This commit is contained in:
Gusted 2024-01-08 15:53:32 +01:00 committed by Earl Warren
parent c070935f13
commit 8735fcdb7d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
7 changed files with 85 additions and 70 deletions

View file

@ -12,7 +12,6 @@ import (
"github.com/blevesearch/bleve/v2"
"github.com/blevesearch/bleve/v2/mapping"
"github.com/ethantkoenig/rupture"
)
var _ internal.Indexer = &Indexer{}
@ -69,7 +68,7 @@ func (i *Indexer) Init(_ context.Context) (bool, error) {
return false, err
}
if err = rupture.WriteIndexMetadata(i.indexDir, &rupture.IndexMetadata{
if err = writeIndexMetadata(i.indexDir, &IndexMetadata{
Version: i.version,
}); err != nil {
return false, err

View file

@ -0,0 +1,55 @@
// Copyright 2024 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT
// Copied and modified from https://github.com/ethantkoenig/rupture (MIT License)
package bleve
import (
"os"
"path/filepath"
"code.gitea.io/gitea/modules/json"
)
const metaFilename = "rupture_meta.json"
func indexMetadataPath(dir string) string {
return filepath.Join(dir, metaFilename)
}
// IndexMetadata contains metadata about a bleve index.
type IndexMetadata struct {
// The version of the data in the index. This can be useful for tracking
// schema changes or data migrations.
Version int `json:"version"`
}
// readIndexMetadata returns the metadata for the index at the specified path.
// If no such index metadata exists, an empty metadata and a nil error are
// returned.
func readIndexMetadata(path string) (*IndexMetadata, error) {
meta := &IndexMetadata{}
metaPath := indexMetadataPath(path)
if _, err := os.Stat(metaPath); os.IsNotExist(err) {
return meta, nil
} else if err != nil {
return nil, err
}
metaBytes, err := os.ReadFile(metaPath)
if err != nil {
return nil, err
}
return meta, json.Unmarshal(metaBytes, &meta)
}
// writeIndexMetadata writes metadata for the index at the specified path.
func writeIndexMetadata(path string, meta *IndexMetadata) error {
metaBytes, err := json.Marshal(meta)
if err != nil {
return err
}
return os.WriteFile(indexMetadataPath(path), metaBytes, 0o644)
}

View file

@ -0,0 +1,27 @@
// Copyright 2024 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT
// Copied and modified from https://github.com/ethantkoenig/rupture (MIT License)
package bleve
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestMetadata(t *testing.T) {
dir := t.TempDir()
meta, err := readIndexMetadata(dir)
assert.NoError(t, err)
assert.Equal(t, &IndexMetadata{}, meta)
meta.Version = 24
assert.NoError(t, writeIndexMetadata(dir, meta))
meta, err = readIndexMetadata(dir)
assert.NoError(t, err)
assert.EqualValues(t, 24, meta.Version)
}

View file

@ -12,7 +12,6 @@ import (
"github.com/blevesearch/bleve/v2"
"github.com/blevesearch/bleve/v2/index/upsidedown"
"github.com/ethantkoenig/rupture"
)
// openIndexer open the index at the specified path, checking for metadata
@ -26,7 +25,7 @@ func openIndexer(path string, latestVersion int) (bleve.Index, int, error) {
return nil, 0, err
}
metadata, err := rupture.ReadIndexMetadata(path)
metadata, err := readIndexMetadata(path)
if err != nil {
return nil, 0, err
}