-
Notifications
You must be signed in to change notification settings - Fork 442
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.
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
feat(interactive): Add three builtin procedures #4249
Open
zhichao-shi
wants to merge
6
commits into
alibaba:main
Choose a base branch
from
zhichao-shi:builtin
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
824ba4e
three builtin_app
zhichao-shi a8ce71a
add three builtin add
zhichao-shi 597e9bd
Remove deleted files
zhichao-shi 2dc4d50
add builtin app test
zhichao-shi 42241b0
add builtin app test
zhichao-shi c2a578b
Modify k_neighbors return value
zhichao-shi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
/** Copyright 2020 Alibaba Group Holding Limited. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#include "flex/engines/graph_db/app/builtin/TVSP.h" | ||
|
||
namespace gs { | ||
|
||
bool TVSP::DoQuery(GraphDBSession& sess, Decoder& input,Encoder& output) { | ||
ReadTransaction txn = sess.GetReadTransaction(); | ||
if (input.empty()) { | ||
return false; | ||
} | ||
Schema schema_ = txn.schema(); | ||
std::string label_name1{input.get_string()}; | ||
vid_t vid1=input.get_int(); | ||
std::string label_name2{input.get_string()}; | ||
vid_t vid2=input.get_int(); | ||
std::string label_name3{input.get_string()}; | ||
vid_t vid3=input.get_int(); | ||
|
||
if(!schema_.has_vertex_label(label_name1)||!schema_.has_vertex_label(label_name2) | ||
||!schema_.has_vertex_label(label_name3)){ | ||
output.put_string_view("The requested label doesn't exits."); | ||
return false; // The requested label doesn't exits. | ||
} | ||
label_t label_v1=schema_.get_vertex_label_id(label_name1); | ||
label_t label_v2=schema_.get_vertex_label_id(label_name2); | ||
label_t label_v3=schema_.get_vertex_label_id(label_name3); | ||
vid_t index_v1{}; | ||
vid_t index_v2{}; | ||
vid_t index_v3{}; | ||
if(!txn.GetVertexIndex(label_v1, (int64_t)vid1, index_v1)|| | ||
!txn.GetVertexIndex(label_v2, (int64_t)vid2, index_v2)|| | ||
!txn.GetVertexIndex(label_v3, (int64_t)vid3, index_v3)) | ||
{ | ||
output.put_string_view("get index fail."); | ||
return false; | ||
} | ||
|
||
uint vertex_num = 0 ; | ||
for(label_t i = 0 ; i<schema_.vertex_label_num();i++){ | ||
vertex_num+=txn.GetVertexNum(i); | ||
} | ||
std::vector<int64_t> v1v2result_; | ||
std::vector<int64_t> v2v3result_; | ||
std::vector<int64_t> v1v3result_; | ||
|
||
bool find_flag = true; | ||
if(!ShortestPath(txn,label_v1,index_v1,label_v2,index_v2,v1v2result_,vertex_num)){ | ||
find_flag=false; | ||
} | ||
if(find_flag&&!ShortestPath(txn,label_v2,index_v2,label_v3,index_v3,v2v3result_,vertex_num)){ | ||
find_flag=false; | ||
} | ||
if(find_flag&&!ShortestPath(txn,label_v1,index_v1,label_v3,index_v3,v1v3result_,vertex_num)){ | ||
find_flag=false; | ||
} | ||
std::string result_path = ""; | ||
if(find_flag){ | ||
//选择最短的两条路径进行连接 | ||
std::vector<int64_t> TSP = ConnectPath(v1v2result_,v2v3result_,v1v3result_); | ||
for(auto it = TSP.begin(); it != TSP.end(); ++it){ | ||
if (std::next(it) != TSP.end()) { | ||
result_path += std::to_string(*it)+"--"; // 如果当前元素不是最后一个,则添加空格 | ||
} | ||
else{ | ||
result_path += std::to_string(*it); | ||
} | ||
} | ||
} | ||
else{ | ||
result_path="no path find!"; | ||
} | ||
|
||
// 向CollectiveResults中添加多个Results对象 | ||
results::CollectiveResults results; | ||
auto result = results.add_results(); | ||
result->mutable_record() | ||
->add_columns() | ||
->mutable_entry() | ||
->mutable_element() | ||
->mutable_object() | ||
->set_str(result_path); | ||
|
||
output.put_string_view(results.SerializeAsString()); | ||
txn.Commit(); | ||
return true; | ||
} | ||
|
||
bool TVSP::ShortestPath(const gs::ReadTransaction& txn, label_t v1_l,vid_t v1_index,label_t v2_l,vid_t v2_index,std::vector<int64_t> &result_, uint vertex_num){ | ||
Schema schema_ = txn.schema(); | ||
int vertex_size_ = (int)schema_.vertex_label_num(); | ||
int edge_size_ = (int)schema_.edge_label_num(); | ||
|
||
std::vector<bool> visited(vertex_num+1, false); | ||
std::unordered_map<int64_t, int64_t> parent; | ||
std::vector<label_t> nei_label_; | ||
std::vector<vid_t> nei_index_; | ||
int64_t v1_id = txn.GetVertexId(v1_l, v1_index).AsInt64(); | ||
int64_t v2_id = txn.GetVertexId(v2_l, v2_index).AsInt64(); | ||
|
||
// std::cout<<"v1: "<<v1_id<<std::endl; | ||
// std::cout<<"v2: "<<v2_id<<std::endl; | ||
parent[v1_id] = -1; | ||
nei_label_.push_back(v1_l); | ||
nei_index_.push_back(v1_index); | ||
visited[v1_id] = true; | ||
|
||
std::vector<label_t> next_nei_labels_; | ||
std::vector<vid_t> next_nei_indexs_; | ||
bool find = false; | ||
while(!nei_label_.empty()&&!find) { | ||
for(long unsigned int i = 0 ; i< nei_index_.size();i++){ | ||
for(int j = 0 ; j<vertex_size_;j++){ | ||
for(int k = 0 ; k<edge_size_;k++){ | ||
std::string vertex_name = schema_.get_vertex_label_name(label_t(nei_label_[i])); | ||
std::string nei_name = schema_.get_vertex_label_name(label_t(j)); | ||
std::string edge_name = schema_.get_edge_label_name(label_t(k)); | ||
if(schema_.has_edge_label(vertex_name,nei_name,edge_name)){ | ||
auto outedges = txn.GetOutEdgeIterator(nei_label_[i],nei_index_[i],j,k);//1.self_label 2.self_index 3.edge_label 4.nei_label | ||
while(outedges.IsValid()){ | ||
auto neighbor = outedges.GetNeighbor(); | ||
int64_t v_id = txn.GetVertexId(j, neighbor).AsInt64(); | ||
std::cout<<v_id<<std::endl; | ||
if(!visited[v_id]) { | ||
next_nei_labels_.push_back(j); | ||
next_nei_indexs_.push_back(neighbor); | ||
visited[v_id] = true; | ||
parent[v_id] = txn.GetVertexId(nei_label_[i], nei_index_[i]).AsInt64(); | ||
if(v_id == v2_id) { | ||
find = true; | ||
break; | ||
} | ||
} | ||
outedges.Next(); | ||
} | ||
} | ||
if(schema_.has_edge_label(nei_name,vertex_name,edge_name)){ | ||
auto inedges = txn.GetInEdgeIterator(nei_label_[i],nei_index_[i],j,k);//1.self_label 2.self_index 3.edge_label 4.nei_label | ||
while(inedges.IsValid()){ | ||
auto neighbor = inedges.GetNeighbor(); | ||
int64_t v_id = txn.GetVertexId(j, neighbor).AsInt64(); | ||
if(!visited[v_id]) { | ||
next_nei_labels_.push_back(j); | ||
next_nei_indexs_.push_back(neighbor); | ||
visited[v_id] = true; | ||
parent[v_id] = txn.GetVertexId(nei_label_[i], nei_index_[i]).AsInt64(); | ||
if(v_id == v2_id) { | ||
find = true; | ||
break; | ||
} | ||
} | ||
inedges.Next(); | ||
} | ||
} | ||
} | ||
if(find) break; | ||
} | ||
if(find) break; | ||
} | ||
if(find) break; | ||
nei_label_ = next_nei_labels_; | ||
nei_index_ = next_nei_indexs_; | ||
next_nei_labels_.clear(); | ||
next_nei_indexs_.clear(); | ||
} | ||
if(find) { | ||
int64_t v = v2_id; | ||
while(v != -1) { | ||
result_.push_back(v); | ||
v = parent[v]; | ||
std::cout<<v<<std::endl; | ||
} | ||
std::reverse(result_.begin(), result_.end()); | ||
return true; | ||
} | ||
else { | ||
return false; | ||
} | ||
} | ||
|
||
std::vector<int64_t> TVSP::ConnectPath(std::vector<int64_t> &path1,std::vector<int64_t> &path2, | ||
std::vector<int64_t> &path3){ | ||
std::vector<int64_t> TSP; | ||
int v1v2size = (int)path1.size(); | ||
int v2v3size = (int)path2.size(); | ||
int v1v3size = (int)path3.size(); | ||
if(v1v2size<=v2v3size&&v1v3size<=v2v3size){ | ||
for(int i =v1v2size-1;i>=0;i--){ | ||
TSP.push_back(path1[i]); | ||
} | ||
for(int i = 1;i<v1v3size;i++){ | ||
TSP.push_back(path3[i]); | ||
} | ||
} | ||
else if(v1v2size<=v1v3size&&v2v3size<=v1v3size){ | ||
for(int i= 0;i<v1v2size;i++){ | ||
TSP.push_back(path1[i]); | ||
} | ||
for(int i = 1;i<v2v3size;i++){ | ||
TSP.push_back(path2[i]); | ||
} | ||
} | ||
else if(v2v3size<=v1v2size&&v1v3size<=v1v2size){ | ||
for(int i = 0;i<v2v3size;i++){ | ||
TSP.push_back(path2[i]); | ||
} | ||
for(int i = v1v3size-2;i>=0;i--){ | ||
TSP.push_back(path3[i]); | ||
} | ||
} | ||
return TSP; | ||
} | ||
AppWrapper TVSPFactory::CreateApp(const GraphDB& db) { | ||
return AppWrapper(new TVSP(), NULL); | ||
} | ||
} // namespace gs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/** Copyright 2020 Alibaba Group Holding Limited. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef ENGINES_GRAPH_DB_APP_BUILDIN_TVSP_H_ | ||
#define ENGINES_GRAPH_DB_APP_BUILDIN_TVSP_H_ | ||
#include "flex/engines/graph_db/database/graph_db_session.h" | ||
#include "flex/engines/hqps_db/app/interactive_app_base.h" | ||
|
||
namespace gs { | ||
// A simple app to count the number of vertices of a given label. | ||
class TVSP : public CypherInternalPbWriteAppBase { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please rename the filename, maybe shortest_path.h? |
||
private: | ||
// std::string label_name1; | ||
// int32_t vid1; | ||
// std::string label_name2; | ||
// int32_t vid2; | ||
// std::string label_name3; | ||
// int32_t vid3; | ||
|
||
public: | ||
TVSP() {} | ||
bool DoQuery(GraphDBSession& sess, Decoder& input, Encoder& output) override; | ||
bool ShortestPath(const gs::ReadTransaction& txn, label_t v1_l,vid_t v1_index,label_t v2_l,vid_t v2_index,std::vector<int64_t> &result_, uint vertex_num); | ||
std::vector<int64_t> ConnectPath(std::vector<int64_t> &path1,std::vector<int64_t> &path2,std::vector<int64_t> &path3); | ||
|
||
}; | ||
|
||
class TVSPFactory : public AppFactoryBase { | ||
public: | ||
TVSPFactory() = default; | ||
~TVSPFactory() = default; | ||
|
||
AppWrapper CreateApp(const GraphDB& db) override; | ||
}; | ||
|
||
} // namespace gs | ||
|
||
#endif // ENGINES_GRAPH_DB_APP_BUILDIN_TVSP_H_ |
116 changes: 116 additions & 0 deletions
116
flex/engines/graph_db/app/builtin/k_degree_neighbors.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
/** Copyright 2020 Alibaba Group Holding Limited. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#include "flex/engines/graph_db/app/builtin/k_degree_neighbors.h" | ||
|
||
namespace gs { | ||
|
||
bool KNeighbors::DoQuery(GraphDBSession& sess, Decoder& input, | ||
Encoder& output) { | ||
// 创建一个CollectiveResults对象 | ||
auto txn = sess.GetReadTransaction(); | ||
Schema schema_ = txn.schema(); | ||
if (input.empty()) { | ||
return false; | ||
} | ||
this->vertex_id_=input.get_int(); | ||
std::string label_name { input.get_string()}; | ||
this->k=input.get_int(); | ||
|
||
if(k<=0) { | ||
output.put_string_view("k must be greater than 0."); | ||
return false; | ||
} | ||
if(!schema_.has_vertex_label(label_name)){ | ||
output.put_string_view("The requested label doesn't exits."); | ||
return false; // The requested label doesn't exits. | ||
} | ||
this->vertex_label_=schema_.get_vertex_label_id(label_name); | ||
|
||
|
||
std::set<int64_t> k_neighbors; | ||
|
||
int vertex_size_ = (int)schema_.vertex_label_num(); | ||
int edge_size_ = (int)schema_.edge_label_num(); | ||
|
||
std::vector<vid_t> nei_index_; | ||
std::vector<label_t> nei_label_; | ||
std::vector<vid_t> next_nei_indexs_; | ||
std::vector<label_t> next_nei_label_; | ||
|
||
nei_label_.push_back(vertex_label_); | ||
vid_t vertex_index{}; | ||
if(!txn.GetVertexIndex(vertex_label_, (int64_t)vertex_id_, vertex_index)){ | ||
output.put_string_view("get index fail."); | ||
return false; | ||
} | ||
nei_index_.push_back(vertex_index); | ||
//层次遍历得到k跳邻居 | ||
while(!nei_index_.empty() && k > 0) { | ||
for(long unsigned int i = 0 ; i<nei_index_.size();i++){ | ||
for(int j = 0 ; j<vertex_size_;j++){ | ||
for(int k = 0 ; k<edge_size_;k++){ | ||
std::string vertex_name = schema_.get_vertex_label_name(label_t(nei_label_[i])); | ||
std::string nei_name = schema_.get_vertex_label_name(label_t(j)); | ||
std::string edge_name = schema_.get_edge_label_name(label_t(k)); | ||
if(schema_.has_edge_label(vertex_name,nei_name,edge_name)){ | ||
auto outedges = txn.GetOutEdgeIterator(nei_label_[i],nei_index_[i],j,k);//1.self_label 2.self_index 3.edge_label 4.nei_label | ||
while(outedges.IsValid()){ | ||
auto neighbor = outedges.GetNeighbor(); | ||
next_nei_label_.push_back(j); | ||
next_nei_indexs_.push_back(neighbor); | ||
k_neighbors.insert(txn.GetVertexId(j, neighbor).AsInt64()); | ||
outedges.Next(); | ||
} | ||
} | ||
if(schema_.has_edge_label(nei_name,vertex_name,edge_name)){ | ||
auto inedges = txn.GetInEdgeIterator(nei_label_[i],nei_index_[i],j,k);//1.self_label 2.self_index 3.edge_label 4.nei_label | ||
while(inedges.IsValid()){ | ||
auto neighbor = inedges.GetNeighbor(); | ||
next_nei_label_.push_back(j); | ||
next_nei_indexs_.push_back(neighbor); | ||
k_neighbors.insert(txn.GetVertexId(j, neighbor).AsInt64()); | ||
inedges.Next(); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
nei_index_ = next_nei_indexs_; | ||
nei_label_ = next_nei_label_; | ||
next_nei_label_.clear(); | ||
next_nei_indexs_.clear(); | ||
k--; | ||
} | ||
std::string res = ""; | ||
for(auto it:k_neighbors){ | ||
res+=(std::to_string(it)+" "); | ||
} | ||
results::CollectiveResults results; | ||
auto result = results.add_results(); | ||
result->mutable_record() | ||
->add_columns() | ||
->mutable_entry() | ||
->mutable_element() | ||
->mutable_object() | ||
->set_str(res); | ||
output.put_string_view(results.SerializeAsString()); | ||
txn.Commit(); | ||
return true; | ||
} | ||
|
||
AppWrapper KNeighborsFactory::CreateApp(const GraphDB& db) { | ||
return AppWrapper(new KNeighbors(), NULL); | ||
} | ||
} // namespace gs |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check the comments,