You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@age.apache.org by GitBox <gi...@apache.org> on 2022/02/18 17:17:52 UTC
[GitHub] [incubator-age] muhammadshoaib opened a new pull request #188: Age load issue
muhammadshoaib opened a new pull request #188:
URL: https://github.com/apache/incubator-age/pull/188
Fixed issue with AGE Load
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@age.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-age] JoshInnis merged pull request #188: Age load issue
Posted by GitBox <gi...@apache.org>.
JoshInnis merged pull request #188:
URL: https://github.com/apache/incubator-age/pull/188
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@age.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-age] jrgemignani commented on a change in pull request #188: Age load issue
Posted by GitBox <gi...@apache.org>.
jrgemignani commented on a change in pull request #188:
URL: https://github.com/apache/incubator-age/pull/188#discussion_r816388016
##########
File path: src/backend/utils/load/ag_load_edges.c
##########
@@ -171,8 +174,10 @@ int create_edges_from_csv_file(char *file_path,
cr.object_id = object_id;
while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_edges.c
##########
@@ -171,8 +174,10 @@ int create_edges_from_csv_file(char *file_path,
cr.object_id = object_id;
while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {
- if (csv_parse(&p, buf, bytes_read, edge_field_cb, edge_row_cb, &cr) != bytes_read) {
- ereport(ERROR, (errmsg("Error while parsing file: %s\n", csv_strerror(csv_error(&p)))));
+ if (csv_parse(&p, buf, bytes_read, edge_field_cb,
+ edge_row_cb, &cr) != bytes_read) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
agtype_in_state result;
int i;
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value("id"));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, integer_to_agtype_value(vertex_id));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value("__id__"));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ integer_to_agtype_value(vertex_id));
for (i = 0; i<fields_len; i++) {
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value(header[i]));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, string_to_agtype_value(fields[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value(header[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ string_to_agtype_value(fields[i]));
}
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list_i(char **header, char **fields, size_t fields_len, size_t start_index) {
+agtype* create_agtype_from_list_i(char **header, char **fields,
+ size_t fields_len, size_t start_index) {
agtype_in_state result;
size_t i;
- if (start_index + 1 == fields_len)
+ if (start_index + 1 == fields_len) {
return create_empty_agtype();
-
-
+ }
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
for (i = start_index; i<fields_len; i++) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
agtype_in_state result;
int i;
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value("id"));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, integer_to_agtype_value(vertex_id));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value("__id__"));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ integer_to_agtype_value(vertex_id));
for (i = 0; i<fields_len; i++) {
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value(header[i]));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, string_to_agtype_value(fields[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value(header[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ string_to_agtype_value(fields[i]));
}
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list_i(char **header, char **fields, size_t fields_len, size_t start_index) {
+agtype* create_agtype_from_list_i(char **header, char **fields,
+ size_t fields_len, size_t start_index) {
agtype_in_state result;
size_t i;
- if (start_index + 1 == fields_len)
+ if (start_index + 1 == fields_len) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
agtype_in_state result;
int i;
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value("id"));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, integer_to_agtype_value(vertex_id));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value("__id__"));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ integer_to_agtype_value(vertex_id));
for (i = 0; i<fields_len; i++) {
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value(header[i]));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, string_to_agtype_value(fields[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value(header[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ string_to_agtype_value(fields[i]));
}
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list_i(char **header, char **fields, size_t fields_len, size_t start_index) {
+agtype* create_agtype_from_list_i(char **header, char **fields,
+ size_t fields_len, size_t start_index) {
agtype_in_state result;
size_t i;
- if (start_index + 1 == fields_len)
+ if (start_index + 1 == fields_len) {
return create_empty_agtype();
-
-
+ }
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
for (i = start_index; i<fields_len; i++) {
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value(header[i]));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, string_to_agtype_value(fields[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value(header[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ string_to_agtype_value(fields[i]));
}
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-void insert_edge_simple(Oid graph_id, char* label_name, graphid edge_id, graphid start_id, graphid end_id, agtype* edge_properties) {
+void insert_edge_simple(Oid graph_id, char* label_name, graphid edge_id,
+ graphid start_id, graphid end_id,
+ agtype* edge_properties) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
agtype_in_state result;
int i;
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value("id"));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, integer_to_agtype_value(vertex_id));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value("__id__"));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ integer_to_agtype_value(vertex_id));
for (i = 0; i<fields_len; i++) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_labels.c
##########
@@ -81,7 +81,8 @@ void vertex_field_cb(void *field, size_t field_len, void *data) {
if (cr->fields == NULL) {
cr->error = 1;
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_edges.c
##########
@@ -44,7 +44,8 @@ void edge_field_cb(void *field, size_t field_len, void *data) {
if (cr->fields == NULL) {
Review comment:
Brace needs to be on its own line -
some_function(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_labels.c
##########
@@ -199,15 +202,18 @@ int create_labels_from_csv_file(char *file_path,
while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {
- if (csv_parse(&p, buf, bytes_read, vertex_field_cb, vertex_row_cb, &cr) != bytes_read) {
- ereport(ERROR, (errmsg("Error while parsing file: %s\n", csv_strerror(csv_error(&p)))));
+ if (csv_parse(&p, buf, bytes_read, vertex_field_cb,
+ vertex_row_cb, &cr) != bytes_read) {
+ ereport(ERROR, (errmsg("Error while parsing file: %s\n",
+ csv_strerror(csv_error(&p)))));
}
}
csv_fini(&p, vertex_field_cb, vertex_row_cb, &cr);
if (ferror(fp)) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_labels.c
##########
@@ -199,15 +202,18 @@ int create_labels_from_csv_file(char *file_path,
while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {
- if (csv_parse(&p, buf, bytes_read, vertex_field_cb, vertex_row_cb, &cr) != bytes_read) {
- ereport(ERROR, (errmsg("Error while parsing file: %s\n", csv_strerror(csv_error(&p)))));
+ if (csv_parse(&p, buf, bytes_read, vertex_field_cb,
+ vertex_row_cb, &cr) != bytes_read) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -126,15 +147,21 @@ void insert_edge_simple(Oid graph_id, char* label_name, graphid edge_id, graphid
values[2] = GRAPHID_GET_DATUM(end_id);
values[3] = AGTYPE_P_GET_DATUM((edge_properties));
- label_relation = heap_open(get_label_relation(label_name, graph_id), RowExclusiveLock);
- tuple = heap_form_tuple(RelationGetDescr(label_relation), values, nulls);
+ label_relation = heap_open(get_label_relation(label_name,
+ graph_id),
+ RowExclusiveLock);
+
+ tuple = heap_form_tuple(RelationGetDescr(label_relation),
+ values, nulls);
heap_insert(label_relation, tuple,
GetCurrentCommandId(true), 0, NULL);
heap_close(label_relation, RowExclusiveLock);
CommandCounterIncrement();
}
-void insert_vertex_simple(Oid graph_id, char* label_name, graphid vertex_id, agtype* vertex_properties) {
+void insert_vertex_simple(Oid graph_id, char* label_name,
+ graphid vertex_id,
+ agtype* vertex_properties) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/ag_load_labels.c
##########
@@ -199,15 +202,18 @@ int create_labels_from_csv_file(char *file_path,
while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
##########
File path: src/backend/utils/load/age_load.c
##########
@@ -63,57 +63,78 @@ static agtype* create_empty_agtype(void) {
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list(char **header, char **fields, size_t fields_len, int64 vertex_id) {
+agtype* create_agtype_from_list(char **header, char **fields,
+ size_t fields_len, int64 vertex_id) {
agtype_in_state result;
int i;
memset(&result, 0, sizeof(agtype_in_state));
- result.res = push_agtype_value(&result.parse_state, WAGT_BEGIN_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_BEGIN_OBJECT, NULL);
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value("id"));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, integer_to_agtype_value(vertex_id));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value("__id__"));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ integer_to_agtype_value(vertex_id));
for (i = 0; i<fields_len; i++) {
- result.res = push_agtype_value(&result.parse_state, WAGT_KEY, string_to_agtype_value(header[i]));
- result.res = push_agtype_value(&result.parse_state, WAGT_VALUE, string_to_agtype_value(fields[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_KEY,
+ string_to_agtype_value(header[i]));
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_VALUE,
+ string_to_agtype_value(fields[i]));
}
- result.res = push_agtype_value(&result.parse_state, WAGT_END_OBJECT, NULL);
+ result.res = push_agtype_value(&result.parse_state,
+ WAGT_END_OBJECT, NULL);
return agtype_value_to_agtype(result.res);
}
-agtype* create_agtype_from_list_i(char **header, char **fields, size_t fields_len, size_t start_index) {
+agtype* create_agtype_from_list_i(char **header, char **fields,
+ size_t fields_len, size_t start_index) {
Review comment:
Brace needs to be on its own line -
some_function_or_command(blah blah,...)
{
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@age.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org