trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [2/3] incubator-trafodion git commit: Merge remote branch 'origin/master' into lob_get_trace
Date Mon, 02 May 2016 15:28:48 GMT
Merge remote branch 'origin/master' into lob_get_trace

Conflicts:
	core/sql/sqlcomp/CmpSeabaseDDLschema.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/48875d0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/48875d0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/48875d0c

Branch: refs/heads/master
Commit: 48875d0cc931f0a73e02cbf271a6e7023ebb2bf7
Parents: 2ce2d0d 64a68cf
Author: Sandhya Sundaresan <sandhya@apache.org>
Authored: Fri Apr 29 16:42:13 2016 +0000
Committer: Sandhya Sundaresan <sandhya@apache.org>
Committed: Fri Apr 29 16:42:13 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |   2 +
 NOTICE                                          |   2 +-
 README                                          |   2 +-
 core/conn/jdbc_type2/native/SqlInterface.cpp    |   5 -
 .../src/org/trafodion/jdbc/t4/BaseRow.java      |  65 --
 .../src/org/trafodion/jdbc/t4/InsertRow.java    |  82 ---
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |  30 +-
 .../src/org/trafodion/jdbc/t4/ObjectArray.java  |  86 +++
 .../src/org/trafodion/jdbc/t4/Row.java          | 233 --------
 .../src/org/trafodion/jdbc/t4/SecPwd.java       |   9 -
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |  26 +-
 .../jdbc/t4/TrafT4PreparedStatement.java        |   2 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  | 435 +++-----------
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   2 +-
 core/conn/odb/odb.sln                           |  28 +
 core/conn/odb/odb/odb.vcxproj                   | 165 ++++++
 core/conn/odb/odb/odb.vcxproj.filters           |  36 ++
 core/conn/odb/odb/odb.vcxproj.user              |   4 +
 core/conn/odb/src/memcpy_wrapper.c              |   2 +
 core/conn/odb/src/odb.c                         |   1 +
 core/conn/odb/src/verslib.h                     |   3 +
 core/conn/odb/src/versodb.c                     |   2 +
 .../java/org/trafodion/rest/ServerResource.java |   2 +-
 core/sqf/conf/install_features                  |   1 +
 core/sqf/sqenvcom.sh                            |  27 +-
 core/sqf/sql/scripts/get_libhdfs_files          |   6 +-
 core/sqf/sql/scripts/ilh_cleanhb                |  31 +-
 core/sqf/sql/scripts/install_local_hadoop       |   8 +-
 core/sqf/sql/scripts/sqnodestatus               |   4 +-
 core/sqf/src/seatrans/.gitignore                |   3 +
 .../hbase/client/ClientScanner98.java.tmpl      | 490 +++++++++++++++
 .../client/TrafParallelClientScanner.java.tmpl  | 325 ++++++++++
 .../hbase/client/transactional/RMInterface.java |   4 +-
 .../transactional/SsccTransactionalTable.java   |   8 +-
 .../transactional/TransactionManager.java       |  85 +--
 .../transactional/TransactionalTable.java       |   8 +-
 .../transactional/TransactionalTableClient.java |   3 +-
 .../regionserver/transactional/IdTmId.java      |  10 -
 core/sql/arkcmp/CmpContext.cpp                  |   4 +
 core/sql/arkcmp/CmpContext.h                    |   1 +
 core/sql/arkcmp/NATableSt.cpp                   |  30 +-
 core/sql/bin/SqlciErrors.txt                    |   4 +-
 core/sql/cli/CliExtern.cpp                      |   2 +-
 core/sql/cli/Context.cpp                        |   8 +-
 core/sql/cli/SQLCLIdev.h                        |   7 -
 core/sql/cli/Statement.cpp                      |   7 +-
 core/sql/cli/sqlcli.h                           |   6 +
 core/sql/comexe/ComTdbHbaseAccess.h             |   4 +
 core/sql/common/CharType.cpp                    |  19 +-
 core/sql/common/CharType.h                      |   5 +-
 core/sql/common/ComResWords.cpp                 |   1 -
 core/sql/common/arkcmp_proc.cpp                 |  24 +-
 core/sql/executor/ExExeUtil.h                   |   4 +-
 core/sql/executor/ExExeUtilVolTab.cpp           |  26 +-
 core/sql/executor/ExHbaseIUD.cpp                |   6 +-
 core/sql/executor/ExHbaseSelect.cpp             |   3 +
 core/sql/executor/ExHdfsScan.cpp                |  12 +-
 core/sql/executor/HBaseClient_JNI.cpp           |   5 +-
 core/sql/executor/HBaseClient_JNI.h             |   1 +
 core/sql/executor/ex_transaction.cpp            |   7 +-
 core/sql/exp/ExpErrorEnums.h                    |   1 +
 core/sql/exp/ExpHbaseInterface.cpp              |   4 +-
 core/sql/exp/ExpHbaseInterface.h                |   2 +
 core/sql/exp/exp_clause.cpp                     |  12 +
 core/sql/exp/exp_datetime.cpp                   |  28 +-
 core/sql/exp/exp_datetime.h                     |   3 +-
 core/sql/exp/exp_eval.cpp                       |   2 +-
 core/sql/exp/exp_function.h                     |   2 +
 core/sql/generator/GenExplain.cpp               |   7 +
 core/sql/generator/GenPreCode.cpp               |   5 +
 core/sql/generator/GenRelDCL.cpp                |   4 +
 core/sql/generator/GenRelScan.cpp               |  76 ++-
 core/sql/generator/Generator.cpp                |   3 +
 core/sql/generator/Generator.h                  |   2 +-
 .../java/org/trafodion/libmgmt/FileMgmt.java    |   1 +
 core/sql/nskgmake/Makerules.mk                  |   6 +-
 core/sql/optimizer/BindItemExpr.cpp             |   6 +-
 core/sql/optimizer/NATable.cpp                  |  23 +-
 core/sql/optimizer/NATable.h                    |   4 +
 core/sql/optimizer/RelScan.h                    |   5 +-
 core/sql/optimizer/SchemaDB.cpp                 |   4 +
 core/sql/parser/ParKeyWords.cpp                 |   1 -
 core/sql/regress/compGeneral/TEST004            |   6 +-
 core/sql/regress/core/EXPECTED005.SB            |   8 +-
 core/sql/regress/core/EXPECTED037.SB            |   9 +-
 core/sql/regress/core/FILTER116                 |   1 +
 core/sql/regress/core/TEST005                   |   2 +-
 core/sql/regress/executor/EXPECTED013.SB        |   1 -
 core/sql/regress/executor/EXPECTED140           | 440 +++++++++++++-
 core/sql/regress/executor/TEST140               |  28 +-
 core/sql/regress/fullstack2/EXPECTED062         |   3 -
 core/sql/regress/fullstack2/EXPECTED062.RELEASE |   3 -
 core/sql/regress/hive/EXPECTED009               |   2 +-
 core/sql/regress/hive/TEST009                   |   2 +-
 core/sql/regress/seabase/EXPECTED010            | 460 ++++++--------
 core/sql/regress/seabase/EXPECTED011            |   1 -
 core/sql/regress/seabase/EXPECTED016            |   7 -
 core/sql/regress/seabase/EXPECTED030            |  18 +-
 core/sql/regress/seabase/TEST030                |   2 +
 core/sql/regress/tools/sbdefs                   |   2 +-
 core/sql/sqlci/SqlciEnv.cpp                     |   8 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   4 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        | 111 +++-
 core/sql/sqlcomp/DefaultConstants.h             |   5 +
 core/sql/sqlcomp/nadefaults.cpp                 |  25 +-
 .../java/org/trafodion/sql/HTableClient.java    |   7 +-
 dcs/src/assembly/all.xml                        |   1 +
 docs/src/site/markdown/index.md                 |   2 +-
 docs/src/site/resources/css/site.css            |   5 +
 docs/src/site/site.xml                          |   6 +-
 install/Makefile                                |   2 +-
 install/installer/acceptKeys                    |  61 ++
 install/installer/traf_add_sudoAccess           |  10 +-
 install/installer/traf_apache_mods              | 247 ++++++++
 install/installer/traf_cloudera_mods            | 397 +++++++++++++
 install/installer/traf_cloudera_mods98          | 418 -------------
 install/installer/traf_config_check             |  92 ++-
 install/installer/traf_config_setup             | 307 ++++++++--
 install/installer/traf_getHadoopNodes           |   1 -
 install/installer/traf_getMultiHadoopNodes      | 145 +++++
 install/installer/traf_hortonworks_mods         | 572 ++++++++++++++++++
 install/installer/traf_hortonworks_mods98       | 592 -------------------
 install/installer/traf_package_setup            |   2 +-
 install/installer/trafodion_install             |  35 +-
 .../odbcclient/DSNConverter/DSNConverter.def    |   2 +-
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc    |   2 +-
 .../TranslationDll/TranslationDll.def           |   2 +-
 .../odbcclient/TranslationDll/TranslationDll.rc |   2 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC |   2 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC |   2 +-
 win-odbc64/odbcclient/drvr35/drvr35.rc          |   2 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc    |   2 +-
 win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc     |   2 +-
 133 files changed, 4253 insertions(+), 2439 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48875d0c/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48875d0c/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
