Merge branch 'main' into sphoorti

Author: DougTidwell

content/en/altinity-kb-integrations/altinity-kb-kafka/altinity-kb-adjusting-librdkafka-settings.md

@@ -148,7 +148,7 @@ kafkacat -b my_broker:9092 -C -o -10 -t my_topic \
 
 ```
 
-# Different configurations for different tables?
+## Different configurations for different tables?
 
 > Is there some more documentation how to use this multiconfiguration for Kafka ?
 
@@ -180,7 +180,7 @@ And after that in configuration:
 </clickhouse>
 
 
-<yandex>
+<clickhouse>
     <named_collections>
         <kafka_preset1>
             <kafka_broker_list>...</kafka_broker_list>
@@ -197,7 +197,7 @@ And after that in configuration:
             </kafka>
         </kafka_preset1>
     </named_collections>
-</yandex>
+</clickhouse>
 
 ```
 

content/en/altinity-kb-schema-design/change-order-by.md

@@ -37,14 +37,24 @@ ORDER BY (column1, column2, column3)
 
 4. Copy data from `example_table_old` into `example_table_temp`
 
-     a. Use this query to generate a list of INSERT statements
+     a. Use this query to generate a list of INSERT statements   
      ```sql
+     -- old Clickhouse versions before a support of `where _partition_id`
      select concat('insert into example_table_temp select * from example_table_old where toYYYYMM(date)=',partition) as cmd, 
      database, table, partition, sum(rows), sum(bytes_on_disk), count()
      from system.parts
      where database='default' and table='example_table_old'
      group by database, table, partition
      order by partition
+
+     -- newer Clickhouse versions with a support of `where _partition_id`
+     select concat('insert into example_table_temp select * from ', table,' where _partition_id = \'',partition_id, '\';') as cmd, 
+     database, table, partition, sum(rows), sum(bytes_on_disk), count()
+     from system.parts
+     where database='default' and table='example_table_old'
+     group by database, table, partition_id, partition
+     order by partition_id
+
      ```
 
      b. Create an intermediate table
@@ -70,7 +80,7 @@ ORDER BY (column1, column2, column3)
      order by partition
      ```
 
-5. Attach data from the intermediate table to `example_table`
+6. Attach data from the intermediate table to `example_table`
 
      a. Use this query to generate a list of ATTACH statements
      ```sql
@@ -93,5 +103,5 @@ ORDER BY (column1, column2, column3)
      order by partition
      ```
 
-6. Drop `example_table_old` and `example_table_temp`
+7. Drop `example_table_old` and `example_table_temp`
 

content/en/altinity-kb-setup-and-maintenance/altinity-kb-data-migration/add_remove_replica.md

@@ -59,7 +59,7 @@ SELECT
     replaceRegexpOne(replaceOne(concat(create_table_query, ';'), '(', 'ON CLUSTER \'{cluster}\' ('), 'CREATE (TABLE|DICTIONARY|VIEW|LIVE VIEW|WINDOW VIEW)', 'CREATE \\1 IF NOT EXISTS')
 FROM
     system.tables
-WHERE
+WHERE engine != 'MaterializedView' and
     database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA') AND
     create_table_query != '' AND
     name NOT LIKE '.inner.%%' AND
@@ -72,7 +72,7 @@ SELECT
     replaceRegexpOne(replaceOne(concat(create_table_query, ';'), 'TO', 'ON CLUSTER \'{cluster}\' TO'), '(CREATE MATERIALIZED VIEW)', '\\1 IF NOT EXISTS')
 FROM
     system.tables
-WHERE
+WHERE engine = 'MaterializedView' and
     database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA') AND
     create_table_query != '' AND
     name NOT LIKE '.inner.%%' AND
@@ -101,9 +101,9 @@ clickhouse-client --host localhost --port 9000 -mn < schema.sql
 - Using `clickhouse-backup` to copy the schema of a replica to another is also convenient and moreover if [using Atomic database](/engines/altinity-kb-atomic-database-engine/) with `{uuid}` macros in [ReplicatedMergeTree engines](https://www.youtube.com/watch?v=oHwhXc0re6k):
 
 ```bash
-sudo -u clickhouse clickhouse-backup --schema --rbac create_remote full-replica
+sudo -u clickhouse clickhouse-backup create --schema --rbac rbac_and_schema
 # From the destination replica
-sudo -u clickhouse clickhouse-backup --schema --rbac restore_remote full-replica
+sudo -u clickhouse clickhouse-backup restore --schema --rbac rbac_and_schema
 ```
 
 ### Using `altinity operator`

layouts/_default/_markup/render-link.html

@@ -1 +1 @@
-<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}{{ if strings.Contains .Destination "clickhouse.com" }} rel="nofollow" {{ end }}{{ if strings.Contains .Destination "clickhouse.tech" }} rel="nofollow" {{ end }}>{{ .Text }}</a>
+<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}{{ if strings.Contains .Destination "clickhouse.com" }} rel="nofollow" {{ end }}{{ if strings.Contains .Destination "clickhouse.tech" }} rel="nofollow" {{ end }}>{{ .Text }}</a>