CWS-TOOLING: integrate CWS dbaperf1

2009-04-02 09:12:25 +0200 oj  r270372 : CWS-TOOLING: rebase CWS dbaperf1 to trunk@270033 (milestone: DEV300:m45)
2009-03-17 10:20:34 +0100 oj  r269577 : add parameter
2009-03-17 10:20:05 +0100 oj  r269576 : add parameter
2009-03-12 12:32:24 +0100 oj  r269387 : add missing ++
2009-03-11 12:53:35 +0100 oj  r269315 : compile error
2009-03-06 08:52:11 +0100 oj  r268968 : #i99264# remove duplicate code
2009-03-06 08:20:08 +0100 oj  r268966 : add missingheader
2009-03-06 08:17:41 +0100 oj  r268965 : add header
2009-03-06 08:15:07 +0100 oj  r268964 : #i99708# remove duplicate code
2009-03-06 07:24:11 +0100 oj  r268963 : #i99708# remove duplicate code
2009-03-06 07:22:24 +0100 oj  r268962 : #i99708# use tenary operator
2009-03-06 07:19:21 +0100 oj  r268961 : remove unused rtl_logs
2009-03-06 07:15:55 +0100 oj  r268960 : #i99708# extract getLength from for loop
2009-03-06 07:15:35 +0100 oj  r268959 : #i99708# extract getLength from for loop
2009-03-06 07:14:57 +0100 oj  r268958 : remove unused rtl_logs
2009-03-06 07:13:01 +0100 oj  r268957 : insert DBG_ helper
2009-03-06 07:12:17 +0100 oj  r268956 : remove unused rtl_logs
2009-03-06 07:10:26 +0100 oj  r268955 : remove unused rtl_logs
2009-03-06 07:04:51 +0100 oj  r268954 : #i99708# use tenary operator
2009-03-05 12:04:46 +0100 oj  r268895 : comment RTL_LOG out
2009-03-05 09:05:07 +0100 oj  r268874 : add rtl logfile
2009-03-04 14:21:18 +0100 oj  r268828 : #i99708# make static inplace and some method calls in for loop removed
2009-03-04 14:20:34 +0100 oj  r268827 : #i99708# impl double check pattern for getInfohelper
2009-03-02 09:31:42 +0100 oj  r268636 : add rtl logfile
2009-03-02 08:18:37 +0100 oj  r268633 : add rtl logfile
2009-02-27 11:22:16 +0100 oj  r268570 : #i99709# change algorithm for marking objects
2009-02-27 11:17:04 +0100 oj  r268568 : #i99708# some improvements to load forms, controls faster and replacement of size() call with !empty() which is much faster
2009-02-24 10:09:35 +0100 sb  r268383 : #i99290# no longer care to set a sensible context class loader for native threads attached to the VM
2009-02-23 13:44:04 +0100 oj  r268354 : #i76606# seekrow changes
2009-02-23 12:27:30 +0100 oj  r268349 : deleted
2009-02-20 15:14:23 +0100 oj  r268325 : #i76606# some code changes
2009-02-19 14:15:25 +0100 oj  r268284 : #i76606# use of simple prep stmt instead of full blown rowset, when source and dest connection are the same use insert into ... ( select ... )
2009-02-19 11:27:55 +0100 oj  r268265 : #i76606# insert some RTL_LOG and setObject impl
2009-02-18 14:45:37 +0100 oj  r268222 : #i99363# insert RTL_LOG
2009-02-18 14:45:18 +0100 oj  r268221 : #i99363# insert RTL_LOG
2009-02-18 11:14:54 +0100 oj  r268207 : #i99363# call some impl_ methods to avoid duplicate cechCache calls
2009-02-18 11:10:47 +0100 oj  r268206 : #i99363# make isCount inline
2009-02-18 10:33:22 +0100 oj  r268203 : #i99363# use bookmarkable if available and inserted some RTL_LOG
2009-02-18 10:32:57 +0100 oj  r268202 : #i99363# use bookmarkable if available and inserted some RTL_LOG
2009-02-17 07:29:05 +0100 oj  r267843 : #i96897# remove some dll public
2009-02-16 15:01:04 +0100 oj  r267816 : #i96897# remove some dll public
2009-02-16 14:25:53 +0100 oj  r267810 : #i99264# remove duplicate code
2009-02-16 14:25:33 +0100 oj  r267809 : #i99264# remove duplicate code
2009-02-16 14:24:59 +0100 oj  r267808 : #i99264# remove duplicate code
2009-02-13 10:56:17 +0100 oj  r267703 : #i99191# comment the contextclassloader
2009-02-13 10:32:40 +0100 oj  r267700 : reduce call to resultset meta data
2009-02-13 10:27:31 +0100 oj  r267699 : reduce call to resultset meta data
2009-02-13 10:27:08 +0100 oj  r267698 : reduce call to resultset meta data

1 files changed, 34 insertions, 6 deletions

diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 42828dcb75e7..2692f02d7614 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -48,6 +48,7 @@
 #include "resource/file_res.hrc"
 #include <algorithm>
 #include <tools/debug.hxx>
+#include <rtl/logfile.hxx>
 
 #define THROW_SQL(x) \
     OTools::ThrowException(x,m_aStatementHandle,SQL_HANDLE_STMT,*this)
@@ -89,6 +90,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
     ,m_bEscapeProcessing(sal_True)
     ,rBHelper(OStatement_BASE::rBHelper)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::OStatement_Base" );
     DBG_CTOR( file_OStatement_Base, NULL );
 
     m_pConnection->acquire();
