Skip to content

Conversation

@xiaokang
Copy link
Contributor

@xiaokang xiaokang commented Dec 21, 2022

Proposed changes

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

  • thirdparty/installed/include/sqltypes.h

#define BOOL int

  • thirdparty/src/simdjson-1.0.2/include/simdjson/dom/element.h

enum class element_type {
ARRAY = '[', ///< dom::array
OBJECT = '{', ///< dom::object
INT64 = 'l', ///< int64_t
UINT64 = 'u', ///< uint64_t: any integer that fits in uint64_t but not int64_t
DOUBLE = 'd', ///< double: Any number with a "." or "e" that fits in double.
STRING = '"', ///< std::string_view
BOO = 't', ///< bool
NULL_VALUE = 'n' ///< null
};

Problem summary

Describe your changes.

Checklist(Required)

  1. Does it affect the original behavior:
    • Yes
    • No
    • I don't know
  2. Has unit tests been added:
    • Yes
    • No
    • No Need
  3. Has document been added or modified:
    • Yes
    • No
    • No Need
  4. Does it need to update dependencies:
    • Yes
    • No
  5. Are there any changes that cannot be rolled back:
    • Yes (If Yes, please explain WHY)
    • No

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@hello-stephen
Copy link
Contributor

TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 35.17 seconds
load time: 669 seconds
storage size: 17123579519 Bytes
https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/tmp/20221221034621_clickbench_pr_65927.html

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

LGTM

@morningman morningman merged commit 7d49ddf into apache:master Dec 22, 2022
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 22, 2022
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

morningman pushed a commit that referenced this pull request Dec 22, 2022
… BOOL (#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

- thirdparty/installed/include/sqltypes.h

> #define	BOOL				int


- thirdparty/src/simdjson-1.0.2/include/simdjson/dom/element.h

> enum class element_type {
>   ARRAY = '[',     ///< dom::array
>   OBJECT = '{',    ///< dom::object
>   INT64 = 'l',     ///< int64_t
>   UINT64 = 'u',    ///< uint64_t: any integer that fits in uint64_t but *not* int64_t
>   DOUBLE = 'd',    ///< double: Any number with a "." or "e" that fits in double.
>   STRING = '"',    ///< std::string_view
>   BOOL = 't',      ///< bool
>   NULL_VALUE = 'n' ///< null
> };
>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 1, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 1, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 2, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 7, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 8, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 9, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 10, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 10, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
eldenmoon added a commit to eldenmoon/incubator-doris that referenced this pull request Feb 10, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
luwei16 pushed a commit to luwei16/Doris that referenced this pull request Apr 7, 2023
…he#1331)

* (improvement)[dynamic-table] support load in new_load_scan_node

* [bugfix](thirdparty) patch simdjson to avoid conflict with odbc macro BOOL (apache#15223)

fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson.

Co-authored-by: Kang <kxiao.tiger@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. dev/1.2.1-merged reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants