remove olap use olap common from olap repository

Signed-off-by: dbulahov <[email protected]>

Author: dbulahov

demo/server/play/xmla.demo.server.jdkhttp.bndrun

@@ -84,6 +84,7 @@
 	org.eclipse.daanse.mdx.parser.ccc;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.action.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.api;version='[0.0.1,0.0.2)',\
+	org.eclipse.daanse.olap.common;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.documentation.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.documentation.common;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\

demo/server/play/xmla.demo.server.jetty.bndrun

@@ -89,6 +89,7 @@
 	org.eclipse.daanse.mdx.parser.ccc;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.action.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.api;version='[0.0.1,0.0.2)',\
+	org.eclipse.daanse.olap.common;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.documentation.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.documentation.common;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\

mondrian/pom.xml

@@ -399,6 +399,11 @@
 			<artifactId>org.eclipse.daanse.olap.api</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.daanse</groupId>
+			<artifactId>org.eclipse.daanse.olap.common</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>		
 	</dependencies>
 	<build>
 

mondrian/src/main/java/mondrian/rolap/CacheControlImpl.java

@@ -77,10 +77,10 @@
 
 import mondrian.rolap.agg.SegmentCacheManager;
 import mondrian.rolap.sql.MemberChildrenConstraint;
-import mondrian.server.ExecutionImpl;
-import mondrian.server.LocusImpl;
+import  org.eclipse.daanse.olap.server.ExecutionImpl;
+import  org.eclipse.daanse.olap.server.LocusImpl;
 import mondrian.spi.SegmentColumn;
-import mondrian.util.ArraySortedSet;
+import org.eclipse.daanse.olap.util.ArraySortedSet;
 
 /**
  * Implementation of {@link CacheControl} API.
@@ -595,7 +595,7 @@ public void printCacheState(
         for (RolapStar star : starList) {
             star.print(pw, "", false);
         }
-        
+
 		AbstractBasicContext abc = (AbstractBasicContext) connection.getContext();
         final ISegmentCacheManager manager =
                 abc.getAggregationManager().getCacheMgr(this.connection);

mondrian/src/main/java/mondrian/rolap/CompoundPredicateInfo.java

@@ -47,7 +47,7 @@
 import mondrian.rolap.agg.OrPredicate;
 import mondrian.rolap.agg.ValueColumnPredicate;
 import mondrian.rolap.sql.SqlQuery;
-import mondrian.util.Pair;
+import  org.eclipse.daanse.olap.util.Pair;
 
 /**
  * Constructs a Pair<BitKey, StarPredicate> based on an tuple list and measure, along with the string representation of

mondrian/src/main/java/mondrian/rolap/FastBatchingCellReader.java

@@ -43,15 +43,15 @@
 import java.util.concurrent.Future;
 
 import org.eclipse.daanse.jdbc.db.dialect.api.Dialect;
+import org.eclipse.daanse.olap.api.CacheCommand;
 import org.eclipse.daanse.olap.api.ConfigConstants;
-import org.eclipse.daanse.olap.api.DataTypeJdbc;
 import org.eclipse.daanse.olap.api.Execution;
 import org.eclipse.daanse.olap.api.IAggregationManager;
 import org.eclipse.daanse.olap.api.ISegmentCacheManager;
 import org.eclipse.daanse.olap.api.Locus;
 import org.eclipse.daanse.olap.api.exception.CellRequestQuantumExceededException;
 import org.eclipse.daanse.olap.common.Util;
-import org.eclipse.daanse.rolap.mapping.api.model.SqlStatementMapping;
+import  org.eclipse.daanse.olap.server.LocusImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,17 +63,17 @@
 import mondrian.rolap.agg.Segment;
 import mondrian.rolap.agg.SegmentBuilder;
 import mondrian.rolap.agg.SegmentCacheManager;
+import mondrian.rolap.agg.SegmentCacheManager.SegmentCacheIndexRegistry;
 import mondrian.rolap.agg.SegmentLoader;
 import mondrian.rolap.agg.SegmentWithData;
 import mondrian.rolap.agg.ValueColumnPredicate;
 import mondrian.rolap.aggmatcher.AggGen;
 import mondrian.rolap.aggmatcher.AggStar;
 import mondrian.rolap.cache.SegmentCacheIndex;
 import mondrian.rolap.cache.SegmentCacheIndexImpl;
-import mondrian.server.LocusImpl;
 import mondrian.spi.SegmentBody;
 import mondrian.spi.SegmentHeader;
-import mondrian.util.Pair;
+import  org.eclipse.daanse.olap.util.Pair;
 
 /**
  * A <code>FastBatchingCellReader</code> doesn't really Read cells: when asked
@@ -391,11 +391,11 @@ public boolean loadAggregations() {
                 if (!cacheMgr.getContext().getConfigValue(ConfigConstants.DISABLE_CACHING, ConfigConstants.DISABLE_CACHING_DEFAULT_VALUE, Boolean.class)) {
                     final Locus locus = LocusImpl.peek();
                     cacheMgr.execute(
-                        new SegmentCacheManager.Command<Void>() {
+                        new CacheCommand<Void>() {
                             @Override
 							public Void call() throws Exception {
                                 SegmentCacheIndex index =
-                                    cacheMgr.getIndexRegistry()
+                                        ((SegmentCacheIndexRegistry)cacheMgr.getIndexRegistry())
                                     .getIndex(segmentWithData.getStar());
                                 index.add(
                                     segmentWithData.getHeader(),
@@ -706,7 +706,7 @@ private boolean loadFromCaches(
         final RolapStar star = measure.getStar();
         final RolapCatalog catalog = star.getCatalog();
         final SegmentCacheIndex index =
-            cacheMgr.getIndexRegistry().getIndex(star);
+            ((SegmentCacheIndexRegistry)cacheMgr.getIndexRegistry()).getIndex(star);
         final List<SegmentHeader> headersInCache =
             index.locate(
                 catalog.getName(),
@@ -1047,8 +1047,7 @@ static void addToCompositeBatch(
      * Command that loads the segments required for a collection of cell
      * requests. Returns the collection of segments.
      */
