link to top Makefile
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e55da58f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e55da58f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e55da58f Branch: refs/heads/master Commit: e55da58fb7fb73564964e503e54c37bb0671e426 Parents: 417bb81 Author: Kevin Xu <[email protected]> Authored: Fri Dec 11 14:58:54 2015 +0800 Committer: Kevin Xu <[email protected]> Committed: Fri Dec 11 14:58:54 2015 +0800 ---------------------------------------------------------------------- core/Makefile | 5 ++++- core/conn/spj_mgmt/pom.xml | 5 ----- .../main/java/org/trafodion/mgmt/JarFileMgmt.java | 1 + core/conn/spj_mgmt/src/main/resources/init_spj.sh | 16 ++++++++-------- 4 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e55da58f/core/Makefile ---------------------------------------------------------------------- diff --git a/core/Makefile b/core/Makefile index ab62c49..c7d2640 100644 --- a/core/Makefile +++ b/core/Makefile @@ -35,7 +35,7 @@ include macros.gmk # Server-side only # Default target (all components) -all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar dcs rest odb +all: $(MPI_TARGET) dbsecurity foundation jdbc_jar $(SEAMONSTER_TARGET) ndcs ci jdbc_type2_jar dcs rest odb spj_mgmt package: pkg-product pkg-client @@ -204,3 +204,6 @@ eclipseclean: trafinstall: cd $(MY_SQROOT)/sql/scripts && install_traf_components + +spj_mgmt: + cd conn/spj_mgmt && $(MAKE) all http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e55da58f/core/conn/spj_mgmt/pom.xml ---------------------------------------------------------------------- diff --git a/core/conn/spj_mgmt/pom.xml b/core/conn/spj_mgmt/pom.xml index 37414c1..e033fda 100644 --- a/core/conn/spj_mgmt/pom.xml +++ b/core/conn/spj_mgmt/pom.xml @@ -33,11 +33,6 @@ <version>1.7.12</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>1.1.2</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e55da58f/core/conn/spj_mgmt/src/main/java/org/trafodion/mgmt/JarFileMgmt.java ---------------------------------------------------------------------- diff --git a/core/conn/spj_mgmt/src/main/java/org/trafodion/mgmt/JarFileMgmt.java b/core/conn/spj_mgmt/src/main/java/org/trafodion/mgmt/JarFileMgmt.java index 0753428..3b50a96 100644 --- a/core/conn/spj_mgmt/src/main/java/org/trafodion/mgmt/JarFileMgmt.java +++ b/core/conn/spj_mgmt/src/main/java/org/trafodion/mgmt/JarFileMgmt.java @@ -109,6 +109,7 @@ public class JarFileMgmt { String nodes = System.getenv("MY_NODES"); if (nodes != null && !"".equals(nodes.trim())) { execShell("pdcp " + nodes + " " + userPath + fileName.trim() + " " + userPath + " "); + execShell("pdsh " + nodes + " chmod 755 " + userPath + fileName.trim()); } } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e55da58f/core/conn/spj_mgmt/src/main/resources/init_spj.sh ---------------------------------------------------------------------- diff --git a/core/conn/spj_mgmt/src/main/resources/init_spj.sh b/core/conn/spj_mgmt/src/main/resources/init_spj.sh index ae1042e..f684a72 100644 --- a/core/conn/spj_mgmt/src/main/resources/init_spj.sh +++ b/core/conn/spj_mgmt/src/main/resources/init_spj.sh @@ -23,19 +23,19 @@ SERVER_JAR=${MY_SQROOT}/export/lib/spj_mgmt.jar SQLCI=${MY_SQROOT}/export/bin32/sqlci CP=/bin/cp -MANAGEABILITY_CATALOG=TRAFODION +CATALOG_NAME=TRAFODION CIS_SCHEMA="_SPJ_" function dropAndCreateSchema { - echo "Creating Schema for CI Server Component" + echo "Creating Schema for SPJ_MGMT" sqlci << sqlciEOF cqd CAT_IGNORE_ALREADY_EXISTS_ERROR 'on'; cqd CAT_IGNORE_DOES_NOT_EXIST_ERROR 'on'; - DROP SCHEMA $MANAGEABILITY_CATALOG.$CIS_SCHEMA CASCADE; - CREATE SCHEMA $MANAGEABILITY_CATALOG.$CIS_SCHEMA; + DROP SCHEMA $CATALOG_NAME.$CIS_SCHEMA CASCADE; + CREATE SCHEMA $CATALOG_NAME.$CIS_SCHEMA; cqd CAT_IGNORE_ALREADY_EXISTS_ERROR 'off'; cqd CAT_IGNORE_DOES_NOT_EXIST_ERROR 'off'; @@ -46,14 +46,14 @@ sqlciEOF function createProcedures { - echo "Creating Procedures in schema '$MANAGEABILITY_CATALOG.$CIS_SCHEMA' " + echo "Creating Procedures in schema '$CATALOG_NAME.$CIS_SCHEMA' " sqlci << procEOF cqd CAT_IGNORE_ALREADY_EXISTS_ERROR 'on'; cqd CAT_IGNORE_DOES_NOT_EXIST_ERROR 'on'; -- Creating Procedures - set schema $MANAGEABILITY_CATALOG.$CIS_SCHEMA; + set schema $CATALOG_NAME.$CIS_SCHEMA; DROP LIBRARY SPJMGMT CASCADE; CREATE LIBRARY SPJMGMT FILE '${SERVER_JAR}'; @@ -129,9 +129,9 @@ function createProcedures { GRANT EXECUTE ON PROCEDURE RMREX TO PUBLIC; CREATE PROCEDURE GETFILE ( - IN FILENAME VARCHAR(256) CHARACTER SET ISO88591, + IN FILENAME VARCHAR(256) CHARACTER SET UTF8, IN OFFSET INTEGER, - OUT FILEDATA VARCHAR(102400) CHARACTER SET ISO88591, + OUT FILEDATA VARCHAR(51200) CHARACTER SET UTF8, OUT DATALENGTH LARGEINT) EXTERNAL NAME 'com.traf.mgmt.JarFileMgmt.get (java.lang.String,int,java.lang.String[],long[])' EXTERNAL SECURITY DEFINER
