Skip to content

fix(interactive): Fixing Interactive CI #4283

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
siyuan0322 merged 2 commits into from
Oct 10, 2024
Merged

fix(interactive): Fixing Interactive CI #4283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c95018f
try to invoke the ci
zhanglei1949 Oct 10, 2024
2276011
fixing get_edge
zhanglei1949 Oct 10, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ flex/interactive/sdk/java/.openapi-generator/*
flex/interactive/sdk/java/src/main/AndroidManifest.xml
flex/interactive/sdk/java/.openapi-generate/
flex/interactive/sdk/java/settings.gradle
flex/interactive/sdk/java/reference/**
flex/interactive/sdk/java/src/main/java/com/alibaba/graphscope/interactive/models/
flex/interactive/sdk/java/src/main/java/com/alibaba/graphscope/interactive/api/
flex/interactive/sdk/java/src/main/java/com/alibaba/graphscope/interactive/auth/
Expand Down
35 changes: 18 additions & 17 deletions flex/engines/graph_db/database/graph_db_operations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ Result<std::string> GraphDBOperations::GetVertex(
return Result<std::string>(check_result);
}
vertex_data.push_back(vertex);
auto get_result = getVertex(std::move(vertex_data), property_names, session);
auto get_result = getVertex(std::move(vertex_data), property_names, session,
result.GetAllocator());
if (get_result.ok()) {
result.AddMember("values", get_result.value(), result.GetAllocator());
return Result<std::string>(rapidjson_stringify(result));
Expand Down Expand Up @@ -199,11 +200,12 @@ Result<std::string> GraphDBOperations::GetEdge(
result.AddMember("dst_primary_key_value", dst_pk_value,
result.GetAllocator());
if (property_name.empty()) {
result.AddMember("properties", rapidjson::Value(rapidjson::kArrayType),
result.GetAllocator());
rapidjson::Value properties(rapidjson::kObjectType);
result.AddMember("properties", properties, result.GetAllocator());
return Result<std::string>(rapidjson_stringify(result));
}
auto get_result = getEdge(std::move(edge_data), property_name, session);
auto get_result = getEdge(std::move(edge_data), property_name, session,
result.GetAllocator());
if (get_result.ok()) {
result.AddMember("properties", get_result.value(), result.GetAllocator());
return Result<std::string>(rapidjson_stringify(result));
Expand Down Expand Up @@ -605,22 +607,22 @@ Status GraphDBOperations::updateEdge(std::vector<EdgeData>&& edge_data,

Result<rapidjson::Value> GraphDBOperations::getVertex(
std::vector<VertexData>&& vertex_data,
const std::vector<std::string>& property_names, GraphDBSession& session) {
const std::vector<std::string>& property_names, GraphDBSession& session,
rapidjson::Document::AllocatorType& allocator) {
try {
auto& vertex = vertex_data[0];
rapidjson::Document result(rapidjson::kArrayType);
rapidjson::Document result(rapidjson::kArrayType, &allocator);
auto txn = session.GetReadTransaction();
auto vertex_db = txn.FindVertex(vertex.label_id, vertex.pk_value);
if (vertex_db.IsValid() == false) {
txn.Abort();
throw std::runtime_error("Vertex not found");
}
for (int i = 0; i < vertex_db.FieldNum(); i++) {
rapidjson::Value values(rapidjson::kObjectType);
values.AddMember("name", property_names[i], result.GetAllocator());
values.AddMember("value", vertex_db.GetField(i).to_string(),
result.GetAllocator());
result.PushBack(values, result.GetAllocator());
rapidjson::Document values(rapidjson::kObjectType, &allocator);
values.AddMember("name", property_names[i], allocator);
values.AddMember("value", vertex_db.GetField(i).to_string(), allocator);
result.PushBack(values, allocator);
}
txn.Commit();
return Result<rapidjson::Value>(std::move(result));
Expand All @@ -632,7 +634,7 @@ Result<rapidjson::Value> GraphDBOperations::getVertex(

Result<rapidjson::Value> GraphDBOperations::getEdge(
std::vector<EdgeData>&& edge_data, const std::string& property_name,
GraphDBSession& session) {
GraphDBSession& session, rapidjson::Document::AllocatorType& allocator) {
try {
const auto& edge = edge_data[0];
rapidjson::Document result(rapidjson::kArrayType);
Expand All @@ -650,11 +652,10 @@ Result<rapidjson::Value> GraphDBOperations::getEdge(
edgeIt.IsValid(); edgeIt.Next()) {
if (edgeIt.GetNeighbor() != dst_vid)
continue;
rapidjson::Value push_json(rapidjson::kObjectType);
push_json.AddMember("name", property_name, result.GetAllocator());
push_json.AddMember("value", edgeIt.GetData().to_string(),
result.GetAllocator());
result.PushBack(push_json, result.GetAllocator());
rapidjson::Document push_json(rapidjson::kObjectType, &allocator);
push_json.AddMember("name", property_name, allocator);
push_json.AddMember("value", edgeIt.GetData().to_string(), allocator);
result.PushBack(push_json, allocator);
break;
}
if (result.Empty()) {
Expand Down
9 changes: 5 additions & 4 deletions flex/engines/graph_db/database/graph_db_operations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,13 @@ class GraphDBOperations {
GraphDBSession& session);
static Status updateEdge(std::vector<EdgeData>&& edge_data,
GraphDBSession& session);
static Result<rapidjson::Value> getEdge(std::vector<EdgeData>&& edge_data,
const std::string& property_name,
GraphDBSession& session);
static Result<rapidjson::Value> getEdge(
std::vector<EdgeData>&& edge_data, const std::string& property_name,
GraphDBSession& session, rapidjson::Document::AllocatorType& allocator);
static Result<rapidjson::Value> getVertex(
std::vector<VertexData>&& vertex_data,
const std::vector<std::string>& property_names, GraphDBSession& session);
const std::vector<std::string>& property_names, GraphDBSession& session,
rapidjson::Document::AllocatorType& allocator);
};

} // namespace gs
Expand Down