This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry-go-libs.git
commit 330d7a450d2bca68c69e93c7f3cbeb7707ea7ccb Author: Karen Huddleston <[email protected]> AuthorDate: Mon May 20 11:47:05 2024 -0700 Remove Progress command This is only used by gpbackup/gprestore so we will remove it from here and use the new Custom function to implement a wrapper in the codebase where it is used to keep this repo more general --- gplog/gplog.go | 9 ------- gplog/gplog_test.go | 74 ----------------------------------------------------- 2 files changed, 83 deletions(-) diff --git a/gplog/gplog.go b/gplog/gplog.go index 2e84fbe..1b53a13 100644 --- a/gplog/gplog.go +++ b/gplog/gplog.go @@ -430,15 +430,6 @@ func Custom(customFileVerbosity int, customShellVerbosity int, s string, v ...in } } -/* - * Progress is a wrapper around the Custom logging function for messages that show progress as an alternative to a progress bar. - * We write them to the log file if fileVerbosity is >= LOGINFO, and we write them to stdout if shellVerbosity >= LOGVERBOSE - */ - -func Progress(s string, v ...interface{}) { - Custom(LOGINFO, LOGVERBOSE, s, v...) -} - func FatalOnError(err error, output ...string) { if err != nil { if len(output) == 0 { diff --git a/gplog/gplog_test.go b/gplog/gplog_test.go index b3869e8..0fc4ba9 100644 --- a/gplog/gplog_test.go +++ b/gplog/gplog_test.go @@ -311,15 +311,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to the log file", func() { - expectedMessage := "error progress" - gplog.Progress(expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Shell verbosity set to Info", func() { BeforeEach(func() { @@ -420,15 +411,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to the log file", func() { - expectedMessage := "info progress" - gplog.Progress(expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Shell verbosity set to Verbose", func() { BeforeEach(func() { @@ -530,15 +512,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to stdout and the log file", func() { - expectedMessage := "verbose progress" - gplog.Progress(expectedMessage) - testhelper.ExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Shell verbosity set to Debug", func() { BeforeEach(func() { @@ -639,15 +612,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to stdout and the log file", func() { - expectedMessage := "debug progress" - gplog.Progress(expectedMessage) - testhelper.ExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Shell verbosity set to Info, logfile verbosity set to Error", func() { BeforeEach(func() { @@ -761,15 +725,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("does not print", func() { - expectedMessage := "logfile error progress" - gplog.Progress(expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Shell verbosity set to Info, logfile verbosity set to Info", func() { BeforeEach(func() { @@ -883,15 +838,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to the log file", func() { - expectedMessage := "logfile info progress" - gplog.Progress(expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, verboseExpected+expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Custom Shell Prefix used - shell verbosity set to Debug", func() { BeforeEach(func() { @@ -1012,16 +958,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to stdout and the log file", func() { - expectedMessage := "debug progress" - gplog.Progress(expectedMessage) - testhelper.ExpectRegexp(stdout, expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) Describe("Custom Shell Prefix used with colorization - shell verbosity set to Debug", func() { BeforeEach(func() { @@ -1148,16 +1084,6 @@ var _ = Describe("logger/log tests", func() { testhelper.ExpectRegexp(logfile, errorExpected+expectedMessage) }) }) - Context("Progress", func() { - It("prints to stdout and the log file", func() { - expectedMessage := "debug progress" - gplog.Progress(expectedMessage) - testhelper.ExpectRegexp(stdout, expectedMessage) - testhelper.NotExpectRegexp(stdout, verboseExpected+expectedMessage) - testhelper.NotExpectRegexp(stderr, expectedMessage) - testhelper.ExpectRegexp(logfile, infoExpected+expectedMessage) - }) - }) }) }) }) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
