[Feature][linkis-public-enhancements] Mer pes publicservice (#4854)

* merge pes service

* remove instance label

docs/errorcode/linkis-instance-label-errorcode.md

@@ -1,7 +1,7 @@
 ## linkis-instance-label  errorcode
 
 | 模块名(服务名) | 错误码  | 描述 | Exception Class|
-| -------- | -------- | ----- |-----|
+|  | -------- | ----- |-----|
 |linkis-instance-label |14100|Failed to insert service instance(插入服务实例失败)|LinkisInstanceLabelErrorCodeSummary|
 |linkis-instance-label |14100|Only admin can view all instances(只有管理员才能查看所有实例).|LinkisInstanceLabelErrorCodeSummary|
 |linkis-instance-label |14100|Only admin can modify instance label(只有管理员才能修改标签).|LinkisInstanceLabelErrorCodeSummary|

linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml

@@ -91,12 +91,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <!--Metadata common-->
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-pes-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
   <build>

linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml

@@ -6,9 +6,9 @@
   ~ 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.

linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql

@@ -1,65 +1,65 @@
-/*
- * 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.
- */
-
-DROP TABLE IF EXISTS "linkis_ps_instance_info";
-CREATE TABLE linkis_ps_instance_info (
-	id serial NOT NULL,
-	"instance" varchar(128) NULL,
-	"name" varchar(128) NULL,
-	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	CONSTRAINT linkis_instance_info_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_instance_ii ON linkis_ps_instance_info USING btree (instance);
-
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label";
-CREATE TABLE linkis_ps_instance_label (
-	id serial NOT NULL,
-	label_key varchar(32) NOT NULL,
-	label_value varchar(255) NOT NULL,
-	label_feature varchar(16) NOT NULL,
-	label_value_size int4 NOT NULL,
-	update_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	create_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	CONSTRAINT linkis_instance_label_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lk_lv_il ON linkis_ps_instance_label USING btree (label_key, label_value);
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label_relation";
-CREATE TABLE linkis_ps_instance_label_relation (
-	id serial NOT NULL,
-	label_id int4 NULL,
-	service_instance varchar(128) NOT NULL,
-	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	CONSTRAINT linkis_instance_label_relation_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lid_instance ON linkis_ps_instance_label_relation USING btree (label_id, service_instance);
-
-
-DROP TABLE IF EXISTS "linkis_ps_instance_label_value_relation";
-CREATE TABLE linkis_ps_instance_label_value_relation (
-	id serial NOT NULL,
-	label_value_key varchar(255) NOT NULL,
-	label_value_content varchar(255) NULL,
-	label_id int4 NULL,
-	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
-	CONSTRAINT linkis_ps_instance_label_value_relation_pkey PRIMARY KEY (id)
-);
-CREATE UNIQUE INDEX uniq_lvk_lid_ilvr ON linkis_ps_instance_label_value_relation USING btree (label_value_key, label_id);
+/*
+ * 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.
+ */
+
+DROP TABLE IF EXISTS "linkis_ps_instance_info";
+CREATE TABLE linkis_ps_instance_info (
+	id serial NOT NULL,
+	"instance" varchar(128) NULL,
+	"name" varchar(128) NULL,
+	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	CONSTRAINT linkis_instance_info_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_instance_ii ON linkis_ps_instance_info USING btree (instance);
+
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label";
+CREATE TABLE linkis_ps_instance_label (
+	id serial NOT NULL,
+	label_key varchar(32) NOT NULL,
+	label_value varchar(255) NOT NULL,
+	label_feature varchar(16) NOT NULL,
+	label_value_size int4 NOT NULL,
+	update_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	create_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	CONSTRAINT linkis_instance_label_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lk_lv_il ON linkis_ps_instance_label USING btree (label_key, label_value);
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label_relation";
+CREATE TABLE linkis_ps_instance_label_relation (
+	id serial NOT NULL,
+	label_id int4 NULL,
+	service_instance varchar(128) NOT NULL,
+	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	CONSTRAINT linkis_instance_label_relation_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lid_instance ON linkis_ps_instance_label_relation USING btree (label_id, service_instance);
+
+
+DROP TABLE IF EXISTS "linkis_ps_instance_label_value_relation";
+CREATE TABLE linkis_ps_instance_label_value_relation (
+	id serial NOT NULL,
+	label_value_key varchar(255) NOT NULL,
+	label_value_content varchar(255) NULL,
+	label_id int4 NULL,
+	update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
+	CONSTRAINT linkis_ps_instance_label_value_relation_pkey PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX uniq_lvk_lid_ilvr ON linkis_ps_instance_label_value_relation USING btree (label_value_key, label_id);