Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Q
query-service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GraphPolaris
Microservices
query-service
Compare revisions
1e939c8fdca637e052f64b36f00473943d84a8df to 4906aa55986831619575946f1a18e489edd4cc5a
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
graphpolaris/microservices/query-service
Select target project
No results found
4906aa55986831619575946f1a18e489edd4cc5a
Select Git revision
Swap
Target
graphpolaris/microservices/query-service
Select target project
graphpolaris/microservices/query-service
1 result
1e939c8fdca637e052f64b36f00473943d84a8df
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
fix: do not gzip result if caching is disabled
· 2eb9b86f
Dennis Collaris
authored
4 weeks ago
and
Leonardo Christino
committed
4 weeks ago
2eb9b86f
fix: force garbage collection
· 4906aa55
Dennis Collaris
authored
4 weeks ago
and
Leonardo Christino
committed
4 weeks ago
4906aa55
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/readers/queryService.ts
+111
-96
111 additions, 96 deletions
src/readers/queryService.ts
with
111 additions
and
96 deletions
src/readers/queryService.ts
View file @
4906aa55
...
...
@@ -53,13 +53,22 @@ export const queryService = async (db: DbConnection, cypher: QueryCypher, useCac
const
result
=
graphQueryBackend2graphQuery
(
graph
,
countGraph
);
result
.
nodeCounts
.
updatedAt
=
Date
.
now
();
// Force garbage collection
neo4jResult
.
records
=
[];
Bun
.
gc
(
true
);
// cache result
const
compressedMessage
=
Bun
.
gzipSync
(
JSON
.
stringify
(
result
));
const
base64Message
=
Buffer
.
from
(
compressedMessage
).
toString
(
'
base64
'
);
if
(
QUERY_CACHE_DURATION
!==
''
)
{
log
.
info
(
'
Started gzipping...
'
);
const
compressedMessage
=
Bun
.
gzipSync
(
JSON
.
stringify
(
result
));
log
.
info
(
'
Done gzipping, started encoding to base64...
'
);
const
base64Message
=
Buffer
.
from
(
compressedMessage
).
toString
(
'
base64
'
);
log
.
info
(
'
Done encoding, sending to redis...
'
);
// if cache enabled, cache the result
await
redis
.
setWithExpire
(
cacheKey
,
base64Message
,
QUERY_CACHE_DURATION
);
// ttl in seconds
log
.
info
(
'
cached in redis
'
);
}
return
result
;
...
...
@@ -95,118 +104,124 @@ export const queryServiceReader = async (frontendPublisher: RabbitMqBroker, mlPu
const
publisher
=
new
QueryPublisher
(
frontendPublisher
,
mlPublisher
,
headers
,
message
.
queryID
);
const
startTime
=
Date
.
now
();
const
ss
=
await
ums
.
getUserSaveState
(
headers
.
message
.
sessionData
.
userID
,
message
.
saveStateID
);
if
(
!
ss
)
{
log
.
error
(
'
Invalid SaveState received in queryServiceConsumer:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
Invalid SaveState
'
);
return
;
}
try
{
const
startTime
=
Date
.
now
();
const
ss
=
await
ums
.
getUserSaveState
(
headers
.
message
.
sessionData
.
userID
,
message
.
saveStateID
);
log
.
debug
(
'
Received query request:
'
,
message
,
headers
,
ss
);
log
.
debug
(
'
Received routing key:
'
,
headers
.
routingKey
);
if
(
!
ss
)
{
log
.
error
(
'
Invalid SaveState received in queryServiceConsumer:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
Invalid SaveState
'
);
return
;
}
publisher
.
publishStatusToFrontend
(
'
Received
'
);
log
.
debug
(
'
Received query request:
'
,
message
,
headers
,
ss
);
log
.
debug
(
'
Received routing key:
'
,
headers
.
routingKey
);
if
(
ss
==
null
||
ss
.
dbConnections
==
null
||
ss
.
dbConnections
[
0
]
==
null
||
ss
.
dbConnections
.
length
===
0
)
{
log
.
error
(
'
Invalid SaveState received in queryServiceConsumer:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
Invalid SaveState
'
);
return
;
}
publisher
.
publishStatusToFrontend
(
'
Received
'
);
let
activeQuery
=
ss
.
queryStates
.
activeQueryId
;
if
(
message
.
queryID
)
{
if
(
ss
.
queryStates
.
openQueryArray
.
find
(
q
=>
q
.
id
===
message
.
queryID
)
==
null
)
{
log
.
error
(
'
Query not found in SaveState:
'
,
message
.
queryID
,
ss
.
queryStates
.
openQueryArray
);
publisher
.
publishErrorToFrontend
(
'
Query not found
'
);
if
(
ss
==
null
||
ss
.
dbConnections
==
null
||
ss
.
dbConnections
[
0
]
==
null
||
ss
.
dbConnections
.
length
===
0
)
{
log
.
error
(
'
Invalid SaveState received in queryServiceConsumer:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
Invalid SaveState
'
);
return
;
}
activeQuery
=
message
.
queryID
;
}
if
(
activeQuery
==
null
||
activeQuery
==
-
1
)
{
log
.
error
(
'
No active query found in SaveState:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
No active query found
'
);
return
;
}
let
activeQuery
=
ss
.
queryStates
.
activeQueryId
;
if
(
message
.
queryID
)
{
if
(
ss
.
queryStates
.
openQueryArray
.
find
(
q
=>
q
.
id
===
message
.
queryID
)
==
null
)
{
log
.
error
(
'
Query not found in SaveState:
'
,
message
.
queryID
,
ss
.
queryStates
.
openQueryArray
);
publisher
.
publishErrorToFrontend
(
'
Query not found
'
);
return
;
}
activeQuery
=
message
.
queryID
;
}
const
activeQueryInfo
=
ss
.
queryStates
.
openQueryArray
.
find
(
q
=>
q
.
id
===
activeQuery
);
if
(
activeQueryInfo
==
null
)
{
log
.
error
(
'
Active query not found in SaveState:
'
,
ss
.
queryStates
.
activeQueryId
,
ss
.
queryStates
.
openQueryArray
);
publisher
.
publishErrorToFrontend
(
'
Active query not found
'
);
return
;
}
if
(
activeQuery
==
null
||
activeQuery
==
-
1
)
{
log
.
error
(
'
No active query found in SaveState:
'
,
ss
);
publisher
.
publishErrorToFrontend
(
'
No active query found
'
);
return
;
}
const
visualQuery
=
activeQueryInfo
.
graph
;
//ss.queries[0].graph;
log
.
debug
(
'
Received query request:
'
,
message
,
headers
,
visualQuery
);
if
(
visualQuery
.
nodes
.
length
===
0
)
{
log
.
info
(
'
Empty query received
'
);
publisher
.
publishResultToFrontend
({
nodes
:
[],
edges
:
[],
nodeCounts
:
{
updatedAt
:
0
},
metaData
:
{
topological
:
{
density
:
0
,
self_loops
:
0
},
nodes
:
{
count
:
0
,
labels
:
[],
types
:
{}
},
edges
:
{
count
:
0
,
labels
:
[],
types
:
{}
},
},
});
return
;
}
const
activeQueryInfo
=
ss
.
queryStates
.
openQueryArray
.
find
(
q
=>
q
.
id
===
activeQuery
);
if
(
activeQueryInfo
==
null
)
{
log
.
error
(
'
Active query not found in SaveState:
'
,
ss
.
queryStates
.
activeQueryId
,
ss
.
queryStates
.
openQueryArray
);
publisher
.
publishErrorToFrontend
(
'
Active query not found
'
);
return
;
}
const
queryBuilderSettings
=
activeQueryInfo
.
settings
;
//ss.queries[0].settings;
const
ml
=
message
.
ml
;
const
convertedQuery
=
Query2BackendQuery
(
ss
.
id
,
visualQuery
,
queryBuilderSettings
,
ml
);
const
visualQuery
=
activeQueryInfo
.
graph
;
//ss.queries[0].graph;
log
.
debug
(
'
Received query request:
'
,
message
,
headers
,
visualQuery
);
if
(
visualQuery
.
nodes
.
length
===
0
)
{
log
.
info
(
'
Empty query received
'
);
publisher
.
publishResultToFrontend
({
nodes
:
[],
edges
:
[],
nodeCounts
:
{
updatedAt
:
0
},
metaData
:
{
topological
:
{
density
:
0
,
self_loops
:
0
},
nodes
:
{
count
:
0
,
labels
:
[],
types
:
{}
},
edges
:
{
count
:
0
,
labels
:
[],
types
:
{}
},
},
});
return
;
}
log
.
debug
(
'
translating query:
'
,
convertedQuery
);
publisher
.
publishStatusToFrontend
(
'
Translating
'
);
const
queryBuilderSettings
=
activeQueryInfo
.
settings
;
//ss.queries[0].settings;
const
ml
=
message
.
ml
;
const
convertedQuery
=
Query2BackendQuery
(
ss
.
id
,
visualQuery
,
queryBuilderSettings
,
ml
);
const
cypher
=
query2Cypher
(
convertedQuery
);
const
query
=
cypher
.
query
;
if
(
query
==
null
)
{
log
.
error
(
'
Error translating query:
'
,
convertedQuery
);
publisher
.
publishErrorToFrontend
(
'
Error translating query
'
);
return
;
}
log
.
debug
(
'
translating query:
'
,
convertedQuery
);
publisher
.
publishStatusToFrontend
(
'
Translating
'
);
log
.
debug
(
'
Translated query FROM:
'
,
convertedQuery
);
log
.
info
(
'
Translated query:
'
,
query
);
log
.
info
(
'
Translated query:
'
,
cypher
.
countQuery
);
publisher
.
publishTranslationResultToFrontend
(
query
);
for
(
let
i
=
0
;
i
<
ss
.
dbConnections
.
length
;
i
++
)
{
try
{
const
result
=
await
queryService
(
ss
.
dbConnections
[
i
],
cypher
,
message
.
useCached
);
// Cache nodeCounts such that we can display differentiation for each query
await
ums
.
updateQuery
(
headers
.
message
.
sessionData
.
userID
,
message
.
saveStateID
,
{
...
activeQueryInfo
,
graph
:
{
...
activeQueryInfo
.
graph
,
nodeCounts
:
result
.
nodeCounts
,
},
});
const
cypher
=
query2Cypher
(
convertedQuery
);
const
query
=
cypher
.
query
;
if
(
query
==
null
)
{
log
.
error
(
'
Error translating query:
'
,
convertedQuery
);
publisher
.
publishErrorToFrontend
(
'
Error translating query
'
);
return
;
}
publisher
.
publishResultToFrontend
(
result
);
log
.
debug
(
'
Query result!
'
);
log
.
info
(
`Query executed in
${
formatTimeDifference
(
Date
.
now
()
-
startTime
)}
`
);
if
(
convertedQuery
.
machineLearning
&&
convertedQuery
.
machineLearning
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
convertedQuery
.
machineLearning
.
length
;
i
++
)
{
try
{
publisher
.
publishMachineLearningRequest
(
result
,
convertedQuery
.
machineLearning
[
i
],
headers
);
log
.
debug
(
'
Published machine learning request
'
,
convertedQuery
.
machineLearning
[
i
]);
}
catch
(
error
)
{
log
.
error
(
'
Error publishing machine learning request
'
,
error
);
publisher
.
publishErrorToFrontend
(
'
Error publishing machine learning request
'
);
log
.
debug
(
'
Translated query FROM:
'
,
convertedQuery
);
log
.
info
(
'
Translated query:
'
,
query
);
log
.
info
(
'
Translated query:
'
,
cypher
.
countQuery
);
publisher
.
publishTranslationResultToFrontend
(
query
);
for
(
let
i
=
0
;
i
<
ss
.
dbConnections
.
length
;
i
++
)
{
try
{
const
result
=
await
queryService
(
ss
.
dbConnections
[
i
],
cypher
,
message
.
useCached
);
// Cache nodeCounts such that we can display differentiation for each query
await
ums
.
updateQuery
(
headers
.
message
.
sessionData
.
userID
,
message
.
saveStateID
,
{
...
activeQueryInfo
,
graph
:
{
...
activeQueryInfo
.
graph
,
nodeCounts
:
result
.
nodeCounts
,
},
});
publisher
.
publishResultToFrontend
(
result
);
log
.
debug
(
'
Query result!
'
);
log
.
info
(
`Query executed in
${
formatTimeDifference
(
Date
.
now
()
-
startTime
)}
`
);
if
(
convertedQuery
.
machineLearning
&&
convertedQuery
.
machineLearning
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
convertedQuery
.
machineLearning
.
length
;
i
++
)
{
try
{
publisher
.
publishMachineLearningRequest
(
result
,
convertedQuery
.
machineLearning
[
i
],
headers
);
log
.
debug
(
'
Published machine learning request
'
,
convertedQuery
.
machineLearning
[
i
]);
}
catch
(
error
)
{
log
.
error
(
'
Error publishing machine learning request
'
,
error
);
publisher
.
publishErrorToFrontend
(
'
Error publishing machine learning request
'
);
}
}
}
}
catch
(
error
)
{
log
.
error
(
'
Error querying database
'
,
error
);
publisher
.
publishErrorToFrontend
(
'
Error querying database
'
);
}
}
catch
(
error
)
{
log
.
error
(
'
Error querying database
'
,
error
);
publisher
.
publishErrorToFrontend
(
'
Error querying database
'
);
Bun
.
gc
(
true
);
}
}
finally
{
setTimeout
(()
=>
Bun
.
gc
(
true
),
100
);
}
});
};
This diff is collapsed.
Click to expand it.