Merge remote-tracking branch 'apache/main' into recursive-external-err

Author: alamb

.github/pull_request_template.md

@@ -4,7 +4,7 @@
 We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
 -->
 
-Closes #.
+- Closes #.
 
 ## Rationale for this change
 

datafusion/sqllogictest/src/engines/postgres_engine/mod.rs

@@ -17,14 +17,14 @@
 
 use async_trait::async_trait;
 use bytes::Bytes;
+use datafusion_common_runtime::SpawnedTask;
 use futures::{SinkExt, StreamExt};
 use log::{debug, info};
 use sqllogictest::DBOutput;
 /// Postgres engine implementation for sqllogictest.
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::time::Duration;
-use tokio::task::JoinHandle;
 
 use super::conversion::*;
 use crate::engines::output::{DFColumnType, DFOutput};
@@ -54,7 +54,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 pub struct Postgres {
     client: tokio_postgres::Client,
-    join_handle: JoinHandle<()>,
+    _spawned_task: SpawnedTask<()>,
     /// Relative test file path
     relative_path: PathBuf,
     pb: ProgressBar,
@@ -90,7 +90,7 @@ impl Postgres {
 
         let (client, connection) = res?;
 
-        let join_handle = tokio::spawn(async move {
+        let _spawned_task = SpawnedTask::spawn(async move {
             if let Err(e) = connection.await {
                 log::error!("Postgres connection error: {:?}", e);
             }
@@ -114,7 +114,7 @@ impl Postgres {
 
         Ok(Self {
             client,
-            join_handle,
+            _spawned_task,
             relative_path,
             pb,
         })
@@ -222,12 +222,6 @@ fn schema_name(relative_path: &Path) -> String {
         .to_string()
 }
 
-impl Drop for Postgres {
-    fn drop(&mut self) {
-        self.join_handle.abort()
-    }
-}
-
 #[async_trait]
 impl sqllogictest::AsyncDB for Postgres {
     type Error = Error;

datafusion/sqllogictest/test_files/string/string_literal.slt

@@ -862,26 +862,29 @@ true true true true
 # Escapes
 
 # \ is an implicit escape character
-query BBBB
+query BBBBBB
 SELECT
     'a' LIKE '\%',
     '\a' LIKE '\%',
+    '\a' LIKE '\\%',
     '%' LIKE '\%',
-    '\%' LIKE '\%'
+    '\%' LIKE '\%',
+    '\%' LIKE '\\%'
 ----
-false false true false
+false false true true false true
 
 # \ is an implicit escape character
-query BBBBBB
+query BBBBBBB
 SELECT
     'a' LIKE '\_',
     '\a' LIKE '\_',
+    '\a' LIKE '\\_',
     '_' LIKE '\_',
     '\_' LIKE '\_',
     'abc' LIKE 'a_c',
     'abc' LIKE 'a\_c'
 ----
-false false true false true false
+false false true true false true false
 
 query BBBB
 SELECT