Merge 8efa631 into 8b1b84a

Author: pashandor789

ydb/core/kqp/opt/kqp_query_plan.cpp

@@ -662,20 +662,24 @@ class TxPlanSerializer {
                 for (const auto& keyPartRange : scanRangeDescr) {
                     TStringBuilder rangeDescr;
 
+                    auto removeForbiddenChars = [](std::string s) -> std::string {
+                        return IsUtf(s)? s: "Non-UTF8 string";
+                    }; /* remove chars, that break json plan */
+
                     if (keyPartRange.From == keyPartRange.To) {
                         if (keyPartRange.From.Empty()) {
                             rangeDescr << keyPartRange.ColumnName << " (-∞, +∞)";
                             readInfo.ScanBy.push_back(rangeDescr);
                         } else {
                             rangeDescr << keyPartRange.ColumnName
-                                       << " (" << keyPartRange.From << ")";
+                                       << " (" << removeForbiddenChars(keyPartRange.From) << ")";
                             readInfo.LookupBy.push_back(rangeDescr);
                         }
                     } else {
                         rangeDescr << keyPartRange.ColumnName << " "
                                    << (keyPartRange.From.Empty() ? "(" : leftParen)
-                                   << (keyPartRange.From.Empty() ? "-∞" : keyPartRange.From) << ", "
-                                   << (keyPartRange.To.Empty() ? "+∞" : keyPartRange.To)
+                                   << (keyPartRange.From.Empty() ? "-∞" : removeForbiddenChars(keyPartRange.From)) << ", "
+                                   << (keyPartRange.To.Empty() ? "+∞" : removeForbiddenChars(keyPartRange.To))
                                    << (keyPartRange.To.Empty() ? ")" : rightParen);
                         readInfo.ScanBy.push_back(rangeDescr);
                         hasRangeScans = true;