feedback

Author: jgao54

flow/connectors/mongo/validate.go

@@ -8,15 +8,17 @@ import (
 	shared_mongo "github.com/PeerDB-io/peerdb/flow/shared/mongo"
 )
 
-const MinSupportedVersion = "5.1.0"
-
 func (c *MongoConnector) ValidateCheck(ctx context.Context) error {
-	cmp, err := shared_mongo.CompareServerVersion(ctx, c.client, MinSupportedVersion)
+	version, err := c.GetVersion(ctx)
+	if err != nil {
+		return err
+	}
+	cmp, err := shared_mongo.CompareServerVersions(version, shared_mongo.MinSupportedVersion)
 	if err != nil {
 		return err
 	}
 	if cmp == -1 {
-		return fmt.Errorf("require minimum mongo version %s", MinSupportedVersion)
+		return fmt.Errorf("require minimum mongo version %s", shared_mongo.MinSupportedVersion)
 	}
 	return nil
 }

flow/go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0
 	github.com/ClickHouse/ch-go v0.66.1
 	github.com/ClickHouse/clickhouse-go/v2 v2.37.2
-	github.com/Masterminds/semver v1.5.0
 	github.com/PeerDB-io/glua64 v1.0.1
 	github.com/PeerDB-io/gluabit32 v1.0.2
 	github.com/PeerDB-io/gluajson v1.0.2

flow/go.sum

@@ -82,8 +82,6 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.53.0/go.mod h1:jUZ5LYlw40WMd07qxcQJD5M40aUxrfwqQX1g7zxYnrQ=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/PeerDB-io/glua64 v1.0.1 h1:biXLlFF/L5pnJCwDon7hkWkuQPozC8NjKS3J7Wzi69I=
 github.com/PeerDB-io/glua64 v1.0.1/go.mod h1:UHmAhniv61bJPMhQvxkpC7jXbn353dSbQviu83bgQVg=
 github.com/PeerDB-io/gluabit32 v1.0.2 h1:AGI1Z7dwDVotakpuOOuyTX4/QGi5HUYsipL/VfodmO4=

flow/shared/mongo/util.go

@@ -0,0 +1,44 @@
+package mongo
+
+import (
+	"cmp"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+func CompareServerVersions(a, b string) (int, error) {
+	aMajor, aRest, _ := strings.Cut(a, ".")
+	bMajor, bRest, _ := strings.Cut(b, ".")
+
+	if majorCompare, err := compareSubVersion("major", aMajor, bMajor, a, b); err != nil || majorCompare != 0 {
+		return majorCompare, err
+	}
+
+	aMinor, aPatch, _ := strings.Cut(aRest, ".")
+	bMinor, bPatch, _ := strings.Cut(bRest, ".")
+
+	if minorCompare, err := compareSubVersion("minor", aMinor, bMinor, a, b); err != nil || minorCompare != 0 {
+		return minorCompare, err
+	}
+
+	return compareSubVersion("patch", aPatch, bPatch, a, b)
+}
+
+func compareSubVersion(typ, a, b, aFull, bFull string) (int, error) {
+	if a == "" || b == "" {
+		return 0, nil
+	}
+
+	var aNum, bNum int
+	var err error
+
+	if aNum, err = strconv.Atoi(a); err != nil {
+		return 0, fmt.Errorf("cannot parse %s version %s of %s", typ, a, aFull)
+	}
+	if bNum, err = strconv.Atoi(b); err != nil {
+		return 0, fmt.Errorf("cannot parse %s version %s of %s", typ, b, bFull)
+	}
+
+	return cmp.Compare(aNum, bNum), nil
+}

flow/shared/mongo/validation.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Masterminds/semver"
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
+const MinSupportedVersion = "5.1.0"
+
 type BuildInfo struct {
 	Version string `bson:"version"`
 }
@@ -30,19 +31,6 @@ func GetBuildInfo(ctx context.Context, client *mongo.Client) (*BuildInfo, error)
 	return &info, nil
 }
 
-func CompareServerVersion(ctx context.Context, client *mongo.Client, versionString string) (int, error) {
-	buildInfo, err := GetBuildInfo(ctx, client)
-	if err != nil {
-		return 0, fmt.Errorf("failed to get mongo version: %w", err)
-	}
-	parsedVersion, err := semver.NewVersion(buildInfo.Version)
-	if err != nil {
-		return 0, fmt.Errorf("failed to parse mongo version %w", err)
-	}
-	compareVersion := semver.MustParse(versionString)
-	return parsedVersion.Compare(compareVersion), nil
-}
-
 func GetReplSetGetStatus(ctx context.Context, client *mongo.Client) (*ReplSetGetStatus, error) {
 	db := client.Database("admin")
 	singleResult := db.RunCommand(ctx, bson.D{