Commitcc4a3a3

committed

Merge branch 'rel_future_beta' into fix_merge_partitions

2 parentsd62a542 +61c01f6 commitcc4a3a3Copy full SHA for cc4a3a3

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -647,6 +647,14 @@ def test_conc_part_drop_runtime_append(self):`
`647`	`647`	`# Create two separate connections for this test`
`648`	`648`	`withnode.connect()ascon1,node.connect()ascon2:`
`649`	`649`
	`650`	`+try:`
	`651`	`+fromqueueimportQueue`
	`652`	`+exceptImportError:`
	`653`	`+fromQueueimportQueue`
	`654`	`+`
	`655`	`+# return values from thread`
	`656`	`+queue=Queue()`
	`657`	`+`
`650`	`658`	`# Thread for connection #2 (it has to wait)`
`651`	`659`	`defcon2_thread():`
`652`	`660`	`con1.begin()`
`@@ -678,9 +686,9 @@ def con2_thread():`
`678`	`686`	`has_drop_test_4=True`
`679`	`687`	`continue`
`680`	`688`
`681`		`-self.assertTrue(has_runtime_append)`
`682`		`-self.assertFalse(has_drop_test_1)`
`683`		`-self.assertTrue(has_drop_test_4)`
	`689`	`+# return all values in tuple`
	`690`	`+queue.put((has_runtime_append,has_drop_test_1,has_drop_test_4))`
	`691`	`+`
`684`	`692`
`685`	`693`	`# Step 1: cache partitioned table in con1`
`686`	`694`	`con1.begin()`
`@@ -725,6 +733,12 @@ def con2_thread():`
`725`	`733`	`# check number of partitions`
`726`	`734`	`self.assertEqual(len(rows),99)`
`727`	`735`
	`736`	`+# check RuntimeAppend + selected partitions`
	`737`	`+ (has_runtime_append,has_drop_test_1,has_drop_test_4)=queue.get()`
	`738`	`+self.assertTrue(has_runtime_append)`
	`739`	`+self.assertFalse(has_drop_test_1)`
	`740`	`+self.assertTrue(has_drop_test_4)`
	`741`	`+`
`728`	`742`	`# Stop instance and finish work`
`729`	`743`	`node.stop()`
`730`	`744`	`node.cleanup()`

Comments

(0)