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

Merge ObjType and ObjectType enums #2522

Closed
stress-tess opened this issue Jun 23, 2023 · 2 comments · Fixed by #3358
Closed

Merge ObjType and ObjectType enums #2522

stress-tess opened this issue Jun 23, 2023 · 2 comments · Fixed by #3358
Labels
Technical Debt Rework code for more flexibility or readability

Comments

@stress-tess
Copy link
Member

We got 2 different enums for object types. One used primarily for message / parameter objects and the other used for file IO / most select statements. We should dig into this to see if these can be merged into one thing

@stress-tess stress-tess added the Technical Debt Rework code for more flexibility or readability label Jun 23, 2023
@Ethan-DeBandi99
Copy link
Contributor

Its worth noting here that these do vary slightly. The ObjType enum is strictly for Arkouda objects. The ObjectType enum used by the message parameter parser also includes values for Scalar and JSON. I am not positive that merging these is the right course of action based on their intended purpose. It may be more beneficial to rename ObjectType to ParameterType or something of that nature.

@stress-tess
Copy link
Member Author

stress-tess commented Aug 21, 2023

Okay the rename is seems fine by me!

jeremiah-corrado added a commit to jeremiah-corrado/arkouda that referenced this issue Jun 25, 2024
…rs-R-Us#2522. Only 'efunc2Msg' was using this functionality, so put a temporary fix in place until it can be refactored

Signed-off-by: Jeremiah Corrado <[email protected]>
github-merge-queue bot pushed a commit that referenced this issue Jun 27, 2024
* remove binary commandMap by including binary-payload field in MsgTuple. Fix misleading indentation in serverDaemon. Remove repeated error-handling code from ServerDaemon.

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove commandMapArray by adding payload field to MessageArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix messageArgs serialization bug

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove unecessary string.doFormat, replacing with string.format

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove symbols duplicated across IOCompat versions

Signed-off-by: Jeremiah Corrado <[email protected]>

* start refactor of ParameterObj. Simplified argument parsing API to include 'toScalar', 'toScalarTuple', 'toScalarList', 'toScalarArray'. Other methods were removed or "deprecated".  Added 'this()' indexing to msgArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType enum from Message.chpl (and message.py) - resolves #2522. Only 'efunc2Msg' was using this functionality, so put a temporary fix in place until it can be refactored

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix dep modules wrt IOCompat changes

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType from message.py tests

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix tuple and array deserialization for array-api-builds. Fix a bug in the array-api 'tolist' introduced in #3242

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove duplicate serialize method from MessageArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix formatting in Message.chpl

Signed-off-by: Jeremiah Corrado <[email protected]>

---------

Signed-off-by: Jeremiah Corrado <[email protected]>
Co-authored-by: ajpotts <[email protected]>
github-merge-queue bot pushed a commit that referenced this issue Jul 1, 2024
* remove binary commandMap by including binary-payload field in MsgTuple. Fix misleading indentation in serverDaemon. Remove repeated error-handling code from ServerDaemon.

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove commandMapArray by adding payload field to MessageArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix messageArgs serialization bug

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove unecessary string.doFormat, replacing with string.format

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove symbols duplicated across IOCompat versions

Signed-off-by: Jeremiah Corrado <[email protected]>

* start refactor of ParameterObj. Simplified argument parsing API to include 'toScalar', 'toScalarTuple', 'toScalarList', 'toScalarArray'. Other methods were removed or "deprecated".  Added 'this()' indexing to msgArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType enum from Message.chpl (and message.py) - resolves #2522. Only 'efunc2Msg' was using this functionality, so put a temporary fix in place until it can be refactored

Signed-off-by: Jeremiah Corrado <[email protected]>

* add this() accessor to SymbolTable, adjust ManipulationMsg to use it. Fold error handling into 'executeCommand'

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix dep modules wrt IOCompat changes

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix build errors originating in server deamon error message metrics

Signed-off-by: Jeremiah Corrado <[email protected]>

