spark-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aarondav <...@git.apache.org>
Subject [GitHub] spark pull request: [SPARK-1681] Include datanucleus jars in Spark...
Date Thu, 01 May 2014 07:29:08 GMT
Github user aarondav commented on a diff in the pull request:

    https://github.com/apache/spark/pull/610#discussion_r12180776
  
    --- Diff: bin/compute-classpath.sh ---
    @@ -63,14 +64,21 @@ fi
     # built with Hive, so first check if the datanucleus jars exist, and then ensure the
current Spark
     # assembly is built for Hive, before actually populating the CLASSPATH with the jars.
     # Note that this check order is faster (by up to half a second) in the case where Hive
is not used.
    -num_datanucleus_jars=$(ls "$FWDIR"/lib_managed/jars/ 2>/dev/null | grep "datanucleus-.*\\.jar"
| wc -l)
    -if [ $num_datanucleus_jars -gt 0 ]; then
    -  AN_ASSEMBLY_JAR=${ASSEMBLY_JAR:-$DEPS_ASSEMBLY_JAR}
    -  num_hive_files=$(jar tvf "$AN_ASSEMBLY_JAR" org/apache/hadoop/hive/ql/exec 2>/dev/null
| wc -l)
    -  if [ $num_hive_files -gt 0 ]; then
    +if [ -f "$FWDIR/RELEASE" ]; then
    +  datanucleus_dir="$FWDIR"/lib
    +else
    +  datanucleus_dir="$FWDIR"/lib_managed/jars
    +fi
    +
    +datanucleus_jars=$(find "$datanucleus_dir" 2>/dev/null | grep "datanucleus-.*\\.jar")
    +datanucleus_jars=$(echo "$datanucleus_jars" | tr "\n" : | sed s/:$//g)
    +
    +if [ -n "$datanucleus_jars" ]; then
    +  an_assembly_jar=${ASSEMBLY_JAR:-$DEPS_ASSEMBLY_JAR}
    +  hive_files=$(jar tvf "$an_assembly_jar" org/apache/hadoop/hive/ql/exec)
    --- End diff --
    
    should probably still pipe 2>/dev/null here as before, I believe this throws an error
if it doesn't exist


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message