Skip to content

Commit fd3ad2f

Browse files
author
liusiyuan1
committed
Update break line /r/n to /n in '/bin'
1 parent 2323829 commit fd3ad2f

File tree

3 files changed

+79
-79
lines changed

3 files changed

+79
-79
lines changed

‎conf/log4j.properties

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more
2-
# contributor license agreements. See the NOTICE file distributed with
3-
# this work for additional information regarding copyright ownership.
4-
# The ASF licenses this file to you under the Apache License, Version 2.0
5-
# (the "License"); you may not use this file except in compliance with
6-
# the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
16-
# Root logger is configured at INFO and is sent to A1
17-
log4j.rootLogger=INFO, Console
18-
19-
# A1 goes to the console
20-
log4j.appender.Console=org.apache.log4j.ConsoleAppender
21-
22-
# Set the pattern for each log message
23-
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
24-
log4j.appender.Console.layout.ConversionPattern=%d [%t] %-5p - %m%n
25-
26-
log4j.logger.com.qihoo.qsql.org.apache.calcite.runtime=DEBUG
27-
log4j.logger.org.apache.calcite.metadata=DEBUG
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to you under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Root logger is configured at INFO and is sent to A1
17+
log4j.rootLogger=INFO, Console
18+
19+
# A1 goes to the console
20+
log4j.appender.Console=org.apache.log4j.ConsoleAppender
21+
22+
# Set the pattern for each log message
23+
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
24+
log4j.appender.Console.layout.ConversionPattern=%d [%t] %-5p - %m%n
25+
26+
log4j.logger.com.qihoo.qsql.org.apache.calcite.runtime=DEBUG
27+
log4j.logger.org.apache.calcite.metadata=DEBUG
2828
log4j.logger.com.qihoo.qsql.org.apache.calcite.plan.plan=DEBUG

‎metastore/scripts/qsql-metadata-mysql-delete.sql

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
2-
DROP TABLE COLUMNS;
3-
4-
DROP TABLE TBLS;
5-
6-
DROP TABLE DATABASE_PARAMS;
7-
1+
2+
DROP TABLE COLUMNS;
3+
4+
DROP TABLE TBLS;
5+
6+
DROP TABLE DATABASE_PARAMS;
7+
88
DROP TABLE DBS;

‎metastore/scripts/qsql-metadata-mysql-init.sql

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
DROP TABLE IF EXISTS `DBS`;
2-
CREATE TABLE `DBS` (
3-
`DB_ID` bigint(20) AUTO_INCREMENT NOT NULL,
4-
`DESC` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
5-
`NAME` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
6-
`DB_TYPE` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
7-
PRIMARY KEY (`DB_ID`),
8-
UNIQUE KEY `UNIQUE_DATABASE` (`NAME`)
9-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
10-
11-
DROP TABLE IF EXISTS `DATABASE_PARAMS`;
12-
CREATE TABLE `DATABASE_PARAMS` (
13-
`DB_ID` bigint(20) NOT NULL,
14-
`PARAM_KEY` varchar(180) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
15-
`PARAM_VALUE` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
16-
PRIMARY KEY (`DB_ID`,`PARAM_KEY`),
17-
KEY `DATABASE_PARAMS_N49` (`DB_ID`),
18-
INDEX `PARAMS_INDEX` (`DB_ID`),
19-
CONSTRAINT `DATABASE_PARAMS_FK1` FOREIGN KEY (`DB_ID`) REFERENCES `DBS` (`DB_ID`)
20-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
21-
22-
DROP TABLE IF EXISTS `TBLS`;
23-
CREATE TABLE `TBLS` (
24-
`TBL_ID` bigint(20) AUTO_INCREMENT NOT NULL,
25-
`CREATE_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
26-
`DB_ID` bigint(20) DEFAULT NULL,
27-
`TBL_NAME` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
28-
PRIMARY KEY (`TBL_ID`),
29-
UNIQUE KEY `UNIQUETABLE` (`TBL_NAME`,`DB_ID`),
30-
KEY `TBLS_N49` (`DB_ID`),
31-
CONSTRAINT `TBLS_FK2` FOREIGN KEY (`DB_ID`) REFERENCES `DBS` (`DB_ID`)
32-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
33-
34-
DROP TABLE IF EXISTS `COLUMNS`;
35-
CREATE TABLE `COLUMNS` (
36-
`CD_ID` bigint(20) NOT NULL,
37-
`COMMENT` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
38-
`COLUMN_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
39-
`TYPE_NAME` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
40-
`INTEGER_IDX` int(11) NOT NULL,
41-
PRIMARY KEY (`CD_ID`,`COLUMN_NAME`),
42-
KEY `COLUMNS_N49` (`CD_ID`),
43-
INDEX `COLUMNS_INDEX` (`CD_ID`),
44-
CONSTRAINT `COLUMNS_FK1` FOREIGN KEY (`CD_ID`) REFERENCES `TBLS` (`TBL_ID`)
45-
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
1+
DROP TABLE IF EXISTS `DBS`;
2+
CREATE TABLE `DBS` (
3+
`DB_ID` bigint(20) AUTO_INCREMENT NOT NULL,
4+
`DESC` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
5+
`NAME` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
6+
`DB_TYPE` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
7+
PRIMARY KEY (`DB_ID`),
8+
UNIQUE KEY `UNIQUE_DATABASE` (`NAME`)
9+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
10+
11+
DROP TABLE IF EXISTS `DATABASE_PARAMS`;
12+
CREATE TABLE `DATABASE_PARAMS` (
13+
`DB_ID` bigint(20) NOT NULL,
14+
`PARAM_KEY` varchar(180) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
15+
`PARAM_VALUE` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
16+
PRIMARY KEY (`DB_ID`,`PARAM_KEY`),
17+
KEY `DATABASE_PARAMS_N49` (`DB_ID`),
18+
INDEX `PARAMS_INDEX` (`DB_ID`),
19+
CONSTRAINT `DATABASE_PARAMS_FK1` FOREIGN KEY (`DB_ID`) REFERENCES `DBS` (`DB_ID`)
20+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
21+
22+
DROP TABLE IF EXISTS `TBLS`;
23+
CREATE TABLE `TBLS` (
24+
`TBL_ID` bigint(20) AUTO_INCREMENT NOT NULL,
25+
`CREATE_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
26+
`DB_ID` bigint(20) DEFAULT NULL,
27+
`TBL_NAME` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
28+
PRIMARY KEY (`TBL_ID`),
29+
UNIQUE KEY `UNIQUETABLE` (`TBL_NAME`,`DB_ID`),
30+
KEY `TBLS_N49` (`DB_ID`),
31+
CONSTRAINT `TBLS_FK2` FOREIGN KEY (`DB_ID`) REFERENCES `DBS` (`DB_ID`)
32+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
33+
34+
DROP TABLE IF EXISTS `COLUMNS`;
35+
CREATE TABLE `COLUMNS` (
36+
`CD_ID` bigint(20) NOT NULL,
37+
`COMMENT` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
38+
`COLUMN_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
39+
`TYPE_NAME` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
40+
`INTEGER_IDX` int(11) NOT NULL,
41+
PRIMARY KEY (`CD_ID`,`COLUMN_NAME`),
42+
KEY `COLUMNS_N49` (`CD_ID`),
43+
INDEX `COLUMNS_INDEX` (`CD_ID`),
44+
CONSTRAINT `COLUMNS_FK1` FOREIGN KEY (`CD_ID`) REFERENCES `TBLS` (`TBL_ID`)
45+
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

0 commit comments

Comments
 (0)