* fold symbol creation response code into the symbol table. Update ManipulationMsg to use the new API

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType from message.py tests

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix typo in merge-conflict resolution

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix build failures and warnings for older versions of Chapel

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix merge conflict resolution errors:

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix duplicate line in serverDaemon

Signed-off-by: Jeremiah Corrado <[email protected]>

---------

Signed-off-by: Jeremiah Corrado <[email protected]>
github-merge-queue bot pushed a commit that referenced this issue Jul 15, 2024
* remove binary commandMap by including binary-payload field in MsgTuple. Fix misleading indentation in serverDaemon. Remove repeated error-handling code from ServerDaemon.

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove commandMapArray by adding payload field to MessageArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix messageArgs serialization bug

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove unecessary string.doFormat, replacing with string.format

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove symbols duplicated across IOCompat versions

Signed-off-by: Jeremiah Corrado <[email protected]>

* start refactor of ParameterObj. Simplified argument parsing API to include 'toScalar', 'toScalarTuple', 'toScalarList', 'toScalarArray'. Other methods were removed or "deprecated".  Added 'this()' indexing to msgArgs

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType enum from Message.chpl (and message.py) - resolves #2522. Only 'efunc2Msg' was using this functionality, so put a temporary fix in place until it can be refactored

Signed-off-by: Jeremiah Corrado <[email protected]>

* add this() accessor to SymbolTable, adjust ManipulationMsg to use it. Fold error handling into 'executeCommand'

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix dep modules wrt IOCompat changes

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix build errors originating in server deamon error message metrics

Signed-off-by: Jeremiah Corrado <[email protected]>

* fold symbol creation response code into the symbol table. Update ManipulationMsg to use the new API

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove objType from message.py tests

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix typo in merge-conflict resolution

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix build failures and warnings for older versions of Chapel

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix merge conflict resolution errors:

Signed-off-by: Jeremiah Corrado <[email protected]>

* add script to support registerCommand and registerAndInstantiate annotations for fully and partially automated command registration

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix frontend parsing of multi-array responses generated from 'MsgTuple.fromResponses'

Signed-off-by: Jeremiah Corrado <[email protected]>

* add register-commnds to makefile for calling register_commands.py script. Rename server-config.json to registration-config.json (update old parseServerConfig script accordingly). Make some minor qol improvements to the new register_commands script

Signed-off-by: Jeremiah Corrado <[email protected]>

* finish converting ManipulationMsg to use new registration script

Signed-off-by: Jeremiah Corrado <[email protected]>

* update 'test_client_get_server_commands' to not include 'array' (this command no longer requires special handling in the serverDaemon)

Signed-off-by: Jeremiah Corrado <[email protected]>

* adjust array_api/manipulation_functions to use new commands. Move type checking into frontend for concat and stack (implement type promotion that was missing)

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix type annotation

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix type annotation

Signed-off-by: Jeremiah Corrado <[email protected]>

* start translating statsMsg to use new registration framework

Signed-off-by: Jeremiah Corrado <[email protected]>

* finish switching statsMsg to new registration framework

Signed-off-by: Jeremiah Corrado <[email protected]>

* generate code with spaces instead of tabs in register_commands.py

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix aryUtilCompat modules

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix compilation errors in stats

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix compilation errors for older versions of chapel and for multidimensional builds

Signed-off-by: Jeremiah Corrado <[email protected]>

* use python dtype names in MsgTuple.fromScalar (instead of Chapel type names)

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix corr and cov computations

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix some array-api test failures

Signed-off-by: Jeremiah Corrado <[email protected]>

* don't include modules in Commands.chpl if they don't contain any annotated procedures

Signed-off-by: Jeremiah Corrado <[email protected]>

* apply black formatting to array api modules

Signed-off-by: Jeremiah Corrado <[email protected]>

* fix failing array api tests

Signed-off-by: Jeremiah Corrado <[email protected]>

* remove duplicate line from ServerDaemon

Signed-off-by: Jeremiah Corrado <[email protected]>

---------

Signed-off-by: Jeremiah Corrado <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Technical Debt Rework code for more flexibility or readability
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants