CWS-TOOLING: integrate CWS datapilotperf

1 files changed, 79 insertions, 55 deletions

diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 60dba0bc27db..eab01d078081 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -55,33 +55,38 @@ class ScRange;
 class ScDPDimension;
 class ScDPCollection;
 struct ScDPCacheCell;
-struct ScDPItemData;
 struct ScQueryParam;
+// Wang Xu Ming -- 2009-8-17
+// DataPilot Migration - Cache&&Performance
+class ScDPItemData;
+// End Comments
 class Date;
 
+// Wang Xu Ming -- 2009-8-17
+// DataPilot Migration - Cache&&Performance
+class ScDPTableDataCache;
+struct ScDPValueData;
+// End Comments
 // ----------------------------------------------------------------------------
 
-class ScDPCacheTable
+class SC_DLLPUBLIC ScDPCacheTable
 {
 public:
-
-    struct Cell
-    {
-        SCROW           mnCategoryRef;
-        ScDPCacheCell*  mpContent;
-
-        Cell();
-        ~Cell();
-    };
-
     /** individual filter item used in SingleFilter and GroupFilter. */
     struct FilterItem
     {
-        sal_Int32   mnMatchStrId;
+        // Wang Xu Ming -- 2009-8-17
+        // DataPilot Migration - Cache&&Performance
+        String       maString;
+        // End Comments
         double      mfValue;
         bool        mbHasValue;
 
         FilterItem();
+// Wang Xu Ming -- 2009-8-17
+// DataPilot Migration - Cache&&Performance
+    bool  match( const  ScDPItemData& rCellData ) const;
+// End Comments
     };
 
     /** interface class used for filtering of rows. */
@@ -90,19 +95,26 @@ public:
     public:
         /** returns true if the matching condition is met for a single cell
             value, or false otherwise. */
-        virtual bool match(const ScDPCacheCell& rCell) const = 0;
+// Wang Xu Ming -- 2009-8-17
+// DataPilot Migration - Cache&&Performance
+        virtual bool match( const  ScDPItemData& rCellData ) const = 0;
+// End Comments
     };
 
     /** ordinary single-item filter. */
     class SingleFilter : public FilterBase
     {
     public:
-        explicit SingleFilter(ScSimpleSharedString& rSharedString,
-                              sal_Int32 nMatchStrId, double fValue, bool bHasValue);
+        // Wang Xu Ming -- 2009-8-17
+        // DataPilot Migration - Cache&&Performance
+        explicit SingleFilter(String aString, double fValue, bool bHasValue);
+        // End Comments
         virtual ~SingleFilter(){}
 
-        virtual bool match(const ScDPCacheCell& rCell) const;
-
+       // Wang Xu Ming -- 2009-8-17
+        // DataPilot Migration - Cache&&Performance
+         virtual bool match(const ScDPItemData& rCellData) const;
+         // End Comments
         const String    getMatchString();
         double          getMatchValue() const;
         bool            hasValue() const;
@@ -111,25 +123,27 @@ public:
         explicit SingleFilter();
 
         FilterItem  maItem;
-        ScSimpleSharedString mrSharedString;
     };
 
     /** multi-item (group) filter. */
     class GroupFilter : public FilterBase
     {
     public:
-        GroupFilter(ScSimpleSharedString& rSharedString);
+        // Wang Xu Ming -- 2009-8-17
+        // DataPilot Migration - Cache&&Performance
+        GroupFilter();
+        // End Comments
         virtual ~GroupFilter(){}
-        virtual bool match(const ScDPCacheCell& rCell) const;
-
+        // Wang Xu Ming -- 2009-8-17
+        // DataPilot Migration - Cache&&Performance
+        virtual bool match(  const  ScDPItemData& rCellData ) const;
+        // End Comments
         void addMatchItem(const String& rStr, double fVal, bool bHasValue);
         size_t getMatchItemCount() const;
 
     private:
-        GroupFilter();
 
         ::std::vector<FilterItem> maItems;
-        ScSimpleSharedString mrSharedString;
     };
 
     /** single filtering criterion. */
