Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Help document collation (integration of help and documentation documents) #1586

Merged
merged 12 commits into from
Aug 7, 2019
Merged

Help document collation (integration of help and documentation documents) #1586

merged 12 commits into from
Aug 7, 2019

Conversation

xy720
Copy link
Member

@xy720 xy720 commented Aug 5, 2019 •
edited
Loading

Integrate help and documentation folder

imay
imay requested changes Aug 5, 2019
View reviewed changes
docs/documentation/cn/sql-reference/sql-statements/Utility/util_stmt.md Outdated
@@ -0,0 +1,11 @@
# DESCRIBE
## description
该语�~O��~T��~N�~U示�~L~G�~Z table �~Z~D schema 信�~A�
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOT UTF8

docs/script/split.sh Outdated

scandir() {
for file in `ls $*`; do
if [[ ! -d $*"/"$file ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use space instead of space.

docs/script/merge.sh Outdated
local tempfile=${ROOTDIR}"/temp"
cp $* $tempfile

local row=0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tab

docs/documentation/cn/sql-reference/sql-statements/Data Manipulation/manipulation_stmt.md Outdated
@@ -648,12 +647,8 @@

4. 展示指定 db 的导入任务，指定 label 为 "load_example_db_20140102" ，state 为 "loading", 并按 LoadStartTime 降序排序
SHOW LOAD FROM example_db WHERE LABEL = "load_example_db_20140102" AND STATE = "loading" ORDER BY LoadStartTime DESC;

5. 展示指定 db 的导入任务 并按 LoadStartTime 降序排序,并从偏移量5开始显示10条查询结果
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should rebase master, or you will lose some documents information

imay
imay reviewed Aug 6, 2019
View reviewed changes
docs/script/keyword.sh Outdated
@@ -0,0 +1,68 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you rewrite it with python?
It's a little hard for us to maintain a complex shell script.

docs/documentation/cn/sql-reference/sql-statements/Data Definition/ddl_stmt.md Outdated
@@ -1110,44 +1110,3 @@
## keyword

COLOCATE, JOIN, CREATE TABLE

# CREATE FUNCTION
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you delete it?

Copy link
Member Author

@xy720 xy720 Aug 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because there already two md file with duplicate topics named "create-function" and "drop-function" exists. The two files originally belonged to documentation folder.

imay
imay reviewed Aug 7, 2019
View reviewed changes
docs/Makefile Outdated Show resolved Hide resolved
docs/documentation/cn/sql-reference/sql-functions/cast.md Outdated

## Syntax
## description
## description
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dup

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

docs/documentation/cn/sql-reference/sql-functions/cast.md
@@ -54,3 +53,5 @@ mysql> select cast(cast ("11.2" as double) as bigint);
+----------------------------------------+
1 row in set (0.00 sec)
```
##keyword
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there may be some error

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

xy720 and others added 2 commits August 7, 2019 14:44
@xy720 @imay
Update docs/Makefile
1646651 
Co-Authored-By: ZHAO Chun <buaa.zhaoc@gmail.com>
fix dup head and keywords, fix makefile
e6d7e3f
@imay imay merged commit 4c2a3d6 into apache:master Aug 7, 2019
@imay imay mentioned this pull request Sep 26, 2019
Closed
luwei16 pushed a commit to luwei16/incubator-doris that referenced this pull request Apr 7, 2023
@xiaokang @HappenLee @jacktengg
[cherry_pick](like) pick doris for regexp and like 17953 18351 (apach…
2c0077e 
…e#1586)

* [Bug][Fix] regexp function core dump DCHECK failed and error result (apache#17953)

CREATE TABLE `test` (
`name` varchar(64) NULL,
`age` int(11) NULL
) ENGINE=OLAP
DUPLICATE KEY(`name`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`name`) BUCKETS 1
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
"in_memory" = "false",
"storage_format" = "V2",
"disable_auto_compaction" = "false"
);
insert into `test` values ("lemon",1),("tom",2);

select a.name regexp concat('^', a.name) from test a;

* [fix](like) fix wrong result of like pattern with backslash (apache#18351)

---------

Co-authored-by: HappenLee <happenlee@hotmail.com>
Co-authored-by: TengJianPing <18241664+jacktengg@users.noreply.github.com>
SWJTU-ZhangLei pushed a commit to SWJTU-ZhangLei/incubator-doris that referenced this pull request Jul 25, 2023
@xiaokang @HappenLee
@jacktengg @gavinchou
[cherry_pick](like) pick doris for regexp and like 17953 18351 (apach…
ec5a362 
…e#1586)

* [Bug][Fix] regexp function core dump DCHECK failed and error result (apache#17953)

CREATE TABLE `test` (
`name` varchar(64) NULL,
`age` int(11) NULL
) ENGINE=OLAP
DUPLICATE KEY(`name`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`name`) BUCKETS 1
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
"in_memory" = "false",
"storage_format" = "V2",
"disable_auto_compaction" = "false"
);
insert into `test` values ("lemon",1),("tom",2);

select a.name regexp concat('^', a.name) from test a;

* [fix](like) fix wrong result of like pattern with backslash (apache#18351)

---------

Co-authored-by: HappenLee <happenlee@hotmail.com>
Co-authored-by: TengJianPing <18241664+jacktengg@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imay imay imay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xy720 @imay