You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/05/14 16:34:10 UTC
[pulsar-client-go] 33/38: Renamed `impl` package to `internal`
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
commit d6dbcfa0037e899417d1cf5536849bf918de8d26
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue May 7 16:38:57 2019 -0700
Renamed `impl` package to `internal`
---
pulsar/impl_client.go | 22 +++++++++++-----------
pulsar/impl_message.go | 2 +-
pulsar/impl_partition_producer.go | 20 ++++++++++----------
pulsar/impl_producer.go | 12 ++++++------
pulsar/{impl => internal}/backoff.go | 2 +-
pulsar/{impl => internal}/batch_builder.go | 6 +++---
pulsar/{impl => internal}/buffer.go | 2 +-
pulsar/{impl => internal}/buffer_test.go | 2 +-
pulsar/{impl => internal}/checksum.go | 2 +-
pulsar/{impl => internal}/closable.go | 2 +-
pulsar/{impl => internal}/commands.go | 4 ++--
pulsar/{impl => internal}/commands_test.go | 2 +-
.../{impl => internal}/compression/compression.go | 0
.../compression/compression_test.go | 0
pulsar/{impl => internal}/compression/lz4.go | 0
pulsar/{impl => internal}/compression/noop.go | 0
pulsar/{impl => internal}/compression/zlib.go | 0
pulsar/{impl => internal}/compression/zstd.go | 0
pulsar/{impl => internal}/connection.go | 4 ++--
pulsar/{impl => internal}/connection_pool.go | 2 +-
pulsar/{impl => internal}/connection_reader.go | 4 ++--
pulsar/{impl => internal}/default_router.go | 2 +-
pulsar/{impl => internal}/default_router_test.go | 2 +-
pulsar/{impl => internal}/hash.go | 2 +-
pulsar/{impl => internal}/hash_test.go | 2 +-
pulsar/{impl => internal}/lookup_service.go | 4 ++--
pulsar/{impl => internal}/lookup_service_test.go | 4 ++--
pulsar/{ => internal}/pulsar_proto/PulsarApi.pb.go | 0
pulsar/{impl => internal}/rpc_client.go | 4 ++--
pulsar/{impl => internal}/topic_name.go | 2 +-
pulsar/{impl => internal}/topic_name_test.go | 2 +-
pulsar/{impl => internal}/util/blocking_queue.go | 0
.../{impl => internal}/util/blocking_queue_test.go | 0
pulsar/{impl => internal}/util/semaphore.go | 0
pulsar/{impl => internal}/utils.go | 2 +-
pulsar/producer_test.go | 2 +-
36 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/pulsar/impl_client.go b/pulsar/impl_client.go
index 89b955d..0db2ee8 100644
--- a/pulsar/impl_client.go
+++ b/pulsar/impl_client.go
@@ -23,18 +23,18 @@ import (
"fmt"
log "github.com/sirupsen/logrus"
"net/url"
- "pulsar-client-go/pulsar/impl"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ "pulsar-client-go/pulsar/internal"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
)
type client struct {
options ClientOptions
- cnxPool impl.ConnectionPool
- rpcClient impl.RpcClient
- lookupService impl.LookupService
+ cnxPool internal.ConnectionPool
+ rpcClient internal.RpcClient
+ lookupService internal.LookupService
- handlers map[impl.Closable]bool
+ handlers map[internal.Closable]bool
producerIdGenerator uint64
consumerIdGenerator uint64
}
@@ -55,11 +55,11 @@ func newClient(options ClientOptions) (Client, error) {
}
c := &client{
- cnxPool: impl.NewConnectionPool(),
+ cnxPool: internal.NewConnectionPool(),
}
- c.rpcClient = impl.NewRpcClient(url, c.cnxPool)
- c.lookupService = impl.NewLookupService(c.rpcClient, url)
- c.handlers = make(map[impl.Closable]bool)
+ c.rpcClient = internal.NewRpcClient(url, c.cnxPool)
+ c.lookupService = internal.NewLookupService(c.rpcClient, url)
+ c.handlers = make(map[internal.Closable]bool)
return c, nil
}
@@ -82,7 +82,7 @@ func (client *client) CreateReader(options ReaderOptions) (Reader, error) {
}
func (client *client) TopicPartitions(topic string) ([]string, error) {
- topicName, err := impl.ParseTopicName(topic)
+ topicName, err := internal.ParseTopicName(topic)
if err != nil {
return nil, err
}
diff --git a/pulsar/impl_message.go b/pulsar/impl_message.go
index 24f3f30..b73445f 100644
--- a/pulsar/impl_message.go
+++ b/pulsar/impl_message.go
@@ -21,7 +21,7 @@ package pulsar
import (
"github.com/golang/protobuf/proto"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
)
type messageId struct {
diff --git a/pulsar/impl_partition_producer.go b/pulsar/impl_partition_producer.go
index 41e7702..0e38fa6 100644
--- a/pulsar/impl_partition_producer.go
+++ b/pulsar/impl_partition_producer.go
@@ -23,9 +23,9 @@ import (
"context"
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
- "pulsar-client-go/pulsar/impl"
- "pulsar-client-go/pulsar/impl/util"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ "pulsar-client-go/pulsar/internal"
+ "pulsar-client-go/pulsar/internal/util"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
"sync"
"sync/atomic"
"time"
@@ -45,12 +45,12 @@ type partitionProducer struct {
client *client
topic string
log *log.Entry
- cnx impl.Connection
+ cnx internal.Connection
options *ProducerOptions
producerName *string
producerId uint64
- batchBuilder *impl.BatchBuilder
+ batchBuilder *internal.BatchBuilder
sequenceIdGenerator *uint64
batchFlushTicker *time.Ticker
@@ -140,7 +140,7 @@ func (p *partitionProducer) grabCnx() error {
p.producerName = res.Response.ProducerSuccess.ProducerName
if p.batchBuilder == nil {
- p.batchBuilder = impl.NewBatchBuilder(p.options.BatchingMaxMessages, *p.producerName,
+ p.batchBuilder = internal.NewBatchBuilder(p.options.BatchingMaxMessages, *p.producerName,
p.producerId, pb.CompressionType(p.options.CompressionType))
}
if p.sequenceIdGenerator == nil {
@@ -170,7 +170,7 @@ func (p *partitionProducer) ConnectionClosed() {
func (p *partitionProducer) reconnectToBroker() {
p.log.Info("Reconnecting to broker")
- backoff := impl.Backoff{}
+ backoff := internal.Backoff{}
for {
if p.state != producerReady {
// Producer is already closing
@@ -231,7 +231,7 @@ func (p *partitionProducer) internalSend(request *sendRequest) {
}
if msg.EventTime != nil {
- smm.EventTime = proto.Uint64(impl.TimestampMillis(*msg.EventTime))
+ smm.EventTime = proto.Uint64(internal.TimestampMillis(*msg.EventTime))
}
if msg.Key != "" {
@@ -239,10 +239,10 @@ func (p *partitionProducer) internalSend(request *sendRequest) {
}
if msg.Properties != nil {
- smm.Properties = impl.ConvertFromStringMap(msg.Properties)
+ smm.Properties = internal.ConvertFromStringMap(msg.Properties)
}
- sequenceId := impl.GetAndAdd(p.sequenceIdGenerator, 1)
+ sequenceId := internal.GetAndAdd(p.sequenceIdGenerator, 1)
if sendAsBatch {
for ; p.batchBuilder.Add(smm, sequenceId, msg.Payload, request, msg.ReplicationClusters) == false; {
diff --git a/pulsar/impl_producer.go b/pulsar/impl_producer.go
index c379531..afe8b3a 100644
--- a/pulsar/impl_producer.go
+++ b/pulsar/impl_producer.go
@@ -21,7 +21,7 @@ package pulsar
import (
"context"
- "pulsar-client-go/pulsar/impl"
+ "pulsar-client-go/pulsar/internal"
)
type producer struct {
@@ -33,11 +33,11 @@ type producer struct {
func getHashingFunction(s HashingScheme) func(string) uint32 {
switch s {
case JavaStringHash:
- return impl.JavaStringHash
+ return internal.JavaStringHash
case Murmur3_32Hash:
- return impl.Murmur3_32Hash
+ return internal.Murmur3_32Hash
default:
- return impl.JavaStringHash
+ return internal.JavaStringHash
}
}
@@ -51,8 +51,8 @@ func newProducer(client *client, options *ProducerOptions) (*producer, error) {
}
if options.MessageRouter == nil {
- internalRouter := impl.NewDefaultRouter(
- impl.NewSystemClock(),
+ internalRouter := internal.NewDefaultRouter(
+ internal.NewSystemClock(),
getHashingFunction(options.HashingScheme),
options.BatchingMaxPublishDelay)
p.messageRouter = func(message *ProducerMessage, metadata TopicMetadata) int {
diff --git a/pulsar/impl/backoff.go b/pulsar/internal/backoff.go
similarity index 98%
rename from pulsar/impl/backoff.go
rename to pulsar/internal/backoff.go
index 3e7629e..94a185e 100644
--- a/pulsar/impl/backoff.go
+++ b/pulsar/internal/backoff.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"time"
diff --git a/pulsar/impl/batch_builder.go b/pulsar/internal/batch_builder.go
similarity index 97%
rename from pulsar/impl/batch_builder.go
rename to pulsar/internal/batch_builder.go
index a3b41a2..5c18850 100644
--- a/pulsar/impl/batch_builder.go
+++ b/pulsar/internal/batch_builder.go
@@ -17,13 +17,13 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
- "pulsar-client-go/pulsar/impl/compression"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ "pulsar-client-go/pulsar/internal/compression"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
"time"
)
diff --git a/pulsar/impl/buffer.go b/pulsar/internal/buffer.go
similarity index 99%
rename from pulsar/impl/buffer.go
rename to pulsar/internal/buffer.go
index bf92b8f..cadf041 100644
--- a/pulsar/impl/buffer.go
+++ b/pulsar/internal/buffer.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"encoding/binary"
diff --git a/pulsar/impl/buffer_test.go b/pulsar/internal/buffer_test.go
similarity index 98%
rename from pulsar/impl/buffer_test.go
rename to pulsar/internal/buffer_test.go
index e6ace40..72a9ee8 100644
--- a/pulsar/impl/buffer_test.go
+++ b/pulsar/internal/buffer_test.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"testing"
diff --git a/pulsar/impl/checksum.go b/pulsar/internal/checksum.go
similarity index 98%
rename from pulsar/impl/checksum.go
rename to pulsar/internal/checksum.go
index 906c4dc..eba1460 100644
--- a/pulsar/impl/checksum.go
+++ b/pulsar/internal/checksum.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import "hash/crc32"
diff --git a/pulsar/impl/closable.go b/pulsar/internal/closable.go
similarity index 98%
rename from pulsar/impl/closable.go
rename to pulsar/internal/closable.go
index 3805556..77801a4 100644
--- a/pulsar/impl/closable.go
+++ b/pulsar/internal/closable.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
type Closable interface {
Close() error
diff --git a/pulsar/impl/commands.go b/pulsar/internal/commands.go
similarity index 98%
rename from pulsar/impl/commands.go
rename to pulsar/internal/commands.go
index 949d56d..b375817 100644
--- a/pulsar/impl/commands.go
+++ b/pulsar/internal/commands.go
@@ -17,12 +17,12 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
)
const MaxFrameSize = 5 * 1024 * 1024
diff --git a/pulsar/impl/commands_test.go b/pulsar/internal/commands_test.go
similarity index 98%
rename from pulsar/impl/commands_test.go
rename to pulsar/internal/commands_test.go
index a1f08a8..7f510f1 100644
--- a/pulsar/impl/commands_test.go
+++ b/pulsar/internal/commands_test.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/stretchr/testify/assert"
diff --git a/pulsar/impl/compression/compression.go b/pulsar/internal/compression/compression.go
similarity index 100%
rename from pulsar/impl/compression/compression.go
rename to pulsar/internal/compression/compression.go
diff --git a/pulsar/impl/compression/compression_test.go b/pulsar/internal/compression/compression_test.go
similarity index 100%
rename from pulsar/impl/compression/compression_test.go
rename to pulsar/internal/compression/compression_test.go
diff --git a/pulsar/impl/compression/lz4.go b/pulsar/internal/compression/lz4.go
similarity index 100%
rename from pulsar/impl/compression/lz4.go
rename to pulsar/internal/compression/lz4.go
diff --git a/pulsar/impl/compression/noop.go b/pulsar/internal/compression/noop.go
similarity index 100%
rename from pulsar/impl/compression/noop.go
rename to pulsar/internal/compression/noop.go
diff --git a/pulsar/impl/compression/zlib.go b/pulsar/internal/compression/zlib.go
similarity index 100%
rename from pulsar/impl/compression/zlib.go
rename to pulsar/internal/compression/zlib.go
diff --git a/pulsar/impl/compression/zstd.go b/pulsar/internal/compression/zstd.go
similarity index 100%
rename from pulsar/impl/compression/zstd.go
rename to pulsar/internal/compression/zstd.go
diff --git a/pulsar/impl/connection.go b/pulsar/internal/connection.go
similarity index 99%
rename from pulsar/impl/connection.go
rename to pulsar/internal/connection.go
index aa1c809..affa8cc 100644
--- a/pulsar/impl/connection.go
+++ b/pulsar/internal/connection.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"errors"
@@ -25,7 +25,7 @@ import (
log "github.com/sirupsen/logrus"
"net"
"net/url"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
"sync"
"sync/atomic"
"time"
diff --git a/pulsar/impl/connection_pool.go b/pulsar/internal/connection_pool.go
similarity index 99%
rename from pulsar/impl/connection_pool.go
rename to pulsar/internal/connection_pool.go
index 474f2f8..4b56484 100644
--- a/pulsar/impl/connection_pool.go
+++ b/pulsar/internal/connection_pool.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
log "github.com/sirupsen/logrus"
diff --git a/pulsar/impl/connection_reader.go b/pulsar/internal/connection_reader.go
similarity index 98%
rename from pulsar/impl/connection_reader.go
rename to pulsar/internal/connection_reader.go
index fd753d1..836d7ce 100644
--- a/pulsar/impl/connection_reader.go
+++ b/pulsar/internal/connection_reader.go
@@ -17,14 +17,14 @@
// under the License.
//
-package impl
+package internal
import (
"bufio"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
"io"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
)
type connectionReader struct {
diff --git a/pulsar/impl/default_router.go b/pulsar/internal/default_router.go
similarity index 99%
rename from pulsar/impl/default_router.go
rename to pulsar/internal/default_router.go
index 20db625..cbdff53 100644
--- a/pulsar/impl/default_router.go
+++ b/pulsar/internal/default_router.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"math/rand"
diff --git a/pulsar/impl/default_router_test.go b/pulsar/internal/default_router_test.go
similarity index 99%
rename from pulsar/impl/default_router_test.go
rename to pulsar/internal/default_router_test.go
index 8cad90d..0134c99 100644
--- a/pulsar/impl/default_router_test.go
+++ b/pulsar/internal/default_router_test.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/stretchr/testify/assert"
diff --git a/pulsar/impl/hash.go b/pulsar/internal/hash.go
similarity index 98%
rename from pulsar/impl/hash.go
rename to pulsar/internal/hash.go
index 61f580b..5ec7df8 100644
--- a/pulsar/impl/hash.go
+++ b/pulsar/internal/hash.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import "github.com/spaolacci/murmur3"
diff --git a/pulsar/impl/hash_test.go b/pulsar/internal/hash_test.go
similarity index 98%
rename from pulsar/impl/hash_test.go
rename to pulsar/internal/hash_test.go
index b4f41d5..79c4c62 100644
--- a/pulsar/impl/hash_test.go
+++ b/pulsar/internal/hash_test.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/stretchr/testify/assert"
diff --git a/pulsar/impl/lookup_service.go b/pulsar/internal/lookup_service.go
similarity index 98%
rename from pulsar/impl/lookup_service.go
rename to pulsar/internal/lookup_service.go
index 13c74a7..1ec8841 100644
--- a/pulsar/impl/lookup_service.go
+++ b/pulsar/internal/lookup_service.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"errors"
@@ -25,7 +25,7 @@ import (
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
"net/url"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
)
type LookupResult struct {
diff --git a/pulsar/impl/lookup_service_test.go b/pulsar/internal/lookup_service_test.go
similarity index 99%
rename from pulsar/impl/lookup_service_test.go
rename to pulsar/internal/lookup_service_test.go
index a5e8cb0..7e0d148 100644
--- a/pulsar/impl/lookup_service_test.go
+++ b/pulsar/internal/lookup_service_test.go
@@ -17,13 +17,13 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
"net/url"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
"testing"
)
diff --git a/pulsar/pulsar_proto/PulsarApi.pb.go b/pulsar/internal/pulsar_proto/PulsarApi.pb.go
similarity index 100%
rename from pulsar/pulsar_proto/PulsarApi.pb.go
rename to pulsar/internal/pulsar_proto/PulsarApi.pb.go
diff --git a/pulsar/impl/rpc_client.go b/pulsar/internal/rpc_client.go
similarity index 98%
rename from pulsar/impl/rpc_client.go
rename to pulsar/internal/rpc_client.go
index 32be5b6..2281def 100644
--- a/pulsar/impl/rpc_client.go
+++ b/pulsar/internal/rpc_client.go
@@ -17,12 +17,12 @@
// under the License.
//
-package impl
+package internal
import (
"github.com/golang/protobuf/proto"
"net/url"
- pb "pulsar-client-go/pulsar/pulsar_proto"
+ pb "pulsar-client-go/pulsar/internal/pulsar_proto"
"sync"
"sync/atomic"
)
diff --git a/pulsar/impl/topic_name.go b/pulsar/internal/topic_name.go
similarity index 99%
rename from pulsar/impl/topic_name.go
rename to pulsar/internal/topic_name.go
index 7b284ef..6cee520 100644
--- a/pulsar/impl/topic_name.go
+++ b/pulsar/internal/topic_name.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"errors"
diff --git a/pulsar/impl/topic_name_test.go b/pulsar/internal/topic_name_test.go
similarity index 99%
rename from pulsar/impl/topic_name_test.go
rename to pulsar/internal/topic_name_test.go
index 7095edb..f1339a5 100644
--- a/pulsar/impl/topic_name_test.go
+++ b/pulsar/internal/topic_name_test.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"testing"
diff --git a/pulsar/impl/util/blocking_queue.go b/pulsar/internal/util/blocking_queue.go
similarity index 100%
rename from pulsar/impl/util/blocking_queue.go
rename to pulsar/internal/util/blocking_queue.go
diff --git a/pulsar/impl/util/blocking_queue_test.go b/pulsar/internal/util/blocking_queue_test.go
similarity index 100%
rename from pulsar/impl/util/blocking_queue_test.go
rename to pulsar/internal/util/blocking_queue_test.go
diff --git a/pulsar/impl/util/semaphore.go b/pulsar/internal/util/semaphore.go
similarity index 100%
rename from pulsar/impl/util/semaphore.go
rename to pulsar/internal/util/semaphore.go
diff --git a/pulsar/impl/utils.go b/pulsar/internal/utils.go
similarity index 98%
rename from pulsar/impl/utils.go
rename to pulsar/internal/utils.go
index b9b9b08..30837d6 100644
--- a/pulsar/impl/utils.go
+++ b/pulsar/internal/utils.go
@@ -17,7 +17,7 @@
// under the License.
//
-package impl
+package internal
import (
"sync/atomic"
diff --git a/pulsar/producer_test.go b/pulsar/producer_test.go
index 318d811..5d781a3 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"
- "pulsar-client-go/pulsar/impl/util"
+ "pulsar-client-go/pulsar/internal/util"
"sync"
"testing"
"time"