Changeset 3664

Timestamp:

Aug 14, 2007, 2:50:43 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #722: Create DynamicReporterQuery?

Location:

trunk/src

Files:

• clients/migrate/net/sf/basedb/clients/migrate/ReporterProxy.java (modified) (1 diff)
• clients/migrate/net/sf/basedb/clients/migrate/ReporterTransfer.java (modified) (6 diffs)
• core/net/sf/basedb/core/AbstractEntityQuery.java (modified) (1 diff)
• core/net/sf/basedb/core/DataQuery.java (modified) (1 diff)
• core/net/sf/basedb/core/DataResultIterator.java (modified) (4 diffs)
• core/net/sf/basedb/core/DynamicReporterQuery.java (added)
• core/net/sf/basedb/core/Reporter.java (modified) (1 diff)

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/ReporterProxy.java

@@ -43 +43 @@
   private final int id;
 
+  ReporterProxy(int id)
+  {
+    this.id = id;
+  }
+  
   ReporterProxy(ReporterData reporter)
   {

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/ReporterTransfer.java

@@ -26 +26 @@
 
 import net.sf.basedb.core.BaseException;
-import net.sf.basedb.core.DataQuery;
-import net.sf.basedb.core.DataResultIterator;
+import net.sf.basedb.core.DatabaseException;
 import net.sf.basedb.core.DbControl;
+import net.sf.basedb.core.DynamicReporterQuery;
+import net.sf.basedb.core.DynamicResultIterator;
 import net.sf.basedb.core.Reporter;
 import net.sf.basedb.core.ReporterBatcher;
 import net.sf.basedb.core.data.ReporterData;
-import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Dynamic;
 import net.sf.basedb.core.query.Orders;
+import net.sf.basedb.core.query.SqlResult;
 import net.sf.basedb.util.timer.PerformanceTimer;
 
@@ -46 +48 @@
 BASE 2.
 
-@author Gregory, Martin
+@author Gregory, Martin, Nicklas
 @version 2.0
 @base.modified $Date$
 */
 
-public class ReporterTransfer extends Transfer
+public class ReporterTransfer 
+  extends Transfer
 {
   
@@ -140 +143 @@
       int batchSize = getBatchSize();
 
-      DataQuery<ReporterData> query = Reporter.getQuery();
-      query.order(Orders.asc(Hql.property("id")));
+      DynamicReporterQuery query = Reporter.getDynamicQuery();
+      query.select(Dynamic.selectReporter("id"));
+      query.select(Dynamic.selectReporter("externalId"));
+      query.order(Orders.asc(Dynamic.reporter("id")));
       query.setMaxResults(batchSize);
       while (start < count)
@@ -214 +219 @@
   }
 
-  private void mapMigratedReporters(DbControl dc, DataQuery<ReporterData> query)
-  {
-    DataResultIterator<ReporterData> result = null;
+  private void mapMigratedReporters(DbControl dc, DynamicReporterQuery query)
+  {
+//    DataResultIterator<ReporterData> result = null;
+    DynamicResultIterator result = null;
     PerformanceTimer timer = new PerformanceTimer(
       "iterate()", "hasNext()", "next()", "HashMap.get()", "HashMap.put()", "other");
@@ -227 +233 @@
       {
         timer.stopStart(1, 2);
-        ReporterData reporter = result.next();
+        SqlResult reporter = result.next();
+        String externalId = reporter.getString(2);
         timer.stopStart(2, 3);
-        Integer base1Id = externalIdMap.get(reporter.getExternalId());
+        Integer base1Id = externalIdMap.get(externalId);
         timer.stopStart(3, 4);
-        reporterMap.put(base1Id, new ReporterProxy(reporter));
+        reporterMap.put(base1Id, new ReporterProxy(reporter.getInt(1)));
         timer.stopStart(4, 5);
         progress.increase();
         if (log.isDebugEnabled())
         {
-          log.debug("Reporter: " + reporter.getExternalId() + 
+          log.debug("Reporter: " + externalId + 
             " has been mapped to BASE 1 ID="+base1Id);
         }
@@ -246 +253 @@
         log.info("\n"+timer.toString());
       }
+    }
+    catch (SQLException ex)
+    {
+      throw new DatabaseException(ex);
     }
     finally

trunk/src/core/net/sf/basedb/core/AbstractEntityQuery.java

@@ -389 +389 @@
   
   /**
+    If queries are using the stateless Hibernate session or the regular
+    session.
+    @return TRUE if the stateless session is used, FALSE otherwise
+    @since 2.4
+  */
+  protected boolean isStateless()
+  {
+    return stateless;
+  }
+  
+  /**
     Enable runtime query filters for the query.
     @see #disableFilters(DbControl)

trunk/src/core/net/sf/basedb/core/DataQuery.java

@@ -90 +90 @@
     ScrollIterator<I> result = HibernateUtil.loadIterator(dataClass,  getMainHqlQuery(dc));
     disableFilters(dc);
-    return new DataResultIterator<I>(result, dc, dataClass, totalCount);
+    return new DataResultIterator<I>(result, dc.getSessionControl(), 
+        isStateless() ? null : dc.getHibernateSession(), dataClass, totalCount);
   }
-  
-  
 
 }

trunk/src/core/net/sf/basedb/core/DataResultIterator.java

@@ -31 +31 @@
   of iterator is only used for batchable items like reporter and raw data.
   It is expected that the query uses the stateless Hibernate session available
-  from {@link DbControl#getStatelessSession()}. If 
-  The returned objects are automatically disconnected from the Hibernate session
+  from {@link DbControl#getStatelessSession()}. If not,
+  the returned objects are automatically disconnected from the Hibernate session
   to avoid memory problems and bypassing permission checks.
   
@@ -49 +49 @@
 
   /**
-    The DbControl that was used in the query, if it used the regular 
-    Hibernate session, null otherwise.
+    The Hibernate Session that was used in the query, null if a stateless
+    session is used.
   */
-  private final DbControl dc;
+  private final org.hibernate.Session session;
 
+  /**
+    The SessionControl
+  */
   private final SessionControl sc;
   
@@ -71 +74 @@
   private final Item itemType;
 
-  DataResultIterator(ScrollIterator<I> data, DbControl dc, Class<I> dataClass, long totalCount)
+  DataResultIterator(ScrollIterator<I> data, SessionControl sc, org.hibernate.Session session, 
+    Class<I> dataClass, long totalCount)
   {
     assert data != null : "data == null";
     this.data = data;
-    this.dc = dc;
-    this.sc = dc.getSessionControl();
+    this.sc = sc;
+    this.session = session;
     this.dataClass = dataClass;
     this.itemType = Item.fromDataClass(dataClass);
@@ -116 +120 @@
     sc.updateLastAccess();
     I dataObject = data.next();
-    if (dc != null)
+    if (session != null)
     {
-      HibernateUtil.evictData(dc.getHibernateSession(), dataObject);
+      HibernateUtil.evictData(session, dataObject);
     }
     return dataObject;

trunk/src/core/net/sf/basedb/core/Reporter.java

@@ -129 +129 @@
 
   /**
+    Get a dynamic query object configured to retrieve reporter information.
+    You must add columns/expressions to select with
+    {@link net.sf.basedb.core.query.Query#select(net.sf.basedb.core.query.Select)}
+    @return A {@link DynamicReporterQuery} object
+    @since 2.4
+  */
+  public static DynamicReporterQuery getDynamicQuery()
+  {
+    return new DynamicReporterQuery();
+  }
+  
+  /**
     Get the reporter type item from a reporter data object.