index d981e3a,c103714..56f6e11
--- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
@@@ -633,10 -632,8 +632,11 @@@ void CmpSeabaseDDL::dropSeabaseSchema(S
         cliRC = cliInterface.executeImmediate(buf);
         if (cliRC < 0 && cliRC != -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
           {
+            appendErrorObjName(errorObjs, objName);
 -           someObjectsCouldNotBeDropped = true;
 +           if (dropSchemaNode->ddlXns())
 +             goto label_error;
 +           else
 +             someObjectsCouldNotBeDropped = true;
           }
     } 
  
@@@ -660,10 -657,8 +660,12 @@@
  
           if (cliRC < 0 && cliRC != -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
             {
+              appendErrorObjName(errorObjs, objName);
 -             someObjectsCouldNotBeDropped = true;
 +             if (dropSchemaNode->ddlXns())
 +               goto label_error;
 +             else
 +               someObjectsCouldNotBeDropped = true;
++
             }
        }
     }
@@@ -691,10 -686,8 +693,11 @@@
  				(char*)schName.data(),(char*)objName.data(),
  				isVolatile, FALSE,dropSchemaNode->ddlXns()))
                   {
+                    appendErrorObjName(errorObjs, objName.data());
 -                   someObjectsCouldNotBeDropped = true;
 +                   if (dropSchemaNode->ddlXns())
 +                     goto label_error;
 +                   else
 +                     someObjectsCouldNotBeDropped = true;
                   }
  	     }
  	 } 
