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

feat(cli): Add settings.max_width and settings.max_col_width #131

Merged
merged 11 commits into from
Jun 17, 2023
Merged

feat(cli): Add settings.max_width and settings.max_col_width #131

merged 11 commits into from
Jun 17, 2023

Conversation

TCeason
Copy link
Collaborator

@TCeason TCeason commented Jun 13, 2023 

root@localhost> .max_col_width 5;
root@localhost> .max_display_rows 4;
root@localhost> .max_width 40;

root@localhost> desc db.hits;

DESC db.hits

┌───────────────────────────────────────────┐
│   Fi...   │ Ty... │ Nu... │ De... │ Ex... │
│   St...   │ St... │ St... │ St... │ St... │
├───────────┼───────┼───────┼───────┼───────┤
│ wa...     │ BI... │ NO    │ 0     │       │
│ ja...     │ SM... │ NO    │ 0     │       │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ur...     │ BI... │ NO    │ 0     │       │
│ clid      │ INT   │ NO    │ 0     │       │
│ 105 rows  │       │       │       │       │
│ (4 shown) │       │       │       │       │
└───────────────────────────────────────────┘
105 rows in 0.035 sec. Processed 0 rows, 0B (0 rows/s, 0B/s)

root@localhost> select * from db.hits;

SELECT
  *
FROM
  db.hits

┌─────────────────────────────────────────────────────────┐
│   wa...   │ ja... │ ti... │ ··· │ re... │ ur... │ cl... │
│   In...   │ In... │ St... │     │ In... │ In... │ In... │
├───────────┼───────┼───────┼─────┼───────┼───────┼───────┤
│     91... │     0 │       │ ... │ -2... │ -8... │     0 │
│     81... │     0 │       │ ... │ -2... │ -8... │     0 │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│     66... │     0 │       │ ... │ -2... │ 49... │     0 │
│     89... │     0 │       │ ... │ -2... │ -8... │     0 │
│   10 rows │       │       │     │       │       │       │
│ (4 shown) │       │       │     │       │       │       │
└─────────────────────────────────────────────────────────┘
10 rows in 0.047 sec. Processed 10 rows, 10B (214.17 rows/s, 70.25 KiB/s)

@TCeason
Copy link
Collaborator Author

TCeason commented Jun 13, 2023

@sundy-li please review this pr.

@TCeason
Add settings.max_width and settings.max_col_width
9b36364 
root@localhost> .max_col_width 5;
root@localhost> .max_display_rows 4;
root@localhost> .max_width 40;

root@localhost> desc db.hits;

DESC db.hits

┌───────────────────────────────────────────┐
│   Fi...   │ Ty... │ Nu... │ De... │ Ex... │
│   St...   │ St... │ St... │ St... │ St... │
├───────────┼───────┼───────┼───────┼───────┤
│ wa...     │ BI... │ NO    │ 0     │       │
│ ja...     │ SM... │ NO    │ 0     │       │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ·         │ ·     │ ·     │ ·     │ ·     │
│ ur...     │ BI... │ NO    │ 0     │       │
│ clid      │ INT   │ NO    │ 0     │       │
│ 105 rows  │       │       │       │       │
│ (4 shown) │       │       │       │       │
└───────────────────────────────────────────┘
105 rows in 0.035 sec. Processed 0 rows, 0B (0 rows/s, 0B/s)

root@localhost> select * from db.hits;

SELECT
  *
FROM
  db.hits

┌─────────────────────────────────────────────────────────┐
│   wa...   │ ja... │ ti... │ ··· │ re... │ ur... │ cl... │
│   In...   │ In... │ St... │     │ In... │ In... │ In... │
├───────────┼───────┼───────┼─────┼───────┼───────┼───────┤
│     91... │     0 │       │ ... │ -2... │ -8... │     0 │
│     81... │     0 │       │ ... │ -2... │ -8... │     0 │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│         · │     · │ ·     │  ·  │     · │     · │     · │
│     66... │     0 │       │ ... │ -2... │ 49... │     0 │
│     89... │     0 │       │ ... │ -2... │ -8... │     0 │
│   10 rows │       │       │     │       │       │       │
│ (4 shown) │       │       │     │       │       │       │
└─────────────────────────────────────────────────────────┘
10 rows in 0.047 sec. Processed 10 rows, 10B (214.17 rows/s, 70.25 KiB/s)
sundy-li
sundy-li reviewed Jun 14, 2023
View reviewed changes
cli/src/config.rs Outdated Show resolved Hide resolved
sundy-li
sundy-li reviewed Jun 14, 2023
View reviewed changes
cli/src/display.rs Outdated Show resolved Hide resolved
TCeason
TCeason commented Jun 15, 2023
View reviewed changes
cli/src/display.rs Outdated Show resolved Hide resolved
@TCeason
1. max_col_width default to 20
813a607 
2. max_width default is 0, use terminal width
3. col_length = field.name.len() + 1 + field.data_type.to_string().len(); not field.name.len().max(field.data_type.to_string().len());
4. fix conversation
@TCeason TCeason force-pushed the modify_display branch 2 times, most recently from c0399bb to 6d188b1 Compare June 16, 2023 03:48
@TCeason TCeason mentioned this pull request Jun 16, 2023
Merged
@TCeason
1. col_length should be max(field.name.len(), field.data_type.to_stri…
a8b54d7 
…ng().len())

2. width consider result row length.
@sundy-li sundy-li merged commit 498cc7b into databendlabs:main Jun 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sundy-li sundy-li sundy-li 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
@TCeason @sundy-li