Merge pull request #4057 from ghalliday/issue8913

HPCC-8913 Remove a deprecated and unused IResultSet interface

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

common/fileview2/fileview.hpp

@@ -86,43 +86,6 @@ interface IResultSetMetaData : extends IInterface
 
 
 typedef double xdouble;
-interface IResultSet : extends IInterface
-{
-    virtual bool absolute(__int64 row) = 0;
-    virtual void afterLast() = 0;
-    virtual void beforeFirst() = 0;
-    virtual int findColumn(const char * columnName) const = 0;
-    virtual bool first() = 0;
-    virtual bool getBoolean(int columnIndex) = 0;
-    virtual IDataVal & getBytes(IDataVal & d, int columnIndex) = 0;
-    virtual xdouble getDouble(int columnIndex) = 0;
-    virtual int getFetchSize() const = 0;
-    virtual __int64 getInt(int columnIndex) = 0;
-    virtual int getType() = 0;
-    virtual const IResultSetMetaData & getMetaData() const = 0;
-    virtual __int64 getNumRows() const = 0;
-    virtual IDataVal & getRaw(IDataVal & d, int columnIndex) = 0;
-    virtual IDataVal & getRawRow(IDataVal & d) = 0;
-    virtual IStringVal & getString(IStringVal & ret, int columnIndex) = 0;
-    virtual bool isAfterLast() const = 0;
-    virtual bool isBeforeFirst() const = 0;
-    virtual bool isFirst() const = 0;
-    virtual bool isLast() const = 0;
-    virtual bool isNull(int columnIndex) const = 0;
-    virtual bool last() = 0;
-    virtual bool next() = 0;
-    virtual bool previous() = 0;
-    virtual bool relative(__int64 rows) = 0;
-    virtual void setFetchSize(int rows) = 0;
-    virtual bool supportsRandomSeek() const = 0;
-    virtual IStringVal & getDisplayText(IStringVal & ret, int columnIndex) = 0;
-    virtual void beginAccess() = 0;
-    virtual void endAccess() = 0;
-    virtual IStringVal & getXml(IStringVal & ret, int columnIndex) = 0;
-};
-
-
-
 interface INewResultSet;
 interface IResultSetCursor : extends IInterface
 {
@@ -196,8 +159,6 @@ interface INewResultSet : extends IInterface
 
 interface IResultSetFactory : extends IInterface
 {
-    virtual IResultSet * createResultSet(IConstWUResult * wuResult, const char * wuid) = 0;
-    virtual IResultSet * createFileResultSet(const char * logicalFile, const char * cluster) = 0;
     virtual INewResultSet * createNewResultSet(IConstWUResult * wuResult, const char * wuid) = 0;
     virtual INewResultSet * createNewFileResultSet(const char * logicalFile, const char * cluster) = 0;
     virtual INewResultSet * createNewResultSet(const char * wuid, unsigned sequence, const char * name) = 0;
@@ -208,8 +169,6 @@ interface IResultSetFactory : extends IInterface
 
 
 //provided to wrap the exceptions for clarion....
-extern FILEVIEW_API IResultSet* createResultSet(IResultSetFactory & factory, IStringVal & error, IConstWUResult * wuResult, const char * wuid);
-extern FILEVIEW_API IResultSet* createFileResultSet(IResultSetFactory & factory, IStringVal & error, const char * logicalFile, const char * queue = NULL, const char * cluster = NULL);
 extern FILEVIEW_API INewResultSet* createNewResultSet(IResultSetFactory & factory, IStringVal & error, IConstWUResult * wuResult, const char * wuid);
 extern FILEVIEW_API INewResultSet* createNewFileResultSet(IResultSetFactory & factory, IStringVal & error, const char * logicalFile, const char * queue, const char * cluster);
 extern FILEVIEW_API INewResultSet* createNewResultSetSeqName(IResultSetFactory & factory, IStringVal & error, const char * wuid, unsigned sequence, const char * name);

common/fileview2/fvresultset.cpp

@@ -670,7 +670,7 @@ IStringVal & CResultSetMetaData::getXmlXPathSchema(IStringVal & str, bool addHea
 
 IResultSetCursor * CResultSetBase::createCursor()
 {
-    return doCreateCursor(false);
+    return doCreateCursor();
 }
 
 IResultSetCursor * CResultSetBase::createCursor(IDataVal & savedCursor)
@@ -703,9 +703,9 @@ IResultSetCursor * CResultSetBase::createSortedCursor(unsigned column, bool desc
     return new CResultSetSortedCursor(getMeta(), this, column, descend);
 }
 
-CResultSetCursor * CResultSetBase::doCreateCursor(bool oldInterface)
+CResultSetCursor * CResultSetBase::doCreateCursor()
 {
-    return new CResultSetCursor(getMeta(), this, oldInterface);
+    return new CResultSetCursor(getMeta(), this);
 }
 
 
@@ -850,16 +850,14 @@ void CResultSet::serialize(MemoryBuffer & out)
 
 //---------------------------------------------------------------------------
 
-CResultSetCursor::CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, bool _oldInterface) : meta(_meta)
+CResultSetCursor::CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet) : meta(_meta)
 { 
-    oldInterface = _oldInterface;
     init(_resultSet); 
     absolute(BEFORE_FIRST_ROW);
 }
 
 CResultSetCursor::CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, MemoryBuffer & buffer) : meta(_meta)
 { 
-    oldInterface = false;
     init(_resultSet); 
 
     buffer.read(curRow);
@@ -868,8 +866,7 @@ CResultSetCursor::CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNe
 
 CResultSetCursor::~CResultSetCursor()
 {
-    if (!oldInterface)
-        resultSet->onClose();
+    resultSet->onClose();
     delete [] offsets;
 }
 
@@ -880,8 +877,7 @@ void CResultSetCursor::init(IExtendedNewResultSet * _resultSet)
     offsets = new unsigned[meta.getColumnCount()+1];
     if (meta.isFixedSize())
         meta.calcFieldOffsets(NULL, offsets);
-    if (!oldInterface)
-        resultSet->onOpen();
+    resultSet->onOpen();
 }
 
 bool CResultSetCursor::absolute(__int64 row)
