Kolab Groupware OBS

_service:set_version:akonadi.spec Changed

_service:recompress:tar_scm:akonadi-1.12.42.99.git20150630.ef27655.tar.gz/server/src/storagejanitor.cpp -> _service:recompress:tar_scm:akonadi-1.12.42.99.git20150706.9a15737.tar.gz/server/src/storagejanitor.cpp Changed

@@ -117,6 +117,9 @@
   inform( "Looking for dirty objects..." );
   findDirtyObjects();
 
+  inform( "Looking for rid-duplicates not matching the content mime-type of the parent collection" );
+  findRIDDuplicates();
+
   /* TODO some ideas for further checks:
    * the collection tree is non-cyclic
    * content type constraints of collections are not violated
@@ -448,6 +451,50 @@
   inform( QLatin1Literal( "Found " ) + QString::number( dirtyItems.size() ) + QLatin1Literal( " dirty items." ) );
 }
 
+void StorageJanitor::findRIDDuplicates()
+{
+  QueryBuilder qb( Collection::tableName(), QueryBuilder::Select );
+  qb.addColumn( Collection::idColumn() );
+  qb.addColumn( Collection::nameColumn() );
+  qb.exec();
+
+  while ( qb.query().next() ) {
+    const Collection::Id id = qb.query().value( 0 ).value<Collection::Id>();
+    const QString name = qb.query().value( 1 ).toString();
+    inform( QLatin1Literal( "Checking " ) + name);
+
+    QueryBuilder duplicates( PimItem::tableName(), QueryBuilder::Select );
+    duplicates.addColumn( PimItem::remoteIdColumn() );
+    duplicates.addColumn( QLatin1Literal( "count(" ) + PimItem::idColumn() + QLatin1Literal( ") as cnt" ) );
+    duplicates.addValueCondition( PimItem::remoteIdColumn(), Query::IsNot, QVariant() );
+    duplicates.addValueCondition( PimItem::collectionIdColumn(), Query::Equals, id );
+    duplicates.addGroupColumn( PimItem::remoteIdColumn() );
+    duplicates.addValueCondition( QLatin1Literal( "count(" ) + PimItem::idColumn() + QLatin1Literal( ")" ), Query::Greater, 1, QueryBuilder::HavingCondition );
+    duplicates.exec();
+
+    Akonadi::Server::Collection col = Akonadi::Server::Collection::retrieveById(id);
+    const QVector<Akonadi::Server::MimeType> contentMimeTypes = col.mimeTypes();
+    QVariantList contentMimeTypesVariantList;
+    Q_FOREACH (const Akonadi::Server::MimeType &mimeType, contentMimeTypes) {
+        contentMimeTypesVariantList << mimeType.id();
+    }
+    while ( duplicates.query().next() ) {
+        const QString rid = duplicates.query().value(0).toString();
+        inform( QLatin1Literal( "Found duplicates " ) + rid);
+
+        QueryBuilder items( PimItem::tableName(), QueryBuilder::Delete );
+        items.addColumn( PimItem::idColumn() );
+        items.addColumn( PimItem::remoteIdColumn() );
+        items.addColumn( PimItem::mimeTypeIdColumn() );
+        items.addValueCondition( PimItem::remoteIdColumn(), Query::Equals, rid );
+        items.addValueCondition( PimItem::mimeTypeIdColumn(), Query::NotIn, contentMimeTypesVariantList );
+        if ( !items.exec() ) {
+            akDebug() << "Error while deleting duplicates" << items.query().lastError().text();
+        }
+    }
+  }
+}
+
 void StorageJanitor::vacuum()
 {
   const DbType::Type dbType = DbType::type( DataStore::self()->database() );

_service:recompress:tar_scm:akonadi-1.12.42.99.git20150630.ef27655.tar.gz/server/src/storagejanitor.h -> _service:recompress:tar_scm:akonadi-1.12.42.99.git20150706.9a15737.tar.gz/server/src/storagejanitor.h Changed

_service:set_version:akonadi.dsc Changed

Changes of Revision 13