Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup QgsDebugMsg usage in HANA provider
  • Loading branch information
Maksim Rylov authored and mrylov committed Dec 7, 2020
1 parent c34a095 commit 7083c55
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 115 deletions.
5 changes: 1 addition & 4 deletions src/providers/hana/qgshanadataitems.cpp
Expand Up @@ -171,8 +171,6 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
u.name,
( srcLayer->geometryType() != QgsWkbTypes::NullGeometry ) ? ( fieldsInUpperCase ? QStringLiteral( "GEOM" ) : QStringLiteral( "geom" ) ) : nullptr );

QgsDebugMsg( "URI " + uri.uri( false ) );

std::unique_ptr< QgsVectorLayerExporterTask > exportTask(
QgsVectorLayerExporterTask::withLayerOwnership( srcLayer, uri.uri( false ),
QStringLiteral( "hana" ), srcLayer->crs() ) );
Expand Down Expand Up @@ -265,7 +263,7 @@ QString QgsHanaLayerItem::createUri() const
uri.setWkbType( mLayerProperty.type );
if ( uri.wkbType() != QgsWkbTypes::NoGeometry )
uri.setSrid( QString::number( mLayerProperty.srid ) );
QgsDebugMsg( QStringLiteral( "layer uri: %1" ).arg( uri.uri( false ) ) );
QgsDebugMsgLevel( QStringLiteral( "layer uri: %1" ).arg( uri.uri( false ) ), 4 );
return uri.uri( false );
}

Expand Down Expand Up @@ -408,6 +406,5 @@ QgsDataItem *QgsHanaDataItemProvider::createDataItem(
const QString &pathIn, QgsDataItem *parentItem )
{
Q_UNUSED( pathIn );
QgsDebugMsg( QStringLiteral( "HANA: Browser Panel; data item detected." ) );
return new QgsHanaRootItem( parentItem, QStringLiteral( "HANA" ), QStringLiteral( "hana:" ) );
}
6 changes: 1 addition & 5 deletions src/providers/hana/qgshanaexpressioncompiler.cpp
Expand Up @@ -140,8 +140,7 @@ QgsSqlExpressionCompiler::Result QgsHanaExpressionCompiler::compileNode(
Result resLeft = compileNode( binOp->opLeft(), opLeft );
Result resRight = compileNode( binOp->opRight(), opRight );
Result compileResult;
QgsDebugMsg( "left: '" + opLeft + "'; right: '" + opRight +
QString( "'; op: %1; lr: %2; rr: %3" ).arg( binOp->op() ).arg( resLeft ).arg( resRight ) );

if ( resLeft == Fail || resRight == Fail )
return Fail;

Expand All @@ -150,19 +149,16 @@ QgsSqlExpressionCompiler::Result QgsHanaExpressionCompiler::compileNode(
case QgsExpressionNodeBinaryOperator::boMod:
result = QStringLiteral( "MOD(%1,%2)" ).arg( opLeft, opRight );
compileResult = ( resLeft == Partial || resRight == Partial ) ? Partial : Complete;
QgsDebugMsg( QStringLiteral( "MOD compile status: %1" ).arg( compileResult ) + "; " + result );
return compileResult;

case QgsExpressionNodeBinaryOperator::boPow:
result = QStringLiteral( "POWER(%1,%2)" ).arg( opLeft, opRight );
compileResult = ( resLeft == Partial || resRight == Partial ) ? Partial : Complete;
QgsDebugMsg( QStringLiteral( "POWER compile status: %1" ).arg( compileResult ) + "; " + result );
return compileResult;

case QgsExpressionNodeBinaryOperator::boRegexp:
result = QStringLiteral( "%1 LIKE_REGEXPR %2" ).arg( opLeft, opRight );
compileResult = ( resLeft == Partial || resRight == Partial ) ? Partial : Complete;
QgsDebugMsg( QStringLiteral( "LIKE_REGEXPR compile status: %1" ).arg( compileResult ) + "; " + result );
return compileResult;

// We only support IS NULL and IS NOT NULL if the operand on the left is a column
Expand Down
2 changes: 1 addition & 1 deletion src/providers/hana/qgshanafeatureiterator.cpp
Expand Up @@ -414,7 +414,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
if ( limitAtProvider )
sql += QStringLiteral( " LIMIT %1" ).arg( mRequest.limit() );

QgsDebugMsg( sql );
QgsDebugMsgLevel( "Query: " + sql, 4 );
return sql;
}

Expand Down
26 changes: 8 additions & 18 deletions src/providers/hana/qgshanaprovider.cpp
Expand Up @@ -247,7 +247,8 @@ static void setStatementValue(
}
break;
default:
QgsDebugMsg( QStringLiteral( "Unknown value type ('%1') for parameter %2" ).arg( QString::number( fieldInfo.type ), QString::number( paramIndex ) ) );
QgsDebugMsg( QStringLiteral( "Unknown value type ('%1') for parameter %2" )
.arg( QString::number( fieldInfo.type ), QString::number( paramIndex ) ) );
}
}

