Skip to content

Commit

Permalink
squash. Genquery2Input serialization w/ test. clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@korydraughn
korydraughn committed Apr 4, 2024
1 parent c294cf8 commit 1544e47
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 19 deletions.
69 changes: 68 additions & 1 deletion scripts/irods/test/test_dynamic_peps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,75 @@ def has_avu():
# This isn't required, but we do it here to keep the database metadata
# tables small, for performance reasons.
self.admin.run_icommand(['imeta', 'rm', '-C', self.admin.session_collection, attr_name_1, delay_rule_body])
self.admin.run_icommand(['imeta', 'rm', '-C', self.admin.session_collection, attr_name_2, '1'])
self.admin.run_icommand(['imeta', 'rm', '-C', self.admin.session_collection, attr_name_2, '12'])

finally:
# Restart so the server's original configuration takes effect.
IrodsController().restart(test_mode=True)

@unittest.skipIf(plugin_name != 'irods_rule_engine_plugin-irods_rule_language' or test.settings.RUN_IN_TOPOLOGY, "Requires NREP and single node zone.")
def test_if_Genquery2Input_is_exposed__issue_7570(self):
with temporary_core_file() as core:
avu_prefix = 'test_if_Genquery2Input_is_exposed__issue_7570'

# Add a rule to core.re which when triggered will add AVUs to the user's
# session collection.
core.add_rule(dedent('''
pep_api_genquery2_pre(*inst, *comm, *input, *output) {{
*v = *input.query_string;
msiModAVUMetadata('-C', '{self.user.session_collection}', 'add', '{avu_prefix}_0', *v, '');
*v = *input.zone;
if (strlen(*v) > 0) {{
msiModAVUMetadata('-C', '{self.user.session_collection}', 'add', '{avu_prefix}_1', *v, '');
}}
else {{
msiModAVUMetadata('-C', '{self.user.session_collection}', 'add', '{avu_prefix}_1', 'unspecified', '');
}}
*v = *input.sql_only;
msiModAVUMetadata('-C', '{self.user.session_collection}', 'add', '{avu_prefix}_2', *v, '');
*v = *input.column_mappings;
msiModAVUMetadata('-C', '{self.user.session_collection}', 'add', '{avu_prefix}_3', *v, '');
}}
'''.format(**locals())))

try:
# Trigger PEP, ignore output.
query_string = f"select COLL_NAME where COLL_NAME = '{self.user.session_collection}'"
self.user.assert_icommand(['iquery', query_string], 'STDOUT')

# Show the session collection has the expected AVUs attached to it.
self.user.assert_icommand(['imeta', 'ls', '-C', self.user.session_collection], 'STDOUT', [
f'attribute: {avu_prefix}_0\nvalue: {query_string}\n',
f'attribute: {avu_prefix}_1\nvalue: unspecified\n',
f'attribute: {avu_prefix}_2\nvalue: 0\n',
f'attribute: {avu_prefix}_3\nvalue: 0\n',
])

# Remove the AVUs to avoid duplicate AVU errors. These will cause the test to fail.
self.user.assert_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_0', query_string])
self.user.assert_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_1', 'unspecified'])
self.user.assert_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_2', '0'])
self.user.assert_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_3', '0'])

# Now, with the zone explicitly passed.
self.user.assert_icommand(['iquery', '-z', self.user.zone_name, query_string], 'STDOUT')

# Show the session collection has the expected AVUs attached to it.
self.user.assert_icommand(['imeta', 'ls', '-C', self.user.session_collection], 'STDOUT', [
f'attribute: {avu_prefix}_0\nvalue: {query_string}\n',
f'attribute: {avu_prefix}_1\nvalue: {self.user.zone_name}\n',
f'attribute: {avu_prefix}_2\nvalue: 0\n',
f'attribute: {avu_prefix}_3\nvalue: 0\n',
])

finally:
# This isn't required, but we do it here to keep the database metadata
# tables small, for performance reasons.
self.user.run_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_0', query_string])
self.user.run_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_1', 'unspecified'])
self.user.run_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_1', self.user.zone_name])
self.user.run_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_2', '0'])
self.user.run_icommand(['imeta', 'rm', '-C', self.user.session_collection, f'{avu_prefix}_3', '0'])
2 changes: 1 addition & 1 deletion server/genquery2/include/irods/private/genquery2_table_column_mappings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ namespace irods::experimental::genquery2
//{"TICKET_EXPIRY_TIME", {"R_TICKET_MAIN", "ticket_expiry_ts"}},
//{"TICKET_CREATE_TIME", {"R_TICKET_MAIN", "create_time"}},
//{"TICKET_MODIFY_TIME", {"R_TICKET_MAIN", "modify_time"}},

