diff options
| author | Lester Solbakken <lesters@oath.com> | 2018-10-23 09:02:44 +0200 |
|---|---|---|
| committer | Lester Solbakken <lesters@oath.com> | 2018-10-23 09:02:44 +0200 |
| commit | 0857f3d0f3e6e1e1320a3dcd09380fbdac193e06 (patch) | |
| tree | ce3e34f1e012dd9ab40b9a1dac648de1f2fbe805 /config-model/src/test/derived/types | |
| parent | f77121c5e9cff27f81ce5a3a39955855bc544c27 (diff) | |
Revert "Revert "Disallow complex types as keys for nested types in arrays""
This reverts commit bb42d0c6f30de25b9ca6b8e232b6920aeb51a7d1.
Reason for system tests failing was changes in the system tests, not
this PR.
Diffstat (limited to 'config-model/src/test/derived/types')
| -rw-r--r-- | config-model/src/test/derived/types/documentmanager.cfg | 12 | ||||
| -rw-r--r-- | config-model/src/test/derived/types/types.sd | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg index c490db59736..647c26e1316 100644 --- a/config-model/src/test/derived/types/documentmanager.cfg +++ b/config-model/src/test/derived/types/documentmanager.cfg @@ -209,11 +209,11 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "summaryfeatures" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id 171503364 -datatype[].maptype[].keytype 1707615575 -datatype[].maptype[].valtype 0 -datatype[].id 1100964733 -datatype[].arraytype[].datatype 171503364 +datatype[].id -372512406 +datatype[].maptype[].keytype 0 +datatype[].maptype[].valtype 1707615575 +datatype[].id 1416345047 +datatype[].arraytype[].datatype -372512406 datatype[].id 348447225 datatype[].structtype[].name "types.body" datatype[].structtype[].version 0 @@ -222,7 +222,7 @@ datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "complexarray" -datatype[].structtype[].field[].datatype 1100964733 +datatype[].structtype[].field[].datatype 1416345047 datatype[].structtype[].field[].detailedtype "" datatype[].id -853072901 datatype[].documenttype[].name "types" diff --git a/config-model/src/test/derived/types/types.sd b/config-model/src/test/derived/types/types.sd index 0590625e1c6..c908b648340 100644 --- a/config-model/src/test/derived/types/types.sd +++ b/config-model/src/test/derived/types/types.sd @@ -87,7 +87,7 @@ search types { field arrarr type array<array<array<string>>> {header} field maparr type array<map<string, string>> {header} - field complexarray type array< map<array<array<string>>, int> > {body} + field complexarray type array< map<int, array<array<string>>> > {body} struct mystruct { field bytearr type array<byte>{} |