add ee changes that should also have been made in community

Author: berthoug

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/BlockInfoClusterj.java

@@ -186,6 +186,42 @@ public void prepare(Collection<BlockInfo> removed, Collection<BlockInfo> news,
       session.release(luChanges);
     }
   }
+  
+  //only for testing
+  @Override
+  public void deleteBlocksForFile(long inodeID) throws StorageException {
+    HopsSession session = connector.obtainSession();
+
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQueryDomainType<BlockInfoDTO> dobj = qb.createQueryDefinition(BlockInfoDTO.class);
+    HopsPredicate pred1 = dobj.get("iNodeId").equal(dobj.param("inodeIdParam"));
+    dobj.where(pred1);
+
+    HopsQuery<BlockInfoDTO> query = session.createQuery(dobj);
+    query.setParameter("inodeIdParam", inodeID);
+    List<BlockInfoDTO> dtos = query.getResultList();
+
+    session.deletePersistentAll(dtos);
+    session.release(dtos);
+
+    deleteBlockLoopupForFile(inodeID);
+  }
+
+  private void deleteBlockLoopupForFile(long inodeID) throws StorageException {
+    HopsSession session = connector.obtainSession();
+
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQueryDomainType<BlockLookUpClusterj.BlockLookUpDTO> dobj =
+            qb.createQueryDefinition(BlockLookUpClusterj.BlockLookUpDTO.class);
+    HopsPredicate pred = dobj.get("iNodeId").equal(dobj.param("inodeIdParam"));
+    dobj.where(pred);
+    HopsQuery<BlockLookUpClusterj.BlockLookUpDTO> query = session.createQuery(dobj);
+    query.setParameter("inodeIdParam", inodeID);
+    List<BlockLookUpClusterj.BlockLookUpDTO> dtos = query.getResultList();
+
+    session.deletePersistentAll(dtos);
+    session.release(dtos);
+  }
 
   @Override
   public BlockInfo findById(long blockId, long inodeId) throws StorageException {
@@ -240,28 +276,32 @@ public List<BlockInfo> findByInodeIds(long[] inodeIds)
     return lbis;
   }
 
