Make autoindexing not require a cast to GeoGigDataStore

geoserver · Jun 7, 2017 · 4b540fe · 4b540fe
1 parent d89e44d
commit 4b540fe
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 65 deletions.
diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/config/RepositoryManager.java b/src/community/geogig/src/main/java/org/geogig/geoserver/config/RepositoryManager.java
@@ -15,6 +15,7 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.UUID;
 
@@ -27,6 +28,8 @@
 import org.geoserver.catalog.DataStoreInfo;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.catalog.LayerInfo;
+import org.geoserver.catalog.ResourceInfo;
+import org.geoserver.catalog.StoreInfo;
 import org.geoserver.catalog.util.CloseableIterator;
 import org.geoserver.config.GeoServer;
 import org.geoserver.config.GeoServerInitializer;
@@ -419,4 +422,45 @@ private static Ref pingRemote(Remote remote) throws Exception {
             throw new IllegalArgumentException("Unable to connect: " + e.getMessage(), e);
         }
     }
+
+    public boolean isGeogigLayer(LayerInfo layer) {
+        ResourceInfo resource = layer.getResource();
+        if (resource == null) {
+            return false;
+        }
+        StoreInfo store = resource.getStore();
+        if (store == null) {
+            return false;
+        }
+        return isGeogigStore(store);
+    }
+
+    public boolean isGeogigStore(CatalogInfo store) {
+        if (!(store instanceof DataStoreInfo)) {
+            return false;
+        }
+        final String storeType = ((DataStoreInfo) store).getType();
+        boolean isGeogigStore = GeoGigDataStoreFactory.DISPLAY_NAME.equals(storeType);
+        return isGeogigStore;
+    }
+
+    public Repository findRepository(LayerInfo geogigLayer) {
+        Preconditions.checkArgument(isGeogigLayer(geogigLayer));
+
+        Map<String, Serializable> params = geogigLayer.getResource().getStore()
+                .getConnectionParameters();
+        String repoUriStr = String.valueOf(params.get(GeoGigDataStoreFactory.REPOSITORY.key));
+        URI repoURI = URI.create(repoUriStr);
+        RepositoryResolver resolver = RepositoryResolver.lookup(repoURI);
+        String repoName = resolver.getName(repoURI);
+        RepositoryInfo repoInfo = getByRepoName(repoName);
+        String repoId = repoInfo.getId();
+        try {
+            Repository repository = getRepository(repoId);
+            Preconditions.checkState(repository != null);
+            return repository;
+        } catch (IOException e) {
+            throw Throwables.propagate(e);
+        }
+    }
 }
diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/wms/GeoGigCatalogVisitor.java b/src/community/geogig/src/main/java/org/geogig/geoserver/wms/GeoGigCatalogVisitor.java
@@ -4,7 +4,9 @@
  */
 package org.geogig.geoserver.wms;
 
+import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -14,8 +16,9 @@
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
+import org.eclipse.jdt.annotation.Nullable;
+import org.geogig.geoserver.config.RepositoryManager;
 import org.geoserver.catalog.Catalog;
-import org.geoserver.catalog.CatalogException;
 import org.geoserver.catalog.CatalogVisitor;
 import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.CoverageStoreInfo;
@@ -36,6 +39,7 @@
 import org.locationtech.geogig.geotools.data.GeoGigDataStore;
 import org.locationtech.geogig.geotools.data.GeoGigDataStoreFactory;
 import org.locationtech.geogig.model.ObjectId;
+import org.locationtech.geogig.repository.Repository;
 
 import com.google.common.base.Optional;
 
@@ -100,21 +104,30 @@ public void visit(CoverageInfo coverage) {
         // do nothing
     }
 