Expand Down Expand Up @@ -334,16 +335,16 @@ QgsHanaProvider::QgsHanaProvider(

mValid = true;

QgsDebugMsg( QStringLiteral( "Connection info is %1" ).arg( mUri.connectionInfo( false ) ) );
QgsDebugMsg( QStringLiteral( "Schema is: %1" ).arg( mSchemaName ) );
QgsDebugMsg( QStringLiteral( "Table name is: %1" ).arg( mTableName ) );
QgsDebugMsg( QStringLiteral( "Geometry column is: %1" ).arg( mGeometryColumn ) );
QgsDebugMsg( QStringLiteral( "Query is: %1" ).arg( mQuery ) );
QgsDebugMsgLevel( QStringLiteral( "Connection info is %1" ).arg( mUri.connectionInfo( false ) ), 4 );
QgsDebugMsgLevel( QStringLiteral( "Schema is: %1" ).arg( mSchemaName ), 4 );
QgsDebugMsgLevel( QStringLiteral( "Table name is: %1" ).arg( mTableName ), 4 );
QgsDebugMsgLevel( QStringLiteral( "Geometry column is: %1" ).arg( mGeometryColumn ), 4 );
QgsDebugMsgLevel( QStringLiteral( "Query is: %1" ).arg( mQuery ), 4 );
}

QgsHanaProvider::~QgsHanaProvider()
{
QgsDebugMsg( QStringLiteral( "deconstructing." ) );
QgsDebugMsgLevel( QStringLiteral( "deconstructing." ), 4 );
}

QgsAbstractFeatureSource *QgsHanaProvider::featureSource() const
Expand Down Expand Up @@ -471,8 +472,6 @@ bool QgsHanaProvider::setSubsetString( const QString &subset, bool )
if ( whereClause == mQueryWhereClause )
return true;

QgsDebugMsg( whereClause );

bool hasErrors = false;
try
{
Expand Down Expand Up @@ -1023,7 +1022,6 @@ bool QgsHanaProvider::changeAttributeValues( const QgsChangedAttributesMap &attr
if ( !mFidColumn.isEmpty() )
sql += QStringLiteral( " WHERE %1=%2" ).arg( QgsHanaUtils::quotedIdentifier( mFidColumn ), FID_TO_STRING( fid ) );

QgsDebugMsg( QStringLiteral( "Change attributes: " ) + sql );
PreparedStatementRef stmt = conn->prepareStatement( reinterpret_cast<const char16_t *>( sql.unicode() ) );

unsigned short paramIndex = 1;
Expand Down Expand Up @@ -1477,11 +1475,6 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
if ( wkbType != QgsWkbTypes::NoGeometry && geometryColumn.isEmpty() )
geometryColumn = "geom";

QgsDebugMsg( QStringLiteral( "Connection info is: %1" ).arg( dsUri.connectionInfo( false ) ) );
QgsDebugMsg( QStringLiteral( "Geometry column is: %1" ).arg( geometryColumn ) );
QgsDebugMsg( QStringLiteral( "Schema is: %1" ).arg( schemaName ) );
QgsDebugMsg( QStringLiteral( "Table name is: %1" ).arg( tableName ) );

bool fieldsInUpperCase = false;
if ( fields.size() > 0 )
{
Expand Down Expand Up @@ -1641,8 +1634,6 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(

return QgsVectorLayerExporter::ErrAttributeCreationFailed;
}

QgsDebugMsg( QStringLiteral( "Done creating fields" ) );
}

return QgsVectorLayerExporter::NoError;
Expand All @@ -1651,7 +1642,6 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
QgsHanaProviderMetadata::QgsHanaProviderMetadata()
: QgsProviderMetadata( QgsHanaProvider::HANA_KEY, QgsHanaProvider::HANA_DESCRIPTION )
{
QgsDebugMsg( QStringLiteral( "Create QgsHanaProviderMetadata" ) );
}

void QgsHanaProviderMetadata::initProvider()
Expand Down

0 comments on commit 7083c55

Please sign in to comment.