-  public BlockInfo scanByBlockId(long blockId) throws StorageException {
+  @Override
+  public List<BlockInfo> findAllBlocks() throws StorageException {
     HopsSession session = connector.obtainSession();
     HopsQueryBuilder qb = session.getQueryBuilder();
     HopsQueryDomainType<BlockInfoClusterj.BlockInfoDTO> dobj =
             qb.createQueryDefinition(BlockInfoClusterj.BlockInfoDTO.class);
-    HopsPredicate pred1 = dobj.get("blockId").equal(dobj.param("blockIdParam"));
-    dobj.where(pred1);
     HopsQuery<BlockInfoClusterj.BlockInfoDTO> query = session.createQuery(dobj);
-    query.setParameter("blockIdParam", blockId);
+
     List<BlockInfoDTO> biDtos = query.getResultList();
-    BlockInfo bi = createBlockInfo(biDtos.get(0));
+    List<BlockInfo> lbis = createBlockInfoList(biDtos);
     session.release(biDtos);
-    return bi;
+    return lbis;
   }
 
   @Override
-  public List<BlockInfo> findAllBlocks() throws StorageException {
+  public List<BlockInfo> findAllBlocks(long startID, long endID) throws StorageException {
     HopsSession session = connector.obtainSession();
     HopsQueryBuilder qb = session.getQueryBuilder();
-    HopsQueryDomainType<BlockInfoClusterj.BlockInfoDTO> dobj =
-            qb.createQueryDefinition(BlockInfoClusterj.BlockInfoDTO.class);
-    HopsQuery<BlockInfoClusterj.BlockInfoDTO> query = session.createQuery(dobj);
+    HopsQueryDomainType<BlockInfoDTO> qdty = qb.createQueryDefinition(BlockInfoDTO.class);
+    HopsPredicate pred1 = qdty.get("blockId").greaterEqual(qdty.param("blockIdParam1"));
+    HopsPredicate pred2 = qdty.get("blockId").lessThan(qdty.param("blockIdParam2"));
+    qdty.where(pred1.and(pred2));
+
+    HopsQuery<BlockInfoDTO> query = session.createQuery(qdty);
+    query.setParameter("blockIdParam1", startID);
+    query.setParameter("blockIdParam2", endID);
 
     List<BlockInfoDTO> biDtos = query.getResultList();
     List<BlockInfo> lbis = createBlockInfoList(biDtos);

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/ExcessReplicaClusterj.java

@@ -200,6 +200,18 @@ public ExcessReplica findByPK(long bId, int sid, long inodeId)
     session.release(invTable);
     return result;
   }
+  
+  @Override
+  public List<ExcessReplica> findAll() throws StorageException {
+    HopsSession session = connector.obtainSession();
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQuery<ExcessReplicaDTO> query =
+            session.createQuery(qb.createQueryDefinition(ExcessReplicaDTO.class));
+    List<ExcessReplicaDTO> dtos = query.getResultList();
+    List<ExcessReplica> list = createList(dtos);
+    session.release(dtos);
+    return list;
+  }
 
   @Override
   public void removeAll() throws StorageException {

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/INodeClusterj.java

@@ -638,6 +638,25 @@ public int countAllFiles() throws StorageException {
         .countWithCriterion(TABLE_NAME, String.format("%s<>0", HEADER));
   }
 
+  @Override
+  public List<INode> findINodes(String name) throws StorageException {
+    HopsSession session = connector.obtainSession();
+
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQueryDomainType<InodeDTO> dobj =
+            qb.createQueryDefinition(InodeDTO.class);
+    HopsPredicate pred1 = dobj.get("name").equal(dobj.param("nameParam"));
+    dobj.where(pred1);
+
+    HopsQuery<InodeDTO> query = session.createQuery(dobj);
+    query.setParameter("nameParam", name);
+
+    List<InodeDTO> dtos = query.getResultList();
+    List<INode> results = convert(dtos);
+    session.release(dtos);
+    return results;
+  }
+  
   @Override
   public void deleteInode(String inodeName) throws StorageException { // only for testing
     String query = "delete from "+TablesDef.INodeTableDef.TABLE_NAME+" where "+

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/InvalidatedBlockClusterj.java

@@ -289,6 +289,34 @@ public void removeAllByStorageId(int storageId) throws StorageException {
     query.deletePersistentAll();
   }
 
+  @Override
+  public List<InvalidatedBlock> findAll() throws StorageException {
+    HopsSession session = connector.obtainSession();
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQuery<InvalidateBlocksDTO> query =
+            session.createQuery(qb.createQueryDefinition(InvalidateBlocksDTO.class));
+    List<InvalidateBlocksDTO> dtos = query.getResultList();
+    List<InvalidatedBlock> list = createList(dtos);
+    return list;
+  }
+
+  @Override
+  public List<InvalidatedBlock> findInvalidatedBlockInCloudList(int cloudStorageID, int limit)
+          throws StorageException {
+    HopsSession session = connector.obtainSession();
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQueryDomainType<InvalidateBlocksDTO> qdt =
+            qb.createQueryDefinition(InvalidateBlocksDTO.class);
+    qdt.where(qdt.get("storageId").equal(qdt.param("param")));
+    HopsQuery<InvalidateBlocksDTO> query = session.createQuery(qdt);
+    query.setParameter("param", cloudStorageID);
+    query.setLimits(0, limit);
+
+    List<InvalidateBlocksDTO> dtos = query.getResultList();
+    List<InvalidatedBlock> ivl = createList(dtos);
+    session.release(dtos);
+    return ivl;
+  }
 
   private List<InvalidatedBlock> createList(List<InvalidateBlocksDTO> dtoList) {
     List<InvalidatedBlock> list = new ArrayList<>();

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/ReplicaClusterj.java

@@ -332,6 +332,17 @@ public long findBlockIdAtIndex(int storageId, long index, int maxFetchingSize) t
     return 0;
   }
 
+  @Override
+  public List<Replica> findAll() throws StorageException {
+    HopsSession session = connector.obtainSession();
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQuery<ReplicaDTO> query =
+            session.createQuery(qb.createQueryDefinition(ReplicaDTO.class));
+    List<ReplicaDTO> dtos = query.getResultList();
+    List<Replica> list = convertAndRelease(session, dtos);
+    return list;
+  }
+  
   private static Long countBlocksInWindow(int storageId, long from, int size) throws
       StorageException {
     Long result =  MySQLQueryHelper.executeLongAggrQuery(String.format("SELECT count(*) " +

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/ReplicaUnderConstructionClusterj.java

@@ -172,6 +172,17 @@ public int countAll() throws StorageException {
     return MySQLQueryHelper.countAll(TABLE_NAME);
   }
 
+  @Override
+  public List<ReplicaUnderConstruction> findAll() throws StorageException {
+    HopsSession session = connector.obtainSession();
+    HopsQueryBuilder qb = session.getQueryBuilder();
+    HopsQuery<ReplicaUcDTO> query =
+            session.createQuery(qb.createQueryDefinition(ReplicaUcDTO.class));
+    List<ReplicaUcDTO> dtos = query.getResultList();
+    List<ReplicaUnderConstruction> list = convertAndRelease(session, dtos);
+    return list;
+  }
+  
   private List<ReplicaUnderConstruction> convertAndRelease(HopsSession session,
       List<ReplicaUcDTO> replicaUc) throws StorageException {
     List<ReplicaUnderConstruction> replicas =

src/main/java/io/hops/metadata/ndb/mysqlserver/CountHelper.java

@@ -57,7 +57,6 @@ public static int countWhere(String tableName, String condition)
    * @throws StorageException
    */
   public static int countAll(String tableName) throws StorageException {
-    // TODO[H]: Is it good to create and close connections in every call?
     String query = String.format(COUNT_QUERY, tableName);
     return count(query);
   }

src/main/java/io/hops/metadata/ndb/mysqlserver/MySQLQueryHelper.java

@@ -54,7 +54,6 @@ public class MySQLQueryHelper {
    * @throws io.hops.exception.StorageException
    */
   public static int countAll(String tableName) throws StorageException {
-    // TODO[H]: Is it good to create and close connections in every call?
     String query = String.format(COUNT_QUERY, tableName);
     return executeIntAggrQuery(query);
   }