diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h index a6470aa6943..e974cb753d3 100644 --- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h +++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h @@ -6,8 +6,7 @@ #include #include -// TODO include this last because of a broken roaring header. See the comment -// inside. +// TODO include this last because of a broken roaring header. See the comment inside. #include namespace DB diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h index 17b02dc63a5..76258f5cd7d 100644 --- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h +++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h @@ -601,7 +601,7 @@ public: private: /// To read and write the DB Buffer directly, migrate code from CRoaring - void db_roaring_bitmap_add_many(DB::ReadBuffer & dbBuf, roaring_bitmap_t * r, size_t n_args) + void db_roaring_bitmap_add_many(DB::ReadBuffer & db_buf, roaring_bitmap_t * r, size_t n_args) { void * container = nullptr; // hold value of last container touched uint8_t typecode = 0; // typecode of last container touched @@ -611,13 +611,13 @@ private: if (n_args == 0) return; uint32_t val; - readBinary(val, dbBuf); + readBinary(val, db_buf); container = containerptr_roaring_bitmap_add(r, val, &typecode, &containerindex); prev = val; ++i; for (; i < n_args; ++i) { - readBinary(val, dbBuf); + readBinary(val, db_buf); if (((prev ^ val) >> 16) == 0) { // no need to seek the container, it is at hand // because we already have the container at hand, we can do the @@ -643,37 +643,37 @@ private: } } - void db_ra_to_uint32_array(DB::WriteBuffer & dbBuf, roaring_array_t * ra) const + void db_ra_to_uint32_array(DB::WriteBuffer & db_buf, roaring_array_t * ra) const { size_t ctr = 0; for (Int32 i = 0; i < ra->size; ++i) { - Int32 num_added = db_container_to_uint32_array(dbBuf, ra->containers[i], ra->typecodes[i], (static_cast(ra->keys[i])) << 16); + Int32 num_added = db_container_to_uint32_array(db_buf, ra->containers[i], ra->typecodes[i], (static_cast(ra->keys[i])) << 16); ctr += num_added; } } - UInt32 db_container_to_uint32_array(DB::WriteBuffer & dbBuf, const void * container, uint8_t typecode, UInt32 base) const + UInt32 db_container_to_uint32_array(DB::WriteBuffer & db_buf, const void * container, uint8_t typecode, UInt32 base) const { container = container_unwrap_shared(container, &typecode); switch (typecode) { case BITSET_CONTAINER_TYPE_CODE: - return db_bitset_container_to_uint32_array(dbBuf, static_cast(container), base); + return db_bitset_container_to_uint32_array(db_buf, static_cast(container), base); case ARRAY_CONTAINER_TYPE_CODE: - return db_array_container_to_uint32_array(dbBuf, static_cast(container), base); + return db_array_container_to_uint32_array(db_buf, static_cast(container), base); case RUN_CONTAINER_TYPE_CODE: - return db_run_container_to_uint32_array(dbBuf, static_cast(container), base); + return db_run_container_to_uint32_array(db_buf, static_cast(container), base); } return 0; } - UInt32 db_bitset_container_to_uint32_array(DB::WriteBuffer & dbBuf, const bitset_container_t * cont, UInt32 base) const + UInt32 db_bitset_container_to_uint32_array(DB::WriteBuffer & db_buf, const bitset_container_t * cont, UInt32 base) const { - return static_cast(db_bitset_extract_setbits(dbBuf, cont->array, BITSET_CONTAINER_SIZE_IN_WORDS, base)); + return static_cast(db_bitset_extract_setbits(db_buf, cont->array, BITSET_CONTAINER_SIZE_IN_WORDS, base)); } - size_t db_bitset_extract_setbits(DB::WriteBuffer & dbBuf, UInt64 * bitset, size_t length, UInt32 base) const + size_t db_bitset_extract_setbits(DB::WriteBuffer & db_buf, UInt64 * bitset, size_t length, UInt32 base) const { UInt32 outpos = 0; for (size_t i = 0; i < length; ++i) @@ -684,7 +684,7 @@ private: UInt64 t = w & (~w + 1); // on x64, should compile to BLSI (careful: the Intel compiler seems to fail) UInt32 r = __builtin_ctzll(w); // on x64, should compile to TZCNT UInt32 val = r + base; - writePODBinary(val, dbBuf); + writePODBinary(val, db_buf); outpos++; w ^= t; } @@ -693,19 +693,19 @@ private: return outpos; } - int db_array_container_to_uint32_array(DB::WriteBuffer & dbBuf, const array_container_t * cont, UInt32 base) const + int db_array_container_to_uint32_array(DB::WriteBuffer & db_buf, const array_container_t * cont, UInt32 base) const { UInt32 outpos = 0; for (Int32 i = 0; i < cont->cardinality; ++i) { const UInt32 val = base + cont->array[i]; - writePODBinary(val, dbBuf); + writePODBinary(val, db_buf); outpos++; } return outpos; } - int db_run_container_to_uint32_array(DB::WriteBuffer & dbBuf, const run_container_t * cont, UInt32 base) const + int db_run_container_to_uint32_array(DB::WriteBuffer & db_buf, const run_container_t * cont, UInt32 base) const { UInt32 outpos = 0; for (Int32 i = 0; i < cont->n_runs; ++i) @@ -715,7 +715,7 @@ private: for (Int32 j = 0; j <= le; ++j) { UInt32 val = run_start + j; - writePODBinary(val, dbBuf); + writePODBinary(val, db_buf); outpos++; } } diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.py b/tests/queries/0_stateless/00979_live_view_watch_live.py index 901852f3408..784afa14498 100755 --- a/tests/queries/0_stateless/00979_live_view_watch_live.py +++ b/tests/queries/0_stateless/00979_live_view_watch_live.py @@ -37,16 +37,16 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo client2.send('INSERT INTO test.mt VALUES (4),(5),(6)') client1.expect(r'21.*3' + end_of_block) client2.expect(prompt) - for i in range(1,129): + for i in range(1, 129): client2.send('INSERT INTO test.mt VALUES (1)') - client1.expect(r'%d.*%d' % (21+i, 3+i) + end_of_block) + client1.expect(r'%d.*%d' % (21 + i, 3 + i) + end_of_block) client2.expect(prompt) # send Ctrl-C client1.send('\x03', eol='') match = client1.expect('(%s)|([#\$] )' % prompt) if match.groups()[1]: client1.send(client1.command) - client1.expect(prompt) + client1.expect(prompt) client1.send('DROP TABLE test.lv') client1.expect(prompt) client1.send('DROP TABLE test.mt')