pathman: documentation and tests updated

zilder · zilder · commit fbb5ff35a002 · 2016-02-01T13:19:30.000+03:00
diff --git a/contrib/pg_pathman/README.md b/contrib/pg_pathman/README.md
@@ -54,7 +54,7 @@ create_hash_partitions(
     attribute TEXT,
     partitions_count INTEGER)
 ```
-Performs HASH partitioning for `relation` by integer key `attribute`. Creates `partitions_count` partitions and trigger on INSERT. Data doesn't automatically copied from parent table to partitions. Use `partition_data()` function (see below) to migrate data.
+Performs HASH partitioning for `relation` by integer key `attribute`. Creates `partitions_count` partitions and trigger on INSERT. All the data will be automatically copied from the parent to partitions.
 
 ```
 create_range_partitions(
@@ -71,7 +71,7 @@ create_range_partitions(
     interval INTERVAL,
     premake INTEGER)
 ```
-Performs RANGE partitioning for `relation` by partitioning key `attribute`. `start_value` argument specifies initial value, `interval` sets the range of values in a single partition, `premake` is the number of premade partitions.
+Performs RANGE partitioning for `relation` by partitioning key `attribute`. `start_value` argument specifies initial value, `interval` sets the range of values in a single partition, `premake` is the number of premade partitions. All the data will be automatically copied from the parent to partitions.
 
 ```
 create_partitions_from_range(
@@ -88,7 +88,7 @@ create_partitions_from_range(
     end_value ANYELEMENT,
     interval INTERVAL)
 ```
-Performs RANGE-partitioning from specified range for `relation` by partitioning key `attribute`.
+Performs RANGE-partitioning from specified range for `relation` by partitioning key `attribute`. Data will be copied to partitions as well.
 
 ### Utilities
 ```
diff --git a/contrib/pg_pathman/README.rus.md b/contrib/pg_pathman/README.rus.md
@@ -56,7 +56,7 @@ create_hash_partitions(
     attribute TEXT,
     partitions_count INTEGER)
 ```
-Выполняет HASH-секционирование таблицы `relation` по целочисленному полю `attribute`. Создает `partitions_count` дочерних секций, а также триггер на вставку. Данные из родительской таблицы не копируются автоматически в дочерние. Миграцию данных можно выполнить с помощью функции `partition_data()` (см. ниже), либо вручную.
+Выполняет HASH-секционирование таблицы `relation` по целочисленному полю `attribute`. Создает `partitions_count` дочерних секций, а также триггер на вставку. Данные из родительской таблицы будут автоматически скопированы в дочерние.
 
 ```
 create_range_partitions(
@@ -73,7 +73,7 @@ create_range_partitions(
     interval INTERVAL,
     premake INTEGER)
 ```
-Выполняет RANGE-секционирование таблицы `relation` по полю `attribute`. Аргумент `start_value` задает начальное значение, `interval` -- диапазон значений внутри одной секции, `premake` -- количество заранее создаваемых секций.
+Выполняет RANGE-секционирование таблицы `relation` по полю `attribute`. Аргумент `start_value` задает начальное значение, `interval` -- диапазон значений внутри одной секции, `premake` -- количество заранее создаваемых секций. Данные из родительской таблицы будут автоматически скопированы в дочерние.
 
 ```
 create_partitions_from_range(
@@ -90,7 +90,7 @@ create_partitions_from_range(
     end_value ANYELEMENT,
     interval INTERVAL)
 ```
-Выполняет RANGE-секционирование для заданного диапазона таблицы `relation` по полю `attribute`.
+Выполняет RANGE-секционирование для заданного диапазона таблицы `relation` по полю `attribute`. Данные также будут скопированы в дочерние секции.
 
 ### Утилиты
 ```
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -5,22 +5,39 @@ CREATE SCHEMA test;
 CREATE TABLE test.hash_rel (
     id      SERIAL PRIMARY KEY,
     value   INTEGER);
+INSERT INTO test.hash_rel VALUES (1, 1);
+INSERT INTO test.hash_rel VALUES (2, 2);
+INSERT INTO test.hash_rel VALUES (3, 3);
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
 NOTICE:  function test.hash_rel_hash_insert_trigger_func() does not exist, skipping
 NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_hash_partitions 
 ------------------------
                       3
 (1 row)
 
 SELECT COUNT(*) FROM test.hash_rel;
  count 
+-------
+     3
+(1 row)
+
+SELECT COUNT(*) FROM ONLY test.hash_rel;
+ count 
 -------
      0
 (1 row)
 
+INSERT INTO test.hash_rel VALUES (4, 4);
+INSERT INTO test.hash_rel VALUES (5, 5);
+INSERT INTO test.hash_rel VALUES (6, 6);
+SELECT COUNT(*) FROM test.hash_rel;
+ count 
+-------
+     6
+(1 row)
+
 SELECT COUNT(*) FROM ONLY test.hash_rel;
  count 
 -------
@@ -37,7 +54,6 @@ SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2015-04-30', '1 day':
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '1 month'::INTERVAL, 4);
 NOTICE:  sequence "range_rel_seq" does not exist, skipping
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_range_partitions 
 -------------------------
                        4
@@ -61,7 +77,6 @@ CREATE TABLE test.num_range_rel (
 SELECT pathman.create_range_partitions('test.num_range_rel', 'id', 0, 1000, 4);
 NOTICE:  sequence "num_range_rel_seq" does not exist, skipping
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_range_partitions 
 -------------------------
                        4
@@ -93,12 +108,6 @@ SELECT COUNT(*) FROM ONLY test.num_range_rel;
      0
 (1 row)
 
-INSERT INTO test.hash_rel VALUES (1, 1);
-INSERT INTO test.hash_rel VALUES (2, 2);
-INSERT INTO test.hash_rel VALUES (3, 3);
-INSERT INTO test.hash_rel VALUES (4, 4);
-INSERT INTO test.hash_rel VALUES (5, 5);
-INSERT INTO test.hash_rel VALUES (6, 6);
 VACUUM;
 /* update triggers test */
 SELECT pathman.create_hash_update_trigger('test.hash_rel');
@@ -486,7 +495,6 @@ CREATE TABLE test.range_rel (
     dt TIMESTAMP);
 SELECT pathman.create_range_partitions('test.range_rel', 'dt', '2015-01-01'::DATE, '10 days'::INTERVAL, 1);
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_range_partitions 
 -------------------------
                        1
@@ -558,7 +566,6 @@ SELECT create_hash_partitions('hash_rel', 'value', 3);
 NOTICE:  function hash_rel_hash_insert_trigger_func() does not exist, skipping
 NOTICE:  function hash_rel_hash_update_trigger_func() does not exist, skipping
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_hash_partitions 
 ------------------------
                       3
@@ -584,7 +591,6 @@ INSERT INTO range_rel (dt) SELECT g FROM generate_series('2010-01-01'::date, '20
 SELECT create_range_partitions('range_rel', 'dt', '2010-01-01'::date, '1 month'::interval, 12);
 NOTICE:  sequence "range_rel_seq" does not exist, skipping
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_range_partitions 
 -------------------------
                       12
@@ -669,7 +675,6 @@ SELECT drop_range_partitions('range_rel');
 
 SELECT create_partitions_from_range('range_rel', 'id', 1, 1000, 100);
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_partitions_from_range 
 ------------------------------
                            10
@@ -683,7 +688,6 @@ SELECT drop_range_partitions('range_rel');
 
 SELECT create_partitions_from_range('range_rel', 'dt', '2015-01-01'::date, '2015-12-01'::date, '1 month'::interval);
 NOTICE:  Copying data to partitions...
-NOTICE:  0 rows have been copied
  create_partitions_from_range 
 ------------------------------
                            12
diff --git a/contrib/pg_pathman/init.sql b/contrib/pg_pathman/init.sql
@@ -64,7 +64,7 @@ BEGIN
                 , p_parent
                 , p_parent);
     GET DIAGNOSTICS p_total = ROW_COUNT;
-    RAISE NOTICE '% rows have been copied', p_total;
+    -- RAISE NOTICE '% rows have been copied', p_total;
     RETURN;
 
 EXCEPTION WHEN others THEN
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -7,9 +7,17 @@ CREATE SCHEMA test;
 CREATE TABLE test.hash_rel (
     id      SERIAL PRIMARY KEY,
     value   INTEGER);
+INSERT INTO test.hash_rel VALUES (1, 1);
+INSERT INTO test.hash_rel VALUES (2, 2);
+INSERT INTO test.hash_rel VALUES (3, 3);
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
 SELECT COUNT(*) FROM test.hash_rel;
 SELECT COUNT(*) FROM ONLY test.hash_rel;
+INSERT INTO test.hash_rel VALUES (4, 4);
+INSERT INTO test.hash_rel VALUES (5, 5);
+INSERT INTO test.hash_rel VALUES (6, 6);
+SELECT COUNT(*) FROM test.hash_rel;
+SELECT COUNT(*) FROM ONLY test.hash_rel;
 
 CREATE TABLE test.range_rel (
     id SERIAL PRIMARY KEY,
@@ -33,13 +41,6 @@ INSERT INTO test.num_range_rel
 SELECT COUNT(*) FROM test.num_range_rel;
 SELECT COUNT(*) FROM ONLY test.num_range_rel;
 
-INSERT INTO test.hash_rel VALUES (1, 1);
-INSERT INTO test.hash_rel VALUES (2, 2);
-INSERT INTO test.hash_rel VALUES (3, 3);
-INSERT INTO test.hash_rel VALUES (4, 4);
-INSERT INTO test.hash_rel VALUES (5, 5);
-INSERT INTO test.hash_rel VALUES (6, 6);
-
 VACUUM;
 
 /* update triggers test */
