This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch HAWQ-1801
in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/HAWQ-1801 by this push:
new b136a8e HAWQ-1801. cleanup misc information for 3.0.0.0 release
b136a8e is described below
commit b136a8e96da994914b97281be86a8602ac1b7862
Author: huor <huoruil...@163.com>
AuthorDate: Wed Aug 11 11:54:29 2021 +0800
HAWQ-1801. cleanup misc information for 3.0.0.0 release
---
README.md | 16 ++----
contrib/orc/README | 8 ---
pre-push | 62 ----------------------
pxf/tomcat/src/scripts/pre-install.sh | 2 +-
src/backend/access/external/read_cache.c | 6 ---
src/backend/cdb/dispatcher_mgr.c | 6 ---
src/backend/cdb/dispatcher_new.c | 6 ---
src/backend/cdb/executormgr_new.c | 6 ---
src/backend/cdb/scheduler.c | 7 +--
src/backend/commands/tablecmds.c | 2 +-
src/backend/executor/newExecutor.c | 4 +-
src/backend/libpq/cloudrest.c | 6 ---
src/include/access/read_cache.h | 5 --
src/include/cdb/dispatcher_mgr.h | 5 --
src/include/cdb/dispatcher_new.h | 5 --
src/include/cdb/executormgr_new.h | 5 --
src/include/cdb/scheduler.h | 6 +--
.../cwrapper/dbcommon/function/func-kind.cg.h | 13 -----
src/include/cwrapper/dbcommon/type/type-kind.h | 6 ---
src/include/cwrapper/dbcommon/utils/instrument.h | 6 ---
.../cwrapper/executor/cwrapper/cached-result.h | 6 ---
.../cwrapper/executor/cwrapper/executor-c.h | 6 ---
.../cwrapper/magma/cwrapper/magma-client-c.h | 6 ---
.../cwrapper/scheduler/cwrapper/scheduler-c.h | 7 +--
.../cwrapper/storage/cwrapper/hdfs-file-system-c.h | 6 ---
.../cwrapper/storage/cwrapper/hive-file-system-c.h | 6 ---
.../cwrapper/storage/cwrapper/magma-format-c.h | 7 +--
.../cwrapper/storage/cwrapper/orc-format-c.h | 6 ---
.../cwrapper/storage/cwrapper/text-format-c.h | 6 ---
.../cwrapper/univplan/cwrapper/univplan-c.h | 5 --
src/include/utils/cloudrest.h | 6 +--
src/test/feature/cloudtest/test_cloud.xml | 2 +-
32 files changed, 15 insertions(+), 236 deletions(-)
diff --git a/README.md b/README.md
index 8692187..5a73754 100644
--- a/README.md
+++ b/README.md
@@ -181,9 +181,7 @@ kern.corefile=/cores/core.%N.%P
```bash
mkdir ~/dev
-git clone g...@github.com:oushu-io/hawq ~/dev/hawq
-git clone g...@github.com:oushu-io/hornet ~/dev/hornet
-git clone g...@github.com:oushu-io/libhdfs3 ~/dev/libhdfs3
+git clone g...@github.com:apache/hawq ~/dev/hawq
sudo mkdir -p /opt
sudo chmod a+w /opt
@@ -191,8 +189,7 @@ sudo install -o $USER -d /usr/local/hawq
```
### Step 2.3 Setup toolchain and thirdparty dependency
-1. Setup toolchain and thirdparty dependency referring to
[here](https://github.com/oushu-io/hornet/tree/master/thirdparty).
-2. Build hornet referring to [here](https://github.com/oushu-io/hornet#hornet).
+Setup toolchain and thirdparty dependency
### Step 2.4 Build HAWQ
@@ -209,8 +206,7 @@ sudo install -o $USER -d /usr/local/hawq
```bash
cd ~/dev/hawq
- git checkout oushu-master
- ln -sf ../../pre-push .git/hooks/pre-push
+ git checkout master
ln -sf ../../commit-msg .git/hooks/commit-msg
./configure
make -j8
@@ -280,11 +276,11 @@ hawq stop/restart/start cluster
# Build HAWQ on Centos 7
-Almost the same as that on macOS, feel free to have a try, referring to
[here](https://github.com/oushu-io/knowledgebase/wiki/Build-HAWQ-on-Linux-macOS#build-hawq-on-linuxmacos).
+Almost the same as that on macOS, feel free to have a try.
# Build HAWQ on Centos 7(6.X) using docker
-Almost the same as that on macOS, feel free to have a try, referring to
[here](https://github.com/oushu-io/knowledgebase/wiki/Build-HAWQ-in-Docker-Container#build-hawq-in-docker-container).
+Almost the same as that on macOS, feel free to have a try.
# Build & Install & Test (Apache HAWQ Version)
@@ -292,8 +288,6 @@ Almost the same as that on macOS, feel free to have a try,
referring to [here](h
Please see HAWQ wiki page:
https://cwiki.apache.org/confluence/display/HAWQ/Build+and+Install
-It is also ok to use the environment for building OushuDB, which saves time.
-
```shell
cd hawq
make feature-test
diff --git a/contrib/orc/README b/contrib/orc/README
index fa41fbf..869ccba 100644
--- a/contrib/orc/README
+++ b/contrib/orc/README
@@ -11,9 +11,6 @@ Fresh installation from 3.0.0.0 source code
Fresh installation from 3.0.0.0 rpm package
-------------------------------------------
1. Setup 3.0.0.0 yum repository
- $ cd /etc/yum.repos.d
- $ sudo wget
http://yum.oushu.io/oushurepo/yumrepo/release/oushu-database/centos7/3.0.0.0/oushu-database.repo
- $ sudo wget
http://yum.oushu.io/oushurepo/yumrepo/oushu-database-utils/centos7/1.1.0.0/oushu-database-utils.repo
2. Install rpm package
$ sudo yum install -y hawq
@@ -32,13 +29,8 @@ Upgrade from 2.2.0.0 to 3.3.0.0
$ cp -rf $GPHOME/etc ~/
3. Backup 2.2.0.0 yum repository on each node
- $ sudo mv /etc/yum.repos.d/oushu-hawq++.repo
/etc/yum.repos.d/oushu-hawq++.repo.bak
- $ sudo mv /etc/yum.repos.d/oushu-hawq++-utils.repo
/etc/yum.repos.d/oushu-hawq++-utils.repo.bak
4. Setup 3.0.0.0 yum repository on each node
- $ sudo wget -O /etc/yum.repos.d/oushu-database.repo
http://yum.oushu.io/oushurepo/yumrepo/test/oushu-database/centos7/3.0.0.0/oushu-database.repo
- $ sudo wget -O /etc/yum.repos.d/oushu-database-utils.repo
http://yum.oushu.io/oushurepo/yumrepo/oushu-database-utils/centos7/1.1.0.0/oushu-database-utils.repo
- $ sudo yum makecache
5. Install 3.0.0.0 rpm package on each node
$ sudo yum remove -y hawq
diff --git a/pre-push b/pre-push
deleted file mode 100755
index 819890e..0000000
--- a/pre-push
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# 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.
-
-# ln -sf ../../pre-push .git/hooks/pre-push
-
-remote="$1"
-url="$2"
-read local_ref local_sha remote_ref remote_sha
-
-DOWNLOAD_PROJECT="DownloadCode"
-COMPILE_PROJECT="CompileMasterReleaseRPM"
-TEST_PROJECT="MasterSingleNodeRelease"
-JENKINS_SERVER="http://zhenglin.taozl:zhenglin.ta...@ciserver10000.oushu-tech.com:10000/job/";
-BUILD_STATUS_QUERY="/lastBuild/api/json"
-protected_branch='oushu-master'
-
-CONSOLE_RED='\033[31m'
-CONSOLE_GREEN='\033[32m'
-CONSOLE_YELLOW='\033[33m'
-CONSOLE_CLEAR='\033[m'
-
-function check_build() {
- PROJECT=$1
- JOB_STATUS_JSON=`curl --silent --show-error
${JENKINS_SERVER}${PROJECT}${BUILD_STATUS_QUERY}`
- RESULT=`echo "${JOB_STATUS_JSON}" | sed -n
's/.*"building":\([\"A-Za-z]*\),.*/\1/p'`
- if [ "${RESULT}" = "true" ]; then
- printf "${CONSOLE_RED}${PROJECT} is still running, hold to
push${CONSOLE_CLEAR}\n"
- exit 1
- fi
- RESULT=`echo "${JOB_STATUS_JSON}" | sed -n
's/.*"result":\([\"A-Za-z]*\),.*/\1/p'`
- if [ "${RESULT}" != "\"SUCCESS\"" ]; then
- printf "${CONSOLE_RED}${PROJECT} not succeed, hold to
push${CONSOLE_CLEAR}\n"
- exit 1
- fi
- printf "${CONSOLE_GREEN} Checking
${CONSOLE_YELLOW}${PROJECT}${CONSOLE_GREEN} succeeds. ${CONSOLE_CLEAR}\n"
-}
-
-if [[ $remote_ref =~ $protected_branch ]]; then
- printf "${CONSOLE_YELLOW} Checking CI status... ${CONSOLE_CLEAR}\n"
- check_build ${DOWNLOAD_PROJECT}
- check_build ${COMPILE_PROJECT}
- check_build ${TEST_PROJECT}
- check_build CompileMasterDebugRPM
- check_build MasterSingleNodeDebug
- check_build MagmaDebugTest
- check_build MagmaSingleNodeParallel
- check_build MagmaApSingleNodeParallel
-fi
-exit 0
diff --git a/pxf/tomcat/src/scripts/pre-install.sh
b/pxf/tomcat/src/scripts/pre-install.sh
index 87f1058..9ee6837 100644
--- a/pxf/tomcat/src/scripts/pre-install.sh
+++ b/pxf/tomcat/src/scripts/pre-install.sh
@@ -32,4 +32,4 @@ getent group $group > /dev/null || $groupadd -r $group
getent passwd $user > /dev/null || $useradd --comment "tomcat server user" -M
-r -g $group $user
# Create base directory
-mkdir -p /opt/oushu
+mkdir -p /opt/hawq
diff --git a/src/backend/access/external/read_cache.c
b/src/backend/access/external/read_cache.c
index ec18f02..8be3a08 100644
--- a/src/backend/access/external/read_cache.c
+++ b/src/backend/access/external/read_cache.c
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#include "postgres.h"
#include "miscadmin.h"
diff --git a/src/backend/cdb/dispatcher_mgr.c b/src/backend/cdb/dispatcher_mgr.c
index 92baf51..b1e4feb 100644
--- a/src/backend/cdb/dispatcher_mgr.c
+++ b/src/backend/cdb/dispatcher_mgr.c
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#include "postgres.h"
diff --git a/src/backend/cdb/dispatcher_new.c b/src/backend/cdb/dispatcher_new.c
index 8d4a0b1..09053f2 100644
--- a/src/backend/cdb/dispatcher_new.c
+++ b/src/backend/cdb/dispatcher_new.c
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#include "postgres.h"
diff --git a/src/backend/cdb/executormgr_new.c
b/src/backend/cdb/executormgr_new.c
index 12b60ee..9b35b16 100644
--- a/src/backend/cdb/executormgr_new.c
+++ b/src/backend/cdb/executormgr_new.c
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#include "postgres.h"
diff --git a/src/backend/cdb/scheduler.c b/src/backend/cdb/scheduler.c
index 7a0274d..1c8ce76 100644
--- a/src/backend/cdb/scheduler.c
+++ b/src/backend/cdb/scheduler.c
@@ -16,12 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
+
#include "postgres.h"
#include "cdb/cdbgang.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 12cd2bb..7e6429e 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -18382,7 +18382,7 @@ static Datum transformLocationUris(List *locs, List*
fmtopts, bool isweb, bool i
errOmitLocation(true)));
}
- // Oushu will not support pxf anymore
+ // Apache HAWQ will not support pxf anymore
if (is_pxf_protocol(uri))
{
ereport(ERROR,
diff --git a/src/backend/executor/newExecutor.c
b/src/backend/executor/newExecutor.c
index bf3398e..ed803bf 100644
--- a/src/backend/executor/newExecutor.c
+++ b/src/backend/executor/newExecutor.c
@@ -42,8 +42,8 @@ bool enableOushuDbExtensiveFeatureSupport() {
void checkOushuDbExtensiveFeatureSupport(char featureCategory[]) {
if (MyExecutorRun == NULL)
ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
- errmsg("Feature of %s is only supported in OushuDB "
- "Enterprise Edition", featureCategory)));
+ errmsg("Feature of %s is not supported in Apache "
+ "HAWQ", featureCategory)));
}
PlanState *newExecutorPlanStateReference = NULL;
diff --git a/src/backend/libpq/cloudrest.c b/src/backend/libpq/cloudrest.c
index d66cae3..6d61c23 100644
--- a/src/backend/libpq/cloudrest.c
+++ b/src/backend/libpq/cloudrest.c
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#include "utils/cloudrest.h"
diff --git a/src/include/access/read_cache.h b/src/include/access/read_cache.h
index c9b146d..ca0ea78 100644
--- a/src/include/access/read_cache.h
+++ b/src/include/access/read_cache.h
@@ -17,11 +17,6 @@
* under the License.
*/
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef ACCESS_READ_CACHE_H
#define ACCESS_READ_CACHE_H
diff --git a/src/include/cdb/dispatcher_mgr.h b/src/include/cdb/dispatcher_mgr.h
index ea29a2a..6da5db4 100644
--- a/src/include/cdb/dispatcher_mgr.h
+++ b/src/include/cdb/dispatcher_mgr.h
@@ -17,11 +17,6 @@
* under the License.
*/
////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#ifndef DISPATCHER_MGR_H
#define DISPATCHER_MGR_H
diff --git a/src/include/cdb/dispatcher_new.h b/src/include/cdb/dispatcher_new.h
index bf0c4fe..ea84071 100644
--- a/src/include/cdb/dispatcher_new.h
+++ b/src/include/cdb/dispatcher_new.h
@@ -17,11 +17,6 @@
* under the License.
*/
////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#ifndef DISPATCHER_NEW_H
#define DISPATCHER_NEW_H
diff --git a/src/include/cdb/executormgr_new.h
b/src/include/cdb/executormgr_new.h
index 3162621..4287921 100644
--- a/src/include/cdb/executormgr_new.h
+++ b/src/include/cdb/executormgr_new.h
@@ -17,11 +17,6 @@
* under the License.
*/
////////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////////
#ifndef EXECUTORMGR_NEW_H
#define EXECUTORMGR_NEW_H
diff --git a/src/include/cdb/scheduler.h b/src/include/cdb/scheduler.h
index e05574b..77a0d48 100644
--- a/src/include/cdb/scheduler.h
+++ b/src/include/cdb/scheduler.h
@@ -17,11 +17,7 @@
* under the License.
*/
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
+
#ifndef SRC_INCLUDE_CDB_SCHEDULER_H_
#define SRC_INCLUDE_CDB_SCHEDULER_H_
diff --git a/src/include/cwrapper/dbcommon/function/func-kind.cg.h
b/src/include/cwrapper/dbcommon/function/func-kind.cg.h
index 93b8884..f5879b5 100644
--- a/src/include/cwrapper/dbcommon/function/func-kind.cg.h
+++ b/src/include/cwrapper/dbcommon/function/func-kind.cg.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef DBCOMMON_SRC_DBCOMMON_FUNCTION_FUNC_KIND_H_
#define DBCOMMON_SRC_DBCOMMON_FUNCTION_FUNC_KIND_H_
@@ -31,7 +25,6 @@
/*
* DO NOT EDIT!"
- * This file is generated from :
/Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h
*/
enum FuncKind {
@@ -39,7 +32,6 @@ enum FuncKind {
// OpExpr::setOpFuncId chooses the specific function to use:
// 1. val op val 2. val op vec 3. vec op val 4. vec op vec
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:61
TINYINT_LESS_THAN_TINYINT = 0,
TINYINT_LESS_THAN_SMALLINT = 1,
@@ -288,7 +280,6 @@ enum FuncKind {
DECIMAL_GREATER_THAN_DECIMAL = 244,
DECIMAL_GREATER_EQ_DECIMAL = 245,
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:74
TINYINT_MUL_TINYINT = 246,
TINYINT_MUL_SMALLINT = 247,
@@ -443,7 +434,6 @@ enum FuncKind {
// dummy aggregate function id denotes its correlated function, and it shares
// the same value with the lower bound its correlated function ids
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:127
AVG_TINYINT = 394,
@@ -588,7 +578,6 @@ enum FuncKind {
COUNT_ADD = 455,
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:157
TINYINT_TO_SMALLINT = 456,
TINYINT_TO_INT = 457,
@@ -633,7 +622,6 @@ enum FuncKind {
DECIMAL_TO_FLOAT = 496,
DECIMAL_TO_DOUBLE = 497,
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:165
INTERVAL_LESS_THAN_INTERVAL = 498,
INTERVAL_LESS_EQ_INTERVAL = 499,
@@ -654,7 +642,6 @@ enum FuncKind {
TIMESTAMP_GREATER_THAN_DATE = 514,
TIMESTAMP_GREATER_EQ_DATE = 515,
-///Users/oushu/dev/hornet-opensource/dbcommon/src/dbcommon/function/func-kind.h:175
INTERVAL_ADD_INTERVAL = 516,
INTERVAL_SUB_INTERVAL = 517,
diff --git a/src/include/cwrapper/dbcommon/type/type-kind.h
b/src/include/cwrapper/dbcommon/type/type-kind.h
index 6505729..465efc7 100644
--- a/src/include/cwrapper/dbcommon/type/type-kind.h
+++ b/src/include/cwrapper/dbcommon/type/type-kind.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef DBCOMMON_SRC_DBCOMMON_TYPE_TYPE_KIND_H_
#define DBCOMMON_SRC_DBCOMMON_TYPE_TYPE_KIND_H_
diff --git a/src/include/cwrapper/dbcommon/utils/instrument.h
b/src/include/cwrapper/dbcommon/utils/instrument.h
index 5ca10eb..bc50f1f 100644
--- a/src/include/cwrapper/dbcommon/utils/instrument.h
+++ b/src/include/cwrapper/dbcommon/utils/instrument.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef DBCOMMON_SRC_DBCOMMON_UTILS_INSTRUMENT_H_
#define DBCOMMON_SRC_DBCOMMON_UTILS_INSTRUMENT_H_
diff --git a/src/include/cwrapper/executor/cwrapper/cached-result.h
b/src/include/cwrapper/executor/cwrapper/cached-result.h
index 5831346..0b45381 100644
--- a/src/include/cwrapper/executor/cwrapper/cached-result.h
+++ b/src/include/cwrapper/executor/cwrapper/cached-result.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2019, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef EXECUTOR_SRC_EXECUTOR_CWRAPPER_CACHED_RESULT_H_
#define EXECUTOR_SRC_EXECUTOR_CWRAPPER_CACHED_RESULT_H_
diff --git a/src/include/cwrapper/executor/cwrapper/executor-c.h
b/src/include/cwrapper/executor/cwrapper/executor-c.h
index 1481768..d6e0dcc 100644
--- a/src/include/cwrapper/executor/cwrapper/executor-c.h
+++ b/src/include/cwrapper/executor/cwrapper/executor-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef EXECUTOR_SRC_EXECUTOR_CWRAPPER_EXECUTOR_C_H_
#define EXECUTOR_SRC_EXECUTOR_CWRAPPER_EXECUTOR_C_H_
diff --git a/src/include/cwrapper/magma/cwrapper/magma-client-c.h
b/src/include/cwrapper/magma/cwrapper/magma-client-c.h
index e7725f7..bef1a13 100644
--- a/src/include/cwrapper/magma/cwrapper/magma-client-c.h
+++ b/src/include/cwrapper/magma/cwrapper/magma-client-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2018, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef MAGMA_SRC_MAGMA_CWRAPPER_MAGMA_CLIENT_C_H_
#define MAGMA_SRC_MAGMA_CWRAPPER_MAGMA_CLIENT_C_H_
diff --git a/src/include/cwrapper/scheduler/cwrapper/scheduler-c.h
b/src/include/cwrapper/scheduler/cwrapper/scheduler-c.h
index 7ce1adc..b49b1d3 100644
--- a/src/include/cwrapper/scheduler/cwrapper/scheduler-c.h
+++ b/src/include/cwrapper/scheduler/cwrapper/scheduler-c.h
@@ -16,12 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
+
#ifndef SCHEDULER_SRC_SCHEDULER_CWRAPPER_SCHEDULER_C_H_
#define SCHEDULER_SRC_SCHEDULER_CWRAPPER_SCHEDULER_C_H_
diff --git a/src/include/cwrapper/storage/cwrapper/hdfs-file-system-c.h
b/src/include/cwrapper/storage/cwrapper/hdfs-file-system-c.h
index fdd22b1..3147600 100644
--- a/src/include/cwrapper/storage/cwrapper/hdfs-file-system-c.h
+++ b/src/include/cwrapper/storage/cwrapper/hdfs-file-system-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef STORAGE_SRC_STORAGE_CWRAPPER_HDFS_FILE_SYSTEM_C_H_
#define STORAGE_SRC_STORAGE_CWRAPPER_HDFS_FILE_SYSTEM_C_H_
diff --git a/src/include/cwrapper/storage/cwrapper/hive-file-system-c.h
b/src/include/cwrapper/storage/cwrapper/hive-file-system-c.h
index 4cb14e9..42cd458 100644
--- a/src/include/cwrapper/storage/cwrapper/hive-file-system-c.h
+++ b/src/include/cwrapper/storage/cwrapper/hive-file-system-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-////////////////////////////////////////////////////////////////////////////
-// Copyright 2018, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-////////////////////////////////////////////////////////////////////////////
#ifndef STORAGE_SRC_STORAGE_CWRAPPER_HIVE_FILE_SYSTEM_C_H_
#define STORAGE_SRC_STORAGE_CWRAPPER_HIVE_FILE_SYSTEM_C_H_
diff --git a/src/include/cwrapper/storage/cwrapper/magma-format-c.h
b/src/include/cwrapper/storage/cwrapper/magma-format-c.h
index 838561d..af8a12e 100644
--- a/src/include/cwrapper/storage/cwrapper/magma-format-c.h
+++ b/src/include/cwrapper/storage/cwrapper/magma-format-c.h
@@ -16,12 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2018, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
+
#ifndef STORAGE_MAGMA_FORMAT_SRC_STORAGE_CWRAPPER_MAGMA_FORMAT_C_H_
#define STORAGE_MAGMA_FORMAT_SRC_STORAGE_CWRAPPER_MAGMA_FORMAT_C_H_
diff --git a/src/include/cwrapper/storage/cwrapper/orc-format-c.h
b/src/include/cwrapper/storage/cwrapper/orc-format-c.h
index db38deb..558c41a 100644
--- a/src/include/cwrapper/storage/cwrapper/orc-format-c.h
+++ b/src/include/cwrapper/storage/cwrapper/orc-format-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef STORAGE_SRC_STORAGE_CWRAPPER_ORC_FORMAT_C_H_
#define STORAGE_SRC_STORAGE_CWRAPPER_ORC_FORMAT_C_H_
diff --git a/src/include/cwrapper/storage/cwrapper/text-format-c.h
b/src/include/cwrapper/storage/cwrapper/text-format-c.h
index a6d4719..82dc3eb 100644
--- a/src/include/cwrapper/storage/cwrapper/text-format-c.h
+++ b/src/include/cwrapper/storage/cwrapper/text-format-c.h
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef STORAGE_SRC_STORAGE_CWRAPPER_TEXT_FORMAT_C_H_
#define STORAGE_SRC_STORAGE_CWRAPPER_TEXT_FORMAT_C_H_
diff --git a/src/include/cwrapper/univplan/cwrapper/univplan-c.h
b/src/include/cwrapper/univplan/cwrapper/univplan-c.h
index eabe528..34f4c88 100644
--- a/src/include/cwrapper/univplan/cwrapper/univplan-c.h
+++ b/src/include/cwrapper/univplan/cwrapper/univplan-c.h
@@ -17,11 +17,6 @@
* under the License.
*/
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
#ifndef UNIVPLAN_SRC_UNIVPLAN_CWRAPPER_UNIVPLAN_C_H_
#define UNIVPLAN_SRC_UNIVPLAN_CWRAPPER_UNIVPLAN_C_H_
diff --git a/src/include/utils/cloudrest.h b/src/include/utils/cloudrest.h
index a12ad8e..cfb5afd 100644
--- a/src/include/utils/cloudrest.h
+++ b/src/include/utils/cloudrest.h
@@ -17,11 +17,7 @@
* under the License.
*/
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2016, Oushu Inc.
-// All rights reserved.
-//
-// Author:
-///////////////////////////////////////////////////////////////////////////////
+
#ifndef SRC_INCLUDE_UTILS_CLOUDREST_H_
#define SRC_INCLUDE_UTILS_CLOUDREST_H_
diff --git a/src/test/feature/cloudtest/test_cloud.xml
b/src/test/feature/cloudtest/test_cloud.xml
index f886ea8..fc5d2e8 100644
--- a/src/test/feature/cloudtest/test_cloud.xml
+++ b/src/test/feature/cloudtest/test_cloud.xml
@@ -35,6 +35,6 @@
</property>
<property>
<name>cloud_user</name>
- <value>oushu</value>
+ <value>gpadmin</value>
</property>
</configuration>
