From 26c5c7336a720ff341790c5f7d4b5e94cccd75bd Mon Sep 17 00:00:00 2001 From: Kevin Xu Date: Thu, 24 May 2018 07:30:28 +0800 Subject: [PATCH 01/16] Isolated folder for trafodion-sql --- core/Makefile | 2 +- core/sql/lib_mgmt/Makefile | 2 +- core/sql/nskgmake/Makerules.mk | 22 ++------- core/sql/sqlmid/Makefile | 49 +++++++++++++++++++ core/sql/{ => sqlmid}/pom.xml | 0 core/sql/{ => sqlmid}/pom.xml.apache | 0 core/sql/{ => sqlmid}/pom.xml.hdp | 0 .../java/org/trafodion/sql/HBaseClient.java | 0 .../org/trafodion/sql/HBulkLoadClient.java | 0 .../java/org/trafodion/sql/HDFSClient.java | 0 .../java/org/trafodion/sql/HTableClient.java | 0 .../main/java/org/trafodion/sql/HdfsScan.java | 0 .../java/org/trafodion/sql/HiveClient.java | 0 .../java/org/trafodion/sql/OrcFileReader.java | 0 .../org/trafodion/sql/SequenceFileReader.java | 0 .../org/trafodion/sql/SequenceFileWriter.java | 0 .../org/trafodion/sql/TrafConfiguration.java | 0 .../org/trafodion/sql/TrafRegionStats.java | 0 .../sql/udr/CardinalityConstraintInfo.java | 0 .../org/trafodion/sql/udr/ColumnInfo.java | 0 .../sql/udr/ComparisonPredicateInfo.java | 0 .../org/trafodion/sql/udr/ConstraintInfo.java | 0 .../org/trafodion/sql/udr/LmCharsetCoder.java | 0 .../org/trafodion/sql/udr/LmClassLoader.java | 0 .../org/trafodion/sql/udr/LmT2Driver.java | 0 .../sql/udr/LmUDRObjMethodInvoke.java | 0 .../java/org/trafodion/sql/udr/LmUtility.java | 0 .../udr/MethodValidationFailedException.java | 0 .../java/org/trafodion/sql/udr/OrderInfo.java | 0 .../trafodion/sql/udr/ParameterListInfo.java | 0 .../org/trafodion/sql/udr/PartitionInfo.java | 0 .../org/trafodion/sql/udr/PredicateInfo.java | 0 .../org/trafodion/sql/udr/ProvenanceInfo.java | 0 .../sql/udr/TMUDRSerializableObject.java | 0 .../java/org/trafodion/sql/udr/TableInfo.java | 0 .../java/org/trafodion/sql/udr/TupleInfo.java | 0 .../java/org/trafodion/sql/udr/TypeInfo.java | 0 .../main/java/org/trafodion/sql/udr/UDR.java | 0 .../org/trafodion/sql/udr/UDRException.java | 0 .../trafodion/sql/udr/UDRInvocationInfo.java | 0 .../org/trafodion/sql/udr/UDRPlanInfo.java | 0 .../sql/udr/UDRWriterCompileTimeData.java | 0 .../sql/udr/UniqueConstraintInfo.java | 0 .../org/trafodion/sql/udr/predef/JDBCUDR.java | 0 .../org/trafodion/sql/ustat/ChgAutoList.java | 0 .../org/trafodion/sql/ustat/UstatUtil.java | 0 46 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 core/sql/sqlmid/Makefile rename core/sql/{ => sqlmid}/pom.xml (100%) rename core/sql/{ => sqlmid}/pom.xml.apache (100%) rename core/sql/{ => sqlmid}/pom.xml.hdp (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HBaseClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HBulkLoadClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HDFSClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HTableClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HdfsScan.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HiveClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/OrcFileReader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/SequenceFileReader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/SequenceFileWriter.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/TrafConfiguration.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/TrafRegionStats.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ColumnInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmClassLoader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmT2Driver.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmUtility.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/OrderInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/PartitionInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/PredicateInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TableInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TupleInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TypeInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDR.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRException.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/ustat/UstatUtil.java (100%) diff --git a/core/Makefile b/core/Makefile index bbd0878fbb..45fc1fff36 100644 --- a/core/Makefile +++ b/core/Makefile @@ -259,4 +259,4 @@ trafinstall: cd $(TRAF_HOME)/sql/scripts && install_traf_components lib_mgmt: foundation - cd sql/lib_mgmt && $(MAKE) all + cd sql/lib_mgmt && $(MAKE) all | sed -e "s/$$/ ##(lib_mgmt)/";exit $${PIPESTATUS[0]} diff --git a/core/sql/lib_mgmt/Makefile b/core/sql/lib_mgmt/Makefile index 3dd21007bd..bb7debd33b 100644 --- a/core/sql/lib_mgmt/Makefile +++ b/core/sql/lib_mgmt/Makefile @@ -22,7 +22,7 @@ INSTALL_LIBDIR := ${TRAF_HOME}/export/lib CP :=/bin/cp -f all: - @$(MAVEN) package -DskipTests + @$(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(lib_mgmt)/";exit $${PIPESTATUS[0]} mkdir -p ${INSTALL_LIBDIR} ${CP} target/lib_mgmt-${TRAFODION_VER}.jar ${INSTALL_LIBDIR}/lib_mgmt.jar clean: diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index d61cb77e71..bcf520af65 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -271,27 +271,11 @@ endif # DLLs should be built before executables, so we are adding this dependency here. # $(FINAL_EXES): $(FINAL_DLLS) -# Java files get built through Maven mavenbuild: - # create a jar manifest file with the correct version information - mkdir -p ../src/main/resources - $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf - # run maven - set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_apache: - set -o pipefail && cd ..; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_hdp: - set -o pipefail && cd ..; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib + cd ../sqlmid && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} # This is where the top-level is declared to build everything. -buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild mavenbuild_hdp mavenbuild_apache +buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild clean: @echo "Removing intermediate objects for $(TARGTYPE)/$(ARCHBITS)/$(FLAVOR)" @@ -305,4 +289,4 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - @rm -rf $(TRAF_HOME)/export/lib/trafodion-sql-*.jar + cd ../sqlmid && $(MAKE) clean diff --git a/core/sql/sqlmid/Makefile b/core/sql/sqlmid/Makefile new file mode 100644 index 0000000000..87ab64aa84 --- /dev/null +++ b/core/sql/sqlmid/Makefile @@ -0,0 +1,49 @@ +# @@@ 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 @@@ + +INSTALL_LIBDIR := ${TRAF_HOME}/export/lib +CP :=/bin/cp -f +all: mavenbuild mavenbuild_apache mavenbuild_hdp + +# Java files get built through Maven +mavenbuild: + # create a jar manifest file with the correct version information + mkdir -p ../src/main/resources + #$(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf + # run maven + $(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-cdh)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib + +# Java files get built through Maven +mavenbuild_apache: + $(MAVEN) -f pom.xml.apache package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-apache)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib + +# Java files get built through Maven +mavenbuild_hdp: + $(MAVEN) -f pom.xml.hdp package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-hdp)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib +clean: + @rm -f ${INSTALL_LIBDIR}/trafodion-sql-*.jar + @$(MAVEN) clean + @$(MAVEN) -f pom.xml.apache clean + @$(MAVEN) -f pom.xml.hdp clean +cleanall: clean diff --git a/core/sql/pom.xml b/core/sql/sqlmid/pom.xml similarity index 100% rename from core/sql/pom.xml rename to core/sql/sqlmid/pom.xml diff --git a/core/sql/pom.xml.apache b/core/sql/sqlmid/pom.xml.apache similarity index 100% rename from core/sql/pom.xml.apache rename to core/sql/sqlmid/pom.xml.apache diff --git a/core/sql/pom.xml.hdp b/core/sql/sqlmid/pom.xml.hdp similarity index 100% rename from core/sql/pom.xml.hdp rename to core/sql/sqlmid/pom.xml.hdp diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HBaseClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HDFSClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HTableClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HdfsScan.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HiveClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/OrcFileReader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/OrcFileReader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/SequenceFileReader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/SequenceFileReader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafRegionStats.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/TrafRegionStats.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TableInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TableInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDR.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRException.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRException.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java From fbb1cdb0132796ade76a7dc8a07eb29f8a863d5f Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Tue, 29 May 2018 11:41:19 +0000 Subject: [PATCH 02/16] Put the jars into one --- core/sql/sqlmid/Makefile | 24 ++---- core/sql/sqlmid/pom.xml | 119 +++++++++++++++++++----------- core/sql/sqlmid/pom.xml.apache | 131 --------------------------------- core/sql/sqlmid/pom.xml.hdp | 111 ---------------------------- 4 files changed, 85 insertions(+), 300 deletions(-) delete mode 100644 core/sql/sqlmid/pom.xml.apache delete mode 100644 core/sql/sqlmid/pom.xml.hdp diff --git a/core/sql/sqlmid/Makefile b/core/sql/sqlmid/Makefile index 87ab64aa84..534bb07426 100644 --- a/core/sql/sqlmid/Makefile +++ b/core/sql/sqlmid/Makefile @@ -21,29 +21,19 @@ INSTALL_LIBDIR := ${TRAF_HOME}/export/lib CP :=/bin/cp -f -all: mavenbuild mavenbuild_apache mavenbuild_hdp +all: mavenbuild # Java files get built through Maven mavenbuild: # create a jar manifest file with the correct version information - mkdir -p ../src/main/resources - #$(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf # run maven - $(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-cdh)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib + $(MAVEN) -Pproduction install -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-$(TRAFODION_VER).jar $(TRAF_HOME)/export/lib + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-apache-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-cdh-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-hdp-$(TRAFODION_VER).jar -# Java files get built through Maven -mavenbuild_apache: - $(MAVEN) -f pom.xml.apache package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-apache)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_hdp: - $(MAVEN) -f pom.xml.hdp package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-hdp)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib clean: @rm -f ${INSTALL_LIBDIR}/trafodion-sql-*.jar - @$(MAVEN) clean - @$(MAVEN) -f pom.xml.apache clean - @$(MAVEN) -f pom.xml.hdp clean + @$(MAVEN) -Pproduction clean cleanall: clean diff --git a/core/sql/sqlmid/pom.xml b/core/sql/sqlmid/pom.xml index cd025a1858..9c78b36e98 100644 --- a/core/sql/sqlmid/pom.xml +++ b/core/sql/sqlmid/pom.xml @@ -19,23 +19,74 @@ * limitations under the License. */ --> + org.trafodion.sql + 4.0.0 + trafodion-sql + ${INTERNAL_VERSION} + trafodion-sql + Java code for SQL engine in Trafodion + - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ + Apache + https://repo1.maven.org/maven2 UTF-8 - 2.6.0-cdh5.4.4 - ${env.HBASE_DEP_VER_CDH} - ${env.HBASE_TRX_ID_CDH} - ${env.HIVE_DEP_VER_CDH} - ${env.THRIFT_DEP_VER} - 1.7 + 2.6.0 + apache + + + dev + + 0.1 + 1.2.0 + hbase-trx-apache1_2 + 1.1.0 + 0.9.0 + + + true + + + + production + + ${env.TRAFODION_VER} + ${env.HBASE_DEP_VER_APACHE} + ${env.HBASE_TRX_ID_APACHE} + ${env.HIVE_DEP_VER_APACHE} + ${THRIFT_DEP_VER} + 1.7 + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${basedir}/../../sqf/export/include/SCMBuildMan.mf + + + + + + + + + + + package + ${project.build.directory}/classes_${hbase-flavor-id} + ${project.artifactId}-${project.version} + + org.apache.hbase @@ -47,26 +98,41 @@ hbase-client ${hbase.version} + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + ${hbase.version} + org.apache.hbase.client.transactional ${hbase-trx.id} ${env.TRAFODION_VER} system - ${env.HBASE_TRXDIR}/${env.HBASE_TRX_JAR} + ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar + + + org.apache.hadoop + hadoop-common + ${hadoop.version} org.apache.hive - hive-jdbc + hive-exec ${hive.version} org.apache.hive - hive-metastore + hive-jdbc ${hive.version} org.apache.hive - hive-exec + hive-metastore ${hive.version} @@ -86,33 +152,4 @@ - org.trafodion.sql - 4.0.0 - trafodion-sql-cdh - ${env.TRAFODION_VER} - trafodion-sql - Java code for SQL engine in Trafodion - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - public - - - - diff --git a/core/sql/sqlmid/pom.xml.apache b/core/sql/sqlmid/pom.xml.apache deleted file mode 100644 index 938bbbbcba..0000000000 --- a/core/sql/sqlmid/pom.xml.apache +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - Apache - https://repo1.maven.org/maven2 - - - - - UTF-8 - 2.6.0 - apache - ${env.HBASE_DEP_VER_APACHE} - ${env.HBASE_TRX_ID_APACHE} - ${env.HIVE_DEP_VER_APACHE} - ${THRIFT_DEP_VER} - 1.7 - - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hive - hive-exec - ${hive.version} - - - org.apache.hive - hive-jdbc - ${hive.version} - - - org.apache.hive - hive-metastore - ${hive.version} - - - org.apache.thrift - libthrift - ${thrift.version} - - - commons-configuration - commons-configuration - 1.6 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - org.trafodion.sql - 4.0.0 - trafodion-sql-apache - ${env.TRAFODION_VER} - trafodion-sql-apache - Java code for SQL engine in Trafodion - - diff --git a/core/sql/sqlmid/pom.xml.hdp b/core/sql/sqlmid/pom.xml.hdp deleted file mode 100644 index 5b1216f78f..0000000000 --- a/core/sql/sqlmid/pom.xml.hdp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Horton Works - http://repo.hortonworks.com/content/groups/public/ - - - - - UTF-8 - 2.7.1.2.3.2.0-2950 - ${env.HBASE_DEP_VER_HDP} - ${env.HBASE_TRX_ID_HDP} - ${env.HIVE_DEP_VER_HDP} - hdp - 0.9.0 - 1.7 - - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hive - hive-exec - ${hive.version} - - - org.apache.hive - hive-jdbc - ${hive.version} - - - org.apache.hive - hive-metastore - ${hive.version} - - - org.apache.thrift - libthrift - ${thrift.version} - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - org.trafodion.sql - 4.0.0 - trafodion-sql-${hbase-flavor-id} - ${env.TRAFODION_VER} - trafodion-sql - Java code for SQL engine in Trafodion - - From a1e406e1a1d3861554917445694e5d71cff603d2 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 07:58:46 +0000 Subject: [PATCH 03/16] refactor trx and tm project --- core/sqf/src/seatrans/hbase-trx/Makefile | 56 +-- .../hbase-trx/{pom.xml.apache10 => pom.xml} | 376 ++++++++++++------ .../src/seatrans/hbase-trx/pom.xml.apache11 | 336 ---------------- .../src/seatrans/hbase-trx/pom.xml.apache12 | 336 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 353 ---------------- .../sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 350 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.mapr | 334 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.sscc | 349 ---------------- core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 11 +- core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 91 ++++- .../seatrans/tm/hbasetmlib2/pom.xml.apache | 115 ------ .../src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 88 ---- .../org/trafodion/sql/TrafConfiguration.java | 1 - 16 files changed, 364 insertions(+), 3431 deletions(-) rename core/sqf/src/seatrans/hbase-trx/{pom.xml.apache10 => pom.xml} (69%) delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.mapr delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.sscc delete mode 100644 core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache delete mode 100644 core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp delete mode 120000 core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile index c52821fb54..83b3cf4e53 100644 --- a/core/sqf/src/seatrans/hbase-trx/Makefile +++ b/core/sqf/src/seatrans/hbase-trx/Makefile @@ -43,9 +43,9 @@ all: build_all jdk_1_7_cdh54: build_chk_cdh54 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.4 - echo "$(MAVEN) package -DskipTests" + echo "$(MAVEN) install -DskipTests" echo "### For full Maven output, see file build_trx.log" - set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_4 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -53,7 +53,7 @@ jdk_1_7_cdh54: build_chk_cdh54 jdk_1_7_cdh55: build_chk_cdh55 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.5 - set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_5 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -61,13 +61,13 @@ jdk_1_7_cdh55: build_chk_cdh55 jdk_1_7_cdh57: build_chk_cdh57 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.7 - set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_7 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) jdk_1_7_mapr: build_chk_mapr - set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pmapr install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -75,7 +75,7 @@ jdk_1_7_mapr: build_chk_mapr jdk_1_7_hdp: build_chk_hdp $(REINSTATE_ORIG) $(UNCOMMENT_STRING) HDP2.3 - set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Phdp2_3 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -83,7 +83,7 @@ jdk_1_7_hdp: build_chk_hdp jdk_1_7_apache10: build_chk_apache10 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.0 - set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_0 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -91,7 +91,7 @@ jdk_1_7_apache10: build_chk_apache10 jdk_1_7_apache11: build_chk_apache11 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.1 - set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_1 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -99,7 +99,7 @@ jdk_1_7_apache11: build_chk_apache11 jdk_1_7_apache12: build_chk_apache12 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.2 - set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_2 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -147,22 +147,22 @@ build_chk_hdp: @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi clean: - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME) - $(REINSTATE_ORIG) - -$(MAVEN) -f pom.xml.apache10 clean | grep ERROR - -$(MAVEN) -f pom.xml.apache11 clean | grep ERROR - -$(MAVEN) -f pom.xml.apache12 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh57 clean | grep ERROR - -$(MAVEN) -f pom.xml.mapr clean | grep ERROR - -$(MAVEN) -f pom.xml.hdp clean | grep ERROR - $(RM) build_trx.log - $(RM) $(VFILE) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME) + -$(REINSTATE_ORIG) + -$(MAVEN) -f pom.xml -Papache1_0 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Papache1_1 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Papache1_2 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_4 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_5 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_7 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + #-$(MAVEN) -f pom.xml -Pmapr clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Phdp2_3 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(RM) build_trx.log + -$(RM) $(VFILE) diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 b/core/sqf/src/seatrans/hbase-trx/pom.xml similarity index 69% rename from core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 rename to core/sqf/src/seatrans/hbase-trx/pom.xml index 6e088f1ba2..ea1ee59a7b 100755 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 +++ b/core/sqf/src/seatrans/hbase-trx/pom.xml @@ -19,138 +19,164 @@ * limitations under the License. */ --> + org.apache + 4.0.0 + hbase-trx-${ARTIFACT_ID} + ${INTERNAL_VERSION} + HBase - Trx + Trx of HBase usage + Apache http://mvnrepository.com/artifact/ default + + cloudera + https://repository.cloudera.com/artifactory/cloudera-repos/ + + + + true + always + warn + + + false + never + fail + + HDPReleases + HDP Releases + http://repo.hortonworks.com/content/repositories/releases/ + default + + + HDPContent + HDP Content + http://repo.hortonworks.com/content/groups/public/ + default + + + mapr release + http://repository.mapr.com/maven + true + true + - 2.4.0 - 1.0.2 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache + UTF-8 + 2.5.0 + 2.5.0 + 1.7 - org.apache - 4.0.0 - hbase-trx-apache1_0 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - + + + apache1_0 + + apache1_0 + ${env.TRAFODION_VER} + 2.4.0 + 1.0.2 + apache + + + true + + + + apache1_1 + + apache1_1 + ${env.TRAFODION_VER} + 2.6.0 + 1.1.2 + apache + + + + apache1_2 + + apache1_2 + ${env.TRAFODION_VER} + 2.6.0 + 1.2.0 + apache + + + + cdh5_4 + + cdh5_4 + ${env.TRAFODION_VER} + 2.6.0-cdh5.4.4 + 1.0.0-cdh5.4.4 + ${ARTIFACT_ID} + + + + cdh5_5 + + cdh5_5 + ${env.TRAFODION_VER} + 2.6.0-cdh5.5.1 + 1.0.0-cdh5.5.1 + ${ARTIFACT_ID} + + + + cdh5_7 + + cdh5_7 + ${env.TRAFODION_VER} + 2.6.0-cdh5.7.1 + 1.2.0-cdh5.7.1 + ${ARTIFACT_ID} + + + + hdp2_3 + + hdp2_3 + ${env.TRAFODION_VER} + 2.7.1 + ${env.HBASE_DEP_VER_HDP} + ${ARTIFACT_ID} + + + + hdp2_1 + + hdp2_1 + ${env.TRAFODION_VER} + 2.4.0 + 0.98.0.2.1.4.0-632-hadoop2 + ${ARTIFACT_ID} + + + + mapr4_0 + + mapr4_0 + ${env.TRAFODION_VER} + 2.5.0 + 0.98.7-mapr-1501-r1 + ${ARTIFACT_ID} + + + + sscc + + sscc + ${env.TRAFODION_VER} + 2.4.0 + 0.98.0.2.1.4.0-632-hadoop2 + ${ARTIFACT_ID} + + skipTrxTests @@ -303,6 +329,7 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-maven-plugins + 2.6.0 compile-protoc @@ -333,4 +360,111 @@ if we can combine these profiles somehow --> + + + package + + ${project.build.directory}/classes_${trx-suffix} + ${project.artifactId}-${project.version} + + + + + maven-assembly-plugin + 2.2-beta-5 + + true + + + + maven-surefire-plugin + 2.5 + + + ${surefire.firstPartGroups} + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + org.apache.maven.plugins + maven-jar-plugin + + + hbase-trx.jar.versions + + + + + + + + + + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + ${hbase.version} + + + org.apache.hbase + hbase-client + ${hbase.version} + + + org.apache.hbase + hbase-server + ${hbase.version} + + + org.apache.hbase + hbase-thrift + ${hbase.version} + + + org.apache.hbase + hbase-annotations + ${hbase.version} + + + org.apache.hbase + hbase-testing-util + test + ${hbase.version} + + + + org.apache.thrift + libthrift + 0.9.1 + + + commons-logging + commons-logging + 1.1.3 + + + org.apache.zookeeper + zookeeper + 3.4.6 + + + com.google.protobuf + protobuf-java + 2.5.0 + + diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 deleted file mode 100755 index 9ee8c1cab7..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - default - - - - - 2.6.0 - 1.1.2 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache - - - org.apache - 4.0.0 - hbase-trx-apache1_1 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 deleted file mode 100644 index 09c353d48e..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - default - - - - - 2.6.0 - 1.2.0 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache - - - org.apache - 4.0.0 - hbase-trx-apache1_2 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 deleted file mode 100755 index 2d54caffce..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.4.4 - 1.0.0-cdh5.4.4 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_4 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_4 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 deleted file mode 100755 index 0f2429e753..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.5.1 - 1.0.0-cdh5.5.1 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_5 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_5 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 deleted file mode 100644 index e5e52725a9..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.7.1 - 1.2.0-cdh5.7.1 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_7 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_7 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp deleted file mode 100755 index 8592b589bb..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - HDPContent - HDP Content - http://repo.hortonworks.com/content/groups/public/ - default - - - - - 2.7.1 - ${env.HBASE_DEP_VER_HDP} - UTF-8 - 1.7 - hdp2_3 - 2.5.0 - - - - org.apache - 4.0.0 - hbase-trx-hdp2_3 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.6 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 deleted file mode 100755 index 8c28a824e1..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 +++ /dev/null @@ -1,350 +0,0 @@ - - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - - - 2.4.0 - 0.98.0.2.1.4.0-632-hadoop2 - - - UTF-8 - 1.7 - - - - - org.apache - 4.0.0 - hbase-trx-hdp2_1 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_hdp2_1_${trx-suffix} - ${project.artifactId}-${project.version}${trx-suffix} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr b/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr deleted file mode 100755 index b3ca10521d..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.mapr +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - mapr release - http://repository.mapr.com/maven - true - true - - - - - 2.5.0 - 0.98.7-mapr-1501-r1 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - mapr4_0 - - - - org.apache - 4.0.0 - hbase-trx-mapr4_0 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc b/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc deleted file mode 100644 index f1c57bb0f2..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - - - 2.4.0 - 0.98.0.2.1.4.0-632-hadoop2 - - - UTF-8 - 1.7 - - - - - org.apache - 4.0.0 - hbase-trx-sscc - ${env.TRAFODION_VER} - HBase - TrxSscc - TrxSscc of HBase usage - - - - package - - ${project.build.directory}/classes_sscc_${trx-suffix} - ${project.artifactId}-${project.version}${trx-suffix} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile index 12859d85fb..18d2d79317 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile @@ -65,13 +65,12 @@ all: $(PROGS) mavenbuild mavenbuild: # create a jar manifest file with the correct version information - mkdir -p src/main/resources - $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf # run maven - set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib + set -o pipefail; $(MAVEN) -Pproduction install -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'; exit $${PIPESTATUS} + cp -pf target/trafodion-dtm-$(TRAFODION_VER).jar $(TRAF_HOME)/export/lib + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-apache-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-cdh-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-hdp-$(TRAFODION_VER).jar $(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS) $(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS) diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml index 0a88d395de..6b8bfaed5e 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml @@ -19,20 +19,67 @@ * limitations under the License. */ --> + org.trafodion.dtm + 4.0.0 + trafodion-dtm + ${INTERNAL_VERSION} + trafodion-dtm + Java code for the Trafodion DTM (Distributed Transaction Manager) + - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ + Apache + http://mvnrepository.com/artifact/ UTF-8 - ${env.HBASE_DEP_VER_CDH} - ${env.HBASE_TRX_ID_CDH} + 2.6.0 1.7 + + + dev + + 0.1 + 1.2.0 + hbase-trx-apache1_2 + 1.1.0 + 0.9.0 + + + true + + + + production + + ${env.TRAFODION_VER} + ${env.HBASE_DEP_VER_APACHE} + ${env.HBASE_TRX_ID_APACHE} + ${env.HIVE_DEP_VER_APACHE} + ${THRIFT_DEP_VER} + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${env.TRAF_HOME}/export/include/SCMBuildMan.mf + + + + + + + + + org.apache.hbase @@ -45,11 +92,9 @@ ${hbase.version} - org.apache.hbase.client.transactional + org.apache ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.HBASE_TRXDIR}/${env.HBASE_TRX_JAR} + ${project.version} org.slf4j @@ -61,16 +106,32 @@ commons-logging 1.1.3 + + org.apache.hadoop + hadoop-common + 2.5.1 + + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + 1.0.0 + + + org.trafodion.sql + trafodion-sql + ${project.version} + - org.trafodion.sql - 4.0.0 - trafodion-dtm-cdh - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - + package + ${project.build.directory}/classes_${hbase-flavor-id} + ${project.artifactId}-${project.version} org.apache.maven.plugins diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache deleted file mode 100644 index 6550926f57..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - - - - - UTF-8 - 2.6.0 - ${env.HBASE_DEP_VER_APACHE} - apache - ${env.HBASE_TRX_ID_APACHE} - 1.7 - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hadoop.hbase.coprocessor.transactional.generated - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.hadoop - hadoop-common - 2.5.1 - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - 1.0.0 - - - - org.trafodion.dtm - 4.0.0 - trafodion-dtm-apache - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-dtm.jar.mf - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp deleted file mode 100644 index 3b626e1c33..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - Horton Works - http://repo.hortonworks.com/content/groups/public/ - - - - - UTF-8 - 2.7.1.2.3.2.0-2950 - ${env.HBASE_DEP_VER_HDP} - hdp - ${env.HBASE_TRX_ID_HDP} - 1.7 - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - - org.trafodion.dtm - 4.0.0 - trafodion-dtm-hdp - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-dtm.jar.mf - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java deleted file mode 120000 index 811c58c044..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../sql/src/main/java/org/trafodion/sql/TrafConfiguration.java \ No newline at end of file From 0695f13b5bbad7f4928a226b44012a4945fa80b0 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 08:36:17 +0000 Subject: [PATCH 04/16] Rename sqlmid to trafodion_sql and add one more folder for java_src --- core/sql/{sqlmid => java_src/trafodion_sql}/Makefile | 0 core/sql/{sqlmid => java_src/trafodion_sql}/pom.xml | 2 +- .../src/main/java/org/trafodion/sql/HBaseClient.java | 0 .../src/main/java/org/trafodion/sql/HBulkLoadClient.java | 0 .../src/main/java/org/trafodion/sql/HDFSClient.java | 0 .../src/main/java/org/trafodion/sql/HTableClient.java | 0 .../src/main/java/org/trafodion/sql/HdfsScan.java | 0 .../src/main/java/org/trafodion/sql/HiveClient.java | 0 .../src/main/java/org/trafodion/sql/OrcFileReader.java | 0 .../src/main/java/org/trafodion/sql/SequenceFileReader.java | 0 .../src/main/java/org/trafodion/sql/SequenceFileWriter.java | 0 .../src/main/java/org/trafodion/sql/TrafConfiguration.java | 0 .../src/main/java/org/trafodion/sql/TrafRegionStats.java | 0 .../java/org/trafodion/sql/udr/CardinalityConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ColumnInfo.java | 0 .../java/org/trafodion/sql/udr/ComparisonPredicateInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java | 0 .../src/main/java/org/trafodion/sql/udr/LmClassLoader.java | 0 .../src/main/java/org/trafodion/sql/udr/LmT2Driver.java | 0 .../main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java | 0 .../src/main/java/org/trafodion/sql/udr/LmUtility.java | 0 .../trafodion/sql/udr/MethodValidationFailedException.java | 0 .../src/main/java/org/trafodion/sql/udr/OrderInfo.java | 0 .../main/java/org/trafodion/sql/udr/ParameterListInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/PartitionInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/PredicateInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java | 0 .../java/org/trafodion/sql/udr/TMUDRSerializableObject.java | 0 .../src/main/java/org/trafodion/sql/udr/TableInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/TupleInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/TypeInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/UDR.java | 0 .../src/main/java/org/trafodion/sql/udr/UDRException.java | 0 .../main/java/org/trafodion/sql/udr/UDRInvocationInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java | 0 .../java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java | 0 .../main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java | 0 .../src/main/java/org/trafodion/sql/ustat/ChgAutoList.java | 0 .../src/main/java/org/trafodion/sql/ustat/UstatUtil.java | 0 core/sql/nskgmake/Makerules.mk | 4 ++-- 42 files changed, 3 insertions(+), 3 deletions(-) rename core/sql/{sqlmid => java_src/trafodion_sql}/Makefile (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/pom.xml (98%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HBaseClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HBulkLoadClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HDFSClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HTableClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HdfsScan.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HiveClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/OrcFileReader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/SequenceFileReader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/SequenceFileWriter.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/TrafConfiguration.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/TrafRegionStats.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ColumnInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmClassLoader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmT2Driver.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmUtility.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/OrderInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/PartitionInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/PredicateInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TableInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TupleInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TypeInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDR.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRException.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/ustat/UstatUtil.java (100%) diff --git a/core/sql/sqlmid/Makefile b/core/sql/java_src/trafodion_sql/Makefile similarity index 100% rename from core/sql/sqlmid/Makefile rename to core/sql/java_src/trafodion_sql/Makefile diff --git a/core/sql/sqlmid/pom.xml b/core/sql/java_src/trafodion_sql/pom.xml similarity index 98% rename from core/sql/sqlmid/pom.xml rename to core/sql/java_src/trafodion_sql/pom.xml index 9c78b36e98..0937abbaba 100644 --- a/core/sql/sqlmid/pom.xml +++ b/core/sql/java_src/trafodion_sql/pom.xml @@ -71,7 +71,7 @@ - ${basedir}/../../sqf/export/include/SCMBuildMan.mf + ${env.TRAF_HOME}/export/include/SCMBuildMan.mf diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBaseClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBaseClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HDFSClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HDFSClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HTableClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HTableClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HdfsScan.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HdfsScan.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HiveClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HiveClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/OrcFileReader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/OrcFileReader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileReader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileReader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafConfiguration.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafRegionStats.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafRegionStats.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUtility.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUtility.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TableInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TableInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDR.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDR.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRException.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRException.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index bcf520af65..f321d48fa7 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -272,7 +272,7 @@ endif # $(FINAL_EXES): $(FINAL_DLLS) mavenbuild: - cd ../sqlmid && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} + cd ../java_src/trafodion_sql && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} # This is where the top-level is declared to build everything. buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild @@ -289,4 +289,4 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - cd ../sqlmid && $(MAKE) clean + cd ../java_src/trafodion_sql && $(MAKE) clean From a828c3732ba3a58ddf21dbd002b20acb241202b2 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 09:47:17 +0000 Subject: [PATCH 05/16] Move trafodion-sql after trx build --- core/Makefile | 8 ++++---- core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 2 +- core/sqf/src/tm/Makefile | 5 ++++- core/sql/java_src/trafodion_sql/pom.xml | 4 +--- core/sql/nskgmake/Makerules.mk | 6 +----- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/core/Makefile b/core/Makefile index 45fc1fff36..1452bd06b9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -220,7 +220,7 @@ rpmbuild: rpmpackage mv $(RPMROOT)/RPMS/$(ARCH)/$(PKG_PROD)*.rpm ../distribution/${OS_TYPE}${OS_MAJOR}/ -eclipse: rest/.project dcs/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project +eclipse: rest/.project dcs/.project sql/java_src/trafodion_sql/.project sqf/src/seatrans/hbase-trx/.project .project @echo @echo @echo " Now you can import 5 projects in Eclipse:" @@ -238,8 +238,8 @@ rest/.project: dcs/.project: cd ../dcs && $(MAVEN) eclipse:eclipse -sql/.project: - cd sql && $(MAVEN) eclipse:eclipse +sql/java_src/trafodion_sql/.project: + cd sql/java_src/trafodion_sql && $(MAVEN) eclipse:eclipse sqf/src/seatrans/hbase-trx/.project: cd sqf/src/seatrans/hbase-trx && $(MAVEN) eclipse:eclipse @@ -251,7 +251,7 @@ sqf/src/seatrans/hbase-trx/.project: eclipseclean: $(RM) rest/.classpath rest/.project $(RM) ../dcs/.classpath ../dcs/.project - $(RM) sql/.classpath sql/.project + $(RM) sql/java_src/trafodion_sql/.classpath sql/java_src/trafodion_sql/.project $(RM) sqf/src/seatrans/hbase-trx/.classpath sqf/src/seatrans/hbase-trx/.project $(RM) .cproject .project diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile index 18d2d79317..7e0b9fe6d4 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile @@ -99,7 +99,7 @@ clean: $(RM) *.gcda *.gcno *.gcov $(RM) -f $(OUTDIR)/*.o $(RM) -rf $(TRAF_HOME)/export/lib/trafodion-dtm-*.jar - -$(MAVEN) -f pom.xml clean + -$(MAVEN) -f pom.xml -Pproduction clean cleanall: clean $(RM) -rf $(BUILD_PLAT) diff --git a/core/sqf/src/tm/Makefile b/core/sqf/src/tm/Makefile index ff5686e4f7..d7d2ed3680 100644 --- a/core/sqf/src/tm/Makefile +++ b/core/sqf/src/tm/Makefile @@ -144,6 +144,8 @@ all: $(LIBEXPDIR)/libstmlib.so cp_trx_jar cp_trx_jar: cd $(HBASE_TRX_LOC); make +trafodion_sql_build: cp_trx_jar + cd ../../../sql/java_src/trafodion_sql && $(MAKE) 2>&1 all: $(LIBEXPDIR)/libsxatmlib.so $(LIBEXPDIR)/libstmlib.so $(PROGS) $(LIBEXPDIR)/libxarm.so cd tools; $(MAKE) @@ -167,7 +169,7 @@ $(LIBEXPDIR)/libstmlib.so: $(LIBSTMOBJS) $(LIBEXPDIR)/libsxatmlib.so: $(LIBSXATMOBJS) $(CXX) $(LNK_FLGS) -shared -o $@ $(LIBSXATMOBJS) $(LIBSTMX) -L$(LIBEXPDIR) -llog4cxx -$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSXATMOBJS) cp_trx_jar +$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSXATMOBJS) trafodion_sql_build cp_trx_jar cd $(HBASETMLIB); $(MAKE) @@ -197,6 +199,7 @@ clean: $(RM) $(ALLOBJS) $(RM) $(CDEPFILES) cd $(HBASE_TRX_LOC); make clean + cd ../../../sql/java_src/trafodion_sql && $(MAKE) clean @echo "PWD = " `pwd` cd tools; $(MAKE) clean @echo "PWD = " `pwd` diff --git a/core/sql/java_src/trafodion_sql/pom.xml b/core/sql/java_src/trafodion_sql/pom.xml index 0937abbaba..01069a77f0 100644 --- a/core/sql/java_src/trafodion_sql/pom.xml +++ b/core/sql/java_src/trafodion_sql/pom.xml @@ -109,11 +109,9 @@ ${hbase.version} - org.apache.hbase.client.transactional + org.apache ${hbase-trx.id} ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar org.apache.hadoop diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index f321d48fa7..cca0ed2c00 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -271,11 +271,8 @@ endif # DLLs should be built before executables, so we are adding this dependency here. # $(FINAL_EXES): $(FINAL_DLLS) -mavenbuild: - cd ../java_src/trafodion_sql && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} - # This is where the top-level is declared to build everything. -buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild +buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) clean: @echo "Removing intermediate objects for $(TARGTYPE)/$(ARCHBITS)/$(FLAVOR)" @@ -289,4 +286,3 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - cd ../java_src/trafodion_sql && $(MAKE) clean From 93d4e5ea27a23d3a64567f7bd610ff567859a148 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Thu, 31 May 2018 02:25:00 +0000 Subject: [PATCH 06/16] deal with site error with jdk8 --- core/conn/jdbcT4/pom.xml | 4 ++++ core/rest/pom.xml | 1 + dcs/Makefile | 2 +- dcs/pom.xml | 3 ++- wms/pom.xml | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml index 1750c4228a..b456874996 100644 --- a/core/conn/jdbcT4/pom.xml +++ b/core/conn/jdbcT4/pom.xml @@ -260,6 +260,10 @@ org.apache.maven.plugins maven-javadoc-plugin 2.9 + + true + -Xdoclint:none + attach-javadocs diff --git a/core/rest/pom.xml b/core/rest/pom.xml index 52c276ddf5..b0ca98dd64 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -640,6 +640,7 @@ ${maven.javadoc.plugin.version} true + -Xdoclint:none diff --git a/dcs/Makefile b/dcs/Makefile index 76c64b92d2..36a7c9df8b 100644 --- a/dcs/Makefile +++ b/dcs/Makefile @@ -43,7 +43,7 @@ build_chk: @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi clean: - -$(MAVEN) clean | grep ERROR + -$(MAVEN) clean | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile' $(RM) build_dcs.log $(RM) $(VFILE) $(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME) diff --git a/dcs/pom.xml b/dcs/pom.xml index 206e424489..8e7e73c225 100644 --- a/dcs/pom.xml +++ b/dcs/pom.xml @@ -500,7 +500,7 @@ 1.6 - 3.3 + 3.6 2.9.1 2.6 2.3 @@ -742,6 +742,7 @@ ${maven.javadoc.plugin.version} true + -Xdoclint:none diff --git a/wms/pom.xml b/wms/pom.xml index c79985c5e2..9650bc03b2 100644 --- a/wms/pom.xml +++ b/wms/pom.xml @@ -726,6 +726,7 @@ 2.6.1 true + -Xdoclint:none From 5d94beb148be0f1ec0a2f583c286829d4ad88acd Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Thu, 31 May 2018 06:09:37 +0000 Subject: [PATCH 07/16] put doclint into profile for supoorting jdk7 and jdk8 --- core/conn/jdbcT4/pom.xml | 11 ++++++++++- core/rest/pom.xml | 13 +++++++++++-- dcs/pom.xml | 11 ++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml index b456874996..6d9b3bbcbd 100644 --- a/core/conn/jdbcT4/pom.xml +++ b/core/conn/jdbcT4/pom.xml @@ -213,6 +213,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + apache-release @@ -262,7 +271,7 @@ 2.9 true - -Xdoclint:none + ${javadoc.opts} diff --git a/core/rest/pom.xml b/core/rest/pom.xml index b0ca98dd64..fab5248f8a 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -536,6 +536,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + @@ -639,8 +648,8 @@ maven-javadoc-plugin ${maven.javadoc.plugin.version} - true - -Xdoclint:none + true + -Xdoclint:none diff --git a/dcs/pom.xml b/dcs/pom.xml index 8e7e73c225..760de9a459 100644 --- a/dcs/pom.xml +++ b/dcs/pom.xml @@ -674,6 +674,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + runSmallTests @@ -742,7 +751,7 @@ ${maven.javadoc.plugin.version} true - -Xdoclint:none + ${javadoc.opts} From 3f862fa33a234cfc5c950822602a11c49f5a4cc9 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Fri, 1 Jun 2018 01:21:01 +0000 Subject: [PATCH 08/16] fix rest doclint issue --- core/rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/rest/pom.xml b/core/rest/pom.xml index fab5248f8a..2a6ee16a98 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -649,7 +649,7 @@ ${maven.javadoc.plugin.version} true - -Xdoclint:none + ${javadoc.opts} From 30d2dcc2d827a8aa16c13086e74d403d12b529eb Mon Sep 17 00:00:00 2001 From: Kevin Xu Date: Thu, 24 May 2018 07:30:28 +0800 Subject: [PATCH 09/16] Isolated folder for trafodion-sql --- core/Makefile | 2 +- core/sql/lib_mgmt/Makefile | 2 +- core/sql/nskgmake/Makerules.mk | 22 ++------- core/sql/sqlmid/Makefile | 49 +++++++++++++++++++ core/sql/{ => sqlmid}/pom.xml | 0 core/sql/{ => sqlmid}/pom.xml.apache | 0 core/sql/{ => sqlmid}/pom.xml.hdp | 0 .../java/org/trafodion/sql/HBaseClient.java | 0 .../org/trafodion/sql/HBulkLoadClient.java | 0 .../java/org/trafodion/sql/HDFSClient.java | 0 .../java/org/trafodion/sql/HTableClient.java | 0 .../main/java/org/trafodion/sql/HdfsScan.java | 0 .../java/org/trafodion/sql/HiveClient.java | 0 .../java/org/trafodion/sql/OrcFileReader.java | 0 .../org/trafodion/sql/SequenceFileReader.java | 0 .../org/trafodion/sql/SequenceFileWriter.java | 0 .../org/trafodion/sql/TrafConfiguration.java | 0 .../org/trafodion/sql/TrafRegionStats.java | 0 .../sql/udr/CardinalityConstraintInfo.java | 0 .../org/trafodion/sql/udr/ColumnInfo.java | 0 .../sql/udr/ComparisonPredicateInfo.java | 0 .../org/trafodion/sql/udr/ConstraintInfo.java | 0 .../org/trafodion/sql/udr/LmCharsetCoder.java | 0 .../org/trafodion/sql/udr/LmClassLoader.java | 0 .../org/trafodion/sql/udr/LmT2Driver.java | 0 .../sql/udr/LmUDRObjMethodInvoke.java | 0 .../java/org/trafodion/sql/udr/LmUtility.java | 0 .../udr/MethodValidationFailedException.java | 0 .../java/org/trafodion/sql/udr/OrderInfo.java | 0 .../trafodion/sql/udr/ParameterListInfo.java | 0 .../org/trafodion/sql/udr/PartitionInfo.java | 0 .../org/trafodion/sql/udr/PredicateInfo.java | 0 .../org/trafodion/sql/udr/ProvenanceInfo.java | 0 .../sql/udr/TMUDRSerializableObject.java | 0 .../java/org/trafodion/sql/udr/TableInfo.java | 0 .../java/org/trafodion/sql/udr/TupleInfo.java | 0 .../java/org/trafodion/sql/udr/TypeInfo.java | 0 .../main/java/org/trafodion/sql/udr/UDR.java | 0 .../org/trafodion/sql/udr/UDRException.java | 0 .../trafodion/sql/udr/UDRInvocationInfo.java | 0 .../org/trafodion/sql/udr/UDRPlanInfo.java | 0 .../sql/udr/UDRWriterCompileTimeData.java | 0 .../sql/udr/UniqueConstraintInfo.java | 0 .../org/trafodion/sql/udr/predef/JDBCUDR.java | 0 .../org/trafodion/sql/ustat/ChgAutoList.java | 0 .../org/trafodion/sql/ustat/UstatUtil.java | 0 46 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 core/sql/sqlmid/Makefile rename core/sql/{ => sqlmid}/pom.xml (100%) rename core/sql/{ => sqlmid}/pom.xml.apache (100%) rename core/sql/{ => sqlmid}/pom.xml.hdp (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HBaseClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HBulkLoadClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HDFSClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HTableClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HdfsScan.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/HiveClient.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/OrcFileReader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/SequenceFileReader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/SequenceFileWriter.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/TrafConfiguration.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/TrafRegionStats.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ColumnInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmClassLoader.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmT2Driver.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/LmUtility.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/OrderInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/PartitionInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/PredicateInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TableInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TupleInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/TypeInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDR.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRException.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java (100%) rename core/sql/{ => sqlmid}/src/main/java/org/trafodion/sql/ustat/UstatUtil.java (100%) diff --git a/core/Makefile b/core/Makefile index bbd0878fbb..45fc1fff36 100644 --- a/core/Makefile +++ b/core/Makefile @@ -259,4 +259,4 @@ trafinstall: cd $(TRAF_HOME)/sql/scripts && install_traf_components lib_mgmt: foundation - cd sql/lib_mgmt && $(MAKE) all + cd sql/lib_mgmt && $(MAKE) all | sed -e "s/$$/ ##(lib_mgmt)/";exit $${PIPESTATUS[0]} diff --git a/core/sql/lib_mgmt/Makefile b/core/sql/lib_mgmt/Makefile index 3dd21007bd..bb7debd33b 100644 --- a/core/sql/lib_mgmt/Makefile +++ b/core/sql/lib_mgmt/Makefile @@ -22,7 +22,7 @@ INSTALL_LIBDIR := ${TRAF_HOME}/export/lib CP :=/bin/cp -f all: - @$(MAVEN) package -DskipTests + @$(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(lib_mgmt)/";exit $${PIPESTATUS[0]} mkdir -p ${INSTALL_LIBDIR} ${CP} target/lib_mgmt-${TRAFODION_VER}.jar ${INSTALL_LIBDIR}/lib_mgmt.jar clean: diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index d61cb77e71..bcf520af65 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -271,27 +271,11 @@ endif # DLLs should be built before executables, so we are adding this dependency here. # $(FINAL_EXES): $(FINAL_DLLS) -# Java files get built through Maven mavenbuild: - # create a jar manifest file with the correct version information - mkdir -p ../src/main/resources - $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf - # run maven - set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_apache: - set -o pipefail && cd ..; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_hdp: - set -o pipefail && cd ..; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib + cd ../sqlmid && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} # This is where the top-level is declared to build everything. -buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild mavenbuild_hdp mavenbuild_apache +buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild clean: @echo "Removing intermediate objects for $(TARGTYPE)/$(ARCHBITS)/$(FLAVOR)" @@ -305,4 +289,4 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - @rm -rf $(TRAF_HOME)/export/lib/trafodion-sql-*.jar + cd ../sqlmid && $(MAKE) clean diff --git a/core/sql/sqlmid/Makefile b/core/sql/sqlmid/Makefile new file mode 100644 index 0000000000..87ab64aa84 --- /dev/null +++ b/core/sql/sqlmid/Makefile @@ -0,0 +1,49 @@ +# @@@ 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 @@@ + +INSTALL_LIBDIR := ${TRAF_HOME}/export/lib +CP :=/bin/cp -f +all: mavenbuild mavenbuild_apache mavenbuild_hdp + +# Java files get built through Maven +mavenbuild: + # create a jar manifest file with the correct version information + mkdir -p ../src/main/resources + #$(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf + # run maven + $(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-cdh)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib + +# Java files get built through Maven +mavenbuild_apache: + $(MAVEN) -f pom.xml.apache package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-apache)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib + +# Java files get built through Maven +mavenbuild_hdp: + $(MAVEN) -f pom.xml.hdp package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-hdp)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib +clean: + @rm -f ${INSTALL_LIBDIR}/trafodion-sql-*.jar + @$(MAVEN) clean + @$(MAVEN) -f pom.xml.apache clean + @$(MAVEN) -f pom.xml.hdp clean +cleanall: clean diff --git a/core/sql/pom.xml b/core/sql/sqlmid/pom.xml similarity index 100% rename from core/sql/pom.xml rename to core/sql/sqlmid/pom.xml diff --git a/core/sql/pom.xml.apache b/core/sql/sqlmid/pom.xml.apache similarity index 100% rename from core/sql/pom.xml.apache rename to core/sql/sqlmid/pom.xml.apache diff --git a/core/sql/pom.xml.hdp b/core/sql/sqlmid/pom.xml.hdp similarity index 100% rename from core/sql/pom.xml.hdp rename to core/sql/sqlmid/pom.xml.hdp diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HBaseClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HDFSClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HTableClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HdfsScan.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java diff --git a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/HiveClient.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java diff --git a/core/sql/src/main/java/org/trafodion/sql/OrcFileReader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/OrcFileReader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/SequenceFileReader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/SequenceFileReader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafRegionStats.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/TrafRegionStats.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/LmUtility.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TableInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TableInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDR.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDR.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRException.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRException.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java diff --git a/core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java b/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java similarity index 100% rename from core/sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java rename to core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java From 107c7798913f2e646258ccc0cac449136da223ec Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Tue, 29 May 2018 11:41:19 +0000 Subject: [PATCH 10/16] Put the jars into one --- core/sql/sqlmid/Makefile | 24 ++---- core/sql/sqlmid/pom.xml | 119 +++++++++++++++++++----------- core/sql/sqlmid/pom.xml.apache | 131 --------------------------------- core/sql/sqlmid/pom.xml.hdp | 111 ---------------------------- 4 files changed, 85 insertions(+), 300 deletions(-) delete mode 100644 core/sql/sqlmid/pom.xml.apache delete mode 100644 core/sql/sqlmid/pom.xml.hdp diff --git a/core/sql/sqlmid/Makefile b/core/sql/sqlmid/Makefile index 87ab64aa84..534bb07426 100644 --- a/core/sql/sqlmid/Makefile +++ b/core/sql/sqlmid/Makefile @@ -21,29 +21,19 @@ INSTALL_LIBDIR := ${TRAF_HOME}/export/lib CP :=/bin/cp -f -all: mavenbuild mavenbuild_apache mavenbuild_hdp +all: mavenbuild # Java files get built through Maven mavenbuild: # create a jar manifest file with the correct version information - mkdir -p ../src/main/resources - #$(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf # run maven - $(MAVEN) package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-cdh)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-cdh*.jar $(TRAF_HOME)/export/lib + $(MAVEN) -Pproduction install -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql)/";exit $${PIPESTATUS[0]} + cp -pf target/trafodion-sql-$(TRAFODION_VER).jar $(TRAF_HOME)/export/lib + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-apache-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-cdh-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-sql-$(TRAFODION_VER).jar trafodion-sql-hdp-$(TRAFODION_VER).jar -# Java files get built through Maven -mavenbuild_apache: - $(MAVEN) -f pom.xml.apache package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-apache)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-apache*.jar $(TRAF_HOME)/export/lib - -# Java files get built through Maven -mavenbuild_hdp: - $(MAVEN) -f pom.xml.hdp package -DskipTests 2>&1 | sed -e "s/$$/ ##(trafodion-sql-hdp)/";exit $${PIPESTATUS[0]} - cp -pf target/trafodion-sql-hdp*.jar $(TRAF_HOME)/export/lib clean: @rm -f ${INSTALL_LIBDIR}/trafodion-sql-*.jar - @$(MAVEN) clean - @$(MAVEN) -f pom.xml.apache clean - @$(MAVEN) -f pom.xml.hdp clean + @$(MAVEN) -Pproduction clean cleanall: clean diff --git a/core/sql/sqlmid/pom.xml b/core/sql/sqlmid/pom.xml index cd025a1858..9c78b36e98 100644 --- a/core/sql/sqlmid/pom.xml +++ b/core/sql/sqlmid/pom.xml @@ -19,23 +19,74 @@ * limitations under the License. */ --> + org.trafodion.sql + 4.0.0 + trafodion-sql + ${INTERNAL_VERSION} + trafodion-sql + Java code for SQL engine in Trafodion + - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ + Apache + https://repo1.maven.org/maven2 UTF-8 - 2.6.0-cdh5.4.4 - ${env.HBASE_DEP_VER_CDH} - ${env.HBASE_TRX_ID_CDH} - ${env.HIVE_DEP_VER_CDH} - ${env.THRIFT_DEP_VER} - 1.7 + 2.6.0 + apache + + + dev + + 0.1 + 1.2.0 + hbase-trx-apache1_2 + 1.1.0 + 0.9.0 + + + true + + + + production + + ${env.TRAFODION_VER} + ${env.HBASE_DEP_VER_APACHE} + ${env.HBASE_TRX_ID_APACHE} + ${env.HIVE_DEP_VER_APACHE} + ${THRIFT_DEP_VER} + 1.7 + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${basedir}/../../sqf/export/include/SCMBuildMan.mf + + + + + + + + + + + package + ${project.build.directory}/classes_${hbase-flavor-id} + ${project.artifactId}-${project.version} + + org.apache.hbase @@ -47,26 +98,41 @@ hbase-client ${hbase.version} + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + ${hbase.version} + org.apache.hbase.client.transactional ${hbase-trx.id} ${env.TRAFODION_VER} system - ${env.HBASE_TRXDIR}/${env.HBASE_TRX_JAR} + ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar + + + org.apache.hadoop + hadoop-common + ${hadoop.version} org.apache.hive - hive-jdbc + hive-exec ${hive.version} org.apache.hive - hive-metastore + hive-jdbc ${hive.version} org.apache.hive - hive-exec + hive-metastore ${hive.version} @@ -86,33 +152,4 @@ - org.trafodion.sql - 4.0.0 - trafodion-sql-cdh - ${env.TRAFODION_VER} - trafodion-sql - Java code for SQL engine in Trafodion - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - public - - - - diff --git a/core/sql/sqlmid/pom.xml.apache b/core/sql/sqlmid/pom.xml.apache deleted file mode 100644 index 938bbbbcba..0000000000 --- a/core/sql/sqlmid/pom.xml.apache +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - Apache - https://repo1.maven.org/maven2 - - - - - UTF-8 - 2.6.0 - apache - ${env.HBASE_DEP_VER_APACHE} - ${env.HBASE_TRX_ID_APACHE} - ${env.HIVE_DEP_VER_APACHE} - ${THRIFT_DEP_VER} - 1.7 - - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hive - hive-exec - ${hive.version} - - - org.apache.hive - hive-jdbc - ${hive.version} - - - org.apache.hive - hive-metastore - ${hive.version} - - - org.apache.thrift - libthrift - ${thrift.version} - - - commons-configuration - commons-configuration - 1.6 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - org.trafodion.sql - 4.0.0 - trafodion-sql-apache - ${env.TRAFODION_VER} - trafodion-sql-apache - Java code for SQL engine in Trafodion - - diff --git a/core/sql/sqlmid/pom.xml.hdp b/core/sql/sqlmid/pom.xml.hdp deleted file mode 100644 index 5b1216f78f..0000000000 --- a/core/sql/sqlmid/pom.xml.hdp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Horton Works - http://repo.hortonworks.com/content/groups/public/ - - - - - UTF-8 - 2.7.1.2.3.2.0-2950 - ${env.HBASE_DEP_VER_HDP} - ${env.HBASE_TRX_ID_HDP} - ${env.HIVE_DEP_VER_HDP} - hdp - 0.9.0 - 1.7 - - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-sql.jar.mf - - - - - - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hive - hive-exec - ${hive.version} - - - org.apache.hive - hive-jdbc - ${hive.version} - - - org.apache.hive - hive-metastore - ${hive.version} - - - org.apache.thrift - libthrift - ${thrift.version} - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - org.trafodion.sql - 4.0.0 - trafodion-sql-${hbase-flavor-id} - ${env.TRAFODION_VER} - trafodion-sql - Java code for SQL engine in Trafodion - - From 3b548ee77c81ad4caaa14ac852db9a6158543bc6 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 07:58:46 +0000 Subject: [PATCH 11/16] refactor trx and tm project --- core/sqf/src/seatrans/hbase-trx/Makefile | 56 +-- .../hbase-trx/{pom.xml.apache10 => pom.xml} | 376 ++++++++++++------ .../src/seatrans/hbase-trx/pom.xml.apache11 | 336 ---------------- .../src/seatrans/hbase-trx/pom.xml.apache12 | 336 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 333 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 354 ----------------- .../sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 351 ---------------- core/sqf/src/seatrans/hbase-trx/pom.xml.sscc | 349 ---------------- core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 11 +- core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 91 ++++- .../seatrans/tm/hbasetmlib2/pom.xml.apache | 115 ------ .../src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 88 ---- .../org/trafodion/sql/TrafConfiguration.java | 1 - 15 files changed, 364 insertions(+), 3099 deletions(-) rename core/sqf/src/seatrans/hbase-trx/{pom.xml.apache10 => pom.xml} (69%) delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp delete mode 100755 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 delete mode 100644 core/sqf/src/seatrans/hbase-trx/pom.xml.sscc delete mode 100644 core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache delete mode 100644 core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp delete mode 120000 core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile index c52821fb54..83b3cf4e53 100644 --- a/core/sqf/src/seatrans/hbase-trx/Makefile +++ b/core/sqf/src/seatrans/hbase-trx/Makefile @@ -43,9 +43,9 @@ all: build_all jdk_1_7_cdh54: build_chk_cdh54 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.4 - echo "$(MAVEN) package -DskipTests" + echo "$(MAVEN) install -DskipTests" echo "### For full Maven output, see file build_trx.log" - set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_4 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -53,7 +53,7 @@ jdk_1_7_cdh54: build_chk_cdh54 jdk_1_7_cdh55: build_chk_cdh55 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.5 - set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_5 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -61,13 +61,13 @@ jdk_1_7_cdh55: build_chk_cdh55 jdk_1_7_cdh57: build_chk_cdh57 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) CDH5.7 - set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_7 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) jdk_1_7_mapr: build_chk_mapr - set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Pmapr install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -75,7 +75,7 @@ jdk_1_7_mapr: build_chk_mapr jdk_1_7_hdp: build_chk_hdp $(REINSTATE_ORIG) $(UNCOMMENT_STRING) HDP2.3 - set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Phdp2_3 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -83,7 +83,7 @@ jdk_1_7_hdp: build_chk_hdp jdk_1_7_apache10: build_chk_apache10 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.0 - set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_0 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -91,7 +91,7 @@ jdk_1_7_apache10: build_chk_apache10 jdk_1_7_apache11: build_chk_apache11 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.1 - set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_1 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -99,7 +99,7 @@ jdk_1_7_apache11: build_chk_apache11 jdk_1_7_apache12: build_chk_apache12 $(REINSTATE_ORIG) $(UNCOMMENT_STRING) APACHE1.2 - set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log + set -o pipefail && $(MAVEN) -f pom.xml -Papache1_2 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} mkdir -p $(TRAF_HOME)/export/lib cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib $(RM) $(VFILE) @@ -147,22 +147,22 @@ build_chk_hdp: @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi clean: - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME) - $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME) - $(REINSTATE_ORIG) - -$(MAVEN) -f pom.xml.apache10 clean | grep ERROR - -$(MAVEN) -f pom.xml.apache11 clean | grep ERROR - -$(MAVEN) -f pom.xml.apache12 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR - -$(MAVEN) -f pom.xml.cdh57 clean | grep ERROR - -$(MAVEN) -f pom.xml.mapr clean | grep ERROR - -$(MAVEN) -f pom.xml.hdp clean | grep ERROR - $(RM) build_trx.log - $(RM) $(VFILE) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME) + -$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME) + -$(REINSTATE_ORIG) + -$(MAVEN) -f pom.xml -Papache1_0 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Papache1_1 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Papache1_2 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_4 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_5 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Pcdh5_7 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + #-$(MAVEN) -f pom.xml -Pmapr clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(MAVEN) -f pom.xml -Phdp2_3 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]} + -$(RM) build_trx.log + -$(RM) $(VFILE) diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 b/core/sqf/src/seatrans/hbase-trx/pom.xml similarity index 69% rename from core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 rename to core/sqf/src/seatrans/hbase-trx/pom.xml index 6e088f1ba2..ea1ee59a7b 100755 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 +++ b/core/sqf/src/seatrans/hbase-trx/pom.xml @@ -19,138 +19,164 @@ * limitations under the License. */ --> + org.apache + 4.0.0 + hbase-trx-${ARTIFACT_ID} + ${INTERNAL_VERSION} + HBase - Trx + Trx of HBase usage + Apache http://mvnrepository.com/artifact/ default + + cloudera + https://repository.cloudera.com/artifactory/cloudera-repos/ + + + + true + always + warn + + + false + never + fail + + HDPReleases + HDP Releases + http://repo.hortonworks.com/content/repositories/releases/ + default + + + HDPContent + HDP Content + http://repo.hortonworks.com/content/groups/public/ + default + + + mapr release + http://repository.mapr.com/maven + true + true + - 2.4.0 - 1.0.2 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache + UTF-8 + 2.5.0 + 2.5.0 + 1.7 - org.apache - 4.0.0 - hbase-trx-apache1_0 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - + + + apache1_0 + + apache1_0 + ${env.TRAFODION_VER} + 2.4.0 + 1.0.2 + apache + + + true + + + + apache1_1 + + apache1_1 + ${env.TRAFODION_VER} + 2.6.0 + 1.1.2 + apache + + + + apache1_2 + + apache1_2 + ${env.TRAFODION_VER} + 2.6.0 + 1.2.0 + apache + + + + cdh5_4 + + cdh5_4 + ${env.TRAFODION_VER} + 2.6.0-cdh5.4.4 + 1.0.0-cdh5.4.4 + ${ARTIFACT_ID} + + + + cdh5_5 + + cdh5_5 + ${env.TRAFODION_VER} + 2.6.0-cdh5.5.1 + 1.0.0-cdh5.5.1 + ${ARTIFACT_ID} + + + + cdh5_7 + + cdh5_7 + ${env.TRAFODION_VER} + 2.6.0-cdh5.7.1 + 1.2.0-cdh5.7.1 + ${ARTIFACT_ID} + + + + hdp2_3 + + hdp2_3 + ${env.TRAFODION_VER} + 2.7.1 + ${env.HBASE_DEP_VER_HDP} + ${ARTIFACT_ID} + + + + hdp2_1 + + hdp2_1 + ${env.TRAFODION_VER} + 2.4.0 + 0.98.0.2.1.4.0-632-hadoop2 + ${ARTIFACT_ID} + + + + mapr4_0 + + mapr4_0 + ${env.TRAFODION_VER} + 2.5.0 + 0.98.7-mapr-1501-r1 + ${ARTIFACT_ID} + + + + sscc + + sscc + ${env.TRAFODION_VER} + 2.4.0 + 0.98.0.2.1.4.0-632-hadoop2 + ${ARTIFACT_ID} + + skipTrxTests @@ -303,6 +329,7 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-maven-plugins + 2.6.0 compile-protoc @@ -333,4 +360,111 @@ if we can combine these profiles somehow --> + + + package + + ${project.build.directory}/classes_${trx-suffix} + ${project.artifactId}-${project.version} + + + + + maven-assembly-plugin + 2.2-beta-5 + + true + + + + maven-surefire-plugin + 2.5 + + + ${surefire.firstPartGroups} + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.1 + + + org.apache.maven.plugins + maven-jar-plugin + + + hbase-trx.jar.versions + + + + + + + + + + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + ${hbase.version} + + + org.apache.hbase + hbase-client + ${hbase.version} + + + org.apache.hbase + hbase-server + ${hbase.version} + + + org.apache.hbase + hbase-thrift + ${hbase.version} + + + org.apache.hbase + hbase-annotations + ${hbase.version} + + + org.apache.hbase + hbase-testing-util + test + ${hbase.version} + + + + org.apache.thrift + libthrift + 0.9.1 + + + commons-logging + commons-logging + 1.1.3 + + + org.apache.zookeeper + zookeeper + 3.4.6 + + + com.google.protobuf + protobuf-java + 2.5.0 + + diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 deleted file mode 100755 index 9ee8c1cab7..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - default - - - - - 2.6.0 - 1.1.2 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache - - - org.apache - 4.0.0 - hbase-trx-apache1_1 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 deleted file mode 100644 index 09c353d48e..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache12 +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - default - - - - - 2.6.0 - 1.2.0 - UTF-8 - 2.5.0 - 2.5.0 - 1.7 - apache - - - org.apache - 4.0.0 - hbase-trx-apache1_2 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 deleted file mode 100755 index 2d54caffce..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.4.4 - 1.0.0-cdh5.4.4 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_4 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_4 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 deleted file mode 100755 index 0f2429e753..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.5.1 - 1.0.0-cdh5.5.1 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_5 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_5 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 deleted file mode 100644 index e5e52725a9..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - 2.6.0-cdh5.7.1 - 1.2.0-cdh5.7.1 - 2.5.0 - 2.5.0 - UTF-8 - 1.7 - cdh5_7 - - - - org.apache - 4.0.0 - hbase-trx-cdh5_7 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.6.0 - - - compile-protoc - generate-sources - - protoc - - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp deleted file mode 100755 index e6a1b6c783..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - HDPContent - HDP Content - http://repo.hortonworks.com/content/groups/public/ - default - - - - - 2.7.1 - ${env.HBASE_DEP_VER_HDP} - UTF-8 - 1.7 - hdp2_3 - 2.5.0 - - - - org.apache - 4.0.0 - hbase-trx-hdp2_3 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_${trx-suffix} - ${project.artifactId}-${project.version} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.6 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.7.1 - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - 2.5.0 - 2.5.0 - - ${basedir}/src/main/protobuf - - TrxRegion.proto - SsccRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 b/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 deleted file mode 100755 index c03d82689c..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - - - 2.4.0 - 0.98.0.2.1.4.0-632-hadoop2 - - - UTF-8 - 1.7 - - - - - org.apache - 4.0.0 - hbase-trx-hdp2_1 - ${env.TRAFODION_VER} - HBase - Trx - Trx of HBase usage - - - - package - - ${project.build.directory}/classes_hdp2_1_${trx-suffix} - ${project.artifactId}-${project.version}${trx-suffix} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - 2.4.0 - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc b/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc deleted file mode 100644 index f1c57bb0f2..0000000000 --- a/core/sqf/src/seatrans/hbase-trx/pom.xml.sscc +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - true - always - warn - - - false - never - fail - - HDPReleases - HDP Releases - http://repo.hortonworks.com/content/repositories/releases/ - default - - - - - 2.4.0 - 0.98.0.2.1.4.0-632-hadoop2 - - - UTF-8 - 1.7 - - - - - org.apache - 4.0.0 - hbase-trx-sscc - ${env.TRAFODION_VER} - HBase - TrxSscc - TrxSscc of HBase usage - - - - package - - ${project.build.directory}/classes_sscc_${trx-suffix} - ${project.artifactId}-${project.version}${trx-suffix} - - - - - maven-assembly-plugin - 2.2-beta-5 - - true - - - - maven-surefire-plugin - 2.5 - - - ${surefire.firstPartGroups} - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-jar-plugin - - - hbase-trx.jar.versions - - - - - - - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-thrift - ${hbase.version} - - - org.apache.hbase - hbase-testing-util - test - ${hbase.version} - - - - org.apache.thrift - libthrift - 0.9.1 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - com.google.protobuf - protobuf-java - 2.5.0 - - - - - - skipTrxTests - - - skipTrxTests - - - - true - true - - - - - - - - hadoop-1.1 - - - - hadoop.profile1.1 - - - - - org.apache.hadoop - hadoop-core - - - org.apache.hadoop - hadoop-test - - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - compile-protobuf - - - compile-protobuf - - - - - - org.apache.hadoop - hadoop-maven-plugins - - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/protobuf - ${basedir}/hbase-protocol/src/main/protobuf - - - ${basedir}/src/main/protobuf - - TrxRegion.proto - - - ${basedir}/src/main/java/ - - - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile index 12859d85fb..18d2d79317 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile @@ -65,13 +65,12 @@ all: $(PROGS) mavenbuild mavenbuild: # create a jar manifest file with the correct version information - mkdir -p src/main/resources - $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf # run maven - set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib + set -o pipefail; $(MAVEN) -Pproduction install -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'; exit $${PIPESTATUS} + cp -pf target/trafodion-dtm-$(TRAFODION_VER).jar $(TRAF_HOME)/export/lib + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-apache-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-cdh-$(TRAFODION_VER).jar + @cd $(TRAF_HOME)/export/lib; ln -sf trafodion-dtm-$(TRAFODION_VER).jar trafodion-dtm-hdp-$(TRAFODION_VER).jar $(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS) $(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS) diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml index 0a88d395de..6b8bfaed5e 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml @@ -19,20 +19,67 @@ * limitations under the License. */ --> + org.trafodion.dtm + 4.0.0 + trafodion-dtm + ${INTERNAL_VERSION} + trafodion-dtm + Java code for the Trafodion DTM (Distributed Transaction Manager) + - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ + Apache + http://mvnrepository.com/artifact/ UTF-8 - ${env.HBASE_DEP_VER_CDH} - ${env.HBASE_TRX_ID_CDH} + 2.6.0 1.7 + + + dev + + 0.1 + 1.2.0 + hbase-trx-apache1_2 + 1.1.0 + 0.9.0 + + + true + + + + production + + ${env.TRAFODION_VER} + ${env.HBASE_DEP_VER_APACHE} + ${env.HBASE_TRX_ID_APACHE} + ${env.HIVE_DEP_VER_APACHE} + ${THRIFT_DEP_VER} + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + ${env.TRAF_HOME}/export/include/SCMBuildMan.mf + + + + + + + + + org.apache.hbase @@ -45,11 +92,9 @@ ${hbase.version} - org.apache.hbase.client.transactional + org.apache ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.HBASE_TRXDIR}/${env.HBASE_TRX_JAR} + ${project.version} org.slf4j @@ -61,16 +106,32 @@ commons-logging 1.1.3 + + org.apache.hadoop + hadoop-common + 2.5.1 + + + org.apache.hbase + hbase-common + ${hbase.version} + + + org.apache.hbase + hbase-protocol + 1.0.0 + + + org.trafodion.sql + trafodion-sql + ${project.version} + - org.trafodion.sql - 4.0.0 - trafodion-dtm-cdh - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - + package + ${project.build.directory}/classes_${hbase-flavor-id} + ${project.artifactId}-${project.version} org.apache.maven.plugins diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache deleted file mode 100644 index 6550926f57..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - Apache - http://mvnrepository.com/artifact/ - - - - - UTF-8 - 2.6.0 - ${env.HBASE_DEP_VER_APACHE} - apache - ${env.HBASE_TRX_ID_APACHE} - 1.7 - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.apache.hadoop.hbase.coprocessor.transactional.generated - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - commons-logging - commons-logging - 1.1.3 - - - org.apache.hadoop - hadoop-common - 2.5.1 - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - 1.0.0 - - - - org.trafodion.dtm - 4.0.0 - trafodion-dtm-apache - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-dtm.jar.mf - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp deleted file mode 100644 index 3b626e1c33..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - Horton Works - http://repo.hortonworks.com/content/groups/public/ - - - - - UTF-8 - 2.7.1.2.3.2.0-2950 - ${env.HBASE_DEP_VER_HDP} - hdp - ${env.HBASE_TRX_ID_HDP} - 1.7 - - - - - org.apache.hbase - hbase-server - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase.client.transactional - ${hbase-trx.id} - ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - - org.trafodion.dtm - 4.0.0 - trafodion-dtm-hdp - ${env.TRAFODION_VER} - trafodion-dtm - Java code for the Trafodion DTM (Distributed Transaction Manager) - - - package - ${project.build.directory}/classes_${hbase-flavor-id} - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-jar-plugin - - - - src/main/resources/trafodion-dtm.jar.mf - - - - - - - diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java deleted file mode 120000 index 811c58c044..0000000000 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/sql/TrafConfiguration.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../../sql/src/main/java/org/trafodion/sql/TrafConfiguration.java \ No newline at end of file From e1fc544faeea0df3f6846fac25be613d7d1931b4 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 08:36:17 +0000 Subject: [PATCH 12/16] Rename sqlmid to trafodion_sql and add one more folder for java_src --- core/sql/{sqlmid => java_src/trafodion_sql}/Makefile | 0 core/sql/{sqlmid => java_src/trafodion_sql}/pom.xml | 2 +- .../src/main/java/org/trafodion/sql/HBaseClient.java | 0 .../src/main/java/org/trafodion/sql/HBulkLoadClient.java | 0 .../src/main/java/org/trafodion/sql/HDFSClient.java | 0 .../src/main/java/org/trafodion/sql/HTableClient.java | 0 .../src/main/java/org/trafodion/sql/HdfsScan.java | 0 .../src/main/java/org/trafodion/sql/HiveClient.java | 0 .../src/main/java/org/trafodion/sql/OrcFileReader.java | 0 .../src/main/java/org/trafodion/sql/SequenceFileReader.java | 0 .../src/main/java/org/trafodion/sql/SequenceFileWriter.java | 0 .../src/main/java/org/trafodion/sql/TrafConfiguration.java | 0 .../src/main/java/org/trafodion/sql/TrafRegionStats.java | 0 .../java/org/trafodion/sql/udr/CardinalityConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ColumnInfo.java | 0 .../java/org/trafodion/sql/udr/ComparisonPredicateInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java | 0 .../src/main/java/org/trafodion/sql/udr/LmClassLoader.java | 0 .../src/main/java/org/trafodion/sql/udr/LmT2Driver.java | 0 .../main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java | 0 .../src/main/java/org/trafodion/sql/udr/LmUtility.java | 0 .../trafodion/sql/udr/MethodValidationFailedException.java | 0 .../src/main/java/org/trafodion/sql/udr/OrderInfo.java | 0 .../main/java/org/trafodion/sql/udr/ParameterListInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/PartitionInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/PredicateInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java | 0 .../java/org/trafodion/sql/udr/TMUDRSerializableObject.java | 0 .../src/main/java/org/trafodion/sql/udr/TableInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/TupleInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/TypeInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/UDR.java | 0 .../src/main/java/org/trafodion/sql/udr/UDRException.java | 0 .../main/java/org/trafodion/sql/udr/UDRInvocationInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java | 0 .../java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java | 0 .../main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java | 0 .../src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java | 0 .../src/main/java/org/trafodion/sql/ustat/ChgAutoList.java | 0 .../src/main/java/org/trafodion/sql/ustat/UstatUtil.java | 0 core/sql/nskgmake/Makerules.mk | 4 ++-- 42 files changed, 3 insertions(+), 3 deletions(-) rename core/sql/{sqlmid => java_src/trafodion_sql}/Makefile (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/pom.xml (98%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HBaseClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HBulkLoadClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HDFSClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HTableClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HdfsScan.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/HiveClient.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/OrcFileReader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/SequenceFileReader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/SequenceFileWriter.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/TrafConfiguration.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/TrafRegionStats.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ColumnInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmClassLoader.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmT2Driver.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/LmUtility.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/OrderInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/PartitionInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/PredicateInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TableInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TupleInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/TypeInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDR.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRException.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java (100%) rename core/sql/{sqlmid => java_src/trafodion_sql}/src/main/java/org/trafodion/sql/ustat/UstatUtil.java (100%) diff --git a/core/sql/sqlmid/Makefile b/core/sql/java_src/trafodion_sql/Makefile similarity index 100% rename from core/sql/sqlmid/Makefile rename to core/sql/java_src/trafodion_sql/Makefile diff --git a/core/sql/sqlmid/pom.xml b/core/sql/java_src/trafodion_sql/pom.xml similarity index 98% rename from core/sql/sqlmid/pom.xml rename to core/sql/java_src/trafodion_sql/pom.xml index 9c78b36e98..0937abbaba 100644 --- a/core/sql/sqlmid/pom.xml +++ b/core/sql/java_src/trafodion_sql/pom.xml @@ -71,7 +71,7 @@ - ${basedir}/../../sqf/export/include/SCMBuildMan.mf + ${env.TRAF_HOME}/export/include/SCMBuildMan.mf diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBaseClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HBaseClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBaseClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HBulkLoadClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HDFSClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HDFSClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HDFSClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HTableClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HTableClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HTableClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HdfsScan.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HdfsScan.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HdfsScan.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HiveClient.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/HiveClient.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/HiveClient.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/OrcFileReader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/OrcFileReader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/OrcFileReader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileReader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileReader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileReader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/SequenceFileWriter.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/SequenceFileWriter.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafConfiguration.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafConfiguration.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafConfiguration.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafRegionStats.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/TrafRegionStats.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/TrafRegionStats.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/CardinalityConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ColumnInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ColumnInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ComparisonPredicateInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmCharsetCoder.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmClassLoader.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmClassLoader.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmT2Driver.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmT2Driver.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUDRObjMethodInvoke.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUtility.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/LmUtility.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/LmUtility.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/MethodValidationFailedException.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/OrderInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/OrderInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ParameterListInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PartitionInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PartitionInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/PredicateInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/PredicateInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/ProvenanceInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TMUDRSerializableObject.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TableInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TableInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TableInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TupleInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TupleInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/TypeInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDR.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDR.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDR.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRException.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRException.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRException.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRInvocationInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRPlanInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UDRWriterCompileTimeData.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/UniqueConstraintInfo.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/udr/predef/JDBCUDR.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/ChgAutoList.java diff --git a/core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java b/core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java similarity index 100% rename from core/sql/sqlmid/src/main/java/org/trafodion/sql/ustat/UstatUtil.java rename to core/sql/java_src/trafodion_sql/src/main/java/org/trafodion/sql/ustat/UstatUtil.java diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index bcf520af65..f321d48fa7 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -272,7 +272,7 @@ endif # $(FINAL_EXES): $(FINAL_DLLS) mavenbuild: - cd ../sqlmid && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} + cd ../java_src/trafodion_sql && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} # This is where the top-level is declared to build everything. buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild @@ -289,4 +289,4 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - cd ../sqlmid && $(MAKE) clean + cd ../java_src/trafodion_sql && $(MAKE) clean From 432e03b413321503a7f198e1c1b4fce29535d42a Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Wed, 30 May 2018 09:47:17 +0000 Subject: [PATCH 13/16] Move trafodion-sql after trx build --- core/Makefile | 8 ++++---- core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 2 +- core/sqf/src/tm/Makefile | 5 ++++- core/sql/java_src/trafodion_sql/pom.xml | 4 +--- core/sql/nskgmake/Makerules.mk | 6 +----- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/core/Makefile b/core/Makefile index 45fc1fff36..1452bd06b9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -220,7 +220,7 @@ rpmbuild: rpmpackage mv $(RPMROOT)/RPMS/$(ARCH)/$(PKG_PROD)*.rpm ../distribution/${OS_TYPE}${OS_MAJOR}/ -eclipse: rest/.project dcs/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project +eclipse: rest/.project dcs/.project sql/java_src/trafodion_sql/.project sqf/src/seatrans/hbase-trx/.project .project @echo @echo @echo " Now you can import 5 projects in Eclipse:" @@ -238,8 +238,8 @@ rest/.project: dcs/.project: cd ../dcs && $(MAVEN) eclipse:eclipse -sql/.project: - cd sql && $(MAVEN) eclipse:eclipse +sql/java_src/trafodion_sql/.project: + cd sql/java_src/trafodion_sql && $(MAVEN) eclipse:eclipse sqf/src/seatrans/hbase-trx/.project: cd sqf/src/seatrans/hbase-trx && $(MAVEN) eclipse:eclipse @@ -251,7 +251,7 @@ sqf/src/seatrans/hbase-trx/.project: eclipseclean: $(RM) rest/.classpath rest/.project $(RM) ../dcs/.classpath ../dcs/.project - $(RM) sql/.classpath sql/.project + $(RM) sql/java_src/trafodion_sql/.classpath sql/java_src/trafodion_sql/.project $(RM) sqf/src/seatrans/hbase-trx/.classpath sqf/src/seatrans/hbase-trx/.project $(RM) .cproject .project diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile index 18d2d79317..7e0b9fe6d4 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile @@ -99,7 +99,7 @@ clean: $(RM) *.gcda *.gcno *.gcov $(RM) -f $(OUTDIR)/*.o $(RM) -rf $(TRAF_HOME)/export/lib/trafodion-dtm-*.jar - -$(MAVEN) -f pom.xml clean + -$(MAVEN) -f pom.xml -Pproduction clean cleanall: clean $(RM) -rf $(BUILD_PLAT) diff --git a/core/sqf/src/tm/Makefile b/core/sqf/src/tm/Makefile index ff5686e4f7..d7d2ed3680 100644 --- a/core/sqf/src/tm/Makefile +++ b/core/sqf/src/tm/Makefile @@ -144,6 +144,8 @@ all: $(LIBEXPDIR)/libstmlib.so cp_trx_jar cp_trx_jar: cd $(HBASE_TRX_LOC); make +trafodion_sql_build: cp_trx_jar + cd ../../../sql/java_src/trafodion_sql && $(MAKE) 2>&1 all: $(LIBEXPDIR)/libsxatmlib.so $(LIBEXPDIR)/libstmlib.so $(PROGS) $(LIBEXPDIR)/libxarm.so cd tools; $(MAKE) @@ -167,7 +169,7 @@ $(LIBEXPDIR)/libstmlib.so: $(LIBSTMOBJS) $(LIBEXPDIR)/libsxatmlib.so: $(LIBSXATMOBJS) $(CXX) $(LNK_FLGS) -shared -o $@ $(LIBSXATMOBJS) $(LIBSTMX) -L$(LIBEXPDIR) -llog4cxx -$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSXATMOBJS) cp_trx_jar +$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSXATMOBJS) trafodion_sql_build cp_trx_jar cd $(HBASETMLIB); $(MAKE) @@ -197,6 +199,7 @@ clean: $(RM) $(ALLOBJS) $(RM) $(CDEPFILES) cd $(HBASE_TRX_LOC); make clean + cd ../../../sql/java_src/trafodion_sql && $(MAKE) clean @echo "PWD = " `pwd` cd tools; $(MAKE) clean @echo "PWD = " `pwd` diff --git a/core/sql/java_src/trafodion_sql/pom.xml b/core/sql/java_src/trafodion_sql/pom.xml index 0937abbaba..01069a77f0 100644 --- a/core/sql/java_src/trafodion_sql/pom.xml +++ b/core/sql/java_src/trafodion_sql/pom.xml @@ -109,11 +109,9 @@ ${hbase.version} - org.apache.hbase.client.transactional + org.apache ${hbase-trx.id} ${env.TRAFODION_VER} - system - ${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar org.apache.hadoop diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index f321d48fa7..cca0ed2c00 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -271,11 +271,8 @@ endif # DLLs should be built before executables, so we are adding this dependency here. # $(FINAL_EXES): $(FINAL_DLLS) -mavenbuild: - cd ../java_src/trafodion_sql && $(MAKE) 2>&1 | exit $${PIPESTATUS[0]} - # This is where the top-level is declared to build everything. -buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild +buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) clean: @echo "Removing intermediate objects for $(TARGTYPE)/$(ARCHBITS)/$(FLAVOR)" @@ -289,4 +286,3 @@ clean: @echo "Removing coverage files" @-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f @cd ..; $(MAVEN) clean - cd ../java_src/trafodion_sql && $(MAKE) clean From 71cbc90dda42bbd0dbdaee39e2c203c6a59fb680 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Thu, 31 May 2018 02:25:00 +0000 Subject: [PATCH 14/16] deal with site error with jdk8 --- core/conn/jdbcT4/pom.xml | 4 ++++ core/rest/pom.xml | 1 + dcs/Makefile | 2 +- dcs/pom.xml | 3 ++- wms/pom.xml | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml index 1750c4228a..b456874996 100644 --- a/core/conn/jdbcT4/pom.xml +++ b/core/conn/jdbcT4/pom.xml @@ -260,6 +260,10 @@ org.apache.maven.plugins maven-javadoc-plugin 2.9 + + true + -Xdoclint:none + attach-javadocs diff --git a/core/rest/pom.xml b/core/rest/pom.xml index 52c276ddf5..b0ca98dd64 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -640,6 +640,7 @@ ${maven.javadoc.plugin.version} true + -Xdoclint:none diff --git a/dcs/Makefile b/dcs/Makefile index 76c64b92d2..36a7c9df8b 100644 --- a/dcs/Makefile +++ b/dcs/Makefile @@ -43,7 +43,7 @@ build_chk: @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi clean: - -$(MAVEN) clean | grep ERROR + -$(MAVEN) clean | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile' $(RM) build_dcs.log $(RM) $(VFILE) $(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME) diff --git a/dcs/pom.xml b/dcs/pom.xml index 206e424489..8e7e73c225 100644 --- a/dcs/pom.xml +++ b/dcs/pom.xml @@ -500,7 +500,7 @@ 1.6 - 3.3 + 3.6 2.9.1 2.6 2.3 @@ -742,6 +742,7 @@ ${maven.javadoc.plugin.version} true + -Xdoclint:none diff --git a/wms/pom.xml b/wms/pom.xml index c79985c5e2..9650bc03b2 100644 --- a/wms/pom.xml +++ b/wms/pom.xml @@ -726,6 +726,7 @@ 2.6.1 true + -Xdoclint:none From 097bf004d788c810a1cff3984b9e893e5f60a436 Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Thu, 31 May 2018 06:09:37 +0000 Subject: [PATCH 15/16] put doclint into profile for supoorting jdk7 and jdk8 --- core/conn/jdbcT4/pom.xml | 11 ++++++++++- core/rest/pom.xml | 13 +++++++++++-- dcs/pom.xml | 11 ++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml index b456874996..6d9b3bbcbd 100644 --- a/core/conn/jdbcT4/pom.xml +++ b/core/conn/jdbcT4/pom.xml @@ -213,6 +213,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + apache-release @@ -262,7 +271,7 @@ 2.9 true - -Xdoclint:none + ${javadoc.opts} diff --git a/core/rest/pom.xml b/core/rest/pom.xml index b0ca98dd64..fab5248f8a 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -536,6 +536,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + @@ -639,8 +648,8 @@ maven-javadoc-plugin ${maven.javadoc.plugin.version} - true - -Xdoclint:none + true + -Xdoclint:none diff --git a/dcs/pom.xml b/dcs/pom.xml index 8e7e73c225..760de9a459 100644 --- a/dcs/pom.xml +++ b/dcs/pom.xml @@ -674,6 +674,15 @@ + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + runSmallTests @@ -742,7 +751,7 @@ ${maven.javadoc.plugin.version} true - -Xdoclint:none + ${javadoc.opts} From 259187aa53e0676aba72f98fe470b0af8ee9f6aa Mon Sep 17 00:00:00 2001 From: kevinxu021 Date: Fri, 1 Jun 2018 01:21:01 +0000 Subject: [PATCH 16/16] fix rest doclint issue --- core/rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/rest/pom.xml b/core/rest/pom.xml index fab5248f8a..2a6ee16a98 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -649,7 +649,7 @@ ${maven.javadoc.plugin.version} true - -Xdoclint:none + ${javadoc.opts}