From f1fc373de70f402a522d5a46ea13606151754b92 Mon Sep 17 00:00:00 2001 From: Peter Schafhalter Date: Mon, 21 May 2018 12:19:41 -0700 Subject: [PATCH] [DataFrame] Update initializations of IndexMetadata which use outdated APIs (#2103) * Update calls which use outdated APIs * Fix lengths of IndexMetadata --- python/ray/dataframe/indexing.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python/ray/dataframe/indexing.py b/python/ray/dataframe/indexing.py index 9df3cdffb..2ae1809fd 100644 --- a/python/ray/dataframe/indexing.py +++ b/python/ray/dataframe/indexing.py @@ -188,11 +188,18 @@ class _Location_Indexer_Base(): def _generate_view(self, row_lookup, col_lookup): """Generate a DataFrameView from lookup """ + row_lengths = [0] * len(self.df._row_metadata._lengths) + for i in row_lookup["partition"]: + row_lengths[i] += 1 + col_lengths = [0] * len(self.df._col_metadata._lengths) + for i in col_lookup["partition"]: + col_lengths[i] += 1 + row_metadata_view = _IndexMetadata( - _coord_df=row_lookup, _lengths=self.df._row_metadata._lengths) + coord_df_oid=row_lookup, lengths_oid=row_lengths) col_metadata_view = _IndexMetadata( - _coord_df=col_lookup, _lengths=self.df._col_metadata._lengths) + coord_df_oid=col_lookup, lengths_oid=col_lengths) df_view = DataFrameView( block_partitions=self.block_oids, @@ -354,7 +361,7 @@ class _Loc_Indexer(_Location_Indexer_Base): lens = major_meta._lengths lens = np.concatenate([lens, np.array([num_nan_labels])]) - metadata_view = _IndexMetadata(_coord_df=coord_df, _lengths=lens) + metadata_view = _IndexMetadata(coord_df_oid=coord_df, lengths_oid=lens) return metadata_view def _compute_enlarge_labels(self, locator, base_index):