CDPD-5851: ORC-562:Don't wrap readerSchema in acidSchema, if readerSc…

…hema is already acid

Fixes apache#442

Signed-off-by: Owen O'Malley <omalley@apache.org>
(cherry picked from commit 2db32a8)
Change-Id: Icfc548d19b0d0cc62b3e0e90ea164c791ece0a94

java/core/src/java/org/apache/orc/impl/SchemaEvolution.java

@@ -86,10 +86,11 @@ public SchemaEvolution(TypeDescription fileSchema,
     this.isOnlyImplicitConversion = true;
     this.fileSchema = fileSchema;
     this.isAcid = checkAcidSchema(fileSchema);
+    boolean readerSchemaIsAcid = readerSchema == null ? false : checkAcidSchema(readerSchema);
     this.includeAcidColumns = options.getIncludeAcidColumns();
-    this.readerColumnOffset = isAcid ? acidEventFieldNames.size() : 0;
+    this.readerColumnOffset = isAcid && !readerSchemaIsAcid ? acidEventFieldNames.size() : 0;
     if (readerSchema != null) {
-      if (isAcid) {
+      if (isAcid && !readerSchemaIsAcid) {
         this.readerSchema = createEventSchema(readerSchema);
       } else {
         this.readerSchema = readerSchema;

java/core/src/test/org/apache/orc/impl/TestSchemaEvolution.java

@@ -1668,4 +1668,24 @@ public void testCheckAcidSchema() {
     assertTrue("Schema (" + ccSchema +") was found to be non-acid ", evoCc.isAcid());
     assertTrue("Schema (" + lcSchema +") was found to be non-acid ", evoLc.isAcid());
   }
+
+  @Test
+  public void testAcidReaderSchema() {
+    String acidSchema = "struct<operation:int,originalTransaction:bigint,bucket:int," +
+        "rowId:bigint,currentTransaction:bigint," +
+        "row:struct<a:int,b:int>>";
+
+    TypeDescription fileSchema = TypeDescription.fromString(acidSchema);
+    TypeDescription readerSchema = TypeDescription.fromString(acidSchema);
+    SchemaEvolution schemaEvolution = new SchemaEvolution(fileSchema, readerSchema, options);
+
+    assertEquals(String.format("Reader schema %s is not acid", schemaEvolution.getReaderSchema().toString()),
+        acidSchema, schemaEvolution.getReaderSchema().toString());
+
+    String notAcidSchema ="struct<a:int,b:int>";
+    readerSchema = TypeDescription.fromString(notAcidSchema);
+    schemaEvolution = new SchemaEvolution(fileSchema, readerSchema, options);
+    assertEquals(String.format("Reader schema %s is not acid", schemaEvolution.getReaderSchema().toString()),
+        acidSchema, schemaEvolution.getReaderSchema().toString());
+  }
 }