Merge 5e0ea2b into 7dd3f4d

Author: evanevanevanevannnn

ydb/core/kqp/session_actor/kqp_response.cpp

@@ -111,6 +111,7 @@ TMaybe<Ydb::StatusIds::StatusCode> GetYdbStatus(const TIssue& issue) {
         case TIssuesIds::KIKIMR_TRANSACTION_NOT_FOUND:
             return Ydb::StatusIds::NOT_FOUND;
 
+        case TIssuesIds::CORE_EXEC:
         case TIssuesIds::KIKIMR_BAD_REQUEST:
         case TIssuesIds::KIKIMR_BAD_COLUMN_TYPE:
         case TIssuesIds::KIKIMR_NO_COLUMN_DEFAULT_VALUE:

ydb/library/yql/providers/common/mkql/parser.cpp

@@ -253,19 +253,25 @@ TRuntimeNode BuildParseCall(
         );
     } else if (format == "json_list") {
         auto parseToListLambda = [&](TRuntimeNode blob) {
-            const auto json = ctx.ProgramBuilder.StrictFromString(
-                blob,
-                ctx.ProgramBuilder.NewDataType(NUdf::TDataType<NUdf::TJson>::Id));
-            const auto dom = ctx.ProgramBuilder.Apply(
-                ctx.ProgramBuilder.Udf("Yson2.ParseJson"),
-                {json});
-            const auto userType = ctx.ProgramBuilder.NewTupleType({
-                ctx.ProgramBuilder.NewTupleType({dom.GetStaticType()}),
-                ctx.ProgramBuilder.NewStructType({}),
-                ctx.ProgramBuilder.NewListType(parseItemType)});
-            return ctx.ProgramBuilder.Apply(
-                ctx.ProgramBuilder.Udf("Yson2.ConvertTo", {}, userType),
-                {dom});
+            try {
+                const auto json = ctx.ProgramBuilder.StrictFromString(
+                    blob,
+                    ctx.ProgramBuilder.NewDataType(NUdf::TDataType<NUdf::TJson>::Id));
+                const auto dom = ctx.ProgramBuilder.Apply(
+                    ctx.ProgramBuilder.Udf("Yson2.ParseJson"),
+                    {json});
+                const auto userType = ctx.ProgramBuilder.NewTupleType({
+                    ctx.ProgramBuilder.NewTupleType({dom.GetStaticType()}),
+                    ctx.ProgramBuilder.NewStructType({}),
+                    ctx.ProgramBuilder.NewListType(parseItemType)});
+                return ctx.ProgramBuilder.Apply(
+                    ctx.ProgramBuilder.Udf("Yson2.ConvertTo", {}, userType),
+                    {dom});
+            } catch(const yexception& e) {
+                auto resException = TErrorException(UNEXPECTED_ERROR);
+                resException.Append(e.what());
+                throw resException;
+            }
         };
 
         input = ctx.ProgramBuilder.FlatMap(ctx.ProgramBuilder.ToFlow(input),

ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp

@@ -1152,6 +1152,10 @@ class TS3ReadCoroImpl : public TActorCoroImpl {
                     Issues.AddIssue(TIssue(ex.message()));
                     FatalCode = NYql::NDqProto::StatusIds::BAD_REQUEST;
                     RetryStuff->Cancel();
+                } catch (const yexception& ex) {
+                    Issues.AddIssue(ExceptionToIssue(ex));
+                    FatalCode = NYql::NDqProto::StatusIds::BAD_REQUEST;
+                    RetryStuff->Cancel();
                 }
             }
         } catch (const TS3ReadAbort&) {

ydb/tests/fq/s3/test_s3_0.py

@@ -762,6 +762,54 @@ def test_bad_format(self, kikimr, s3, client, runtime_listing, unique_prefix):
         query_id = client.create_query("simple", sql, type=fq.QueryContent.QueryType.ANALYTICS).result.query_id
         client.wait_query_status(query_id, fq.QueryMeta.FAILED)
 
+    @yq_v2
+    @pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
+    def test_bad_request(self, kikimr, s3, client, unique_prefix):
+        resource = boto3.resource(
+            "s3", endpoint_url=s3.s3_url, aws_access_key_id="key", aws_secret_access_key="secret_key"
+        )
+
+        bucket = resource.Bucket("bbucket")
+        bucket.create(ACL='public-read')
+        bucket.objects.all().delete()
+
+        s3_client = boto3.client(
+            "s3", endpoint_url=s3.s3_url, aws_access_key_id="key", aws_secret_access_key="secret_key"
+        )
+
+        s3_client.put_object(Body="blah blah blah", Bucket='bbucket', Key='file.json', ContentType='text/plain')
+
+        kikimr.control_plane.wait_bootstrap(1)
+        storage_connection_name = unique_prefix + "badbucket"
+        client.create_storage_connection(storage_connection_name, "bbucket")
+
+        sql = f'''
+            select * from `{storage_connection_name}`.`file.json` with (
+                format=json_list,
+                schema (data timestamp)
+            );
+            '''
+
+        query_id = client.create_query("simple", sql, type=fq.QueryContent.QueryType.ANALYTICS).result.query_id
+        client.wait_query_status(query_id, fq.QueryMeta.FAILED)
+        assert "Query failed with code BAD_REQUEST" in str(
+            client.describe_query(query_id).result
+        )
+
+        sql = f'''
+            select * from `{storage_connection_name}`.`file.json` with (
+                format=csv_with_names,
+                compression='gzip',
+                schema (data timestamp)
+            );
+            '''
+
+        query_id = client.create_query("simple", sql, type=fq.QueryContent.QueryType.ANALYTICS).result.query_id
+        client.wait_query_status(query_id, fq.QueryMeta.FAILED)
+        assert "Query failed with code BAD_REQUEST" in str(
+            client.describe_query(query_id).result
+        )
+
     @yq_v1
     @pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
     @pytest.mark.parametrize("mvp_external_ydb_endpoint", [{"endpoint": os.getenv("YDB_ENDPOINT")}], indirect=True)