working commit

Makefile.am

@@ -5,21 +5,21 @@ SUFFIXES = .go
 OBJEXT= none
 
 
-sbin_PROGRAMS = mbased mbasedump mbaserestore mbaseadmin 
+sbin_PROGRAMS = mbased mbasedump  mbaseadmin 
 bin_PROGRAMS = mbasectl 
 
 mbased_SOURCES = cmd/mbased/main.go
 mbased$(EXEEXT): $(mbased_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbased$(EXEEXT) $(mbased_SOURCES)
 
-mbasedump_SOURCES = cmd/mbasedump/maindump.go
+mbasedump_SOURCES = \
+	cmd/mbasedump/printr.go \
+	cmd/mbasedump/main.go \
+	cmd/mbasedump/util.go
+
 mbasedump$(EXEEXT): $(mbasedump_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbasedump$(EXEEXT) $(mbasedump_SOURCES)
 
-mbaserestore_SOURCES = cmd/mbaserestore/mainrestore.go
-mbaserestore$(EXEEXT): $(mbaserestore_SOURCES) $(EXTRA_mbased_SOURCES)
-	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbaserestore$(EXEEXT) $(mbaserestore_SOURCES)
-
 mbasectl_SOURCES = cmd/mbasectl/main.go \
 	cmd/mbasectl/account.go \
 	cmd/mbasectl/grant.go \

Makefile.in

@@ -90,8 +90,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-sbin_PROGRAMS = mbased$(EXEEXT) mbasedump$(EXEEXT) \
+sbin_PROGRAMS = mbased$(EXEEXT) mbasedump$(EXEEXT) mbaseadmin$(EXEEXT)
-	mbaserestore$(EXEEXT) mbaseadmin$(EXEEXT)
 bin_PROGRAMS = mbasectl$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -120,9 +119,6 @@ mbased_LDADD = $(LDADD)
 am_mbasedump_OBJECTS =
 mbasedump_OBJECTS = $(am_mbasedump_OBJECTS)
 mbasedump_LDADD = $(LDADD)
-am_mbaserestore_OBJECTS =
-mbaserestore_OBJECTS = $(am_mbaserestore_OBJECTS)
-mbaserestore_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -151,11 +147,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(mbaseadmin_SOURCES) $(mbasectl_SOURCES) $(mbased_SOURCES) \
-	$(EXTRA_mbased_SOURCES) $(mbasedump_SOURCES) \
+	$(EXTRA_mbased_SOURCES) $(mbasedump_SOURCES)
-	$(mbaserestore_SOURCES)
 DIST_SOURCES = $(mbaseadmin_SOURCES) $(mbasectl_SOURCES) \
-	$(mbased_SOURCES) $(EXTRA_mbased_SOURCES) $(mbasedump_SOURCES) \
+	$(mbased_SOURCES) $(EXTRA_mbased_SOURCES) $(mbasedump_SOURCES)
-	$(mbaserestore_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -327,8 +321,11 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo
 SUFFIXES = .go
 mbased_SOURCES = cmd/mbased/main.go
-mbasedump_SOURCES = cmd/mbasedump/maindump.go
+mbasedump_SOURCES = \
-mbaserestore_SOURCES = cmd/mbaserestore/mainrestore.go
+	cmd/mbasedump/printr.go \
+	cmd/mbasedump/main.go \
+	cmd/mbasedump/util.go
+
 mbasectl_SOURCES = cmd/mbasectl/main.go \
 	cmd/mbasectl/account.go \
 	cmd/mbasectl/grant.go \
@@ -859,10 +856,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
 
 mbased$(EXEEXT): $(mbased_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbased$(EXEEXT) $(mbased_SOURCES)
+
 mbasedump$(EXEEXT): $(mbasedump_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbasedump$(EXEEXT) $(mbasedump_SOURCES)
-mbaserestore$(EXEEXT): $(mbaserestore_SOURCES) $(EXTRA_mbased_SOURCES)
-	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbaserestore$(EXEEXT) $(mbaserestore_SOURCES)
 
 mbasectl$(EXEEXT): $(mbasectl_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mbasectl$(EXEEXT) $(mbasectl_SOURCES)

app/handler/handler.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"mbase/app/logic"
-	"mbase/pkg/mbctl"
 	"mbase/pkg/logger"
+	"mbase/pkg/mbctl"
 
 	"google.golang.org/grpc"
 )

cmd/mbasedump/util.go

@@ -4,11 +4,11 @@
 package main
 
 import (
-	"os"
+	"bytes"
-	"path/filepath"
 	"context"
 	"io"
-        "bytes"
+	"os"
+	"path/filepath"
 
 	"mbase/app/config"
 	"mbase/app/database"
@@ -16,8 +16,8 @@ import (
 	"mbase/pkg/auxtool"
 	"mbase/pkg/logger"
 
-        "go.yaml.in/yaml/v4"
 	"github.com/spf13/cobra"
+	"go.yaml.in/yaml/v4"
 )
 
 type Util struct {
@@ -81,7 +81,7 @@ func (util *Util) DumpDatabase(cmd *cobra.Command, args []string) {
 type dumpDatabaseParams struct {
 	Filename string
 }
-type dumpDatabaseResult struct {}
+type dumpDatabaseResult struct{}
 
 func (util *Util) dumpDatabase(params dumpDatabaseParams) (dumpDatabaseResult, error) {
 	var err error
@@ -137,7 +137,6 @@ func (util *Util) dumpDatabase(params dumpDatabaseParams) (dumpDatabaseResult, e
 	return res, err
 }
 
-
 func (util *Util) RestoreDatabase(cmd *cobra.Command, args []string) {
 	util.restoreDatabaseParams.Filename = args[0]
 	res, err := util.restoreDatabase(util.restoreDatabaseParams)
@@ -148,7 +147,7 @@ type restoreDatabaseParams struct {
 	Filename         string
 	DeleteAllRecords bool
 }
-type restoreDatabaseResult struct {}
+type restoreDatabaseResult struct{}
 
 func (util *Util) restoreDatabase(params restoreDatabaseParams) (restoreDatabaseResult, error) {
 	var err error
@@ -214,7 +213,3 @@ func (util *Util) restoreDatabase(params restoreDatabaseParams) (restoreDatabase
 	}
 	return res, err
 }
-
-
-
-

pkg/logger/logger.go

@@ -31,7 +31,6 @@ func NewLogger(subj string) *Logger {
 	}
 }
 
-
 func SetWriter(newOut io.WriteCloser) {
 	mtx.Lock()
 	output = newOut

pkg/logger/logger_test.go

@@ -4,8 +4,8 @@
 package logger
 
 import (
-	"testing"
 	"os"
+	"testing"
 
 	"github.com/stretchr/testify/require"
 )