@@ -101,46 +101,6 @@ def tearDownClass(cls):
101101 if os .path .exists (cls .warehouse ):
102102 shutil .rmtree (cls .warehouse )
103103
104- def testWrongFieldName (self ):
105- table = self .catalog .get_table ('default.test_append' )
106- predicate_builder = table .new_read_builder ().new_predicate_builder ()
107- with self .assertRaises (ValueError ) as e :
108- predicate_builder .equal ('f2' , 'a' )
109- self .assertEqual (str (e .exception ), "The field f2 is not in field list ['f0', 'f1']." )
110-
111- def testAppendWithDuplicate (self ):
112- pa_schema = pa .schema ([
113- ('f0' , pa .int64 ()),
114- ('f1' , pa .string ()),
115- ])
116- self .catalog .create_table ('default.test_append_with_duplicate' , Schema (pa_schema ), False )
117-
118- df = pd .DataFrame ({
119- 'f0' : [1 , 1 , 2 , 2 ],
120- 'f1' : ['a' , 'b' , 'c' , 'd' ],
121- })
122-
123- table = self .catalog .get_table ('default.test_append_with_duplicate' )
124- write_builder = table .new_batch_write_builder ()
125- write = write_builder .new_write ()
126- commit = write_builder .new_commit ()
127- write .write_pandas (df )
128- commit .commit (write .prepare_commit ())
129- write .close ()
130- commit .close ()
131-
132- predicate_builder = table .new_read_builder ().new_predicate_builder ()
133-
134- predicate = predicate_builder .equal ('f0' , 1 )
135- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), df .loc [0 :1 ])
136-
137- predicate = predicate_builder .equal ('f0' , 0 )
138- read_builder = table .new_read_builder ().with_filter (predicate )
139- scan = read_builder .new_scan ()
140- read = read_builder .new_read ()
141- actual_df = read .to_pandas (scan .plan ().splits ())
142- self .assertEqual (len (actual_df ), 0 )
143-
144104 def testAllFieldTypesWithEqual (self ):
145105 pa_schema = pa .schema ([
146106 # int
@@ -213,182 +173,3 @@ def testAllFieldTypesWithEqual(self):
213173
214174 predicate = predicate_builder .equal ('_boolean' , True )
215175 _check_filtered_result (table .new_read_builder ().with_filter (predicate ), df .loc [[0 ]])
216-
217- def testEqualPk (self ):
218- table = self .catalog .get_table ('default.test_pk' )
219- predicate_builder = table .new_read_builder ().new_predicate_builder ()
220- predicate = predicate_builder .equal ('f0' , 1 )
221- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[0 ]])
222-
223- def testNotEqualAppend (self ):
224- table = self .catalog .get_table ('default.test_append' )
225- predicate_builder = table .new_read_builder ().new_predicate_builder ()
226- predicate = predicate_builder .not_equal ('f0' , 1 )
227- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [1 :4 ])
228-
229- def testNotEqualPk (self ):
230- table = self .catalog .get_table ('default.test_pk' )
231- predicate_builder = table .new_read_builder ().new_predicate_builder ()
232- predicate = predicate_builder .not_equal ('f0' , 1 )
233- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [1 :4 ])
234-
235- def testLessThanAppend (self ):
236- table = self .catalog .get_table ('default.test_append' )
237- predicate_builder = table .new_read_builder ().new_predicate_builder ()
238- predicate = predicate_builder .less_than ('f0' , 3 )
239- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :1 ])
240-
241- def testLessThanPk (self ):
242- table = self .catalog .get_table ('default.test_pk' )
243- predicate_builder = table .new_read_builder ().new_predicate_builder ()
244- predicate = predicate_builder .less_than ('f0' , 3 )
245- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :1 ])
246-
247- def testLessOrEqualAppend (self ):
248- table = self .catalog .get_table ('default.test_append' )
249- predicate_builder = table .new_read_builder ().new_predicate_builder ()
250- predicate = predicate_builder .less_or_equal ('f0' , 3 )
251- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
252-
253- def testLessOrEqualPk (self ):
254- table = self .catalog .get_table ('default.test_pk' )
255- predicate_builder = table .new_read_builder ().new_predicate_builder ()
256- predicate = predicate_builder .less_or_equal ('f0' , 3 )
257- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
258-
259- def testGreaterThanAppend (self ):
260- table = self .catalog .get_table ('default.test_append' )
261- predicate_builder = table .new_read_builder ().new_predicate_builder ()
262- predicate = predicate_builder .greater_than ('f0' , 3 )
263- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [3 :4 ])
264-
265- def testGreaterThanPk (self ):
266- table = self .catalog .get_table ('default.test_pk' )
267- predicate_builder = table .new_read_builder ().new_predicate_builder ()
268- predicate = predicate_builder .greater_than ('f0' , 3 )
269- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [3 :4 ])
270-
271- def testGreaterOrEqualAppend (self ):
272- table = self .catalog .get_table ('default.test_append' )
273- predicate_builder = table .new_read_builder ().new_predicate_builder ()
274- predicate = predicate_builder .greater_or_equal ('f0' , 3 )
275- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [2 :4 ])
276-
277- def testGreaterOrEqualPk (self ):
278- table = self .catalog .get_table ('default.test_pk' )
279- predicate_builder = table .new_read_builder ().new_predicate_builder ()
280- predicate = predicate_builder .greater_or_equal ('f0' , 3 )
281- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [2 :4 ])
282-
283- def testIsNullAppend (self ):
284- table = self .catalog .get_table ('default.test_append' )
285- predicate_builder = table .new_read_builder ().new_predicate_builder ()
286- predicate = predicate_builder .is_null ('f1' )
287- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[4 ]])
288-
289- def testIsNullPk (self ):
290- table = self .catalog .get_table ('default.test_pk' )
291- predicate_builder = table .new_read_builder ().new_predicate_builder ()
292- predicate = predicate_builder .is_null ('f1' )
293- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[4 ]])
294-
295- def testIsNotNullAppend (self ):
296- table = self .catalog .get_table ('default.test_append' )
297- predicate_builder = table .new_read_builder ().new_predicate_builder ()
298- predicate = predicate_builder .is_not_null ('f1' )
299- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :3 ])
300-
301- def testIsNotNullPk (self ):
302- table = self .catalog .get_table ('default.test_pk' )
303- predicate_builder = table .new_read_builder ().new_predicate_builder ()
304- predicate = predicate_builder .is_not_null ('f1' )
305- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :3 ])
306-
307- def testStartswithAppend (self ):
308- table = self .catalog .get_table ('default.test_append' )
309- predicate_builder = table .new_read_builder ().new_predicate_builder ()
310- predicate = predicate_builder .startswith ('f1' , 'ab' )
311- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :1 ])
312-
313- def testStartswithPk (self ):
314- table = self .catalog .get_table ('default.test_pk' )
315- predicate_builder = table .new_read_builder ().new_predicate_builder ()
316- predicate = predicate_builder .startswith ('f1' , 'ab' )
317- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :1 ])
318-
319- def testEndswithAppend (self ):
320- table = self .catalog .get_table ('default.test_append' )
321- predicate_builder = table .new_read_builder ().new_predicate_builder ()
322- predicate = predicate_builder .endswith ('f1' , 'bc' )
323- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
324-
325- def testEndswithPk (self ):
326- table = self .catalog .get_table ('default.test_pk' )
327- predicate_builder = table .new_read_builder ().new_predicate_builder ()
328- predicate = predicate_builder .endswith ('f1' , 'bc' )
329- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
330-
331- def testContainsAppend (self ):
332- table = self .catalog .get_table ('default.test_append' )
333- predicate_builder = table .new_read_builder ().new_predicate_builder ()
334- predicate = predicate_builder .contains ('f1' , 'bb' )
335- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[1 ]])
336-
337- def testContainsPk (self ):
338- table = self .catalog .get_table ('default.test_pk' )
339- predicate_builder = table .new_read_builder ().new_predicate_builder ()
340- predicate = predicate_builder .contains ('f1' , 'bb' )
341- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[1 ]])
342-
343- def testIsInAppend (self ):
344- table = self .catalog .get_table ('default.test_append' )
345- predicate_builder = table .new_read_builder ().new_predicate_builder ()
346- predicate = predicate_builder .is_in ('f0' , [1 , 2 ])
347- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :1 ])
348-
349- def testIsInPk (self ):
350- table = self .catalog .get_table ('default.test_pk' )
351- predicate_builder = table .new_read_builder ().new_predicate_builder ()
352- predicate = predicate_builder .is_in ('f1' , ['abc' , 'd' ])
353- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[0 , 3 ]])
354-
355- def testIsNotInAppend (self ):
356- table = self .catalog .get_table ('default.test_append' )
357- predicate_builder = table .new_read_builder ().new_predicate_builder ()
358- predicate = predicate_builder .is_not_in ('f0' , [1 , 2 ])
359- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [2 :4 ])
360-
361- def testIsNotInPk (self ):
362- table = self .catalog .get_table ('default.test_pk' )
363- predicate_builder = table .new_read_builder ().new_predicate_builder ()
364- predicate = predicate_builder .is_not_in ('f1' , ['abc' , 'd' ])
365- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [1 :2 ])
366-
367- def testBetweenAppend (self ):
368- table = self .catalog .get_table ('default.test_append' )
369- predicate_builder = table .new_read_builder ().new_predicate_builder ()
370- predicate = predicate_builder .between ('f0' , 1 , 3 )
371- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
372-
373- def testBetweenPk (self ):
374- table = self .catalog .get_table ('default.test_pk' )
375- predicate_builder = table .new_read_builder ().new_predicate_builder ()
376- predicate = predicate_builder .between ('f0' , 1 , 3 )
377- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [0 :2 ])
378-
379- def testAndPredicates (self ):
380- table = self .catalog .get_table ('default.test_append' )
381- predicate_builder = table .new_read_builder ().new_predicate_builder ()
382- predicate1 = predicate_builder .greater_than ('f0' , 1 )
383- predicate2 = predicate_builder .startswith ('f1' , 'ab' )
384- predicate = predicate_builder .and_predicates ([predicate1 , predicate2 ])
385- _check_filtered_result (table .new_read_builder ().with_filter (predicate ), self .df .loc [[1 ]])
386-
387- def testOrPredicates (self ):
388- table = self .catalog .get_table ('default.test_append' )
389- predicate_builder = table .new_read_builder ().new_predicate_builder ()
390- predicate1 = predicate_builder .greater_than ('f0' , 3 )
391- predicate2 = predicate_builder .less_than ('f0' , 2 )
392- predicate = predicate_builder .or_predicates ([predicate1 , predicate2 ])
393- _check_filtered_result (table .new_read_builder ().with_filter (predicate ),
394- self .df .loc [[0 , 3 , 4 ]])
0 commit comments