@@ -118,6 +120,7 @@ OStatement_Base::~OStatement_Base()
 //------------------------------------------------------------------------------
 void OStatement_Base::disposeResultSet()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::disposeResultSet" );
     // free the cursor if alive
     Reference< XComponent > xComp(m_xResultSet.get(), UNO_QUERY);
     if (xComp.is())
@@ -177,15 +180,17 @@ void SAL_CALL OStatement_BASE2::release() throw()
 //-----------------------------------------------------------------------------
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
-    Any aRet = OStatement_BASE::queryInterface(rType);
+    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::queryInterface" );
+    const Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 // -------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 {
-        ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                                        ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                                        ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::getTypes" );
+    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
+                                                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
+                                                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
@@ -193,11 +198,13 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 
 void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::cancel" );
 }
 // -------------------------------------------------------------------------
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::close" );
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -208,6 +215,7 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 
 void OStatement_Base::reset() throw (SQLException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::reset" );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
@@ -224,6 +232,7 @@ void OStatement_Base::reset() throw (SQLException)
 
 void OStatement_Base::clearMyResultSet () throw (SQLException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::clearMyResultSet " );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
@@ -244,6 +253,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
 
 void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setWarning " );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
@@ -254,6 +264,7 @@ void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
 // -------------------------------------------------------------------------
 Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::getWarnings" );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
@@ -262,6 +273,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 // -------------------------------------------------------------------------
 void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::clearWarnings" );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
@@ -270,6 +282,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 // -------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
 {
+    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createArrayHelper" );
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
@@ -278,6 +291,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 // -------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
+    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::getInfoHelper" );
     return *const_cast<OStatement_Base*>(this)->getArrayHelper();
 }
 // -------------------------------------------------------------------------
@@ -350,6 +364,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw
 // -----------------------------------------------------------------------------
 void SAL_CALL OStatement_Base::disposing(void)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::disposing" );
     if(m_aEvaluateRow.isValid())
     {
         m_aEvaluateRow->get().clear();
@@ -361,6 +376,7 @@ void SAL_CALL OStatement_Base::disposing(void)
 // -----------------------------------------------------------------------------
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::getPropertySetInfo" );
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 // -----------------------------------------------------------------------------
@@ -372,11 +388,13 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
 // -----------------------------------------------------------------------------
 OSQLAnalyzer* OStatement_Base::createAnalyzer()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createAnalyzer" );
     return new OSQLAnalyzer(m_pConnection);
 }
 // -----------------------------------------------------------------------------
 void OStatement_Base::anylizeSQL()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::anylizeSQL" );
     OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::anylizeSQL: Analyzer isn't set!");
     // start analysing the statement
     m_pSQLAnalyzer->setOrigColumns(m_xColNames);
@@ -408,6 +426,7 @@ void OStatement_Base::anylizeSQL()
 void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
                                         OSQLParseNode* pAscendingDescending)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setOrderbyColumn" );
     ::rtl::OUString aColumnName;
     if (pColumnRef->count() == 1)
         aColumnName = pColumnRef->getChild(0)->getTokenValue();
@@ -456,6 +475,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
 // -----------------------------------------------------------------------------
 void OStatement_Base::construct(const ::rtl::OUString& sql)  throw(SQLException, RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::construct" );
     ::rtl::OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
     if(m_pParseTree)
@@ -531,6 +551,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql)  throw(SQLException,
 // -----------------------------------------------------------------------------
 void OStatement_Base::createColumnMapping()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createColumnMapping" );
     // initialize the column index map (mapping select columns to table columns)
     ::vos::ORef<connectivity::OSQLColumns>  xColumns = m_aSQLIterator.getSelectColumns();
     m_aColMapping.resize(xColumns->get().size() + 1);
@@ -544,6 +565,7 @@ void OStatement_Base::createColumnMapping()
 // -----------------------------------------------------------------------------
 void OStatement_Base::initializeResultSet(OResultSet* _pResult)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::initializeResultSet" );
     GetAssignValues();
 
     _pResult->setSqlAnalyzer(m_pSQLAnalyzer);
@@ -562,6 +584,7 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult)
 // -----------------------------------------------------------------------------
 void OStatement_Base::GetAssignValues()
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::GetAssignValues" );
     if (m_pParseTree == NULL)
     {
         ::dbtools::throwFunctionSequenceException(*this);
@@ -729,6 +752,7 @@ void OStatement_Base::GetAssignValues()
 // -------------------------------------------------------------------------
 void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::ParseAssignValues" );
     OSL_ENSURE(nIndex <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()");
     String aColumnName(aColumnNameList[nIndex]);
     OSL_ENSURE(aColumnName.Len() > 0,"OResultSet: Column-Name nicht gefunden");
@@ -760,6 +784,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName,
                                    BOOL bSetNull,
                                    UINT32 nParameter)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
     Reference<XPropertySet> xCol;
     m_xColNames->getByName(aColumnName) >>= xCol;
     sal_Int32 nId = Reference<XColumnLocate>(m_xColNames,UNO_QUERY)->findColumn(aColumnName);
@@ -842,8 +867,11 @@ void OStatement_Base::SetAssignValue(const String& aColumnName,
 // -----------------------------------------------------------------------------
 void OStatement_Base::parseParamterElem(const String& /*_sColumnName*/,OSQLParseNode* /*pRow_Value_Constructor_Elem*/)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::parseParamterElem" );
     // do nothing here
 }
-    }
-}
+// =============================================================================
+    } // namespace file
+// =============================================================================
+}// namespace connectivity
 // -----------------------------------------------------------------------------