clickhouse: added missing rules to OLAP query converter [#CONV-6318].

dbms/include/DB/Functions/FunctionsFormatting.h

@@ -37,7 +37,7 @@ public:
 		if (!type->isNumeric() ||
 			dynamic_cast<const DataTypeFloat32 *>(type) ||
 			dynamic_cast<const DataTypeFloat64 *>(type))
-			throw Exception("Cannot format " + type->getName() + " as bitmask String", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+			throw Exception("Cannot format " + type->getName() + " as bitmask string", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 		
 		return new DataTypeString;
 	}

dbms/src/Server/OLAPQueryConverter.cpp

@@ -449,13 +449,13 @@ void QueryConverter::fillNumericAttributeMap()
 	M("ClickCost",            "ClickCost")
 	M("ClickURLHash",         "halfMD5(ClickURL)")
 	M("ClickOrderID",         "ClickOrderID")
-	M("GoalReachesAny",       "")
-	M("GoalReachesDepth",     "length(GoalsReached)")
-	M("GoalReachesURL",       "")
-	M("ConvertedAny",         "")
-	M("ConvertedDepth",       "")
-	M("ConvertedURL",         "")
-	M("GoalReaches",          "arrayCount(GoalsReached, %u)")
+	M("GoalReachesAny",       "GoalReachesDepth + GoalReachesURL")
+	M("GoalReachesDepth",     "GoalReachesDepth")
+	M("GoalReachesURL",       "GoalReachesURL")
+	M("ConvertedAny",         "GoalReachesDepth + GoalReachesURL > 0")
+	M("ConvertedDepth",       "GoalReachesDepth > 0")
+	M("ConvertedURL",         "GoalReachesURL > 0")
+	M("GoalReaches",          "countEqual(GoalsReached, %u)")
 	M("Converted",            "has(GoalsReached, %u)")
 	M("CounterID",            "CounterID")
 	M("VisitID",              "VisitID")