Skip to content

[RI-3860] [RedisGraph] Don't convert graph Ids to string. #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2022
Merged

[RI-3860] [RedisGraph] Don't convert graph Ids to string. #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions redisinsight/ui/src/packages/redisgraph/src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function responseParser(data: any): IResponseParser {
if (Array.isArray(item)) {
if (item[0][0] === 'id' && item[1][0] === 'labels') {
const node: INode = {
id: item[0][1].toString(),
id: item[0][1],
labels: item[1][1],
properties: {}
}
Expand All @@ -81,15 +81,15 @@ function responseParser(data: any): IResponseParser {
const v = resolveProps(x)
node['properties'][v.key] = v.value
})
if (nodes.findIndex((e: INode) => e.id === item[0][1].toString()) === -1) {
if (nodes.findIndex((e: INode) => e.id === item[0][1]) === -1) {
nodes.push(node)
}
} else if (item[0][0] === 'id' && item[1][0] === 'type') {
const edge: IEdge = {
id: item[0][1].toString(),
id: item[0][1],
type: item[1][1],
source: item[2][1].toString(),
target: item[3][1].toString(),
source: item[2][1],
target: item[3][1],
properties: {}
}
types[item[1][1]] = (types[item[1][1]] + 1) || 1
Expand Down Expand Up @@ -155,7 +155,7 @@ function ResultsParser(data: any[][]) : {headers: any[], results: any[] }{
if (Array.isArray(entity)) {
if (entity[0][0] === 'id') {
const item: any = {
id: entity[0][1].toString(),
id: entity[0][1],
properties: {}
}
let propValues = []
Expand All @@ -164,8 +164,8 @@ function ResultsParser(data: any[][]) : {headers: any[], results: any[] }{
propValues = entity[2][1]
} else if (entity[1][0] === 'type') {
item.type = entity[1][1]
item.source = entity[2][1].toString()
item.target = entity[3][1].toString()
item.source = entity[2][1]
item.target = entity[3][1]
propValues = entity[4][1]
}
propValues.map((x: any) => {
Expand Down
10 changes: 5 additions & 5 deletions redisinsight/ui/src/packages/redisgraph/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,23 +189,23 @@ export function commandIsSuccess(resp: [{ response: any, status: string }]) {
}


export function getFetchNodesByIdQuery(graphKey: string, nodeIds: string[]): string {
export function getFetchNodesByIdQuery(graphKey: string, nodeIds: number[]): string {
return `graph.ro_query ${graphKey} "MATCH (n) WHERE id(n) IN [${nodeIds}] RETURN DISTINCT n"`
}

export function getFetchNodesByEdgeIdQuery(graphKey: string, edgeIds: string[], existingNodeIds: string[]): string {
export function getFetchNodesByEdgeIdQuery(graphKey: string, edgeIds: number[], existingNodeIds: number[]): string {
return `graph.ro_query ${graphKey} "MATCH (n)-[t]->(m) WHERE id(t) IN [${edgeIds}] AND NOT id(n) IN [${existingNodeIds}] AND NOT id(m) IN [${existingNodeIds}] RETURN n, m"`
}

export function getFetchEdgesByIdQuery(graphKey: string, edgeIds: string[]): string {
export function getFetchEdgesByIdQuery(graphKey: string, edgeIds: number[]): string {
return `graph.ro_query ${graphKey} "MATCH ()-[t]->() WHERE id(t) IN [${edgeIds}] RETURN DISTINCT t"`
}

export function getFetchDirectNeighboursOfNodeQuery(graphKey: string, nodeId: string): string {
export function getFetchDirectNeighboursOfNodeQuery(graphKey: string, nodeId: number): string {
return `graph.ro_query "${graphKey}" "MATCH (n)-[t]-(m) WHERE id(n)=${nodeId} RETURN t, m"`
}


export function getFetchNodeRelationshipsQuery(graphKey: string, sourceNodeIds: string[], destNodeIds: string[], existingEdgeIds: string[]): string {
export function getFetchNodeRelationshipsQuery(graphKey: string, sourceNodeIds: number[], destNodeIds: number[], existingEdgeIds: number[]): string {
return `graph.ro_query ${graphKey} "MATCH (n)-[t]->(m) WHERE (ID(n) IN [${sourceNodeIds}] OR ID(m) IN [${destNodeIds}]) AND NOT ID(t) IN [${existingEdgeIds}] RETURN DISTINCT t"`
}