Skip to content

Commit cbfa92a

Browse files
committed
chore(upload/neo4j): hide specific implementations
1 parent 0437d97 commit cbfa92a

3 files changed

Lines changed: 42 additions & 22 deletions

File tree

‎binding.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package sibyl2
33
import (
44
"context"
55

6+
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
7+
68
"github.com/williamfzc/sibyl2/pkg/extractor"
79
)
810

@@ -52,6 +54,7 @@ create func links:
5254
*/
5355

5456
type Driver interface {
57+
GetType() DriverType
5558
UploadFileResult(wc *WorkspaceConfig, f *extractor.FunctionFileResult, ctx context.Context) error
5659
UploadFuncContext(wc *WorkspaceConfig, f *FunctionContext, ctx context.Context) error
5760
QueryFiles(wc *WorkspaceConfig, ctx context.Context) ([]string, error)
@@ -65,6 +68,14 @@ type Driver interface {
6568
UpdateFuncProperties(wc *WorkspaceConfig, signature string, k string, v any, ctx context.Context) error
6669
}
6770

71+
type DriverType string
72+
73+
const DtNeo4j DriverType = "NEO4J"
74+
75+
func NewNeo4jDriver(dwc neo4j.DriverWithContext) (Driver, error) {
76+
return &neo4jDriver{dwc}, nil
77+
}
78+
6879
/*
6980
WorkspaceConfig
7081

‎binding_neo4j.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@ MERGE (file)-[:INCLUDE]->(func)
3636
TemplateMergeLinkFuncReference = "MERGE (%s)-[:FUNC_REFERENCE]->(%s)"
3737
)
3838

39-
type Neo4jDriver struct {
39+
type neo4jDriver struct {
4040
neo4j.DriverWithContext
4141
}
4242

43-
func (d *Neo4jDriver) UploadFileResult(wc *WorkspaceConfig, f *extractor.FunctionFileResult, ctx context.Context) error {
43+
func (d *neo4jDriver) GetType() DriverType {
44+
return DtNeo4j
45+
}
46+
47+
func (d *neo4jDriver) UploadFileResult(wc *WorkspaceConfig, f *extractor.FunctionFileResult, ctx context.Context) error {
4448
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
4549
defer session.Close(ctx)
4650
_, err := session.ExecuteWrite(ctx, createFunctionFileTransaction(wc, f, ctx))
@@ -50,7 +54,7 @@ func (d *Neo4jDriver) UploadFileResult(wc *WorkspaceConfig, f *extractor.Functio
5054
return nil
5155
}
5256

53-
func (d *Neo4jDriver) UploadFuncContext(wc *WorkspaceConfig, f *FunctionContext, ctx context.Context) error {
57+
func (d *neo4jDriver) UploadFuncContext(wc *WorkspaceConfig, f *FunctionContext, ctx context.Context) error {
5458
// session is cheap to create
5559
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
5660
defer session.Close(ctx)
@@ -61,7 +65,7 @@ func (d *Neo4jDriver) UploadFuncContext(wc *WorkspaceConfig, f *FunctionContext,
6165
return nil
6266
}
6367

64-
func (d *Neo4jDriver) QueryFiles(wc *WorkspaceConfig, ctx context.Context) ([]string, error) {
68+
func (d *neo4jDriver) QueryFiles(wc *WorkspaceConfig, ctx context.Context) ([]string, error) {
6569
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
6670
defer session.Close(ctx)
6771
ret, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -89,7 +93,7 @@ func (d *Neo4jDriver) QueryFiles(wc *WorkspaceConfig, ctx context.Context) ([]st
8993
return ret.([]string), nil
9094
}
9195

92-
func (d *Neo4jDriver) QueryFunctions(wc *WorkspaceConfig, path string, ctx context.Context) ([]*FunctionWithPath, error) {
96+
func (d *neo4jDriver) QueryFunctions(wc *WorkspaceConfig, path string, ctx context.Context) ([]*FunctionWithPath, error) {
9397
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
9498
defer session.Close(ctx)
9599
ret, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -133,7 +137,7 @@ func (d *Neo4jDriver) QueryFunctions(wc *WorkspaceConfig, path string, ctx conte
133137
return ret.([]*FunctionWithPath), nil
134138
}
135139

136-
func (d *Neo4jDriver) QueryFunctionWithSignature(wc *WorkspaceConfig, signature string, ctx context.Context) (*FunctionWithPath, error) {
140+
func (d *neo4jDriver) QueryFunctionWithSignature(wc *WorkspaceConfig, signature string, ctx context.Context) (*FunctionWithPath, error) {
137141
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
138142
defer session.Close(ctx)
139143
ret, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -184,7 +188,7 @@ func (d *Neo4jDriver) QueryFunctionWithSignature(wc *WorkspaceConfig, signature
184188
return ret.(*FunctionWithPath), nil
185189
}
186190

187-
func (d *Neo4jDriver) QueryFunctionsWithLines(wc *WorkspaceConfig, path string, lines []int, ctx context.Context) ([]*FunctionWithPath, error) {
191+
func (d *neo4jDriver) QueryFunctionsWithLines(wc *WorkspaceConfig, path string, lines []int, ctx context.Context) ([]*FunctionWithPath, error) {
188192
functions, err := d.QueryFunctions(wc, path, ctx)
189193
if err != nil {
190194
return nil, err
@@ -198,7 +202,7 @@ func (d *Neo4jDriver) QueryFunctionsWithLines(wc *WorkspaceConfig, path string,
198202
return ret, nil
199203
}
200204

201-
func (d *Neo4jDriver) QueryFunctionContextWithSignature(wc *WorkspaceConfig, signature string, ctx context.Context) (*FunctionContext, error) {
205+
func (d *neo4jDriver) QueryFunctionContextWithSignature(wc *WorkspaceConfig, signature string, ctx context.Context) (*FunctionContext, error) {
202206
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
203207
defer session.Close(ctx)
204208
ret, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -297,7 +301,7 @@ RETURN f, file, srcFunc, srcFile, targetFunc, targetFile
297301
return ret.(*FunctionContext), nil
298302
}
299303

300-
func (d *Neo4jDriver) DeleteWorkspace(wc *WorkspaceConfig, ctx context.Context) error {
304+
func (d *neo4jDriver) DeleteWorkspace(wc *WorkspaceConfig, ctx context.Context) error {
301305
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
302306
defer session.Close(ctx)
303307
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -316,7 +320,7 @@ MATCH (repo:Repo {id: $repoId})-[:INCLUDE]->(rev:Rev {hash: $revHash})-[:INCLUDE
316320
return nil
317321
}
318322

319-
func (d *Neo4jDriver) InitWorkspace(wc *WorkspaceConfig, ctx context.Context) error {
323+
func (d *neo4jDriver) InitWorkspace(wc *WorkspaceConfig, ctx context.Context) error {
320324
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
321325
defer session.Close(ctx)
322326
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -335,7 +339,7 @@ MERGE (r)-[:INCLUDE]->(:Rev {hash: $revHash})`
335339
return nil
336340
}
337341

338-
func (d *Neo4jDriver) QueryRevs(repoId string, ctx context.Context) []string {
342+
func (d *neo4jDriver) QueryRevs(repoId string, ctx context.Context) []string {
339343
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
340344
defer session.Close(ctx)
341345
ret, _ := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
@@ -361,7 +365,7 @@ func (d *Neo4jDriver) QueryRevs(repoId string, ctx context.Context) []string {
361365
return ret.([]string)
362366
}
363367

364-
func (d *Neo4jDriver) UpdateFuncProperties(wc *WorkspaceConfig, signature string, k string, v any, ctx context.Context) error {
368+
func (d *neo4jDriver) UpdateFuncProperties(wc *WorkspaceConfig, signature string, k string, v any, ctx context.Context) error {
365369
session := d.DriverWithContext.NewSession(ctx, neo4j.SessionConfig{})
366370
defer session.Close(ctx)
367371
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {

‎binding_neo4j_test.go‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestNeo4jDriver_InitWorkspace(t *testing.T) {
3333
}
3434
ctx := context.Background()
3535
defer driver.Close(ctx)
36-
newDriver := &Neo4jDriver{driver}
36+
newDriver, _ := NewNeo4jDriver(driver)
3737
err = newDriver.InitWorkspace(wc, ctx)
3838
if err != nil {
3939
panic(err)
@@ -51,10 +51,15 @@ func TestNeo4jDriver_UploadFile(t *testing.T) {
5151
}
5252
ctx := context.Background()
5353
defer driver.Close(ctx)
54-
newDriver := &Neo4jDriver{driver}
54+
55+
newDriver, _ := NewNeo4jDriver(driver)
5556
functions, _ := ExtractFunction(".", DefaultConfig())
5657

5758
core.Log.Infof("start uploading")
59+
err = newDriver.InitWorkspace(wc, ctx)
60+
if err != nil {
61+
panic(err)
62+
}
5863
var wg sync.WaitGroup
5964
for _, each := range functions {
6065
wg.Add(1)
@@ -82,7 +87,7 @@ func TestNeo4jDriver_UploadFuncContextWithContext(t *testing.T) {
8287
}
8388
ctx := context.Background()
8489
defer driver.Close(ctx)
85-
newDriver := &Neo4jDriver{driver}
90+
newDriver, _ := NewNeo4jDriver(driver)
8691
functions, _ := ExtractFunction(".", DefaultConfig())
8792
symbols, _ := ExtractSymbol(".", DefaultConfig())
8893
fg, _ := AnalyzeFuncGraph(functions, symbols)
@@ -109,7 +114,7 @@ func TestNeo4jDriver_QueryFiles(t *testing.T) {
109114
}
110115
ctx := context.Background()
111116
defer driver.Close(ctx)
112-
newDriver := &Neo4jDriver{driver}
117+
newDriver, _ := NewNeo4jDriver(driver)
113118
files, err := newDriver.QueryFiles(wc, ctx)
114119
if err != nil {
115120
panic(err)
@@ -127,7 +132,7 @@ func TestNeo4jDriver_QueryFunctions(t *testing.T) {
127132
}
128133
ctx := context.Background()
129134
defer driver.Close(ctx)
130-
newDriver := &Neo4jDriver{driver}
135+
newDriver, _ := NewNeo4jDriver(driver)
131136
files, err := newDriver.QueryFunctions(wc, "extract.go", ctx)
132137
if err != nil {
133138
panic(err)
@@ -147,7 +152,7 @@ func TestNeo4jDriver_QueryFunctionsWithLines(t *testing.T) {
147152
}
148153
ctx := context.Background()
149154
defer driver.Close(ctx)
150-
newDriver := &Neo4jDriver{driver}
155+
newDriver, _ := NewNeo4jDriver(driver)
151156
functions, err := newDriver.QueryFunctionsWithLines(wc, "extract.go", []int{32, 33}, ctx)
152157
if err != nil {
153158
panic(err)
@@ -167,7 +172,7 @@ func TestNeo4jDriver_QueryFunctionWithSignature(t *testing.T) {
167172
}
168173
ctx := context.Background()
169174
defer driver.Close(ctx)
170-
newDriver := &Neo4jDriver{driver}
175+
newDriver, _ := NewNeo4jDriver(driver)
171176
ctxs, err := newDriver.QueryFunctionWithSignature(wc, "::ExtractFromString|string,*ExtractConfig|*extractor.FileResult,error", ctx)
172177
if err != nil {
173178
panic(err)
@@ -185,7 +190,7 @@ func TestNeo4jDriver_QueryFunctionContextWithSignature(t *testing.T) {
185190
}
186191
ctx := context.Background()
187192
defer driver.Close(ctx)
188-
newDriver := &Neo4jDriver{driver}
193+
newDriver, _ := NewNeo4jDriver(driver)
189194
ctxs, err := newDriver.QueryFunctionContextWithSignature(wc, "::ExtractFromString|string,*ExtractConfig|*extractor.FileResult,error", ctx)
190195
if err != nil {
191196
panic(err)
@@ -205,7 +210,7 @@ func TestNeo4jDriver_RemoveFileResult(t *testing.T) {
205210
}
206211
ctx := context.Background()
207212
defer driver.Close(ctx)
208-
newDriver := &Neo4jDriver{driver}
213+
newDriver, _ := NewNeo4jDriver(driver)
209214
err = newDriver.DeleteWorkspace(wc, ctx)
210215
if err != nil {
211216
panic(err)
@@ -222,7 +227,7 @@ func TestNeo4jDriver_UpdateFuncProperties(t *testing.T) {
222227
}
223228
ctx := context.Background()
224229
defer driver.Close(ctx)
225-
newDriver := &Neo4jDriver{driver}
230+
newDriver, _ := NewNeo4jDriver(driver)
226231
err = newDriver.UpdateFuncProperties(wc, "::ExtractFromString|string,*ExtractConfig|*extractor.FileResult,error", "covered", 1, ctx)
227232
if err != nil {
228233
panic(err)

0 commit comments

Comments
 (0)
⌂ 换网址