[mapguide-commits] r7589 - in branches/2.4/MgDev: . Common/MapGuideCommon/System Common/Stylization Server/src/Core Server/src/Services/Feature Server/src/Services/Mapping Web/src/mapadmin/HelpDocs Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 9 07:56:18 PDT 2013
Author: jng
Date: 2013-06-09 07:56:18 -0700 (Sun, 09 Jun 2013)
New Revision: 7589
Modified:
branches/2.4/MgDev/
branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.cpp
branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.h
branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
branches/2.4/MgDev/Server/src/Core/serverconfig.ini
branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.h
branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/
branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
branches/2.4/MgDev/Web/src/viewerfiles/
branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
Log:
#2213: Backport to 2.4
Property changes on: branches/2.4/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev:7569-7570
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev:7349,7569-7570
/sandbox/rfc94:5099-5163
/trunk/MgDev:6611,6690,6746,7230-7231
Modified: branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.cpp
===================================================================
--- branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.cpp 2013-06-09 14:39:48 UTC (rev 7588)
+++ branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.cpp 2013-06-09 14:56:18 UTC (rev 7589)
@@ -278,6 +278,8 @@
const INT32 MgConfigProperties::DefaultFeatureServicePropertyDataTransactionTimerInterval = 60;
const STRING MgConfigProperties::FeatureServicePropertyFDOConnectionTimeoutCustom = L"FDOConnectionTimeoutCustom";
const STRING MgConfigProperties::DefaultFeatureServicePropertyFDOConnectionTimeoutCustom = L"OSGeo.WMS:120";
+const STRING MgConfigProperties::FeatureServicePropertyUseFdoJoinOptimization = L"UseFdoJoinOptimization";
+const bool MgConfigProperties::DefaultFeatureServicePropertyUseFdoJoinOptimization = true;
// ******************************************************************
// Mapping Service Properties
Modified: branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.h
===================================================================
--- branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.h 2013-06-09 14:39:48 UTC (rev 7588)
+++ branches/2.4/MgDev/Common/MapGuideCommon/System/ConfigProperties.h 2013-06-09 14:56:18 UTC (rev 7589)
@@ -347,6 +347,10 @@
static const STRING FeatureServicePropertyFDOConnectionTimeoutCustom; /// value("FDOConnectionTimeoutCustom")
static const STRING DefaultFeatureServicePropertyFDOConnectionTimeoutCustom; /// value("OSGeo.WMS:120")
+ /// Defines whether to use the FDO Join APIs for Feature Joins where applicable and supported
+ static const STRING FeatureServicePropertyUseFdoJoinOptimization; /// value("UseFdoJoinOptimization")
+ static const bool DefaultFeatureServicePropertyUseFdoJoinOptimization; /// value(true)
+
/// MAPPING SERVICE PROPERTIES SECTION -------------------------------------------------------------------------------
/// Mapping Service properties
Property changes on: branches/2.4/MgDev/Common/Stylization/SE_Renderer.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7569-7570
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Common/Stylization/SE_Renderer.cpp:7349,7569-7570
/sandbox/adsk/2.4j/Common/Stylization/SE_Renderer.cpp:6327-6445
/sandbox/rfc94/Common/Stylization/SE_Renderer.cpp:5099-5163
/trunk/MgDev/Common/Stylization/SE_Renderer.cpp:6250-6326,6611,6690,6746,7230-7231
Modified: branches/2.4/MgDev/Server/src/Core/serverconfig.ini
===================================================================
--- branches/2.4/MgDev/Server/src/Core/serverconfig.ini 2013-06-09 14:39:48 UTC (rev 7588)
+++ branches/2.4/MgDev/Server/src/Core/serverconfig.ini 2013-06-09 14:56:18 UTC (rev 7589)
@@ -268,6 +268,9 @@
# 0 < Value <= 1800
# FDOConnectionTimeoutCustom Time duration in seconds for an FDO connection
# 0 < Value <= 600
+# UseFdoJoinOptimization Determines whether to use FDO Join APIs for feature joins between
+# classes from the same Feature Source for FDO providers that support it
+# 1 = Use FDO Join APIs if possible, 0 = Fallback to GwsQueryEngine
# *****************************************************************************
CacheSize = 100
CacheTimeLimit = 86400
@@ -283,6 +286,7 @@
DataTransactionTimeout = 360
DataTransactionTimerInterval = 60
FDOConnectionTimeoutCustom = OSGeo.WMS:120
+UseFdoJoinOptimization = 1
[MappingServiceProperties]
# *****************************************************************************
Property changes on: branches/2.4/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:7349,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Feature/ServerFeatureUtil.cpp:6327-6481
/sandbox/rfc94/Server/src/Services/Feature/ServerFeatureUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Modified: branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2013-06-09 14:39:48 UTC (rev 7588)
+++ branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2013-06-09 14:56:18 UTC (rev 7589)
@@ -49,6 +49,7 @@
// Set a default join query batch size
m_nJoinQueryBatchSize = MgConfigProperties::DefaultFeatureServicePropertyJoinQueryBatchSize;
+ m_bUseFdoJoinOptimization = MgConfigProperties::DefaultFeatureServicePropertyUseFdoJoinOptimization;
MgConfiguration* config = MgConfiguration::GetInstance();
if(config)
@@ -63,6 +64,11 @@
MgConfigProperties::FeatureServicePropertyDataCacheSize,
m_nDataCacheSize,
MgConfigProperties::DefaultFeatureServicePropertyDataCacheSize);
+ // Get FDO Join use flag
+ config->GetBoolValue(MgConfigProperties::FeatureServicePropertiesSection,
+ MgConfigProperties::FeatureServicePropertyUseFdoJoinOptimization,
+ m_bUseFdoJoinOptimization,
+ MgConfigProperties::DefaultFeatureServicePropertyUseFdoJoinOptimization);
}
}
@@ -1556,6 +1562,10 @@
{
bool bSupported = false;
+ //If disabled on a global level, don't even bother continuing
+ if (!m_bUseFdoJoinOptimization)
+ return false;
+
MG_FEATURE_SERVICE_TRY()
//This could be qualified, so parse it to be sure
Modified: branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.h
===================================================================
--- branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.h 2013-06-09 14:39:48 UTC (rev 7588)
+++ branches/2.4/MgDev/Server/src/Services/Feature/ServerSelectFeatures.h 2013-06-09 14:56:18 UTC (rev 7589)
@@ -91,6 +91,9 @@
INT32 m_nJoinQueryBatchSize;
INT32 m_nDataCacheSize;
+ // This is the overriding flag that decides if we should test for and use the FDO Join
+ // APIs if possible
+ bool m_bUseFdoJoinOptimization;
// FDO join optimization
bool IsFunctionOnPrimaryProperty(FdoFunction* function, FdoIConnection* conn, CREFSTRING schemaName, CREFSTRING className);
Property changes on: branches/2.4/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:7349,7569-7570
/sandbox/adsk/2.4j/Server/src/Services/Mapping/MappingUtil.cpp:6327-6535
/sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs:7349,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs:6413
/sandbox/rfc94/Web/src/mapadmin/HelpDocs:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:7349,7569-7570
/sandbox/adsk/2.4j/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6327-6435
/sandbox/rfc94/Web/src/mapadmin/HelpDocs/configuring_servers.htm:5099-5163
/trunk/MgDev/Web/src/mapadmin/HelpDocs/configuring_servers.htm:6250-6326,6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7569-7570
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:7349,7569-7570
/sandbox/adsk/2.4jbeta2/Web/src/mapviewerphp/quickplotgeneratepicture.php:6334-6374
/sandbox/rfc94/Web/src/mapviewerphp/quickplotgeneratepicture.php:5099-5163
/trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles:7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles:7349,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/trunk/MgDev/Web/src/viewerfiles:6611,6690,6746,7230-7231
Property changes on: branches/2.4/MgDev/Web/src/viewerfiles/quickplot.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
+ /branches/2.5/MgDev/Web/src/viewerfiles/quickplot.js:7349,7569-7570
/sandbox/adsk/2.2gp/Web/src/viewerfiles/quickplot.js:5392
/sandbox/adsk/2.4j/Web/src/viewerfiles/quickplot.js:6327-6474
/trunk/MgDev/Web/src/viewerfiles/quickplot.js:6250-6326,6611,6690,6746,7230-7231
More information about the mapguide-commits
mailing list