Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<property file="${basedir}/build.properties" />

<!-- name and version properties -->
<property name="name" value="pig" />
<property name="name" value="pig-23-withouthadoop" />
<property name="Name" value="Pig" />
<property name="ant-task.version" value="2.0.10" />
<property name="pig.pom" value="${basedir}/ivy/pig.pom" />
<property name="pigsmoke.pom" value="${basedir}/ivy/pigsmoke.pom" />
<property name="pigunit.pom" value="${basedir}/ivy/pigunit.pom" />
<property name="piggybank.pom" value="${basedir}/ivy/piggybank.pom" />
<property name="pig.version" value="0.17.0" />
<property name="pig.version.suffix" value="-SNAPSHOT" />
<property name="pig.version" value="0.17.1" />
<property name="pig.version.suffix" value="-parquet-pig-bundle-1.9.0" />
<property name="version" value="${pig.version}${pig.version.suffix}" />
<property name="final.name" value="${name}-${version}" />
<property name="year" value="2007-2017" />
Expand Down Expand Up @@ -69,7 +69,7 @@
<property name="javac.debug" value="on" />
<property name="javac.optimize" value="on" />
<property name="javac.deprecation" value="off" />
<property name="javac.version" value="1.7" />
<property name="javac.version" value="1.8" />
<property name="javac.args" value="" />
<condition property="javac.args.warnings" value="-Xmaxwarns 1000000 -Xlint -Xlint:-deprecation" else="-Xmaxwarns 1000000">
<isset property="all.warnings" />
Expand All @@ -84,7 +84,7 @@

<!-- jar names. TODO we might want to use the svn reversion name in the name in case it is a dev version -->
<property name="output.jarfile.withouthadoop" value="${build.dir}/${final.name}-withouthadoop.jar" />
<property name="output.jarfile.withouthadoop-h2" value="${legacy.dir}/${final.name}-withouthadoop-h2.jar" />
<property name="output.jarfile.withouthadoop-h2" value="${legacy.dir}/${final.name}.jar" />
<property name="output.jarfile.core" value="${build.dir}/${artifact.pig.jar}" />
<property name="output.jarfile.core-h2" value="${build.dir}/${artifact.pig-h2.jar}" />
<property name="output.jarfile.sources" value="${build.dir}/${artifact.pig-sources.jar}" />
Expand Down Expand Up @@ -247,7 +247,7 @@

<property name="asfrepo" value="https://repository.apache.org"/>
<property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
<property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
<property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
<property name="asfstagingrepo" value="${asfrepo}/service/local/staging/deploy/maven2"/>
<property name="staging_repo_id" value="apache.staging.https"/>
<property name="snapshots_repo_id" value="apache.snapshots.https"/>
Expand Down
2 changes: 1 addition & 1 deletion ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@

<dependency org="org.mockito" name="mockito-all" rev="${mockito.version}" conf="test->default"/>

<dependency org="com.twitter" name="parquet-pig-bundle" rev="${parquet-pig-bundle.version}" conf="compile->master"/>
<dependency org="org.apache.parquet" name="parquet-pig-bundle" rev="${parquet-pig-bundle.version}" conf="compile->master"/>

<!-- for Spark integration -->
<dependency org="org.apache.spark" name="spark-core_2.11" rev="${spark.version}" conf="spark->default">
Expand Down
4 changes: 2 additions & 2 deletions ivy/libraries.properties
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ checkstyle.version=4.2
ivy.version=2.2.0
jasper.version=6.1.14
groovy.version=2.4.5
guava.version=11.0
guava.version=23.0
hadoop-common.version=2.7.3
hadoop-hdfs.version=2.7.3
hadoop-mapreduce.version=2.7.3
Expand Down Expand Up @@ -91,7 +91,7 @@ jansi.version=1.9
asm.version=3.3.1
snappy-java.version=1.1.1.3
tez.version=0.7.0
parquet-pig-bundle.version=1.2.3
parquet-pig-bundle.version=1.9.0
snappy.version=0.2
leveldbjni.version=1.8
curator.version=2.6.0
Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/pig/builtin/ParquetLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.pig.impl.util.JarManager;

/**
* Wrapper class which will delegate calls to parquet.pig.ParquetLoader
* Wrapper class which will delegate calls to org.apache.parquet.pig.ParquetLoader
*/
public class ParquetLoader extends LoadFuncMetadataWrapper implements LoadPushDown {

Expand All @@ -37,12 +37,12 @@ public ParquetLoader() throws FrontendException {

public ParquetLoader(String requestedSchemaStr) throws FrontendException {
try {
init(new parquet.pig.ParquetLoader(requestedSchemaStr));
init(new org.apache.parquet.pig.ParquetLoader(requestedSchemaStr));
}
// if compile time dependency not found at runtime
catch (NoClassDefFoundError e) {
throw new FrontendException(String.format("Cannot instantiate class %s (%s)",
getClass().getName(), "parquet.pig.ParquetLoader"), 2259, e);
getClass().getName(), "org.apache.parquet.pig.ParquetLoader"), 2259, e);
}
}

Expand All @@ -52,7 +52,7 @@ private void init(LoadMetadata loadMetadata) {

@Override
public void setLocation(String location, Job job) throws IOException {
JarManager.addDependencyJars(job, parquet.Version.class);
JarManager.addDependencyJars(job, org.apache.parquet.Version.class);
super.setLocation(location, job);
}

Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/pig/builtin/ParquetStorer.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
import org.apache.pig.impl.util.JarManager;

/**
* Wrapper class which will delegate calls to parquet.pig.ParquetStorer
* Wrapper class which will delegate calls to org.apache.parquet.pig.ParquetStorer
*/
public class ParquetStorer extends StoreFuncMetadataWrapper {

public ParquetStorer() throws FrontendException {
try {
init(new parquet.pig.ParquetStorer());
init(new org.apache.parquet.pig.ParquetStorer());
}
// if compile time dependency not found at runtime
catch (NoClassDefFoundError e) {
throw new FrontendException(String.format("Cannot instantiate class %s (%s)",
getClass().getName(), "parquet.pig.ParquetStorer"), 2259, e);
getClass().getName(), "org.apache.parquet.pig.ParquetStorer"), 2259, e);
}
}

Expand All @@ -49,7 +49,7 @@ private void init(StoreMetadata storeMetadata) {
*/
@Override
public void setStoreLocation(String location, Job job) throws IOException {
JarManager.addDependencyJars(job, parquet.Version.class);
JarManager.addDependencyJars(job, org.apache.parquet.Version.class);
super.setStoreLocation(location, job);
}

Expand Down