source 使用 Layer 名称为 key，修复缓存 SQL 导致的查询错误

zmaplab · May 11, 2024 · 2e43fe8 · 2e43fe8
1 parent 52886a6
commit 2e43fe8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 27 deletions.
diff --git a/src/ZMap.Source.Postgre/PostgreSource.cs b/src/ZMap.Source.Postgre/PostgreSource.cs
@@ -48,46 +48,49 @@ public override async Task<IEnumerable<Feature>> GetFeaturesInExtentAsync(Envelo
         // sql =
         //     $"SELECT CASE WHEN ST_HasArc({Geometry}) THEN {Geometry} ELSE ST_Simplify(ST_Force2D({Geometry}), 0.00001, true) END as geom{columnSql} from (SELECT {Geometry} as geom{columnSql} FROM {Table} WHERE {@where} {Geometry} && ST_MakeEnvelope({bbox.MinX}, {bbox.MinY},{bbox.MaxX},{bbox.MaxY}, {SRID})) t";
 
-        var sqlBuilder = new StringBuilder();
-        if (Properties == null || Properties.Count == 0)
+        var baseSql = BaseSql.GetOrAdd(Key, (_) =>
         {
-            sqlBuilder.Append("SELECT * ").Append("FROM ").Append(Table).Append(" WHERE ");
-        }
-        else
-        {
-            sqlBuilder.Append("SELECT");
-            var containsId = false;
-            foreach (var property in Properties)
+            var sqlBuilder = new StringBuilder();
+            if (Properties == null || Properties.Count == 0)
+            {
+                sqlBuilder.Append("SELECT * ").Append("FROM ").Append(Table).Append(" WHERE ");
+            }
+            else
             {
-                if (property == Geometry)
+                sqlBuilder.Append("SELECT");
+                var containsId = false;
+                foreach (var property in Properties)
                 {
-                    continue;
+                    if (property == Geometry)
+                    {
+                        continue;
+                    }
+
+                    if (containsId == false && property == Id)
+                    {
+                        containsId = true;
+                    }
+
+                    sqlBuilder.Append(' ').Append(property).Append(',');
                 }
 
-                if (containsId == false && property == Id)
+                if (!containsId)
                 {
-                    containsId = true;
+                    sqlBuilder.Append(' ').Append(Id).Append(',');
                 }
 
-                sqlBuilder.Append(' ').Append(property).Append(',');
+                sqlBuilder.Append(' ').Append(Geometry).Append(" WHERE ");
             }
 
-            if (!containsId)
+            sqlBuilder.Append(Geometry).Append(" && ST_MakeEnvelope(@MinX, @MinY, @MaxX, @MaxY, @Srid)");
+
+            if (!string.IsNullOrEmpty(Where))
             {
-                sqlBuilder.Append(' ').Append(Id).Append(',');
+                sqlBuilder.Append(" AND ").Append(Where);
             }
 
-            sqlBuilder.Append(' ').Append(Geometry).Append(" WHERE ");
-        }
-
-        sqlBuilder.Append(Geometry).Append(" && ST_MakeEnvelope(@MinX, @MinY, @MaxX, @MaxY, @Srid)");
-
-        if (!string.IsNullOrEmpty(Where))
-        {
-            sqlBuilder.Append(" AND ").Append(Where);
-        }
-
-        var baseSql = sqlBuilder.ToString();
+            return sqlBuilder.ToString();
+        });
 
         string sql;
         if (!string.IsNullOrEmpty(Filter))

diff --git a/src/ZMap/Source/ISource.cs b/src/ZMap/Source/ISource.cs
@@ -5,6 +5,8 @@ namespace ZMap.Source;
 /// </summary>
 public interface ISource : IDisposable
 {
+    string Key { get; set; }
+
     /// <summary>
     /// 数据源名称
     /// </summary>

diff --git a/src/ZMap/Source/RasterSource.cs b/src/ZMap/Source/RasterSource.cs
@@ -2,6 +2,7 @@ namespace ZMap.Source;
 
 public abstract class RasterSource : IRasterSource
 {
+    public string Key { get; set; }
     public string Name { get; set; }
 
     /// <summary>
@@ -16,6 +17,7 @@ public abstract class RasterSource : IRasterSource
     /// <param name="extent"></param>
     /// <returns></returns>
     public abstract Task<byte[]> GetImageInExtentAsync(Envelope extent);
+
     public abstract Envelope GetEnvelope();
     public abstract ISource Clone();
     public abstract void Dispose();

diff --git a/src/ZMap/Source/VectorSourceBase.cs b/src/ZMap/Source/VectorSourceBase.cs
@@ -2,6 +2,8 @@ namespace ZMap.Source;
 
 public abstract class VectorSourceBase : IVectorSource
 {
+    public string Key { get; set; }
+
     /// <summary>
     /// 数据源名称
     /// </summary>

diff --git a/src/ZServer/Store/LayerStore.cs b/src/ZServer/Store/LayerStore.cs
@@ -327,6 +327,7 @@ private async Task<ISource> RestoreSourceAsync(string resourceGroup, string name
             return null;
         }
 
+        source.Key = name;
         var properties = PropertyCache.GetOrAdd(source.GetType(), t =>
         {
             return t.GetProperties().Where(z => z.CanWrite)