@@ -92,11 +92,8 @@ pub enum CassIterator<'result_or_schema> {
92
92
CassSchemaMetaIterator ( CassSchemaMetaIterator < ' result_or_schema > ) ,
93
93
CassKeyspaceMetaTableIterator ( CassKeyspaceMetaIterator < ' result_or_schema > ) ,
94
94
CassKeyspaceMetaUserTypeIterator ( CassKeyspaceMetaIterator < ' result_or_schema > ) ,
95
- CassKeyspaceMetaViewIterator ( CassKeyspaceMetaIterator < ' result_or_schema > ) ,
96
95
CassMaterializedViewsMetaIterator ( CassMaterializedViewsMetaIterator < ' result_or_schema > ) ,
97
96
CassColumnsMetaIterator ( CassColumnsMetaIterator < ' result_or_schema > ) ,
98
- CassTableMetaIterator ( CassTableMetaIterator < ' result_or_schema > ) ,
99
- CassViewMetaIterator ( CassViewMetaIterator < ' result_or_schema > ) ,
100
97
}
101
98
102
99
impl BoxFFI for CassIterator < ' _ > { }
@@ -127,17 +124,12 @@ pub unsafe extern "C" fn cass_iterator_type(iterator: *mut CassIterator) -> Cass
127
124
CassIterator :: CassKeyspaceMetaUserTypeIterator ( _) => {
128
125
CassIteratorType :: CASS_ITERATOR_TYPE_TYPE_META
129
126
}
130
- CassIterator :: CassKeyspaceMetaViewIterator ( _) => {
131
- CassIteratorType :: CASS_ITERATOR_TYPE_MATERIALIZED_VIEW_META
132
- }
133
127
CassIterator :: CassMaterializedViewsMetaIterator ( _) => {
134
128
CassIteratorType :: CASS_ITERATOR_TYPE_MATERIALIZED_VIEW_META
135
129
}
136
130
CassIterator :: CassColumnsMetaIterator ( _) => {
137
131
CassIteratorType :: CASS_ITERATOR_TYPE_COLUMN_META
138
132
}
139
- CassIterator :: CassTableMetaIterator ( _) => CassIteratorType :: CASS_ITERATOR_TYPE_COLUMN_META ,
140
- CassIterator :: CassViewMetaIterator ( _) => CassIteratorType :: CASS_ITERATOR_TYPE_COLUMN_META ,
141
133
}
142
134
}
143
135
@@ -219,8 +211,7 @@ pub unsafe extern "C" fn cass_iterator_next(iterator: *mut CassIterator) -> cass
219
211
}
220
212
CassIterator :: CassMaterializedViewsMetaIterator (
221
213
CassMaterializedViewsMetaIterator :: FromKeyspace ( keyspace_meta_iterator) ,
222
- )
223
- | CassIterator :: CassKeyspaceMetaViewIterator ( keyspace_meta_iterator) => {
214
+ ) => {
224
215
let new_pos: usize = keyspace_meta_iterator
225
216
. position
226
217
. map_or ( 0 , |prev_pos| prev_pos + 1 ) ;
@@ -234,16 +225,14 @@ pub unsafe extern "C" fn cass_iterator_next(iterator: *mut CassIterator) -> cass
234
225
)
235
226
| CassIterator :: CassColumnsMetaIterator ( CassColumnsMetaIterator :: FromTable (
236
227
table_iterator,
237
- ) )
238
- | CassIterator :: CassTableMetaIterator ( table_iterator) => {
228
+ ) ) => {
239
229
let new_pos: usize = table_iterator. position . map_or ( 0 , |prev_pos| prev_pos + 1 ) ;
240
230
241
231
table_iterator. position = Some ( new_pos) ;
242
232
243
233
( new_pos < table_iterator. count ) as cass_bool_t
244
234
}
245
- CassIterator :: CassColumnsMetaIterator ( CassColumnsMetaIterator :: FromView ( view_iterator) )
246
- | CassIterator :: CassViewMetaIterator ( view_iterator) => {
235
+ CassIterator :: CassColumnsMetaIterator ( CassColumnsMetaIterator :: FromView ( view_iterator) ) => {
247
236
let new_pos: usize = view_iterator. position . map_or ( 0 , |prev_pos| prev_pos + 1 ) ;
248
237
249
238
view_iterator. position = Some ( new_pos) ;
0 commit comments