// Is this possible? Does it make sense?
// This isn't a thing in GenQuery1.
//{"TICKET_LOGICAL_PATH", {"R_TICKET_MAIN", "modify_time"}},
Expand Down
8 changes: 4 additions & 4 deletions server/genquery2/src/genquery2_sql.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,10 @@ namespace
alias = _state.table_aliases.at(std::string{iter->second.table});
}

const auto ast_iter = std::find_if(
std::begin(_state.ast_column_ptrs),
std::end(_state.ast_column_ptrs),
[&se](const irods::experimental::genquery2::column* _p) { return _p->name == se.column; });
const auto ast_iter =
std::find_if(std::begin(_state.ast_column_ptrs),
std::end(_state.ast_column_ptrs),
[&se](const irods::experimental::genquery2::column* _p) { return _p->name == se.column; });

if (std::end(_state.ast_column_ptrs) == ast_iter) {
throw std::invalid_argument{"cannot generate SQL from General Query."};
Expand Down
34 changes: 21 additions & 13 deletions server/re/src/irods_re_serialization.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1120,26 +1120,28 @@ namespace irods::re_serialization
return SUCCESS();
} // serialize_bytesBuf_ptr


static irods::error serialize_const_Genquery2Input_ptr(boost::any _p, serialized_parameter_t& _out)
static irods::error serialize_Genquery2Input_ptr(boost::any _p, serialized_parameter_t& _out)
{
try {
auto* v = boost::any_cast<const Genquery2Input*>(_p);
const auto* v = boost::any_cast<Genquery2Input*>(_p);

_out["query_string"] = v->query_string;
_out["zone"] = v->zone;
_out["query_string"] = v->query_string ? v->query_string : "";
_out["zone"] = v->zone ? v->zone : "";
_out["sql_only"] = std::to_string(v->sql_only);
_out["column_mappings"] = std::to_string(v->column_mappings);

return SUCCESS();
}
catch (const boost::bad_any_cast& e) {
return ERROR(INVALID_ANY_CAST, fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(
INVALID_ANY_CAST,
fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
}
catch (const std::exception& e) {
return ERROR(SYS_LIBRARY_ERROR, fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(SYS_LIBRARY_ERROR,
fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
}
} // serialize_const_Genquery2Input_ptr
} // serialize_Genquery2Input_ptr

static void serialize_vector_of_strings_ptr_impl(const std::vector<std::string>& _v, serialized_parameter_t& _out)
{
Expand All @@ -1164,10 +1166,13 @@ namespace irods::re_serialization
return SUCCESS();
}
catch (const boost::bad_any_cast& e) {
return ERROR(INVALID_ANY_CAST, fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(
INVALID_ANY_CAST,
fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
}
catch (const std::exception& e) {
return ERROR(SYS_LIBRARY_ERROR, fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(SYS_LIBRARY_ERROR,
fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
}
} // serialize_const_vector_of_strings_ptr

Expand All @@ -1184,10 +1189,13 @@ namespace irods::re_serialization
return SUCCESS();
}
catch (const boost::bad_any_cast& e) {
return ERROR(INVALID_ANY_CAST, fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(
INVALID_ANY_CAST,
fmt::format("{}: failed to cast pointer to [std::vector<std::string>*]: {}", __func__, e.what()));
}
catch (const std::exception& e) {
return ERROR(SYS_LIBRARY_ERROR, fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
return ERROR(SYS_LIBRARY_ERROR,
fmt::format("{}: failed to serialize [std::vector<std::string>*]: {}", __func__, e.what()));
}
} // serialize_vector_of_strings_ptr

Expand Down Expand Up @@ -1245,7 +1253,7 @@ namespace irods::re_serialization
{ std::type_index(typeid(openedDataObjInp_t*)), serialize_openedDataObjInp_ptr },
{ std::type_index(typeid(openedDataObjInp_t**)), serialize_openedDataObjInp_ptr_ptr },
{ std::type_index(typeid(bytesBuf_t*)), serialize_bytesBuf_ptr },
{ std::type_index(typeid(const Genquery2Input*)), serialize_const_Genquery2Input_ptr },
{ std::type_index(typeid(Genquery2Input*)), serialize_Genquery2Input_ptr },
{ std::type_index(typeid(const std::vector<std::string>*)), serialize_const_vector_of_strings_ptr },
{ std::type_index(typeid(std::vector<std::string>*)), serialize_vector_of_strings_ptr }
};
Expand Down

0 comments on commit 1544e47

Please sign in to comment.