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

Jump to bottom

Age load issue #188

Merged

JoshInnis merged 14 commits into apache:master from muhammadshoaib:age_load_issue

Mar 2, 2022

Contributor

muhammadshoaib commented Feb 18, 2022

Fixed issue with AGE Load


          Fixed error with AGE LOAD

6cfd669

muhammadshoaib force-pushed the age_load_issue branch from ce2c4c8 to 6cfd669 Compare

February 18, 2022 17:22

muhammadshoaib and others added 3 commits

February 20, 2022 13:44


          Fixed error with AGE LOAD

d18fe09

fixed regression test issue


          fixed code lines issues

477874f


          Refactor agtype_access_operator

466f094

Refactored the agtype_access_operator and support functions to
eliminate the constant conversions back-and-forth.

Also corrected the response to AGTV_NULL

Moved get_agtype_key from age_vle.c to agtype.c for usage by
others.

Adjusted 2 regression tests.

jrgemignani reviewed

View reviewed changes

src/backend/utils/load/ag_load_edges.c Outdated

		@@ -44,7 +44,8 @@ void edge_field_cb(void field, size_t field_len, void data) {
		if (cr->fields == NULL) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function(blah blah,...)
{

src/backend/utils/load/ag_load_edges.c Outdated

		@@ -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) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/ag_load_edges.c Outdated

-                      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) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

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;

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/ag_load_labels.c Outdated

		@@ -199,15 +202,18 @@ int create_labels_from_csv_file(char *file_path,


		while ((bytes_read=fread(buf, 1, 1024, fp)) > 0) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/age_load.c Outdated

                   agtype_in_state result;
                   size_t i;
-                  if (start_index + 1 == fields_len)
+                  if (start_index + 1 == fields_len) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/age_load.c Outdated

                   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++) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/age_load.c Outdated

-              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) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/age_load.c Outdated

-              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) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

src/backend/utils/load/ag_load_labels.c Outdated

-                      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) {

Contributor

jrgemignani Mar 1, 2022

Brace needs to be on its own line -

some_function_or_command(blah blah,...)
{

muhammadshoaib added 10 commits

March 1, 2022 21:12


          fixed code lines issues

b86a311


          fixed code lines issues

5c1be3b


          fixed code lines issues

9c7a750


          Fixed error with AGE LOAD

3c17d98


          Fixed error with AGE LOAD

887daf5

fixed regression test issue


          fixed code lines issues

11847cc


          fixed code lines issues

26a0c45


          fixed code lines issues

4ee2442


          fixed code lines issues

7ff6560


          Merge remote-tracking branch 'dest/age_load_issue' into age_load_issue

f02a943

JoshInnis merged commit ac4c7f9 into apache:master

muhammadshoaib deleted the age_load_issue branch

March 23, 2023 10:58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment