Projects >> howl >>99287a2a49bc6cb6b17aa507c53912c3cdb13437

Chunk
Conflicting content
     * at the time of calling store must match.
     */
    Schema runtimeSchema = Schema.getPigSchema(resourceSchema);
<<<<<<< HEAD
    if(pigSchema != null){
      if(! Schema.equals(runtimeSchema, pigSchema, false, false) ){
        throw new FrontendException("Schema provided in store statement doesn't match with the Schema" +
      "returned by Pig run-time. Schema provided in HowlStorer: "+pigSchema.toString()+ " Schema received from Pig runtime: "+runtimeSchema.toString());
      }
    } else {
      pigSchema = runtimeSchema;
=======
    if(! Schema.equals(runtimeSchema, pigSchema, false, true) ){
      throw new FrontendException("Schema provided in store statement doesn't match with the Schema" +
    "returned by Pig run-time. Schema provided in HowlStorer: "+pigSchema.toString()+ " Schema received from Pig runtime: "+runtimeSchema.toString());
>>>>>>> dc35d25c528466611db33fe8f1ac15234677e06f
    }
  }
Solution content
     * at the time of calling store must match.
     */
    Schema runtimeSchema = Schema.getPigSchema(resourceSchema);
    if(pigSchema != null){
      if(! Schema.equals(runtimeSchema, pigSchema, false, true) ){
        throw new FrontendException("Schema provided in store statement doesn't match with the Schema" +
      "returned by Pig run-time. Schema provided in HowlStorer: "+pigSchema.toString()+ " Schema received from Pig runtime: "+runtimeSchema.toString());
      }
    } else {
      pigSchema = runtimeSchema;
    }
  }
File
HowlStorer.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Throw statement
Variable