Changeset: b2c9165bef23 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b2c9165bef23
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_join.c
Branch: cnting_sketches
Log Message:
Merge with pp_hashjoin branch.
diffs (truncated from 12022 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.56.0
+current_version = 56.0.0
commit = False
tag = False
diff --git a/.clang-format b/.clang-format
new file mode 100644
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,161 @@
+---
+IndentWidth: 8
+TabWidth: 8
+UseTab: Always
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: Consecutive
+AlignEscapedNewlines: LeftWithLastLine
+AlignOperands: Align
+AlignTrailingComments: Always
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseExpressionOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+# clang-format 23: AllowShortRecordOnASingleLine: Never
+AlwaysBreakBeforeMultilineStrings: false
+AttributeMacros: [_In_z_, _Printf_format_string_]
+BinPackArguments: true
+BinPackParameters: BinPack
+BitFieldColonSpacing: None
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Always
+BreakAfterReturnType: AllDefinitions
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: true
+BreakBinaryOperations: RespectPrecedence
+BreakFunctionDefinitionParameters: false
+BreakStringLiterals: false
+ColumnLimit: 80
+ContinuationIndentWidth: 8
+EnumTrailingComma: Leave
+ForEachMacros:
+ - BATloop
+ - TIMEOUT_LOOP_IDX
+ - TIMEOUT_LOOP_IDX_DECL
+ - TIMEOUT_LOOP
+IfMacros:
+ - TRC_CRITICAL_IF
+ - TRC_ERROR_IF
+ - TRC_WARNING_IF
+ - TRC_INFO_IF
+ - TRC_DEBUG_IF
+IncludeCategories:
+ - Regex: '^"monetdb_config\.h"'
+ - Regex: '.*'
+IndentCaseBlocks: false
+IndentCaseLabels: false
+# clang-format 22: IndentGotoLabels: HalfIndent
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+InsertNewlineAtEOF: true
+KeepEmptyLines:
+ AtEndOfFile: false
+ AtStartOfBlock: false
+ AtStartOfFile: false
+LineEnding: LF
+PPIndentWidth: 1
+PointerAlignment: Right
+QualifierAlignment: Leave
+ReflowComments: IndentOnly
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyParentheses: false
+SpacesInParens: Never
+SpacesInSquareBrackets: false
+StatementAttributeLikeMacros:
+ - fits_export
+ - gdk_export
+ - generator_export
+ - geom_export
+ - libgeom_export
+ - mal_export
+ - mapi_export
+ - monetdbe_export
+ - moptions_export
+ - mutils_export
+ - mvc_export
+ - netcdf_export
+ - orderidx_export
+ - pyapi_export
+ - shp_export
+ - sql5_export
+ - sql_export
+ - udf_export
+TypeNames:
+ - allocator
+ - ATOMIC_BASE_TYPE
+ - ATOMIC_TYPE
+ - bat
+ - BAT
+ - BATiter
+ - bit
+ - bte
+ - BUN
+ - BUN2type
+ - BUN4type
+ - BUN8type
+ - date
+ - daytime
+ - dbl
+ - FILE
+ - flt
+ - gdk_callback_func
+ - gdk_return
+ - Hash
+ - Heap
+ - hge
+ - __int128_t
+ - int16_t
+ - int32_t
+ - int64_t
+ - int8_t
+ - lng
+ - log_bid
+ - logger
+ - log_id
+ - Mapi
+ - MapiHdl
+ - MapiMsg
+ - msk
+ - MT_Cond
+ - MT_Id
+ - MT_Lock
+ - MT_Sema
+ - off_t
+ - oid
+ - old_logger
+ - PROPrec
+ - ptr
+ - QryCtx
+ - RTree
+ - sht
+ - str
+ - stream
+ - stridx_t
+ - Strimps
+ - timestamp
+ - time_t
+ - trans
+ - uint16_t
+ - uint32_t
+ - uint64_t
+ - uint8_t
+ - ulng
+ - url
+ - ValRecord
+ - var_t
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,6 +11,9 @@ on:
schedule:
- cron: '15 1 * * *'
+env:
+ TSTALTLOCALHOST: altlocalhost
+
jobs:
test:
strategy:
@@ -55,6 +58,16 @@ jobs:
run: pip3 install --user --break-system-packages --upgrade pymonetdb
cryptography
if: runner.os == 'macOS'
+
+ - name: Patch /etc/hosts on Unix
+ run: echo '127.0.0.1 altlocalhost' | sudo tee -a /etc/hosts
+ if: runner.os != 'Windows'
+
+ - name: Patch \etc\hosts on Windows
+ run: Add-Content "C:\Windows\System32\drivers\etc\hosts" "127.0.0.1
altlocalhost"
+ shell: powershell
+ if: runner.os == 'Windows'
+
- name: make MonetDB on linux
run: |
mkdir build
@@ -109,14 +122,14 @@ jobs:
- name: choco packages
run: |
choco install winflexbison3
- vcpkg install libiconv bzip2 libxml2 pcre2 zlib getopt
+ vcpkg install libiconv bzip2 libxml2 pcre2 zlib getopt
if: runner.os == 'Windows'
- name: make MonetDB on Windows
shell: pwsh
run: |
mkdir build
- cd build
+ cd build
cmake .. -DCMAKE_INSTALL_PREFIX=C:\MDB
-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake
-DPY3INTEGRATION=OFF -DRINTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release
-DASSERT=OFF -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_SUMMARY=ON
cmake --build . --target install
if: runner.os == 'Windows'
@@ -129,10 +142,10 @@ jobs:
- name: mtest
run: |
- PATH=$HOME/MDB/bin:$PATH $HOME/MDB/bin/Mtest.py -r --debug=0 --ci
--no-html --TSTTRGBASE=.
+ PATH=$HOME/MDB/bin:$PATH $HOME/MDB/bin/Mtest.py -v -r --debug=0 --ci
--no-html --TSTTRGBASE=.
if: runner.os != 'Windows'
- - name: mtest-pipeline
+ - name: mtest-pipeline
run: |
PATH=$HOME/MDB/bin:$PATH $HOME/MDB/bin/Mtest.py -r --debug=0 --ci
--no-html --TSTTRGBASE=. --pipeline
if: runner.os != 'Windows'
@@ -149,14 +162,14 @@ jobs:
shell: pwsh
run: |
$env:PATH =
'C:\MDB\lib;C:\MDB\lib\monetdb5;C:\MDB\bin;C:\vcpkg\installed\x64-windows\bin;C:\vcpkg\installed\x64-windows\debug\bin;'
+ $env:PATH
- python C:\MDB\bin\Mtest.py -r --debug=0 --ci --no-html --TSTTRGBASE=.
+ python C:\MDB\bin\Mtest.py -v -r --debug=0 --ci --no-html
--TSTTRGBASE=.
if: runner.os == 'Windows'
- - name: mtest
+ - name: mtest-pipeline
shell: pwsh
run: |
$env:PATH =
'C:\MDB\lib;C:\MDB\lib\monetdb5;C:\MDB\bin;C:\vcpkg\installed\x64-windows\bin;C:\vcpkg\installed\x64-windows\debug\bin;'
+ $env:PATH
- python C:\MDB\bin\Mtest.py -r --debug=0 --ci --no-html
--TSTTRGBASE=. --pipeline
+ python C:\MDB\bin\Mtest.py -v -r --debug=0 --ci --no-html
--TSTTRGBASE=. --pipeline
if: runner.os == 'Windows'
- name: Tar files
diff --git a/.indent.pro b/.indent.pro
new file mode 100644
--- /dev/null
+++ b/.indent.pro
@@ -0,0 +1,102 @@
+--no-blank-before-sizeof
+--no-blank-lines-after-commas
+--no-blank-lines-after-declarations
+--blank-lines-after-procedures
+--braces-after-func-def-line
+--braces-on-if-line
+--braces-on-struct-decl-line
+--break-after-boolean-operator
+--case-brace-indentation0
+--case-indentation0
+--no-comment-delimiters-on-blank-lines
+--comment-indentation33
+--continuation-indentation8
+--continue-at-parentheses
+--cuddle-do-while
+--cuddle-else
+--declaration-comment-column33
+--declaration-indentation1
+--dont-format-comments
+--dont-format-first-column-comments
+--dont-star-comments
+--else-endif-column1
+--ignore-newlines
+--indent-label2
+--indent-level8
+--leave-preprocessor-space
+--line-comments-indentation0
+--line-length80
+--parameter-indentation0
+--pointer-align-right
+--procnames-start-lines
+--space-after-cast
+--space-after-for
+--no-space-after-function-call-names
+--space-after-if
+--no-space-after-parentheses
+--space-after-while
+--space-special-semicolon
+--tab-size8
+--use-tabs
+-T allocator
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
