Changeset 1417 for trunk/sources/HeuristicLab.CEDMA.DB/Store.cs

Timestamp:

03/25/09 14:48:56 (15 years ago)

Author:

gkronber

Message:

Introduced paging for queries to fix problems with large WCF messages. #257 (CEDMA console doesn't handle communication- and timeout exceptions correctly)

File:

• trunk/sources/HeuristicLab.CEDMA.DB/Store.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.DB/Store.cs

@@ -62 +62 @@
 
 
-    public ICollection<VariableBindings> Query(string query) {
+    public ICollection<VariableBindings> Query(string query, int page, int pageSize) {
       MyQueryResultSink resultSink = new MyQueryResultSink();
       SemWeb.N3Reader n3Reader = new SemWeb.N3Reader(new StringReader(query));
       SemWeb.Query.GraphMatch matcher = new SemWeb.Query.GraphMatch(n3Reader);
       matcher.Run(store, resultSink);
-      return resultSink.Bindings;
-    }
-
-    public ICollection<VariableBindings> Query(ICollection<Statement> query) {
+      return resultSink.Bindings.Skip(page*pageSize).Take(pageSize).ToList();
+    }
+
+    public ICollection<VariableBindings> Query(ICollection<Statement> query, int page, int pageSize) {
       MyQueryResultSink resultSink = new MyQueryResultSink();
       Translate(query).Run(store, resultSink);
-      return resultSink.Bindings;
+      return resultSink.Bindings.Skip(page * pageSize).Take(pageSize).ToList();
     }
 
@@ -82 +82 @@
       return new SemWeb.Query.GraphMatch(queryStore);
     }
-
-
-    //public ICollection<Statement> Select(Statement template) {
-    //  SemWeb.MemoryStore memStore = new SemWeb.MemoryStore();
-    //  lock (bigLock) {
-    //    store.Select(Translate(template), memStore);
-    //  }
-    //  return memStore.Select(x=>Translate(x)).ToList();
-    //}
-
-    //public ICollection<Statement> Select(SelectFilter filter) {
-    //  SemWeb.MemoryStore memStore = new SemWeb.MemoryStore();
-    //  lock (bigLock) {
-    //    store.Select(Translate(filter), memStore);
-    //  }
-    //  return memStore.Select(x => Translate(x)).ToList();
-    //}
-
-    //private SemWeb.SelectFilter Translate(SelectFilter filter) {
-    //  SemWeb.SelectFilter f = new SemWeb.SelectFilter();
-    //  f.Subjects = Array.ConvertAll(filter.Subjects, s => Translate(s));
-    //  f.Predicates = Array.ConvertAll(filter.Predicates, p => Translate(p));
-    //  f.Objects = Array.ConvertAll(filter.Properties, prop => Translate(prop));
-    //  return f;
-    //}
 
     private static SemWeb.Entity Translate(Entity e) {