You are viewing a plain text version of this content. The canonical link for it is here.
Posted to codereview@trafodion.apache.org by traflm <gi...@git.apache.org> on 2018/03/27 23:59:24 UTC

[GitHub] trafodion pull request #1500: [TRAFODION-3014] merge R2.2 changes into mainb...

GitHub user traflm opened a pull request:

    https://github.com/apache/trafodion/pull/1500

    [TRAFODION-3014] merge R2.2 changes into mainbranch

    This is an effort to merge R2.2 branch into main branch.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/traflm/trafodion TRAFODION-3014

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/trafodion/pull/1500.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1500
    
----
commit ef73b7719c746bc721587f2b4b4a032d71d03c65
Author: liu.yu <yu...@...>
Date:   2017-08-15T04:12:48Z

    cherry-pick altercolumn

commit a465ec83025a8a3664a1b0f9a28c86021287952a
Author: liu.yu <yu...@...>
Date:   2017-08-15T03:22:21Z

    Capitalize XML

commit 08b41edb08d313ed524e64392271d17c38ee9b19
Author: liu.yu <yu...@...>
Date:   2017-08-14T03:56:00Z

    cherry pick add alter column 2

commit fb007c00469a36b37e58d1821581fdbe38527626
Author: liu.yu <yu...@...>
Date:   2017-08-13T08:06:25Z

    cherry-pick Load XML Files

commit 89576f3dc7f5e37977ec3cdd9f0fd5ecadee0d36
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-08-22T17:38:42Z

    Changes to take care of closing internal cursor statement when extract operation is done and the exact length of data is passed in to be extracted.

commit 8a260f425e0527100c8039b8db8a8b4db64b1101
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-08-22T17:41:39Z

    Expected file change to show result of unload.

commit 2048d253ca0ec8e01bf9f8b2c959a67f82da530a
Author: Liu Ming <ov...@...>
Date:   2017-08-24T03:09:27Z

    Merge Fix for Cherry-pick changes of [TRAFODION-2703] & [TRAFODION-2710] to 2.2

commit f18644841f8d3c8aaa5c594c1018798d515821b0
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-08-31T20:03:05Z

    Main change:
    
    Added a method for JDBC driver to be able to close an open cursor abruptly by passing in a 0 length to the extract syntax. This will ensure internal opens are not left around if the application does not retrieve all the data with the stream API.
    This abrupt close can be called when the result set is closed or the connection is closed by keeping track of all the open Blob objects. (in the driver)
    Added a freeResources method and destructor to LobExtract and LobUpdate Tcbs.
    Minor changes and fixes :
    Refactored the ExLob::closeCursor
    Removed the LOB_CLI_SELECT_CLOSE call from ::fetchCursor so it gets closed only when ExLob::closeCursor is called. Makes the code consistent and readable.
    Took care of a few  memory allocations and deletions.
    Refactored the LOB length calculation into on ecommon method  so it works correctly for both regular LOB dat aas well as external LOB files. Earlier the external lobs length was being returned incorrectly. Now it reports the length of the external HDFS file .
    Fixed one place in generator where the CQD value was not being multiplied by the MB units correctly.

commit 615b8dd26d38e19ba17cf9451453bc38e8879dcc
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-09-04T06:58:05Z

    Merge remote branch 'origin/pr/1216/head' into merge_1216

commit e8c09ebb678ab6560130bf687dc1e52c9b04d64a
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-09-11T17:57:02Z

    Changes to handle errors during drop of lob tables that leave the table inconsistent.
    (cherry picked from commit 749295ad774620d49db79d961b1bbacac8d589c7)

commit 42b2b0b4a56e9b125d15eaa227976d11dcec1b3c
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-09-12T17:51:49Z

    Merge remote branch 'origin/pr/1230/head' into merge_1230

commit 808c87450f343e6df3dcc82e0799919581958513
Author: Weiqing Xu <we...@...>
Date:   2017-09-20T05:49:28Z

    [TRAFODION-2704]close unused statment in JDBC regression

commit bd792ff7ef0a81c6b0106ce1d2aaeb3ff34d9701
Author: Weiqing Xu <we...@...>
Date:   2017-09-20T05:57:26Z

    [TRAFODION-2740]JDBC extract LOB context in chunks

commit ea80ab383da807fe4fd61d9a9193c08ad2c79283
Author: Weiqing Xu <we...@...>
Date:   2017-09-22T16:44:40Z

    [TRAFODION-2740]remove unused code

commit 835a48945afe3cc19ec58ac94e22b323db69d5cf
Author: Weiqing Xu <we...@...>
Date:   2017-09-23T17:47:33Z

    [TRAFODION-2740]add property to set the LOB chunk size