-    private void createOrUpdateIndex(final GeoGigDataStore dataStore, final String layerName,
+    private void createOrUpdateIndex(final LayerInfo geogigLayer, final @Nullable String head,
-            final String[] extraAttribues) {
+            final String[] extraAttributes) {
         // schedule the index creation
         final Future<Optional<ObjectId>> indexId = INDEX_SERVICE.submit(
                 new Callable<Optional<ObjectId>>() {
 
             @Override
             public Optional<ObjectId> call() throws Exception {
-                return dataStore.createOrUpdateIndex(layerName, extraAttribues);
+                RepositoryManager manager = RepositoryManager.get();
+                Repository findRepository = manager.findRepository(geogigLayer);
+
+                String featureTreePath=geogigLayer.getResource().getNativeName();
+
+                Optional<ObjectId> index = GeoGigDataStore.createOrUpdateIndex(findRepository, head,
+                                featureTreePath, extraAttributes);
+
+                return index;
             }
         });
         // handle the Future and generate an error log if the index create/update fails
         FUTURE_SERVICE.submit(new Runnable() {
             @Override
             public void run() {
+                final String layerName = geogigLayer.getName();
                 try {
                     Optional<ObjectId> objId = indexId.get();
                     if (!objId.isPresent()) {
@@ -138,35 +151,37 @@ public void run() {
     public void visit(LayerInfo layer) {
         // get the Resource for this layer
         final ResourceInfo resource = layer.getResource();
-        if (resource != null) {
+        if (RepositoryManager.get().isGeogigLayer(layer)) {
             // get the Store to see if it's a GeoGig store
             final StoreInfo store = resource.getStore();
-            if (GeoGigDataStoreFactory.DISPLAY_NAME.equals(store.getType())) {
+            // it's a GeoGig dataStore
-                // it's a GeoGig dataStore
+            Map<String, Serializable> connectionParams = store.getConnectionParameters();
-                GeoGigDataStore geogigDataStore = null;
+            Serializable autoIndexingParam = connectionParams
-                try {
+                    .get(GeoGigDataStoreFactory.AUTO_INDEXING.key);
-                    geogigDataStore = GeoGigDataStore.class.cast(
+
-                            ((DataStoreInfo) store).getDataStore(null));
+            final boolean autoIndexing = Boolean.TRUE.equals(autoIndexingParam);
-                } catch (Exception ex) {
+
-                    throw new CatalogException("Error accessing GeoGig DataStore", ex);
+            if (!autoIndexing) {
-                }
+                if (LOGGER.isLoggable(Level.FINE)) {
-                if (!geogigDataStore.getAutoIndexing()) {
+                    LOGGER.fine(String.format(
-                    if (LOGGER.isLoggable(Level.FINE)) {
+                            "GeoGig DataStore is not configured for automatic indexing."));
-                        LOGGER.fine(String.format(
-                                "GeoGig DataStore is not configured for automatic indexing."));
-                    }
-                    // skip it
-                    return;
                 }
-                // get the metadata for the layer resource
+                // skip it
-                final MetadataMap metadata = resource.getMetadata();
+                return;
-                final String[] timeAttr = getAttribute(metadata, "time");
-                final String[] elevationAttr = getAttribute(metadata, "elevation");
-                String[] dimensions = Stream.concat(Arrays.stream(timeAttr),
-                        Arrays.stream(elevationAttr)).toArray(String[]::new);
-                // create the indexes
-                createOrUpdateIndex(geogigDataStore, resource.getName(), dimensions);
             }
+            String head = (String) connectionParams.get(GeoGigDataStoreFactory.HEAD.key);
+            String branch = (String) connectionParams.get(GeoGigDataStoreFactory.BRANCH.key);
+
+            String effectiveHead = head == null? branch:head;
+
+            // get the metadata for the layer resource
+            final MetadataMap metadata = resource.getMetadata();
+            final String[] timeAttr = getAttribute(metadata, "time");
+            final String[] elevationAttr = getAttribute(metadata, "elevation");
+            String[] dimensions = Stream.concat(Arrays.stream(timeAttr),
+                    Arrays.stream(elevationAttr)).toArray(String[]::new);
+            // create the indexes
+            createOrUpdateIndex(layer, effectiveHead, dimensions);
         }
     }
 

diff --git a/...mmunity/geogig/src/main/java/org/geogig/geoserver/wms/GeogigLayerIntegrationListener.java b/...mmunity/geogig/src/main/java/org/geogig/geoserver/wms/GeogigLayerIntegrationListener.java
@@ -28,7 +28,6 @@
 import org.geoserver.catalog.LayerIdentifierInfo;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.ResourceInfo;
-import org.geoserver.catalog.StoreInfo;
 import org.geoserver.catalog.WorkspaceInfo;
 import org.geoserver.catalog.event.CatalogAddEvent;
 import org.geoserver.catalog.event.CatalogListener;
@@ -53,26 +52,25 @@
  * <p>
  * The identifier is made of the following parts:
  * <ul>
- * <li> {@code <repositoryId>}: {@link RepositoryInfo#getId() RepositoryInfo ID} that identifies the
+ * <li>{@code <repositoryId>}: {@link RepositoryInfo#getId() RepositoryInfo ID} that identifies the
  * repository referred by the layer's {@link DataStore}. {@link RepositoryInfo}s are managed by
  * {@link RepositoryManager} and are the way this plugin supports configuring several datastores
  * against the same repository without duplication of information.
- * <li> {@code <nativeName>}: the layer's resource {@link ResourceInfo#getNativeName() native name}
+ * <li>{@code <nativeName>}: the layer's resource {@link ResourceInfo#getNativeName() native name}
- * <li> {@code <branch/head>}: the geogig datastore's configured
+ * <li>{@code <branch/head>}: the geogig datastore's configured {@link GeoGigDataStoreFactory#BRANCH
- * {@link GeoGigDataStoreFactory#BRANCH branch} or {@link GeoGigDataStoreFactory#HEAD}, whichever is
+ * branch} or {@link GeoGigDataStoreFactory#HEAD}, whichever is present, or absent if no branch or
- * present, or absent if no branch or head is configured (and hence the datastore operates on
+ * head is configured (and hence the datastore operates on whatever the current HEAD is)
- * whatever the current HEAD is)
  * </ul>
  * <p>
  * Handles the following events:
  * <ul>
- * <li> {@link WorkspaceInfo} renamed: all geogig layers of stores in that workspace get their
+ * <li>{@link WorkspaceInfo} renamed: all geogig layers of stores in that workspace get their
  * authority URL identifiers updated
- * <li> {@link DataStoreInfo} renamed: all geogig layers of stores in that workspace get their
+ * <li>{@link DataStoreInfo} renamed: all geogig layers of stores in that workspace get their
  * authority URL identifiers updated
- * <li> {@link DataStoreInfo} workspace changed: all geogig layers of stores in that workspace get
+ * <li>{@link DataStoreInfo} workspace changed: all geogig layers of stores in that workspace get
  * their authority URL identifiers updated
- * <li> {@link LayerInfo} added: if its a geogig layer, creates its geogig authority URL identifier
+ * <li>{@link LayerInfo} added: if its a geogig layer, creates its geogig authority URL identifier
  * and saves the layer info
  * </ul>
  */
@@ -87,6 +85,7 @@ public class GeogigLayerIntegrationListener implements CatalogListener {
     private final GeoServer geoserver;
 
     private final GeoGigCatalogVisitor visitor = new GeoGigCatalogVisitor();
+
     /**
      */
     public GeogigLayerIntegrationListener(GeoServer geoserver) {
@@ -101,7 +100,7 @@ public void handleAddEvent(CatalogAddEvent event) throws CatalogException {
             return;
         }
         LayerInfo layer = (LayerInfo) event.getSource();
-        if (!isGeogigLayer(layer)) {
+        if (!RepositoryManager.get().isGeogigLayer(layer)) {
             return;
         }
         event.getSource().accept(visitor);
@@ -117,13 +116,14 @@ public void handleAddEvent(CatalogAddEvent event) throws CatalogException {
     @Override
     public void handleModifyEvent(CatalogModifyEvent event) throws CatalogException {
         if (PRE_MOFIFY_EVENT.get() != null) {
-            LOGGER.log(Level.FINE, "pre-modify event exists, ignoring handleModifyEvent ({0})", PRE_MOFIFY_EVENT.get());
+            LOGGER.log(Level.FINE, "pre-modify event exists, ignoring handleModifyEvent ({0})",
+                    PRE_MOFIFY_EVENT.get());
             return;
         }
         event.getSource().accept(visitor);
 
         final CatalogInfo source = event.getSource();
-        final boolean isGeogigStore = isGeogigStore(source);
+        final boolean isGeogigStore = RepositoryManager.get().isGeogigStore(source);
 
         boolean tryPostUpdate = (source instanceof WorkspaceInfo) || isGeogigStore;
         final List<String> propertyNames = event.getPropertyNames();
@@ -236,7 +236,8 @@ public void reloaded() {
     }
 
     private void setIdentifier(LayerInfo layer) {
-        LOGGER.log(Level.FINE, "Updating geogig auth identifier for layer {0}", layer.prefixedName());
+        LOGGER.log(Level.FINE, "Updating geogig auth identifier for layer {0}",
+                layer.prefixedName());
         final String layerIdentifier = buildLayerIdentifier(layer);
         updateIdentifier(layer, layerIdentifier);
     }
@@ -267,7 +268,7 @@ private void updateIdentifier(LayerInfo geogigLayer, final String newIdentifier)
         Catalog catalog = geoserver.getCatalog();
         catalog.save(geogigLayer);
         LOGGER.log(Level.INFO, "Updated geogig auth identifier for layer {0} as {1}",
-                new Object[]{geogigLayer.prefixedName(), newIdentifier});
+                new Object[] { geogigLayer.prefixedName(), newIdentifier });
     }
 
     private String buildLayerIdentifier(LayerInfo geogigLayer) {
@@ -284,27 +285,12 @@ private String buildLayerIdentifier(LayerInfo geogigLayer) {
             refSpec = connectionParameters.get(HEAD.key);
         }
 
-        StringBuilder identifier = new StringBuilder(repositoryId).append(':').append(
+        StringBuilder identifier = new StringBuilder(repositoryId).append(':')
-                resource.getNativeName());
+                .append(resource.getNativeName());
         if (refSpec != null) {
             identifier.append(':').append(refSpec);
         }
 
         return identifier.toString();
     }
-
-    private boolean isGeogigLayer(LayerInfo layer) {
-        ResourceInfo resource = layer.getResource();
-        StoreInfo store = resource.getStore();
-        return isGeogigStore(store);
-    }
-
-    private boolean isGeogigStore(CatalogInfo store) {
-        if (!(store instanceof DataStoreInfo)) {
-            return false;
-        }
-        final String storeType = ((DataStoreInfo) store).getType();
-        boolean isGeogigLayer = DISPLAY_NAME.equals(storeType);
-        return isGeogigLayer;
-    }
 }
diff --git a/src/community/geogig/src/test/java/org/geogig/geoserver/wms/GeoGigCatalogVisitorTest.java b/src/community/geogig/src/test/java/org/geogig/geoserver/wms/GeoGigCatalogVisitorTest.java
@@ -29,6 +29,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.locationtech.geogig.geotools.data.GeoGigDataStore;
+import org.locationtech.geogig.geotools.data.GeoGigDataStoreFactory;
 import org.locationtech.geogig.repository.IndexInfo;
 import org.locationtech.geogig.repository.impl.GeoGIG;
 import org.locationtech.geogig.storage.IndexDatabase;
@@ -141,8 +142,7 @@ private void addAvailableGeogigLayers() throws IOException {
         // set the DataStore to auto-index
         DataStoreInfo dataStore = catalog.getDataStoreByName(GeoGigTestData.CatalogBuilder.WORKSPACE,
                 GeoGigTestData.CatalogBuilder.STORE);
-        final GeoGigDataStore geogigDataStore = GeoGigDataStore.class.cast(
+        dataStore.getConnectionParameters().put(GeoGigDataStoreFactory.AUTO_INDEXING.key, true);
-                            ((DataStoreInfo) dataStore).getDataStore(null));
+        catalog.save(dataStore);
-        geogigDataStore.setAutoIndexing(true);
     }
 }