test: re-enable sql_hive-1 for Spark 4.0 and fix two small failures#4047

andygrove merged 4 commits intoapache:mainapache/datafusion-comet:mainfrom

andygrove:test-hive1-spark4-retryandygrove/datafusion-comet:test-hive1-spark4-retryCopy head branch name to clipboard