Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 42465 | Differences between
and this patch

Collapse All | Expand All

(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/RunTime/Communication/RTEComm_URIBuilder.hpp (-1 / +2 lines)
Lines 453-459 public: Link Here
453
453
454
    void                        CleanUp ();
454
    void                        CleanUp ();
455
455
456
private:
456
// HM051231 private:
457
    // Do not allow to use copy constructor outside
457
    // Do not allow to use copy constructor outside
458
	RTEComm_URIBuilder     (const RTEComm_URIBuilder & uriBuilder)
458
	RTEComm_URIBuilder     (const RTEComm_URIBuilder & uriBuilder)
459
        :   m_URI (uriBuilder.m_URI),
459
        :   m_URI (uriBuilder.m_URI),
Lines 467-472 private: Link Here
467
      @brief    Build up URI
467
      @brief    Build up URI
468
     */
468
     */
469
469
470
private:  //HM051231
470
    URIBuildRC  BuildURI                           (SAPDB_Char const * const  path,
471
    URIBuildRC  BuildURI                           (SAPDB_Char const * const  path,
471
                                                    SAPDB_Char const * const  protocol,
472
                                                    SAPDB_Char const * const  protocol,
472
                                                    SAPDB_UTF8 const * const  serverDB,
473
                                                    SAPDB_UTF8 const * const  serverDB,
(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/Interfaces/Runtime/Util/IFRUtil_LinkedList.h (+1 lines)
Lines 36-41 Link Here
36
36
37
//#include "SAPDB/Interfaces/Runtime/IFR_Trace.h"
37
//#include "SAPDB/Interfaces/Runtime/IFR_Trace.h"
38
#include "SAPDB/Interfaces/SQLDBC/SQLDBC_Internals.h"
38
#include "SAPDB/Interfaces/SQLDBC/SQLDBC_Internals.h"
39
#include "SAPDB/Interfaces/Runtime/Util/IFRUtil_RuntimeItem.h"
39
40
40
/*!
41
/*!
41
@class          IFRUtil_LinkedList
42
@class          IFRUtil_LinkedList
(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/ServerTasks/SrvTasks_JobList.hpp (-2 / +2 lines)
Lines 354-360 void SrvTasks_JobList<JOB>::RemoveAllJob Link Here
354
    typename Container_Vector<JOB*>::Iterator iter;
354
    typename Container_Vector<JOB*>::Iterator iter;
355
    for ( iter = this->Begin(); iter != this->End(); ++iter )
355
    for ( iter = this->Begin(); iter != this->End(); ++iter )
356
        if ( *iter != 0 )
356
        if ( *iter != 0 )
357
            destroy(*iter, GetAllocator());
357
            destroy(*iter, this->GetAllocator());
358
	this->Delete();
358
	this->Delete();
359
}
359
}
360
//--------------------------------------------------------------------------------------
360
//--------------------------------------------------------------------------------------
Lines 383-389 void SrvTasks_JobList<JOB>::WriteToTrace Link Here
383
template <class JOB> inline
383
template <class JOB> inline
384
void SrvTasks_JobList<JOB>::RemoveJob(typename Container_Vector<JOB*>::Iterator &job)
384
void SrvTasks_JobList<JOB>::RemoveJob(typename Container_Vector<JOB*>::Iterator &job)
385
{
385
{
386
    destroy(*job, GetAllocator());
386
    destroy(*job, this->GetAllocator());
387
    Delete(job);
387
    Delete(job);
388
}
388
}
389
389
(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceBackwardRead.hpp (-28 / +28 lines)
Lines 121-127 public: Link Here
121
            // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace()
121
            // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace()
122
            if(!m_RecordSpace.Deassign(errlist,isOK))
122
            if(!m_RecordSpace.Deassign(errlist,isOK))
123
            {
123
            {
124
                AppendContextInfo(__CONTEXT__,errlist);
124
                this->AppendContextInfo(__CONTEXT__,errlist);
125
                return false;
125
                return false;
126
            }
126
            }
127
            return true;
127
            return true;
Lines 172-178 public: Link Here
172
            m_BreakInfo.lastAccessMode = GetCurrentPage().AccessMode();
172
            m_BreakInfo.lastAccessMode = GetCurrentPage().AccessMode();
173
            if ( ! Invalidate(errlist) )
173
            if ( ! Invalidate(errlist) )
174
            {
174
            {
175
                AppendContextInfo(__CONTEXT__,errlist,"Break");
175
                this->AppendContextInfo(__CONTEXT__,errlist,"Break");
176
                return false;
176
                return false;
177
            }
177
            }
178
            return true;
178
            return true;
Lines 191-201 public: Link Here
191
                     WriteToTrace ("Continue(): IsValid() is true");
191
                     WriteToTrace ("Continue(): IsValid() is true");
192
                if ( ! Invalidate(errlist) )
192
                if ( ! Invalidate(errlist) )
193
                {
193
                {
194
                    AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() could not invalidate record space");
194
                    this->AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() could not invalidate record space");
195
                    return false;
195
                    return false;
196
                }
196
                }
197
                m_BreakInfo = BreakInfo();
197
                m_BreakInfo = BreakInfo();
198
                AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() call without break");
198
                this->AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() call without break");
199
                return false; // PTS 1134170 mb 2005-03-22
199
                return false; // PTS 1134170 mb 2005-03-22
200
            }
200
            }
201
 
201
 
Lines 204-210 public: Link Here
204
                                 m_BreakInfo.lastAccessMode,
204
                                 m_BreakInfo.lastAccessMode,
205
                                 errlist ) )
205
                                 errlist ) )
206
            {
206
            {
207
                AppendContextInfo(__CONTEXT__,errlist);
207
                this->AppendContextInfo(__CONTEXT__,errlist);
208
                m_BreakInfo = BreakInfo();
208
                m_BreakInfo = BreakInfo();
209
                (void)Invalidate(errlist);
209
                (void)Invalidate(errlist);
210
                return false;
210
                return false;
Lines 214-220 public: Link Here
214
            (void)Deref(result,errlist);
214
            (void)Deref(result,errlist);
215
            if ( ! result )
215
            if ( ! result )
216
            {
216
            {
217
                AppendContextInfo(__CONTEXT__,errlist);
217
                this->AppendContextInfo(__CONTEXT__,errlist);
218
                m_BreakInfo = BreakInfo();
218
                m_BreakInfo = BreakInfo();
219
                (void)Invalidate(errlist);
219
                (void)Invalidate(errlist);
220
                return false;
220
                return false;
Lines 263-269 public: Link Here
263
            {
263
            {
264
                result = AssignRecordspace (m_RecordIterator, errlist);
264
                result = AssignRecordspace (m_RecordIterator, errlist);
265
                if ( ! result )
265
                if ( ! result )
266
                    AppendContextInfo(__CONTEXT__,errlist);
266
                    this->AppendContextInfo(__CONTEXT__,errlist);
267
            }
267
            }
268
            return m_RecordSpace;
268
            return m_RecordSpace;
269
        }
269
        }
Lines 290-296 public: Link Here
290
            // reorder and reassign the split record space
290
            // reorder and reassign the split record space
291
            if ( ! m_RecordSpace.Reassign (errlist, KEEP_FIRST_PART) )
291
            if ( ! m_RecordSpace.Reassign (errlist, KEEP_FIRST_PART) )
292
            {
292
            {
293
                AppendContextInfo(__CONTEXT__,errlist);
293
                this->AppendContextInfo(__CONTEXT__,errlist);
294
                return false;
294
                return false;
295
            }
295
            }
296
            m_RecordSpaceIsComplete = false;
296
            m_RecordSpaceIsComplete = false;
Lines 312-324 public: Link Here
312
                    
312
                    
313
                    if ( ! m_PAM.ReleasePage(Page, errlist) )
313
                    if ( ! m_PAM.ReleasePage(Page, errlist) )
314
                    {
314
                    {
315
                        AppendContextInfo(__CONTEXT__,errlist);
315
                        this->AppendContextInfo(__CONTEXT__,errlist);
316
                        return false;
316
                        return false;
317
                    }
317
                    }
318
318
319
                    if ( ! m_PAM.GetPage (Page, PrevPageNo, errlist) )
319
                    if ( ! m_PAM.GetPage (Page, PrevPageNo, errlist) )
320
                    {
320
                    {
321
                        AppendContextInfo(__CONTEXT__,errlist);
321
                        this->AppendContextInfo(__CONTEXT__,errlist);
322
                        m_RecordSpace.WriteToTrace("--");
322
                        m_RecordSpace.WriteToTrace("--");
323
                        errlist = errlist + Data_Exception(__CONTEXT__,
323
                        errlist = errlist + Data_Exception(__CONTEXT__,
324
                                                  DATA_CHAIN_IS_INCONSISTENT,
324
                                                  DATA_CHAIN_IS_INCONSISTENT,
Lines 332-338 public: Link Here
332
                {
332
                {
333
                    if ( ! m_RecordSpace.Deassign(errlist) )
333
                    if ( ! m_RecordSpace.Deassign(errlist) )
334
                    {
334
                    {
335
                        AppendContextInfo(__CONTEXT__,errlist);
335
                        this->AppendContextInfo(__CONTEXT__,errlist);
336
                        return false;
336
                        return false;
337
                    }
337
                    }
338
                }
338
                }
Lines 370-376 public: Link Here
370
                {
370
                {
371
                    if ( ! m_RecordSpace.Reassign(errlist) )
371
                    if ( ! m_RecordSpace.Reassign(errlist) )
372
                    {
372
                    {
373
                        AppendContextInfo(__CONTEXT__,errlist);
373
                        this->AppendContextInfo(__CONTEXT__,errlist);
374
                        return false;
374
                        return false;
375
                    }
375
                    }
376
                }
376
                }
Lines 378-390 public: Link Here
378
                {
378
                {
379
                    if ( ! m_RecordSpace.Deassign(errlist) )
379
                    if ( ! m_RecordSpace.Deassign(errlist) )
380
                    {
380
                    {
381
                        AppendContextInfo(__CONTEXT__,errlist);
381
                        this->AppendContextInfo(__CONTEXT__,errlist);
382
                        return false;
382
                        return false;
383
                    }
383
                    }
384
                    m_RecordSpace.SetAccessMode(AccessMode);
384
                    m_RecordSpace.SetAccessMode(AccessMode);
385
                    if ( ! m_RecordSpace.UseNextPart(errlist) )
385
                    if ( ! m_RecordSpace.UseNextPart(errlist) )
386
                    {
386
                    {
387
                        AppendContextInfo(__CONTEXT__,errlist);
387
                        this->AppendContextInfo(__CONTEXT__,errlist);
388
                        return false;
388
                        return false;
389
                    }
389
                    }
390
                    if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(),
390
                    if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(),
Lines 392-398 public: Link Here
392
                                          AccessMode,
392
                                          AccessMode,
393
                                          errlist ) )
393
                                          errlist ) )
394
                    {
394
                    {
395
                        AppendContextInfo(__CONTEXT__,errlist);
395
                        this->AppendContextInfo(__CONTEXT__,errlist);
396
                        return false;
396
                        return false;
397
                    }
397
                    }
398
                }
398
                }
Lines 402-408 public: Link Here
402
                m_RecordSpace.SetAccessMode(AccessMode);
402
                m_RecordSpace.SetAccessMode(AccessMode);
403
                if ( ! m_RecordSpace.UseNextPart(errlist) )
403
                if ( ! m_RecordSpace.UseNextPart(errlist) )
404
                {
404
                {
405
                    AppendContextInfo(__CONTEXT__,errlist);
405
                    this->AppendContextInfo(__CONTEXT__,errlist);
406
                    return false;
406
                    return false;
407
                }
407
                }
408
                if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(),
408
                if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(),
Lines 410-416 public: Link Here
410
                                      AccessMode,
410
                                      AccessMode,
411
                                      errlist) )
411
                                      errlist) )
412
                {
412
                {
413
                    AppendContextInfo(__CONTEXT__,errlist);
413
                    this->AppendContextInfo(__CONTEXT__,errlist);
414
                    return false;
414
                    return false;
415
                }
415
                }
416
            }
416
            }
Lines 448-454 public: Link Here
448
            else
448
            else
449
            {
449
            {
450
                errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read");
450
                errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read");
451
                AppendContextInfo(__CONTEXT__,errlist);
451
                this->AppendContextInfo(__CONTEXT__,errlist);
452
                return false;
452
                return false;
453
            }
453
            }
454
                
454
                
Lines 459-465 public: Link Here
459
                if ( ! RecordIter.LengthIsValid() ) // PTS 1113270 UH 2001-12-28
459
                if ( ! RecordIter.LengthIsValid() ) // PTS 1113270 UH 2001-12-28
460
                {
460
                {
461
                    errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read");
461
                    errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read");
462
                    AppendContextInfo(__CONTEXT__,errlist);
462
                    this->AppendContextInfo(__CONTEXT__,errlist);
463
                    Invalidate(errlist,false);
463
                    Invalidate(errlist,false);
464
                    return false;
464
                    return false;
465
                }
465
                }
Lines 481-487 public: Link Here
481
                        {
481
                        {
482
                            if ( ! m_RecordSpace.UseNextPart(errlist) )
482
                            if ( ! m_RecordSpace.UseNextPart(errlist) )
483
                            {
483
                            {
484
                                AppendContextInfo(__CONTEXT__,errlist);
484
                                this->AppendContextInfo(__CONTEXT__,errlist);
485
                                return false;
485
                                return false;
486
                            }
486
                            }
487
                            if ( m_PAM.GetPage (m_RecordSpace.GetCurrentPage(), PrevPageNo, errlist) )
487
                            if ( m_PAM.GetPage (m_RecordSpace.GetCurrentPage(), PrevPageNo, errlist) )
Lines 493-499 public: Link Here
493
                                errlist = errlist +
493
                                errlist = errlist +
494
                                          Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
494
                                          Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
495
                                                         "incomplete backread image");
495
                                                         "incomplete backread image");
496
                                AppendContextInfo(__CONTEXT__,errlist);
496
                                this->AppendContextInfo(__CONTEXT__,errlist);
497
                                Invalidate(errlist, false);
497
                                Invalidate(errlist, false);
498
                                return false;
498
                                return false;
499
                            }
499
                            }
Lines 505-511 public: Link Here
505
                            errlist = errlist +
505
                            errlist = errlist +
506
                                      Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
506
                                      Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
507
                                                     "incomplete backread image (prevpno): nil");
507
                                                     "incomplete backread image (prevpno): nil");
508
                            AppendContextInfo(__CONTEXT__,errlist);
508
                            this->AppendContextInfo(__CONTEXT__,errlist);
509
                            Invalidate(errlist, false);
509
                            Invalidate(errlist, false);
510
                            return false;
510
                            return false;
511
                        }
511
                        }
Lines 520-526 public: Link Here
520
                          Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
520
                          Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,
521
                                         "incomplete backread image (totalrestlength>0)");
521
                                         "incomplete backread image (totalrestlength>0)");
522
                Kernel_VTrace() << "TotalRestLength: " << TotalRestLength;
522
                Kernel_VTrace() << "TotalRestLength: " << TotalRestLength;
523
                AppendContextInfo(__CONTEXT__,errlist);
523
                this->AppendContextInfo(__CONTEXT__,errlist);
524
                Invalidate(errlist, false);
524
                Invalidate(errlist, false);
525
                return false;
525
                return false;
526
            }
526
            }
Lines 710-716 public: Link Here
710
                    const Data_ISplitSpace::PartNo partNoOfCurrentPage = Space.CurrentPart();
710
                    const Data_ISplitSpace::PartNo partNoOfCurrentPage = Space.CurrentPart();
711
                    if(!Space.UseNextPart(errlist))
711
                    if(!Space.UseNextPart(errlist))
712
                    {
712
                    {
713
                        AppendContextInfo(__CONTEXT__,errlist);
713
                        this->AppendContextInfo(__CONTEXT__,errlist);
714
                        return false;
714
                        return false;
715
                    }
715
                    }
716
                    PAGE &CurrentPage = Space.GetPage(partNoOfCurrentPage);
716
                    PAGE &CurrentPage = Space.GetPage(partNoOfCurrentPage);
Lines 718-724 public: Link Here
718
                    
718
                    
719
                    if ( ! CurrentPage.Append (NextPage, errlist) )
719
                    if ( ! CurrentPage.Append (NextPage, errlist) )
720
                    {
720
                    {
721
                        AppendContextInfo(__CONTEXT__,errlist);
721
                        this->AppendContextInfo(__CONTEXT__,errlist);
722
                        return false;
722
                        return false;
723
                    }
723
                    }
724
                    this->m_LastPageNo = NextPage.PageNo();
724
                    this->m_LastPageNo = NextPage.PageNo();
Lines 727-733 public: Link Here
727
                    if ( CurrentPage.RootPageNo() != NextPage.RootPageNo() )
727
                    if ( CurrentPage.RootPageNo() != NextPage.RootPageNo() )
728
                    {
728
                    {
729
                        errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"invalid root 1");
729
                        errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"invalid root 1");
730
                        AppendContextInfo(__CONTEXT__,errlist);
730
                        this->AppendContextInfo(__CONTEXT__,errlist);
731
                        return false;
731
                        return false;
732
                    }
732
                    }
733
                }
733
                }
Lines 742-748 public: Link Here
742
                    
742
                    
743
                    if(!OldLastPage.Append (CurrentPage,errlist))
743
                    if(!OldLastPage.Append (CurrentPage,errlist))
744
                    {
744
                    {
745
                        AppendContextInfo(__CONTEXT__,errlist);
745
                        this->AppendContextInfo(__CONTEXT__,errlist);
746
                        return false;
746
                        return false;
747
                    }
747
                    }
748
                    this->m_LastPageNo = CurrentPage.PageNo();
748
                    this->m_LastPageNo = CurrentPage.PageNo();
Lines 803-809 public: Link Here
803
                                      DATA_CHAIN_IS_INCONSISTENT,
803
                                      DATA_CHAIN_IS_INCONSISTENT,
804
                                      "-",
804
                                      "-",
805
                                      SAPDB_ToString(this->LastPageNo()) ));
805
                                      SAPDB_ToString(this->LastPageNo()) ));
806
            AppendContextInfo(__CONTEXT__,errlist);
806
            this->AppendContextInfo(__CONTEXT__,errlist);
807
            return false;
807
            return false;
808
        }
808
        }
809
        return true;
809
        return true;
(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceForwardRead.hpp (-31 / +31 lines)
Lines 97-103 public: Link Here
97
        {
97
        {
98
            if(!Invalidate(errlist))
98
            if(!Invalidate(errlist))
99
            {
99
            {
100
                AppendContextInfo(__CONTEXT__,errlist);
100
                this->AppendContextInfo(__CONTEXT__,errlist);
101
                return false;
101
                return false;
102
            }
102
            }
103
            m_RecordSpace.Delete();
103
            m_RecordSpace.Delete();
Lines 126-132 public: Link Here
126
            // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace
126
            // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace
127
            if(!m_RecordSpace.Deassign(errlist,isOK))
127
            if(!m_RecordSpace.Deassign(errlist,isOK))
128
            {
128
            {
129
                AppendContextInfo(__CONTEXT__,errlist);
129
                this->AppendContextInfo(__CONTEXT__,errlist);
130
                return false;
130
                return false;
131
            }
131
            }
132
            return true;
132
            return true;
Lines 171-177 public: Link Here
171
            m_BreakInfo.lastAccessMode = m_RecordSpace.GetPage(0).AccessMode();
171
            m_BreakInfo.lastAccessMode = m_RecordSpace.GetPage(0).AccessMode();
172
            if ( ! Invalidate(errlist) )
172
            if ( ! Invalidate(errlist) )
173
            {
173
            {
174
                AppendContextInfo(__CONTEXT__,errlist);
174
                this->AppendContextInfo(__CONTEXT__,errlist);
175
                return false;
175
                return false;
176
            }
176
            }
177
            return true;
177
            return true;
Lines 185-195 public: Link Here
185
                     WriteToTrace ("Continue(): IsValid() is true");
185
                     WriteToTrace ("Continue(): IsValid() is true");
186
                if ( ! Invalidate(errlist) )
186
                if ( ! Invalidate(errlist) )
187
                {
187
                {
188
                    AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() could not invalidate record space");
188
                    this->AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() could not invalidate record space");
189
                    return false;
189
                    return false;
190
                }
190
                }
191
                m_BreakInfo = BreakInfo();
191
                m_BreakInfo = BreakInfo();
192
                AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() call without break");
192
                this->AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() call without break");
193
                return false;
193
                return false;
194
            }
194
            }
195
 
195
 
Lines 198-204 public: Link Here
198
                                 m_BreakInfo.lastAccessMode,
198
                                 m_BreakInfo.lastAccessMode,
199
                                 errlist ) )
199
                                 errlist ) )
200
            {
200
            {
201
                AppendContextInfo(__CONTEXT__,errlist);
201
                this->AppendContextInfo(__CONTEXT__,errlist);
202
                m_BreakInfo = BreakInfo();
202
                m_BreakInfo = BreakInfo();
203
                (void)Invalidate(errlist);
203
                (void)Invalidate(errlist);
204
            	return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value
204
            	return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value
Lines 208-214 public: Link Here
208
            (void) this->Deref(result,errlist);
208
            (void) this->Deref(result,errlist);
209
            if ( ! result )
209
            if ( ! result )
210
            {
210
            {
211
                AppendContextInfo(__CONTEXT__,errlist);
211
                this->AppendContextInfo(__CONTEXT__,errlist);
212
                m_BreakInfo = BreakInfo();
212
                m_BreakInfo = BreakInfo();
213
            	return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value
213
            	return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value
214
            }
214
            }
Lines 229-235 public: Link Here
229
            {
229
            {
230
                result = AssignRecordspace (m_RecordIterator, errlist);
230
                result = AssignRecordspace (m_RecordIterator, errlist);
231
                if (! result)
231
                if (! result)
232
                    AppendContextInfo(__CONTEXT__,errlist);
232
                    this->AppendContextInfo(__CONTEXT__,errlist);
233
            }
233
            }
234
            return m_RecordSpace;
234
            return m_RecordSpace;
235
        }
235
        }
Lines 253-259 public: Link Here
253
            // reorder and reassign the split record space
253
            // reorder and reassign the split record space
254
            if ( ! m_RecordSpace.Reassign(errlist))
254
            if ( ! m_RecordSpace.Reassign(errlist))
255
            {
255
            {
256
                AppendContextInfo(__CONTEXT__,errlist);
256
                this->AppendContextInfo(__CONTEXT__,errlist);
257
                WriteToTrace("! m_RecordSpace.Reassign");
257
                WriteToTrace("! m_RecordSpace.Reassign");
258
                return false;
258
                return false;
259
            }
259
            }
Lines 275-281 public: Link Here
275
275
276
                    if ( ! m_PAM.ReleasePage(Page, errlist) )
276
                    if ( ! m_PAM.ReleasePage(Page, errlist) )
277
                    {
277
                    {
278
                        AppendContextInfo(__CONTEXT__,errlist);
278
                        this->AppendContextInfo(__CONTEXT__,errlist);
279
                        WriteToTrace("! m_PAM.ReleasePage");
279
                        WriteToTrace("! m_PAM.ReleasePage");
280
                        return false;
280
                        return false;
281
                    }
281
                    }
Lines 286-292 public: Link Here
286
                                                  DATA_CHAIN_IS_INCONSISTENT,
286
                                                  DATA_CHAIN_IS_INCONSISTENT,
287
                                                  SAPDB_ToString(auxPageNo),
287
                                                  SAPDB_ToString(auxPageNo),
288
                                                  SAPDB_ToString(Page.PageNo()) );
288
                                                  SAPDB_ToString(Page.PageNo()) );
289
                        AppendContextInfo(__CONTEXT__,errlist);
289
                        this->AppendContextInfo(__CONTEXT__,errlist);
290
                        WriteToTrace("! m_PAM.GetPage");
290
                        WriteToTrace("! m_PAM.GetPage");
291
                        return false;
291
                        return false;
292
                    }
292
                    }
Lines 297-303 public: Link Here
297
                {
297
                {
298
                    if ( ! m_RecordSpace.Deassign (errlist) )
298
                    if ( ! m_RecordSpace.Deassign (errlist) )
299
                    {
299
                    {
300
                        AppendContextInfo(__CONTEXT__,errlist);
300
                        this->AppendContextInfo(__CONTEXT__,errlist);
301
                        WriteToTrace("! m_RecordSpace.Deassign");
301
                        WriteToTrace("! m_RecordSpace.Deassign");
302
                        return false;
302
                        return false;
303
                    }
303
                    }
Lines 352-358 public: Link Here
352
                {
352
                {
353
                    if(!m_RecordSpace.Reassign(errlist))
353
                    if(!m_RecordSpace.Reassign(errlist))
354
                    {
354
                    {
355
                        AppendContextInfo(__CONTEXT__,errlist);
355
                        this->AppendContextInfo(__CONTEXT__,errlist);
356
                        return false;
356
                        return false;
357
                    }
357
                    }
358
                }
358
                }
Lines 360-372 public: Link Here
360
                {
360
                {
361
                    if (!m_RecordSpace.Deassign(errlist))
361
                    if (!m_RecordSpace.Deassign(errlist))
362
                    {
362
                    {
363
                        AppendContextInfo(__CONTEXT__,errlist);
363
                        this->AppendContextInfo(__CONTEXT__,errlist);
364
                        return false;
364
                        return false;
365
                    }
365
                    }
366
                    m_RecordSpace.SetAccessMode(AccessMode);
366
                    m_RecordSpace.SetAccessMode(AccessMode);
367
                    if ( ! m_RecordSpace.UseNextPart(errlist) )
367
                    if ( ! m_RecordSpace.UseNextPart(errlist) )
368
                    {
368
                    {
369
                        AppendContextInfo(__CONTEXT__,errlist);
369
                        this->AppendContextInfo(__CONTEXT__,errlist);
370
                        return false;
370
                        return false;
371
                    }
371
                    }
372
                    if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(),
372
                    if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(),
Lines 374-380 public: Link Here
374
                                           AccessMode,
374
                                           AccessMode,
375
                                           errlist) )
375
                                           errlist) )
376
                    {
376
                    {
377
                        AppendContextInfo(__CONTEXT__,errlist);
377
                        this->AppendContextInfo(__CONTEXT__,errlist);
378
                        return false;
378
                        return false;
379
                    }
379
                    }
380
                }
380
                }
Lines 384-390 public: Link Here
384
                m_RecordSpace.SetAccessMode(AccessMode);
384
                m_RecordSpace.SetAccessMode(AccessMode);
385
                if ( ! m_RecordSpace.UseNextPart(errlist) )
385
                if ( ! m_RecordSpace.UseNextPart(errlist) )
386
                {
386
                {
387
                    AppendContextInfo(__CONTEXT__,errlist);
387
                    this->AppendContextInfo(__CONTEXT__,errlist);
388
                    return false;
388
                    return false;
389
                }
389
                }
390
                if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(),
390
                if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(),
Lines 392-398 public: Link Here
392
                                       AccessMode,
392
                                       AccessMode,
393
                                       errlist) )
393
                                       errlist) )
394
                {
394
                {
395
                    AppendContextInfo(__CONTEXT__,errlist);
395
                    this->AppendContextInfo(__CONTEXT__,errlist);
396
                    return false;
396
                    return false;
397
                }
397
                }
398
            }       
398
            }       
Lines 445-457 public: Link Here
445
                            errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
445
                            errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
446
                                      SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()),
446
                                      SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()),
447
                                      SAPDB_ToString(NextPageNo) );
447
                                      SAPDB_ToString(NextPageNo) );
448
                            AppendContextInfo(__CONTEXT__,errlist);
448
                            this->AppendContextInfo(__CONTEXT__,errlist);
449
                            WriteToTrace("! NextPageNo.IsValid()");
449
                            WriteToTrace("! NextPageNo.IsValid()");
450
                            return false;
450
                            return false;
451
                        }
451
                        }
452
                        if ( ! m_RecordSpace.UseNextPart(errlist) )
452
                        if ( ! m_RecordSpace.UseNextPart(errlist) )
453
                        {
453
                        {
454
                            AppendContextInfo(__CONTEXT__,errlist);
454
                            this->AppendContextInfo(__CONTEXT__,errlist);
455
                            WriteToTrace("! m_RecordSpace.UseNextPart(errlist)");
455
                            WriteToTrace("! m_RecordSpace.UseNextPart(errlist)");
456
                            return false;
456
                            return false;
457
                        }
457
                        }
Lines 460-466 public: Link Here
460
                            errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
460
                            errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
461
                                      SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()),
461
                                      SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()),
462
                                      SAPDB_ToString(NextPageNo) );
462
                                      SAPDB_ToString(NextPageNo) );
463
                            AppendContextInfo(__CONTEXT__,errlist);
463
                            this->AppendContextInfo(__CONTEXT__,errlist);
464
                            WriteToTrace("! m_PAM.GetPage");
464
                            WriteToTrace("! m_PAM.GetPage");
465
                            return false;
465
                            return false;
466
                        }
466
                        }
Lines 473-479 public: Link Here
473
                errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
473
                errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
474
                          "TotalRestLength",
474
                          "TotalRestLength",
475
                          SAPDB_ToString(TotalRestLength));
475
                          SAPDB_ToString(TotalRestLength));
476
                AppendContextInfo(__CONTEXT__,errlist);
476
                this->AppendContextInfo(__CONTEXT__,errlist);
477
                WriteToTrace("TotalRestLength != 0");
477
                WriteToTrace("TotalRestLength != 0");
478
                return false;
478
                return false;
479
            }
479
            }
Lines 584-602 public: Link Here
584
584
585
        if ( ! RecordIterator.Invalidate(errlist) )
585
        if ( ! RecordIterator.Invalidate(errlist) )
586
        {
586
        {
587
            AppendContextInfo(__CONTEXT__,errlist);
587
            this->AppendContextInfo(__CONTEXT__,errlist);
588
            return false;
588
            return false;
589
        }
589
        }
590
590
591
        if ( ! this->FindLastPageNo(errlist) )
591
        if ( ! this->FindLastPageNo(errlist) )
592
        {
592
        {
593
            AppendContextInfo(__CONTEXT__,errlist);
593
            this->AppendContextInfo(__CONTEXT__,errlist);
594
            return false;
594
            return false;
595
        }
595
        }
596
            
596
            
597
        if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForUpdate, errlist ) )
597
        if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForUpdate, errlist ) )
598
        {
598
        {
599
            AppendContextInfo(__CONTEXT__,errlist);
599
            this->AppendContextInfo(__CONTEXT__,errlist);
600
            errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
600
            errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
601
                                               "-",
601
                                               "-",
602
                                               SAPDB_ToString(this->LastPageNo()) );
602
                                               SAPDB_ToString(this->LastPageNo()) );
Lines 613-624 public: Link Here
613
        {
613
        {
614
            if(!RecordIterator.Invalidate(errlist))
614
            if(!RecordIterator.Invalidate(errlist))
615
            {
615
            {
616
                AppendContextInfo(__CONTEXT__,errlist);
616
                this->AppendContextInfo(__CONTEXT__,errlist);
617
                return false;
617
                return false;
618
            }
618
            }
619
            if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForStructureChange, errlist ) )
619
            if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForStructureChange, errlist ) )
620
            {
620
            {
621
                AppendContextInfo(__CONTEXT__,errlist);
621
                this->AppendContextInfo(__CONTEXT__,errlist);
622
                errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
622
                errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
623
                                                   "-",
623
                                                   "-",
624
                                                   SAPDB_ToString(this->LastPageNo()) );
624
                                                   SAPDB_ToString(this->LastPageNo()) );
Lines 664-670 public: Link Here
664
664
665
                    if(!Space.UseNextPart(errlist))
665
                    if(!Space.UseNextPart(errlist))
666
                    {
666
                    {
667
                        AppendContextInfo(__CONTEXT__,errlist);
667
                        this->AppendContextInfo(__CONTEXT__,errlist);
668
                        return false;
668
                        return false;
669
                    }
669
                    }
670
670
Lines 673-679 public: Link Here
673
673
674
                    if(!CurrentPage.Append (NextPage, errlist))
674
                    if(!CurrentPage.Append (NextPage, errlist))
675
                    {
675
                    {
676
                        AppendContextInfo(__CONTEXT__,errlist);
676
                        this->AppendContextInfo(__CONTEXT__,errlist);
677
                        return false;
677
                        return false;
678
                    }
678
                    }
679
                    this->m_LastPageNo = NextPage.PageNo();
679
                    this->m_LastPageNo = NextPage.PageNo();
Lines 690-696 public: Link Here
690
                    OldLastPage.Assign (CurrentPage);
690
                    OldLastPage.Assign (CurrentPage);
691
                    if(!OldLastPage.Append (CurrentPage,errlist))
691
                    if(!OldLastPage.Append (CurrentPage,errlist))
692
                    {
692
                    {
693
                        AppendContextInfo(__CONTEXT__,errlist);
693
                        this->AppendContextInfo(__CONTEXT__,errlist);
694
                        return false;
694
                        return false;
695
                    }
695
                    }
696
                    this->m_LastPageNo = CurrentPage.PageNo();
696
                    this->m_LastPageNo = CurrentPage.PageNo();
Lines 723-729 public: Link Here
723
    {
723
    {
724
        if ( ! RecordIterator.Assign( this->RootId().PageNo(), 0, AccessMode, errlist) )
724
        if ( ! RecordIterator.Assign( this->RootId().PageNo(), 0, AccessMode, errlist) )
725
        {
725
        {
726
            AppendContextInfo(__CONTEXT__,errlist);
726
            this->AppendContextInfo(__CONTEXT__,errlist);
727
            errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
727
            errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT,
728
                                      "-",SAPDB_ToString(this->RootId().PageNo()));
728
                                      "-",SAPDB_ToString(this->RootId().PageNo()));
729
            return false;
729
            return false;
(-)V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/RunTime/System/RTESys_AtomicOperation.c (-2 / +2 lines)
Lines 398-404 SAPDB_Bool RTESys_CmpxchgInt8( SAPDB_Int Link Here
398
		  "m"(resultHigh),
398
		  "m"(resultHigh),
399
		  "m"(resultLow),
399
		  "m"(resultLow),
400
		  "m"(resultHigh)
400
		  "m"(resultHigh)
401
		: "eax", "ebx", "ecx", "edx", "memory"
401
		: "eax", "ecx", "edx", "memory"
402
	);
402
	);
403
    *pOldValue = (SAPDB_Int8)(resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 )));
403
    *pOldValue = (SAPDB_Int8)(resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 )));
404
    return ( expectedValue == (*pOldValue) );
404
    return ( expectedValue == (*pOldValue) );
Lines 450-456 SAPDB_Bool RTESys_CmpxchgUInt8( SAPDB_UI Link Here
450
		  "m"(resultHigh),
450
		  "m"(resultHigh),
451
		  "m"(resultLow),
451
		  "m"(resultLow),
452
		  "m"(resultHigh)
452
		  "m"(resultHigh)
453
		: "eax", "ebx", "ecx", "edx", "memory"
453
		: "eax", "ecx", "edx", "memory"
454
	);
454
	);
455
    *pOldValue = resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 ));
455
    *pOldValue = resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 ));
456
#endif
456
#endif

Return to bug 42465