@@ -140,22 +154,26 @@ public:
 
         Criterion();
     };
-
-    ScDPCacheTable(ScDPCollection* pCollection);
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+    ScDPCacheTable( ScDocument* pDoc,long nId );
+    // End Comments
     ~ScDPCacheTable();
 
     sal_Int32 getRowSize() const;
     sal_Int32 getColSize() const;
 
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+    ScDPTableDataCache* GetCache() const;
     /** Fill the internal table from the cell range provided.  This function
-        assumes that the first row is the column header. */
-    void fillTable(ScDocument* pDoc, const ScRange& rRange, const ScQueryParam& rQuery, BOOL* pSpecial,
-                   bool bIgnoreEmptyRows);
-
+    assumes that the first row is the column header. */
+    void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial,
+        bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
     /** Fill the internal table from database connection object.  This function
         assumes that the first row is the column header. */
-    void fillTable(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xRowSet,
-                   const Date& rNullDate);
+    void fillTable();
+    // End Comments
 
     /** Check whether a specified row is active or not.  When a row is active,
         it is used in calculation of the results data.  A row becomes inactive
@@ -169,15 +187,23 @@ public:
     /** Get the cell instance at specified location within the data grid. Note
         that the data grid doesn't include the header row.  Don't delete the
         returned object! */
-    const ScDPCacheCell* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
-
-    const String* getFieldName(sal_Int32 nIndex) const;
-
-    /** Get the unique entries for a field specified by index.  The caller must
+    const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
+    void  getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
+    String getFieldName( SCCOL  nIndex) const;
+    //End Comments
+
+    /** Get the field index (i.e. column ID in the original data source) based
+        on the string value that corresponds with the column title.  It returns
+        -1 if no field matching the string value exists. */
+    sal_Int32 getFieldIndex(const String& rStr) const;
+
+  // Wang Xu Ming -- 2009-8-17
+  // DataPilot Migration - Cache&&Performance
+   /** Get the unique entries for a field specified by index.  The caller must
         make sure that the table is filled before calling function, or it will
         get an empty collection. */
-    const TypedScStrCollection& getFieldEntries(sal_Int32 nIndex) const;
-
+    const ::std::vector<SCROW>& getFieldEntries( sal_Int32 nColumn ) const;
+    // End Comments
     /** Filter the table based on the specified criteria, and copy the
         result to rTabData.  This method is used, for example, to generate
         a drill-down data table. */
@@ -186,6 +212,7 @@ public:
                      const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims);
 
     void clear();
+    void swap(ScDPCacheTable& rOther);
     bool empty() const;
 
 private:
@@ -200,26 +227,23 @@ private:
      */
     bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims) const;
     void getValueData(ScDocument* pDoc, const ScAddress& rPos, ScDPCacheCell& rCell);
-
+   // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+   void InitNoneCache( ScDocument* pDoc );
+    // End Comments
 private:
-    typedef ::boost::shared_ptr<TypedScStrCollection> TypedScStrCollectionPtr;
-
-    /** main data table. */
-    ::std::vector< ::std::vector< ::ScDPCacheTable::Cell > > maTable;
-
-    /** header string IDs */
-    ::std::vector<sal_Int32> maHeader;
-
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
     /** unique field entires for each field (column). */
-    ::std::vector<TypedScStrCollectionPtr> maFieldEntries;
-
+    ::std::vector< ::std::vector<SCROW> > maFieldEntries;
+    // End Comments
     /** used to track visibility of rows.  The first row below the header row
         has the index of 0. */
     ::std::vector<bool> maRowsVisible;
-
-    ScSimpleSharedString& mrSharedString;
-    ScDPCollection* mpCollection;
+    // Wang Xu Ming -- 2009-8-17
+    // DataPilot Migration - Cache&&Performance
+    ScDPTableDataCache* mpCache;
+    ScDPTableDataCache* mpNoneCache;
+    // End Comments
 };
-
-
 #endif