Skip to content

Commit

Permalink
Merge branch 'main' into sqlAliasQuery
Browse files Browse the repository at this point in the history
  • Loading branch information
auxten authored Jun 5, 2024
2 parents 152f5cf + c84060d commit d6b1341
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributors

* auxten [auxtenwpc@gmail.com](mailto:auxtenwpc@gmail.com)
* auxten [auxten@clickhouse.com](mailto:auxten@clickhouse.com)

To see the list of authors who created the source code of ClickHouse, published and distributed by ClickHouse, Inc. as the owner,
run "SELECT * FROM system.contributors;" query on any ClickHouse server.
2 changes: 1 addition & 1 deletion README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,5 +182,5 @@ chDB 主要基于 [ClickHouse](https://github.com/ClickHouse/ClickHouse)。由
## 联系方式
- 知乎: [@auxten](https://www.zhihu.com/people/auxten)
- Discord:[https://discord.gg/D2Daa2fM5K](https://discord.gg/D2Daa2fM5K)
- 电子邮件:auxtenwpc@gmail.com
- 电子邮件:auxten@clickhouse.com
- Twitter:[@chdb](https://twitter.com/chdb_io)
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
</div>
<div align="center">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="docs/_static/snake-chdb-dark.png" height="130">
<img src="docs/_static/snake-chdb.png" height="130">
<source media="(prefers-color-scheme: dark)" srcset="https://github.com/chdb-io/chdb/raw/main/docs/_static/snake-chdb-dark.png" height="130">
<img src="https://github.com/chdb-io/chdb/raw/main/docs/_static/snake-chdb.png" height="130">
</picture>

[![Build X86](https://github.com/chdb-io/chdb/actions/workflows/build_wheels.yml/badge.svg?event=release)](https://github.com/chdb-io/chdb/actions/workflows/build_wheels.yml)
Expand Down Expand Up @@ -34,7 +34,7 @@

## Arch
<div align="center">
<img src="docs/_static/arch-chdb2.png" width="450">
<img src="https://github.com/chdb-io/chdb/raw/main/docs/_static/arch-chdb2.png" width="450">
</div>

## Get Started
Expand Down Expand Up @@ -202,7 +202,7 @@ for trade mark and other reasons, I named it chDB.

## Contact
- Discord: [https://discord.gg/D2Daa2fM5K](https://discord.gg/D2Daa2fM5K)
- Email: auxtenwpc@gmail.com
- Email: auxten@clickhouse.com
- Twitter: [@chdb](https://twitter.com/chdb_io)


Expand Down
2 changes: 1 addition & 1 deletion bindings.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ If you have already developed bindings for a language not listed above,
If you are interested in contributing to the development of bindings for a language not listed above, please contact us at:
- Discord: [bindings](https://discord.gg/uUk6AKf7yM)
- Email: auxtenwpc@gmail.com
- Email: auxten@clickhouse.com
- Twitter: [@chdb](https://twitter.com/chdb_io)
11 changes: 7 additions & 4 deletions chdb/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

set -e

# default to build Release
build_type=${1:-Release}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

. ${DIR}/vars.sh
Expand Down Expand Up @@ -68,7 +71,7 @@ if [ ! -d $BUILD_DIR ]; then
fi

cd ${BUILD_DIR}
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_THINLTO=0 -DENABLE_TESTS=0 -DENABLE_CLICKHOUSE_SERVER=0 -DENABLE_CLICKHOUSE_CLIENT=0 \
cmake -DCMAKE_BUILD_TYPE=${build_type} -DENABLE_THINLTO=0 -DENABLE_TESTS=0 -DENABLE_CLICKHOUSE_SERVER=0 -DENABLE_CLICKHOUSE_CLIENT=0 \
-DENABLE_CLICKHOUSE_KEEPER=0 -DENABLE_CLICKHOUSE_KEEPER_CONVERTER=0 -DENABLE_CLICKHOUSE_LOCAL=1 -DENABLE_CLICKHOUSE_SU=0 -DENABLE_CLICKHOUSE_BENCHMARK=0 \
-DENABLE_AZURE_BLOB_STORAGE=0 -DENABLE_CLICKHOUSE_COPIER=0 -DENABLE_CLICKHOUSE_DISKS=0 -DENABLE_CLICKHOUSE_FORMAT=0 -DENABLE_CLICKHOUSE_GIT_IMPORT=0 \
-DENABLE_AWS_S3=1 -DENABLE_HIVE=0 -DENABLE_AVRO=1 \
Expand All @@ -81,11 +84,11 @@ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_THINLTO=0 -DENABLE_TESTS=0 -DENABLE_CL
-DENABLE_LIBRARIES=0 -DENABLE_RUST=0 \
${GLIBC_COMPATIBILITY} \
-DENABLE_UTILS=0 ${LLVM} ${UNWIND} \
-DENABLE_ICU=0 ${JEMALLOC} \
-DENABLE_ICU=1 ${JEMALLOC} \
-DENABLE_PARQUET=1 -DENABLE_ROCKSDB=1 -DENABLE_SQLITE=1 -DENABLE_VECTORSCAN=1 \
-DENABLE_PROTOBUF=1 -DENABLE_THRIFT=1 \
-DENABLE_RAPIDJSON=1 \
-DENABLE_BROTLI=1 \
-DENABLE_BROTLI=1 -DENABLE_H3=1 \
-DENABLE_CLICKHOUSE_ALL=0 -DUSE_STATIC_LIBRARIES=1 -DSPLIT_SHARED_LIBRARIES=0 \
${CPU_FEATURES} \
${CMAKE_TOOLCHAIN_FILE} \
Expand All @@ -108,7 +111,7 @@ ninja -v > build.log

# extract the command to generate CHDB_PY_MODULE

PYCHDB_CMD=$(grep 'clang++.*-o programs/clickhouse .*' build.log \
PYCHDB_CMD=$(grep -m 1 'clang++.*-o programs/clickhouse .*' build.log \
| sed "s/-o programs\/clickhouse/-fPIC -Wl,-undefined,dynamic_lookup -shared ${PYINIT_ENTRY} -o ${CHDB_PY_MODULE}/" \
| sed 's/^[^&]*&& //' | sed 's/&&.*//' \
| sed 's/ -Wl,-undefined,error/ -Wl,-undefined,dynamic_lookup/g' \
Expand Down
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
name = chdb
description = chDB is an in-process SQL OLAP Engine powered by ClickHouse
author = auxten
author_email = auxtenwpc@gmail.com
author_email = auxten@clickhouse.com
license = Apache-2.0
license_files = LICENSE.txt
long_description = file: README.md
long_description_content_type = text/markdown; charset=UTF-8; variant=GFM
url = https://github.com/auxten/chdb
url = https://github.com/chdb-io/chdb
# Add here related links, for example:
project_urls =
Documentation = https://github.com/auxten/chdb
Documentation = https://doc.chdb.io/
# Source = https://github.com/pyscaffold/pyscaffold/
# Changelog = https://pyscaffold.org/en/latest/changelog.html
# Tracker = https://github.com/pyscaffold/pyscaffold/issues
# Conda-Forge = https://anaconda.org/conda-forge/pyscaffold
# Download = https://pypi.org/project/PyScaffold/#files
# Twitter = https://twitter.com/PyScaffold
Twitter = https://twitter.com/chdb_io

# Change if running only on Windows, Mac or Linux (comma-separated)
platforms = Mac, Linux
Expand Down

0 comments on commit d6b1341

Please sign in to comment.