@@@ -726,10 -719,8 +729,11 @@@
  				(char*)schName.data(),(char*)objName.data(),
  				isVolatile,TRUE, dropSchemaNode->ddlXns()))
                   {
+                    appendErrorObjName(errorObjs, objName.data());
 -                   someObjectsCouldNotBeDropped = true;
 +                   if (dropSchemaNode->ddlXns())
 +                     goto label_error;
 +                   else
 +                     someObjectsCouldNotBeDropped = true;
                   }
  	     }
  	 } 
@@@ -770,11 -761,9 +774,13 @@@
           cliRC = cliInterface.executeImmediate(buf);
  
           if (cliRC < 0 && cliRC != -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
 -           {
 +           { 
+              appendErrorObjName(errorObjs, objName);
 -             someObjectsCouldNotBeDropped = true;
 +             if (dropSchemaNode->ddlXns())
 +               goto label_error;
 +             else
 +               someObjectsCouldNotBeDropped = true;
++
             }
        }  
     }  
@@@ -816,10 -805,8 +822,12 @@@
  
           if (cliRC < 0 && cliRC != -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
             {
+              appendErrorObjName(errorObjs, objName);
 -             someObjectsCouldNotBeDropped = true;
 +             if (dropSchemaNode->ddlXns())
 +               goto label_error;
 +             else
 +               someObjectsCouldNotBeDropped = true;
++
             }
        }  
     }  
@@@ -838,10 -825,8 +846,12 @@@
                          (char*)schName.data(),(char*)objName.data(),
                          isVolatile, FALSE, dropSchemaNode->ddlXns()))
           {
+            appendErrorObjName(errorObjs, objName.data());
 -           someObjectsCouldNotBeDropped = true;
++
 +           if (dropSchemaNode->ddlXns())
 +             goto label_error;
 +           else
 +             someObjectsCouldNotBeDropped = true;
           }
       }
     }


Mime
View raw message