From a7581335f142e0a711fd4feb126e00b704fc5348 Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Sat, 21 Oct 2023 11:31:31 +0300
Subject: [PATCH] - Improve the "getDataForPayloadPrefillQuery". - Improve some
 error-messages.

---
 src/main/java/eu/openaire/urls_controller/util/FileUtils.java | 3 ++-
 .../eu/openaire/urls_controller/util/ParquetFileUtils.java    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/openaire/urls_controller/util/FileUtils.java b/src/main/java/eu/openaire/urls_controller/util/FileUtils.java
index 174df78..f9a0e0f 100644
--- a/src/main/java/eu/openaire/urls_controller/util/FileUtils.java
+++ b/src/main/java/eu/openaire/urls_controller/util/FileUtils.java
@@ -768,10 +768,11 @@ public class FileUtils {
         relatedIDsStringBuilder.append(")");
 
         // Get the id and url of any
-        String getDataForPayloadPrefillQuery = "select pu.id, pu.url\n" +
+        String getDataForPayloadPrefillQuery = "select distinct pu.id, pu.url\n" +
                 "from " + DatabaseConnector.databaseName + ".publication_urls pu\n" +
                 "left anti join " + DatabaseConnector.databaseName + ".attempt a on a.id=pu.id and a.original_url=pu.url\n" +
                 "left anti join " + DatabaseConnector.databaseName + ".payload p on p.id=pu.id and p.original_url=pu.url\n" +
+                "left anti join " + DatabaseConnector.databaseName + ".assignment asgn on asgn.id=pu.id and asgn.original_url=pu.url\n" +
                 "where pu.url in " + relatedIDsStringBuilder;
 
         //logger.trace("getDataForPayloadPrefillQuery:\n" + getDataForPayloadPrefillQuery);
diff --git a/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java b/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java
index 0a69164..0702eb5 100644
--- a/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java
+++ b/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java
@@ -489,9 +489,9 @@ public class ParquetFileUtils {
             // Using the "load data inpath" command, he files are MOVED, not copied! So we don't have to delete them afterwards.
             // See: https://docs.cloudera.com/documentation/enterprise/latest/topics/impala_load_data.html
         } catch (Throwable e) {
-            String errorMsg = "Error while uploading parquet file \"" + parquetFileFullLocalPath + "\" to HDFS!\n" + e.getMessage();
+            String errorMsg = "Error while uploading parquet file \"" + parquetFileFullLocalPath + "\" to HDFS!\n";
             logger.error(errorMsg, e);
-            return errorMsg;
+            return errorMsg + e.getMessage();
         }
 
         // The local parquet file will be deleted later.