Consider comments for HANA provider

qgis · Dec 7, 2020 · dee148e · dee148e
1 parent 13add12
commit dee148e
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 40 deletions.
diff --git a/src/providers/hana/CMakeLists.txt b/src/providers/hana/CMakeLists.txt
@@ -68,9 +68,6 @@ INCLUDE_DIRECTORIES (SYSTEM
 ADD_LIBRARY(hanaprovider MODULE ${HANA_SRCS} ${HANA_HDRS} ${HANA_MOC_SRCS})
 ADD_LIBRARY(hanaprovider_a STATIC ${HANA_SRCS} ${HANA_HDRS} ${HANA_MOC_SRCS})
 
-SET_TARGET_PROPERTIES(hanaprovider PROPERTIES COMPILE_DEFINITIONS ODBC_EXPORTS)
-SET_TARGET_PROPERTIES(hanaprovider_a PROPERTIES COMPILE_DEFINITIONS ODBC_EXPORTS)
-
 TARGET_LINK_LIBRARIES(hanaprovider
   qgis_core
   ${ODBC_LIBRARIES}

diff --git a/src/providers/hana/qgshanacolumntypethread.cpp b/src/providers/hana/qgshanacolumntypethread.cpp
@@ -19,11 +19,16 @@
 #include "qgshanasettings.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
+#include <mutex>
 
 QgsHanaColumnTypeThread::QgsHanaColumnTypeThread( const QgsHanaSettings &settings )
   : mSettings( settings )
 {
-  qRegisterMetaType<QgsHanaLayerProperty>( "QgsHanaLayerProperty" );
+  static std::once_flag initialized;
+  std::call_once( initialized, [ = ]( )
+  {
+    qRegisterMetaType<QgsHanaLayerProperty>( "QgsHanaLayerProperty" );
+  } );
 }
 
 void QgsHanaColumnTypeThread::stop()

diff --git a/src/providers/hana/qgshanadataitems.cpp b/src/providers/hana/qgshanadataitems.cpp
@@ -164,7 +164,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
 
       if ( srcLayer->isValid() )
       {
-        bool fieldsInUpperCase = QgsHanaUtils::countFieldsInUppercase( srcLayer->fields() ) > srcLayer->fields().size() / 2;
+        bool fieldsInUpperCase = QgsHanaUtils::countFieldsWithFirstLetterInUppercase( srcLayer->fields() ) > srcLayer->fields().size() / 2;
 
         uri.setWkbType( srcLayer->wkbType() );
         uri.setDataSource( !toSchema.isNull() ? toSchema : nullptr,

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -78,6 +78,27 @@ QgsHanaFeatureIterator::QgsHanaFeatureIterator(
     PreparedStatementRef stmt = mConnRef->getNativeRef()->prepareStatement( sql.toStdString().c_str() );
     mSqlStatement = sql;
     mClosed = false;
+
+    /// TODO : REMOVE ************
+    StatementRef stmtCount = mConnRef->getNativeRef()->createStatement();
+
+    QString sqlCount = QString( "SELECT COUNT(*) FROM %1.%2" ).arg( QgsHanaUtils::quotedIdentifier( mSource->mSchemaName ), QgsHanaUtils::quotedIdentifier( mSource->mTableName ) );
+    if ( !mSource->mQueryWhereClause.isEmpty() )
+      sqlCount += " WHERE " + mSource->mQueryWhereClause;
+    ResultSetRef rsCount = stmtCount->executeQuery( sqlCount.toStdString().c_str() );
+    rsCount->next();
+    int64_t tableRowsCount = *rsCount->getLong( 1 );
+    rsCount->close();
+
+    sqlCount = QString( "SELECT COUNT(*) FROM (%1)" ).arg( sql );
+    rsCount = stmtCount->executeQuery( sqlCount.toStdString().c_str() );
+    rsCount->next();
+    int64_t viewFeaturesCount = *rsCount->getLong( 1 );
+    rsCount->close();
+
+    mSelectivity = static_cast<double>( viewFeaturesCount ) / tableRowsCount;
+    /// ***************
+
     rewind();
   }
   catch ( const odbc::Exception &ex )

diff --git a/src/providers/hana/qgshanafeatureiterator.h b/src/providers/hana/qgshanafeatureiterator.h
@@ -89,6 +89,7 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
     bool mHasGeometryColumn = false;
     bool mExpressionCompiled = false;
     bool mOrderByCompiled = false;
+    double mSelectivity = 0;
 };
 
 #endif // QGSHANAFEATUREITERATOR_H
diff --git a/src/providers/hana/qgshanaprovider.cpp b/src/providers/hana/qgshanaprovider.cpp
@@ -1512,7 +1512,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
   bool fieldsInUpperCase = false;
   if ( fields.size() > 0 )
   {
-    int count = QgsHanaUtils::countFieldsInUppercase( fields );
+    int count = QgsHanaUtils::countFieldsWithFirstLetterInUppercase( fields );
     fieldsInUpperCase = count > fields.size() / 2;
   }
 

diff --git a/src/providers/hana/qgshanatablemodel.cpp b/src/providers/hana/qgshanatablemodel.cpp
@@ -37,9 +37,6 @@ QgsHanaTableModel::QgsHanaTableModel()
 
 void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty )
 {
-  // is there already a root item with the given scheme Name?
-  QStandardItem *schemaItem = nullptr;
-
   QgsWkbTypes::Type wkbType = layerProperty.type;
   int srid = layerProperty.srid;
 
@@ -133,22 +130,20 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
     }
   }
 
-  if ( !schemaItem )
-  {
-    QList<QStandardItem *> schemaItems = findItems( layerProperty.schemaName, Qt::MatchExactly, DbtmSchema );
+  QStandardItem *schemaItem = nullptr;
+  QList<QStandardItem *> schemaItems = findItems( layerProperty.schemaName, Qt::MatchExactly, DbtmSchema );
 
-    // there is already an item for this schema
-    if ( !schemaItems.isEmpty() )
-    {
-      schemaItem = schemaItems.at( DbtmSchema );
-    }
-    else
-    {
-      // create a new toplevel item for this schema
-      schemaItem = new QStandardItem( layerProperty.schemaName );
-      schemaItem->setFlags( Qt::ItemIsEnabled );
-      invisibleRootItem()->setChild( invisibleRootItem()->rowCount(), schemaItem );
-    }
+  // there is already an item for this schema
+  if ( !schemaItems.isEmpty() )
+  {
+    schemaItem = schemaItems.at( DbtmSchema );
+  }
+  else
+  {
+    // create a new toplevel item for this schema
+    schemaItem = new QStandardItem( layerProperty.schemaName );
+    schemaItem->setFlags( Qt::ItemIsEnabled );
+    invisibleRootItem()->setChild( invisibleRootItem()->rowCount(), schemaItem );
   }
 
   schemaItem->appendRow( childItemList );
@@ -333,8 +328,3 @@ QString QgsHanaTableModel::layerURI( const QModelIndex &index, const QString &co
 
   return uri.uri();
 }
-
-QgsWkbTypes::Type QgsHanaTableModel::wkbTypeFromHana( const QString &type )
-{
-  return QgsWkbTypes::parseType( type.toUpper() );
-}
diff --git a/src/providers/hana/qgshanatablemodel.h b/src/providers/hana/qgshanatablemodel.h
@@ -94,8 +94,6 @@ class QgsHanaTableModel : public QStandardItemModel
 
     static QIcon iconForWkbType( QgsWkbTypes::Type type );
 
-    static QgsWkbTypes::Type wkbTypeFromHana( const QString &dbType );
-
   private:
     //! Number of tables in the model
     int mTableCount = 0;

diff --git a/src/providers/hana/qgshanautils.cpp b/src/providers/hana/qgshanautils.cpp
@@ -268,15 +268,20 @@ QVariant QgsHanaUtils::toVariant( const String &value, int type, bool isSigned )
       if ( isNull )
         return QVariant( QVariant::Char );
       else
-        return QVariant( QChar( value->operator[]( 0 ) ) );
+      {
+        QString str = QString( value->c_str() );
+        if ( str.isEmpty() )
+          return QVariant( QVariant::Char );
+        return QVariant( str.at( 0 ) );
+      }
     case SQLDataTypes::VarChar:
     case SQLDataTypes::WVarChar:
     case SQLDataTypes::LongVarChar:
     case SQLDataTypes::WLongVarChar:
       if ( isNull )
         return QVariant( QVariant::String );
       else
-        return QVariant( value->c_str() );
+        return QVariant( QString( value->c_str() ) );
     case SQLDataTypes::Binary:
     case SQLDataTypes::VarBinary:
       return QVariant( QByteArray( value->c_str(), static_cast< int >( value->length() ) ) );
@@ -343,7 +348,6 @@ QgsWkbTypes::Type QgsHanaUtils::toWkbType( const QString &hanaType )
 QVersionNumber QgsHanaUtils::toHANAVersion( const QString &dbVersion )
 {
   QString version = dbVersion;
-  version.replace( " ", "." );
   QStringList strs = version.replace( " ", "." ).split( "." );
 
   if ( strs.length() < 3 )
@@ -424,7 +428,7 @@ bool QgsHanaUtils::convertField( QgsField &field )
       else
       {
         if ( field.length() > 0 && field.precision() >= 0 )
-          fieldType = QStringLiteral( "DECIMAL(%2,%3)" ).arg( field.length(), field.precision() );
+          fieldType = QStringLiteral( "DECIMAL(%1,%2)" ).arg( field.length(), field.precision() );
         else
           fieldType = QStringLiteral( "DECIMAL" );
       }
@@ -445,15 +449,15 @@ bool QgsHanaUtils::convertField( QgsField &field )
   return true;
 }
 
-int QgsHanaUtils::countFieldsInUppercase( const QgsFields &fields )
+int QgsHanaUtils::countFieldsWithFirstLetterInUppercase( const QgsFields &fields )
 {
   int count = 0;
   for ( int i = 0, n = fields.size(); i < n; ++i )
   {
     QString name = fields.at( i ).name();
     if ( name.isEmpty() )
       continue;
-    if ( isupper( name.at( 0 ).toAscii() ) )
+    if ( name.at( 0 ).isUpper() )
       ++count;
   }
   return count;

diff --git a/src/providers/hana/qgshanautils.h b/src/providers/hana/qgshanautils.h
@@ -23,7 +23,6 @@
 #include <qstring.h>
 #include <QVariant>
 #include <QVersionNumber>
-#include <string.h>
 
 #include "odbc/Types.h"
 
@@ -69,7 +68,7 @@ class QgsHanaUtils
     static QVersionNumber toHANAVersion( const QString &dbVersion );
     static int toPlanarSRID( int srid );
     static bool convertField( QgsField &field );
-    static int countFieldsInUppercase( const QgsFields &fields );
+    static int countFieldsWithFirstLetterInUppercase( const QgsFields &fields );
     static QString formatErrorMessage( const char *message, bool withPrefix = true );
 };
 

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1625,7 +1625,7 @@
     <string>Add HANA Spatial Layer…</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Shift+3</string>
+    <string>Ctrl+Shift+G</string>
    </property>
   </action>
   <action name="mActionAddWmsLayer">