From b6ed956dcaf5767353bebcf1c61a57904efb04f7 Mon Sep 17 00:00:00 2001 From: Claudio Mezzasalma Date: Tue, 30 Jul 2019 17:16:23 +0200 Subject: [PATCH] Default sorting for Datastore queries Signed-off-by: Claudio Mezzasalma --- .../datastore/internal/mediator/DatastoreMediator.java | 2 -- .../datastore/internal/model/query/ChannelInfoQueryImpl.java | 5 +++++ .../datastore/internal/model/query/ClientInfoQueryImpl.java | 5 +++++ .../datastore/internal/model/query/MessageQueryImpl.java | 4 ++++ .../datastore/internal/model/query/MetricInfoQueryImpl.java | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/mediator/DatastoreMediator.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/mediator/DatastoreMediator.java index b5d178d2b5..87311afe8e 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/mediator/DatastoreMediator.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/mediator/DatastoreMediator.java @@ -157,8 +157,6 @@ public void onAfterMessageStore(MessageInfo messageInfo, channelInfo.setFirstMessageId(message.getDatastoreId()); channelInfo.setFirstMessageOn(message.getTimestamp()); channelInfo.setId(new StorableIdImpl(ChannelInfoField.getOrDeriveId(null, channelInfo))); - clientInfo.setFirstMessageId(message.getDatastoreId()); - clientInfo.setFirstMessageOn(message.getTimestamp()); channelInfoStoreFacade.upstore(channelInfo); KapuaPayload payload = message.getPayload(); diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ChannelInfoQueryImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ChannelInfoQueryImpl.java index 6050fc1e65..176821b95a 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ChannelInfoQueryImpl.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ChannelInfoQueryImpl.java @@ -11,11 +11,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.datastore.internal.model.query; +import java.util.Collections; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.datastore.internal.AbstractStorableQuery; import org.eclipse.kapua.service.datastore.internal.mediator.ChannelInfoField; +import org.eclipse.kapua.service.datastore.internal.schema.ChannelInfoSchema; import org.eclipse.kapua.service.datastore.model.ChannelInfo; import org.eclipse.kapua.service.datastore.model.query.ChannelInfoQuery; +import org.eclipse.kapua.service.datastore.model.query.SortField; import org.eclipse.kapua.service.datastore.model.query.StorableFetchStyle; /** @@ -35,6 +39,7 @@ public class ChannelInfoQueryImpl extends AbstractStorableQuery imp */ public ChannelInfoQueryImpl(KapuaId scopeId) { super(scopeId); + setSortFields(Collections.singletonList(SortField.ascending(ChannelInfoSchema.CHANNEL_NAME))); } @Override diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ClientInfoQueryImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ClientInfoQueryImpl.java index 2a109a2d28..bec22dbc91 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ClientInfoQueryImpl.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/ClientInfoQueryImpl.java @@ -11,11 +11,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.datastore.internal.model.query; +import java.util.Collections; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.datastore.internal.AbstractStorableQuery; import org.eclipse.kapua.service.datastore.internal.mediator.ClientInfoField; +import org.eclipse.kapua.service.datastore.internal.schema.ClientInfoSchema; import org.eclipse.kapua.service.datastore.model.ClientInfo; import org.eclipse.kapua.service.datastore.model.query.ClientInfoQuery; +import org.eclipse.kapua.service.datastore.model.query.SortField; import org.eclipse.kapua.service.datastore.model.query.StorableFetchStyle; /** @@ -34,6 +38,7 @@ public class ClientInfoQueryImpl extends AbstractStorableQuery imple */ public ClientInfoQueryImpl(KapuaId scopeId) { super(scopeId); + setSortFields(Collections.singletonList(SortField.ascending(ClientInfoSchema.CLIENT_ID))); } @Override diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MessageQueryImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MessageQueryImpl.java index 580bb8ff10..6420210b21 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MessageQueryImpl.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MessageQueryImpl.java @@ -11,12 +11,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.datastore.internal.model.query; +import java.util.Collections; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.datastore.internal.AbstractStorableQuery; import org.eclipse.kapua.service.datastore.internal.mediator.MessageField; import org.eclipse.kapua.service.datastore.internal.schema.MessageSchema; import org.eclipse.kapua.service.datastore.model.DatastoreMessage; import org.eclipse.kapua.service.datastore.model.query.MessageQuery; +import org.eclipse.kapua.service.datastore.model.query.SortField; import org.eclipse.kapua.service.datastore.model.query.StorableFetchStyle; /** @@ -36,6 +39,7 @@ public class MessageQueryImpl extends AbstractStorableQuery im */ public MessageQueryImpl(KapuaId scopeId) { super(scopeId); + setSortFields(Collections.singletonList(SortField.descending(MessageSchema.MESSAGE_TIMESTAMP))); } @Override diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MetricInfoQueryImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MetricInfoQueryImpl.java index 1a981f6bf8..f58e900cba 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MetricInfoQueryImpl.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/query/MetricInfoQueryImpl.java @@ -11,11 +11,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.datastore.internal.model.query; +import java.util.Collections; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.datastore.internal.AbstractStorableQuery; import org.eclipse.kapua.service.datastore.internal.mediator.MetricInfoField; +import org.eclipse.kapua.service.datastore.internal.schema.MetricInfoSchema; import org.eclipse.kapua.service.datastore.model.MetricInfo; import org.eclipse.kapua.service.datastore.model.query.MetricInfoQuery; +import org.eclipse.kapua.service.datastore.model.query.SortField; import org.eclipse.kapua.service.datastore.model.query.StorableFetchStyle; /** @@ -34,6 +38,7 @@ public class MetricInfoQueryImpl extends AbstractStorableQuery imple */ public MetricInfoQueryImpl(KapuaId scopeId) { super(scopeId); + setSortFields(Collections.singletonList(SortField.ascending(MetricInfoSchema.METRIC_MTR_NAME_FULL))); } @Override