/*******************************************************************************
 * Copyright (C) 2015 Google Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); 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
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 ******************************************************************************/

package com.google.cloud.dataflow.sdk.runners.worker;


import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

/**
 * Native library used to read from and write to a shuffle dataset.
 */
class ShuffleLibrary {
  /**
   * Loads the native shuffle library.
   */
  static void load() {
    try {
      File tempfile = File.createTempFile("libshuffle_client_jni", ".so");
      InputStream input = ClassLoader.getSystemResourceAsStream(
          "libshuffle_client_jni.so.stripped");
      Files.copy(input, tempfile.toPath(), StandardCopyOption.REPLACE_EXISTING);
      System.load(tempfile.getAbsolutePath());
    } catch (IOException e) {
      throw new RuntimeException("Loading shuffle_client failed:", e);
    }
  }
}

@@ -1130,16 +1130,347 @@
   try %7B%0A
+      final String shuffleClientLibraryPropertyKey = %22batch.shuffle_client_library%22;%0A      String shuffleClientLibrary = %22libshuffle_client_jni.so.stripped%22;%0A      if (System.getProperties().containsKey(shuffleClientLibraryPropertyKey)) %7B%0A        shuffleClientLibrary = System.getProperty(shuffleClientLibraryPropertyKey);%0A      %7D%0A
       Fi
@@ -1604,54 +1604,28 @@
 eam(
-%0A          %22lib
 shuffle
-_c
+C
 lient
-_jni.so.stripped%22
+Library
 );%0A 

Add support to configure the shuffle client library with a property.