Build: #108 failed Changes by Takahiro Tsutsumi and Rodrigo Tobar <rtobar@icrar.org>
Code commits
Casa6
-
Takahiro Tsutsumi c84be1413a0d775fc6fe17d180f968a1475a1fa6
Pull request #1043: CAS-14606
Merge in CASA/casa6 from CAS-14606 to master
* commit 'e2af0ec57f50d3edffed7dd5384465472326b4a5':
Add a check that an entire (sub-)table is empty (nrows=0)
Fix a bug in is_column_empty function and add tb.getvarcol-based data existence check for the subtables
Add test for data types, str, int, float
Access the first row only
Use tb.getvarcol to check if optional data columns in Main table have any data instead of tb.getcell -
Takahiro Tsutsumi e2af0ec57f50d3edffed7dd5384465472326b4a5 m
Add a check that an entire (sub-)table is empty (nrows=0)
-
Takahiro Tsutsumi b16c5ce495369cf93b416cd12e7c6954ddf83611 m
Fix a bug in is_column_empty function and add tb.getvarcol-based data existence check for the subtables
-
Takahiro Tsutsumi 68a9bac2144ccae3259c56de1bdd6b2edc25a158 m
Add test for data types, str, int, float
-
Takahiro Tsutsumi 7aca7a422dccf268486ac1ab5a5268b26b8ccaf3 m
Access the first row only
-
Takahiro Tsutsumi 1d9a1e86d5d6464c599037b83359947d72d1efdd m
Use tb.getvarcol to check if optional data columns in Main table have any data instead of tb.getcell
GitHub Casacore
-
Rodrigo Tobar <rtobar@icrar.org> b13654637dad54684c6da92810380f0107f1d259
Remove duplicated assignment to itsRows
This is already done at the top of the function, there is no need to do
it again at the bottom.
Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>- tables/DataMan/Adios2StMan.cc (version b13654637dad54684c6da92810380f0107f1d259)
-
Rodrigo Tobar <rtobar@icrar.org> aaf72eb7edd5a5fecefa78ca04713233b7b6ffd6
Revert "Remove unused main argumnets"
This reverts commit 56efef39688ce49640db2c190a8a78ce7da6e845.- tables/DataMan/test/tAdios2StMan.cc (version aaf72eb7edd5a5fecefa78ca04713233b7b6ffd6)
-
Rodrigo Tobar <rtobar@icrar.org> 19ffb815917639c47b74ee4a7249dc14663afbf8
Fix read/write of array Adiso2StMan columns by rows
The previous implementation of these the set/getArrayColumnCellsV
methods was flawed for two reasons:
* It wrongly normalised the rownrs input variable, invoking its
convert() method but never storing the result. This made it easy to
lead readers to the wrong assumption that rownrs itself had been
normalised.
* When looping over the row (one by one, which isn't ideal) the offset
into the user-provided array was incorrectly calculated, using
IPosition.nelements() (i.e. the number of dimensions) instead of
IPosition.product() (i.e., the number of cells in the N-dimensional
space).
This commit fixes both issues by providing a class that iteratively
adjusts the Adios2StManColumn's adios variable start/count arrays to
go through the rows specified in the rownrs input variable, calculating
at the same time the correct offset into the user-provided array
corresponding to each row. Iteration over rownrs is done using a
RefRowsSliceIter object, which goes through full row slices at a time
when possible, or row-by-row otherwise. The class is used by both
set/getArrayColumnCellsV, centralising the logic.
Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>- tables/DataMan/Adios2StManColumn.cc (version 19ffb815917639c47b74ee4a7249dc14663afbf8)
- tables/DataMan/Adios2StManColumn.h (version 19ffb815917639c47b74ee4a7249dc14663afbf8)