Clone
 

sandhya sundaresan <sandhya@apache.org> in Trafodion

Merge 1784 [TRAFODION-3268] [TRAFODION-3269] [TRAFODION-3269] Library manager fixes and LOB alter fix

Fix buffer overrun issue

    • -1
    • +2
    /core/sql/optimizer/UdfDllInteraction.cpp
LOB alter fix #2

Library manager fixes and LOB alter fix

    • -3
    • +1
    /core/sql/optimizer/UdfDllInteraction.cpp
    • -45
    • +59
    /core/sql/regress/executor/EXPECTED130
    • -1
    • +1
    /core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
Merge remote branch 'origin/master' into traf_remove_loblock

Conflicts:

core/sql/exp/ExpLOBinterface.cpp

Chages to disable LOB locking and refactor IUD operations

    • -232
    • +280
    /core/sql/exp/ExpLOBaccess.cpp
    • -37
    • +125
    /core/sql/exp/ExpLOBinterface.cpp
Merge remote branch 'origin/pr/1754/head' into merge_1754

Remove code that empties the LOB data file when creating an empty_blob.

    • -65
    • +82
    /core/sql/regress/executor/EXPECTED130
Merge remote branch 'origin/pr/1740/head' into merge_1740

Fixes for regression tests and expected files

    • -1
    • +1
    /core/sql/optimizer/UdfDllInteraction.cpp
    • -10
    • +10
    /core/sql/regress/compGeneral/EXPECTED072
    • -63
    • +45
    /core/sql/regress/executor/EXPECTED130
    • -0
    • +173
    /core/sql/regress/privs2/EXPECTED143
Merge remote branch 'origin/pr/1721/head' into merge_1721

    • -0
    • +5
    /core/sqf/sql/scripts/install_local_hadoop
    • -23
    • +126
    /core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
iChanges based on review comments

    • -2
    • +8
    /core/sql/optimizer/UdfDllInteraction.cpp
    • -2
    • +1
    /core/sql/sqlcomp/CmpDDLCatErrorCodes.h
    • -5
    • +0
    /core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
Fix issue with init sql ordering

    • -11
    • +6
    /core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
Fixees to support stroring Udr libraries s Blobs.

    • -0
    • +5
    /core/sqf/sql/scripts/install_local_hadoop
    • -0
    • +39
    /core/sql/executor/ExExeUtilLoad.cpp
  1. … 31 more files in changeset.
Merge remote branch 'origin/pr/1712/head' into merge_1712

Follow on to TRAFODION-3192 that caused one regression failure on Jenkins alone since the queue resizing caused the executor/TEST106 that tests cancel to not work as expected. The upsert subtest was running too fast to get cancelled. So added some CQds to use smaller queue sizes and override dynamic queue resizing.Now it runs long enough to get canceled and give expected results.

    • -217
    • +234
    /core/sql/regress/executor/EXPECTED106
Merge remote branch 'origin/pr/1708/head' into merge_1708

    • -12
    • +12
    /core/sql/sqlcomp/nadefaults.cpp
known diff for AQR issue with hive timestamp mismatch.

    • -0
    • +5
    /core/sql/regress/hive/DIFF005.KNOWN
Regression expected file fix

    • -10
    • +10
    /core/sql/regress/executor/EXPECTED015.SB
Fix to remove minmax unused methods.

Changes to update queue sizes and add dynamic queue resizing to some missing operators. (cherry picked from commit f26c0f448a6adf5cdefddc74c4ba840b030e8cf5)

Conflicts:

core/sql/generator/Generator.cpp

core/sql/generator/Generator.h

core/sql/sqlcomp/nadefaults.cpp

    • -18
    • +20
    /core/sql/executor/ExSequence.cpp
    • -21
    • +18
    /core/sql/executor/ExTranspose.cpp
    • -12
    • +14
    /core/sql/optimizer/Inlining.cpp
    • -12
    • +12
    /core/sql/sqlcomp/nadefaults.cpp
Merge remote branch 'origin/pr/1611/head' into merge_1611

Merge remote branch 'origin/pr/1573/head' into merge_1573

Merge remote branch 'origin/pr/1607/head' into merge_1607

Merge remote branch 'origin/master' into traf_misc

    • -0
    • +24
    /core/sql/sqlcomp/DefaultConstants.h
Merge remote branch 'origin/pr/1588/head' into merge_1588

Merge remote branch 'origin/pr/1566/head' into merge_1566

Merge remote branch 'origin/pr/1586/head' into merge_1586