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
1762b548
Commit
1762b548
authored
4 months ago
by
Sjoerd Vink
Browse files
Options
Downloads
Patches
Plain Diff
feat(reportOnNewData): initial setup report on new data
parent
9b3a71e3
No related branches found
No related tags found
No related merge requests found
Pipeline
#143110
failed
4 months ago
Stage: tag-release
Stage: get-release-tag
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/index.ts
+2
-1
2 additions, 1 deletion
src/index.ts
src/readers/queryService.ts
+111
-1
111 additions, 1 deletion
src/readers/queryService.ts
with
113 additions
and
2 deletions
src/index.ts
+
2
−
1
View file @
1762b548
import
{
RabbitMqBroker
,
RedisConnector
}
from
"
ts-common
"
;
import
{
REDIS_PASSWORD
,
REDIS_HOST
,
REDIS_PORT
,
RABBIT_USER
,
RABBIT_PASSWORD
,
RABBIT_PORT
,
RABBIT_HOST
}
from
"
./variables
"
;
import
{
log
}
from
"
./logger
"
;
import
{
queryServiceReader
,
queryServiceReaderStatsCheck
}
from
"
./readers/queryService
"
;
import
{
queryServiceReader
,
queryServiceReaderStatsCheck
,
queryServiceReaderDiffCheck
}
from
"
./readers/queryService
"
;
async
function
main
()
{
log
.
info
(
"
Starting query-service...
"
);
...
...
@@ -39,6 +39,7 @@ async function testStatsCheck() {
log
.
info
(
"
Starting query-service-statsCheck ...
"
);
await
queryServiceReaderStatsCheck
(
"
neo4j
"
);
await
queryServiceReaderDiffCheck
(
"
neo4j
"
);
}
main
();
...
...
This diff is collapsed.
Click to expand it.
src/readers/queryService.ts
+
111
−
1
View file @
1762b548
import
{
getUserSaveState
,
//
getUserSaveStateInsight,
getUserSaveStateInsight
,
type
BackendQueryFormat
,
type
QueryRequest
,
type
GraphQueryResultFromBackend
,
type
GraphQueryResultMetaFromBackend
,
mlDefaultState
,
updateUserSaveStateInsight
,
}
from
"
ts-common
"
;
import
{
Neo4jConnection
,
type
DbConnection
,
RabbitMqBroker
,
RedisConnector
}
from
"
ts-common
"
;
import
{
...
...
@@ -257,3 +258,112 @@ export const queryServiceReaderStatsCheck = async (type: QueryExecutionTypes) =>
}
});
};
export
const
queryServiceReaderDiffCheck
=
async
(
type
:
QueryExecutionTypes
)
=>
{
if
(
type
==
null
)
{
log
.
error
(
"
Unsupported query execution type:
"
,
type
);
throw
new
Error
(
"
Unsupported query execution type
"
);
}
// TODO: change requests-exchange -> requests-exchange-stats
const
queryServiceConsumer
=
new
RabbitMqBroker
(
"
requests-exchange
"
,
`
${
type
}
-query-queue`
,
`
${
type
}
-query-request`
);
await
queryServiceConsumer
.
connect
({
protocol
:
"
amqp
"
,
hostname
:
RABBIT_HOST
,
port
:
RABBIT_PORT
,
username
:
RABBIT_USER
,
password
:
RABBIT_PASSWORD
,
});
log
.
info
(
"
Connected to RabbitMQ ST!
"
);
// query-service to query-service-insight-reader
await
queryServiceConsumer
.
startConsuming
<
QueryRequest
>
(
"
query-service-insight-reader
"
,
async
(
message
,
headers
)
=>
{
const
startTime
=
Date
.
now
();
const
ss
=
await
getUserSaveState
(
headers
.
message
.
sessionData
.
userID
,
headers
.
message
.
sessionData
.
saveStateID
,
USER_MANAGEMENT_SERVICE_API
);
// const ssInsight = await getUserSaveStateInsight(
// headers.message.sessionData.userID,
// headers.message.sessionData.saveStateID,
// USER_MANAGEMENT_SERVICE_API
// );
const
previousQueryResult
=
{
nodes
:
[],
edges
:
[],
};
log
.
debug
(
"
Received query request:
"
,
ss
);
if
(
!
headers
.
queryID
)
{
log
.
error
(
"
QueryID not set in headers:
"
,
headers
);
return
;
}
log
.
debug
(
"
Received check stat request:
"
,
message
,
headers
);
if
(
ss
==
null
||
ss
.
dbConnections
==
null
||
ss
.
dbConnections
[
0
]
==
null
||
ss
.
dbConnections
.
length
===
0
)
{
log
.
error
(
"
Invalid SaveState received in queryServiceConsumer:
"
,
ss
);
return
;
}
const
visualQuery
=
ss
.
queries
[
0
].
graph
;
const
queryBuilderSettings
=
ss
.
queries
[
0
].
settings
;
const
ml
=
message
.
ml
;
const
convertedQuery
=
Query2BackendQuery
(
ss
.
id
,
visualQuery
,
queryBuilderSettings
,
ml
);
log
.
debug
(
"
translating query:
"
,
convertedQuery
);
const
query
=
query2Cypher
(
convertedQuery
);
if
(
query
==
null
)
{
log
.
error
(
"
Error translating query:
"
,
convertedQuery
);
return
;
}
for
(
let
i
=
0
;
i
<
ss
.
dbConnections
.
length
;
i
++
)
{
queryService
(
ss
.
dbConnections
[
i
],
query
)
.
then
((
result
)
=>
{
log
.
debug
(
"
Query result!
"
);
log
.
info
(
`Query executed in
${
formatTimeDifference
(
Date
.
now
()
-
startTime
)}
`
);
const
queryResult
=
{
nodes
:
result
.
nodes
.
map
((
node
)
=>
node
.
_id
),
edges
:
result
.
edges
.
map
((
edge
)
=>
edge
.
_id
),
};
// Compare query results
const
nodesDifferent
=
queryResult
.
nodes
.
some
((
node
,
index
)
=>
node
!==
previousQueryResult
.
nodes
[
index
]);
const
edgesDifferent
=
queryResult
.
edges
.
some
((
edge
,
index
)
=>
edge
!==
previousQueryResult
.
edges
[
index
]);
if
(
queryResult
.
nodes
.
length
!==
previousQueryResult
.
nodes
.
length
||
queryResult
.
edges
.
length
!==
previousQueryResult
.
edges
.
length
||
nodesDifferent
||
edgesDifferent
)
{
log
.
info
(
"
Different results, use Dennis code...
"
);
}
else
{
log
.
info
(
"
No difference in result sets
"
);
}
// Save query result for future reference
updateUserSaveStateInsight
(
headers
.
message
.
sessionData
.
userID
,
headers
.
message
.
sessionData
.
saveStateID
,
USER_MANAGEMENT_SERVICE_API
,
queryResult
);
log
.
info
(
"
Updated node and edge ids in SaveState
"
);
})
.
catch
((
error
)
=>
{
log
.
error
(
"
Error querying database
"
,
error
);
});
}
});
};
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