You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/02 17:57:35 UTC
[01/25] incubator-trafodion git commit: Merge pull request #1 from
apache/master
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 94ac0f6f1 -> 70dd60219
Merge pull request #1 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/12d7342b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/12d7342b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/12d7342b
Branch: refs/heads/master
Commit: 12d7342bb3d63991d31933139f5b3fee216ab8b7
Parents: 810003e 52afc68
Author: mashengchen <ma...@gmail.com>
Authored: Mon Dec 14 14:16:25 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Dec 14 14:16:25 2015 +0800
----------------------------------------------------------------------
.gitattributes | 14 +
.rat-excludes | 116 +-
LICENSE.txt | 178 +-
NOTICE.txt | 1 +
RAT_README.txt | 102 +-
README.txt | 33 +-
core/Makefile | 4 +-
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 3 -
core/conn/security_dll/LICENSE | 127 -
core/conn/trafci/.gitignore | 1 +
core/conn/trafci/build.xml | 9 +-
core/conn/trafci/utils/trafci.sh | 185 -
core/conn/trafci/utils/trafci.sh-tmpl | 187 +
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 -
.../unixcli/package/trafodbclnx_install.sh | 2 +-
core/sqf/build-scripts/genverhdr.ksh | 3 +-
core/sqf/conf/log4j.dtm.config | 22 -
core/sqf/conf/log4j.hdfs.config | 22 -
core/sqf/conf/trafodion.udr.config | 22 -
core/sqf/export/lib/Vili/Functions.pm | 725 ---
core/sqf/export/lib/Vili/Helper.pm | 674 --
core/sqf/export/lib/Vili/NoDriftTimer.pm | 98 -
core/sqf/sqenvcom.sh | 2 +-
core/sqf/sql/scripts/install_local_drill | 114 +
core/sqf/sql/scripts/install_local_hadoop | 41 +-
core/sqf/sql/scripts/sqnodes.pm | 74 +-
core/sqf/sqvers | 29 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 4 +
.../client/transactional/BatchException.java | 21 -
.../CommitUnsuccessfulException.java | 19 -
.../HBaseBackedTransactionLogger.java | 10 -
.../client/transactional/JtaXAResource.java | 10 -
.../transactional/LocalTransactionLogger.java | 19 -
.../transactional/MemoryUsageException.java | 20 -
.../OutOfOrderProtocolException.java | 20 -
.../hbase/client/transactional/RMInterface.java | 20 -
.../transactional/SsccTransactionalScanner.java | 20 -
.../transactional/SsccTransactionalTable.java | 20 -
.../SsccUpdateConflictException.java | 20 -
.../hbase/client/transactional/TmDDL.java | 20 -
.../client/transactional/TransReturnCode.java | 20 -
.../hbase/client/transactional/TransState.java | 20 -
.../client/transactional/TransactionLogger.java | 19 -
.../transactional/TransactionManager.java | 333 +-
.../client/transactional/TransactionMap.java | 22 +-
.../TransactionRegionLocation.java | 20 -
.../client/transactional/TransactionState.java | 20 -
.../TransactionalAggregationClient.java | 19 -
.../transactional/TransactionalScanner.java | 20 -
.../transactional/TransactionalTable.java | 20 -
.../transactional/TransactionalTableClient.java | 20 -
.../UnknownTransactionException.java | 19 -
.../transactional/UnsuccessfulDDLException.java | 20 -
.../transactional/SsccRegionEndpoint.java | 21 -
.../transactional/SsccTableClient.java | 21 -
.../transactional/SsccTableClientUtils.java | 18 -
.../transactional/TrxRegionEndpoint.java | 386 +-
.../transactional/TrxRegionObserver.java | 22 -
.../transactional/TrxTableClient.java | 18 -
.../transactional/TrxTableClient2.java | 18 -
.../transactional/TrxTableClient3.java | 18 -
.../transactional/TrxTableClient4.java | 18 -
.../generated/SsccRegionProtos.java | 131 +-
.../generated/TrxRegionProtos.java | 1020 ++-
.../CleanOldTransactionsChore.java | 10 -
.../hbase/regionserver/transactional/IdTm.java | 10 -
.../regionserver/transactional/IdTmCb.java | 10 -
.../transactional/IdTmException.java | 10 -
.../transactional/KeyValueListScanner.java | 11 -
.../transactional/MemoryUsageChore.java | 10 -
.../transactional/SsccTransactionState.java | 21 -
.../transactional/TransactionState.java | 21 -
.../transactional/TransactionalRegion.java | 10 -
.../TransactionalRegionScannerHolder.java | 10 -
.../transactional/TrxTransactionState.java | 14 +-
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 11 +-
core/sqf/src/tm/tools/dtmci.cpp | 34 +-
core/sqf/tools/sqtools.sh | 4 +-
core/sql/arkcmp/CmpContext.cpp | 18 +-
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/comexe/ComTdb.h | 2 +-
core/sql/comexe/ComTdbExeUtil.cpp | 27 +
core/sql/comexe/ComTdbExeUtil.h | 119 +
core/sql/common/ExprNode.cpp | 1 +
core/sql/common/OperTypeEnum.h | 24 +-
core/sql/common/from_GB2312.c | 134 +-
core/sql/common/swscanf.cpp | 55 +-
core/sql/common/swsprintf.cpp | 63 +-
core/sql/executor/ExComTdb.cpp | 7 +
core/sql/executor/ExExeUtil.h | 167 +
core/sql/executor/ExExeUtilCommon.cpp | 7 +-
core/sql/executor/ExExeUtilGet.cpp | 826 ++-
core/sql/executor/ExHdfsScan.cpp | 4 +-
core/sql/executor/ExStats.cpp | 16 +-
core/sql/executor/ExStats.h | 4 +-
core/sql/executor/HBaseClient_JNI.cpp | 118 +-
core/sql/executor/HBaseClient_JNI.h | 2 +
core/sql/executor/ex_split_bottom.cpp | 11 +
core/sql/exp/ExpHbaseInterface.cpp | 16 +
core/sql/exp/ExpHbaseInterface.h | 3 +
core/sql/generator/GenRelExeUtil.cpp | 119 +
core/sql/optimizer/BindRelExpr.cpp | 5 +
core/sql/optimizer/ColStatDesc.h | 2 +-
core/sql/optimizer/GroupAttr.cpp | 179 +
core/sql/optimizer/GroupAttr.h | 4 +
core/sql/optimizer/ImplRule.cpp | 16 +-
core/sql/optimizer/ItemConstr.h | 39 +
core/sql/optimizer/ItemExpr.cpp | 36 +-
core/sql/optimizer/ItemExpr.h | 4 +-
core/sql/optimizer/OptPhysRelExpr.cpp | 3 +-
core/sql/optimizer/PhyProp.cpp | 2 +-
core/sql/optimizer/RelExeUtil.cpp | 128 +-
core/sql/optimizer/RelExeUtil.h | 60 +
core/sql/optimizer/RelRoutine.cpp | 55 +-
core/sql/optimizer/ScanOptimizer.cpp | 165 +-
core/sql/optimizer/UdfDllInteraction.cpp | 10 +-
core/sql/optimizer/ValueDesc.cpp | 194 +-
core/sql/optimizer/ValueDesc.h | 14 +-
core/sql/parser/ParKeyWords.cpp | 4 +-
core/sql/parser/sqlparser.y | 112 +-
core/sql/parser/ulexer.h | 39 +-
core/sql/pom.xml | 5 +
core/sql/regress/catman1/EXPECTED135 | 2 +
core/sql/regress/compGeneral/EXPECTED071 | 47 +
core/sql/regress/compGeneral/TEST062 | 1 +
core/sql/regress/compGeneral/TEST071 | 22 +
core/sql/regress/executor/EXPECTED130 | 28 +-
core/sql/regress/executor/TEST016 | 5 +
core/sql/regress/executor/TEST130 | 7 +-
core/sql/regress/hive/EXPECTED005 | 3 +
core/sql/regress/hive/EXPECTED006 | 3 +
core/sql/regress/hive/EXPECTED020 | 5 +-
core/sql/regress/hive/TEST005 | 1 +
core/sql/regress/hive/TEST006 | 1 +
core/sql/regress/hive/TEST018 | 1 +
core/sql/regress/hive/TEST020 | 1 +
core/sql/regress/newregr/card/runregr_card.ksh | 7 -
.../regress/newregr/mvs/BIG/expectedmv215_RU | 480 --
core/sql/regress/newregr/mvs/EXPECTEDMV500 | 4708 --------------
core/sql/regress/newregr/mvs/EXPECTEDMV500A | 5179 ----------------
.../regress/newregr/mvs/EXPECTEDMV500A.LINUX | 5789 ------------------
.../sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT | 83 -
core/sql/regress/seabase/EXPECTED002 | 677 ++
core/sql/regress/seabase/EXPECTED010 | 86 +-
core/sql/regress/seabase/EXPECTED021 | 26 +-
core/sql/regress/seabase/FILTER002 | 31 +
core/sql/regress/seabase/TEST002 | 144 +
core/sql/regress/seabase/TEST010 | 4 +
core/sql/regress/seabase/TEST014 | 1 +
core/sql/regress/tools/regress-filter | 5 -
core/sql/regress/tools/regress-filter-linux | 5 -
core/sql/regress/tools/runregr_udr.ksh | 7 +
core/sql/regress/udr/EXPECTED002 | 48 +-
core/sql/regress/udr/EXPECTED100.SB | 4 +-
core/sql/regress/udr/TEST002 | 18 +
core/sql/sqlci/SqlCmd.cpp | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 170 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 15 +
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 2 +-
core/sql/sqlcomp/DefaultConstants.h | 14 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 11 +-
core/sql/sqlcomp/nadefaults.cpp | 8 +-
core/sql/sqludr/doxygen_tmudr.1.6.config | 4 +-
core/sql/sqludr/sqludr.cpp | 2 +-
core/sql/sqludr/sqludr.h | 16 +-
.../java/org/trafodion/sql/HBaseClient.java | 57 +-
.../java/org/trafodion/sql/TrafRegionStats.java | 144 +
.../trafodion/sql/udr/UDRInvocationInfo.java | 17 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 690 +++
core/updateCopyrightCheck.py | 7 +-
dcs/LICENSE.txt | 202 -
dcs/NOTICE.txt | 7 -
.../dcs/master/listener/ConnectReply.java | 75 +-
.../org/trafodion/dcs/servermt/ServerUtils.java | 20 +-
.../servermt/serverHandler/ServerHandler.java | 2 +
.../org/trafodion/dcs/util/ByteBufferUtils.java | 2 -
.../java/org/trafodion/dcs/util/SqlUtils.java | 2 -
.../org/trafodion/dcs/version/util/VerGen.java | 19 -
.../dcs-webapps/master/css/stylesheet.css | 191 -
dcs/src/test/pytests/.tox.ini.tmpl | 21 -
docs/.gitignore | 1 +
.../Trafodion_Client_Installation_Guide.xml | 6 +-
docs/client_install/source/xml-profile.xml | 2 +-
.../Trafodion_Command_Interface_Guide.xml | 44 +-
docs/command_interface/source/xml-profile.xml | 2 +-
docs/odb_manual/Trafodion_odb_User_Guide.xml | 4 +-
.../source/Trafodion_SQL_Reference_Manual.xml | 10 +-
docs/sql_reference/source/xml-profile.xml | 2 +-
docs/src/site/asciidoc/index.adoc | 46 -
docs/src/site/markdown/advocate.md | 15 +
docs/src/site/markdown/architecture-overview.md | 169 +
docs/src/site/markdown/build-tools-manual.md | 197 +
docs/src/site/markdown/build.md | 80 +
docs/src/site/markdown/code-organization.md | 27 +
docs/src/site/markdown/code.md | 32 +
docs/src/site/markdown/contribute.md | 69 +
.../markdown/cplusplus-coding-guidelines.md | 310 +
.../src/site/markdown/create-dev-environment.md | 153 +
docs/src/site/markdown/develop.md | 245 +
docs/src/site/markdown/document.md | 124 +
docs/src/site/markdown/documentation.md | 25 +
docs/src/site/markdown/download.md | 36 +
.../site/markdown/enable-secure-trafodion.md | 224 +
docs/src/site/markdown/faq.md | 220 +
docs/src/site/markdown/index.md | 132 +
docs/src/site/markdown/install-preparation.md | 138 +
docs/src/site/markdown/install-troubleshoot.md | 21 +
docs/src/site/markdown/install.md | 201 +
docs/src/site/markdown/ldapcheck.md | 41 +
docs/src/site/markdown/ldapconfigcheck.md | 48 +
.../src/site/markdown/manage-dev-environment.md | 51 +
docs/src/site/markdown/management.md | 62 +
docs/src/site/markdown/merge.md | 140 +
docs/src/site/markdown/new-features.md | 15 +
docs/src/site/markdown/passwordless-ssh.md | 131 +
docs/src/site/markdown/performance.md | 15 +
docs/src/site/markdown/port-assignment.md | 134 +
docs/src/site/markdown/presentations.md | 18 +
docs/src/site/markdown/quickstart.md | 15 +
docs/src/site/markdown/release-notes-0-8-0.md | 165 +
docs/src/site/markdown/release-notes-0-9-0.md | 210 +
docs/src/site/markdown/release-notes-1-0-0.md | 256 +
docs/src/site/markdown/release-notes-1-0-1.md | 250 +
docs/src/site/markdown/release-notes-1-1-0.md | 181 +
docs/src/site/markdown/release-notes-1-3-0.md | 160 +
docs/src/site/markdown/release-notes.md | 24 +
docs/src/site/markdown/release.md | 225 +
docs/src/site/markdown/roadmap.md | 15 +
.../site/markdown/setup-build-environment.md | 160 +
docs/src/site/markdown/testing.md | 179 +
docs/src/site/markdown/tests.md | 71 +
.../site/markdown/traf_authentication_config.md | 96 +
docs/src/site/markdown/website.md | 89 +
docs/src/site/markdown/wiki.md | 23 +
docs/src/site/resources/css/site.css | 208 +-
.../resources/images/carousel/processes.png | Bin 0 -> 129503 bytes
.../resources/images/carousel/revolution.png | Bin 0 -> 66062 bytes
.../site/resources/images/carousel/scale.png | Bin 0 -> 93783 bytes
.../site/resources/images/carousel/stack.png | Bin 0 -> 102472 bytes
.../site/resources/images/carousel/timeline.png | Bin 0 -> 115681 bytes
.../site/resources/images/logos/community.png | Bin 0 -> 6237 bytes
.../site/resources/images/logos/contribute.png | Bin 0 -> 4902 bytes
.../site/resources/images/logos/understand.png | Bin 0 -> 5925 bytes
docs/src/site/resources/images/logos/use.png | Bin 0 -> 2789 bytes
.../site/resources/images/multi-layer-esps.png | Bin 0 -> 116303 bytes
.../resources/images/process-architecture.png | Bin 0 -> 72704 bytes
docs/src/site/resources/images/revolution.png | Bin 0 -> 185535 bytes
.../presentations/dtm-architecture.pdf | Bin 0 -> 225959 bytes
docs/src/site/site.xml | 363 +-
install/.gitignore | 1 +
install/Makefile | 2 -
install/README.rst | 32 -
install/installer/traf_config_check | 14 +
install/installer/traf_getHadoopNodes | 4 +-
licenses/LICENSE-bsd2 | 14 +
licenses/LICENSE-bsd4 | 31 +
licenses/LICENSE-facebook | 14 +
licenses/LICENSE-js | 18 +
licenses/LICENSE-salesforce | 23 +
pom.xml | 32 +-
.../phoenix/end2end/AlterTableTest.java | 21 -
.../phoenix/end2end/ArithmeticQueryTest.java | 21 -
.../phoenix/end2end/AutoCommitTest.java | 21 -
.../org/trafodion/phoenix/end2end/BaseTest.java | 26 +-
.../trafodion/phoenix/end2end/BatchTest.java | 250 +
.../phoenix/end2end/BinaryRowKeyTest.java | 21 -
.../phoenix/end2end/CoalesceFunctionTest.java | 21 -
.../end2end/CompareDecimalToLongTest.java | 21 -
.../phoenix/end2end/CreateTableTest.java | 21 -
.../phoenix/end2end/CustomEntityDataTest.java | 21 -
.../phoenix/end2end/DeleteRangeTest.java | 21 -
.../end2end/DescColumnSortOrderTest.java | 21 -
.../phoenix/end2end/DistinctCountTest.java | 21 -
.../phoenix/end2end/ExecuteStatementsTest.java | 21 -
.../phoenix/end2end/ExtendedQueryExecTest.java | 21 -
.../phoenix/end2end/FunkyNamesTest.java | 21 -
.../phoenix/end2end/GroupByCaseTest.java | 21 -
.../trafodion/phoenix/end2end/IndexTest.java | 21 -
.../trafodion/phoenix/end2end/IsNullTest.java | 21 -
.../trafodion/phoenix/end2end/KeyOnlyTest.java | 21 -
.../phoenix/end2end/MultiCfQueryExecTest.java | 21 -
.../trafodion/phoenix/end2end/OrderByTest.java | 21 -
.../phoenix/end2end/ProductMetricsTest.java | 21 -
.../phoenix/end2end/QueryExecTest.java | 21 -
.../end2end/QueryExecWithoutSCNTest.java | 21 -
.../phoenix/end2end/QueryPlanTest.java | 21 -
.../phoenix/end2end/ReadIsolationLevelTest.java | 21 -
.../phoenix/end2end/SaltedTableTest.java | 21 -
.../end2end/SaltedTableUpsertSelectTest.java | 21 -
.../end2end/SaltedTableVarLengthRowKeyTest.java | 21 -
.../phoenix/end2end/ServerExceptionTest.java | 21 -
.../phoenix/end2end/SkipScanQueryTest.java | 21 -
.../phoenix/end2end/StatementHintsTest.java | 21 -
.../trafodion/phoenix/end2end/StddevTest.java | 21 -
.../phoenix/end2end/ToCharFunctionTest.java | 21 -
.../phoenix/end2end/ToNumberFunctionTest.java | 21 -
.../org/trafodion/phoenix/end2end/TopNTest.java | 21 -
.../phoenix/end2end/UpsertBigValuesTest.java | 21 -
.../end2end/UpsertSelectAutoCommitTest.java | 21 -
.../phoenix/end2end/UpsertSelectTest.java | 21 -
.../phoenix/end2end/UpsertValuesTest.java | 21 -
.../phoenix/end2end/VariableLengthPKTest.java | 21 -
win-odbc64/Krypton/KryptonBuild.bat | 29 +-
win-odbc64/Krypton/assocsvc.idl | 28 +-
win-odbc64/Krypton/ca.idl | 30 +-
win-odbc64/Krypton/ceecfg.idl | 27 +-
win-odbc64/Krypton/ceercv.idl | 29 +-
win-odbc64/Krypton/clientcfg.idl | 32 +-
win-odbc64/Krypton/generated_incs/cee.h | 28 +-
win-odbc64/Krypton/generated_incs/ceecfg.h | 27 +-
win-odbc64/Krypton/generated_incs/ceercv.h | 27 +-
win-odbc64/Krypton/generated_incs/glu.h | 27 +-
win-odbc64/Krypton/generated_incs/glu_rs.h | 27 +-
win-odbc64/Krypton/generated_incs/glu_stdexc.h | 27 +-
win-odbc64/Krypton/generated_incs/idltype.h | 27 +-
win-odbc64/Krypton/generated_incs/odbc.h | 27 +-
win-odbc64/Krypton/generated_incs/odbcCommon.h | 27 +-
win-odbc64/Krypton/generated_incs/odbc_cl.h | 27 +-
win-odbc64/Krypton/generated_incs/odbc_sv.h | 27 +-
win-odbc64/Krypton/generated_incs/odbcas_cl.h | 27 +-
win-odbc64/Krypton/generated_incs/odbcas_sv.h | 27 +-
win-odbc64/Krypton/generated_incs/odbccfg.h | 27 +-
win-odbc64/Krypton/generated_incs/odbccfg_cl.h | 27 +-
win-odbc64/Krypton/generated_incs/odbccfg_sv.h | 27 +-
.../Krypton/generated_incs/odbcsrvrcommon.h | 27 +-
.../Krypton/generated_incs/tdm_odbcSrvrMsg.h | 28 +-
win-odbc64/Krypton/idlcnp.bat | 27 +-
win-odbc64/Krypton/odbc.idl | 29 +-
win-odbc64/Krypton/odbcCommon.idl | 29 +-
win-odbc64/Krypton/odbcas.idl | 29 +-
win-odbc64/Krypton/odbccfg.idl | 30 +-
win-odbc64/Krypton/odbcsrvrcommon.idl | 29 +-
win-odbc64/Krypton/omxSec.idl | 30 +-
.../odbcclient/DSNConverter/DSNConverter.def | 2 +-
.../TranslationDll/TranslationDll.def | 2 +-
win-odbc64/odbcclient/drvr35/cstmt.cpp | 6 +-
win-odbc64/odbcclient/drvr35/drvrnet.h | 2 +-
win-odbc64/odbcclient/update_version.pl | 100 +
wms/LICENSE.txt | 202 -
wms/NOTICE.txt | 11 -
wms/build.xml | 2 +-
341 files changed, 13313 insertions(+), 22473 deletions(-)
----------------------------------------------------------------------
[04/25] incubator-trafodion git commit: Merge pull request #4 from
apache/master
Posted by db...@apache.org.
Merge pull request #4 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0042344c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0042344c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0042344c
Branch: refs/heads/master
Commit: 0042344cfb67900a1c815da932e5ea4c7ba93a19
Parents: c8fef61 fc9651f
Author: mashengchen <ma...@gmail.com>
Authored: Wed Dec 30 18:32:40 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Dec 30 18:32:40 2015 +0800
----------------------------------------------------------------------
.../jdbc_type2/native/SQLMXDatabaseMetaData.cpp | 6 ++++--
core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 ++--
core/conn/jdbc_type2/native/SrvrSmd.cpp | 7 -------
.../sql/scripts/install_hadoop_regr_test_env | 22 ++++++++++----------
core/sql/sqlcomp/CmpDescribe.cpp | 5 +++++
dcs/bin/start-dcs.sh | 2 +-
dcs/bin/stop-dcs.sh | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[16/25] incubator-trafodion git commit: Update
traf_coprocessor.properties
Posted by db...@apache.org.
Update traf_coprocessor.properties
use TrxRegionEndpoint as default
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b8e6e9c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b8e6e9c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b8e6e9c9
Branch: refs/heads/master
Commit: b8e6e9c920039c2fd7c0a175214b93ed2335d3e9
Parents: c1b8448
Author: mashengchen <ma...@gmail.com>
Authored: Thu Jan 14 15:54:08 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Thu Jan 14 15:54:08 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/traf_coprocessor.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8e6e9c9/core/sqf/sql/scripts/traf_coprocessor.properties
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_coprocessor.properties b/core/sqf/sql/scripts/traf_coprocessor.properties
index 04d04e2..cf4184a 100644
--- a/core/sqf/sql/scripts/traf_coprocessor.properties
+++ b/core/sqf/sql/scripts/traf_coprocessor.properties
@@ -21,4 +21,5 @@
# @@@ END COPYRIGHT @@@
#
-coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
+coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
+#coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
[02/25] incubator-trafodion git commit: Merge pull request #2 from
apache/master
Posted by db...@apache.org.
Merge pull request #2 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3450fb15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3450fb15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3450fb15
Branch: refs/heads/master
Commit: 3450fb15d4ae86c20c0a31f7e0750709f433af59
Parents: 12d7342 55a5d00
Author: mashengchen <ma...@gmail.com>
Authored: Mon Dec 21 13:26:00 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Dec 21 13:26:00 2015 +0800
----------------------------------------------------------------------
.../src/org/trafodion/ci/DatabaseQuery.java | 4 +-
.../trafciDefaultLookAndFeel.properties | 1 +
core/sqf/sql/scripts/findPort.py | 1 +
core/sqf/sql/scripts/install_local_hadoop | 49 ++++-
.../java/org/trafodion/sql/HBaseClient.java | 148 ++++++++++----
docs/src/site/markdown/index.md | 3 +-
docs/src/site/markdown/install.md | 2 +-
docs/src/site/markdown/uninstall.md | 176 ++++++++++++++++
docs/src/site/markdown/website.md | 19 ++
docs/src/site/site.xml | 9 +-
install/installer/dcs_installer | 50 +++++
install/installer/traf_add_sudoAccess | 54 +++++
install/installer/traf_add_user | 23 ++-
install/installer/traf_config_setup | 87 +++++++-
install/installer/traf_createPasswordLessSSH | 63 ++++++
install/installer/traf_package_setup | 60 ++----
install/installer/trafodion_config_default | 11 +
install/installer/trafodion_install | 9 +-
pom.xml | 202 +------------------
win-odbc64/odbcclient/update_version.pl | 84 +++++++-
20 files changed, 765 insertions(+), 290 deletions(-)
----------------------------------------------------------------------
[22/25] incubator-trafodion git commit: Update CoprocessorUtils.java
Posted by db...@apache.org.
Update CoprocessorUtils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c15226c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c15226c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c15226c6
Branch: refs/heads/master
Commit: c15226c639802578bc6eeac38b27aadf93aac8fe
Parents: 379f8ae
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 14:36:35 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 14:36:35 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c15226c6/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index 7105673..2ef71cc 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -78,8 +78,6 @@ public class CoprocessorUtils {
public static void main(String[] args) {
System.out.println("================CoprocessorUtils.main======================");
- // String currentAllClassName =
- // "org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation";
String currentAllClassName = "";
HTableDescriptor desc = new HTableDescriptor();
boolean isMVCC = true;
[14/25] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion
Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/411b703f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/411b703f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/411b703f
Branch: refs/heads/master
Commit: 411b703f557bdcff63b971261715d9a2caecb989
Parents: e1af6b9 9f00dd5
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jan 12 05:50:13 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Tue Jan 12 05:50:13 2016 +0000
----------------------------------------------------------------------
core/sql/optimizer/NATable.cpp | 49 +++++++++++++++++--------------------
1 file changed, 22 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[19/25] incubator-trafodion git commit: Update CoprocessorUtils.java
Posted by db...@apache.org.
Update CoprocessorUtils.java
change addCoprocessor add isMVCC as param.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d11e9d4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d11e9d4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d11e9d4e
Branch: refs/heads/master
Commit: d11e9d4ecf4263b7999d4bf8e6460ba78da04150
Parents: a005ebf
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 14:22:24 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 14:22:24 2016 +0800
----------------------------------------------------------------------
.../org/trafodion/sql/CoprocessorUtils.java | 47 ++++++++++++++------
1 file changed, 33 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d11e9d4e/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index 18bb65c..f1b228d 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -22,16 +22,20 @@
package org.trafodion.sql;
import java.io.IOException;
-import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.log4j.Logger;
public class CoprocessorUtils {
- private static Logger logger = Logger.getLogger(HBaseClient.class.getName());
- private static String[] coprocessors = null;
+ private static Logger logger = Logger.getLogger(CoprocessorUtils.class.getName());
+ private static List<String> coprocessors = new ArrayList<String>();
+ private static String MVCC = null;
+ private static String SSCC = null;
static {
init();
@@ -40,20 +44,24 @@ public class CoprocessorUtils {
private static void init() {
Configuration config = null;
try {
- String path = System.getenv("MY_SQROOT") + "/etc/traf_coprocessor.properties";
+ String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties";
config = new PropertiesConfiguration(path);
- } catch (Exception e) {
+ } catch (ConfigurationException e) {
logger.error("error when finding trafcoprocess.properties");
e.printStackTrace();
}
if (config != null) {
- coprocessors = config.getStringArray("coprocessors");
+ for (String coprocessor : config.getStringArray("coprocessors")) {
+ coprocessors.add(coprocessor);
+ }
+ MVCC = config.getString("MVCC");
+ SSCC = config.getString("SSCC");
}
}
- public static void addCoprocessor(String currentAllClassName, HTableDescriptor desc) throws IOException {
- if (coprocessors == null) {
+ public static void addCoprocessor(String currentAllClassName, HTableDescriptor desc, boolean isMVCC) throws IOException {
+ if (coprocessors == null || currentAllClassName == null) {
return;
}
for (String coprocess : coprocessors) {
@@ -61,16 +69,27 @@ public class CoprocessorUtils {
desc.addCoprocessor(coprocess);
}
}
+ if (isMVCC && (currentAllClassName == null || !currentAllClassName.contains(MVCC))) {
+ desc.addCoprocessor(MVCC);
+ } else if (!isMVCC && (currentAllClassName == null || !currentAllClassName.contains(SSCC))) {
+ desc.addCoprocessor(SSCC);
+ }
}
public static void main(String[] args) {
System.out.println("================CoprocessorUtils.main======================");
- //init();
- if (coprocessors == null) {
- return;
- }
- for (String coprocess : coprocessors) {
- System.out.println(coprocess);
+ // String currentAllClassName =
+ // "org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation";
+ String currentAllClassName = "";
+ HTableDescriptor desc = new HTableDescriptor();
+ boolean isMVCC = true;
+ addCoprocessor(currentAllClassName, desc, isMVCC);
+
+ List<String> list = desc.getCoprocessors();
+
+ for (String string : list) {
+ System.out.println(string);
}
+ System.out.println("================CoprocessorUtils.main======================");
}
}
[03/25] incubator-trafodion git commit: Merge pull request #3 from
apache/master
Posted by db...@apache.org.
Merge pull request #3 from apache/master
update
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c8fef619
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c8fef619
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c8fef619
Branch: refs/heads/master
Commit: c8fef619f858ff24b8076e4abc2f556d9fb42acb
Parents: 3450fb1 5746be3
Author: mashengchen <ma...@gmail.com>
Authored: Wed Dec 23 21:09:41 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Dec 23 21:09:41 2015 +0800
----------------------------------------------------------------------
.rat-excludes | 1 +
RAT_README.txt | 1 +
core/sqf/sql/scripts/cleanlogs | 92 +++++++++++++++++++++++
core/sqf/sql/scripts/dcscheck | 67 +++++++++++++++--
core/sqf/sql/scripts/dcsstop | 4 +
core/sqf/sql/scripts/sqcheck | 52 ++++++++++++-
core/sql/ustat/hs_cli.cpp | 51 +++++++++++--
dcs/bin/dcs-config.sh | 10 +++
dcs/bin/scripts/dcsbind.sh | 133 ++++++++++++++++++++++++++++++++-
dcs/bin/scripts/dcsunbind.sh | 95 +++++++++++++++++++++++
dcs/bin/scripts/parse_dcs_site.py | 46 ++++++++++++
dcs/bin/start-dcs.sh | 11 ++-
dcs/conf/dcs-env.sh | 8 +-
dcs/conf/master | 0
install/installer/setup_ssh_key | 27 +++++++
15 files changed, 577 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[09/25] incubator-trafodion git commit: Update HBaseClient.java
Posted by db...@apache.org.
Update HBaseClient.java
remove unnecessary log.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0ea85521
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0ea85521
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0ea85521
Branch: refs/heads/master
Commit: 0ea8552120bd12d8c5ed1757325276cca3eac172
Parents: 5292fdc
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 13:39:43 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 13:39:43 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/HBaseClient.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ea85521/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
index 66de284..fa68650 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
@@ -236,9 +236,7 @@ public class HBaseClient {
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
- for (String str : desc.getCoprocessors()) {
- logger.debug(tblName + "has coprocessor : " + str);
- }
+
for (int i = 0; i < colFamNameList.length ; i++) {
String colFam = (String)colFamNameList[i];
HColumnDescriptor colDesc = new HColumnDescriptor(colFam);
@@ -490,10 +488,8 @@ public class HBaseClient {
String trueStr = "TRUE";
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
- CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
- for (String str : desc.getCoprocessors()) {
- logger.debug(tblName + "has coprocessor : " + str);
- }
+ CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
+
int defaultVersionsValue = 0;
if (isMVCC)
defaultVersionsValue = DtmConst.MVCC_MAX_VERSION;
[15/25] incubator-trafodion git commit: remove
trafcoprocess.properties
Posted by db...@apache.org.
remove trafcoprocess.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c1b8448c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c1b8448c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c1b8448c
Branch: refs/heads/master
Commit: c1b8448c90533a5a2b039cce116ee57563c77299
Parents: 411b703
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jan 12 05:54:31 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Tue Jan 12 05:54:31 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/trafcoprocess.properties | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c1b8448c/core/sqf/sql/scripts/trafcoprocess.properties
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafcoprocess.properties b/core/sqf/sql/scripts/trafcoprocess.properties
deleted file mode 100644
index 0bc56f5..0000000
--- a/core/sqf/sql/scripts/trafcoprocess.properties
+++ /dev/null
@@ -1 +0,0 @@
-coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
[24/25] incubator-trafodion git commit: TRAFODION-1729
Posted by db...@apache.org.
TRAFODION-1729
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/65cc64fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/65cc64fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/65cc64fe
Branch: refs/heads/master
Commit: 65cc64fef3b0079fb5c018d499b7130baff67536
Parents: accdfe2
Author: mashengchen <ma...@gmail.com>
Authored: Wed Jan 27 06:15:54 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Jan 27 06:15:54 2016 +0000
----------------------------------------------------------------------
.../org/trafodion/sql/CoprocessorUtils.java | 21 +++++++++++++++-----
.../java/org/trafodion/sql/HBaseClient.java | 15 ++++++++++++++
2 files changed, 31 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/65cc64fe/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index 714156a..9a3d75c 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -60,22 +60,33 @@ public class CoprocessorUtils {
}
}
- public static void addCoprocessor(String currentAllClassName, HTableDescriptor desc, boolean isMVCC) throws IOException {
+ //boolean as return ,to make sure whether changes take place in HTableDescriptor
+ public static boolean addCoprocessor(String currentAllClassName, HTableDescriptor desc, boolean isMVCC) throws IOException {
+ boolean retVal = false;
if (coprocessors == null) {
- return;
+ return retVal;
}
for (String coprocess : coprocessors) {
- if (currentAllClassName == null || !currentAllClassName.contains(coprocess)) {
+ if ((currentAllClassName == null || !currentAllClassName.contains(coprocess)) && !desc.hasCoprocessor(coprocess)) {
desc.addCoprocessor(coprocess);
+ retVal = true;
}
}
- if (isMVCC && (currentAllClassName == null || !currentAllClassName.contains(MVCC))) {
+
+ if (isMVCC && (currentAllClassName == null || !currentAllClassName.contains(MVCC)) && !desc.hasCoprocessor(MVCC)) {
desc.addCoprocessor(MVCC);
- } else if (!isMVCC && (currentAllClassName == null || !currentAllClassName.contains(SSCC))) {
+ retVal = true;
+ } else if (!isMVCC && (currentAllClassName == null || !currentAllClassName.contains(SSCC)) && !desc.hasCoprocessor(SSCC)) {
desc.addCoprocessor(SSCC);
+ retVal = true;
}
+
+ return retVal;
}
+ public static boolean addCoprocessor(String currentAllClassName, HTableDescriptor desc) throws IOException {
+ return addCoprocessor(currentAllClassName, desc, true);
+ }
public static void main(String[] args) throws IOException {
System.out.println("================CoprocessorUtils.main======================");
String currentAllClassName = "";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/65cc64fe/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
index a363098..61f8081 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
@@ -854,6 +854,21 @@ public class HBaseClient {
if (logger.isDebugEnabled()) logger.debug(" ==> Error in init(), returning empty.");
return null;
}
+
+ HBaseAdmin admin = new HBaseAdmin(config);
+ HTableDescriptor tblDesc = admin.getTableDescriptor(TableName.valueOf(tblName));
+ if (logger.isDebugEnabled()) logger.debug("check coprocessor num for tbl : "+ tblName+". coprocessor size : "+tblDesc.getCoprocessors().size());
+ boolean added = CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), tblDesc);
+ if (added) {
+ if (logger.isDebugEnabled())
+ logger.debug(" ==> add coprocessor for table : " + tblName);
+ synchronized (admin) {
+ admin.disableTable(tblName);
+ admin.modifyTable(tblName, tblDesc);
+ admin.enableTable(tblName);
+ }
+ }
+
if (logger.isDebugEnabled()) logger.debug(" ==> Created new object.");
hTableClientsInUse.put(htable.getTableName(), htable);
htable.setJniObject(jniObject);
[13/25] incubator-trafodion git commit: rename & update code
Posted by db...@apache.org.
rename & update code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e1af6b9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e1af6b9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e1af6b9b
Branch: refs/heads/master
Commit: e1af6b9b94b237ab98c8e40677ada757a9b76f18
Parents: d8b594f
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jan 12 05:38:26 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Tue Jan 12 05:38:26 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqgen | 4 +++-
.../sqf/sql/scripts/traf_coprocessor.properties | 24 ++++++++++++++++++++
.../org/trafodion/sql/CoprocessorUtils.java | 2 +-
3 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqgen b/core/sqf/sql/scripts/sqgen
index 39aeec2..6dd170c 100755
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@ -187,7 +187,9 @@ else
fi
./gensqstatem2lenv > $SQETC_DIR/sqstatem2l.env
-cp ./trafcoprocess.properties $SQETC_DIR/
+
+cp ./traf_coprocessor.properties $SQETC_DIR/
+
# Create configuration database tables
rm -f sqconfig.db
sqlite3 -init createConfigDb sqconfig.db <<eof
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sqf/sql/scripts/traf_coprocessor.properties
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_coprocessor.properties b/core/sqf/sql/scripts/traf_coprocessor.properties
new file mode 100644
index 0000000..04d04e2
--- /dev/null
+++ b/core/sqf/sql/scripts/traf_coprocessor.properties
@@ -0,0 +1,24 @@
+#
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+#
+
+coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index e8cd7da..a50aff4 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -40,7 +40,7 @@ public class CoprocessorUtils {
private static void init() {
Configuration config = null;
try {
- String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties";
+ String path = System.getenv("MY_SQROOT") + "/etc/traf_coprocessor.properties";
config = new PropertiesConfiguration(path);
} catch (Exception e) {
logger.error("error when finding trafcoprocess.properties");
[08/25] incubator-trafodion git commit: Merge branch 'master' of
github.com:mashengchen/incubator-trafodion
Posted by db...@apache.org.
Merge branch 'master' of github.com:mashengchen/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5292fdc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5292fdc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5292fdc4
Branch: refs/heads/master
Commit: 5292fdc470db2317f4ab1133d298e98b97992e1e
Parents: 6223708 cac96bc
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 04:19:31 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 04:19:31 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/25] incubator-trafodion git commit: Merge pull request #5 from
apache/master
Posted by db...@apache.org.
Merge pull request #5 from apache/master
update head
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cac96bc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cac96bc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cac96bc7
Branch: refs/heads/master
Commit: cac96bc7ea69a3f1293e9ddef5e752f8785fb886
Parents: 0042344 141f354
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 11:19:05 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 11:19:05 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 163 ++++--
core/conn/jdbc_type4/.gitignore | 1 +
core/conn/jdbc_type4/build.xml | 9 +-
.../org/trafodion/rest/GetStatusResponse.java | 2 +-
.../java/org/trafodion/rest/RESTServlet.java | 7 +
.../rest/provider/JAXBContextResolver.java | 1 -
.../producer/PlainTextMessageBodyProducer.java | 3 -
.../java/org/trafodion/rest/util/ConfTool.java | 2 +-
.../org/trafodion/rest/zookeeper/ZkClient.java | 1 -
.../transactional/TransactionManager.java | 9 +-
.../TransactionRegionLocation.java | 22 +-
.../client/transactional/TransactionState.java | 13 +-
.../transactional/TrxRegionEndpoint.java | 26 +-
core/sql/bin/clitest.cpp | 267 +++++++++
core/sql/bin/vprocclitestdriver.cpp | 51 ++
core/sql/cli/Cli.cpp | 31 +-
core/sql/cli/sqlcli.h | 9 +-
core/sql/clitest/blobtest.cpp | 269 +++++++++
core/sql/clitest/blobtest.h | 76 +++
core/sql/clitest/vers_libclitest.cpp | 28 +
core/sql/comexe/ComTdbExeUtil.cpp | 22 +-
core/sql/comexe/ComTdbExeUtil.h | 27 +-
core/sql/comexe/ComTdbRoot.h | 14 +-
core/sql/common/BaseTypes.cpp | 27 +-
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilCli.cpp | 8 +-
core/sql/executor/ExExeUtilCli.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 167 ++++--
core/sql/executor/ExHdfsScan.cpp | 8 +-
core/sql/executor/hiveHook.cpp | 2 +-
core/sql/exp/ExpLOB.cpp | 70 ++-
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 26 +-
core/sql/exp/ExpLOBenums.h | 1 +
core/sql/exp/ExpLOBinterface.cpp | 24 +-
core/sql/exp/ExpLOBinterface.h | 1 +
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/generator/GenRelExeUtil.cpp | 11 +-
core/sql/generator/GenRelMisc.cpp | 4 +
core/sql/nskgmake/Makerules.linux | 4 +-
core/sql/nskgmake/clitest/Makefile | 36 ++
core/sql/nskgmake/clitestdriver/Makefile | 35 ++
core/sql/optimizer/ItemExpr.cpp | 4 +-
core/sql/optimizer/ItemFunc.h | 17 +-
core/sql/optimizer/RelExeUtil.cpp | 4 +-
core/sql/optimizer/RelExeUtil.h | 12 +-
core/sql/optimizer/SynthType.cpp | 33 +-
core/sql/parser/sqlparser.y | 88 +--
core/sql/regress/executor/EXPECTED130 | 275 ++++++++-
core/sql/regress/executor/TEST130 | 8 +-
core/sql/regress/executor/TEST130_argfile | 3 +
core/sql/sqlcomp/DefaultConstants.h | 2 +
core/sql/sqlcomp/NADefaults.h | 2 +
core/sql/sqlcomp/nadefaults.cpp | 141 +++--
core/sql/ustat/hs_globals.cpp | 75 +++
dcs/bin/scripts/dcsbind.sh | 14 +-
dcs/pom.xml | 6 +
.../main/asciidoc/_chapters/architecture.adoc | 15 +-
.../main/asciidoc/_chapters/configuration.adoc | 78 ++-
.../main/asciidoc/_chapters/external_apis.adoc | 34 --
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 30 +-
.../asciidoc/_chapters/troubleshooting.adoc | 4 +-
dcs/src/main/asciidoc/index.adoc | 1 -
dcs/src/main/resources/dcs-default.xml | 45 --
.../java/org/trafodion/jdbc_test/BatchTest.java | 582 +++++++++++++++++++
.../org/trafodion/jdbc_test/JdbcCommon.java | 224 +++++++
install/installer/cloud_cli_setup | 97 ++++
install/installer/dcs_installer | 39 +-
install/installer/traf_config_setup | 123 ++--
install/installer/trafodion_config_default | 15 +
install/installer/trafodion_install | 8 +-
.../org/trafodion/phoenix/end2end/BaseTest.java | 5 -
.../trafodion/phoenix/end2end/BatchTest.java | 250 --------
73 files changed, 2910 insertions(+), 825 deletions(-)
----------------------------------------------------------------------
[11/25] incubator-trafodion git commit: jira1729
Posted by db...@apache.org.
jira1729
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0dbaf3b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0dbaf3b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0dbaf3b3
Branch: refs/heads/master
Commit: 0dbaf3b3164069587a854968869211d1b69c3434
Parents: 6e0193a
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 05:52:45 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 05:52:45 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqgen | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0dbaf3b3/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqgen b/core/sqf/sql/scripts/sqgen
index 6258fde..39aeec2 100755
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@ -187,7 +187,7 @@ else
fi
./gensqstatem2lenv > $SQETC_DIR/sqstatem2l.env
-
+cp ./trafcoprocess.properties $SQETC_DIR/
# Create configuration database tables
rm -f sqconfig.db
sqlite3 -init createConfigDb sqconfig.db <<eof
[20/25] incubator-trafodion git commit: Update
traf_coprocessor.properties
Posted by db...@apache.org.
Update traf_coprocessor.properties
make mvcc & sscc as a separate ones
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5751399d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5751399d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5751399d
Branch: refs/heads/master
Commit: 5751399d9334b77bbaca629b9c93d55355b49f00
Parents: d11e9d4
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 14:27:01 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 14:27:01 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/traf_coprocessor.properties | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5751399d/core/sqf/sql/scripts/traf_coprocessor.properties
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_coprocessor.properties b/core/sqf/sql/scripts/traf_coprocessor.properties
index cf4184a..d69e2f2 100644
--- a/core/sqf/sql/scripts/traf_coprocessor.properties
+++ b/core/sqf/sql/scripts/traf_coprocessor.properties
@@ -21,5 +21,6 @@
# @@@ END COPYRIGHT @@@
#
-coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
-#coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
+coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
+MVCC=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint
+SSCC=org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint
[10/25] incubator-trafodion git commit: Update CoprocessorUtils.java
Posted by db...@apache.org.
Update CoprocessorUtils.java
change log level
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6e0193a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6e0193a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6e0193a1
Branch: refs/heads/master
Commit: 6e0193a1837148fe5fecd3653402ddaff61f54ce
Parents: 0ea8552
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 13:41:00 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 13:41:00 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6e0193a1/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index e9535c4..909b2d0 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -22,7 +22,7 @@ public class CoprocessorUtils {
String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties";
config = new PropertiesConfiguration(path);
} catch (Exception e) {
- logger.info("error when finding trafcoprocess.properties");
+ logger.error("error when finding trafcoprocess.properties");
e.printStackTrace();
}
[05/25] incubator-trafodion git commit: jira1729
Posted by db...@apache.org.
jira1729
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/11f9686b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/11f9686b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/11f9686b
Branch: refs/heads/master
Commit: 11f9686b5df87f70b79edac5621da0610c7e70b8
Parents: fc9651f
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 02:49:44 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 02:49:44 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/trafcoprocess.properties | 1 +
.../org/trafodion/sql/CoprocessorUtils.java | 55 ++++++++++++++++++++
.../java/org/trafodion/sql/HBaseClient.java | 10 +++-
3 files changed, 64 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11f9686b/core/sqf/sql/scripts/trafcoprocess.properties
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafcoprocess.properties b/core/sqf/sql/scripts/trafcoprocess.properties
new file mode 100644
index 0000000..0bc56f5
--- /dev/null
+++ b/core/sqf/sql/scripts/trafcoprocess.properties
@@ -0,0 +1 @@
+coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11f9686b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
new file mode 100644
index 0000000..e9535c4
--- /dev/null
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -0,0 +1,55 @@
+package org.trafodion.sql;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.log4j.Logger;
+
+public class CoprocessorUtils {
+ private static Logger logger = Logger.getLogger(HBaseClient.class.getName());
+ private static String[] coprocessors = null;
+
+ static {
+ init();
+ }
+
+ private static void init() {
+ Configuration config = null;
+ try {
+ String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties";
+ config = new PropertiesConfiguration(path);
+ } catch (Exception e) {
+ logger.info("error when finding trafcoprocess.properties");
+ e.printStackTrace();
+ }
+
+ if (config != null) {
+ coprocessors = config.getStringArray("coprocessors");
+ }
+ }
+
+ public static void addCoprocessor(String currentAllClassName, HTableDescriptor desc) throws IOException {
+ if (coprocessors == null) {
+ return;
+ }
+ for (String coprocess : coprocessors) {
+ if (!currentAllClassName.contains(coprocess)) {
+ desc.addCoprocessor(coprocess);
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+ System.out.println("================CoprocessorUtils.main======================");
+ //init();
+ if (coprocessors == null) {
+ return;
+ }
+ for (String coprocess : coprocessors) {
+ System.out.println(coprocess);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/11f9686b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
index 98ac1b1..66de284 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
@@ -235,6 +235,10 @@ public class HBaseClient {
if (logger.isDebugEnabled()) logger.debug("HBaseClient.create(" + tblName + ") called, and MVCC is " + isMVCC + ".");
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
+ CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
+ for (String str : desc.getCoprocessors()) {
+ logger.debug(tblName + "has coprocessor : " + str);
+ }
for (int i = 0; i < colFamNameList.length ; i++) {
String colFam = (String)colFamNameList[i];
HColumnDescriptor colDesc = new HColumnDescriptor(colFam);
@@ -486,7 +490,10 @@ public class HBaseClient {
String trueStr = "TRUE";
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
-
+ CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
+ for (String str : desc.getCoprocessors()) {
+ logger.debug(tblName + "has coprocessor : " + str);
+ }
int defaultVersionsValue = 0;
if (isMVCC)
defaultVersionsValue = DtmConst.MVCC_MAX_VERSION;
@@ -518,7 +525,6 @@ public class HBaseClient {
metaColDesc.setInMemory(true);
desc.addFamily(metaColDesc);
HBaseAdmin admin = new HBaseAdmin(config);
-
try {
if (beginEndKeys != null && beginEndKeys.length > 0)
{
[12/25] incubator-trafodion git commit: add copyright
Posted by db...@apache.org.
add copyright
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d8b594f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d8b594f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d8b594f2
Branch: refs/heads/master
Commit: d8b594f2b585de224a007e48ba735f0f5db860be
Parents: 0dbaf3b
Author: mashengchen <ma...@gmail.com>
Authored: Tue Jan 12 04:15:12 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Tue Jan 12 04:15:12 2016 +0000
----------------------------------------------------------------------
.../org/trafodion/sql/CoprocessorUtils.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d8b594f2/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index 909b2d0..e8cd7da 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -1,3 +1,24 @@
+// @@@ START COPYRIGHT @@@
+// //
+// // Licensed to the Apache Software Foundation (ASF) under one
+// // or more contributor license agreements. See the NOTICE file
+// // distributed with this work for additional information
+// // regarding copyright ownership. The ASF licenses this file
+// // to you under the Apache License, Version 2.0 (the
+// // "License"); you may not use this file except in compliance
+// // with the License. You may obtain a copy of the License at
+// //
+// // http://www.apache.org/licenses/LICENSE-2.0
+// //
+// // Unless required by applicable law or agreed to in writing,
+// // software distributed under the License is distributed on an
+// // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// // KIND, either express or implied. See the License for the
+// // specific language governing permissions and limitations
+// // under the License.
+// //
+// // @@@ END COPYRIGHT @@@
+
package org.trafodion.sql;
import java.io.IOException;
[17/25] incubator-trafodion git commit: Update CoprocessorUtils.java
Posted by db...@apache.org.
Update CoprocessorUtils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b01d8cb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b01d8cb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b01d8cb0
Branch: refs/heads/master
Commit: b01d8cb00abcfcadf48125649bdb69aac8616ffd
Parents: b8e6e9c
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 12:16:02 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 12:16:02 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b01d8cb0/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index a50aff4..18bb65c 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -57,7 +57,7 @@ public class CoprocessorUtils {
return;
}
for (String coprocess : coprocessors) {
- if (!currentAllClassName.contains(coprocess)) {
+ if (currentAllClassName == null || !currentAllClassName.contains(coprocess)) {
desc.addCoprocessor(coprocess);
}
}
[21/25] incubator-trafodion git commit: Update CoprocessorUtils.java
Posted by db...@apache.org.
Update CoprocessorUtils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/379f8aef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/379f8aef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/379f8aef
Branch: refs/heads/master
Commit: 379f8aefaf12476b8bc0f7960636a33b1b341449
Parents: 5751399
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 14:28:45 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 14:28:45 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/379f8aef/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index f1b228d..7105673 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -61,7 +61,7 @@ public class CoprocessorUtils {
}
public static void addCoprocessor(String currentAllClassName, HTableDescriptor desc, boolean isMVCC) throws IOException {
- if (coprocessors == null || currentAllClassName == null) {
+ if (coprocessors == null) {
return;
}
for (String coprocess : coprocessors) {
[25/25] incubator-trafodion git commit: Merge [TRAFODION-1729] PR 258
Change coprocessor deployment method
Posted by db...@apache.org.
Merge [TRAFODION-1729] PR 258 Change coprocessor deployment method
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/70dd6021
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/70dd6021
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/70dd6021
Branch: refs/heads/master
Commit: 70dd6021945737b9dbe2dc6197ad4971bb34fe44
Parents: 94ac0f6 65cc64f
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Feb 2 16:56:40 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Feb 2 16:56:40 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqgen | 2 +
.../sqf/sql/scripts/traf_coprocessor.properties | 26 +++++
.../org/trafodion/sql/CoprocessorUtils.java | 104 +++++++++++++++++++
.../java/org/trafodion/sql/HBaseClient.java | 19 +++-
4 files changed, 149 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[18/25] incubator-trafodion git commit: Update HBaseClient.java
Posted by db...@apache.org.
Update HBaseClient.java
change CoprocessorUtils.addCoprocessor, add isMVCC as param
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a005ebf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a005ebf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a005ebf5
Branch: refs/heads/master
Commit: a005ebf5ccf75a374f034f8b63891a396c651ae9
Parents: b01d8cb
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 14:18:14 2016 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 14:18:14 2016 +0800
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/HBaseClient.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a005ebf5/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
index fa68650..a363098 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java
@@ -235,8 +235,7 @@ public class HBaseClient {
if (logger.isDebugEnabled()) logger.debug("HBaseClient.create(" + tblName + ") called, and MVCC is " + isMVCC + ".");
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
- CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
-
+ CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc, isMVCC);
for (int i = 0; i < colFamNameList.length ; i++) {
String colFam = (String)colFamNameList[i];
HColumnDescriptor colDesc = new HColumnDescriptor(colFam);
@@ -488,8 +487,7 @@ public class HBaseClient {
String trueStr = "TRUE";
cleanupCache(tblName);
HTableDescriptor desc = new HTableDescriptor(tblName);
- CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc);
-
+ CoprocessorUtils.addCoprocessor(config.get("hbase.coprocessor.region.classes"), desc, isMVCC);
int defaultVersionsValue = 0;
if (isMVCC)
defaultVersionsValue = DtmConst.MVCC_MAX_VERSION;
[23/25] incubator-trafodion git commit: seems version conflect
Posted by db...@apache.org.
seems version conflect
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/accdfe28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/accdfe28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/accdfe28
Branch: refs/heads/master
Commit: accdfe2848fecfdfb1521a2162f11c65794f391d
Parents: c15226c
Author: mashengchen <ma...@gmail.com>
Authored: Fri Jan 15 09:08:49 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Fri Jan 15 09:08:49 2016 +0000
----------------------------------------------------------------------
core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/accdfe28/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
index 2ef71cc..714156a 100644
--- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
+++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java
@@ -44,7 +44,7 @@ public class CoprocessorUtils {
private static void init() {
Configuration config = null;
try {
- String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties";
+ String path = System.getenv("MY_SQROOT") + "/etc/traf_coprocessor.properties";
config = new PropertiesConfiguration(path);
} catch (ConfigurationException e) {
logger.error("error when finding trafcoprocess.properties");
@@ -76,7 +76,7 @@ public class CoprocessorUtils {
}
}
- public static void main(String[] args) {
+ public static void main(String[] args) throws IOException {
System.out.println("================CoprocessorUtils.main======================");
String currentAllClassName = "";
HTableDescriptor desc = new HTableDescriptor();
[07/25] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion
Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62237083
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62237083
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62237083
Branch: refs/heads/master
Commit: 62237083f0db8230e257b6a8a12b5ca21c3831d8
Parents: 11f9686 141f354
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 04:03:24 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 04:03:24 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 163 ++++--
core/conn/jdbc_type4/.gitignore | 1 +
core/conn/jdbc_type4/build.xml | 9 +-
.../org/trafodion/rest/GetStatusResponse.java | 2 +-
.../java/org/trafodion/rest/RESTServlet.java | 7 +
.../rest/provider/JAXBContextResolver.java | 1 -
.../producer/PlainTextMessageBodyProducer.java | 3 -
.../java/org/trafodion/rest/util/ConfTool.java | 2 +-
.../org/trafodion/rest/zookeeper/ZkClient.java | 1 -
.../transactional/TransactionManager.java | 9 +-
.../TransactionRegionLocation.java | 22 +-
.../client/transactional/TransactionState.java | 13 +-
.../transactional/TrxRegionEndpoint.java | 26 +-
core/sql/bin/clitest.cpp | 267 +++++++++
core/sql/bin/vprocclitestdriver.cpp | 51 ++
core/sql/cli/Cli.cpp | 31 +-
core/sql/cli/sqlcli.h | 9 +-
core/sql/clitest/blobtest.cpp | 269 +++++++++
core/sql/clitest/blobtest.h | 76 +++
core/sql/clitest/vers_libclitest.cpp | 28 +
core/sql/comexe/ComTdbExeUtil.cpp | 22 +-
core/sql/comexe/ComTdbExeUtil.h | 27 +-
core/sql/comexe/ComTdbRoot.h | 14 +-
core/sql/common/BaseTypes.cpp | 27 +-
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilCli.cpp | 8 +-
core/sql/executor/ExExeUtilCli.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 167 ++++--
core/sql/executor/ExHdfsScan.cpp | 8 +-
core/sql/executor/hiveHook.cpp | 2 +-
core/sql/exp/ExpLOB.cpp | 70 ++-
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 26 +-
core/sql/exp/ExpLOBenums.h | 1 +
core/sql/exp/ExpLOBinterface.cpp | 24 +-
core/sql/exp/ExpLOBinterface.h | 1 +
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/generator/GenRelExeUtil.cpp | 11 +-
core/sql/generator/GenRelMisc.cpp | 4 +
core/sql/nskgmake/Makerules.linux | 4 +-
core/sql/nskgmake/clitest/Makefile | 36 ++
core/sql/nskgmake/clitestdriver/Makefile | 35 ++
core/sql/optimizer/ItemExpr.cpp | 4 +-
core/sql/optimizer/ItemFunc.h | 17 +-
core/sql/optimizer/RelExeUtil.cpp | 4 +-
core/sql/optimizer/RelExeUtil.h | 12 +-
core/sql/optimizer/SynthType.cpp | 33 +-
core/sql/parser/sqlparser.y | 88 +--
core/sql/regress/executor/EXPECTED130 | 275 ++++++++-
core/sql/regress/executor/TEST130 | 8 +-
core/sql/regress/executor/TEST130_argfile | 3 +
core/sql/sqlcomp/DefaultConstants.h | 2 +
core/sql/sqlcomp/NADefaults.h | 2 +
core/sql/sqlcomp/nadefaults.cpp | 141 +++--
core/sql/ustat/hs_globals.cpp | 75 +++
dcs/bin/scripts/dcsbind.sh | 14 +-
dcs/pom.xml | 6 +
.../main/asciidoc/_chapters/architecture.adoc | 15 +-
.../main/asciidoc/_chapters/configuration.adoc | 78 ++-
.../main/asciidoc/_chapters/external_apis.adoc | 34 --
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 30 +-
.../asciidoc/_chapters/troubleshooting.adoc | 4 +-
dcs/src/main/asciidoc/index.adoc | 1 -
dcs/src/main/resources/dcs-default.xml | 45 --
.../java/org/trafodion/jdbc_test/BatchTest.java | 582 +++++++++++++++++++
.../org/trafodion/jdbc_test/JdbcCommon.java | 224 +++++++
install/installer/cloud_cli_setup | 97 ++++
install/installer/dcs_installer | 39 +-
install/installer/traf_config_setup | 123 ++--
install/installer/trafodion_config_default | 15 +
install/installer/trafodion_install | 8 +-
.../org/trafodion/phoenix/end2end/BaseTest.java | 5 -
.../trafodion/phoenix/end2end/BatchTest.java | 250 --------
73 files changed, 2910 insertions(+), 825 deletions(-)
----------------------------------------------------------------------