This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new 9e3736a refactor the project's directory structure (#7)
9e3736a is described below
commit 9e3736a89f5241adc8490b46fb772ef6df008fe1
Author: 冉小龙 <[email protected]>
AuthorDate: Wed May 15 15:34:04 2019 +0800
refactor the project's directory structure (#7)
Signed-off-by: xiaolong.ran <[email protected]>
---
perf/perf-producer.go | 1 -
{pulsar/internal => pkg}/auth/disabled.go | 0
{pulsar/internal => pkg}/auth/provider.go | 0
{pulsar/internal => pkg}/auth/tls.go | 0
{pulsar/internal => pkg}/auth/token.go | 0
{pulsar/internal => pkg}/compression/compression.go | 0
{pulsar/internal => pkg}/compression/compression_test.go | 0
{pulsar/internal => pkg}/compression/lz4.go | 0
{pulsar/internal => pkg}/compression/noop.go | 0
{pulsar/internal => pkg}/compression/zlib.go | 0
{pulsar/internal => pkg}/compression/zstd.go | 0
{pulsar/internal/pulsar_proto => pkg/pb}/PulsarApi.pb.go | 2 +-
pulsar/client.go | 2 +-
pulsar/impl_client.go | 4 ++--
pulsar/impl_message.go | 2 +-
pulsar/impl_partition_producer.go | 4 ++--
pulsar/internal/batch_builder.go | 4 ++--
pulsar/internal/commands.go | 2 +-
pulsar/internal/connection.go | 6 +++---
pulsar/internal/connection_pool.go | 2 +-
pulsar/internal/connection_reader.go | 2 +-
pulsar/internal/lookup_service.go | 2 +-
pulsar/internal/lookup_service_test.go | 2 +-
pulsar/internal/rpc_client.go | 2 +-
pulsar/producer_test.go | 2 +-
{pulsar/internal/util => util}/blocking_queue.go | 0
{pulsar/internal/util => util}/blocking_queue_test.go | 0
{pulsar/internal/util => util}/semaphore.go | 0
28 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/perf/perf-producer.go b/perf/perf-producer.go
index 9477730..f35857d 100644
--- a/perf/perf-producer.go
+++ b/perf/perf-producer.go
@@ -22,7 +22,6 @@ package main
import (
"context"
"encoding/json"
-
`github.com/Anankke/bilibili-backup/library/net/http/blademaster/middleware/rate`
"github.com/beefsack/go-rate"
"github.com/bmizerany/perks/quantile"
"github.com/spf13/cobra"
diff --git a/pulsar/internal/auth/disabled.go b/pkg/auth/disabled.go
similarity index 100%
rename from pulsar/internal/auth/disabled.go
rename to pkg/auth/disabled.go
diff --git a/pulsar/internal/auth/provider.go b/pkg/auth/provider.go
similarity index 100%
rename from pulsar/internal/auth/provider.go
rename to pkg/auth/provider.go
diff --git a/pulsar/internal/auth/tls.go b/pkg/auth/tls.go
similarity index 100%
rename from pulsar/internal/auth/tls.go
rename to pkg/auth/tls.go
diff --git a/pulsar/internal/auth/token.go b/pkg/auth/token.go
similarity index 100%
rename from pulsar/internal/auth/token.go
rename to pkg/auth/token.go
diff --git a/pulsar/internal/compression/compression.go
b/pkg/compression/compression.go
similarity index 100%
rename from pulsar/internal/compression/compression.go
rename to pkg/compression/compression.go
diff --git a/pulsar/internal/compression/compression_test.go
b/pkg/compression/compression_test.go
similarity index 100%
rename from pulsar/internal/compression/compression_test.go
rename to pkg/compression/compression_test.go
diff --git a/pulsar/internal/compression/lz4.go b/pkg/compression/lz4.go
similarity index 100%
rename from pulsar/internal/compression/lz4.go
rename to pkg/compression/lz4.go
diff --git a/pulsar/internal/compression/noop.go b/pkg/compression/noop.go
similarity index 100%
rename from pulsar/internal/compression/noop.go
rename to pkg/compression/noop.go
diff --git a/pulsar/internal/compression/zlib.go b/pkg/compression/zlib.go
similarity index 100%
rename from pulsar/internal/compression/zlib.go
rename to pkg/compression/zlib.go
diff --git a/pulsar/internal/compression/zstd.go b/pkg/compression/zstd.go
similarity index 100%
rename from pulsar/internal/compression/zstd.go
rename to pkg/compression/zstd.go
diff --git a/pulsar/internal/pulsar_proto/PulsarApi.pb.go
b/pkg/pb/PulsarApi.pb.go
similarity index 99%
rename from pulsar/internal/pulsar_proto/PulsarApi.pb.go
rename to pkg/pb/PulsarApi.pb.go
index cb82acd..1406462 100644
--- a/pulsar/internal/pulsar_proto/PulsarApi.pb.go
+++ b/pkg/pb/PulsarApi.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: PulsarApi.proto
-package pulsar_proto
+package pb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
diff --git a/pulsar/client.go b/pulsar/client.go
index 8c48cdf..3e2b2eb 100644
--- a/pulsar/client.go
+++ b/pulsar/client.go
@@ -20,7 +20,7 @@
package pulsar
import (
- "github.com/apache/pulsar-client-go/pulsar/internal/auth"
+ "github.com/apache/pulsar-client-go/pkg/auth"
"time"
)
diff --git a/pulsar/impl_client.go b/pulsar/impl_client.go
index ddcb51f..147bcfb 100644
--- a/pulsar/impl_client.go
+++ b/pulsar/impl_client.go
@@ -25,8 +25,8 @@ import (
log "github.com/sirupsen/logrus"
"net/url"
"github.com/apache/pulsar-client-go/pulsar/internal"
- "github.com/apache/pulsar-client-go/pulsar/internal/auth"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/auth"
+ "github.com/apache/pulsar-client-go/pkg/pb"
)
type client struct {
diff --git a/pulsar/impl_message.go b/pulsar/impl_message.go
index 3300913..617aee1 100644
--- a/pulsar/impl_message.go
+++ b/pulsar/impl_message.go
@@ -21,7 +21,7 @@ package pulsar
import (
"github.com/golang/protobuf/proto"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
)
type messageId struct {
diff --git a/pulsar/impl_partition_producer.go
b/pulsar/impl_partition_producer.go
index ae3a8d6..19947c1 100644
--- a/pulsar/impl_partition_producer.go
+++ b/pulsar/impl_partition_producer.go
@@ -24,8 +24,8 @@ import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
"github.com/apache/pulsar-client-go/pulsar/internal"
- "github.com/apache/pulsar-client-go/pulsar/internal/util"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/util"
+ "github.com/apache/pulsar-client-go/pkg/pb"
"sync"
"sync/atomic"
"time"
diff --git a/pulsar/internal/batch_builder.go b/pulsar/internal/batch_builder.go
index 4421c61..56cbb2e 100644
--- a/pulsar/internal/batch_builder.go
+++ b/pulsar/internal/batch_builder.go
@@ -22,8 +22,8 @@ package internal
import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pulsar/internal/compression"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/compression"
+ "github.com/apache/pulsar-client-go/pkg/pb"
"time"
)
diff --git a/pulsar/internal/commands.go b/pulsar/internal/commands.go
index 3f75e1b..7609a30 100644
--- a/pulsar/internal/commands.go
+++ b/pulsar/internal/commands.go
@@ -22,7 +22,7 @@ package internal
import (
"github.com/golang/protobuf/proto"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
log "github.com/sirupsen/logrus"
)
diff --git a/pulsar/internal/connection.go b/pulsar/internal/connection.go
index bc2dcf1..2e55d79 100644
--- a/pulsar/internal/connection.go
+++ b/pulsar/internal/connection.go
@@ -24,12 +24,12 @@ import (
"crypto/x509"
"errors"
"github.com/golang/protobuf/proto"
- log "github.com/sirupsen/logrus"
+ log "github.com/sirupsen/logrus"
"io/ioutil"
"net"
"net/url"
- "github.com/apache/pulsar-client-go/pulsar/internal/auth"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/auth"
+ "github.com/apache/pulsar-client-go/pkg/pb"
"sync"
"sync/atomic"
"time"
diff --git a/pulsar/internal/connection_pool.go
b/pulsar/internal/connection_pool.go
index 88146ac..e7d532d 100644
--- a/pulsar/internal/connection_pool.go
+++ b/pulsar/internal/connection_pool.go
@@ -22,7 +22,7 @@ package internal
import (
log "github.com/sirupsen/logrus"
"net/url"
- "github.com/apache/pulsar-client-go/pulsar/internal/auth"
+ "github.com/apache/pulsar-client-go/pkg/auth"
"sync"
)
diff --git a/pulsar/internal/connection_reader.go
b/pulsar/internal/connection_reader.go
index 347fad6..e4a1910 100644
--- a/pulsar/internal/connection_reader.go
+++ b/pulsar/internal/connection_reader.go
@@ -24,7 +24,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"io"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
)
type connectionReader struct {
diff --git a/pulsar/internal/lookup_service.go
b/pulsar/internal/lookup_service.go
index 52c162d..af8d1c1 100644
--- a/pulsar/internal/lookup_service.go
+++ b/pulsar/internal/lookup_service.go
@@ -25,7 +25,7 @@ import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
"net/url"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
)
type LookupResult struct {
diff --git a/pulsar/internal/lookup_service_test.go
b/pulsar/internal/lookup_service_test.go
index b7facaa..aea0042 100644
--- a/pulsar/internal/lookup_service_test.go
+++ b/pulsar/internal/lookup_service_test.go
@@ -23,7 +23,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
"net/url"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
"testing"
)
diff --git a/pulsar/internal/rpc_client.go b/pulsar/internal/rpc_client.go
index 4a5d72f..844639b 100644
--- a/pulsar/internal/rpc_client.go
+++ b/pulsar/internal/rpc_client.go
@@ -22,7 +22,7 @@ package internal
import (
"github.com/golang/protobuf/proto"
"net/url"
- pb "github.com/apache/pulsar-client-go/pulsar/internal/pulsar_proto"
+ "github.com/apache/pulsar-client-go/pkg/pb"
"sync"
"sync/atomic"
)
diff --git a/pulsar/producer_test.go b/pulsar/producer_test.go
index bb188ce..90e201d 100644
--- a/pulsar/producer_test.go
+++ b/pulsar/producer_test.go
@@ -23,7 +23,7 @@ import (
"context"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
- "github.com/apache/pulsar-client-go/pulsar/internal/util"
+ "github.com/apache/pulsar-client-go/util"
"sync"
"testing"
"time"
diff --git a/pulsar/internal/util/blocking_queue.go b/util/blocking_queue.go
similarity index 100%
rename from pulsar/internal/util/blocking_queue.go
rename to util/blocking_queue.go
diff --git a/pulsar/internal/util/blocking_queue_test.go
b/util/blocking_queue_test.go
similarity index 100%
rename from pulsar/internal/util/blocking_queue_test.go
rename to util/blocking_queue_test.go
diff --git a/pulsar/internal/util/semaphore.go b/util/semaphore.go
similarity index 100%
rename from pulsar/internal/util/semaphore.go
rename to util/semaphore.go
