thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: OLAP compatibility: fixed error [#METR-10821].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-04-10 20:18:57 +04:00
parent ee6621f356
commit edb8b71115
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dbms/src/Server/OLAPQueryConverter.cpp
View File

@ -482,13 +482,13 @@ void QueryConverter::fillNumericAttributeMap()
M("RegionCity", "regionToCity(RegionID%s)")
M("RegionArea", "regionToArea(RegionID%s)")
M("RegionCountry", "regionToCountry(RegionID%s)")
M("URLRegionID", "URLRegions[0]")
M("URLRegionCity", "regionToCity(URLRegions[0]%s)")
M("URLRegionArea", "regionToArea(URLRegions[0]%s)")
M("URLRegionCountry", "regionToCountry(URLRegions[0]%s)")
M("URLCategoryID", "URLCategories[0]")
M("URLCategoryMostAncestor", "categoryToRoot(URLCategories[0])")
M("URLCategorySecondLevel", "categoryToSecondLevel(URLCategories[0])")
M("URLRegionID", "URLRegions[1]")
M("URLRegionCity", "regionToCity(URLRegions[1]%s)")
M("URLRegionArea", "regionToArea(URLRegions[1]%s)")
M("URLRegionCountry", "regionToCountry(URLRegions[1]%s)")
M("URLCategoryID", "URLCategories[1]")
M("URLCategoryMostAncestor", "categoryToRoot(URLCategories[1])")
M("URLCategorySecondLevel", "categoryToSecondLevel(URLCategories[1])")
M("TraficSourceID", "TraficSourceID")
M("IsNewUser", "intDiv(toUInt32(FirstVisit), 1800) == intDiv(toUInt32(StartTime), 1800)")
M("UserNewness", "intDiv(toUInt64(StartTime)-toUInt64(FirstVisit), 86400)")
@ -577,17 +577,17 @@ void QueryConverter::fillNumericAttributeMap()
M("UserAgentMajor", "UserAgent * 256 + UserAgentMajor")
M("UserAgentID", "UserAgent")
M("ClickGoodEvent", "Clicks.GoodEvent[1]")
M("ClickPriorityID", "Clicks.PriorityID[1]")
M("ClickBannerID", "Clicks.BannerID[1]")
M("ClickPageID", "Clicks.PageID[1]")
M("ClickPlaceID", "Clicks.PlaceID[1]")
M("ClickTypeID", "Clicks.TypeID[1]")
M("ClickResourceID", "Clicks.ResourceID[1]")
M("ClickDomainID", "Clicks.DomainID[1]")
M("ClickCost", "Clicks.Cost[1]")
M("ClickURLHash", "Clicks.URLHash[1]")
M("ClickOrderID", "Clicks.OrderID[1]")
M("ClickGoodEvent", "ClicksGoodEvent")
M("ClickPriorityID", "ClicksPriorityID")
M("ClickBannerID", "ClicksBannerID")
M("ClickPageID", "ClicksPageID")
M("ClickPlaceID", "ClicksPlaceID")
M("ClickTypeID", "ClicksTypeID")
M("ClickResourceID", "ClicksResourceID")
M("ClickDomainID", "ClicksDomainID")
M("ClickCost", "ClicksCost")
M("ClickURLHash", "ClicksURLHash")
M("ClickOrderID", "ClicksOrderID")
M("GoalReachesAny", "GoalReachesAny")
M("GoalReachesDepth", "GoalReachesDepth")
M("GoalReachesURL", "GoalReachesURL")