You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/10/15 22:07:26 UTC
[7/9] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into rh7_build_issues
Merge branch 'master' of git://git.apache.org/incubator-trafodion into rh7_build_issues
Conflicts:
core/sql/cli/Cli.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a78ffdea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a78ffdea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a78ffdea
Branch: refs/heads/master
Commit: a78ffdea4a6623cbae6c4cbadea4587ba9c9f472
Parents: 4ecccfc 3fb2f9e
Author: selvaganesang <se...@esgyn.com>
Authored: Fri Oct 13 00:45:46 2017 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Fri Oct 13 00:45:46 2017 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/Debug.cpp | 64 +--
core/sql/bin/SqlEsp_templ.cpp | 85 ----
core/sql/bin/Sqlci_templ.cpp | 132 ------
core/sql/bin/arkcmp.cpp | 3 -
core/sql/bin/ex_esp_main.cpp | 7 -
core/sql/cli/Cli.cpp | 48 ++-
core/sql/cli/sqlcli.h | 3 -
core/sql/common/Ipc.cpp | 70 +---
core/sql/common/Ipc.h | 15 -
core/sql/common/IpcGuardian.cpp | 3 -
core/sql/common/NAIpc.cpp | 2 -
core/sql/common/Platform.h | 229 ++---------
core/sql/common/arkcmp_proc.cpp | 3 -
core/sql/common/charinfo.cpp | 11 +-
core/sql/common/ipcmsg.cpp | 3 -
core/sql/common/str.cpp | 12 +-
core/sql/executor/BufferList.cpp | 18 +-
core/sql/executor/ExDupSqlBuffer.cpp | 13 -
core/sql/executor/ExFastTransport.cpp | 20 +-
core/sql/executor/SwapSpace.cpp | 12 -
core/sql/executor/ex_exe_stmt_globals.cpp | 8 -
core/sql/executor/ex_frag_rt.cpp | 3 -
core/sql/executor/ex_mj.cpp | 35 --
core/sql/nskgmake/arkcmp/Makefile | 3 +-
core/sql/nskgmake/arkcmp_dll/Makefile | 5 +-
core/sql/parser/sqlparser.y | 20 +-
core/sql/parser/ulexer.h | 5 -
core/sql/regress/seabase/DIFF031.KNOWN | 6 -
core/sql/sqlci/sqlci_lex.ll | 8 -
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 5 +-
core/sql/udrserv/UdrStreams.cpp | 2 -
core/sql/ustat/hs_globals.cpp | 34 +-
core/sql/ustat/hs_globals.h | 6 +
.../lob_guide/src/asciidoc/_chapters/about.adoc | 2 +-
.../asciidoc/_chapters/working_with_lob.adoc | 407 ++++++++++++++++++-
docs/lob_guide/src/asciidoc/index.adoc | 2 +-
docs/odb_user/src/asciidoc/_chapters/load.adoc | 76 ++--
37 files changed, 628 insertions(+), 752 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --cc core/sql/cli/Cli.cpp
index c2010d1,5ecb5ed..3f88eac
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@@ -9732,7 -9717,28 +9717,28 @@@ Lng32 SQLCLI_LOBddlInterfac
}
} // for
-
+ //If all the descriptor tables got dropped correctly, drop the hdfs
+ //lob data files. Note that if there is an error in the drop of the
+ //descriptor tables above , the transaction will restore each of the
+ //above tables .
+ for (Lng32 i = 0; i < numLOBs; i++)
+ {
+ Lng32 rc = ExpLOBoper::dropLOB
- (NULL, currContext.exHeap(),(void *)&currContext,
++ (NULL, currContext.exHeap(),&currContext,
+ lobLocList[i],hdfsPort,hdfsServer,
+ objectUID, lobNumList[i]);
+ // Ignore 'not found' error from hdfs file deletes until this is made transactional just like Hbase tables are.
+ if (rc && (rc != -LOB_DATA_FILE_DELETE_ERROR))
+ {
+ cliRC = -1;
+ ComDiagsArea * da = &diags;
+ ExRaiseSqlError(currContext.exHeap(), &da,
+ (ExeErrorCode)(8442), NULL, &cliRC ,
+ &rc, NULL, (char*)"ExpLOBInterfaceDrop ",
+ getLobErrStr(rc));
+ goto error_return;
+ }
+ }//for
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a78ffdea/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------