Skip to content

Commit f1c68d5

Browse files
docktermjdocktermj
authored
180.dockter.1 (#188)
* #180 Prepare for versioned release * #180 Fix Examples * #180 Removed deprecated functions
1 parent 75332c4 commit f1c68d5

File tree

7 files changed

+35
-893
lines changed

7 files changed

+35
-893
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
-
1212

13+
## [0.5.0] - 2023-09-25
14+
15+
### Changed in 0.5.0
16+
17+
- Supports SenzingAPI 3.8.0
18+
- Deprecated functions have been removed
19+
1320
## [0.4.15] - 2023-09-01
1421

1522
### Changed in 0.4.15

‎g2diagnosticserver/g2diagnosticserver.go

-259
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package g2diagnosticserver
33
import (
44
"context"
55
"fmt"
6-
"strconv"
76
"sync"
87
"time"
98

@@ -92,22 +91,6 @@ func (server *G2DiagnosticServer) CheckDBPerf(ctx context.Context, request *g2pb
9291
return &response, err
9392
}
9493

95-
func (server *G2DiagnosticServer) CloseEntityListBySize(ctx context.Context, request *g2pb.CloseEntityListBySizeRequest) (*g2pb.CloseEntityListBySizeResponse, error) {
96-
var err error = nil
97-
if server.isTrace {
98-
entryTime := time.Now()
99-
server.traceEntry(5, request)
100-
defer func() { server.traceExit(6, request, err, time.Since(entryTime)) }()
101-
}
102-
g2diagnostic := getG2diagnostic()
103-
entityListBySizeHandleInt, err := strconv.ParseUint(request.GetEntityListBySizeHandle(), 10, 64)
104-
if err == nil {
105-
err = g2diagnostic.CloseEntityListBySize(ctx, uintptr(entityListBySizeHandleInt))
106-
}
107-
response := g2pb.CloseEntityListBySizeResponse{}
108-
return &response, err
109-
}
110-
11194
func (server *G2DiagnosticServer) Destroy(ctx context.Context, request *g2pb.DestroyRequest) (*g2pb.DestroyResponse, error) {
11295
var err error = nil
11396
if server.isTrace {
@@ -123,41 +106,6 @@ func (server *G2DiagnosticServer) Destroy(ctx context.Context, request *g2pb.Des
123106
return &response, err
124107
}
125108

126-
func (server *G2DiagnosticServer) FetchNextEntityBySize(ctx context.Context, request *g2pb.FetchNextEntityBySizeRequest) (*g2pb.FetchNextEntityBySizeResponse, error) {
127-
var err error = nil
128-
var result string = ""
129-
if server.isTrace {
130-
entryTime := time.Now()
131-
server.traceEntry(9, request)
132-
defer func() { server.traceExit(10, request, result, err, time.Since(entryTime)) }()
133-
}
134-
g2diagnostic := getG2diagnostic()
135-
entityListBySizeHandleInt, err := strconv.ParseUint(request.GetEntityListBySizeHandle(), 10, 64)
136-
if err == nil {
137-
result, err = g2diagnostic.FetchNextEntityBySize(ctx, uintptr(entityListBySizeHandleInt))
138-
}
139-
response := g2pb.FetchNextEntityBySizeResponse{
140-
Result: result,
141-
}
142-
return &response, err
143-
}
144-
145-
func (server *G2DiagnosticServer) FindEntitiesByFeatureIDs(ctx context.Context, request *g2pb.FindEntitiesByFeatureIDsRequest) (*g2pb.FindEntitiesByFeatureIDsResponse, error) {
146-
var err error = nil
147-
var result string
148-
if server.isTrace {
149-
entryTime := time.Now()
150-
server.traceEntry(11, request)
151-
defer func() { server.traceExit(12, request, result, err, time.Since(entryTime)) }()
152-
}
153-
g2diagnostic := getG2diagnostic()
154-
result, err = g2diagnostic.FindEntitiesByFeatureIDs(ctx, request.GetFeatures())
155-
response := g2pb.FindEntitiesByFeatureIDsResponse{
156-
Result: result,
157-
}
158-
return &response, err
159-
}
160-
161109
func (server *G2DiagnosticServer) GetAvailableMemory(ctx context.Context, request *g2pb.GetAvailableMemoryRequest) (*g2pb.GetAvailableMemoryResponse, error) {
162110
var err error = nil
163111
var result int64
@@ -174,22 +122,6 @@ func (server *G2DiagnosticServer) GetAvailableMemory(ctx context.Context, reques
174122
return &response, err
175123
}
176124

177-
func (server *G2DiagnosticServer) GetDataSourceCounts(ctx context.Context, request *g2pb.GetDataSourceCountsRequest) (*g2pb.GetDataSourceCountsResponse, error) {
178-
var err error = nil
179-
var result string
180-
if server.isTrace {
181-
entryTime := time.Now()
182-
server.traceEntry(15, request)
183-
defer func() { server.traceExit(16, request, result, err, time.Since(entryTime)) }()
184-
}
185-
g2diagnostic := getG2diagnostic()
186-
result, err = g2diagnostic.GetDataSourceCounts(ctx)
187-
response := g2pb.GetDataSourceCountsResponse{
188-
Result: result,
189-
}
190-
return &response, err
191-
}
192-
193125
func (server *G2DiagnosticServer) GetDBInfo(ctx context.Context, request *g2pb.GetDBInfoRequest) (*g2pb.GetDBInfoResponse, error) {
194126
var err error = nil
195127
var result string
@@ -206,102 +138,6 @@ func (server *G2DiagnosticServer) GetDBInfo(ctx context.Context, request *g2pb.G
206138
return &response, err
207139
}
208140

209-
func (server *G2DiagnosticServer) GetEntityDetails(ctx context.Context, request *g2pb.GetEntityDetailsRequest) (*g2pb.GetEntityDetailsResponse, error) {
210-
var err error = nil
211-
var result string
212-
if server.isTrace {
213-
entryTime := time.Now()
214-
server.traceEntry(19, request)
215-
defer func() { server.traceExit(20, request, result, err, time.Since(entryTime)) }()
216-
}
217-
g2diagnostic := getG2diagnostic()
218-
result, err = g2diagnostic.GetEntityDetails(ctx, request.GetEntityID(), int(request.GetIncludeInternalFeatures()))
219-
response := g2pb.GetEntityDetailsResponse{
220-
Result: result,
221-
}
222-
return &response, err
223-
}
224-
225-
func (server *G2DiagnosticServer) GetEntityListBySize(ctx context.Context, request *g2pb.GetEntityListBySizeRequest) (*g2pb.GetEntityListBySizeResponse, error) {
226-
var err error = nil
227-
var result uintptr
228-
if server.isTrace {
229-
entryTime := time.Now()
230-
server.traceEntry(21, request)
231-
defer func() { server.traceExit(22, request, result, err, time.Since(entryTime)) }()
232-
}
233-
g2diagnostic := getG2diagnostic()
234-
result, err = g2diagnostic.GetEntityListBySize(ctx, int(request.GetEntitySize()))
235-
response := g2pb.GetEntityListBySizeResponse{
236-
Result: fmt.Sprintf("%v", result),
237-
}
238-
return &response, err
239-
}
240-
241-
func (server *G2DiagnosticServer) GetEntityResume(ctx context.Context, request *g2pb.GetEntityResumeRequest) (*g2pb.GetEntityResumeResponse, error) {
242-
var err error = nil
243-
var result string
244-
if server.isTrace {
245-
entryTime := time.Now()
246-
server.traceEntry(23, request)
247-
defer func() { server.traceExit(24, request, result, err, time.Since(entryTime)) }()
248-
}
249-
g2diagnostic := getG2diagnostic()
250-
result, err = g2diagnostic.GetEntityResume(ctx, request.GetEntityID())
251-
response := g2pb.GetEntityResumeResponse{
252-
Result: result,
253-
}
254-
return &response, err
255-
}
256-
257-
func (server *G2DiagnosticServer) GetEntitySizeBreakdown(ctx context.Context, request *g2pb.GetEntitySizeBreakdownRequest) (*g2pb.GetEntitySizeBreakdownResponse, error) {
258-
var err error = nil
259-
var result string
260-
if server.isTrace {
261-
entryTime := time.Now()
262-
server.traceEntry(25, request)
263-
defer func() { server.traceExit(26, request, result, err, time.Since(entryTime)) }()
264-
}
265-
g2diagnostic := getG2diagnostic()
266-
result, err = g2diagnostic.GetEntitySizeBreakdown(ctx, int(request.GetMinimumEntitySize()), int(request.GetIncludeInternalFeatures()))
267-
response := g2pb.GetEntitySizeBreakdownResponse{
268-
Result: result,
269-
}
270-
return &response, err
271-
}
272-
273-
func (server *G2DiagnosticServer) GetFeature(ctx context.Context, request *g2pb.GetFeatureRequest) (*g2pb.GetFeatureResponse, error) {
274-
var err error = nil
275-
var result string
276-
if server.isTrace {
277-
entryTime := time.Now()
278-
server.traceEntry(27, request)
279-
defer func() { server.traceExit(28, request, result, err, time.Since(entryTime)) }()
280-
}
281-
g2diagnostic := getG2diagnostic()
282-
result, err = g2diagnostic.GetFeature(ctx, request.GetLibFeatID())
283-
response := g2pb.GetFeatureResponse{
284-
Result: result,
285-
}
286-
return &response, err
287-
}
288-
289-
func (server *G2DiagnosticServer) GetGenericFeatures(ctx context.Context, request *g2pb.GetGenericFeaturesRequest) (*g2pb.GetGenericFeaturesResponse, error) {
290-
var err error = nil
291-
var result string
292-
if server.isTrace {
293-
entryTime := time.Now()
294-
server.traceEntry(29, request)
295-
defer func() { server.traceExit(30, request, result, err, time.Since(entryTime)) }()
296-
}
297-
g2diagnostic := getG2diagnostic()
298-
result, err = g2diagnostic.GetGenericFeatures(ctx, request.GetFeatureType(), int(request.GetMaximumEstimatedCount()))
299-
response := g2pb.GetGenericFeaturesResponse{
300-
Result: result,
301-
}
302-
return &response, err
303-
}
304-
305141
func (server *G2DiagnosticServer) GetLogicalCores(ctx context.Context, request *g2pb.GetLogicalCoresRequest) (*g2pb.GetLogicalCoresResponse, error) {
306142
var err error = nil
307143
var result int
@@ -318,22 +154,6 @@ func (server *G2DiagnosticServer) GetLogicalCores(ctx context.Context, request *
318154
return &response, err
319155
}
320156

321-
func (server *G2DiagnosticServer) GetMappingStatistics(ctx context.Context, request *g2pb.GetMappingStatisticsRequest) (*g2pb.GetMappingStatisticsResponse, error) {
322-
var err error = nil
323-
var result string
324-
if server.isTrace {
325-
entryTime := time.Now()
326-
server.traceEntry(37, request)
327-
defer func() { server.traceExit(38, request, result, err, time.Since(entryTime)) }()
328-
}
329-
g2diagnostic := getG2diagnostic()
330-
result, err = g2diagnostic.GetMappingStatistics(ctx, int(request.GetIncludeInternalFeatures()))
331-
response := g2pb.GetMappingStatisticsResponse{
332-
Result: result,
333-
}
334-
return &response, err
335-
}
336-
337157
func (server *G2DiagnosticServer) GetObserverOrigin(ctx context.Context) string {
338158
var err error = nil
339159
if server.isTrace {
@@ -361,38 +181,6 @@ func (server *G2DiagnosticServer) GetPhysicalCores(ctx context.Context, request
361181
return &response, err
362182
}
363183

364-
func (server *G2DiagnosticServer) GetRelationshipDetails(ctx context.Context, request *g2pb.GetRelationshipDetailsRequest) (*g2pb.GetRelationshipDetailsResponse, error) {
365-
var err error = nil
366-
var result string
367-
if server.isTrace {
368-
entryTime := time.Now()
369-
server.traceEntry(41, request)
370-
defer func() { server.traceExit(42, request, result, err, time.Since(entryTime)) }()
371-
}
372-
g2diagnostic := getG2diagnostic()
373-
result, err = g2diagnostic.GetRelationshipDetails(ctx, request.GetRelationshipID(), int(request.GetIncludeInternalFeatures()))
374-
response := g2pb.GetRelationshipDetailsResponse{
375-
Result: result,
376-
}
377-
return &response, err
378-
}
379-
380-
func (server *G2DiagnosticServer) GetResolutionStatistics(ctx context.Context, request *g2pb.GetResolutionStatisticsRequest) (*g2pb.GetResolutionStatisticsResponse, error) {
381-
var err error = nil
382-
var result string
383-
if server.isTrace {
384-
entryTime := time.Now()
385-
server.traceEntry(43, request)
386-
defer func() { server.traceExit(44, request, result, err, time.Since(entryTime)) }()
387-
}
388-
g2diagnostic := getG2diagnostic()
389-
result, err = g2diagnostic.GetResolutionStatistics(ctx)
390-
response := g2pb.GetResolutionStatisticsResponse{
391-
Result: result,
392-
}
393-
return &response, err
394-
}
395-
396184
func (server *G2DiagnosticServer) GetTotalSystemMemory(ctx context.Context, request *g2pb.GetTotalSystemMemoryRequest) (*g2pb.GetTotalSystemMemoryResponse, error) {
397185
var err error = nil
398186
var result int64
@@ -497,53 +285,6 @@ func (server *G2DiagnosticServer) SetObserverOrigin(ctx context.Context, origin
497285
g2diagnostic.SetObserverOrigin(ctx, origin)
498286
}
499287

500-
func (server *G2DiagnosticServer) StreamEntityListBySize(request *g2pb.StreamEntityListBySizeRequest, stream g2pb.G2Diagnostic_StreamEntityListBySizeServer) (err error) {
501-
if server.isTrace {
502-
server.traceEntry(163, request)
503-
}
504-
ctx := stream.Context()
505-
entryTime := time.Now()
506-
g2diagnostic := getG2diagnostic()
507-
508-
entitiesFetched := 0
509-
510-
//get the query handle
511-
var queryHandle uintptr
512-
queryHandle, err = g2diagnostic.GetEntityListBySize(ctx, int(request.GetEntitySize()))
513-
if err != nil {
514-
return err
515-
}
516-
517-
defer func() {
518-
err = g2diagnostic.CloseEntityListBySize(ctx, queryHandle)
519-
if server.isTrace {
520-
server.traceExit(165, request, entitiesFetched, err, time.Since(entryTime))
521-
}
522-
}()
523-
524-
for {
525-
var fetchResult string
526-
fetchResult, err = g2diagnostic.FetchNextEntityBySize(ctx, queryHandle)
527-
if err != nil {
528-
return err
529-
}
530-
if len(fetchResult) == 0 {
531-
break
532-
}
533-
response := g2pb.StreamEntityListBySizeResponse{
534-
Result: fetchResult,
535-
}
536-
entitiesFetched += 1
537-
if err = stream.Send(&response); err != nil {
538-
return err
539-
}
540-
server.traceEntry(164, request, fetchResult)
541-
}
542-
543-
err = nil
544-
return
545-
}
546-
547288
func (server *G2DiagnosticServer) UnregisterObserver(ctx context.Context, observer observer.Observer) error {
548289
var err error = nil
549290
if server.isTrace {

0 commit comments

Comments
 (0)