From ef9a397188a16efb46e5b6ad597feb1685f84caf Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 21 Aug 2024 16:39:48 +0200 Subject: [PATCH] Sumo: improve logging and remove some unused code. --- .../Application/Tools/Cloud/RiaSumoConnector.cpp | 6 ++++-- .../Application/Tools/Cloud/RiaSumoConnector.h | 4 ---- .../Summary/Sumo/RimSummaryEnsembleSumo.cpp | 13 ++++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp index 902003b17f..efd27a220d 100644 --- a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp +++ b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp @@ -467,6 +467,8 @@ void RiaSumoConnector::requestBlobDownload( const QString& blobId ) //-------------------------------------------------------------------------------------------------- void RiaSumoConnector::requestBlobByRedirectUri( const QString& blobId, const QString& redirectUri ) { + RiaLogging::debug( QString( "Requesting blob. Id: %1 Redirect URL: %2" ).arg( blobId ).arg( redirectUri ) ); + requestTokenBlocking(); QNetworkRequest networkRequest; @@ -700,9 +702,9 @@ void RiaSumoConnector::parseCases( QNetworkReply* reply ) QString fieldName = fmuCase["name"].toString(); m_cases.push_back( SumoCase{ SumoCaseId( id ), kind, fieldName } ); } - - emit casesFinished(); } + + emit casesFinished(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.h b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.h index beae5fc9c6..76f4603d7e 100644 --- a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.h +++ b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.h @@ -154,9 +154,5 @@ private: std::vector m_blobUrl; - QString m_redirect; - std::vector m_redirectInfo; - - QByteArray m_parquetData; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp b/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp index a770069b9d..5282d1fa40 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryEnsembleSumo.cpp @@ -120,6 +120,7 @@ void RimSummaryEnsembleSumo::loadSummaryData( const RifEclipseSummaryAddress& re if ( m_parquetTable.find( key ) == m_parquetTable.end() ) { auto contents = loadParquetData( key ); + RiaLogging::debug( QString( "Load Summary Data. Contents size: %1" ).arg( contents.size() ) ); arrow::MemoryPool* pool = arrow::default_memory_pool(); @@ -127,20 +128,22 @@ void RimSummaryEnsembleSumo::loadSummaryData( const RifEclipseSummaryAddress& re std::shared_ptr table; std::unique_ptr arrow_reader; - if ( parquet::arrow::OpenFile( input, pool, &arrow_reader ).ok() ) + if ( auto openResult = parquet::arrow::OpenFile( input, pool, &arrow_reader ); openResult.ok() ) { - if ( arrow_reader->ReadTable( &table ).ok() ) + if ( auto readResult = arrow_reader->ReadTable( &table ); readResult.ok() ) { - RiaLogging::info( "Parquet: Read table" ); + RiaLogging::info( QString( "Parquet: Read table successfully for %1" ).arg( QString::fromStdString( resultAddress.uiText() ) ) ); } else { - RiaLogging::warning( "Parquet: Error detected during parsing of table" ); + RiaLogging::warning( QString( "Parquet: Error detected during parsing of table. Message: %1" ) + .arg( QString::fromStdString( readResult.ToString() ) ) ); } } else { - RiaLogging::warning( "Parquet: Not able to open data stream" ); + RiaLogging::warning( + QString( "Parquet: Not able to open data stream. Message: %1" ).arg( QString::fromStdString( openResult.ToString() ) ) ); } m_parquetTable[key] = table;