ogsa-dai-svn-commits Mailing List for OGSA-DAI (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2165
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=2165&view=rev
Author:   amykrause
Date:     2013-01-03 09:05:21 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Test metadata service.

Added Paths:
-----------
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/AttributeService.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/StatisticsService.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMapping.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMappingService.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataService.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataServiceFactory.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataCollector.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceCardinalityStatistics.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDQPFederation.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDataDictionary.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceFactory.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceTableSchema.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/ServiceException.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/SimpleTableMapping.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataService.java
    ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataServiceFactory.java

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/AttributeService.java
===================================================================

--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/AttributeService.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/AttributeService.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2012 Royal Observatory, University of Edinburgh, UK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package uk.ac.roe.wfau.firethorn.ogsadai.metadata;
+
+import uk.org.ogsadai.dqp.lqp.Attribute;
+
+/**
+ * Interface for accessing Attribute(s).
+ * 
+ */
+public interface AttributeService {
+
+    /**
+     * Get an Iterable set of Attributes, based on source (table) name.
+     * 
+     * @param source
+     *            The source (table) alias. <br/>
+     *            This should be the table alias used in SQL queries passed into
+     *            OGSA-DAI, before the mapping from table alias to fully
+     *            qualified resource table name.
+     * 
+     * @return An Iterable set of Attribute(s) for the source (table).
+     * 
+     */
+    public Iterable<Attribute> getAttributes(String source);
+
+    /**
+     * Get a specific Attribute, based on source (table) name and Attribute
+     * (column) name.
+     * 
+     * @param source
+     *            The source (table) alias. <br/>
+     *            This should be the table alias used in SQL queries passed into
+     *            OGSA-DAI, before the mapping from table alias to fully
+     *            qualified resource table name.
+     * @param name
+     *            The Attribute(column) name.
+     * 
+     * @return The specified Attribute, or null if there is no match.
+     * 
+     */
+    public Attribute getAttribute(String source, String name);
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/StatisticsService.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/StatisticsService.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/StatisticsService.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2012 Royal Observatory, University of Edinburgh, UK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package uk.ac.roe.wfau.firethorn.ogsadai.metadata;
+
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeStatistics;
+
+/**
+ * Interface for accessing AttributeStatistics.
+ * 
+ */
+public interface StatisticsService 
+{
+    /**
+     * Get the AttributeStatistics for a given Attribute.
+     * 
+     * @param attribute
+     *            The Attribute to get the corresponding AttributeStatistics
+     *            for.
+     * @return The AttributeStatistics for the Attribute, or null if there is no
+     *         corresponding AttributeStatistics.
+     * 
+     */
+    public AttributeStatistics getStatistics(Attribute attribute);
+
+    /**
+     * Get the AttributeStatistics given the source (table) and attribute name.
+     * 
+     * @param source
+     *            The source (table) alias. <br/>
+     *            This should be the table alias used in SQL queries passed into
+     *            OGSA-DAI, before the mapping from table alias to fully
+     *            qualified resource table name.
+     * @param name
+     *            The Attribute(column) name.
+     * 
+     * @return The AttributeStatistics for the corresponding Attribute, or null
+     *         if there is no corresponding Attribute or AttributeStatistics.
+     * 
+     */
+    public AttributeStatistics getStatistics(String source, String name);
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMapping.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMapping.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMapping.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2012 Royal Observatory, University of Edinburgh, UK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package uk.ac.roe.wfau.firethorn.ogsadai.metadata;
+
+/**
+ * An interface for a mapping between table alias (source) and the fully
+ * qualified table name and target resource.
+ * 
+ * 
+ */
+public interface TableMapping 
+{
+    /**
+     * Get the table alias. <br/>
+     * This is the table alias used in SQL queries passed into OGSA-DAI, before
+     * the mapping from table alias to fully qualified resource table name.
+     * 
+     * @return The table alias.
+     * 
+     */
+    public String tableAlias();
+
+    /**
+     * Get the fully qualified table name (catalog.schema.table) in the target
+     * resource.
+     * 
+     * @return The fully qualified table name.
+     * 
+     */
+    public String tableName();
+
+    /**
+     * Get the target resource identifier.
+     * 
+     * @return The target resource identifier.
+     * 
+     */
+    public String resourceIdent();
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMappingService.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMappingService.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/metadata/TableMappingService.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (C) 2012 Royal Observatory, University of Edinburgh, UK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package uk.ac.roe.wfau.firethorn.ogsadai.metadata;
+
+/**
+ * Interface for accessing TableMapping(s).
+ * 
+ * 
+ */
+public interface TableMappingService {
+    /**
+     * Lookup a TableMapping based on a table alias (source).
+     * 
+     * @param source
+     *            The (source) table alias. <br/>
+     *            This should be the table alias used in SQL queries passed into
+     *            OGSA-DAI, before the mapping from table alias to fully
+     *            qualified resource table name.
+     * 
+     * @return The corresponding TableMapping, or null if there is no match
+     * 
+     */
+    public TableMapping getTableMapping(String source);
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataService.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataService.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataService.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,201 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMapping;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.common.msgs.DAILogger;
+import uk.org.ogsadai.dqp.common.DataDictionary;
+import uk.org.ogsadai.dqp.common.DataNode;
+import uk.org.ogsadai.dqp.common.PhysicalSchema;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+import uk.org.ogsadai.dqp.common.TableSchema;
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.AttributeImpl;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.CardinalityStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.CardinalityUtils;
+import uk.org.ogsadai.dqp.lqp.cardinality.StatisticsPhysicalSchema;
+import uk.org.ogsadai.dqp.lqp.exceptions.TableNotFoundException;
+import uk.org.ogsadai.resource.dataresource.dqp.DQPFederation;
+
+public class CachedMetadataService
+implements AttributeService, TableMappingService, StatisticsService 
+{
+    
+    private static final DAILogger LOG = 
+            DAILogger.getLogger(CachedMetadataService.class);
+
+    private Map<String, TableMapping> mTableMappings = 
+            new HashMap<String, TableMapping>();
+    private Map<String, CardinalityStatistics> mStatistics = 
+            new HashMap<String, CardinalityStatistics>();
+    private Map<String, List<Attribute>> mAttributes = 
+            new HashMap<String, List<Attribute>>();
+    private DataDictionary mDataDictionary;
+
+    public CachedMetadataService(
+            RequestDetails details,
+            DQPFederation federation, 
+            Map<String, DataNode> dataNodes)
+    {
+        mDataDictionary = federation.getDataDictionary(details);
+        Map<DataNode, String> dataNodeIdentifiers = createDataNodeIdentifier(dataNodes);
+        for (TableSchema tableSchema : mDataDictionary.getTableSchemas())
+        {
+            String tableName = tableSchema.getTableName();
+            LOG.debug("Retrieving table schema for '" + tableName + "'");
+            List<Attribute> attributes = tableSchema.getSchema().getAttributes();
+            mAttributes.put(tableName, attributes);
+            LOG.debug("Attributes: " + attributes);
+            // choose the first data node that can access the table
+            if (tableSchema.getDataNodeTables().isEmpty())
+            {
+                throw new RuntimeException(
+                        "Table " + tableName + " has no data node.");
+            }
+            DataNode dataNode = 
+                    tableSchema.getDataNodeTables().get(0).getDataNode();
+            String localName = null;
+            try
+            {
+                localName = mDataDictionary.getOriginalTableName(
+                        tableName, dataNode);
+            }
+            catch (TableNotFoundException e)
+            {
+                // this shouldn't happen
+                throw new RuntimeException(e);
+            }
+            TableMapping tableMapping = 
+                    new SimpleTableMapping(
+                            tableName, 
+                            localName, 
+                            dataNodeIdentifiers.get(dataNode));
+            LOG.debug("Adding table mapping: " + tableMapping);
+            
+            mTableMappings.put(tableName, tableMapping);
+            initStatistics(tableSchema, attributes);
+        }
+    }
+
+    @Override
+    public AttributeStatistics getStatistics(Attribute attribute) 
+    {
+        CardinalityStatistics cardStats = mStatistics.get(attribute.getSource());
+        if (cardStats == null)
+        {
+            LOG.debug("Table statistics not found: " + attribute.getSource());
+            return null;
+        }
+        return cardStats.getStatistics(attribute);
+    }
+
+    @Override
+    public AttributeStatistics getStatistics(String source, String name)
+    {
+        Attribute attribute = new AttributeImpl(name, source);
+        return getStatistics(attribute);
+    }
+
+    @Override
+    public TableMapping getTableMapping(String source)
+    {
+        return mTableMappings.get(source);
+    }
+
+    @Override
+    public Iterable<Attribute> getAttributes(String source) 
+    {
+        return mAttributes.get(source);
+    }
+
+    @Override
+    public Attribute getAttribute(String source, String name)
+    {
+        List<Attribute> attributes = mAttributes.get(source);
+        if (attributes != null)
+        {
+            for (Attribute attribute : attributes)
+            {
+                if (attribute.getName().equals(name))
+                {
+                    return attribute;
+                }
+            }
+        }
+        return null;
+    }
+    
+    private void initStatistics(
+            TableSchema tableSchema,
+            List<Attribute> attributes)
+    {
+        LOG.debug("Adding statistics for '" + tableSchema.getTableName() + "'.");
+        CardinalityStatistics cardStats;
+        // Go to physical data dictionary and get table scan statistics
+        PhysicalSchema physicalSchema = tableSchema.getPhysicalSchema();
+        
+        if (physicalSchema == null)
+        {
+            // make up a schema
+            LOG.debug("Adding standard schema.");
+            cardStats = CardinalityUtils.makeStatisticsFromHeading(
+                    attributes, 100000, 10000);
+        }
+        else if (!(physicalSchema instanceof StatisticsPhysicalSchema))
+        {
+            long cardinality = physicalSchema.getCardinality();
+            LOG.debug("Adding simple schema with cardinality=" + cardinality);
+            // Convert simple physical schema into statistics schema.
+            cardStats = CardinalityUtils.makeStatisticsFromHeading(
+                    attributes, 
+                    cardinality, 
+                    cardinality/10.0);
+        }
+        else
+        {
+            LOG.debug("Found statistics schema.");
+            StatisticsPhysicalSchema statsPhysicalSchema =
+                    (StatisticsPhysicalSchema) physicalSchema;
+                        
+            cardStats = statsPhysicalSchema.getCardinalityStatistics();
+        }
+        mStatistics.put(tableSchema.getTableName(), cardStats);
+    }
+
+    /**
+     * Creates an identifier for the data node.
+     * 
+     * @param dataNode
+     *            data node
+     * @return unique identifier for the data node
+     */
+    private Map<DataNode, String> createDataNodeIdentifier(
+            Map<String, DataNode> dataNodes) 
+    {
+        Map<DataNode, String> result = new HashMap<DataNode, String>();
+        for (Entry<String, DataNode> entry : dataNodes.entrySet())
+        {
+            result.put(entry.getValue(), entry.getKey());
+        }
+        return result;
+    }
+
+//    private List<Attribute> createLocalAttributes(
+//            String localTableName, List<Attribute> attributes) 
+//    {
+//        List<Attribute> result = new ArrayList<Attribute>(attributes.size());
+//        for (Attribute attr : attributes)
+//        {
+//            result.add(new AttributeImpl(attr.getName(), localTableName));
+//        }
+//        return result;
+//    }
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataServiceFactory.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataServiceFactory.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/CachedMetadataServiceFactory.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,69 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.dqp.common.DataNode;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+import uk.org.ogsadai.resource.dataresource.dqp.DQPFederation;
+
+/**
+ * Wrapper for the DQP table schema fetcher.
+ *  
+ * @author The OGSA-DAI Project Team.
+ */
+public class CachedMetadataServiceFactory implements MetadataServiceFactory
+{
+
+    private CachedMetadataService mService;
+    private DQPFederation mDQPFederation;
+    private Map<String, DataNode> mDataNodes = new HashMap<String, DataNode>();
+
+    @Override
+    public AttributeService getAttributeService(RequestDetails details) 
+    {
+        initialise(details);
+        return mService;
+    }
+
+    @Override
+    public TableMappingService getTableMappingService(RequestDetails details) 
+    {
+        initialise(details);
+        return mService;
+    }
+
+    @Override
+    public StatisticsService getStatisticsService(RequestDetails details)
+    {
+        initialise(details);
+        return mService;
+    }
+    
+    public synchronized void initialise(RequestDetails requestDetails)
+    {
+        if (mService == null)
+        {
+            mService = 
+                    new CachedMetadataService(
+                            requestDetails, mDQPFederation, mDataNodes);
+        } 
+    }
+    
+    public void setFederation(DQPFederation federation)
+    {
+        mDQPFederation = federation;
+    }
+    
+    public void setDataNodes(Map<String, DataNode> dataNodes)
+    {
+        mDataNodes.clear();
+        mDataNodes.putAll(dataNodes);
+    }
+
+    
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataCollector.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataCollector.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataCollector.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,187 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+
+import uk.org.ogsadai.dqp.lqp.AttributeImpl;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeHistogramBin;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeHistogramBinEndpoint;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeHistogramRange;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.CardinalityStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.HistogramBasedAttributeStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.ScalarAttributeStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.SimpleCardinalityStatistics;
+
+public class MetadataCollector
+{
+    public double getNumValues(Connection connection, String table, String column) 
+            throws SQLException
+    {
+        ResultSet resultSet = 
+                executeQuery(connection, 
+                        "SELECT count(*) FROM (SELECT DISTINCT " + column + 
+                        " FROM " + table + ") t");
+        resultSet.next();
+        double result = resultSet.getDouble(1);
+        resultSet.close();
+        return result;
+    }
+    
+    public double getNumNulls(Connection connection, String table, String column) 
+            throws SQLException
+    {
+        ResultSet resultSet = 
+                executeQuery(connection, 
+                        "SELECT count(*) FROM " + table + 
+                        " WHERE " + column + " IS NULL");
+        resultSet.next();
+        double result = resultSet.getDouble(1);
+        resultSet.close();
+        return result;
+    }
+    
+    public HistogramBasedAttributeStatistics createHistograms(
+            Connection connection, String table, String column, int numBins) 
+                    throws SQLException
+    {
+        HistogramBasedAttributeStatistics result = 
+                new HistogramBasedAttributeStatistics();
+        ResultSet resultSet = 
+                executeQuery(connection, 
+                        "SELECT min(" + column + "), max(" + column + ") " +
+                        "FROM " + table);
+        resultSet.next();
+        double min = resultSet.getDouble(1);
+        double max = resultSet.getDouble(2);
+        resultSet.close();
+        System.out.println("min=" + min + ", max=" + max);
+        double binSize = (max - min)/numBins;
+        for (int i=0; i<numBins-1; i++)
+        {
+            double lower = min + i*binSize;
+            double upper = min + (i+1)*binSize;
+            String query;
+            if (i == 0)
+            {
+                // include min
+                query = "SELECT count(*) FROM " + table + 
+                    " WHERE " + column + " >= " + lower + 
+                    " AND " + column + " <= " + upper;
+            }
+            else
+            {
+                query = "SELECT count(*) FROM " + table + 
+                        " WHERE " + column + " > " + lower + 
+                        " AND " + column + " <= " + upper;
+            }
+            resultSet = executeQuery(connection, query);
+            resultSet.next();
+            double numRows = resultSet.getDouble(1);
+            resultSet.close();
+            resultSet = executeQuery(
+                    connection, 
+                    "SELECT count(*) FROM (SELECT DISTINCT " + 
+                    column + " FROM " + table + 
+                    " WHERE " + column + " > " + lower + 
+                    " AND " + column + " < " + upper +") t");
+            resultSet.next();
+            double numValues = resultSet.getDouble(1);
+            resultSet.close();
+            AttributeHistogramRange range;
+            if (i == 0)
+            {
+                range = new AttributeHistogramRange(
+                        new AttributeHistogramBinEndpoint(lower, true), 
+                        new AttributeHistogramBinEndpoint(upper, true));
+            }
+            else
+            {
+                range = new AttributeHistogramRange(
+                        new AttributeHistogramBinEndpoint(lower, false), 
+                        new AttributeHistogramBinEndpoint(upper, true));
+            }
+            AttributeHistogramBin histogramBin = 
+                    new AttributeHistogramBin(
+                            range, numRows, numValues);
+            result.addBin(histogramBin);
+        }
+        return result;
+    }
+    
+    public AttributeStatistics createScalarAttributeStatistics(
+            Connection connection, String table, String column, double numRows)
+    throws SQLException
+    {
+        double numValues = getNumValues(connection, table, column);
+        double numNulls = getNumNulls(connection, table, column);
+        return new ScalarAttributeStatistics(numRows, numValues, numNulls);
+    }
+    
+    /**
+     * Creates attribute statistics for all columns in the database table.
+     * 
+     * @param connection
+     *            database connection
+     * @param table
+     *            table name
+     * @param numBins
+     *            number of bins to create for histogram statistics
+     * @return cardinality statistics for the table
+     * @throws SQLException
+     */
+    public CardinalityStatistics createStatistics(
+            Connection connection, String table, int numBins)
+    throws SQLException
+    {
+        SimpleCardinalityStatistics result = new SimpleCardinalityStatistics();
+        ResultSet resultSet = 
+                executeQuery(connection, "SELECT count(*) FROM " + table);
+        resultSet.next();
+        double numRows = resultSet.getDouble(1);
+        resultSet.close();
+        System.out.println("total number of rows = " + numRows);
+        resultSet = connection.getMetaData().getColumns(null, null, table, null);
+        while (resultSet.next())
+        {
+            String column = resultSet.getString(4);
+            System.out.println("Creating histograms for " + column);
+            int type = resultSet.getInt(5);
+            AttributeStatistics histograms = null;
+            switch (type)
+            { 
+            // only numeric types
+            case Types.BIGINT:
+            case Types.DECIMAL:
+            case Types.DOUBLE:
+            case Types.FLOAT:
+            case Types.INTEGER:
+            case Types.NUMERIC:
+            case Types.REAL:
+            case Types.SMALLINT:
+            case Types.TINYINT:
+                histograms = createHistograms(connection, table, column, numBins);
+                break;
+            default:
+                histograms = createScalarAttributeStatistics(connection, table, column, numRows);
+                break;
+            }
+            if (histograms != null)
+            {
+                result.addAttributeStatistics(
+                        new AttributeImpl(column, table), histograms);
+            }
+        }
+        return result;
+    }
+    
+    private ResultSet executeQuery(Connection connection, String query) 
+            throws SQLException
+    {
+        Statement statement = connection.createStatement();
+        return statement.executeQuery(query);
+    }
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceCardinalityStatistics.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceCardinalityStatistics.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceCardinalityStatistics.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,85 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.AttributeMatchMode;
+import uk.org.ogsadai.dqp.lqp.AttributeUtils;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.CardinalityStatistics;
+
+/**
+ * An implementation of cardinality statistics for a set of attributes which
+ * retrieves the attribute statistics on request from a statistics service.
+ * 
+ * @author The OGSA-DAI Project Team.
+ */
+public class MetadataServiceCardinalityStatistics implements CardinalityStatistics
+{
+    private StatisticsService mStatisticsService;
+    private List<Attribute> mAttributes;
+
+    public MetadataServiceCardinalityStatistics(
+            List<Attribute> attributes,
+            StatisticsService statisticsService)
+    {
+        mStatisticsService = statisticsService;
+        mAttributes = attributes;
+    }
+
+    @Override
+    public double getCardinality()
+    {
+        if (mAttributes.isEmpty())
+        {
+            return 0;
+        }
+        else
+        {
+            Attribute attr = mAttributes.get(0);
+            AttributeStatistics stats = mStatisticsService.getStatistics(attr);
+            if (stats == null)
+            {
+                throw new RuntimeException("No statistics found for " + attr);
+            }
+            return stats.getNumRows();
+        }
+    }
+
+    @Override
+    public boolean contains(Attribute attr) 
+    {
+        return AttributeUtils.containsMatching(
+                attr, mAttributes, AttributeMatchMode.NAME_AND_NULL_SOURCE);
+    }
+
+    @Override
+    public AttributeStatistics getStatistics(Attribute attr) 
+    {
+        return mStatisticsService.getStatistics(attr);
+    }
+
+    @Override
+    public Map<Attribute, AttributeStatistics> getStatistics() 
+    {
+        Map<Attribute, AttributeStatistics> result = 
+            new HashMap<Attribute, AttributeStatistics>();
+        for (Attribute attr : mAttributes)
+        {
+            result.put(attr, getStatistics(attr));
+        }
+        return result;
+    }
+    
+    @Override
+    public String toString() 
+    {
+        return "MetadataServiceCardinalityStatistics[attributes=" + 
+                mAttributes +
+                ", service=" + mStatisticsService + "]";
+    }
+    
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDQPFederation.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDQPFederation.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDQPFederation.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,138 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import uk.org.ogsadai.context.OGSADAIContext;
+import uk.org.ogsadai.dqp.common.DataDictionary;
+import uk.org.ogsadai.dqp.common.DataNode;
+import uk.org.ogsadai.dqp.common.EvaluationNode;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+import uk.org.ogsadai.dqp.lqp.udf.FunctionRepository;
+import uk.org.ogsadai.dqp.presentation.common.DQPResourceConfigurationException;
+import uk.org.ogsadai.resource.dataresource.dqp.DQPFederation;
+
+public class MetadataServiceDQPFederation implements DQPFederation
+{
+
+    private Set<EvaluationNode> mEvaluationNodes = new HashSet<EvaluationNode>();
+    private Map<String, DataNode> mDataNodes = new HashMap<String, DataNode>();
+    private EvaluationNode mLocalNode;
+    private FunctionRepository mFunctionRepository;
+    private MetadataServiceFactory mMetadataServiceFactory;
+
+    @Override
+    public Set<EvaluationNode> getEvaluationNodes()
+    {
+        return mEvaluationNodes;
+    }
+
+    @Override
+    public Set<DataNode> getDataNodes() 
+    {
+        return new HashSet<DataNode>(mDataNodes.values());
+    }
+
+    @Override
+    public EvaluationNode getLocalNode()
+    {
+        return mLocalNode;
+    }
+
+    @Override
+    public DataDictionary getDataDictionary(RequestDetails requestDetails) 
+    {
+        MetadataServiceDataDictionary dataDictionary = 
+                new MetadataServiceDataDictionary();
+        dataDictionary.setFederation(this);
+        dataDictionary.setRequestDetails(requestDetails);
+        dataDictionary.setTableMappingService(
+                mMetadataServiceFactory.getTableMappingService(requestDetails));
+        dataDictionary.setAttributeService(
+                mMetadataServiceFactory.getAttributeService(requestDetails));
+        dataDictionary.setStatisticsService(
+                mMetadataServiceFactory.getStatisticsService(requestDetails));
+        return dataDictionary;
+    }
+
+    @Override
+    public void refreshDataDictionary(RequestDetails requestDetails) 
+    {
+        // nothing to do - data dictionary is being looked up for each query
+    }
+    
+    protected FunctionRepository getFunctionRepository()
+    {
+        if (mFunctionRepository == null)
+        {
+            mFunctionRepository =   
+                    (FunctionRepository) OGSADAIContext.getInstance().get(
+                        FunctionRepository.FUNCTION_REPOSITORY_KEY);
+
+        }
+        return mFunctionRepository;
+    }
+    
+    protected Map<String, DataNode> getDataNodesMap()
+    {
+        return mDataNodes;
+    }
+    
+    public void setMetadataServiceFactory(MetadataServiceFactory factory)
+    {
+        mMetadataServiceFactory = factory;
+    }
+    
+    /**
+     * Sets the function repository for the federation. If this value is not set
+     * then the function repository is looked up from the OGSA-DAI context.
+     * 
+     * @param functionRepository
+     *            function repository
+     */
+    public void setFunctionRepository(FunctionRepository functionRepository)
+    {
+        mFunctionRepository = functionRepository;
+    }
+    
+    /**
+     * Specifies the data nodes in this federation. Data nodes are identified
+     * by names that the table mapping service uses.
+     * 
+     * @param dataNodes
+     *            data node mapping
+     */
+    public void setDataNodesMap(Map<String, DataNode> dataNodes)
+    {
+        mDataNodes.clear();
+        mDataNodes.putAll(dataNodes);
+    }
+    
+    /**
+     * Specifies the evaluation nodes in this federation.
+     * 
+     * @param evaluationNodes
+     *            evaluation nodes
+     */
+    public void setEvaluationNodes(Set<EvaluationNode> evaluationNodes)
+    {
+        mEvaluationNodes.clear();
+        mEvaluationNodes.addAll(evaluationNodes);
+        for (EvaluationNode node : mEvaluationNodes)
+        {
+            if (node.isLocal())
+            {
+                mLocalNode = node;
+            }
+        }
+        if (mLocalNode == null)
+        {
+            throw new DQPResourceConfigurationException(
+                    new IllegalArgumentException(
+                            "At least one local evaluation node is needed."));
+        }
+    }
+    
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDataDictionary.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDataDictionary.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceDataDictionary.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,178 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMapping;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.dqp.common.DataDictionary;
+import uk.org.ogsadai.dqp.common.DataNode;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+import uk.org.ogsadai.dqp.common.TableSchema;
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.Heading;
+import uk.org.ogsadai.dqp.lqp.HeadingImpl;
+import uk.org.ogsadai.dqp.lqp.exceptions.AttributeNotFoundException;
+import uk.org.ogsadai.dqp.lqp.exceptions.TableNotFoundException;
+import uk.org.ogsadai.dqp.lqp.udf.FunctionRepository;
+
+public class MetadataServiceDataDictionary implements DataDictionary
+{
+    /** The DQP federation. */
+    private MetadataServiceDQPFederation mFederation;
+    /** Request details of the client. Not used at the moment. */
+    private RequestDetails mRequestDetails;
+    private TableMappingService mTableMappingService;
+    private AttributeService mAttributeService;
+    private StatisticsService mStatisticsService;
+
+    @Override
+    public Heading getHeading(String tableName) throws TableNotFoundException 
+    {
+        return new HeadingImpl(getAttributes(tableName));
+    }
+
+    @Override
+    public TableSchema getTableSchema(String tableName)
+            throws TableNotFoundException 
+    {
+        TableMapping tableMapping = 
+                mTableMappingService.getTableMapping(tableName);
+        if (tableMapping == null)
+        {
+            throw new TableNotFoundException(tableName);
+        }
+        MetadataServiceTableSchema tableSchema = 
+                new MetadataServiceTableSchema(
+                        tableName, 
+                        tableMapping.tableName(), 
+                        mFederation.getDataNodesMap().get(
+                                tableMapping.resourceIdent()));
+        tableSchema.setDataDictionary(this);
+        return tableSchema;
+//        List<Attribute> attributes = getAttributes(tableName);
+//        CardinalityStatistics cardStats = 
+//            new MetadataServiceCardinalityStatistics(
+//                    attributes, mStatisticsService);
+//        SimpleStatisticsPhysicalSchema physicalSchema = 
+//            new SimpleStatisticsPhysicalSchema(tableName, 0);
+//        physicalSchema.setCardinalityStatistics(cardStats);
+//        return new SimpleTableSchema(
+//                    tableMapping.tableName(), 
+//                    mDataNodes.get(tableMapping.resourceIdent()), 
+//                    new SimpleLogicalSchema(tableName, attributes),
+//                    physicalSchema);
+    }
+
+    public List<Attribute> getAttributes(String tableName) 
+    {
+        List<Attribute> attributes = new LinkedList<Attribute>();
+        Iterable<Attribute> iter = mAttributeService.getAttributes(tableName);
+        for (Attribute attribute : iter)
+        {
+            attributes.add(attribute);
+        }
+        return attributes;
+    }
+
+    @Override
+    public String getOriginalTableName(String table, DataNode dataNode)
+            throws TableNotFoundException 
+    {
+        TableMapping mapping = mTableMappingService.getTableMapping(table);
+        if (mapping == null)
+        {
+            throw new TableNotFoundException(table);
+        }
+        return mapping.tableName();
+    }
+
+    @Override
+    public Attribute getAttribute(Attribute attribute)
+        throws AttributeNotFoundException 
+    {
+        Attribute result = mAttributeService.getAttribute(
+                attribute.getSource(), attribute.getName());
+        if (result == null)
+        {
+            throw new AttributeNotFoundException(attribute);
+        }
+        return result;
+    }
+
+    @Override
+    public Set<TableSchema> getTableSchemas() 
+    {
+        // cannot retrieve the names of all available tables?
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FunctionRepository getFunctionRepository() 
+    {
+        return mFederation.getFunctionRepository();
+    }
+    
+    /**
+     * Returns the statistics service.
+     * 
+     * @return statistics service
+     */
+    public StatisticsService getStatisticsService() 
+    {
+        return mStatisticsService;
+    }
+
+    public void setRequestDetails(RequestDetails requestDetails)
+    {
+        mRequestDetails = requestDetails;
+    }
+
+
+    public void setFederation(MetadataServiceDQPFederation federation)
+    {
+        mFederation = federation;
+    }
+    
+    /**
+     * Sets the table mapping service which maps a table name to its data node
+     * identifier and a local table name.
+     * 
+     * @param service
+     *            table mapping service
+     */
+    public void setTableMappingService(TableMappingService service)
+    {
+        mTableMappingService = service;
+    }
+    
+    /**
+     * Set the attribute service that provides attribute metadata to the data
+     * dictionary.
+     * 
+     * @param service
+     *            attribute service
+     */
+    public void setAttributeService(AttributeService service)
+    {
+        mAttributeService = service;
+    }
+    
+    /**
+     * Set the attribute statistics service that provides attribute statistics
+     * to the data dictionary.
+     * 
+     * @param service
+     *            statistics service
+     */
+    public void setStatisticsService(StatisticsService service)
+    {
+        mStatisticsService = service;
+    }
+    
+
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceFactory.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceFactory.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceFactory.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,42 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+
+/**
+ * A factory class that creates metadata services for a particular request.
+ * 
+ * @author The OGSA-DAI Project Team.
+ */
+public interface MetadataServiceFactory 
+{
+    /**
+     * Returns an attribute service.
+     * 
+     * @param details
+     *            request details
+     * @return attribute service for the request
+     */
+    AttributeService getAttributeService(RequestDetails details);
+    
+    /**
+     * Returns a table mapping service.
+     * 
+     * @param details
+     *            request details
+     * @return table mapping service for the request
+     */
+    TableMappingService getTableMappingService(RequestDetails details);
+    
+    /**
+     * Returns a statistics service.
+     * 
+     * @param details
+     *            request details
+     * @return statistics service for the request
+     */
+    StatisticsService getStatisticsService(RequestDetails details);
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceTableSchema.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceTableSchema.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/MetadataServiceTableSchema.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,114 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import uk.org.ogsadai.dqp.common.DataNode;
+import uk.org.ogsadai.dqp.common.DataNodeTable;
+import uk.org.ogsadai.dqp.common.LogicalSchema;
+import uk.org.ogsadai.dqp.common.PhysicalSchema;
+import uk.org.ogsadai.dqp.common.TableSchema;
+import uk.org.ogsadai.dqp.common.simple.SimpleDataNodeTable;
+import uk.org.ogsadai.dqp.common.simple.SimpleLogicalSchema;
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.cardinality.CardinalityStatistics;
+import uk.org.ogsadai.dqp.lqp.cardinality.SimpleStatisticsPhysicalSchema;
+
+/**
+ * A table schema that retrieves logical and physical table metadata on demand.
+ * As it is assumed that the table schema is requested once per query the
+ * physical and logical schema are cached for the lifetime of this object (ie
+ * the duration of the query) to avoid querying the metadata service every time,
+ * for example, when an optimiser requests cardinality estimation, or a table
+ * appears twice in a query.
+ * 
+ * @author The OGSA-DAI Project Team.
+ */
+public class MetadataServiceTableSchema implements TableSchema 
+{
+    /** Name of the table in the federation. */
+    private String mTableName;
+    /** List of data node tables that can access the table. */
+    private List<DataNodeTable> mDataNodeTables;
+    /** The data dictionary which provides access to the metadata services. */
+    private MetadataServiceDataDictionary mDataDictionary;
+    
+    /**
+     * Cached copies of the logical and physical schema. If <code>null</code>
+     * the schemas have not been retrieved from the metadata services yet.
+     */
+    private LogicalSchema mLogicalSchema;
+    private PhysicalSchema mPhysicalSchema;
+
+    public MetadataServiceTableSchema(
+            String tableName, 
+            String localName, 
+            DataNode dataNode) 
+    {
+        mTableName = tableName;
+        mDataNodeTables = Arrays.<DataNodeTable>asList(
+                new SimpleDataNodeTable(dataNode, localName));
+    }
+    
+    public void setDataDictionary(MetadataServiceDataDictionary dataDictionary)
+    {
+        mDataDictionary = dataDictionary;
+    }
+    
+    @Override
+    public List<DataNodeTable> getDataNodeTables() 
+    {
+        return Collections.unmodifiableList(mDataNodeTables);
+    }
+
+    @Override
+    public DataNodeTable getDataNodeTable(DataNode dataNode)
+    {
+        for (DataNodeTable dnTable : mDataNodeTables)
+        {
+            if (dnTable.getDataNode().equals(dataNode))
+            {
+                return dnTable;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getTableName() 
+    {
+        return mTableName;
+    }
+
+    @Override
+    public synchronized LogicalSchema getSchema() 
+    {
+        if (mLogicalSchema == null)
+        {
+            List<Attribute> attributes = 
+                    mDataDictionary.getAttributes(mTableName);
+            mLogicalSchema = new SimpleLogicalSchema(mTableName, attributes);
+        }
+        return mLogicalSchema;
+    }
+
+    @Override
+    public synchronized PhysicalSchema getPhysicalSchema() 
+    {
+        if (mPhysicalSchema == null)
+        {
+            List<Attribute> attributes = 
+                    mDataDictionary.getAttributes(mTableName);
+            CardinalityStatistics cardStats = 
+                new MetadataServiceCardinalityStatistics(
+                        attributes, mDataDictionary.getStatisticsService());
+            SimpleStatisticsPhysicalSchema physicalSchema = 
+                new SimpleStatisticsPhysicalSchema(mTableName, 0);
+            physicalSchema.setCardinalityStatistics(cardStats);
+            mPhysicalSchema = physicalSchema;
+        }
+        return mPhysicalSchema;
+    }    
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/ServiceException.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/ServiceException.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/ServiceException.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,12 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+
+public class ServiceException extends RuntimeException 
+{
+
+    public ServiceException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+    
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/SimpleTableMapping.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/SimpleTableMapping.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/SimpleTableMapping.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,44 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMapping;
+
+public class SimpleTableMapping implements TableMapping 
+{
+    
+    private String mAlias;
+    private String mLocalName;
+    private String mResource;
+
+    public SimpleTableMapping(
+            String alias, String localName, String resourceIdentifier)
+    {
+        mAlias = alias;
+        mLocalName = localName;
+        mResource = resourceIdentifier;
+    }
+
+    @Override
+    public String tableAlias() 
+    {
+        return mAlias;
+    }
+
+    @Override
+    public String tableName() 
+    {
+        return mLocalName;
+    }
+
+    @Override
+    public String resourceIdent() 
+    {
+        return mResource;
+    }
+
+    @Override
+    public String toString() 
+    {
+        return "TableMapping(alias=" + mAlias + ", local name=" +
+                mLocalName + ", resource=" + mResource + ")";
+    }
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataService.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataService.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataService.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,79 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMapping;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.dqp.lqp.Attribute;
+import uk.org.ogsadai.dqp.lqp.cardinality.AttributeStatistics;
+
+public class TestMetadataService 
+implements AttributeService, StatisticsService, TableMappingService
+{
+
+    private Map<String, TableMapping> mTableMappings;
+    private Map<String, Map<String, Attribute>> mTables;
+    private Map<String, Map<String, AttributeStatistics>> mStatistics;
+
+    @Override
+    public AttributeStatistics getStatistics(Attribute attribute)
+    {
+        return getStatistics(attribute.getSource(), attribute.getName());
+    }
+
+    @Override
+    public AttributeStatistics getStatistics(String source, String name) 
+    {
+        return mStatistics.get(source).get(name);
+    }
+
+    @Override
+    public Iterable<Attribute> getAttributes(String source) 
+    {
+        return mTables.get(source).values();
+    }
+
+    @Override
+    public Attribute getAttribute(String source, String name) 
+    {
+        return mTables.get(source).get(name);
+    }
+
+    @Override
+    public TableMapping getTableMapping(String source) 
+    {
+        return mTableMappings.get(source);
+    }
+    
+    public void add(Attribute attribute)
+    {
+        Map<String, Attribute> table = mTables.get(attribute.getSource());
+        if (table == null)
+        {
+            table = new HashMap<String, Attribute>();
+            mTables.put(attribute.getSource(), table);
+        }
+        table.put(attribute.getName(), attribute);
+    }
+    
+    public void add(Attribute attribute, AttributeStatistics attrStats)
+    {
+        Map<String, AttributeStatistics> table = 
+                mStatistics.get(attribute.getSource());
+        if (table == null)
+        {
+            table = new HashMap<String, AttributeStatistics>();
+            mStatistics.put(attribute.getSource(), table);
+        }
+        table.put(attribute.getName(), attrStats);
+    }
+    
+    public void add(TableMapping mapping)
+    {
+        mTableMappings.put(mapping.tableName(), mapping);
+    }
+
+}

Added: ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataServiceFactory.java
===================================================================
--- ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataServiceFactory.java	                        (rev 0)
+++ ogsa-dai/trunk/extensions/astro/server/src/main/java/uk/org/ogsadai/dqp/firethorn/TestMetadataServiceFactory.java	2013-01-03 09:05:21 UTC (rev 2165)
@@ -0,0 +1,36 @@
+package uk.org.ogsadai.dqp.firethorn;
+
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.AttributeService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.StatisticsService;
+import uk.ac.roe.wfau.firethorn.ogsadai.metadata.TableMappingService;
+import uk.org.ogsadai.dqp.common.RequestDetails;
+
+public class TestMetadataServiceFactory implements MetadataServiceFactory
+{
+    
+    private TestMetadataService mTestMetadataService;
+
+    public TestMetadataServiceFactory() 
+    {
+        mTestMetadataService = new TestMetadataService();
+    }
+
+    @Override
+    public AttributeService getAttributeService(RequestDetails details)
+    {
+        return mTestMetadataService;
+    }
+
+    @Override
+    public TableMappingService getTableMappingService(RequestDetails details) 
+    {
+        return mTestMetadataService;
+    }
+
+    @Override
+    public StatisticsService getStatisticsService(RequestDetails details) 
+    {
+        return mTestMetadataService;
+    }
+
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (27)	Oct (132)	Nov (94)	Dec (135)
2010	Jan (79)	Feb (137)	Mar (255)	Apr (132)	May (61)	Jun (203)	Jul (60)	Aug (161)	Sep (16)	Oct (21)	Nov (48)	Dec (37)
2011	Jan (17)	Feb (14)	Mar (21)	Apr (12)	May (5)	Jun (31)	Jul (16)	Aug (44)	Sep (23)	Oct (15)	Nov (74)	Dec (37)
2012	Jan (22)	Feb (20)	Mar (28)	Apr (15)	May (12)	Jun (6)	Jul (9)	Aug (29)	Sep (3)	Oct (14)	Nov (38)	Dec
2013	Jan (6)	Feb (3)	Mar (6)	Apr (2)	May	Jun	Jul (5)	Aug (3)	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

ogsa-dai-svn-commits Mailing List for OGSA-DAI (Page 2)

ogsa-dai-svn-commits — SVN commit messages. Subscribers should not post to this list.