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
Commits
5d68ff05
Commit
5d68ff05
authored
3 years ago
by
thijsheijden
Browse files
Options
Downloads
Patches
Plain Diff
Added query status messages
parent
bbb4f41f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
internal/usecases/consume/handlemessage.go
+25
-0
25 additions, 0 deletions
internal/usecases/consume/handlemessage.go
with
25 additions
and
0 deletions
internal/usecases/consume/handlemessage.go
+
25
−
0
View file @
5d68ff05
...
...
@@ -23,6 +23,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
return
}
s
.
sendStatus
(
"Received"
,
&
sessionID
)
// Unmarshall the incoming message into an IncomingJSONQuery object
JSONQuery
,
err
:=
query
.
UnmarshalJSON
(
&
msg
.
Body
)
if
err
!=
nil
{
...
...
@@ -46,6 +48,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
return
}
s
.
sendStatus
(
"Translating"
,
&
sessionID
)
// Convert the json byte msg to a query string
query
,
err
:=
s
.
queryConverter
.
ConvertQuery
(
JSONQuery
)
if
err
!=
nil
{
...
...
@@ -75,6 +79,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
}
s
.
producer
.
PublishMessage
(
&
translationMsgBytes
,
&
sessionID
)
// TODO: should this be a go routine?
s
.
sendStatus
(
"Getting database credentials"
,
&
sessionID
)
// Fetch database credentials from the user service
databaseInfo
,
err
:=
s
.
databaseInfoService
.
GetDatabaseInfo
(
&
clientID
,
&
JSONQuery
.
DatabaseName
)
if
err
!=
nil
{
...
...
@@ -87,6 +93,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
return
}
s
.
sendStatus
(
"Processing on database"
,
&
sessionID
)
// execute and retrieve result
// convert result to general (node-link) format
result
,
err
:=
s
.
requestSender
.
ExecuteQuery
(
*
query
,
databaseInfo
.
Username
,
databaseInfo
.
Password
,
databaseInfo
.
URL
,
databaseInfo
.
Port
,
databaseInfo
.
InternalDatabaseName
)
...
...
@@ -100,6 +108,8 @@ func (s *Service) HandleMessage(msg *broker.Message) {
return
}
s
.
sendStatus
(
"Done"
,
&
sessionID
)
// Add type indicator to result from database
// TODO: Change key 'values' to key 'value'
var
res
interface
{}
...
...
@@ -116,3 +126,18 @@ func (s *Service) HandleMessage(msg *broker.Message) {
s
.
producer
.
PublishMessage
(
&
resultMsgBytes
,
&
sessionID
)
}
func
(
s
*
Service
)
sendStatus
(
status
string
,
sessionID
*
string
)
{
msg
:=
entity
.
MessageStruct
{
Type
:
"query_status_update"
,
Value
:
status
,
}
msgBytes
,
err
:=
json
.
Marshal
(
msg
)
if
err
!=
nil
{
errorhandler
.
FailWithError
(
err
,
"Marshalling status update message went wrong"
)
return
}
s
.
producer
.
PublishMessage
(
&
msgBytes
,
sessionID
)
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment