From 9b7ed67311018e937f5533c618ee1921b150e34f Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 21 Oct 2025 11:43:22 -0700 Subject: [PATCH] Switch to seaweedfs/cockroachdb-parser directly Removed the replace directive and updated all references to use github.com/seaweedfs/cockroachdb-parser directly instead of redirecting from github.com/cockroachdb/cockroachdb-parser. Changes: - Updated import in weed/query/engine/cockroach_parser.go - Removed replace directive from go.mod - Now using seaweedfs/cockroachdb-parser@909763b17138 which includes all 32-bit architecture fixes and uses seaweedfs namespace throughout Build verified successfully for GOOS=openbsd GOARCH=arm. --- go.mod | 4 +--- go.sum | 4 ++-- weed/query/engine/cockroach_parser.go | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 8b63b2456..153ebad0e 100644 --- a/go.mod +++ b/go.mod @@ -129,7 +129,6 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.31.3 github.com/aws/aws-sdk-go-v2/credentials v1.18.10 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3 - github.com/cockroachdb/cockroachdb-parser v0.25.2 github.com/cognusion/imaging v1.0.2 github.com/fluent/fluent-logger-golang v1.10.1 github.com/getsentry/sentry-go v0.35.3 @@ -401,6 +400,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect github.com/samber/lo v1.51.0 // indirect + github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect github.com/smartystreets/goconvey v1.8.1 // indirect github.com/sony/gobreaker v1.0.0 // indirect @@ -465,5 +465,3 @@ require ( ) // replace github.com/seaweedfs/raft => /Users/chrislu/go/src/github.com/seaweedfs/raft - -replace github.com/cockroachdb/cockroachdb-parser => github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e diff --git a/go.sum b/go.sum index 0c4b7f531..db3541d52 100644 --- a/go.sum +++ b/go.sum @@ -1623,8 +1623,8 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA= github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec= -github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e h1:CDKaiOOEslsh0eARMVDJubE1FoI1IQ57NwpuDvfSJ0s= -github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0= +github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 h1:bX1vBF7GQjPeFQsCAZ8gCQGS/nJQnekL7gZ4Qg/pF4E= +github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0= github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30= github.com/seaweedfs/goexif v1.0.3/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk= github.com/seaweedfs/raft v1.1.3 h1:5B6hgneQ7IuU4Ceom/f6QUt8pEeqjcsRo+IxlyPZCws= diff --git a/weed/query/engine/cockroach_parser.go b/weed/query/engine/cockroach_parser.go index 79fd2d94b..20db9cb4d 100644 --- a/weed/query/engine/cockroach_parser.go +++ b/weed/query/engine/cockroach_parser.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser" - "github.com/cockroachdb/cockroachdb-parser/pkg/sql/sem/tree" + "github.com/seaweedfs/cockroachdb-parser/pkg/sql/parser" + "github.com/seaweedfs/cockroachdb-parser/pkg/sql/sem/tree" ) // CockroachSQLParser wraps CockroachDB's PostgreSQL-compatible SQL parser for use in SeaweedFS