core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1898: Revert changes

This commit is contained in:
Eugen Betke 2024-10-30 13:51:36 +01:00
parent 3769fd7a64
commit cae430a2c1
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/action_class_alias.cc
View File

@ -137,8 +137,6 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
if (x->name_space_ == NULL) if (x->name_space_ == NULL)
x->name_space_ = act->name_space; x->name_space_ = act->name_space;
// TODO(maee): Make sure that the accessor is added to the trie
grib_context_log(p->h->context, GRIB_LOG_DEBUG, "alias: add only namespace: %s.%s", grib_context_log(p->h->context, GRIB_LOG_DEBUG, "alias: add only namespace: %s.%s",
act->name_space, act->name); act->name_space, act->name);
i = 0; i = 0;
@ -180,12 +178,19 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
act->name_space, act->name, y->name_); act->name_space, act->name, y->name_);
/* printf("[%s %s]\n",y->all_names_[i], y->all_name_spaces_[i]); */ /* printf("[%s %s]\n",y->all_names_[i], y->all_name_spaces_[i]); */
// ECC-1898: Remove accessor from cache /*
grib_handle* hand = grib_handle_of_accessor(y); * ECC-1898: Remove accessor from cache
if (hand->use_trie && y->all_name_spaces_[i] != NULL && strcmp(y->name_, act->name) != 0) { * This workaround was disabled because it was causing problems with the unaliasing mars.step,
int id = grib_hash_keys_get_id(hand->context->keys, act->name); * i.e., when unaliasing "mars.step" it also unaliases "step"
hand->accessors[id] = NULL; */
}
// TODO(maee): Implement a new hash function, which uses the name and the name_space as well
//grib_handle* hand = grib_handle_of_accessor(y);
//if (hand->use_trie && y->all_name_spaces_[i] != NULL && strcmp(y->name_, act->name) != 0) {
// int id = grib_hash_keys_get_id(hand->context->keys, act->name);
// hand->accessors[id] = NULL;
//}
while (i < MAX_ACCESSOR_NAMES - 1) { while (i < MAX_ACCESSOR_NAMES - 1) {
y->all_names_[i] = y->all_names_[i + 1]; y->all_names_[i] = y->all_names_[i + 1];

2
tests/CMakeLists.txt
View File

@ -276,7 +276,7 @@ if( HAVE_BUILD_TOOLS )
grib_ecc-1764 grib_ecc-1764
grib_ecc-1792 grib_ecc-1792
grib_ecc-1806 grib_ecc-1806
grib_ecc-1898 #grib_ecc-1898
grib_ecc-1907 grib_ecc-1907
grib_ecc-1941 grib_ecc-1941
grib_ecc-1942 grib_ecc-1942