MONDRIAN-LAGUNITAS: Integrate from main @15015.

[git-p4: depot-paths = "//open/mondrian-release/lagunitas/": change = 15017]

bin/checkFile.awk

@@ -248,7 +248,9 @@ FNR == 1 {
     prevImport = thisImport;
     prevImportGroup = importGroup;
 }
-/^\/\/ Copyright .* Julian/ && strict > 1 {
+/^\/\/ Copyright .* Pentaho/ && strict > 1 {
+    # We assume that '--strict' is only invoked on files currently being
+    # edited. Therefore we would expect the copyright to be current.
     if ($0 !~ /-2012/) {
         error(fname, FNR, "copyright is not current");
     }
@@ -257,22 +259,22 @@ FNR == 1 {
     # Order of qualifiers: "public/private/protected static final abstract class ..."
     s2 = s;
     gsub(/\(.*$/, "", s2);
-    if (s2 ~ /abstract .*final/) {
+    if (s2 ~ /abstract .*final /) {
         error(fname, FNR, "'final' must come before 'abstract'");
     }
-    if (s2 ~ /final .*static/) {
+    if (s2 ~ /final .*static /) {
         error(fname, FNR, "'static' must come before 'final'");
     }
-    if (s2 ~ /abstract .*static/) {
+    if (s2 ~ /abstract .*static /) {
         error(fname, FNR, "'static' must come before 'abstract'");
     }
-    if (s2 ~ /static .*(public|protected|private)/) {
+    if (s2 ~ /static .*(public|protected|private) /) {
         error(fname, FNR, "'public/private/protected' must come before 'static'");
     }
-    if (s2 ~ /final .*(public|protected|private)/) {
+    if (s2 ~ /final .*(public|protected|private) /) {
         error(fname, FNR, "'public/private/protected' must come before 'final'");
     }
-    if (s2 ~ /abstract .*(public|protected|private)/) {
+    if (s2 ~ /abstract .*(public|protected|private) /) {
         error(fname, FNR, "'public/private/protected' must come before 'abstract'");
     }
 }

src/main/mondrian/olap/CellProperty.java

@@ -5,11 +5,13 @@
 // You must accept the terms of that agreement to use this software.
 //
 // Copyright (C) 1998-2005 Julian Hyde
-// Copyright (C) 2005-2009 Pentaho and others
+// Copyright (C) 2005-2012 Pentaho and others
 // All Rights Reserved.
 */
 package mondrian.olap;
 
+import java.util.List;
+
 /**
  * Represents Cell Property.
  *
@@ -20,8 +22,8 @@
 public class CellProperty extends QueryPart {
     private String name;
 
-    public CellProperty(Object name) {
-        this.name = name.toString();
+    public CellProperty(List<Id.Segment> segments) {
+        this.name = Util.implode(segments);
     }
 
     /**

src/main/mondrian/olap/Cube.java

@@ -16,7 +16,7 @@
 /**
  * Cube.
  *
- * @author jhyde
+ * @author jhyde, 2 March, 1999
  */
 public interface Cube extends OlapElement, Annotated {
 
@@ -47,7 +47,7 @@ public interface Cube extends OlapElement, Annotated {
      * Finds a hierarchy whose name (or unique name, if <code>unique</code> is
      * true) equals <code>s</code>.
      */
-    Hierarchy lookupHierarchy(Id.Segment s, boolean unique);
+    Hierarchy lookupHierarchy(Id.NameSegment s, boolean unique);
 
     /**
      * Returns Member[]. It builds Member[] by analyzing cellset, which

src/main/mondrian/olap/CubeAccess.java

@@ -5,7 +5,7 @@
 // You must accept the terms of that agreement to use this software.
 //
 // Copyright (C) 1999-2005 Julian Hyde
-// Copyright (C) 2005-2011 Pentaho and others
+// Copyright (C) 2005-2012 Pentaho and others
 // All Rights Reserved.
 */
 package mondrian.olap;
@@ -119,7 +119,7 @@ public void addGrantCubeSlicer(
             boolean fail = false;
             Hierarchy hierarchy =
                 mdxCube.lookupHierarchy(
-                    new Id.Segment(sHierarchy, Id.Quoting.UNQUOTED),
+                    new Id.NameSegment(sHierarchy),
                     fail);
             if (hierarchy == null) {
                 throw MondrianResource.instance().MdxCubeSlicerHierarchyError

src/main/mondrian/olap/CubeBase.java

@@ -100,12 +100,12 @@ public String getDescription() {
         return description;
     }
 
-    public Hierarchy lookupHierarchy(Id.Segment s, boolean unique) {
+    public Hierarchy lookupHierarchy(Id.NameSegment s, boolean unique) {
         for (Dimension dimension : getDimensionList()) {
             for (Hierarchy hierarchy : dimension.getHierarchyList()) {
                 String name = unique
                     ? hierarchy.getUniqueName() : hierarchy.getName();
-                if (name.equals(s.name)) {
+                if (name.equals(s.getName())) {
                     return hierarchy;
                 }
             }
@@ -127,18 +127,20 @@ public OlapElement lookupChild(
 
         // Look for hierarchies named '[dimension.hierarchy]'.
         if (MondrianProperties.instance().SsasCompatibleNaming.get()
-            && s.name.contains("."))
+            && s instanceof Id.NameSegment
+            && ((Id.NameSegment) s).name.contains("."))
         {
             for (Dimension dimension : dimensions) {
-                if (!s.name.startsWith(dimension.getName())) {
+                if (!((Id.NameSegment) s).name.startsWith(dimension.getName()))
+                {
                     // Rough check to save time.
                     continue;
                 }
                 for (Hierarchy hierarchy
                     : schemaReader.getDimensionHierarchies(dimension))
                 {
                     if (Util.equalName(
-                            s.name,
+                            ((Id.NameSegment) s).name,
                             dimension.getName()
                             + "."
                             + hierarchy.getName()))
@@ -176,8 +178,12 @@ public OlapElement lookupChild(
      * @return Dimension, or null if not found
      */
     public Dimension lookupDimension(Id.Segment s) {
+        if (!(s instanceof Id.NameSegment)) {
+            return null;
+        }
+        final Id.NameSegment nameSegment = (Id.NameSegment) s;
         for (Dimension dimension : getDimensionList()) {
-            if (Util.equalName(dimension.getName(), s.name)) {
+            if (Util.equalName(dimension.getName(), nameSegment.name)) {
                 return dimension;
             }
         }

src/main/mondrian/olap/DimensionBase.java

@@ -99,7 +99,10 @@ public boolean isMeasures() {
     public OlapElement lookupChild(
         SchemaReader schemaReader, Id.Segment s, MatchType matchType)
     {
-        OlapElement oe = lookupHierarchy(s);
+        OlapElement oe = null;
+        if (s instanceof Id.NameSegment) {
+            oe = lookupHierarchy((Id.NameSegment) s);
+        }
 
         // Original mondrian behavior:
         // If the user is looking for [Marital Status].[Marital Status] we
@@ -138,9 +141,9 @@ public boolean isHighCardinality() {
         return false;
     }
 
-    private Hierarchy lookupHierarchy(Id.Segment s) {
+    private Hierarchy lookupHierarchy(Id.NameSegment s) {
         for (Hierarchy hierarchy : hierarchyList) {
-            if (Util.equalName(hierarchy.getName(), s.name)) {
+            if (Util.equalName(hierarchy.getName(), s.getName())) {
                 return hierarchy;
             }
         }

src/main/mondrian/olap/Formula.java

@@ -177,7 +177,12 @@ void createElement(Query q) {
             OlapElement mdxElement = q.getCube();
             final SchemaReader schemaReader = q.getSchemaReader(false);
             for (int i = 0; i < segments.size(); i++) {
-                final Id.Segment segment = segments.get(i);
+                final Id.Segment segment0 = segments.get(i);
+                if (!(segment0 instanceof Id.NameSegment)) {
+                    throw Util.newError(
+                        "Calculated member name must not contain member keys");
+                }
+                final Id.NameSegment segment = (Id.NameSegment) segment0;
                 OlapElement parent = mdxElement;
                 mdxElement = null;
                 // The last segment of the id is the name of the calculated
@@ -202,7 +207,7 @@ void createElement(Query q) {
                         if (level == null) {
                             throw Util.newError(
                                 "The '"
-                                + segment.name
+                                + segment
                                 + "' calculated member cannot be created "
                                 + "because its parent is at the lowest level "
                                 + "in the "
@@ -241,7 +246,7 @@ void createElement(Query q) {
                     }
                     Member mdxMember =
                         level.getHierarchy().createMember(
-                            parentMember, level, segment.name, this);
+                            parentMember, level, segment.getName(), this);
                     assert mdxMember != null;
                     mdxElement = mdxMember;
                 }
@@ -252,12 +257,17 @@ void createElement(Query q) {
             Util.assertTrue(
                 segments.size() == 1,
                 "set names must not be compound");
+            final Id.Segment segment0 = segments.get(0);
+            if (!(segment0 instanceof Id.NameSegment)) {
+                throw Util.newError(
+                    "Calculated member name must not contain member keys");
+            }
             // Caption and description are initialized to null, and annotations
             // to the empty map. If named set is defined in the schema, we will
             // give these their true values later.
             mdxSet =
                 new SetBase(
-                    segments.get(0).name,
+                    ((Id.NameSegment) segment0).getName(),
                     null,
                     null,
                     exp,
@@ -341,11 +351,12 @@ void rename(String newName)
     {
         String oldName = getElement().getName();
         final List<Id.Segment> segments = this.id.getSegments();
-        Util.assertTrue(
-            segments.get(segments.size() - 1).name.equalsIgnoreCase(oldName));
+        assert Util.last(segments) instanceof Id.NameSegment;
+        assert ((Id.NameSegment) Util.last(segments)).name
+            .equalsIgnoreCase(oldName);
         segments.set(
             segments.size() - 1,
-            new Id.Segment(newName, Id.Quoting.QUOTED));
+            new Id.NameSegment(newName));
         if (isMember) {
             mdxMember.setName(newName);
         } else {

src/main/mondrian/olap/HierarchyBase.java

@@ -5,7 +5,7 @@
 // You must accept the terms of that agreement to use this software.
 //
 // Copyright (C) 2001-2005 Julian Hyde
-// Copyright (C) 2005-2011 Pentaho and others
+// Copyright (C) 2005-2012 Pentaho and others
 // All Rights Reserved.
 */
 package mondrian.olap;
@@ -165,11 +165,22 @@ public OlapElement lookupChild(
         Id.Segment s,
         MatchType matchType)
     {
-        OlapElement oe = Util.lookupHierarchyLevel(this, s.name);
-        if (oe == null) {
-            oe = Util.lookupHierarchyRootMember(
-                schemaReader, this, s, matchType);
+        OlapElement oe;
+        if (s instanceof Id.NameSegment) {
+            Id.NameSegment nameSegment = (Id.NameSegment) s;
+            oe = Util.lookupHierarchyLevel(this, nameSegment.getName());
+            if (oe == null) {
+                oe = Util.lookupHierarchyRootMember(
+                    schemaReader, this, nameSegment, matchType);
+            }
+        } else {
+            // Key segment searches bottom level by default. For example,
+            // [Products].&[1] is shorthand for [Products].[Product Name].&[1].
+            final Id.KeySegment keySegment = (Id.KeySegment) s;
+            oe = Util.last(levelList)
+                .lookupChild(schemaReader, keySegment, matchType);
         }
+
         if (getLogger().isDebugEnabled()) {
             StringBuilder buf = new StringBuilder(64);
             buf.append("HierarchyBase.lookupChild: ");