@@ -912,19 +908,6 @@ void CResultSetCursor::beforeFirst()
 }
 
 
-int CResultSetCursor::findColumn(const char * columnName) const
-{
-    SCMStringBuffer s;
-    for(int i = 0; i < getMetaData().getColumnCount(); i++)
-    {
-        s.clear();
-        if(!stricmp(columnName, getMetaData().getColumnLabel(s, i).str()))
-            return i;
-    }
-    return -1;
-}
-
-
 bool CResultSetCursor::fetch(__int64 offset)
 {
     curRow = AFTER_LAST_ROW;
@@ -1964,16 +1947,6 @@ bool CResultSetCursor::supportsRandomSeek() const
 }
 
 
-void CResultSetCursor::beginAccess()
-{
-    resultSet->onOpen();
-}
-
-void CResultSetCursor::endAccess()
-{
-    resultSet->onClose();
-}
-
 //---------------------------------------------------------------------------
 
 bool IndirectResultSetCursor::absolute(__int64 row) 
@@ -2360,7 +2333,7 @@ void buildCursorIndex(unsigned & numElements, unsigned * & elements, CResultSetC
     delete [] keys;
 }
 
-CResultSetSortedCursor::CResultSetSortedCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, unsigned _column, bool _desc) : CResultSetCursor(_meta, _resultSet, false)
+CResultSetSortedCursor::CResultSetSortedCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, unsigned _column, bool _desc) : CResultSetCursor(_meta, _resultSet)
 {
     numEntries = 0;
     elements = NULL;
@@ -2370,7 +2343,7 @@ CResultSetSortedCursor::CResultSetSortedCursor(const CResultSetMetaData & _meta,
     buildIndex();
 }
 
-CResultSetSortedCursor::CResultSetSortedCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, unsigned _column, bool _desc, MemoryBuffer & buffer) : CResultSetCursor(_meta, _resultSet, false)
+CResultSetSortedCursor::CResultSetSortedCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, unsigned _column, bool _desc, MemoryBuffer & buffer) : CResultSetCursor(_meta, _resultSet)
 { 
     numEntries = 0;
     elements = NULL;
@@ -2393,7 +2366,7 @@ CResultSetSortedCursor::~CResultSetSortedCursor()
 
 void CResultSetSortedCursor::buildIndex()
 {
-    Owned<CResultSetCursor> cursor = new CResultSetCursor(meta, resultSet, false);
+    Owned<CResultSetCursor> cursor = new CResultSetCursor(meta, resultSet);
     switch (meta.getColumnDisplayType(column))
     {
     case TypeBoolean:
@@ -3045,17 +3018,6 @@ CResultSetFactory::CResultSetFactory(ISecManager &secmgr, ISecUser &secuser) : C
 {
 }
 
-IResultSet * CResultSetFactory::createResultSet(IConstWUResult * wuResult, const char * wuid)
-{
-    Owned<IFvDataSource> ds = createDataSource(wuResult, wuid, username, password);
-    if (ds)
-    {
-        Owned<CResultSet> result = createResultSet(ds, (wuResult->getResultFormat() == ResultFormatXml));
-        return result->createOldStyleCursor();
-    }
-    return NULL;
-}
-
 IDistributedFile * CResultSetFactory::lookupLogicalName(const char * logicalName)
 {
     Owned<IUserDescriptor> udesc;
@@ -3072,19 +3034,6 @@ IDistributedFile * CResultSetFactory::lookupLogicalName(const char * logicalName
 }
 
 
-IResultSet * CResultSetFactory::createFileResultSet(const char * logicalName, const char * cluster)
-{
-    Owned<IDistributedFile> df = lookupLogicalName(logicalName);
-    Owned<IFvDataSource> ds = createFileDataSource(df, logicalName, cluster, username, password);
-    if (ds)
-    {
-        Owned<CResultSet> result = createResultSet(ds, false);
-        result->setColumnMapping(df);
-        return result->createOldStyleCursor();
-    }
-    return NULL;
-};
-
 INewResultSet * CResultSetFactory::createNewResultSet(IConstWUResult * wuResult, const char * wuid)
 {
     Owned<IFvDataSource> ds = createDataSource(wuResult, wuid, username, password);
@@ -3147,30 +3096,6 @@ CRemoteResultSetFactory::CRemoteResultSetFactory(const char * remoteServer, ISec
     serverEP.set(remoteServer);
 }
 
-IResultSet * CRemoteResultSetFactory::createResultSet(IConstWUResult * wuResult, const char * wuid)
-{
-    SCMStringBuffer name;
-    wuResult->getResultName(name);
-    Owned<IFvDataSource> ds = createRemoteDataSource(serverEP, username, password, wuid, wuResult->getResultSequence(), name.length() ? name.str() : NULL);
-    if (ds)
-    {
-        Owned<CResultSet> result = new CResultSet(ds, false);
-        return result->createOldStyleCursor();
-    }
-    return NULL;
-}
-
-IResultSet * CRemoteResultSetFactory::createFileResultSet(const char * logicalName, const char * cluster)
-{
-    Owned<IFvDataSource> ds = createRemoteFileDataSource(serverEP, username, password, logicalName);
-    if (ds)
-    {
-        Owned<CResultSet> result = new CResultSet(ds, false);
-        return result->createOldStyleCursor();
-    }
-    return NULL;
-};
-
 INewResultSet * CRemoteResultSetFactory::createNewResultSet(IConstWUResult * wuResult, const char * wuid)
 {
     SCMStringBuffer name;
@@ -3217,40 +3142,6 @@ IResultSetMetaData * CRemoteResultSetFactory::createResultSetMeta(const char * w
 
 //---------------------------------------------------------------------------
 
-extern FILEVIEW_API IResultSet* createResultSet(IResultSetFactory & factory, IStringVal & error, IConstWUResult * wuResult, const char * wuid);
-extern FILEVIEW_API IResultSet* createFileResultSet(IResultSetFactory & factory, IStringVal & error, const char * logicalFile, const char * queue, const char * cluster);
-
-IResultSet* createResultSet(IResultSetFactory & factory, IStringVal & error, IConstWUResult * wuResult, const char * wuid)
-{
-    try
-    {
-        return factory.createResultSet(wuResult, wuid);
-    }
-    catch (IException * e)
-    {
-        StringBuffer s;
-        error.set(e->errorMessage(s).str());
-        e->Release();
-        return NULL;
-    }
-}
-
-IResultSet* createFileResultSet(IResultSetFactory & factory, IStringVal & error, const char * logicalFile, const char * cluster)
-{
-    try
-    {
-        return factory.createFileResultSet(logicalFile, cluster);
-    }
-    catch (IException * e)
-    {
-        StringBuffer s;
-        error.set(e->errorMessage(s).str());
-        e->Release();
-        return NULL;
-    }
-}
-
-
 INewResultSet* createNewResultSet(IResultSetFactory & factory, IStringVal & error, IConstWUResult * wuResult, const char * wuid)
 {
     try
@@ -3321,20 +3212,6 @@ IResultSetFactory * getRemoteResultSetFactory(const char * remoteServer, const c
     return new CRemoteResultSetFactory(remoteServer, username, password);
 }
 
-extern FILEVIEW_API void getNumRows(IResultSet * rs, IStringVal &ret)
-{
-    if (rs)
-    {
-        char buff[64];
-#ifdef _WIN32
-      numtostr(buff, rs->getNumRows());
-#else
-        sprintf(buff, "%"I64F"d", rs->getNumRows());
-#endif
-        ret.set(buff);
-    }
-}
-
 int findResultSetColumn(const INewResultSet * results, const char * columnName)
 {
     const IResultSetMetaData & meta = results->getMetaData();

common/fileview2/fvresultset.ipp

@@ -145,7 +145,7 @@ public:
 protected:
     const CResultSetMetaData & getMeta() { return static_cast<const CResultSetMetaData &>(getMetaData()); }
 
-    CResultSetCursor * doCreateCursor(bool oldInterface);
+    CResultSetCursor * doCreateCursor();
 };
 
 
@@ -171,8 +171,6 @@ public:
     virtual void onClose() { dataSource->onClose(); }
     virtual IFvDataSource * queryDataSource() { return dataSource; }
 
-    inline CResultSetCursor * createOldStyleCursor() { return doCreateCursor(true); }
-
     void setColumnMapping(IDistributedFile * df);
 
 protected:
@@ -320,17 +318,14 @@ protected:
     UInt64Array validOffsets;
 };
 
-class CResultSetCursor : public CInterface, implements IResultSet, implements IExtendedResultSetCursor
+class CResultSetCursor : public CInterface, implements IExtendedResultSetCursor
 {
 public:
-    CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, bool _oldInterface);
+    CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet);
     CResultSetCursor(const CResultSetMetaData & _meta, IExtendedNewResultSet * _resultSet, MemoryBuffer & val);
     ~CResultSetCursor();
     IMPLEMENT_IINTERFACE;
 
-//interface IResultSet only
-    virtual int findColumn(const char * columnName) const;
-
 //interface IResultSet, IResultSetCursor shared
     virtual bool absolute(__int64 row);
     virtual void afterLast();
@@ -369,12 +364,6 @@ public:
     virtual IStringVal & getXmlRow(IStringVal &ret);
     virtual IStringVal & getXmlItem(IStringVal & ret);
 
-
-
-//IResultSetCursor
-    virtual void beginAccess();
-    virtual void endAccess();
-
 //IExtendedResultSetCursor
     virtual void noteRelatedFileChanged() {}
 
@@ -397,7 +386,6 @@ protected:
     MemoryBuffer curRowData;
     __int64 curRow;
     unsigned * offsets;
-    bool oldInterface;
 };
 
 //---------------------------------------------------------------------------
@@ -580,8 +568,6 @@ public:
     CResultSetFactory(const char * _username, const char * _password);
     CResultSetFactory(ISecManager &secmgr, ISecUser &secuser);
 
-    virtual IResultSet * createResultSet(IConstWUResult * wuResult, const char * wuid);
-    virtual IResultSet * createFileResultSet(const char * logicalFile, const char * cluster);
     virtual INewResultSet * createNewResultSet(IConstWUResult * wuResult, const char * wuid);
     virtual INewResultSet * createNewFileResultSet(const char * logicalFile, const char * cluster);
     virtual INewResultSet * createNewResultSet(const char * wuid, unsigned sequence, const char * name);
@@ -612,8 +598,6 @@ public:
     CRemoteResultSetFactory(const char * remoteServer, ISecManager &secmgr, ISecUser &secuser);
     IMPLEMENT_IINTERFACE
 
-    virtual IResultSet * createResultSet(IConstWUResult * wuResult, const char * wuid);
-    virtual IResultSet * createFileResultSet(const char * logicalFile, const char * cluster);
     virtual INewResultSet * createNewResultSet(IConstWUResult * wuResult, const char * wuid);
     virtual INewResultSet * createNewFileResultSet(const char * logicalFile, const char * cluster);
     virtual INewResultSet * createNewResultSet(const char * wuid, unsigned sequence, const char * name);