From 7af4b0b3894fbd416ba2ecacbe2a705219f52619 Mon Sep 17 00:00:00 2001 From: Cheng Hao Date: Thu, 24 Jul 2014 16:03:01 +0800 Subject: [PATCH 1/4] Add EqualNS & Unit Tests --- .../catalyst/analysis/HiveTypeCoercion.scala | 2 + .../spark/sql/catalyst/dsl/package.scala | 1 + .../sql/catalyst/expressions/predicates.scala | 16 +++++++ .../sql/catalyst/optimizer/Optimizer.scala | 2 + .../ExpressionEvaluationSuite.scala | 10 ++++- .../apache/spark/sql/hive/HiveContext.scala | 3 +- .../org/apache/spark/sql/hive/HiveQl.scala | 1 + ...ullsafe-0-869726b703f160eabdb7763700b53e60 | 1 + ...ullsafe-1-5644ab44e5ba9f2941216b8d5dc33a99 | 0 ...llsafe-10-b6de4e85dcc1d1949c7431d39fa1b919 | 2 + ...llsafe-11-3aa243002a5363b84556736ef71613b1 | 0 ...llsafe-12-3cc55b14e8256d2c51361b61986c291e | 4 ++ ...llsafe-13-69d94e229191e7b9b1a3e7eae46eb993 | 12 ++++++ ...llsafe-14-cf9ff6ee72a701a8e2f3e7fb0667903c | 12 ++++++ ...llsafe-15-507d0fa6d7ce39e2d9921555cea6f8da | 13 ++++++ ...llsafe-16-1c714fc339304de4db630530e5d1ce97 | 11 +++++ ...llsafe-17-8a4b0dc781a28ad11a0db9805fe03aa8 | 11 +++++ ...llsafe-18-10b2051e65cac50ee1ea1c138ec192c8 | 0 ...llsafe-19-23ab7ac8229a53d391195be7ca092429 | 0 ...nullsafe-2-793e288c9e0971f0bf3f37493f76dc7 | 0 ...llsafe-20-d6fc260320c577eec9a5db0d4135d224 | 0 ...llsafe-21-a60dae725ffc543f805242611d99de4e | 0 ...llsafe-22-24c80d0f9e3d72c48d947770fa184985 | 0 ...llsafe-23-3fe6ae20cab3417759dcc654a3a26746 | 0 ...llsafe-24-2db30531137611e06fdba478ca7a8412 | 1 + ...llsafe-25-e58b2754e8d9c56a473557a549d0d2b9 | 1 + ...llsafe-26-64cabe5164130a94f387288f37b62d71 | 1 + ...llsafe-27-e8ed4a1b574a6ca70cbfb3f7b9980aa6 | 42 +++++++++++++++++++ ...llsafe-28-5a0c946cd7033857ca99e5fb800f8525 | 14 +++++++ ...llsafe-29-514043c2ddaf6ea8f16a764adc92d1cf | 42 +++++++++++++++++++ ...ullsafe-3-ae378fc0f875a21884e58fa35a6d52cd | 0 ...llsafe-30-fcbf92cb1b85ab01102fbbc6caba9a88 | 42 +++++++++++++++++++ ...llsafe-31-1cb03e1106f79d14f22bc89d386cedcf | 42 +++++++++++++++++++ ...llsafe-32-6a0bf6127d4b042e67ae8ee15125fb87 | 40 ++++++++++++++++++ ...llsafe-33-63157d43422fcedadba408537ccecd5c | 40 ++++++++++++++++++ ...llsafe-34-9265f806b71c03061f93f9fbc88aa223 | 42 +++++++++++++++++++ ...llsafe-35-95815bafb81cccb8129c20d399a446fc | 42 +++++++++++++++++++ ...llsafe-36-c4762c60cc93236b7647ebd32a40ce57 | 42 +++++++++++++++++++ ...llsafe-37-a87893adfc73c9cc63ceab200bb56245 | 42 +++++++++++++++++++ ...llsafe-38-e3dfe0044b44c8a49414479521acf762 | 42 +++++++++++++++++++ ...llsafe-39-9a7e1f373b9c02e632d6c7c550b908ec | 42 +++++++++++++++++++ ...ullsafe-4-644c616d87ae426eb2f8c71638045185 | 11 +++++ ...llsafe-40-3c868718e4c120cb9a72ab7318c75be3 | 0 ...llsafe-41-1f7d8737c3e2d74d5ad865535d729811 | 9 ++++ ...ullsafe-5-1e393de94850e92b3b00536aacc9371f | 0 ...ullsafe-6-d66451815212e7d17744184e74c6b0a0 | 2 + ...ullsafe-7-a3ad3cc301d9884898d3e6ab6c792d4c | 0 ...ullsafe-8-cc7527bcf746ab7e2cd9f28db0ead0ac | 29 +++++++++++++ ...ullsafe-9-88f6f40959b0d2faabd9d4b3cd853809 | 0 ...ushdown-0-830517b37a4a1db794d01b828c926465 | 0 ...ushdown-1-1b813538d30b70b4dfa36b26e3f4254e | 0 ...shdown-10-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-11-8624e51ec5c685726039db2766e11b11 | 0 ...shdown-12-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-13-3972568364bdd7fef0091b0d67c85600 | 1 + ...shdown-14-3b03210f94ec40db9ab02620645014d1 | 1 + ...ushdown-15-7b38292881bba4a0fd3d953efc0138f | 1 + ...shdown-16-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-17-d6e812265e4efd51198d587626501fcf | 1 + ...shdown-18-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-19-d6e812265e4efd51198d587626501fcf | 1 + ...ushdown-2-578f5a57fb198decd9327f657e899678 | 0 ...shdown-20-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-21-e92ebcd8dab12f8417cbf58898b811ff | 1 + ...shdown-22-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-23-e92ebcd8dab12f8417cbf58898b811ff | 1 + ...shdown-24-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-25-17c08357b4fd44ba6d25af5c8e4cf846 | 0 ...shdown-26-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-27-17c08357b4fd44ba6d25af5c8e4cf846 | 0 ...shdown-28-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-29-df10a575cae74fdd1e29f6ec44e63eb9 | 2 + ...ushdown-3-1d827149dc2236bfcd903c0b6c78531b | 0 ...shdown-30-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-31-df10a575cae74fdd1e29f6ec44e63eb9 | 2 + ...shdown-32-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 | 0 ...shdown-34-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 | 0 ...shdown-36-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-37-ee03a627cd80d8ad3c26d11be728b089 | 3 ++ ...shdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 | 1 + ...shdown-39-ee03a627cd80d8ad3c26d11be728b089 | 3 ++ ...ushdown-4-a9696f5c4727b9dc1ddab42351528ac6 | 0 ...shdown-40-d80de08433545c29629e21e9356ff174 | 1 + ...shdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb | 0 ...shdown-42-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb | 0 ...shdown-44-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-45-fea78d0c8d99de02734360604f836a61 | 3 ++ ...shdown-46-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-47-fea78d0c8d99de02734360604f836a61 | 3 ++ ...shdown-48-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-49-e1478d352e4040a57761261002a88b21 | 0 ...ushdown-5-7b925ffc10eeb9fc1571160babb50405 | 1 + ...shdown-50-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-51-e1478d352e4040a57761261002a88b21 | 0 ...shdown-52-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-53-61d0f86e7612655c6189bd72ef8012e4 | 1 + ...shdown-54-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-55-61d0f86e7612655c6189bd72ef8012e4 | 1 + ...shdown-56-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...shdown-57-19777278d1bee59683a31f0a8553b705 | 0 ...shdown-58-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-59-19777278d1bee59683a31f0a8553b705 | 0 ...ushdown-6-3b03210f94ec40db9ab02620645014d1 | 1 + ...shdown-60-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...ushdown-7-ac8c6c7e973c18d6294747e8737bc207 | 1 + ...ushdown-8-9b10e38b0f5bc75cb4b7549883b93eec | 1 + ...ushdown-9-8624e51ec5c685726039db2766e11b11 | 0 ...f_equal-0-36b6cdf7c5f68c91155569b1622f5876 | 1 + ...f_equal-1-2422b50b96502dde8b661acdfebd8892 | 2 + ...f_equal-2-e0faab0f5e736c24bcc5503aeac55053 | 1 + ...f_equal-3-39d8d6f197803de927f0af5409ec2f33 | 2 + ...f_equal-4-94ac2476006425e1b3bcddf29ad07b16 | 1 + ...f_equal-5-878650cf21e9360a07d204c8ffb0cde7 | 1 + ...f_equal-6-1635ef051fecdfc7891d9f5a9a3a545e | 1 + ...f_equal-7-78f1b96c199e307714fa1b804e5bae27 | 1 + 118 files changed, 731 insertions(+), 2 deletions(-) create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-0-869726b703f160eabdb7763700b53e60 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-1-5644ab44e5ba9f2941216b8d5dc33a99 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-10-b6de4e85dcc1d1949c7431d39fa1b919 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-11-3aa243002a5363b84556736ef71613b1 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-12-3cc55b14e8256d2c51361b61986c291e create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-13-69d94e229191e7b9b1a3e7eae46eb993 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-14-cf9ff6ee72a701a8e2f3e7fb0667903c create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-15-507d0fa6d7ce39e2d9921555cea6f8da create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-16-1c714fc339304de4db630530e5d1ce97 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-17-8a4b0dc781a28ad11a0db9805fe03aa8 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-18-10b2051e65cac50ee1ea1c138ec192c8 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-19-23ab7ac8229a53d391195be7ca092429 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-2-793e288c9e0971f0bf3f37493f76dc7 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-20-d6fc260320c577eec9a5db0d4135d224 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-21-a60dae725ffc543f805242611d99de4e create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-22-24c80d0f9e3d72c48d947770fa184985 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-23-3fe6ae20cab3417759dcc654a3a26746 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-24-2db30531137611e06fdba478ca7a8412 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-25-e58b2754e8d9c56a473557a549d0d2b9 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-26-64cabe5164130a94f387288f37b62d71 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-27-e8ed4a1b574a6ca70cbfb3f7b9980aa6 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-28-5a0c946cd7033857ca99e5fb800f8525 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-29-514043c2ddaf6ea8f16a764adc92d1cf create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-3-ae378fc0f875a21884e58fa35a6d52cd create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-30-fcbf92cb1b85ab01102fbbc6caba9a88 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-31-1cb03e1106f79d14f22bc89d386cedcf create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-32-6a0bf6127d4b042e67ae8ee15125fb87 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-33-63157d43422fcedadba408537ccecd5c create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-34-9265f806b71c03061f93f9fbc88aa223 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-35-95815bafb81cccb8129c20d399a446fc create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-36-c4762c60cc93236b7647ebd32a40ce57 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-37-a87893adfc73c9cc63ceab200bb56245 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-38-e3dfe0044b44c8a49414479521acf762 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-39-9a7e1f373b9c02e632d6c7c550b908ec create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-4-644c616d87ae426eb2f8c71638045185 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-40-3c868718e4c120cb9a72ab7318c75be3 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-41-1f7d8737c3e2d74d5ad865535d729811 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-5-1e393de94850e92b3b00536aacc9371f create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-6-d66451815212e7d17744184e74c6b0a0 create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-7-a3ad3cc301d9884898d3e6ab6c792d4c create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-8-cc7527bcf746ab7e2cd9f28db0ead0ac create mode 100644 sql/hive/src/test/resources/golden/join_nullsafe-9-88f6f40959b0d2faabd9d4b3cd853809 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec create mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-0-36b6cdf7c5f68c91155569b1622f5876 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-1-2422b50b96502dde8b661acdfebd8892 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-2-e0faab0f5e736c24bcc5503aeac55053 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-3-39d8d6f197803de927f0af5409ec2f33 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-4-94ac2476006425e1b3bcddf29ad07b16 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-5-878650cf21e9360a07d204c8ffb0cde7 create mode 100644 sql/hive/src/test/resources/golden/udf_equal-6-1635ef051fecdfc7891d9f5a9a3a545e create mode 100644 sql/hive/src/test/resources/golden/udf_equal-7-78f1b96c199e307714fa1b804e5bae27 diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala index 76ddeba9cb31..20fa7c1af795 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala @@ -236,6 +236,8 @@ trait HiveTypeCoercion { case e if !e.childrenResolved => e // No need to change EqualTo operators as that actually makes sense for boolean types. case e: EqualTo => e + // No need to change the EqualNSTo operators + case e: EqualNSTo => e // Otherwise turn them to Byte types so that there exists and ordering. case p: BinaryComparison if p.left.dataType == BooleanType && p.right.dataType == BooleanType => diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala index 15c98efbcabc..97701f969bd7 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala @@ -77,6 +77,7 @@ package object dsl { def > (other: Expression) = GreaterThan(expr, other) def >= (other: Expression) = GreaterThanOrEqual(expr, other) def === (other: Expression) = EqualTo(expr, other) + def <=> (other: Expression) = EqualNSTo(expr, other) def !== (other: Expression) = Not(EqualTo(expr, other)) def in(list: Expression*) = In(expr, list) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala index b63406b94a4a..f8563f815ad5 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala @@ -153,6 +153,22 @@ case class EqualTo(left: Expression, right: Expression) extends BinaryComparison } } +case class EqualNSTo(left: Expression, right: Expression) extends BinaryComparison { + def symbol = "<=>" + override def nullable = false + override def eval(input: Row): Any = { + val l = left.eval(input) + val r = right.eval(input) + if (l == null && r == null) { + true + } else if (l == null || r == null) { + false + } else { + l == r + } + } +} + case class LessThan(left: Expression, right: Expression) extends BinaryComparison { def symbol = "<" override def eval(input: Row): Any = c2(input, left, right, _.lt(_, _)) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index c65987b7120b..74ef563e82d7 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -153,6 +153,8 @@ object NullPropagation extends Rule[LogicalPlan] { case e @ GetItem(Literal(null, _), _) => Literal(null, e.dataType) case e @ GetItem(_, Literal(null, _)) => Literal(null, e.dataType) case e @ GetField(Literal(null, _), _) => Literal(null, e.dataType) + case e @ EqualNSTo(Literal(null, _), r) => IsNull(r) + case e @ EqualNSTo(l, Literal(null, _)) => IsNull(l) // For Coalesce, remove null literals. case e @ Coalesce(children) => diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala index c3f5c26fdbe5..58f8c341e667 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala @@ -451,11 +451,13 @@ class ExpressionEvaluationSuite extends FunSuite { } test("BinaryComparison") { - val row = new GenericRow(Array[Any](1, 2, 3, null)) + val row = new GenericRow(Array[Any](1, 2, 3, null, 3, null)) val c1 = 'a.int.at(0) val c2 = 'a.int.at(1) val c3 = 'a.int.at(2) val c4 = 'a.int.at(3) + val c5 = 'a.int.at(4) + val c6 = 'a.int.at(5) checkEvaluation(LessThan(c1, c4), null, row) checkEvaluation(LessThan(c1, c2), true, row) @@ -469,6 +471,12 @@ class ExpressionEvaluationSuite extends FunSuite { checkEvaluation(c1 >= c2, false, row) checkEvaluation(c1 === c2, false, row) checkEvaluation(c1 !== c2, true, row) + checkEvaluation(c4 <=> c1, false, row) + checkEvaluation(c1 <=> c4, false, row) + checkEvaluation(c4 <=> c6, true, row) + checkEvaluation(c3 <=> c5, true, row) + checkEvaluation(Literal(true) <=> Literal(null, BooleanType), false, row) + checkEvaluation(Literal(null, BooleanType) <=> Literal(true), false, row) } test("StringComparison") { diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index 334462357eb8..201c85f3d501 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -253,7 +253,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { protected val primitiveTypes = Seq(StringType, IntegerType, LongType, DoubleType, FloatType, BooleanType, ByteType, - ShortType, DecimalType, TimestampType) + ShortType, DecimalType, TimestampType, BinaryType) protected def toHiveString(a: (Any, DataType)): String = a match { case (struct: Row, StructType(fields)) => @@ -269,6 +269,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { }.toSeq.sorted.mkString("{", ",", "}") case (null, _) => "NULL" case (t: Timestamp, TimestampType) => new TimestampWritable(t).toString + case (bin: Array[Byte], BinaryType) => new String(bin, "UTF-8") case (other, tpe) if primitiveTypes contains tpe => other.toString } diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala index c4ca9f362a04..3c45b23c75ed 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala @@ -931,6 +931,7 @@ private[hive] object HiveQl { /* Comparisons */ case Token("=", left :: right:: Nil) => EqualTo(nodeToExpr(left), nodeToExpr(right)) case Token("==", left :: right:: Nil) => EqualTo(nodeToExpr(left), nodeToExpr(right)) + case Token("<=>", left :: right:: Nil) => EqualNSTo(nodeToExpr(left), nodeToExpr(right)) case Token("!=", left :: right:: Nil) => Not(EqualTo(nodeToExpr(left), nodeToExpr(right))) case Token("<>", left :: right:: Nil) => Not(EqualTo(nodeToExpr(left), nodeToExpr(right))) case Token(">", left :: right:: Nil) => GreaterThan(nodeToExpr(left), nodeToExpr(right)) diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-0-869726b703f160eabdb7763700b53e60 b/sql/hive/src/test/resources/golden/join_nullsafe-0-869726b703f160eabdb7763700b53e60 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-0-869726b703f160eabdb7763700b53e60 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-1-5644ab44e5ba9f2941216b8d5dc33a99 b/sql/hive/src/test/resources/golden/join_nullsafe-1-5644ab44e5ba9f2941216b8d5dc33a99 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-10-b6de4e85dcc1d1949c7431d39fa1b919 b/sql/hive/src/test/resources/golden/join_nullsafe-10-b6de4e85dcc1d1949c7431d39fa1b919 new file mode 100644 index 000000000000..31c409082cc2 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-10-b6de4e85dcc1d1949c7431d39fa1b919 @@ -0,0 +1,2 @@ +NULL 10 10 NULL NULL 10 +100 100 100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-11-3aa243002a5363b84556736ef71613b1 b/sql/hive/src/test/resources/golden/join_nullsafe-11-3aa243002a5363b84556736ef71613b1 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-12-3cc55b14e8256d2c51361b61986c291e b/sql/hive/src/test/resources/golden/join_nullsafe-12-3cc55b14e8256d2c51361b61986c291e new file mode 100644 index 000000000000..9b77d13cbaab --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-12-3cc55b14e8256d2c51361b61986c291e @@ -0,0 +1,4 @@ +NULL NULL NULL NULL NULL NULL +NULL 10 10 NULL NULL 10 +10 NULL NULL 10 10 NULL +100 100 100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-13-69d94e229191e7b9b1a3e7eae46eb993 b/sql/hive/src/test/resources/golden/join_nullsafe-13-69d94e229191e7b9b1a3e7eae46eb993 new file mode 100644 index 000000000000..47c0709d3985 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-13-69d94e229191e7b9b1a3e7eae46eb993 @@ -0,0 +1,12 @@ +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +48 NULL NULL NULL +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-14-cf9ff6ee72a701a8e2f3e7fb0667903c b/sql/hive/src/test/resources/golden/join_nullsafe-14-cf9ff6ee72a701a8e2f3e7fb0667903c new file mode 100644 index 000000000000..36ba48516b65 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-14-cf9ff6ee72a701a8e2f3e7fb0667903c @@ -0,0 +1,12 @@ +NULL NULL NULL NULL +NULL NULL NULL 35 +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-15-507d0fa6d7ce39e2d9921555cea6f8da b/sql/hive/src/test/resources/golden/join_nullsafe-15-507d0fa6d7ce39e2d9921555cea6f8da new file mode 100644 index 000000000000..fc1fd198cf8b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-15-507d0fa6d7ce39e2d9921555cea6f8da @@ -0,0 +1,13 @@ +NULL NULL NULL NULL +NULL NULL NULL 35 +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +48 NULL NULL NULL +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-16-1c714fc339304de4db630530e5d1ce97 b/sql/hive/src/test/resources/golden/join_nullsafe-16-1c714fc339304de4db630530e5d1ce97 new file mode 100644 index 000000000000..1cc70524f9d6 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-16-1c714fc339304de4db630530e5d1ce97 @@ -0,0 +1,11 @@ +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-17-8a4b0dc781a28ad11a0db9805fe03aa8 b/sql/hive/src/test/resources/golden/join_nullsafe-17-8a4b0dc781a28ad11a0db9805fe03aa8 new file mode 100644 index 000000000000..1cc70524f9d6 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-17-8a4b0dc781a28ad11a0db9805fe03aa8 @@ -0,0 +1,11 @@ +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-18-10b2051e65cac50ee1ea1c138ec192c8 b/sql/hive/src/test/resources/golden/join_nullsafe-18-10b2051e65cac50ee1ea1c138ec192c8 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-19-23ab7ac8229a53d391195be7ca092429 b/sql/hive/src/test/resources/golden/join_nullsafe-19-23ab7ac8229a53d391195be7ca092429 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-2-793e288c9e0971f0bf3f37493f76dc7 b/sql/hive/src/test/resources/golden/join_nullsafe-2-793e288c9e0971f0bf3f37493f76dc7 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-20-d6fc260320c577eec9a5db0d4135d224 b/sql/hive/src/test/resources/golden/join_nullsafe-20-d6fc260320c577eec9a5db0d4135d224 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-21-a60dae725ffc543f805242611d99de4e b/sql/hive/src/test/resources/golden/join_nullsafe-21-a60dae725ffc543f805242611d99de4e new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-22-24c80d0f9e3d72c48d947770fa184985 b/sql/hive/src/test/resources/golden/join_nullsafe-22-24c80d0f9e3d72c48d947770fa184985 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-23-3fe6ae20cab3417759dcc654a3a26746 b/sql/hive/src/test/resources/golden/join_nullsafe-23-3fe6ae20cab3417759dcc654a3a26746 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-24-2db30531137611e06fdba478ca7a8412 b/sql/hive/src/test/resources/golden/join_nullsafe-24-2db30531137611e06fdba478ca7a8412 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-24-2db30531137611e06fdba478ca7a8412 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-25-e58b2754e8d9c56a473557a549d0d2b9 b/sql/hive/src/test/resources/golden/join_nullsafe-25-e58b2754e8d9c56a473557a549d0d2b9 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-25-e58b2754e8d9c56a473557a549d0d2b9 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-26-64cabe5164130a94f387288f37b62d71 b/sql/hive/src/test/resources/golden/join_nullsafe-26-64cabe5164130a94f387288f37b62d71 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-26-64cabe5164130a94f387288f37b62d71 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-27-e8ed4a1b574a6ca70cbfb3f7b9980aa6 b/sql/hive/src/test/resources/golden/join_nullsafe-27-e8ed4a1b574a6ca70cbfb3f7b9980aa6 new file mode 100644 index 000000000000..66482299904b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-27-e8ed4a1b574a6ca70cbfb3f7b9980aa6 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL 10 +NULL NULL NULL 10 +NULL NULL NULL 35 +NULL NULL NULL 35 +NULL NULL NULL 110 +NULL NULL NULL 110 +NULL NULL NULL 135 +NULL NULL NULL 135 +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 NULL 10 +NULL 10 NULL 35 +NULL 10 NULL 110 +NULL 10 NULL 135 +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 NULL 10 +NULL 35 NULL 35 +NULL 35 NULL 110 +NULL 35 NULL 135 +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 NULL 10 +NULL 110 NULL 35 +NULL 110 NULL 110 +NULL 110 NULL 135 +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 NULL 10 +NULL 135 NULL 35 +NULL 135 NULL 110 +NULL 135 NULL 135 +10 NULL 10 NULL +48 NULL 48 NULL +100 100 100 100 +110 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-28-5a0c946cd7033857ca99e5fb800f8525 b/sql/hive/src/test/resources/golden/join_nullsafe-28-5a0c946cd7033857ca99e5fb800f8525 new file mode 100644 index 000000000000..2efbef048445 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-28-5a0c946cd7033857ca99e5fb800f8525 @@ -0,0 +1,14 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL 10 NULL 10 +NULL 35 NULL 35 +NULL 110 NULL 110 +NULL 135 NULL 135 +10 NULL 10 NULL +48 NULL 48 NULL +100 100 100 100 +110 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-29-514043c2ddaf6ea8f16a764adc92d1cf b/sql/hive/src/test/resources/golden/join_nullsafe-29-514043c2ddaf6ea8f16a764adc92d1cf new file mode 100644 index 000000000000..66482299904b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-29-514043c2ddaf6ea8f16a764adc92d1cf @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL 10 +NULL NULL NULL 10 +NULL NULL NULL 35 +NULL NULL NULL 35 +NULL NULL NULL 110 +NULL NULL NULL 110 +NULL NULL NULL 135 +NULL NULL NULL 135 +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 NULL 10 +NULL 10 NULL 35 +NULL 10 NULL 110 +NULL 10 NULL 135 +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 NULL 10 +NULL 35 NULL 35 +NULL 35 NULL 110 +NULL 35 NULL 135 +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 NULL 10 +NULL 110 NULL 35 +NULL 110 NULL 110 +NULL 110 NULL 135 +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 NULL 10 +NULL 135 NULL 35 +NULL 135 NULL 110 +NULL 135 NULL 135 +10 NULL 10 NULL +48 NULL 48 NULL +100 100 100 100 +110 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-3-ae378fc0f875a21884e58fa35a6d52cd b/sql/hive/src/test/resources/golden/join_nullsafe-3-ae378fc0f875a21884e58fa35a6d52cd new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-30-fcbf92cb1b85ab01102fbbc6caba9a88 b/sql/hive/src/test/resources/golden/join_nullsafe-30-fcbf92cb1b85ab01102fbbc6caba9a88 new file mode 100644 index 000000000000..66482299904b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-30-fcbf92cb1b85ab01102fbbc6caba9a88 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL 10 +NULL NULL NULL 10 +NULL NULL NULL 35 +NULL NULL NULL 35 +NULL NULL NULL 110 +NULL NULL NULL 110 +NULL NULL NULL 135 +NULL NULL NULL 135 +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 NULL 10 +NULL 10 NULL 35 +NULL 10 NULL 110 +NULL 10 NULL 135 +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 NULL 10 +NULL 35 NULL 35 +NULL 35 NULL 110 +NULL 35 NULL 135 +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 NULL 10 +NULL 110 NULL 35 +NULL 110 NULL 110 +NULL 110 NULL 135 +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 NULL 10 +NULL 135 NULL 35 +NULL 135 NULL 110 +NULL 135 NULL 135 +10 NULL 10 NULL +48 NULL 48 NULL +100 100 100 100 +110 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-31-1cb03e1106f79d14f22bc89d386cedcf b/sql/hive/src/test/resources/golden/join_nullsafe-31-1cb03e1106f79d14f22bc89d386cedcf new file mode 100644 index 000000000000..66482299904b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-31-1cb03e1106f79d14f22bc89d386cedcf @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL 10 +NULL NULL NULL 10 +NULL NULL NULL 35 +NULL NULL NULL 35 +NULL NULL NULL 110 +NULL NULL NULL 110 +NULL NULL NULL 135 +NULL NULL NULL 135 +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 NULL 10 +NULL 10 NULL 35 +NULL 10 NULL 110 +NULL 10 NULL 135 +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 NULL 10 +NULL 35 NULL 35 +NULL 35 NULL 110 +NULL 35 NULL 135 +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 NULL 10 +NULL 110 NULL 35 +NULL 110 NULL 110 +NULL 110 NULL 135 +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 NULL 10 +NULL 135 NULL 35 +NULL 135 NULL 110 +NULL 135 NULL 135 +10 NULL 10 NULL +48 NULL 48 NULL +100 100 100 100 +110 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-32-6a0bf6127d4b042e67ae8ee15125fb87 b/sql/hive/src/test/resources/golden/join_nullsafe-32-6a0bf6127d4b042e67ae8ee15125fb87 new file mode 100644 index 000000000000..ea001a222f35 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-32-6a0bf6127d4b042e67ae8ee15125fb87 @@ -0,0 +1,40 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 10 110 NULL +NULL 10 148 NULL +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +NULL 35 110 NULL +NULL 35 148 NULL +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 10 NULL +NULL 110 48 NULL +NULL 110 110 NULL +NULL 110 148 NULL +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 10 NULL +NULL 135 48 NULL +NULL 135 110 NULL +NULL 135 148 NULL +10 NULL NULL 10 +100 100 100 100 +110 NULL NULL 110 +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-33-63157d43422fcedadba408537ccecd5c b/sql/hive/src/test/resources/golden/join_nullsafe-33-63157d43422fcedadba408537ccecd5c new file mode 100644 index 000000000000..ea001a222f35 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-33-63157d43422fcedadba408537ccecd5c @@ -0,0 +1,40 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 10 110 NULL +NULL 10 148 NULL +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +NULL 35 110 NULL +NULL 35 148 NULL +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 10 NULL +NULL 110 48 NULL +NULL 110 110 NULL +NULL 110 148 NULL +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 10 NULL +NULL 135 48 NULL +NULL 135 110 NULL +NULL 135 148 NULL +10 NULL NULL 10 +100 100 100 100 +110 NULL NULL 110 +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-34-9265f806b71c03061f93f9fbc88aa223 b/sql/hive/src/test/resources/golden/join_nullsafe-34-9265f806b71c03061f93f9fbc88aa223 new file mode 100644 index 000000000000..1093bd89f6e3 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-34-9265f806b71c03061f93f9fbc88aa223 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 10 110 NULL +NULL 10 148 NULL +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +NULL 35 110 NULL +NULL 35 148 NULL +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 10 NULL +NULL 110 48 NULL +NULL 110 110 NULL +NULL 110 148 NULL +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 10 NULL +NULL 135 48 NULL +NULL 135 110 NULL +NULL 135 148 NULL +10 NULL NULL 10 +48 NULL NULL NULL +100 100 100 100 +110 NULL NULL 110 +148 NULL NULL NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-35-95815bafb81cccb8129c20d399a446fc b/sql/hive/src/test/resources/golden/join_nullsafe-35-95815bafb81cccb8129c20d399a446fc new file mode 100644 index 000000000000..9cf0036674d6 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-35-95815bafb81cccb8129c20d399a446fc @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL 35 +NULL NULL NULL 135 +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 10 110 NULL +NULL 10 148 NULL +NULL 35 NULL NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +NULL 35 110 NULL +NULL 35 148 NULL +NULL 110 NULL NULL +NULL 110 NULL NULL +NULL 110 10 NULL +NULL 110 48 NULL +NULL 110 110 NULL +NULL 110 148 NULL +NULL 135 NULL NULL +NULL 135 NULL NULL +NULL 135 10 NULL +NULL 135 48 NULL +NULL 135 110 NULL +NULL 135 148 NULL +10 NULL NULL 10 +100 100 100 100 +110 NULL NULL 110 +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-36-c4762c60cc93236b7647ebd32a40ce57 b/sql/hive/src/test/resources/golden/join_nullsafe-36-c4762c60cc93236b7647ebd32a40ce57 new file mode 100644 index 000000000000..77f6a8ddd7c2 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-36-c4762c60cc93236b7647ebd32a40ce57 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL 10 +NULL 35 NULL 35 +NULL 110 NULL 110 +NULL 135 NULL 135 +10 NULL NULL NULL +10 NULL NULL NULL +10 NULL 10 NULL +10 NULL 48 NULL +10 NULL 110 NULL +10 NULL 148 NULL +48 NULL NULL NULL +48 NULL NULL NULL +48 NULL 10 NULL +48 NULL 48 NULL +48 NULL 110 NULL +48 NULL 148 NULL +100 100 100 100 +110 NULL NULL NULL +110 NULL NULL NULL +110 NULL 10 NULL +110 NULL 48 NULL +110 NULL 110 NULL +110 NULL 148 NULL +148 NULL NULL NULL +148 NULL NULL NULL +148 NULL 10 NULL +148 NULL 48 NULL +148 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-37-a87893adfc73c9cc63ceab200bb56245 b/sql/hive/src/test/resources/golden/join_nullsafe-37-a87893adfc73c9cc63ceab200bb56245 new file mode 100644 index 000000000000..77f6a8ddd7c2 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-37-a87893adfc73c9cc63ceab200bb56245 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL 10 +NULL 35 NULL 35 +NULL 110 NULL 110 +NULL 135 NULL 135 +10 NULL NULL NULL +10 NULL NULL NULL +10 NULL 10 NULL +10 NULL 48 NULL +10 NULL 110 NULL +10 NULL 148 NULL +48 NULL NULL NULL +48 NULL NULL NULL +48 NULL 10 NULL +48 NULL 48 NULL +48 NULL 110 NULL +48 NULL 148 NULL +100 100 100 100 +110 NULL NULL NULL +110 NULL NULL NULL +110 NULL 10 NULL +110 NULL 48 NULL +110 NULL 110 NULL +110 NULL 148 NULL +148 NULL NULL NULL +148 NULL NULL NULL +148 NULL 10 NULL +148 NULL 48 NULL +148 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-38-e3dfe0044b44c8a49414479521acf762 b/sql/hive/src/test/resources/golden/join_nullsafe-38-e3dfe0044b44c8a49414479521acf762 new file mode 100644 index 000000000000..77f6a8ddd7c2 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-38-e3dfe0044b44c8a49414479521acf762 @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL 10 +NULL 35 NULL 35 +NULL 110 NULL 110 +NULL 135 NULL 135 +10 NULL NULL NULL +10 NULL NULL NULL +10 NULL 10 NULL +10 NULL 48 NULL +10 NULL 110 NULL +10 NULL 148 NULL +48 NULL NULL NULL +48 NULL NULL NULL +48 NULL 10 NULL +48 NULL 48 NULL +48 NULL 110 NULL +48 NULL 148 NULL +100 100 100 100 +110 NULL NULL NULL +110 NULL NULL NULL +110 NULL 10 NULL +110 NULL 48 NULL +110 NULL 110 NULL +110 NULL 148 NULL +148 NULL NULL NULL +148 NULL NULL NULL +148 NULL 10 NULL +148 NULL 48 NULL +148 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-39-9a7e1f373b9c02e632d6c7c550b908ec b/sql/hive/src/test/resources/golden/join_nullsafe-39-9a7e1f373b9c02e632d6c7c550b908ec new file mode 100644 index 000000000000..77f6a8ddd7c2 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-39-9a7e1f373b9c02e632d6c7c550b908ec @@ -0,0 +1,42 @@ +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL NULL 48 NULL +NULL NULL 110 NULL +NULL NULL 110 NULL +NULL NULL 148 NULL +NULL NULL 148 NULL +NULL 10 NULL 10 +NULL 35 NULL 35 +NULL 110 NULL 110 +NULL 135 NULL 135 +10 NULL NULL NULL +10 NULL NULL NULL +10 NULL 10 NULL +10 NULL 48 NULL +10 NULL 110 NULL +10 NULL 148 NULL +48 NULL NULL NULL +48 NULL NULL NULL +48 NULL 10 NULL +48 NULL 48 NULL +48 NULL 110 NULL +48 NULL 148 NULL +100 100 100 100 +110 NULL NULL NULL +110 NULL NULL NULL +110 NULL 10 NULL +110 NULL 48 NULL +110 NULL 110 NULL +110 NULL 148 NULL +148 NULL NULL NULL +148 NULL NULL NULL +148 NULL 10 NULL +148 NULL 48 NULL +148 NULL 110 NULL +148 NULL 148 NULL +200 200 200 200 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-4-644c616d87ae426eb2f8c71638045185 b/sql/hive/src/test/resources/golden/join_nullsafe-4-644c616d87ae426eb2f8c71638045185 new file mode 100644 index 000000000000..1cc70524f9d6 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-4-644c616d87ae426eb2f8c71638045185 @@ -0,0 +1,11 @@ +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL +10 NULL NULL 10 +100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-40-3c868718e4c120cb9a72ab7318c75be3 b/sql/hive/src/test/resources/golden/join_nullsafe-40-3c868718e4c120cb9a72ab7318c75be3 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-41-1f7d8737c3e2d74d5ad865535d729811 b/sql/hive/src/test/resources/golden/join_nullsafe-41-1f7d8737c3e2d74d5ad865535d729811 new file mode 100644 index 000000000000..421049d6e509 --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-41-1f7d8737c3e2d74d5ad865535d729811 @@ -0,0 +1,9 @@ +NULL NULL NULL NULL +NULL NULL 10 NULL +NULL NULL 48 NULL +NULL 10 NULL NULL +NULL 10 10 NULL +NULL 10 48 NULL +NULL 35 NULL NULL +NULL 35 10 NULL +NULL 35 48 NULL diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-5-1e393de94850e92b3b00536aacc9371f b/sql/hive/src/test/resources/golden/join_nullsafe-5-1e393de94850e92b3b00536aacc9371f new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-6-d66451815212e7d17744184e74c6b0a0 b/sql/hive/src/test/resources/golden/join_nullsafe-6-d66451815212e7d17744184e74c6b0a0 new file mode 100644 index 000000000000..aec3122cae5f --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-6-d66451815212e7d17744184e74c6b0a0 @@ -0,0 +1,2 @@ +10 NULL NULL 10 10 NULL +100 100 100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-7-a3ad3cc301d9884898d3e6ab6c792d4c b/sql/hive/src/test/resources/golden/join_nullsafe-7-a3ad3cc301d9884898d3e6ab6c792d4c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-8-cc7527bcf746ab7e2cd9f28db0ead0ac b/sql/hive/src/test/resources/golden/join_nullsafe-8-cc7527bcf746ab7e2cd9f28db0ead0ac new file mode 100644 index 000000000000..30db79efa79b --- /dev/null +++ b/sql/hive/src/test/resources/golden/join_nullsafe-8-cc7527bcf746ab7e2cd9f28db0ead0ac @@ -0,0 +1,29 @@ +NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL 10 +NULL NULL NULL NULL NULL 35 +NULL NULL 10 NULL NULL NULL +NULL NULL 10 NULL NULL 10 +NULL NULL 10 NULL NULL 35 +NULL NULL 48 NULL NULL NULL +NULL NULL 48 NULL NULL 10 +NULL NULL 48 NULL NULL 35 +NULL 10 NULL NULL NULL NULL +NULL 10 NULL NULL NULL 10 +NULL 10 NULL NULL NULL 35 +NULL 10 10 NULL NULL NULL +NULL 10 10 NULL NULL 10 +NULL 10 10 NULL NULL 35 +NULL 10 48 NULL NULL NULL +NULL 10 48 NULL NULL 10 +NULL 10 48 NULL NULL 35 +NULL 35 NULL NULL NULL NULL +NULL 35 NULL NULL NULL 10 +NULL 35 NULL NULL NULL 35 +NULL 35 10 NULL NULL NULL +NULL 35 10 NULL NULL 10 +NULL 35 10 NULL NULL 35 +NULL 35 48 NULL NULL NULL +NULL 35 48 NULL NULL 10 +NULL 35 48 NULL NULL 35 +10 NULL NULL 10 10 NULL +100 100 100 100 100 100 diff --git a/sql/hive/src/test/resources/golden/join_nullsafe-9-88f6f40959b0d2faabd9d4b3cd853809 b/sql/hive/src/test/resources/golden/join_nullsafe-9-88f6f40959b0d2faabd9d4b3cd853809 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 new file mode 100644 index 000000000000..7eebda6a8d98 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 @@ -0,0 +1 @@ +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f new file mode 100644 index 000000000000..7eebda6a8d98 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f @@ -0,0 +1 @@ +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf new file mode 100644 index 000000000000..5ffb863c0c45 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf @@ -0,0 +1 @@ +124 336 65664 4294967435 74.72 42.47 true bob davidson 2013-03-01 09:11:58.703302 45.4 yard duty diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf new file mode 100644 index 000000000000..5ffb863c0c45 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf @@ -0,0 +1 @@ +124 336 65664 4294967435 74.72 42.47 true bob davidson 2013-03-01 09:11:58.703302 45.4 yard duty diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff new file mode 100644 index 000000000000..de71f88722a7 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff @@ -0,0 +1 @@ +-8 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff new file mode 100644 index 000000000000..de71f88722a7 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff @@ -0,0 +1 @@ +-8 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 new file mode 100644 index 000000000000..503ce357c5aa --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 @@ -0,0 +1,2 @@ +-1 bob laertes +-1 bob young diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 new file mode 100644 index 000000000000..503ce357c5aa --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 @@ -0,0 +1,2 @@ +-1 bob laertes +-1 bob young diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 new file mode 100644 index 000000000000..30085e5e24fd --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 @@ -0,0 +1,3 @@ +26 bob ovid +26 bob quirinius +27 bob ovid diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 new file mode 100644 index 000000000000..30085e5e24fd --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 @@ -0,0 +1,3 @@ +26 bob ovid +26 bob quirinius +27 bob ovid diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 new file mode 100644 index 000000000000..1353a8513325 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 @@ -0,0 +1,3 @@ +15 334 11.12 jessica robinson +101 327 11.48 gabriella ellison +7 320 11.54 bob ellison diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 new file mode 100644 index 000000000000..1353a8513325 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 @@ -0,0 +1,3 @@ +15 334 11.12 jessica robinson +101 327 11.48 gabriella ellison +7 320 11.54 bob ellison diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 new file mode 100644 index 000000000000..995fb31d6ff7 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 @@ -0,0 +1 @@ +62430 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 new file mode 100644 index 000000000000..905af92f0179 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 @@ -0,0 +1 @@ +15 334 11.12 jessica robinson diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 new file mode 100644 index 000000000000..905af92f0179 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 @@ -0,0 +1 @@ +15 334 11.12 jessica robinson diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 new file mode 100644 index 000000000000..995fb31d6ff7 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 @@ -0,0 +1 @@ +62430 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec @@ -0,0 +1 @@ +0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sql/hive/src/test/resources/golden/udf_equal-0-36b6cdf7c5f68c91155569b1622f5876 b/sql/hive/src/test/resources/golden/udf_equal-0-36b6cdf7c5f68c91155569b1622f5876 new file mode 100644 index 000000000000..9b9b6312a269 --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-0-36b6cdf7c5f68c91155569b1622f5876 @@ -0,0 +1 @@ +a = b - Returns TRUE if a equals b and false otherwise diff --git a/sql/hive/src/test/resources/golden/udf_equal-1-2422b50b96502dde8b661acdfebd8892 b/sql/hive/src/test/resources/golden/udf_equal-1-2422b50b96502dde8b661acdfebd8892 new file mode 100644 index 000000000000..30fdf50f62e4 --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-1-2422b50b96502dde8b661acdfebd8892 @@ -0,0 +1,2 @@ +a = b - Returns TRUE if a equals b and false otherwise +Synonyms: == diff --git a/sql/hive/src/test/resources/golden/udf_equal-2-e0faab0f5e736c24bcc5503aeac55053 b/sql/hive/src/test/resources/golden/udf_equal-2-e0faab0f5e736c24bcc5503aeac55053 new file mode 100644 index 000000000000..d6b4c860778b --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-2-e0faab0f5e736c24bcc5503aeac55053 @@ -0,0 +1 @@ +a == b - Returns TRUE if a equals b and false otherwise diff --git a/sql/hive/src/test/resources/golden/udf_equal-3-39d8d6f197803de927f0af5409ec2f33 b/sql/hive/src/test/resources/golden/udf_equal-3-39d8d6f197803de927f0af5409ec2f33 new file mode 100644 index 000000000000..71e55d6d638a --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-3-39d8d6f197803de927f0af5409ec2f33 @@ -0,0 +1,2 @@ +a == b - Returns TRUE if a equals b and false otherwise +Synonyms: = diff --git a/sql/hive/src/test/resources/golden/udf_equal-4-94ac2476006425e1b3bcddf29ad07b16 b/sql/hive/src/test/resources/golden/udf_equal-4-94ac2476006425e1b3bcddf29ad07b16 new file mode 100644 index 000000000000..015c417bc68f --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-4-94ac2476006425e1b3bcddf29ad07b16 @@ -0,0 +1 @@ +false false true true NULL NULL NULL NULL NULL diff --git a/sql/hive/src/test/resources/golden/udf_equal-5-878650cf21e9360a07d204c8ffb0cde7 b/sql/hive/src/test/resources/golden/udf_equal-5-878650cf21e9360a07d204c8ffb0cde7 new file mode 100644 index 000000000000..aa7b4b51edea --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-5-878650cf21e9360a07d204c8ffb0cde7 @@ -0,0 +1 @@ +a <=> b - Returns same result with EQUAL(=) operator for non-null operands, but returns TRUE if both are NULL, FALSE if one of the them is NULL diff --git a/sql/hive/src/test/resources/golden/udf_equal-6-1635ef051fecdfc7891d9f5a9a3a545e b/sql/hive/src/test/resources/golden/udf_equal-6-1635ef051fecdfc7891d9f5a9a3a545e new file mode 100644 index 000000000000..aa7b4b51edea --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-6-1635ef051fecdfc7891d9f5a9a3a545e @@ -0,0 +1 @@ +a <=> b - Returns same result with EQUAL(=) operator for non-null operands, but returns TRUE if both are NULL, FALSE if one of the them is NULL diff --git a/sql/hive/src/test/resources/golden/udf_equal-7-78f1b96c199e307714fa1b804e5bae27 b/sql/hive/src/test/resources/golden/udf_equal-7-78f1b96c199e307714fa1b804e5bae27 new file mode 100644 index 000000000000..05292fb23192 --- /dev/null +++ b/sql/hive/src/test/resources/golden/udf_equal-7-78f1b96c199e307714fa1b804e5bae27 @@ -0,0 +1 @@ +false false true true true false false false false From 8e66cdd64d807627c250b146f72aa5c3bcbc9b7e Mon Sep 17 00:00:00 2001 From: Cheng Hao Date: Thu, 24 Jul 2014 16:37:59 +0800 Subject: [PATCH 2/4] Rename the EqualNSTo ==> EqualNullSafe --- .../apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala | 4 ++-- .../scala/org/apache/spark/sql/catalyst/dsl/package.scala | 2 +- .../apache/spark/sql/catalyst/expressions/predicates.scala | 2 +- .../org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 4 ++-- .../src/main/scala/org/apache/spark/sql/hive/HiveQl.scala | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala index 20fa7c1af795..22c1bf192c2d 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala @@ -236,8 +236,8 @@ trait HiveTypeCoercion { case e if !e.childrenResolved => e // No need to change EqualTo operators as that actually makes sense for boolean types. case e: EqualTo => e - // No need to change the EqualNSTo operators - case e: EqualNSTo => e + // No need to change the EqualNullSafe operators, too + case e: EqualNullSafe => e // Otherwise turn them to Byte types so that there exists and ordering. case p: BinaryComparison if p.left.dataType == BooleanType && p.right.dataType == BooleanType => diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala index 97701f969bd7..5c8c810d9135 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala @@ -77,7 +77,7 @@ package object dsl { def > (other: Expression) = GreaterThan(expr, other) def >= (other: Expression) = GreaterThanOrEqual(expr, other) def === (other: Expression) = EqualTo(expr, other) - def <=> (other: Expression) = EqualNSTo(expr, other) + def <=> (other: Expression) = EqualNullSafe(expr, other) def !== (other: Expression) = Not(EqualTo(expr, other)) def in(list: Expression*) = In(expr, list) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala index f8563f815ad5..06b94a98d3cd 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala @@ -153,7 +153,7 @@ case class EqualTo(left: Expression, right: Expression) extends BinaryComparison } } -case class EqualNSTo(left: Expression, right: Expression) extends BinaryComparison { +case class EqualNullSafe(left: Expression, right: Expression) extends BinaryComparison { def symbol = "<=>" override def nullable = false override def eval(input: Row): Any = { diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index 74ef563e82d7..5f86d6047cb9 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -153,8 +153,8 @@ object NullPropagation extends Rule[LogicalPlan] { case e @ GetItem(Literal(null, _), _) => Literal(null, e.dataType) case e @ GetItem(_, Literal(null, _)) => Literal(null, e.dataType) case e @ GetField(Literal(null, _), _) => Literal(null, e.dataType) - case e @ EqualNSTo(Literal(null, _), r) => IsNull(r) - case e @ EqualNSTo(l, Literal(null, _)) => IsNull(l) + case e @ EqualNullSafe(Literal(null, _), r) => IsNull(r) + case e @ EqualNullSafe(l, Literal(null, _)) => IsNull(l) // For Coalesce, remove null literals. case e @ Coalesce(children) => diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala index 3c45b23c75ed..4395874526d5 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala @@ -931,7 +931,7 @@ private[hive] object HiveQl { /* Comparisons */ case Token("=", left :: right:: Nil) => EqualTo(nodeToExpr(left), nodeToExpr(right)) case Token("==", left :: right:: Nil) => EqualTo(nodeToExpr(left), nodeToExpr(right)) - case Token("<=>", left :: right:: Nil) => EqualNSTo(nodeToExpr(left), nodeToExpr(right)) + case Token("<=>", left :: right:: Nil) => EqualNullSafe(nodeToExpr(left), nodeToExpr(right)) case Token("!=", left :: right:: Nil) => Not(EqualTo(nodeToExpr(left), nodeToExpr(right))) case Token("<>", left :: right:: Nil) => Not(EqualTo(nodeToExpr(left), nodeToExpr(right))) case Token(">", left :: right:: Nil) => GreaterThan(nodeToExpr(left), nodeToExpr(right)) From 5b2ca88c9a3be623b929d79e7decaf03f90acb50 Mon Sep 17 00:00:00 2001 From: Cheng Hao Date: Thu, 24 Jul 2014 16:49:52 +0800 Subject: [PATCH 3/4] Add cases into whitelist --- .../spark/sql/hive/execution/HiveCompatibilitySuite.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala index 8b451973a47a..d5e7d81466f0 100644 --- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala +++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala @@ -503,6 +503,7 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "join_hive_626", "join_map_ppr", "join_nulls", + "join_nullsafe", "join_rc", "join_reorder2", "join_reorder3", @@ -562,6 +563,7 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "nullscript", "optional_outer", "orc_dictionary_threshold", + "orc_predicate_pushdown", "orc_empty_files", "order", "order2", @@ -734,6 +736,7 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "udf_double", "udf_E", "udf_elt", + "udf_equal", "udf_exp", "udf_field", "udf_find_in_set", From 8d6c789e5f929d8a44def54da17f0913129854cd Mon Sep 17 00:00:00 2001 From: Cheng Hao Date: Fri, 25 Jul 2014 08:54:12 +0800 Subject: [PATCH 4/4] Remove the test case orc_predicate_pushdown --- .../spark/sql/hive/execution/HiveCompatibilitySuite.scala | 6 ++++-- ...rc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 | 0 ...rc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e | 0 ...c_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 | 0 ...c_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 | 1 - ...c_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 | 1 - ...rc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f | 1 - ...c_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf | 1 - ...c_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf | 1 - ...rc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 | 0 ...c_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff | 1 - ...c_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff | 1 - ...c_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 | 0 ...c_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 | 0 ...c_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 | 2 -- ...rc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b | 0 ...c_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 | 2 -- ...c_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 | 0 ...c_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 | 0 ...c_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 | 3 --- ...c_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 | 1 - ...c_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 | 3 --- ...rc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 | 0 ...c_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 | 1 - ...c_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb | 0 ...c_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb | 0 ...c_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 | 3 --- ...c_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 | 3 --- ...c_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 | 0 ...rc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 | 1 - ...c_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 | 0 ...c_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 | 1 - ...c_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 | 1 - ...c_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...c_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 | 0 ...c_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 | 0 ...rc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 | 1 - ...c_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...rc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 | 1 - ...rc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec | 1 - ...rc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 | 0 62 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec delete mode 100644 sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala index d5e7d81466f0..c69e93ba2b9b 100644 --- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala +++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala @@ -196,7 +196,10 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { // Hive returns the results of describe as plain text. Comments with multiple lines // introduce extra lines in the Hive results, which make the result comparison fail. - "describe_comment_indent" + "describe_comment_indent", + + // Limit clause without a ordering, which causes failure. + "orc_predicate_pushdown" ) /** @@ -563,7 +566,6 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { "nullscript", "optional_outer", "orc_dictionary_threshold", - "orc_predicate_pushdown", "orc_empty_files", "order", "order2", diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-0-830517b37a4a1db794d01b828c926465 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-1-1b813538d30b70b4dfa36b26e3f4254e deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-10-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-11-8624e51ec5c685726039db2766e11b11 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-12-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 deleted file mode 100644 index 7eebda6a8d98..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-13-3972568364bdd7fef0091b0d67c85600 +++ /dev/null @@ -1 +0,0 @@ --3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-14-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f deleted file mode 100644 index 7eebda6a8d98..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-15-7b38292881bba4a0fd3d953efc0138f +++ /dev/null @@ -1 +0,0 @@ --3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-16-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf deleted file mode 100644 index 5ffb863c0c45..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-17-d6e812265e4efd51198d587626501fcf +++ /dev/null @@ -1 +0,0 @@ -124 336 65664 4294967435 74.72 42.47 true bob davidson 2013-03-01 09:11:58.703302 45.4 yard duty diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-18-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf deleted file mode 100644 index 5ffb863c0c45..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-19-d6e812265e4efd51198d587626501fcf +++ /dev/null @@ -1 +0,0 @@ -124 336 65664 4294967435 74.72 42.47 true bob davidson 2013-03-01 09:11:58.703302 45.4 yard duty diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-2-578f5a57fb198decd9327f657e899678 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-20-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff deleted file mode 100644 index de71f88722a7..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-21-e92ebcd8dab12f8417cbf58898b811ff +++ /dev/null @@ -1 +0,0 @@ --8 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-22-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff deleted file mode 100644 index de71f88722a7..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-23-e92ebcd8dab12f8417cbf58898b811ff +++ /dev/null @@ -1 +0,0 @@ --8 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-24-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-25-17c08357b4fd44ba6d25af5c8e4cf846 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-26-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-27-17c08357b4fd44ba6d25af5c8e4cf846 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-28-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 deleted file mode 100644 index 503ce357c5aa..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-29-df10a575cae74fdd1e29f6ec44e63eb9 +++ /dev/null @@ -1,2 +0,0 @@ --1 bob laertes --1 bob young diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-3-1d827149dc2236bfcd903c0b6c78531b deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-30-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 deleted file mode 100644 index 503ce357c5aa..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-31-df10a575cae74fdd1e29f6ec44e63eb9 +++ /dev/null @@ -1,2 +0,0 @@ --1 bob laertes --1 bob young diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-32-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-33-5ba7f0cc153dab2f03fba7a1250d3ed3 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-34-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-35-5ba7f0cc153dab2f03fba7a1250d3ed3 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-36-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 deleted file mode 100644 index 30085e5e24fd..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-37-ee03a627cd80d8ad3c26d11be728b089 +++ /dev/null @@ -1,3 +0,0 @@ -26 bob ovid -26 bob quirinius -27 bob ovid diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-38-5ff451159bc8bc0bd0b2f659a5bc30f4 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 deleted file mode 100644 index 30085e5e24fd..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-39-ee03a627cd80d8ad3c26d11be728b089 +++ /dev/null @@ -1,3 +0,0 @@ -26 bob ovid -26 bob quirinius -27 bob ovid diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-4-a9696f5c4727b9dc1ddab42351528ac6 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-40-d80de08433545c29629e21e9356ff174 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-41-e8d8f2cfaf5f7a08c82e336dcb24ecfb deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-42-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-43-e8d8f2cfaf5f7a08c82e336dcb24ecfb deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-44-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 deleted file mode 100644 index 1353a8513325..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-45-fea78d0c8d99de02734360604f836a61 +++ /dev/null @@ -1,3 +0,0 @@ -15 334 11.12 jessica robinson -101 327 11.48 gabriella ellison -7 320 11.54 bob ellison diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-46-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 deleted file mode 100644 index 1353a8513325..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-47-fea78d0c8d99de02734360604f836a61 +++ /dev/null @@ -1,3 +0,0 @@ -15 334 11.12 jessica robinson -101 327 11.48 gabriella ellison -7 320 11.54 bob ellison diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-48-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-49-e1478d352e4040a57761261002a88b21 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 deleted file mode 100644 index 995fb31d6ff7..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-5-7b925ffc10eeb9fc1571160babb50405 +++ /dev/null @@ -1 +0,0 @@ -62430 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-50-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-51-e1478d352e4040a57761261002a88b21 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-52-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 deleted file mode 100644 index 905af92f0179..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-53-61d0f86e7612655c6189bd72ef8012e4 +++ /dev/null @@ -1 +0,0 @@ -15 334 11.12 jessica robinson diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-54-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 deleted file mode 100644 index 905af92f0179..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-55-61d0f86e7612655c6189bd72ef8012e4 +++ /dev/null @@ -1 +0,0 @@ -15 334 11.12 jessica robinson diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-56-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-57-19777278d1bee59683a31f0a8553b705 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-58-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-59-19777278d1bee59683a31f0a8553b705 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-6-3b03210f94ec40db9ab02620645014d1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-60-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 deleted file mode 100644 index 995fb31d6ff7..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-7-ac8c6c7e973c18d6294747e8737bc207 +++ /dev/null @@ -1 +0,0 @@ -62430 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec deleted file mode 100644 index 573541ac9702..000000000000 --- a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-8-9b10e38b0f5bc75cb4b7549883b93eec +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 b/sql/hive/src/test/resources/golden/orc_predicate_pushdown-9-8624e51ec5c685726039db2766e11b11 deleted file mode 100644 index e69de29bb2d1..000000000000