refactored abstract expression base classes

sql/src/main/java/io/crate/metadata/ReferenceImplementation.java

@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.  You may
  * obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -21,7 +21,9 @@
 
 package io.crate.metadata;
 
-public interface ReferenceImplementation {
+import io.crate.operation.Input;
+
+public interface ReferenceImplementation<T> extends Input<T> {
 
     /**
      * Returns an implementation for a child.

sql/src/main/java/io/crate/metadata/RowContextCollectorExpression.java

@@ -23,7 +23,7 @@
 
 import io.crate.operation.Input;
 
-public abstract class RowContextCollectorExpression<R, T> implements ReferenceImplementation, Input<T> {
+public abstract class RowContextCollectorExpression<R, T> implements ReferenceImplementation<T> {
 
     protected final ReferenceInfo info;
     protected R row;

sql/src/main/java/io/crate/metadata/sys/SysExpression.java → sql/src/main/java/io/crate/metadata/SimpleObjectExpression.java

@@ -19,16 +19,16 @@
  * software solely pursuant to the terms of the relevant commercial agreement.
  */
 
-package io.crate.metadata.sys;
+package io.crate.metadata;
 
 import io.crate.metadata.ReferenceImplementation;
 import io.crate.operation.Input;
 
 /**
- * Base class for system expressions. Implementations of system expressions should inherit from it.
+ * Base class for expressions. Implementations of expressions should inherit from it.
  * @param <T> The returnType of the expression
  */
-public abstract class SysExpression<T> implements ReferenceImplementation, Input<T> {
+public abstract class SimpleObjectExpression<T> implements ReferenceImplementation<T> {
 
     @Override
     public ReferenceImplementation getChildImplementation(String name) {

sql/src/main/java/io/crate/metadata/information/RowCollectExpression.java

@@ -29,7 +29,7 @@
  * Base class for information_schema expressions.
  * @param <T> The returnType of the expression
  */
-public abstract class RowCollectExpression<R, T> implements ReferenceImplementation, Input<T> {
+public abstract class RowCollectExpression<R, T> implements ReferenceImplementation<T> {
 
     protected final ReferenceInfo info;
     protected R row;

sql/src/main/java/io/crate/metadata/shard/ShardReferenceImplementation.java

@@ -23,5 +23,5 @@
 
 import io.crate.metadata.ReferenceImplementation;
 
-public interface ShardReferenceImplementation extends ReferenceImplementation {
+public interface ShardReferenceImplementation<T> extends ReferenceImplementation<T> {
 }

sql/src/main/java/io/crate/metadata/shard/blob/BlobShardReferenceImplementation.java

@@ -23,5 +23,5 @@
 
 import io.crate.metadata.ReferenceImplementation;
 
-public interface BlobShardReferenceImplementation extends ReferenceImplementation {
+public interface BlobShardReferenceImplementation<T> extends ReferenceImplementation<T> {
 }

sql/src/main/java/io/crate/metadata/shard/unassigned/UnassignedShardCollectorExpression.java

@@ -7,7 +7,7 @@
 import io.crate.metadata.sys.SysShardsTableInfo;
 import io.crate.operation.Input;
 
-public abstract class UnassignedShardCollectorExpression<T> implements ReferenceImplementation, Input<T> {
+public abstract class UnassignedShardCollectorExpression<T> implements ReferenceImplementation<T> {
 
     private final ReferenceInfo info;
     protected UnassignedShard row;

sql/src/main/java/io/crate/operation/reference/sys/SysObjectReference.java → sql/src/main/java/io/crate/operation/reference/NestedObjectExpression.java

@@ -19,30 +19,32 @@
  * software solely pursuant to the terms of the relevant commercial agreement.
  */
 
-package io.crate.operation.reference.sys;
+package io.crate.operation.reference;
 
 import io.crate.metadata.ReferenceImplementation;
-import io.crate.metadata.sys.SysExpression;
 import org.apache.lucene.util.BytesRef;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class SysObjectReference extends SysExpression<Map<String, Object>>
-        implements ReferenceImplementation {
+public abstract class NestedObjectExpression implements ReferenceImplementation<Map<String, Object>> {
 
-    protected final Map<String, SysExpression> childImplementations = new HashMap<>();
+    protected final Map<String, ReferenceImplementation> childImplementations = new HashMap<>();
+
+    public Map<String, ReferenceImplementation> getChildImplementations() {
+        return childImplementations;
+    }
 
     @Override
-    public SysExpression getChildImplementation(String name) {
+    public ReferenceImplementation getChildImplementation(String name) {
         return childImplementations.get(name);
     }
 
     @Override
     public Map<String,Object> value() {
         Map<String, Object> map = new HashMap<>();
-        for (Map.Entry<String, SysExpression> e : childImplementations.entrySet()) {
+        for (Map.Entry<String, ReferenceImplementation> e : childImplementations.entrySet()) {
             Object value = e.getValue().value();
 
             // convert nested columns of type e.getValue().value() to String here
@@ -54,4 +56,5 @@ public Map<String,Object> value() {
         }
         return Collections.unmodifiableMap(map);
     }
+
 }

sql/src/main/java/io/crate/operation/reference/partitioned/PartitionedColumnExpression.java

@@ -27,7 +27,7 @@
 import io.crate.operation.Input;
 import org.apache.lucene.util.BytesRef;
 
-public class PartitionedColumnExpression implements Input, ShardReferenceImplementation {
+public class PartitionedColumnExpression implements ShardReferenceImplementation {
 
     private final Object value;
 

sql/src/main/java/io/crate/operation/reference/sys/SysClusterObjectReference.java

@@ -22,10 +22,10 @@
 package io.crate.operation.reference.sys;
 
 import io.crate.metadata.ColumnIdent;
-import io.crate.metadata.ReferenceInfo;
 import io.crate.metadata.sys.SysClusterTableInfo;
+import io.crate.operation.reference.NestedObjectExpression;
 
-public abstract class SysClusterObjectReference extends SysObjectReference {
+public abstract class SysClusterObjectReference extends NestedObjectExpression {
 
     protected SysClusterObjectReference(String name) {
         this(new ColumnIdent(name));

sql/src/main/java/io/crate/operation/reference/sys/SysNodeObjectReference.java

@@ -1,8 +1,9 @@
 package io.crate.operation.reference.sys;
 
+import io.crate.operation.reference.NestedObjectExpression;
 import io.crate.operation.reference.sys.node.SysNodeExpression;
 
-public abstract class SysNodeObjectReference extends SysObjectReference {
+public abstract class SysNodeObjectReference extends NestedObjectExpression {
 
     protected abstract class ChildExpression<T> extends SysNodeExpression<T> {
 

sql/src/main/java/io/crate/operation/reference/sys/SysObjectArrayReference.java

@@ -24,32 +24,33 @@
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import io.crate.metadata.ReferenceImplementation;
-import io.crate.metadata.sys.SysExpression;
+import io.crate.metadata.SimpleObjectExpression;
+import io.crate.operation.reference.NestedObjectExpression;
 import org.apache.lucene.util.BytesRef;
 
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
-public abstract class SysObjectArrayReference extends SysExpression<Object[]>
-        implements ReferenceImplementation {
+public abstract class SysObjectArrayReference extends SimpleObjectExpression<Object[]>
+        implements ReferenceImplementation<Object[]> {
 
-    protected abstract List<SysObjectReference> getChildImplementations();
+    protected abstract List<NestedObjectExpression> getChildImplementations();
 
     @Override
-    public SysExpression<Object[]> getChildImplementation(String name) {
-        List<SysObjectReference> childImplementations = getChildImplementations();
+    public ReferenceImplementation<Object[]> getChildImplementation(String name) {
+        List<NestedObjectExpression> childImplementations = getChildImplementations();
         assert childImplementations.size() > 0;
         final Object[] values = new Object[childImplementations.size()];
         int i = 0;
-        for (SysObjectReference sysObjectReference : childImplementations) {
-            SysExpression<?> child = sysObjectReference.getChildImplementation(name);
+        for (NestedObjectExpression sysObjectReference : childImplementations) {
+            ReferenceImplementation<?> child = sysObjectReference.getChildImplementation(name);
             if (child != null) {
                 Object value = child.value();
                 values[i++] = value;
             }
         }
-        return new SysExpression<Object[]>() {
+        return new SimpleObjectExpression<Object[]>() {
             @Override
             public Object[] value() {
                 return values;
@@ -62,14 +63,14 @@ public Object[] value() {
 
     @Override
     public Object[] value() {
-        List<SysObjectReference> childImplementations = getChildImplementations();
+        List<NestedObjectExpression> childImplementations = getChildImplementations();
         Object[] values = new Object[childImplementations.size()];
         int i = 0;
-        for (SysObjectReference expression : childImplementations) {
-            Map<String, Object> map = Maps.transformValues(expression.childImplementations, new Function<SysExpression, Object>() {
+        for (NestedObjectExpression expression : childImplementations) {
+            Map<String, Object> map = Maps.transformValues(expression.getChildImplementations(), new Function<ReferenceImplementation, Object>() {
                 @Nullable
                 @Override
-                public Object apply(@Nullable SysExpression input) {
+                public Object apply(@Nullable ReferenceImplementation input) {
                     Object value = input.value();
                     if (value != null && value instanceof BytesRef) {
                         return ((BytesRef) value).utf8ToString();

sql/src/main/java/io/crate/operation/reference/sys/SysStaticObjectArrayReference.java

@@ -21,15 +21,17 @@
 
 package io.crate.operation.reference.sys;
 
+import io.crate.operation.reference.NestedObjectExpression;
+
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class SysStaticObjectArrayReference extends SysObjectArrayReference {
 
-    protected final List<SysObjectReference> childImplementations = new ArrayList<>();
+    protected final List<NestedObjectExpression> childImplementations = new ArrayList<>();
 
     @Override
-    protected List<SysObjectReference> getChildImplementations() {
+    protected List<NestedObjectExpression> getChildImplementations() {
         return childImplementations;
     }
 

sql/src/main/java/io/crate/operation/reference/sys/cluster/SysClusterExpression.java

@@ -23,13 +23,10 @@
 
 import io.crate.metadata.ColumnIdent;
 import io.crate.metadata.ReferenceImplementation;
-import io.crate.metadata.ReferenceInfo;
 import io.crate.metadata.sys.SysClusterTableInfo;
-import io.crate.metadata.sys.SysExpression;
-import org.elasticsearch.common.Preconditions;
-
-public abstract class SysClusterExpression<T> extends SysExpression<T> implements ReferenceImplementation {
+import io.crate.metadata.SimpleObjectExpression;
 
+public abstract class SysClusterExpression<T> extends SimpleObjectExpression<T> {
 
     protected SysClusterExpression(String name) {
         this(new ColumnIdent(name));

sql/src/main/java/io/crate/operation/reference/sys/node/NodeSysExpression.java

@@ -21,8 +21,8 @@
 
 package io.crate.operation.reference.sys.node;
 
-import io.crate.metadata.sys.SysExpression;
-import io.crate.operation.reference.sys.SysObjectReference;
+import io.crate.metadata.ReferenceImplementation;
+import io.crate.operation.reference.NestedObjectExpression;
 import io.crate.operation.reference.sys.node.fs.NodeFsExpression;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.common.inject.Inject;
@@ -39,7 +39,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-public class NodeSysExpression extends SysObjectReference {
+public class NodeSysExpression extends NestedObjectExpression {
 
     private final NodeService nodeService;
     private final OsService osService;
@@ -85,7 +85,7 @@ public NodeSysExpression(ClusterService clusterService,
     }
 
     @Override
-    public SysExpression getChildImplementation(String name) {
+    public ReferenceImplementation getChildImplementation(String name) {
         if (EXPRESSIONS_WITH_OS_STATS.contains(name)) {
             OsStats osStats = osService.stats();
             if (NodeMemoryExpression.NAME.equals(name)) {
@@ -105,5 +105,4 @@ public SysExpression getChildImplementation(String name) {
         }
         return super.getChildImplementation(name);
     }
-
 }

sql/src/main/java/io/crate/operation/reference/sys/node/SysNodeExpression.java

@@ -22,8 +22,8 @@
 package io.crate.operation.reference.sys.node;
 
 import io.crate.metadata.ReferenceImplementation;
-import io.crate.metadata.sys.SysExpression;
+import io.crate.metadata.SimpleObjectExpression;
 
-public abstract class SysNodeExpression<T> extends SysExpression<T> implements ReferenceImplementation {
+public abstract class SysNodeExpression<T> extends SimpleObjectExpression<T> {
 
 }

sql/src/main/java/io/crate/operation/reference/sys/node/fs/NodeFsDataExpression.java

@@ -25,7 +25,7 @@
 import io.crate.metadata.ColumnIdent;
 import io.crate.operation.reference.sys.SysNodeObjectReference;
 import io.crate.operation.reference.sys.SysNodeStaticObjectArrayReference;
-import io.crate.operation.reference.sys.SysObjectReference;
+import io.crate.operation.reference.NestedObjectExpression;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -52,7 +52,7 @@ protected NodeFsDataExpression(SigarService sigarService, NodeEnvironment nodeEn
     }
 
     @Override
-    protected List<SysObjectReference> getChildImplementations() {
+    protected List<NestedObjectExpression> getChildImplementations() {
         if (childImplementations.isEmpty()) {
             addChildImplementations();
         }

sql/src/main/java/io/crate/operation/reference/sys/node/fs/NodeFsDisksExpression.java

@@ -25,7 +25,7 @@
 import io.crate.metadata.ColumnIdent;
 import io.crate.operation.reference.sys.SysNodeObjectArrayReference;
 import io.crate.operation.reference.sys.SysNodeObjectReference;
-import io.crate.operation.reference.sys.SysObjectReference;
+import io.crate.operation.reference.NestedObjectExpression;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -50,8 +50,8 @@ public class NodeFsDisksExpression extends SysNodeObjectArrayReference {
     }
 
     @Override
-    protected List<SysObjectReference> getChildImplementations() {
-        List<SysObjectReference> diskRefs;
+    protected List<NestedObjectExpression> getChildImplementations() {
+        List<NestedObjectExpression> diskRefs;
         if (sigarService.sigarAvailable()) {
             try {
                 FileSystem[] fileSystems = sigarService.sigar().getFileSystemList();

sql/src/main/java/io/crate/operation/reference/sys/shard/SysShardExpression.java

@@ -22,8 +22,8 @@
 package io.crate.operation.reference.sys.shard;
 
 import io.crate.metadata.shard.ShardReferenceImplementation;
-import io.crate.metadata.sys.SysExpression;
+import io.crate.metadata.SimpleObjectExpression;
 
-public abstract class SysShardExpression<T> extends SysExpression<T> implements ShardReferenceImplementation {
+public abstract class SysShardExpression<T> extends SimpleObjectExpression<T> {
 
 }

sql/src/main/java/io/crate/operation/reference/sys/shard/blob/BlobShardIdExpression.java

@@ -26,7 +26,7 @@
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.index.shard.ShardId;
 
-public class BlobShardIdExpression extends ShardIdExpression implements BlobShardReferenceImplementation {
+public class BlobShardIdExpression extends ShardIdExpression implements BlobShardReferenceImplementation<Integer> {
 
     @Inject
     public BlobShardIdExpression(ShardId shardId) {

sql/src/main/java/io/crate/operation/reference/sys/shard/blob/BlobShardNumDocsExpression.java

@@ -26,7 +26,7 @@
 import io.crate.operation.reference.sys.shard.SysShardExpression;
 import org.elasticsearch.common.inject.Inject;
 
-public class BlobShardNumDocsExpression extends SysShardExpression<Long> implements BlobShardReferenceImplementation {
+public class BlobShardNumDocsExpression extends SysShardExpression<Long> implements BlobShardReferenceImplementation<Long> {
     public static final String NAME = "num_docs";
 
     private final BlobShard blobShard;

sql/src/main/java/io/crate/operation/reference/sys/shard/blob/BlobShardPartitionIdentExpression.java

@@ -26,7 +26,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.inject.Inject;
 
-public class BlobShardPartitionIdentExpression extends SysShardExpression<BytesRef> implements BlobShardReferenceImplementation {
+public class BlobShardPartitionIdentExpression extends SysShardExpression<BytesRef> implements BlobShardReferenceImplementation<BytesRef> {
 
     public static final String NAME = "partition_ident";
     private static final BytesRef value = new BytesRef("");

sql/src/main/java/io/crate/operation/reference/sys/shard/blob/BlobShardPartitionOrphanedExpression.java

@@ -25,7 +25,7 @@
 import io.crate.operation.reference.sys.shard.SysShardExpression;
 import org.elasticsearch.common.inject.Inject;
 
-public class BlobShardPartitionOrphanedExpression extends SysShardExpression<Boolean> implements BlobShardReferenceImplementation {
+public class BlobShardPartitionOrphanedExpression extends SysShardExpression<Boolean> implements BlobShardReferenceImplementation<Boolean> {
 
     public static final String NAME = "orphan_partition";
 

sql/src/main/java/io/crate/operation/reference/sys/shard/blob/BlobShardPrimaryExpression.java

@@ -26,7 +26,7 @@
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.index.shard.service.IndexShard;
 
-public class BlobShardPrimaryExpression extends ShardPrimaryExpression implements BlobShardReferenceImplementation {
+public class BlobShardPrimaryExpression extends ShardPrimaryExpression implements BlobShardReferenceImplementation<Boolean> {
 
     @Inject
     public BlobShardPrimaryExpression(IndexShard indexShard) {