From 5b1ab8e090ec916ba06a48e802e050b48c26d839 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Sat, 22 Feb 2025 15:25:27 -0800 Subject: [PATCH 1/2] servercfg: Add always-disabled AutoGCConfig to get doltgresql compiling. --- go.mod | 4 ++-- go.sum | 8 ++++---- servercfg/config.go | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index a3586b0958..e86f89b883 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/PuerkitoBio/goquery v1.8.1 github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a github.com/cockroachdb/errors v1.7.5 - github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01 + github.com/dolthub/dolt/go v0.40.5-0.20250222232749-36b39dfc25f5 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 - github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93 + github.com/dolthub/go-mysql-server v0.19.1-0.20250221004930-c799663bc359 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 github.com/dolthub/vitess v0.0.0-20250214225328-a0ed4612b41c github.com/fatih/color v1.13.0 diff --git a/go.sum b/go.sum index 1439f98443..de3227b9cd 100644 --- a/go.sum +++ b/go.sum @@ -214,8 +214,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01 h1:jYxiS8l5o5nCKaMURWh3YT+e7m2qjezw/v1dUlToCSA= -github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01/go.mod h1:avbJMbn3PDVuFGFL20ggP/b+34lSM+orqmxs04Geq4o= +github.com/dolthub/dolt/go v0.40.5-0.20250222232749-36b39dfc25f5 h1:BLQlQndHGNZhEdWZL3GAjxSN7MpMrzzlugfM5leKYfE= +github.com/dolthub/dolt/go v0.40.5-0.20250222232749-36b39dfc25f5/go.mod h1:LGdyv8dv8K5ZlMOxsc3NMNdxYCXGf/Pmh629Wlmv308= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d h1:gO9+wrmNHXukPNCO1tpfCcXIdMlW/qppbUStfLvqz/U= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= @@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93 h1:RYb18gXSJFgch5pjwQTeacNm4S+PNKXutENF5wK5gqw= -github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93/go.mod h1:JTlrabhq5TJqvlL+J3NKlm0EzTHQQugUAH6yAxWi4Ww= +github.com/dolthub/go-mysql-server v0.19.1-0.20250221004930-c799663bc359 h1:DqetmUevI80StSLWDY0+TYm8q4ghDEY8peUYMneUqe8= +github.com/dolthub/go-mysql-server v0.19.1-0.20250221004930-c799663bc359/go.mod h1:JTlrabhq5TJqvlL+J3NKlm0EzTHQQugUAH6yAxWi4Ww= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= diff --git a/servercfg/config.go b/servercfg/config.go index 5b2f9ce017..e7be894cc9 100755 --- a/servercfg/config.go +++ b/servercfg/config.go @@ -102,6 +102,14 @@ type DoltgresBehaviorConfig struct { DoltTransactionCommit *bool `yaml:"dolt_transaction_commit,omitempty" minver:"0.7.4"` } +// Implements dolt servercfg.AutoGCBehavior. +type DoltgresAutoGCBehavior struct { +} + +func (DoltgresAutoGCBehavior) Enable() bool { + return false +} + type DoltgresUserConfig struct { Name *string `yaml:"name,omitempty" minver:"0.7.4"` Password *string `yaml:"password,omitempty" minver:"0.7.4"` @@ -447,6 +455,10 @@ func (cfg *DoltgresConfig) EventSchedulerStatus() string { return "OFF" } +func (cfg *DoltgresConfig) AutoGCBehavior() servercfg.AutoGCBehavior { + return DoltgresAutoGCBehavior{} +} + func (cfg *DoltgresConfig) ValueSet(value string) bool { switch value { case readTimeoutKey: From 99595888a5f1fcc23a44004fb963842eddc71fea Mon Sep 17 00:00:00 2001 From: reltuk Date: Mon, 24 Feb 2025 23:46:47 +0000 Subject: [PATCH 2/2] [ga-bump-dep] Bump dependency in Doltgres by reltuk --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index a3586b0958..0f6d209f4e 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/PuerkitoBio/goquery v1.8.1 github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a github.com/cockroachdb/errors v1.7.5 - github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01 + github.com/dolthub/dolt/go v0.40.5-0.20250224234500-b557065e66fb github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 - github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93 + github.com/dolthub/go-mysql-server v0.19.1-0.20250224212452-a3d336db732b github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 github.com/dolthub/vitess v0.0.0-20250214225328-a0ed4612b41c github.com/fatih/color v1.13.0 diff --git a/go.sum b/go.sum index 1439f98443..41056477d3 100644 --- a/go.sum +++ b/go.sum @@ -214,8 +214,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01 h1:jYxiS8l5o5nCKaMURWh3YT+e7m2qjezw/v1dUlToCSA= -github.com/dolthub/dolt/go v0.40.5-0.20250217160730-872b69e2af01/go.mod h1:avbJMbn3PDVuFGFL20ggP/b+34lSM+orqmxs04Geq4o= +github.com/dolthub/dolt/go v0.40.5-0.20250224234500-b557065e66fb h1:rN3ajYBeyo8bZ+zZCUvlciYYE+fj0hz+5vrRQSuKCJ4= +github.com/dolthub/dolt/go v0.40.5-0.20250224234500-b557065e66fb/go.mod h1:XPnBzUbFsZXbLolK6aCWuLWa/J+OGTJw+3OeuKEnT0Q= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d h1:gO9+wrmNHXukPNCO1tpfCcXIdMlW/qppbUStfLvqz/U= github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20241119094239-f4e529af734d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= @@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93 h1:RYb18gXSJFgch5pjwQTeacNm4S+PNKXutENF5wK5gqw= -github.com/dolthub/go-mysql-server v0.19.1-0.20250214230802-dc03db8b1d93/go.mod h1:JTlrabhq5TJqvlL+J3NKlm0EzTHQQugUAH6yAxWi4Ww= +github.com/dolthub/go-mysql-server v0.19.1-0.20250224212452-a3d336db732b h1:5/NOX/GNuXLYLJY5NPSgQaPW5M7aOr1wEmL4ataRI1o= +github.com/dolthub/go-mysql-server v0.19.1-0.20250224212452-a3d336db732b/go.mod h1:JTlrabhq5TJqvlL+J3NKlm0EzTHQQugUAH6yAxWi4Ww= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=