Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Commits
f8626d56
Commit
f8626d56
authored
2 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
FIX: docs and added missing separator
parent
7f047ecf
No related branches found
No related tags found
1 merge request
!65
F permission checks
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/caosdb/server/query/Query.java
+7
-5
7 additions, 5 deletions
src/main/java/org/caosdb/server/query/Query.java
with
7 additions
and
5 deletions
src/main/java/org/caosdb/server/query/Query.java
+
7
−
5
View file @
f8626d56
...
...
@@ -337,7 +337,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
* stored in the cache. This allows (some) cache entries to be shared among users since the final
* check is applied after the retrieval of the result set from the cache (@see {@link
* filterEntitiesWithoutRetrievePermission}) The cache is invalidated whenever there is a write
* operation (@see {@link writeTODO}).
* operation (@see {@link writeTODO}) TODO replace writeTODO and describe how invalidation is
* done.
*/
private
static
ICacheAccess
<
String
,
Serializable
>
cache
=
Cache
.
getCache
(
"HIGH_LEVEL_QUERY_CACHE"
);
...
...
@@ -418,9 +419,9 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
/**
* @return The result set table name.
* @throws
Transaction
Exception
* @throws
Query
Exception
*/
private
String
sourceStrategy
(
final
String
sourceSet
)
throws
Transaction
Exception
{
private
String
sourceStrategy
(
final
String
sourceSet
)
throws
Query
Exception
{
try
{
this
.
sourceSet
=
sourceSet
;
initResultSetWithNameIDAndChildren
();
...
...
@@ -441,7 +442,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
return
this
.
sourceSet
;
}
catch
(
final
SQLException
e
)
{
e
.
printStackTrace
();
throw
new
Transaction
Exception
(
e
);
throw
new
Query
Exception
(
e
);
}
}
...
...
@@ -1158,7 +1159,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
String
principal_desc
=
((
Principal
)
this
.
user
.
getPrincipal
()).
getUsername
()
+
Principal
.
REALM_SEPARATOR
+
((
Principal
)
this
.
user
.
getPrincipal
()).
getRealm
();
+
((
Principal
)
this
.
user
.
getPrincipal
()).
getRealm
()
+
Principal
.
REALM_SEPARATOR
;
sb
.
append
(
principal_desc
);
}
if
(
this
.
versioned
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment