remove duplicate copyright & roll back some change
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/73c164b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/73c164b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/73c164b7 Branch: refs/heads/master Commit: 73c164b78d682aae95a2132f62d97385b5e27b08 Parents: 28460bd Author: mashengchen <[email protected]> Authored: Fri Mar 4 03:05:31 2016 +0000 Committer: mashengchen <[email protected]> Committed: Fri Mar 4 03:05:31 2016 +0000 ---------------------------------------------------------------------- .../backuprestore/TrafExportSnapshot.java | 7 +------ core/sqf/sqenvcom.sh | 4 ++++ core/sqf/sql/scripts/install_local_hadoop | 18 +++++------------ .../SsccTransactionalScanner.java.tmpl | 21 -------------------- .../CleanOldTransactionsChore.java.tmpl | 10 ---------- .../transactional/MemoryUsageChore.java.tmpl | 10 ---------- .../transactional/TrxTransactionState.java.tmpl | 10 ---------- 7 files changed, 10 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/hbase_utilities/src/main/java/org/trafodion/utility/backuprestore/TrafExportSnapshot.java ---------------------------------------------------------------------- diff --git a/core/sqf/hbase_utilities/src/main/java/org/trafodion/utility/backuprestore/TrafExportSnapshot.java b/core/sqf/hbase_utilities/src/main/java/org/trafodion/utility/backuprestore/TrafExportSnapshot.java index 7fa8fed..3abf8ac 100644 --- a/core/sqf/hbase_utilities/src/main/java/org/trafodion/utility/backuprestore/TrafExportSnapshot.java +++ b/core/sqf/hbase_utilities/src/main/java/org/trafodion/utility/backuprestore/TrafExportSnapshot.java @@ -119,10 +119,7 @@ public class TrafExportSnapshot extends Configured implements Tool { private static final String INPUT_FOLDER_PREFIX = "export-files."; // Export Map-Reduce Counters, to keep track of the progress - public enum Counter { - MISSING_FILES, FILES_COPIED, FILES_SKIPPED, COPY_FAILED, - BYTES_EXPECTED, BYTES_SKIPPED, BYTES_COPIED - } + public enum Counter { MISSING_FILES, COPY_FAILED, BYTES_EXPECTED, BYTES_COPIED, FILES_COPIED }; private static class ExportMapper extends Mapper<BytesWritable, NullWritable, NullWritable, NullWritable> { @@ -263,8 +260,6 @@ public class TrafExportSnapshot extends Configured implements Tool { FileStatus outputStat = outputFs.getFileStatus(outputPath); if (outputStat != null && sameFile(inputStat, outputStat)) { LOG.info("Skip copy " + inputStat.getPath() + " to " + outputPath + ", same file."); - context.getCounter(Counter.FILES_SKIPPED).increment(1); - context.getCounter(Counter.BYTES_SKIPPED).increment(inputStat.getLen()); return; } } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/sqenvcom.sh ---------------------------------------------------------------------- diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh index b1b5231..5555bc6 100644 --- a/core/sqf/sqenvcom.sh +++ b/core/sqf/sqenvcom.sh @@ -345,6 +345,8 @@ elif [[ -n "$(ls /usr/lib/hadoop/hadoop-*cdh*.jar 2>/dev/null)" ]]; then export CURL_INC_DIR=/usr/include export CURL_LIB_DIR=/usr/lib64 + lv_hbase_cp=`hbase classpath` + # directories with jar files and list of jar files # (could try to reduce the number of jars in the classpath) export HADOOP_JAR_DIRS="/usr/lib/hadoop @@ -390,6 +392,8 @@ elif [[ -n "$(ls /etc/init.d/ambari* 2>/dev/null)" ]]; then export CURL_INC_DIR=/usr/include export CURL_LIB_DIR=/usr/lib64 + lv_hbase_cp=`hbase classpath` + # directories with jar files and list of jar files export HADOOP_JAR_DIRS="/usr/hdp/current/hadoop-client /usr/hdp/current/hadoop-client/lib" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/sql/scripts/install_local_hadoop ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop index 6f5daaf..2c10839 100755 --- a/core/sqf/sql/scripts/install_local_hadoop +++ b/core/sqf/sql/scripts/install_local_hadoop @@ -391,19 +391,7 @@ else MY_START_PORT=`expr 24000 + $MY_START_PORT '*' 200` elif [ $MY_START_PORT == "rand" ]; then # pick a random number between 12000 and 24000 that is divisible by 200 - lv_number=0 #initialize - FLOOR=10000 - RANGE=31200 - while [ "$lv_number" -le $FLOOR ] - do - lv_number=$RANDOM - let "lv_number %= $RANGE" # Scales $lv_number down within $RANGE. - done - echo "Random lv_number between $FLOOR and $RANGE --- $lv_number" - echo - let "lv_remainder=$lv_number % 200" - let "MY_START_PORT=$lv_number - $lv_remainder" - echo "Start Port --- $MY_START_PORT" + MY_START_PORT=`expr $RANDOM '%' 60 '*' 200 + 12000` elif [ $MY_START_PORT == "available" ]; then portMsg=`python findPort.py` @@ -621,6 +609,10 @@ if [[ "$HBASE_DISTRO" = "APACHE" ]]; then HIVE_TAR=${HIVE_PREFIX}.tar.gz fi +if [[ "$HBASE_DISTRO" = "HDP" ]]; then + HIVE_PREFIX=apache-hive-1.2.1.2.3.2.0-2950-bin + HIVE_TAR=${HIVE_PREFIX}.tar.gz +fi HBASE_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5 HBASE_TAR=hbase-1.0.0-cdh5.4.4.tar.gz http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java.tmpl ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java.tmpl index 72c5666..a2fa801 100644 --- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java.tmpl +++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java.tmpl @@ -21,27 +21,6 @@ * @@@ END COPYRIGHT @@@ **/ -// @@@ START COPYRIGHT @@@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// -// @@@ END COPYRIGHT @@@ - package org.apache.hadoop.hbase.client.transactional; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl index 4507f66..6e81a8a 100644 --- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl +++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java.tmpl @@ -21,16 +21,6 @@ * @@@ END COPYRIGHT @@@ **/ -/** - * Copyright 2009 The Apache Software Foundation 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. - */ package org.apache.hadoop.hbase.regionserver.transactional; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl index 512b5d1..07c66ef 100644 --- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl +++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java.tmpl @@ -21,16 +21,6 @@ * @@@ END COPYRIGHT @@@ **/ -/** - * Copyright 2015 The Apache Software Foundation 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. - */ package org.apache.hadoop.hbase.regionserver.transactional; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/73c164b7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl index 13974ac..6994745 100644 --- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl +++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java.tmpl @@ -21,16 +21,6 @@ * @@@ END COPYRIGHT @@@ **/ -/** - * Copyright 2009 The Apache Software Foundation 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. - */ package org.apache.hadoop.hbase.regionserver.transactional; import java.io.IOException;
