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.

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

HPCC-19070 Add support to base classes for substring matches on fields. #10861

Merged
merged 1 commit into from Feb 8, 2018

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Feb 8, 2018

Signed-off-by: Gavin Halliday gavin.halliday@lexisnexis.com

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
    • 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

Testing:

@hpcc-jirabot
Copy link

case type_data:
case type_string:
//Special case if source and destination types are identical to avoid cloning strings
if ((destType.fieldType & sameTypeMask) == (sourceType.fieldType & sameTypeMask))
Copy link
Member Author

Choose a reason for hiding this comment

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

This function moved - but this particular part of the code is new - to avoid cloning strings when resizing them. It will also potentially optimize some cases of projecting fields whether the change is the length that are not already special cased.

@ghalliday
Copy link
Member Author

@richardkchapman please review.
I pushed this as a separate commit before starting the code generator work, because this is a self contained unit, and I suspect I may not get the codegen changes finished by end of today.

@@ -189,6 +188,8 @@ class jlib_decl MemoryBuffer
inline void Release() const { delete this; } // for consistency even though not link counted

inline void * bufferBase() const { return buffer; }
inline const char * toByteArray() const { return curLen ? buffer : NULL; }
Copy link
Member

Choose a reason for hiding this comment

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

use nullptr?

Copy link
Member Author

Choose a reason for hiding this comment

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

code moved rather than new, but I will change it.

return values->matches(ptr + sizeof(size32_t));

//Clone and expand the string to the expected length
byte * temp = (byte *)alloca(maxTempLength);
Copy link
Member

Choose a reason for hiding this comment

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

What happens when people use STRING1000000 ... Do they get what they deserve?

Copy link
Member Author

Choose a reason for hiding this comment

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

It would only by triggered for

variablesizefieldstring[1..1000000] = 'x'

in which case, yes they probably get what they deserve! I will add an assert that the substring length is < 1000.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like you added a check that less than 256 ...

}

return new VariableSubStringFieldFilter(fieldId, type, subType, values);
}
}

UNIMPLEMENTED_X("Unknown Field Filter");
Copy link
Member

Choose a reason for hiding this comment

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

Unimplemented? Or unexpected?

@richardkchapman
Copy link
Member

@ghalliday Some minor comments - looks good

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
Sha: c1fb73a
Build: success
Install hpccsystems-platform-community_6.5.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 81 81 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 741 741 0
test (thor) 650 650 0
test (roxie) 768 768 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
32 sec (00:00:32) 180 sec (00:03:00) 55 sec (00:00:55) 6 sec (00:00:06) 37 sec (00:00:37) 1070 sec (00:17:50) 33 sec (00:00:33) 1413 sec (00:23:33)

@ghalliday
Copy link
Member Author

@richardkchapman see changes.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
@richardkchapman richardkchapman merged commit 3d39eb3 into hpcc-systems:master Feb 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants