Add test

Author: knizhnik

Makefile

@@ -5,7 +5,9 @@ PGFILEDESC = "lsm3 - MVCC storage with undo log"
 EXTENSION = lsm3
 DATA = lsm3--1.0.sql
 
-REGRESS = lsm3
+REGRESS = test
+REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/lsm3/lsm3.conf
+
 
 ifdef USE_PGXS
 PG_CONFIG ?= pg_config

expected/test.out

@@ -0,0 +1,45 @@
+create extension lsm3;
+create table t(k bigint, val bigint);
+create index lsm3_index on t using lsm3(k);
+insert into t values (generate_series(1,100000), 1);
+insert into t values (generate_series(1000001,200000), 2);
+insert into t values (generate_series(2000001,300000), 3);
+insert into t values (generate_series(1,100000), 1);
+insert into t values (generate_series(1000001,200000), 2);
+insert into t values (generate_series(2000001,300000), 3);
+select * from t where k = 1;
+ k | val 
+---+-----
+ 1 |   1
+ 1 |   1
+(2 rows)
+
+select * from t where k = 1000000;
+ k | val 
+---+-----
+(0 rows)
+
+select * from t where k = 2000000;
+ k | val 
+---+-----
+(0 rows)
+
+select * from t where k = 3000000;
+ k | val 
+---+-----
+(0 rows)
+
+explain (COSTS OFF, TIMING OFF, SUMMARY OFF) select * from t where k = 1;
+            QUERY PLAN            
+----------------------------------
+ Index Scan using lsm3_index on t
+   Index Cond: (k = 1)
+(2 rows)
+
+select lsm3_get_merge_count('lsm3_index') > 0;
+ ?column? 
+----------
+ t
+(1 row)
+
+drop table t;

lsm3--1.0.sql

@@ -785,3 +785,6 @@ CREATE OPERATOR CLASS uuid_ops DEFAULT
 	FUNCTION 1  uuid_cmp(uuid,uuid),
 	FUNCTION 2  uuid_sortsupport(internal),
     FUNCTION 4  btequalimage(oid);
+
+CREATE FUNCTION lsm3_get_merge_count(index regclass) returns bigint
+AS 'MODULE_PATHNAME' LANGUAGE C STRICT PARALLEL RESTRICTED;

lsm3.c

@@ -34,6 +34,8 @@ PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(lsm3_handler);
 PG_FUNCTION_INFO_V1(lsm3_btree_wrapper);
+PG_FUNCTION_INFO_V1(lsm3_get_merge_count);
+
 extern void	_PG_init(void);
 extern void	_PG_fini(void);
 
@@ -191,6 +193,7 @@ lsm3_truncate_index(Oid index_oid, Oid heap_oid)
 	Relation heap = table_open(heap_oid, AccessShareLock); /* heap is actually not used, because we will not load data to top indexes */
 	IndexInfo* indexInfo = BuildDummyIndexInfo(index);
 	RelationTruncate(index, 0);
+	elog(LOG, "Lsm3: truncate index %s", RelationGetRelationName(index));
 	index_build(heap, index, indexInfo, true, false);
 	index_close(index, AccessExclusiveLock);
 	table_close(heap, AccessShareLock);
@@ -207,6 +210,8 @@ lsm3_merge_indexes(Oid dst_oid, Oid src_oid, Oid heap_oid)
 	bool ok;
 	Oid  save_am = base_index->rd_rel->relam;
 
+	elog(LOG, "Lsm3: merge index %s", RelationGetRelationName(top_index));
+
 	base_index->rd_rel->relam = BTREE_AM_OID;
 	scan = index_beginscan(heap, top_index, SnapshotAny, 0, 0);
 	scan->xs_want_itup = true;
@@ -432,7 +437,6 @@ lsm3_insert(Relation rel, Datum *values, bool *isnull,
 	/* If all inserts in previous active index are completed then we can start merge */
 	if (entry->merge_in_progress && entry->active_index != active_index && entry->access_count[active_index] == 0)
 	{
-		elog(LOG, "Initiate merge of index %s", RelationGetRelationName(index));
 		entry->start_merge = true;
 		if (entry->merger == NULL) /* lazy start of bgworker */
 		{
@@ -499,6 +503,10 @@ lsm3_endscan(IndexScanDesc scan)
 	for (int i = 0; i < 3; i++)
 	{
 		btendscan(so->scan[i]);
+		if (i < 2)
+		{
+			index_close(so->top_index[i], AccessShareLock);
+		}
 	}
 	pfree(so);
 }
@@ -756,7 +764,7 @@ lsm3_process_utility(PlannedStmt *plannedStmt,
 		for (i = 0; i < 2; i++)
 		{
 			stmt->accessMethod = "lsm3_btree_wrapper";
-			stmt->idxname = psprintf("%s_top%d", originIndexName, i);
+			stmt->idxname = psprintf("%s_top%d", get_rel_name(Lsm3Entry->base), i);
 			Lsm3Entry->top[i] = DefineIndex(Lsm3Entry->heap,
 											stmt,
 											InvalidOid,
@@ -831,3 +839,16 @@ void _PG_fini(void)
 	shmem_startup_hook = PreviousShmemStartupHook;
 }
 
+Datum
+lsm3_get_merge_count(PG_FUNCTION_ARGS)
+{
+	Oid	relid = PG_GETARG_OID(0);
+	Relation index = index_open(relid, AccessShareLock);
+	Lsm3DictEntry* entry = lsm3_get_entry(index);
+	index_close(index, AccessShareLock);
+	if (entry == NULL)
+		PG_RETURN_NULL();
+	else
+		PG_RETURN_INT64(entry->n_merges);
+}
+

lsm3.conf

@@ -0,0 +1,2 @@
+shared_preload_libraries = 'lsm3'
+lsm3.max_top_index_size=1MB

sql/test.sql

@@ -0,0 +1,17 @@
+create extension lsm3;
+
+create table t(k bigint, val bigint);
+create index lsm3_index on t using lsm3(k);
+insert into t values (generate_series(1,100000), 1);
+insert into t values (generate_series(1000001,200000), 2);
+insert into t values (generate_series(2000001,300000), 3);
+insert into t values (generate_series(1,100000), 1);
+insert into t values (generate_series(1000001,200000), 2);
+insert into t values (generate_series(2000001,300000), 3);
+select * from t where k = 1;
+select * from t where k = 1000000;
+select * from t where k = 2000000;
+select * from t where k = 3000000;
+explain (COSTS OFF, TIMING OFF, SUMMARY OFF) select * from t where k = 1;
+select lsm3_get_merge_count('lsm3_index') > 0;
+drop table t;