Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

increase mod version #259

Merged
merged 3 commits into from
Feb 6, 2023
Merged

increase mod version #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a47be1f
feat: upgrade module to v3 then can import v3 tag
LooJee Dec 1, 2022
eed0f70
fix: fix conflict
LooJee Feb 2, 2023
f3bad56
Update config.go
LooJee Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ default: build
build: clean fmt
@cd cmd; \
CGO_ENABLED=0 go build -ldflags "\
-X 'github.com/vesoft-inc/nebula-importer/pkg/version.GoVersion=$(shell go version)' \
-X 'github.com/vesoft-inc/nebula-importer/pkg/version.GitHash=$(shell git rev-parse HEAD)'\
-X 'github.com/vesoft-inc/nebula-importer/pkg/version.Tag=$(shell git describe --exact-match --abbrev=0 --tags | sed 's/^v//')'\
-X 'github.com/vesoft-inc/nebula-importer/v3/pkg/version.GoVersion=$(shell go version)' \
-X 'github.com/vesoft-inc/nebula-importer/v3/pkg/version.GitHash=$(shell git rev-parse HEAD)'\
-X 'github.com/vesoft-inc/nebula-importer/v3/pkg/version.Tag=$(shell git describe --exact-match --abbrev=0 --tags | sed 's/^v//')'\
" -o nebula-importer; \
mv nebula-importer ..;
@echo "nebula-importer has been outputed to $$(pwd)/nebula-importer";
Expand Down
12 changes: 6 additions & 6 deletions cmd/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"os"
"time"

"github.com/vesoft-inc/nebula-importer/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/errors"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/pkg/version"
"github.com/vesoft-inc/nebula-importer/pkg/web"
"github.com/vesoft-inc/nebula-importer/v3/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/errors"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/version"
"github.com/vesoft-inc/nebula-importer/v3/pkg/web"
)

var configuration = flag.String("config", "", "Specify importer configure file path")
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/vesoft-inc/nebula-importer
module github.com/vesoft-inc/nebula-importer/v3

require (
github.com/cenkalti/backoff/v4 v4.1.3
Expand All @@ -8,7 +8,7 @@ require (
github.com/vesoft-inc/nebula-go/v3 v3.0.0-20220425030225-cdb52399b40a
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
gopkg.in/yaml.v3 v3.0.1 // indirect
)

go 1.13
6 changes: 3 additions & 3 deletions pkg/client/clientmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package client

import (
"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type NebulaClientMgr struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/clientpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/cenkalti/backoff/v4"
nebula "github.com/vesoft-inc/nebula-go/v3"
"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

const (
Expand Down
16 changes: 8 additions & 8 deletions pkg/cmd/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"fmt"
"sync"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/client"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/errhandler"
importerError "github.com/vesoft-inc/nebula-importer/pkg/errors"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/pkg/reader"
"github.com/vesoft-inc/nebula-importer/pkg/stats"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/client"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/errhandler"
importerError "github.com/vesoft-inc/nebula-importer/v3/pkg/errors"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/reader"
"github.com/vesoft-inc/nebula-importer/v3/pkg/stats"
)

type Runner struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"
"time"

"github.com/vesoft-inc/nebula-importer/pkg/base"
ierrors "github.com/vesoft-inc/nebula-importer/pkg/errors"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/pkg/picker"
"github.com/vesoft-inc/nebula-importer/pkg/utils"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
ierrors "github.com/vesoft-inc/nebula-importer/v3/pkg/errors"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/picker"
"github.com/vesoft-inc/nebula-importer/v3/pkg/utils"
"gopkg.in/yaml.v2"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"text/template"

"github.com/stretchr/testify/assert"
"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"gopkg.in/yaml.v2"

"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

func TestYAMLParser(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/csv/errwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"strings"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type ErrWriter struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/csv/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"io"
"os"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type CSVReader struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/errhandler/datawriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package errhandler
import (
"os"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
)

type DataWriter interface {
Expand Down
8 changes: 4 additions & 4 deletions pkg/errhandler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"strings"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/csv"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/csv"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type Handler struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"runtime"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
)

type Logger interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/picker/converter-type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/vesoft-inc/nebula-importer/pkg/utils"
"github.com/vesoft-inc/nebula-importer/v3/pkg/utils"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/reader/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package reader
import (
"fmt"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
)

type Batch struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/reader/batchmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"hash/fnv"
"strings"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type BatchMgr struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/reader/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"
"time"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/csv"
"github.com/vesoft-inc/nebula-importer/pkg/errors"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/csv"
"github.com/vesoft-inc/nebula-importer/v3/pkg/errors"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type DataFileReader interface {
Expand Down
8 changes: 4 additions & 4 deletions pkg/stats/statsmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"time"

"github.com/vesoft-inc/nebula-importer/pkg/base"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/pkg/reader"
"github.com/vesoft-inc/nebula-importer/v3/pkg/base"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/reader"
)

type StatsMgr struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/web/httpserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"sync"

"github.com/vesoft-inc/nebula-importer/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/pkg/config"
"github.com/vesoft-inc/nebula-importer/pkg/errors"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/v3/pkg/config"
"github.com/vesoft-inc/nebula-importer/v3/pkg/errors"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type WebServer struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/web/taskmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package web
import (
"sync"

"github.com/vesoft-inc/nebula-importer/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/pkg/logger"
"github.com/vesoft-inc/nebula-importer/v3/pkg/cmd"
"github.com/vesoft-inc/nebula-importer/v3/pkg/logger"
)

type taskMgr struct {
Expand Down