Skip to content
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

HPCC-28288 Add support for regex and timestamp types. #18530

Merged
merged 1 commit into from
Apr 23, 2024
Merged

HPCC-28288 Add support for regex and timestamp types. #18530

merged 1 commit into from
Apr 23, 2024

Conversation

jackdelv
Copy link
Contributor

@jackdelv jackdelv commented Apr 12, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@jackdelv jackdelv requested review from ghalliday and dcamper April 12, 2024 17:28
dcamper
dcamper requested changes Apr 15, 2024
View reviewed changes
Copy link
Contributor

@dcamper dcamper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. Questions regarding clarity more than anything else.

plugins/mongodb/examples/mongodb-test.ecl Outdated
@@ -57,6 +57,13 @@ layoutDates := {STRING bucket_start_date, STRING bucket_end_date};
layoutEmployee := {INTEGER1 id, STRING25 first, STRING25 last, REAL salary};
layoutperson := {String username, String address, String email};

layoutRegexTimestamp := RECORD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this definition (and the associated test code) conflating testing regex and timestamp data types? I feel like the new data types should be defined and tested separately, for clarity.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separated the test cases.

plugins/mongodb/mongodb.ecllib
@@ -26,3 +26,6 @@ EXPORT boolean supportsScript := true;
EXPORT updateResultRecord := {INTEGER matched_count, INTEGER modified_count};
EXPORT insertManyResultRecord := {INTEGER inserted_count};
EXPORT deleteResultRecord := {INTEGER deleted_count};

EXPORT regexType := {STRING pattern, STRING options};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we document these fields, or provide a URL to a MongoDB page describing their usage?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a url in the ecllib file and added to the documentation in the README.md file.

plugins/mongodb/mongodb.ecllib
@@ -26,3 +26,6 @@ EXPORT boolean supportsScript := true;
EXPORT updateResultRecord := {INTEGER matched_count, INTEGER modified_count};
EXPORT insertManyResultRecord := {INTEGER inserted_count};
EXPORT deleteResultRecord := {INTEGER deleted_count};

EXPORT regexType := {STRING pattern, STRING options};
EXPORT timestampType := {UNSIGNED t, UNSIGNED i};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we document these fields, or provide a URL to a MongoDB page describing their usage?

@jackdelv jackdelv requested a review from dcamper April 15, 2024 13:51
dcamper
dcamper approved these changes Apr 15, 2024
View reviewed changes
Copy link
Contributor

@dcamper dcamper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much clearer, thanks. Approved.

ghalliday
ghalliday reviewed Apr 18, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor comment, otherwise looks good.

plugins/mongodb/mongodbembed.cpp Outdated
while (*end && *end != '}')
end++;

end++;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if *end is '\0' (which I imagine should never happen) then this will increment end to point past the end of the string.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a check for the null character in case there is invalid json or an error while processing.

@ghalliday
Copy link
Member

Also needs re-basing following the change to fixes white-space.

@jackdelv jackdelv requested a review from ghalliday April 18, 2024 13:10
ghalliday
ghalliday approved these changes Apr 22, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash.

@jackdelv
Copy link
Contributor Author

@ghalliday Squashed.

@jackdelv jackdelv requested a review from ghalliday April 23, 2024 14:19
@ghalliday ghalliday merged commit 5dd80da into hpcc-systems:candidate-9.6.x Apr 23, 2024
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcamper dcamper dcamper approved these changes

@ghalliday ghalliday ghalliday approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jackdelv @ghalliday @dcamper