remove getReferenceInfo from ReferenceInfos

mfussenegger · mfussenegger · commit bc0aacd8631d · 2015-04-07T17:27:59.000+02:00
Was only used in tests.
diff --git a/sql/src/main/java/io/crate/metadata/ReferenceInfos.java b/sql/src/main/java/io/crate/metadata/ReferenceInfos.java
@@ -110,15 +110,6 @@ public TableInfo getTableInfoUnsafe(TableIdent ident) {
         return info;
     }
 
-    @Nullable
-    public ReferenceInfo getReferenceInfo(ReferenceIdent ident) {
-        TableInfo tableInfo = getTableInfo(ident.tableIdent());
-        if (tableInfo != null) {
-            return tableInfo.getReferenceInfo(ident.columnIdent());
-        }
-        return null;
-    }
-
     @Nullable
     public SchemaInfo getSchemaInfo(@Nullable String schemaName) {
         if (schemaName == null) {
diff --git a/sql/src/test/java/io/crate/operation/projectors/IndexWriterProjectorTest.java b/sql/src/test/java/io/crate/operation/projectors/IndexWriterProjectorTest.java
@@ -24,18 +24,17 @@
 import io.crate.core.collections.Bucket;
 import io.crate.core.collections.RowN;
 import io.crate.integrationtests.SQLTransportIntegrationTest;
-import io.crate.metadata.ColumnIdent;
-import io.crate.metadata.ReferenceIdent;
-import io.crate.metadata.ReferenceInfos;
-import io.crate.metadata.TableIdent;
+import io.crate.metadata.*;
 import io.crate.metadata.doc.DocSysColumns;
 import io.crate.operation.Input;
 import io.crate.operation.collect.CollectExpression;
 import io.crate.operation.collect.InputCollectExpression;
+import io.crate.planner.RowGranularity;
 import io.crate.planner.symbol.InputColumn;
 import io.crate.planner.symbol.Reference;
 import io.crate.planner.symbol.Symbol;
 import io.crate.test.integration.CrateIntegrationTest;
+import io.crate.types.DataTypes;
 import io.crate.types.StringType;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.action.admin.indices.create.TransportCreateIndexAction;
@@ -76,7 +75,7 @@ public void testIndexWriter() throws Throwable {
                 cluster().getInstance(TransportCreateIndexAction.class),
                 new TableIdent(null, "bulk_import"),
                 null,
-                new Reference(referenceInfos.getReferenceInfo(new ReferenceIdent(bulkImportIdent, DocSysColumns.RAW))),
+                new Reference(new ReferenceInfo(new ReferenceIdent(bulkImportIdent, DocSysColumns.RAW), RowGranularity.DOC, DataTypes.STRING)),
                 Arrays.asList(ID_IDENT),
                 Arrays.<Symbol>asList(new InputColumn(0)),
                 Arrays.<Input<?>>asList(),
diff --git a/sql/src/test/java/io/crate/operation/reference/sys/SysShardsExpressionsTest.java b/sql/src/test/java/io/crate/operation/reference/sys/SysShardsExpressionsTest.java
@@ -60,6 +60,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@SuppressWarnings("ConstantConditions")
 public class SysShardsExpressionsTest extends CrateUnitTest {
 
     private Injector injector;
@@ -144,7 +145,7 @@ public void prepare() throws Exception {
     @Test
     public void testShardInfoLookup() throws Exception {
         ReferenceInfo info = SysShardsTableInfo.INFOS.get(new ColumnIdent("id"));
-        assertEquals(info, referenceInfos.getReferenceInfo(info.ident()));
+        assertEquals(info, referenceInfos.getTableInfo(SysShardsTableInfo.IDENT).getReferenceInfo(info.ident().columnIdent()));
     }
 
     @Test
diff --git a/sql/src/test/java/io/crate/operation/reference/sys/TestGlobalSysExpressions.java b/sql/src/test/java/io/crate/operation/reference/sys/TestGlobalSysExpressions.java
@@ -28,6 +28,7 @@
 import io.crate.metadata.sys.SysClusterTableInfo;
 import io.crate.metadata.sys.SysExpression;
 import io.crate.metadata.sys.SysNodesTableInfo;
+import io.crate.metadata.table.TableInfo;
 import io.crate.operation.Input;
 import io.crate.operation.reference.sys.cluster.ClusterSettingsExpression;
 import io.crate.operation.reference.sys.node.NodeLoadExpression;
@@ -111,24 +112,14 @@ public void prepare() throws Exception {
         referenceInfos = injector.getInstance(ReferenceInfos.class);
     }
 
-    @Test
-    public void testWrongSchema() throws Exception {
-        // unsupported schema
-        ReferenceIdent ident = new ReferenceIdent(new TableIdent("something", "sometable"), "somecolumn");
-        assertNull(referenceInfos.getReferenceInfo(ident));
-
-    }
-
-
     @Test
     public void testInfoLookup() throws Exception {
-
         ReferenceIdent ident = LOAD_INFO.ident();
-        assertEquals(LOAD_INFO, referenceInfos.getReferenceInfo(ident));
+        TableInfo sysNodesTableInfo = referenceInfos.getTableInfoUnsafe(SysNodesTableInfo.IDENT);
+        assertEquals(LOAD_INFO, sysNodesTableInfo.getReferenceInfo(ident.columnIdent()));
 
         ident = LOAD1_INFO.ident();
-        assertEquals(referenceInfos.getReferenceInfo(ident), LOAD1_INFO);
-
+        assertEquals(sysNodesTableInfo.getReferenceInfo(ident.columnIdent()), LOAD1_INFO);
     }
 
     @Test