commit 1ade4208f1e3551fa4ce2c7cbfda29a4c8c68b15
Author: Weiqing Xu <we...@...>
Date:   2017-09-23T17:48:39Z

    [TRAFODION-2704]reslove the random schema not exist issue

commit e26ec04a7815cb46f3d10d9816398c10ad13df67
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-09-25T04:32:50Z

    Merge remote branch 'origin/pr/1240/head' into merge_1240

commit de664c37a95f89573ccc4466357d5ebf94df22a5
Author: Weiqing Xu <we...@...>
Date:   2017-09-25T05:47:56Z

    [TRAFODION-2753]LOB: filetolob() no longer works in trafci

commit 3254cc16b259a6a513cabc391699f44f29850cf1
Author: Sandhya Sundaresan <sa...@...>
Date:   2017-09-26T05:31:16Z

    Merge remote branch 'origin/pr/1242/head' into merge_1242

commit f077620ae434bfdc115a599a591bec1f5eb7bff6
Author: Steve Varnau <st...@...>
Date:   2017-12-22T19:23:57Z

    [TRAFODION-2857] Web-site changes to remove incubating status
    
    Project status and URL changes.
    Email lists and git repo name changes still to come based on infra changes.

commit 6047c512707f72fd32f4b6e7e91bd3834c272b10
Author: Steve Varnau <st...@...>
Date:   2017-12-29T19:03:25Z

    [TRAFODION-2857] Adding repo and email address name changes.

commit 6429a0c2839dd22eefbd6ed368236492e8f730fc
Author: Steve Varnau <st...@...>
Date:   2018-01-04T20:07:47Z

    [TRAFODION-2861][TRAFODION-2869] Remove incubating from release packaging
    
    Remove disclaimer file and incubating string from packaging file names.

commit 5be0d2e5eacc4a48aeb5b407e5eacf76f5b10ec2
Author: Liu Ming <ov...@...>
Date:   2018-01-14T02:43:21Z

    [TRAFODION-2861] Backport to release2.2 branch

commit 2a6282c16989ab5cb6d2806b568989e3f567398c
Author: Eason <hf...@...>
Date:   2018-01-30T08:00:29Z

    pyinstaller fix - kerberos related issues while executing hdfs commands

commit 69ae1b14ac19d057a2bdc98a061154a254c5c7cd
Author: Liu Ming <ov...@...>
Date:   2018-02-01T07:22:13Z

    [TRAFODION-2942] license year should be updated

commit 0d68dfe4ecd26d40d4b96345d42329d6e57ef83e
Author: Liu Ming <ov...@...>
Date:   2018-02-02T10:52:36Z

    [Trafodion 2942] Update year in license text

commit 875cb17004fd29ad5534fc50925f1c40e666a31d
Author: Sandhya Sundaresan <sa...@...>
Date:   2018-02-03T03:22:58Z

    Merge remote branch 'origin/pr/1422/head' into merge_1422

commit a369f0c82299ff9feb59be59367c2da986d861bb
Author: venkat1m <ve...@...>
Date:   2018-02-16T02:35:33Z

    Enable LDAP authentication flag at install time

commit b46010674a0321110f47062702b4a88559c4b215
Author: Dave Birdsall <db...@...>
Date:   2018-02-16T20:03:47Z

    Merge [TRAFODION-2962] PR 1448 Enable LDAP auth flag at install time

commit c75c6bfa45fb2c8f2d2e7406522f83aef20ee786
Author: Liu Ming <ov...@...>
Date:   2018-03-27T23:56:23Z

    Merge remote branch 'origin/release2.2' into TRAFODION-3014
    
    Conflicts:
    	core/sql/cli/Cli.cpp
    	core/sql/clitest/blobtest.cpp
    	core/sql/executor/ExExeUtilLoad.cpp
    	core/sql/exp/ExpLOBaccess.cpp
    	core/sql/exp/ExpLOBaccess.h
    	core/sql/exp/ExpLOBenums.h
    	core/sql/exp/ExpLOBinterface.cpp
    	core/sql/exp/ExpLOBinterface.h
    	core/sql/generator/GenRelExeUtil.cpp
    	core/sql/regress/executor/EXPECTED130
    	core/sql/regress/hive/EXPECTED018
    	docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
    	install/python-installer/scripts/traf_ldap.py
    	pom.xml

----


---

[GitHub] trafodion pull request #1500: [TRAFODION-3014] merge R2.2 changes into mainb...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/trafodion/pull/1500


---