Merge branch 'master' of github.com:teiid/teiid

teiid · Aug 23, 2018 · 1812e49 · 1812e49
2 parents 0f8f091 + 5a120e6
commit 1812e49
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/...otrod/src/main/java/org/teiid/translator/infinispan/hotrod/ProtobufMetadataProcessor.java b/...otrod/src/main/java/org/teiid/translator/infinispan/hotrod/ProtobufMetadataProcessor.java
@@ -384,9 +384,15 @@ private Column addColumn(MetadataFactory mf,
         		c.setAnnotation(annotation);
         	}
 
-            if(annotation.contains("@IndexedField(index=false")) {
-                c.setSearchType(SearchType.Unsearchable);
-            }
+        	String index = findFromAnnotation(AT_INDEXEDFIELD, annotation, "index");
+        	if (index != null && (index.equalsIgnoreCase("false") || index.equalsIgnoreCase("no"))) {
+        		c.setSearchType(SearchType.Unsearchable);
+        	}
+
+        	index = findFromAnnotation(AT_FIELD, annotation, "index");
+        	if (index != null && (index.equalsIgnoreCase("Index.NO") || index.equalsIgnoreCase("no"))) {
+        		c.setSearchType(SearchType.Unsearchable);
+        	}
 
             if(annotation.contains("@Id")) {
                 List<String> pkNames = new ArrayList<String>();
@@ -404,6 +410,8 @@ private Column addColumn(MetadataFactory mf,
 
     private static final String AT_TEIID = "@Teiid("; //$NON-NLS-1$
     private static final String AT_CACHE = "@Cache("; //$NON-NLS-1$
+    private static final String AT_INDEXEDFIELD = "@IndexedField("; //$NON-NLS-1$
+    private static final String AT_FIELD = "@Field("; //$NON-NLS-1$
 
     private String findFromAnnotation(String rootProperty, String annotation, String verb) {
         if ( annotation != null && !annotation.isEmpty()) {

diff --git a/...d/src/test/java/org/teiid/translator/infinispan/hotrod/TestSchemaToProtobufProcessor.java b/...d/src/test/java/org/teiid/translator/infinispan/hotrod/TestSchemaToProtobufProcessor.java
@@ -68,7 +68,7 @@ public void testConverstion() throws Exception {
                 "    optional G3 g3 = 5;\n" +
                 "    /* @IndexedField(index=false) */\n" +
                 "    optional bytes e5 = 7;\n" +
-                "    /* @Teiid(type=long) */\n" +
+                "    /* @Field(index=Index.NO) */\n" +
                 "    optional fixed64 e6 = 8;\n" +
                 "    repeated G4 g4 = 6;\n" +
                 "}\n" +

diff --git a/connectors/infinispan/translator-infinispan-hotrod/src/test/resources/tables.ddl b/connectors/infinispan/translator-infinispan-hotrod/src/test/resources/tables.ddl
@@ -15,7 +15,7 @@ CREATE FOREIGN TABLE G2 (
 	g3_e1 integer NOT NULL OPTIONS (NAMEINSOURCE 'e1', SEARCHABLE 'Searchable', NATIVE_TYPE 'int32', "teiid_ispn:MESSAGE_NAME" 'pm1.G3', "teiid_ispn:PARENT_COLUMN_NAME" 'g3', "teiid_ispn:PARENT_TAG" '5', "teiid_ispn:TAG" '1'),
 	g3_e2 string NOT NULL OPTIONS (NAMEINSOURCE 'e2', SEARCHABLE 'Searchable', NATIVE_TYPE 'string', "teiid_ispn:MESSAGE_NAME" 'pm1.G3', "teiid_ispn:PARENT_COLUMN_NAME" 'g3', "teiid_ispn:PARENT_TAG" '5', "teiid_ispn:TAG" '2'),
 	e5 varbinary OPTIONS (ANNOTATION '@IndexedField(index=false)', SEARCHABLE 'Unsearchable', NATIVE_TYPE 'bytes', "teiid_ispn:TAG" '7'),
-	e6 long OPTIONS (SEARCHABLE 'Searchable', NATIVE_TYPE 'fixed64', "teiid_ispn:TAG" '8'),
+	e6 long OPTIONS (ANNOTATION '@Field(index=Index.NO)', SEARCHABLE 'Unsearchable', NATIVE_TYPE 'fixed64', "teiid_ispn:TAG" '8'),
 	CONSTRAINT PK_E1 PRIMARY KEY(e1)
 ) OPTIONS (ANNOTATION '@Indexed @Cache(name=default)', NAMEINSOURCE 'pm1.G2', UPDATABLE TRUE, "teiid_ispn:CACHE" 'default');
 

diff --git a/connectors/infinispan/translator-infinispan-hotrod/src/test/resources/tables.proto b/connectors/infinispan/translator-infinispan-hotrod/src/test/resources/tables.proto
@@ -29,6 +29,7 @@ message G2 {
    repeated G4 g4 = 6;
    /*@IndexedField(index=false) */
    optional bytes e5 = 7;
+   /*@Field(index=Index.NO) */
    optional fixed64 e6 = 8;
 }