Skip to content

Commit 7efe9bb

Browse files
committed
wip
1 parent afcb658 commit 7efe9bb

File tree

3 files changed

+534
-2
lines changed

3 files changed

+534
-2
lines changed

aerospike_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
var (
4242
hosts = flag.String("hosts", "", "Comma separated Aerospike server seed hostnames or IP addresses and ports. eg: s1:3000,s2:3000,s3:3000")
4343
host = flag.String("h", "127.0.0.1", "Aerospike server seed hostnames or IP addresses")
44-
port = flag.Int("p", 3100, "Aerospike server seed hostname or IP address port number.")
44+
port = flag.Int("p", 3000, "Aerospike server seed hostname or IP address port number.")
4545
user = flag.String("U", "", "Username.")
4646
password = flag.String("P", "", "Password.")
4747
authMode = flag.String("A", "internal", "Authentication mode: internal | external")

client.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ func (clnt *Client) GetNodeNames() []string {
315315
// If the policy is nil, the default relevant policy will be used.
316316
func (clnt *Client) PutPayload(policy *WritePolicy, key *Key, payload []byte) Error {
317317
policy = clnt.getUsableWritePolicy(policy)
318+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
318319
command, err := newWritePayloadCommand(clnt.cluster, policy, key, payload)
319320
if err != nil {
320321
return err
@@ -350,7 +351,8 @@ func (clnt *Client) Put(policy *WritePolicy, key *Key, binMap BinMap) Error {
350351
// This method avoids using the BinMap allocation and iteration and is lighter on GC.
351352
// If the policy is nil, the default relevant policy will be used.
352353
func (clnt *Client) PutBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
353-
policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
354+
policy = clnt.getUsableWritePolicy(policy)
355+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
354356

355357
if policy.Txn != nil {
356358
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -377,6 +379,7 @@ func (clnt *Client) PutBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
377379
// If the policy is nil, the default relevant policy will be used.
378380
func (clnt *Client) Append(policy *WritePolicy, key *Key, binMap BinMap) Error {
379381
policy = clnt.getUsableWritePolicy(policy)
382+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
380383

381384
if policy.Txn != nil {
382385
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -395,6 +398,7 @@ func (clnt *Client) Append(policy *WritePolicy, key *Key, binMap BinMap) Error {
395398
// AppendBins works the same as Append, but avoids BinMap allocation and iteration.
396399
func (clnt *Client) AppendBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
397400
policy = clnt.getUsableWritePolicy(policy)
401+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
398402

399403
if policy.Txn != nil {
400404
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -417,6 +421,7 @@ func (clnt *Client) AppendBins(policy *WritePolicy, key *Key, bins ...*Bin) Erro
417421
// If the policy is nil, the default relevant policy will be used.
418422
func (clnt *Client) Prepend(policy *WritePolicy, key *Key, binMap BinMap) Error {
419423
policy = clnt.getUsableWritePolicy(policy)
424+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
420425

421426
if policy.Txn != nil {
422427
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -435,6 +440,7 @@ func (clnt *Client) Prepend(policy *WritePolicy, key *Key, binMap BinMap) Error
435440
// PrependBins works the same as Prepend, but avoids BinMap allocation and iteration.
436441
func (clnt *Client) PrependBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
437442
policy = clnt.getUsableWritePolicy(policy)
443+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
438444

439445
if policy.Txn != nil {
440446
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -461,6 +467,7 @@ func (clnt *Client) PrependBins(policy *WritePolicy, key *Key, bins ...*Bin) Err
461467
// If the policy is nil, the default relevant policy will be used.
462468
func (clnt *Client) Add(policy *WritePolicy, key *Key, binMap BinMap) Error {
463469
policy = clnt.getUsableWritePolicy(policy)
470+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
464471

465472
if policy.Txn != nil {
466473
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -479,6 +486,7 @@ func (clnt *Client) Add(policy *WritePolicy, key *Key, binMap BinMap) Error {
479486
// AddBins works the same as Add, but avoids BinMap allocation and iteration.
480487
func (clnt *Client) AddBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
481488
policy = clnt.getUsableWritePolicy(policy)
489+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
482490

483491
if policy.Txn != nil {
484492
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -503,6 +511,7 @@ func (clnt *Client) AddBins(policy *WritePolicy, key *Key, bins ...*Bin) Error {
503511
// If the policy is nil, the default relevant policy will be used.
504512
func (clnt *Client) Delete(policy *WritePolicy, key *Key) (bool, Error) {
505513
policy = clnt.getUsableWritePolicy(policy)
514+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
506515

507516
if policy.Txn != nil {
508517
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {
@@ -530,6 +539,7 @@ func (clnt *Client) Delete(policy *WritePolicy, key *Key) (bool, Error) {
530539
// If the record doesn't exist, it will return an error.
531540
func (clnt *Client) Touch(policy *WritePolicy, key *Key) Error {
532541
policy = clnt.getUsableWritePolicy(policy)
542+
//policy = clnt.getUsableWritePolicyWithConfig(policy, applyConfigToWritePolicy)
533543

534544
if policy.Txn != nil {
535545
if err := txnMonitor.addKey(clnt.cluster, policy, key); err != nil {

0 commit comments

Comments
 (0)