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

GO-3855 Update tantivy to 0.0.7 #1440

Merged
merged 1 commit into from
Aug 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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ endif
### Tantivy Section

REPO := anyproto/tantivy-go
VERSION := go/v0.0.5
VERSION := v0.0.7
OUTPUT_DIR := deps/libs
SHA_FILE = tantivity_sha256.txt

Expand Down Expand Up @@ -382,4 +382,4 @@ download-tantivy-all: download-tantivy

download-tantivy-local:
@mkdir -p $(OUTPUT_DIR)
@cp -r $(TANTIVY_GO_PATH)/go/libs/ $(OUTPUT_DIR)
@cp -r $(TANTIVY_GO_PATH)/libs/ $(OUTPUT_DIR)
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/adrium/goheif v0.0.0-20230113233934-ca402e77a786
github.com/anyproto/any-sync v0.4.22
github.com/anyproto/go-naturaldate/v2 v2.0.2-0.20230524105841-9829cfd13438
github.com/anyproto/tantivy-go/go v0.0.5
github.com/anyproto/tantivy-go v0.0.7
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
github.com/avast/retry-go/v4 v4.6.0
github.com/blevesearch/bleve/v2 v2.3.10
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ github.com/anyproto/protobuf v1.3.3-0.20240201225420-6e325cf0ac38 h1:80jke82/c+b
github.com/anyproto/protobuf v1.3.3-0.20240201225420-6e325cf0ac38/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/anyproto/ristretto v0.1.2-0.20240221153107-2b23839cc50c h1:GicoaTUyB2mtCIl3YMrO0OzysqRT5GA4vuvDsqEkhSM=
github.com/anyproto/ristretto v0.1.2-0.20240221153107-2b23839cc50c/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
github.com/anyproto/tantivy-go/go v0.0.5 h1:thYpymvZBqOfbziNrUaIX/H6YB9YMfdtziId/A6zAHk=
github.com/anyproto/tantivy-go/go v0.0.5/go.mod h1:E2kRVa0DJmZSeA+VV0U8eDgpPZQ+4vHuDPn9U1cVJhU=
github.com/anyproto/tantivy-go v0.0.7 h1:sw8wuXJKZYmoULTmoqJdhsK4PYBCdTkAdSD7F89aQiI=
github.com/anyproto/tantivy-go v0.0.7/go.mod h1:Pl0zaeEX7dkVDTDKROzlLlGCVjbZHjyPrZloFuVEASc=
github.com/anyproto/zeroconf/v2 v2.2.1-0.20240228113933-f90a5cc4439d h1:5bj7nX/AS8sxGpTIrapE7PC4oPlhkHMwMqXlJbUHBlg=
github.com/anyproto/zeroconf/v2 v2.2.1-0.20240228113933-f90a5cc4439d/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
Expand Down
2 changes: 1 addition & 1 deletion pkg/lib/localstore/ftsearch/autobatchertantivy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ftsearch
import (
"fmt"

"github.com/anyproto/tantivy-go/go/tantivy"
tantivy "github.com/anyproto/tantivy-go"
"github.com/blevesearch/bleve/v2/search"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/lib/localstore/ftsearch/ftsearchtantivy.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import (
"time"

"github.com/anyproto/any-sync/app"
"github.com/anyproto/tantivy-go/go/tantivy"
_ "github.com/anyproto/tantivy-go/go/tantivy"
tantivy "github.com/anyproto/tantivy-go"
"github.com/blevesearch/bleve/v2/search"
"github.com/samber/lo"
"github.com/valyala/fastjson"
Expand Down
20 changes: 10 additions & 10 deletions tantivity_sha256.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
005bf5dd4e7270ec84fc85f5559700974ef6594e5382d170940145b979cf5e81 deps/libs/android-386.tar.gz
7a6d6bdd32fe1f402448f038e3bdea8be3b14649e23eb9584c57a39388a08974 deps/libs/android-amd64.tar.gz
bba0f8fbd335bf2bf3e199a5b25784634e6dce559907df24f138a9c1055d4d6b deps/libs/android-arm.tar.gz
7fcef555cbda92bd5213d246adac1c9a4099329c80666b32e61ffd5652f16943 deps/libs/android-arm64.tar.gz
663e124b6d6fde676938832734b351a72d6c92ba2711dde603da656f6ceffb11 deps/libs/darwin-amd64.tar.gz
18e870e8775c2124968a449704f44270e1963f38f4714275cedf1401668e395d deps/libs/darwin-arm64.tar.gz
9f11dc4af6105c09c605c68a2c6424749dc3059ee8bb721910733a447bbd7f1b deps/libs/ios-amd64.tar.gz
767116cb5a6d720e4f6b7f2c9fc9c214e2fa87bb770344ee4a8ff8ce36cb4508 deps/libs/ios-arm64.tar.gz
21300999484bcc610cdf640a96ebd6fef196629b9e49f0023955aa311b539712 deps/libs/linux-amd64-musl.tar.gz
61d5d96a80130e838c6c5a59c83f7936ec4f203c7892643c153c1c138a92dfc6 deps/libs/windows-amd64.tar.gz
31eaddb2ce286ff3c8b9fe01781adaa2f8fd7db759d01c5fab2f655cb85202bb deps/libs/android-386.tar.gz
011be437ffd1498aa295191f0c5f44d30de5ec7dc293f28f57d3acc311a59168 deps/libs/android-amd64.tar.gz
93864215777aba8451ee6ba09a3b2fc2b0582273b166a7f43ecc54e00b37615b deps/libs/android-arm.tar.gz
3a7a5ed4b205d4dafe12dc2cac592cf1f37f5a0f6c99a471365db70eda19effb deps/libs/android-arm64.tar.gz
d9fcba7ec18aaf6e59d06e0ef8011de45df578b7617a566ce38fbe764ebfa0ed deps/libs/darwin-amd64.tar.gz
5d8a1600029c1544bebc6ee0d35098ff8d1242056a23b041da739e5197185557 deps/libs/darwin-arm64.tar.gz
0222fa5e850ddc1641ea9138107138ba754254c577f77b43c1b5bfb11c264610 deps/libs/ios-amd64.tar.gz
e3adc97753f1b8fa95e4d2e37385da2c710dd40ba7706af34303af5bce69506c deps/libs/ios-arm64.tar.gz
f88cff214cc0bb01f2cf7b6e54ca617cce1eac6393decf2d86c6d24f0b903df0 deps/libs/linux-amd64-musl.tar.gz
cb29b5328e9b09d99342b936812903410a1864196486d2edd5cc9028bba9c0a2 deps/libs/windows-amd64.tar.gz
Loading