-    public static class LoadBatchCommand
-        extends SegmentCacheManager.Command<LoadBatchResponse>
+    public static class LoadBatchCommand implements CacheCommand<LoadBatchResponse>
     {
         private final Locus locus;
         private final SegmentCacheManager cacheMgr;

mondrian/src/main/java/mondrian/rolap/MemberCacheHelper.java

@@ -41,7 +41,7 @@
 import mondrian.rolap.cache.SoftSmartCache;
 import mondrian.rolap.sql.MemberChildrenConstraint;
 import mondrian.rolap.sql.TupleConstraint;
-import mondrian.util.Pair;
+import  org.eclipse.daanse.olap.util.Pair;
 
 /**
  * Encapsulation of member caching.

mondrian/src/main/java/mondrian/rolap/RolapCell.java

@@ -84,8 +84,8 @@
 import mondrian.rolap.agg.DrillThroughCellRequest;
 import mondrian.rolap.agg.MemberColumnPredicate;
 import mondrian.rolap.agg.OrPredicate;
-import mondrian.server.ExecutionImpl;
-import mondrian.server.LocusImpl;
+import  org.eclipse.daanse.olap.server.ExecutionImpl;
+import  org.eclipse.daanse.olap.server.LocusImpl;
 
 /**
  * <code>RolapCell</code> implements {@link org.eclipse.daanse.olap.api.result.Cell} within a

mondrian/src/main/java/mondrian/rolap/RolapConnection.java

@@ -86,8 +86,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import mondrian.server.ExecutionImpl;
-import mondrian.server.LocusImpl;
+import  org.eclipse.daanse.olap.server.ExecutionImpl;
+import  org.eclipse.daanse.olap.server.LocusImpl;
 import mondrian.util.FauxMemoryMonitor;
 import mondrian.util.MemoryMonitor;
 import mondrian.util.NotificationMemoryMonitor;

mondrian/src/main/java/mondrian/rolap/RolapCube.java

@@ -138,7 +138,7 @@
 import mondrian.rolap.cache.SoftSmartCache;
 import mondrian.rolap.util.DimensionUtil;
 import mondrian.rolap.util.PojoUtil;
-import mondrian.server.LocusImpl;
+import  org.eclipse.daanse.olap.server.LocusImpl;
 
 /**
  * <code>RolapCube</code> implements {@link Cube} for a ROLAP database.