Skip to content

Commit

Permalink
230 dockter 1 (#231)
Browse files Browse the repository at this point in the history 
* #230 Savepoint

* #230 Tests for errant Senzing construction/destruction

* #230 Prepare for versioned release

* #230 Prepare for versioned release

* #230 Prepare for versioned release
  • Loading branch information
@docktermj
docktermj authored Aug 27, 2024
1 parent 86624cd commit db79b6d
Show file tree
Hide file tree
Showing 11 changed files with 158 additions and 79 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [0.8.1] - 2024-08-27

### Changed in 0.8.1

- Modify method calls to match Senzing API 4.0.0-24237

## [0.8.0] - 2024-08-22

### Changed in 0.8.0
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ require (
github.com/senzing-garage/go-observing v0.3.2
github.com/senzing-garage/sz-sdk-go v0.14.0
github.com/stretchr/testify v1.9.0
golang.org/x/text v0.17.0
)

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ github.com/senzing-garage/sz-sdk-go v0.14.0 h1:Pv+CGgl3qFmaksMlzkcMATdFplnWZi3oF
github.com/senzing-garage/sz-sdk-go v0.14.0/go.mod h1:pr9d622FPNGFPgAFooCcUWNeh+AEyVDkvR3Fmsp6whg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 h1:XQMA2e105XNlEZ8NRF0HqnUOZzP14sUSsgL09kpdNnU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
Expand Down
3 changes: 0 additions & 3 deletions main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import (
"github.com/stretchr/testify/require"
)

/*
* The unit tests in this file simulate command line invocation.
*/
func TestMain(test *testing.T) {
_ = test
main()
Expand Down
2 changes: 2 additions & 0 deletions makefiles/linux.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ setup-osarch-specific:

.PHONY: test-osarch-specific
test-osarch-specific:
@go test -v -p 1 ./szengine -run TestSzengine_Destroy_multipleEngines
@go test -json -v -p 1 ./... 2>&1 | tee /tmp/gotest.log | gotestfmt


# -----------------------------------------------------------------------------
# Makefile targets supported only by this platform.
# -----------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions szconfig/szconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package szconfig

/*
#include <stdlib.h>
#include "libSzconfig.h"
#include "gohelpers/Szlang_helpers.h"
#include "libSzConfig.h"
#include "gohelpers/SzLang_helpers.h"
#cgo CFLAGS: -g -I/opt/senzing/er/sdk/c
#cgo windows CFLAGS: -g -I"C:/Program Files/Senzing/er/sdk/c"
#cgo LDFLAGS: -L/opt/senzing/er/lib -lSz
Expand Down Expand Up @@ -461,7 +461,7 @@ func (client *Szconfig) addDataSource(ctx context.Context, configHandle uintptr,
err = client.newError(ctx, 4001, configHandle, dataSourceCode, result.returnCode, result)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand Down Expand Up @@ -529,7 +529,7 @@ func (client *Szconfig) save(ctx context.Context, configHandle uintptr) (string,
err = client.newError(ctx, 4010, configHandle, result.returnCode, result)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand All @@ -544,7 +544,7 @@ func (client *Szconfig) listDataSources(ctx context.Context, configHandle uintpt
err = client.newError(ctx, 4008, configHandle, result.returnCode)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand Down
8 changes: 4 additions & 4 deletions szconfigmanager/szconfigmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package szconfigmanager

/*
#include <stdlib.h>
#include "libSzconfigmgr.h"
#include "gohelpers/Szlang_helpers.h"
#include "libSzConfigMgr.h"
#include "gohelpers/SzLang_helpers.h"
#cgo CFLAGS: -g -I/opt/senzing/er/sdk/c
#cgo windows CFLAGS: -g -I"C:/Program Files/Senzing/er/sdk/c"
#cgo LDFLAGS: -L/opt/senzing/er/lib -lSz
Expand Down Expand Up @@ -461,7 +461,7 @@ func (client *Szconfigmanager) getConfig(ctx context.Context, configID int64) (s
err = client.newError(ctx, 4003, configID, result.returnCode, result)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand All @@ -476,7 +476,7 @@ func (client *Szconfigmanager) getConfigList(ctx context.Context) (string, error
err = client.newError(ctx, 4004, result.returnCode, result)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand Down
10 changes: 5 additions & 5 deletions szdiagnostic/szdiagnostic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package szdiagnostic

/*
#include <stdlib.h>
#include "libSzdiagnostic.h"
#include "libSzDiagnostic.h"
#include "libSz.h"
#include "gohelpers/Szlang_helpers.h"
#include "gohelpers/SzLang_helpers.h"
#cgo CFLAGS: -g -I/opt/senzing/er/sdk/c
#cgo windows CFLAGS: -g -I"C:/Program Files/Senzing/er/sdk/c"
#cgo LDFLAGS: -L/opt/senzing/er/lib -lSz
Expand Down Expand Up @@ -398,7 +398,7 @@ func (client *Szdiagnostic) checkDatastorePerformance(ctx context.Context, secon
err = client.newError(ctx, 4001, secondsToRun, result.returnCode)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand All @@ -425,7 +425,7 @@ func (client *Szdiagnostic) getDatastoreInfo(ctx context.Context) (string, error
err = client.newError(ctx, 4003, result.returnCode)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand All @@ -440,7 +440,7 @@ func (client *Szdiagnostic) getFeature(ctx context.Context, featureID int64) (st
err = client.newError(ctx, 4004, featureID, result)
}
resultResponse = C.GoString(result.response)
C.G2GoHelper_free(unsafe.Pointer(result.response))
C.SzHelper_free(unsafe.Pointer(result.response))
return resultResponse, err
}

Expand Down
Loading

0 comments on commit db79b6d

Please sign in to comment.