From de9892237ebd3cc6aa9a04c8a24270b6ddabdfcb Mon Sep 17 00:00:00 2001
From: Aaron Son <aaron@dolthub.com>
Date: Tue, 31 Jan 2023 14:23:40 -0800
Subject: [PATCH] go/libraries/doltcore/sqle/dprocedures: Do not register
 dolt_gc.

---
 .../doltcore/sqle/dprocedures/init.go         |  9 +-
 .../sqle/enginetest/dolt_engine_test.go       |  1 +
 .../enginetest/dolt_transaction_queries.go    | 84 +++++++++----------
 .../bats/garbage_collection.bats              |  6 +-
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/go/libraries/doltcore/sqle/dprocedures/init.go b/go/libraries/doltcore/sqle/dprocedures/init.go
index 918fdc4dfd..0cb36dccea 100644
--- a/go/libraries/doltcore/sqle/dprocedures/init.go
+++ b/go/libraries/doltcore/sqle/dprocedures/init.go
@@ -31,7 +31,10 @@ var DoltProcedures = []sql.ExternalStoredProcedureDetails{
 	{Name: "dolt_commit_hash_out", Schema: stringSchema("hash"), Function: doltCommitHashOut},
 	{Name: "dolt_conflicts_resolve", Schema: int64Schema("status"), Function: doltConflictsResolve},
 	{Name: "dolt_fetch", Schema: int64Schema("success"), Function: doltFetch},
-	{Name: "dolt_gc", Schema: int64Schema("success"), Function: doltGC},
+
+	// dolt_gc is disabled for now.
+//	{Name: "dolt_gc", Schema: int64Schema("success"), Function: doltGC},
+
 	{Name: "dolt_merge", Schema: int64Schema("fast_forward", "conflicts"), Function: doltMerge},
 	{Name: "dolt_pull", Schema: int64Schema("fast_forward", "conflicts"), Function: doltPull},
 	{Name: "dolt_push", Schema: int64Schema("success"), Function: doltPush},
@@ -51,7 +54,9 @@ var DoltProcedures = []sql.ExternalStoredProcedureDetails{
 	{Name: "dclone", Schema: int64Schema("status"), Function: doltClone},
 	{Name: "dcommit", Schema: stringSchema("hash"), Function: doltCommit},
 	{Name: "dfetch", Schema: int64Schema("success"), Function: doltFetch},
-	{Name: "dgc", Schema: int64Schema("status"), Function: doltGC},
+
+//	{Name: "dgc", Schema: int64Schema("status"), Function: doltGC},
+
 	{Name: "dmerge", Schema: int64Schema("fast_forward", "conflicts"), Function: doltMerge},
 	{Name: "dpull", Schema: int64Schema("fast_forward", "conflicts"), Function: doltPull},
 	{Name: "dpush", Schema: int64Schema("success"), Function: doltPush},
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
index d0264b7241..04ec314d0e 100644
--- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
@@ -1018,6 +1018,7 @@ func TestDoltReset(t *testing.T) {
 }
 
 func TestDoltGC(t *testing.T) {
+	t.SkipNow()
 	for _, script := range DoltGC {
 		enginetest.TestScript(t, newDoltHarness(t), script)
 	}
diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go
index c6f9f370a8..b17a122597 100755
--- a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go
+++ b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_queries.go
@@ -1698,46 +1698,46 @@ var DoltConstraintViolationTransactionTests = []queries.TransactionTest{
 			},
 		},
 	},
-	{
-		Name:        "Run GC concurrently with other transactions",
-		SetUpScript: gcSetup(),
-		Assertions: []queries.ScriptTestAssertion{
-			{
-				Query:    "/* client a */ SELECT count(*) FROM t;",
-				Expected: []sql.Row{{250}},
-			},
-			{
-				Query:    "/* client a */ START TRANSACTION",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "/* client b */ START TRANSACTION",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "/* client a */ CALL DOLT_GC();",
-				Expected: []sql.Row{{1}},
-			},
-			{
-				Query:    "/* client b */ INSERT into t VALUES (300);",
-				Expected: []sql.Row{{types.NewOkResult(1)}},
-			},
-			{
-				Query:    "/* client a */ COMMIT;",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "/* client b */ COMMIT;",
-				Expected: []sql.Row{},
-			},
-			{
-				Query:    "/* client a */ SELECT count(*) FROM t;",
-				Expected: []sql.Row{{251}},
-			},
-			{
-				Query:    "/* client b */ SELECT count(*) FROM t;",
-				Expected: []sql.Row{{251}},
-			},
-		},
-	},
+//	{
+//		Name:        "Run GC concurrently with other transactions",
+//		SetUpScript: gcSetup(),
+//		Assertions: []queries.ScriptTestAssertion{
+//			{
+//				Query:    "/* client a */ SELECT count(*) FROM t;",
+//				Expected: []sql.Row{{250}},
+//			},
+//			{
+//				Query:    "/* client a */ START TRANSACTION",
+//				Expected: []sql.Row{},
+//			},
+//			{
+//				Query:    "/* client b */ START TRANSACTION",
+//				Expected: []sql.Row{},
+//			},
+//			{
+//				Query:    "/* client a */ CALL DOLT_GC();",
+//				Expected: []sql.Row{{1}},
+//			},
+//			{
+//				Query:    "/* client b */ INSERT into t VALUES (300);",
+//				Expected: []sql.Row{{types.NewOkResult(1)}},
+//			},
+//			{
+//				Query:    "/* client a */ COMMIT;",
+//				Expected: []sql.Row{},
+//			},
+//			{
+//				Query:    "/* client b */ COMMIT;",
+//				Expected: []sql.Row{},
+//			},
+//			{
+//				Query:    "/* client a */ SELECT count(*) FROM t;",
+//				Expected: []sql.Row{{251}},
+//			},
+//			{
+//				Query:    "/* client b */ SELECT count(*) FROM t;",
+//				Expected: []sql.Row{{251}},
+//			},
+//		},
+//	},
 }
diff --git a/integration-tests/bats/garbage_collection.bats b/integration-tests/bats/garbage_collection.bats
index a8bbe03b2a..026821bef2 100644
--- a/integration-tests/bats/garbage_collection.bats
+++ b/integration-tests/bats/garbage_collection.bats
@@ -321,6 +321,8 @@ skip_if_chunk_journal() {
 }
 
 @test "garbage_collection: online gc" {
+    skip "dolt_gc is currently disabled"
+
     dolt sql <<SQL
 CREATE TABLE test (pk int PRIMARY KEY);
 INSERT INTO test VALUES (1),(2),(3),(4),(5);
@@ -347,6 +349,8 @@ SQL
 }
 
 @test "garbage_collection: online shallow gc" {
+    skip "dolt_gc is currently disabled"
+
     skip_if_chunk_journal
     create_many_commits
 
@@ -367,4 +371,4 @@ SQL
     echo "$BEFORE"
     echo "$AFTER"
     [ "$BEFORE" -gt "$AFTER" ]
-}
\ No newline at end of file
+}