From 79106a754d4804074e5c5c6bfe1c388f7d314535 Mon Sep 17 00:00:00 2001 From: Joseph Fernandes Date: Wed, 8 Jul 2015 14:35:45 +0530 Subject: libgfdb/sql: Fixing broken query of find_unchanged The find_unchanged query should be "write_heat <= defined_heat" AND "read_heat <= defined_heat" and not "write_heat <= defined_heat" OR "read_heat <= defined_heat" Change-Id: Ie82e02aafbb7ea14563007307de3350ea022049a BUG: 1240970 Signed-off-by: Joseph Fernandes Reviewed-on: http://review.gluster.org/11577 Reviewed-by: Dan Lambright Reviewed-by: mohammed rafi kc Tested-by: NetBSD Build System Tested-by: Joseph Fernandes Tested-by: Dan Lambright Tested-by: Gluster Build System --- libglusterfs/src/gfdb/gfdb_sqlite3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 94553fba70d..349ff60f541 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -763,7 +763,7 @@ gf_sqlite3_find_unchanged_for_time (void *db_conn, /*First condition: For writes*/ "((" GF_COL_TB_WSEC " * " TOSTRING(GFDB_MICROSEC) " + " GF_COL_TB_WMSEC ") <= ? )" - " OR " + " AND " /*Second condition: For reads*/ "((" GF_COL_TB_RWSEC " * " TOSTRING(GFDB_MICROSEC) " + " GF_COL_TB_RWMSEC ") <= ?)"; @@ -996,7 +996,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn, "( (" GF_COL_TB_WFC " < ? ) AND" "((" GF_COL_TB_WSEC " * " TOSTRING(GFDB_MICROSEC) " + " GF_COL_TB_WMSEC ") >= ? ) ) )" - " OR " + " AND " /*Second condition: For Reads * Files that have read wind time smaller than for_time * OR -- cgit