diff --git ql/src/test/queries/clientpositive/ppd_multi_insert.q ql/src/test/queries/clientpositive/ppd_multi_insert.q index c9080ca..45f8c1f 100644 --- ql/src/test/queries/clientpositive/ppd_multi_insert.q +++ ql/src/test/queries/clientpositive/ppd_multi_insert.q @@ -6,6 +6,7 @@ set hive.ppd.remove.duplicatefilters=false; CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE; CREATE TABLE mi2(key INT, value STRING) STORED AS TEXTFILE; CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE; +CREATE TABLE mi4(value STRING) STORED AS TEXTFILE; EXPLAIN FROM src a JOIN src b ON (a.key = b.key) @@ -23,7 +24,8 @@ INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key SELECT mi1.* FROM mi1; SELECT mi2.* FROM mi2; SELECT mi3.* FROM mi3; -dfs -cat ${system:test.warehouse.dir}/mi4.out/*; +LOAD DATA INPATH '${system:test.warehouse.dir}/mi4.out' OVERWRITE INTO TABLE mi4; +SELECT mi4.* FROM mi4; set hive.ppd.remove.duplicatefilters=true; @@ -44,4 +46,5 @@ INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key SELECT mi1.* FROM mi1; SELECT mi2.* FROM mi2; SELECT mi3.* FROM mi3; -dfs -cat ${system:test.warehouse.dir}/mi4.out/*; +LOAD DATA INPATH '${system:test.warehouse.dir}/mi4.out' OVERWRITE INTO TABLE mi4; +SELECT mi4.* FROM mi4; diff --git ql/src/test/results/clientpositive/ppd_multi_insert.q.out ql/src/test/results/clientpositive/ppd_multi_insert.q.out index 55a042a..83a7820 100644 --- ql/src/test/results/clientpositive/ppd_multi_insert.q.out +++ ql/src/test/results/clientpositive/ppd_multi_insert.q.out @@ -26,6 +26,14 @@ POSTHOOK: query: CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@mi3 +PREHOOK: query: CREATE TABLE mi4(value STRING) STORED AS TEXTFILE +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@mi4 +POSTHOOK: query: CREATE TABLE mi4(value STRING) STORED AS TEXTFILE +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@mi4 PREHOOK: query: EXPLAIN FROM src a JOIN src b ON (a.key = b.key) INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100 @@ -813,6 +821,22 @@ POSTHOOK: Input: default@mi3@ds=2008-04-08/hr=12 298 2008-04-08 12 298 2008-04-08 12 298 2008-04-08 12 +#### A masked pattern was here #### +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@mi4 +#### A masked pattern was here #### +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@mi4 +PREHOOK: query: SELECT mi4.* FROM mi4 +PREHOOK: type: QUERY +PREHOOK: Input: default@mi4 +#### A masked pattern was here #### +POSTHOOK: query: SELECT mi4.* FROM mi4 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@mi4 +#### A masked pattern was here #### val_302 val_305 val_306 @@ -2062,6 +2086,22 @@ POSTHOOK: Input: default@mi3@ds=2008-04-08/hr=12 298 2008-04-08 12 298 2008-04-08 12 298 2008-04-08 12 +#### A masked pattern was here #### +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@mi4 +#### A masked pattern was here #### +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@mi4 +PREHOOK: query: SELECT mi4.* FROM mi4 +PREHOOK: type: QUERY +PREHOOK: Input: default@mi4 +#### A masked pattern was here #### +POSTHOOK: query: SELECT mi4.* FROM mi4 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@mi4 +#### A masked pattern was here #### val_302 val_305 val_306 diff --git ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out index b70348f..5c8cc5d 100644 --- ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out +++ ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out @@ -26,6 +26,14 @@ POSTHOOK: query: CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@mi3 +PREHOOK: query: CREATE TABLE mi4(value STRING) STORED AS TEXTFILE +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@mi4 +POSTHOOK: query: CREATE TABLE mi4(value STRING) STORED AS TEXTFILE +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@mi4 PREHOOK: query: EXPLAIN FROM src a JOIN src b ON (a.key = b.key) INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100 @@ -821,16 +829,45 @@ POSTHOOK: Input: default@mi3@ds=2008-04-08/hr=12 298 2008-04-08 12 298 2008-04-08 12 298 2008-04-08 12 +#### A masked pattern was here #### +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@mi4 +#### A masked pattern was here #### +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@mi4 +PREHOOK: query: SELECT mi4.* FROM mi4 +PREHOOK: type: QUERY +PREHOOK: Input: default@mi4 +#### A masked pattern was here #### +POSTHOOK: query: SELECT mi4.* FROM mi4 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@mi4 +#### A masked pattern was here #### +val_302 val_305 +val_306 val_307 val_307 val_307 val_307 +val_308 val_309 val_309 val_309 val_309 val_310 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_315 val_316 val_316 val_316 @@ -840,6 +877,10 @@ val_316 val_316 val_316 val_316 +val_317 +val_317 +val_317 +val_317 val_318 val_318 val_318 @@ -853,6 +894,10 @@ val_321 val_321 val_321 val_321 +val_322 +val_322 +val_322 +val_322 val_323 val_325 val_325 @@ -867,17 +912,70 @@ val_327 val_327 val_327 val_327 +val_331 +val_331 +val_331 +val_331 val_332 +val_333 +val_333 +val_333 +val_333 +val_335 val_336 val_338 +val_339 val_341 +val_342 +val_342 +val_342 +val_342 +val_344 +val_344 +val_344 +val_344 val_345 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_348 +val_351 +val_353 +val_353 +val_353 +val_353 val_356 +val_360 +val_362 +val_364 val_365 +val_366 val_367 val_367 val_367 val_367 +val_368 val_369 val_369 val_369 @@ -887,11 +985,34 @@ val_369 val_369 val_369 val_369 +val_373 val_374 +val_375 +val_377 val_378 +val_379 +val_382 +val_382 +val_382 +val_382 +val_384 +val_384 +val_384 +val_384 +val_384 +val_384 +val_384 +val_384 +val_384 +val_386 val_389 val_392 +val_393 val_394 +val_395 +val_395 +val_395 +val_395 val_396 val_396 val_396 @@ -901,8 +1022,50 @@ val_396 val_396 val_396 val_396 +val_397 +val_397 +val_397 +val_397 +val_399 +val_399 +val_399 +val_399 val_400 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 +val_401 val_402 +val_403 +val_403 +val_403 +val_403 +val_403 +val_403 +val_403 +val_403 +val_403 val_404 val_404 val_404 @@ -923,11 +1086,25 @@ val_406 val_406 val_406 val_406 +val_407 +val_409 +val_409 +val_409 +val_409 +val_409 +val_409 +val_409 +val_409 +val_409 val_411 val_413 val_413 val_413 val_413 +val_414 +val_414 +val_414 +val_414 val_417 val_417 val_417 @@ -937,11 +1114,27 @@ val_417 val_417 val_417 val_417 +val_418 val_419 +val_421 val_424 val_424 val_424 val_424 +val_427 +val_429 +val_429 +val_429 +val_429 +val_430 +val_430 +val_430 +val_430 +val_430 +val_430 +val_430 +val_430 +val_430 val_431 val_431 val_431 @@ -951,18 +1144,45 @@ val_431 val_431 val_431 val_431 +val_432 val_435 +val_436 val_437 +val_438 +val_438 +val_438 +val_438 +val_438 +val_438 +val_438 +val_438 +val_438 val_439 val_439 val_439 val_439 +val_443 val_444 val_446 val_448 +val_449 +val_452 val_453 +val_454 +val_454 +val_454 +val_454 +val_454 +val_454 +val_454 +val_454 +val_454 val_455 val_457 +val_458 +val_458 +val_458 +val_458 val_459 val_459 val_459 @@ -972,6 +1192,10 @@ val_462 val_462 val_462 val_462 +val_463 +val_463 +val_463 +val_463 val_466 val_466 val_466 @@ -981,6 +1205,7 @@ val_466 val_466 val_466 val_466 +val_467 val_468 val_468 val_468 @@ -997,8 +1222,39 @@ val_468 val_468 val_468 val_468 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_469 +val_470 +val_472 val_475 val_477 +val_478 +val_478 +val_478 +val_478 val_479 val_480 val_480 @@ -1009,246 +1265,10 @@ val_480 val_480 val_480 val_480 +val_481 val_482 +val_483 val_484 -val_491 -val_493 -val_495 -val_497 -val_302 -val_306 -val_308 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_315 -val_317 -val_317 -val_317 -val_317 -val_322 -val_322 -val_322 -val_322 -val_331 -val_331 -val_331 -val_331 -val_333 -val_333 -val_333 -val_333 -val_335 -val_339 -val_342 -val_342 -val_342 -val_342 -val_344 -val_344 -val_344 -val_344 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_348 -val_351 -val_353 -val_353 -val_353 -val_353 -val_360 -val_362 -val_364 -val_366 -val_368 -val_373 -val_375 -val_377 -val_379 -val_382 -val_382 -val_382 -val_382 -val_384 -val_384 -val_384 -val_384 -val_384 -val_384 -val_384 -val_384 -val_384 -val_386 -val_393 -val_395 -val_395 -val_395 -val_395 -val_397 -val_397 -val_397 -val_397 -val_399 -val_399 -val_399 -val_399 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_401 -val_403 -val_403 -val_403 -val_403 -val_403 -val_403 -val_403 -val_403 -val_403 -val_407 -val_409 -val_409 -val_409 -val_409 -val_409 -val_409 -val_409 -val_409 -val_409 -val_414 -val_414 -val_414 -val_414 -val_418 -val_421 -val_427 -val_429 -val_429 -val_429 -val_429 -val_430 -val_430 -val_430 -val_430 -val_430 -val_430 -val_430 -val_430 -val_430 -val_432 -val_436 -val_438 -val_438 -val_438 -val_438 -val_438 -val_438 -val_438 -val_438 -val_438 -val_443 -val_449 -val_452 -val_454 -val_454 -val_454 -val_454 -val_454 -val_454 -val_454 -val_454 -val_454 -val_458 -val_458 -val_458 -val_458 -val_463 -val_463 -val_463 -val_463 -val_467 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_469 -val_470 -val_472 -val_478 -val_478 -val_478 -val_478 -val_481 -val_483 val_485 val_487 val_489 @@ -1268,12 +1288,16 @@ val_489 val_489 val_489 val_490 +val_491 val_492 val_492 val_492 val_492 +val_493 val_494 +val_495 val_496 +val_497 val_498 val_498 val_498 @@ -2078,16 +2102,45 @@ POSTHOOK: Input: default@mi3@ds=2008-04-08/hr=12 298 2008-04-08 12 298 2008-04-08 12 298 2008-04-08 12 +#### A masked pattern was here #### +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@mi4 +#### A masked pattern was here #### +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@mi4 +PREHOOK: query: SELECT mi4.* FROM mi4 +PREHOOK: type: QUERY +PREHOOK: Input: default@mi4 +#### A masked pattern was here #### +POSTHOOK: query: SELECT mi4.* FROM mi4 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@mi4 +#### A masked pattern was here #### +val_302 val_305 +val_306 val_307 val_307 val_307 val_307 +val_308 val_309 val_309 val_309 val_309 val_310 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_311 +val_315 val_316 val_316 val_316 @@ -2097,19 +2150,27 @@ val_316 val_316 val_316 val_316 +val_317 +val_317 +val_317 +val_317 +val_318 +val_318 +val_318 val_318 val_318 val_318 val_318 val_318 val_318 -val_318 -val_318 -val_318 val_321 val_321 val_321 val_321 +val_322 +val_322 +val_322 +val_322 val_323 val_325 val_325 @@ -2124,185 +2185,20 @@ val_327 val_327 val_327 val_327 -val_332 -val_336 -val_338 -val_341 -val_345 -val_356 -val_365 -val_367 -val_367 -val_367 -val_367 -val_369 -val_369 -val_369 -val_369 -val_369 -val_369 -val_369 -val_369 -val_369 -val_374 -val_378 -val_389 -val_392 -val_394 -val_396 -val_396 -val_396 -val_396 -val_396 -val_396 -val_396 -val_396 -val_396 -val_400 -val_402 -val_404 -val_404 -val_404 -val_404 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_406 -val_411 -val_413 -val_413 -val_413 -val_413 -val_417 -val_417 -val_417 -val_417 -val_417 -val_417 -val_417 -val_417 -val_417 -val_419 -val_424 -val_424 -val_424 -val_424 -val_431 -val_431 -val_431 -val_431 -val_431 -val_431 -val_431 -val_431 -val_431 -val_435 -val_437 -val_439 -val_439 -val_439 -val_439 -val_444 -val_446 -val_448 -val_453 -val_455 -val_457 -val_459 -val_459 -val_459 -val_459 -val_460 -val_462 -val_462 -val_462 -val_462 -val_466 -val_466 -val_466 -val_466 -val_466 -val_466 -val_466 -val_466 -val_466 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_468 -val_475 -val_477 -val_479 -val_480 -val_480 -val_480 -val_480 -val_480 -val_480 -val_480 -val_480 -val_480 -val_482 -val_484 -val_491 -val_493 -val_495 -val_497 -val_302 -val_306 -val_308 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_311 -val_315 -val_317 -val_317 -val_317 -val_317 -val_322 -val_322 -val_322 -val_322 val_331 val_331 val_331 val_331 +val_332 val_333 val_333 val_333 val_333 val_335 +val_336 +val_338 val_339 +val_341 val_342 val_342 val_342 @@ -2311,6 +2207,7 @@ val_344 val_344 val_344 val_344 +val_345 val_348 val_348 val_348 @@ -2341,14 +2238,31 @@ val_353 val_353 val_353 val_353 +val_356 val_360 val_362 val_364 +val_365 val_366 +val_367 +val_367 +val_367 +val_367 val_368 +val_369 +val_369 +val_369 +val_369 +val_369 +val_369 +val_369 +val_369 +val_369 val_373 +val_374 val_375 val_377 +val_378 val_379 val_382 val_382 @@ -2364,11 +2278,23 @@ val_384 val_384 val_384 val_386 +val_389 +val_392 val_393 +val_394 val_395 val_395 val_395 val_395 +val_396 +val_396 +val_396 +val_396 +val_396 +val_396 +val_396 +val_396 +val_396 val_397 val_397 val_397 @@ -2377,6 +2303,7 @@ val_399 val_399 val_399 val_399 +val_400 val_401 val_401 val_401 @@ -2402,6 +2329,7 @@ val_401 val_401 val_401 val_401 +val_402 val_403 val_403 val_403 @@ -2411,6 +2339,26 @@ val_403 val_403 val_403 val_403 +val_404 +val_404 +val_404 +val_404 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 +val_406 val_407 val_409 val_409 @@ -2421,12 +2369,31 @@ val_409 val_409 val_409 val_409 +val_411 +val_413 +val_413 +val_413 +val_413 val_414 val_414 val_414 val_414 +val_417 +val_417 +val_417 +val_417 +val_417 +val_417 +val_417 +val_417 +val_417 val_418 +val_419 val_421 +val_424 +val_424 +val_424 +val_424 val_427 val_429 val_429 @@ -2441,8 +2408,19 @@ val_430 val_430 val_430 val_430 +val_431 +val_431 +val_431 +val_431 +val_431 +val_431 +val_431 +val_431 +val_431 val_432 +val_435 val_436 +val_437 val_438 val_438 val_438 @@ -2452,9 +2430,17 @@ val_438 val_438 val_438 val_438 +val_439 +val_439 +val_439 +val_439 val_443 +val_444 +val_446 +val_448 val_449 val_452 +val_453 val_454 val_454 val_454 @@ -2464,15 +2450,51 @@ val_454 val_454 val_454 val_454 +val_455 +val_457 val_458 val_458 val_458 val_458 +val_459 +val_459 +val_459 +val_459 +val_460 +val_462 +val_462 +val_462 +val_462 val_463 val_463 val_463 val_463 +val_466 +val_466 +val_466 +val_466 +val_466 +val_466 +val_466 +val_466 +val_466 val_467 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 +val_468 val_469 val_469 val_469 @@ -2500,12 +2522,26 @@ val_469 val_469 val_470 val_472 +val_475 +val_477 val_478 val_478 val_478 val_478 +val_479 +val_480 +val_480 +val_480 +val_480 +val_480 +val_480 +val_480 +val_480 +val_480 val_481 +val_482 val_483 +val_484 val_485 val_487 val_489 @@ -2525,12 +2561,16 @@ val_489 val_489 val_489 val_490 +val_491 val_492 val_492 val_492 val_492 +val_493 val_494 +val_495 val_496 +val_497 val_498 val_498 val_498