You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by pr...@apache.org on 2009/11/24 20:54:34 UTC
svn commit: r883836 [1/23] - in /hadoop/pig/branches/load-store-redesign: ./
contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/
contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/
contrib/zebra/ contrib/zebra...
Author: pradeepkth
Date: Tue Nov 24 19:54:19 2009
New Revision: 883836
URL: http://svn.apache.org/viewvc?rev=883836&view=rev
Log:
svn merge -r831153:882818 http://svn.apache.org/repos/asf/hadoop/pig/trunk - got compilation, secondary sort, udfcontext working - there maybe more tests which are broken - will fix those incrementally (pradeepkth)
Added:
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/TableRecordReader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/BagExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/BooleanExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/ByteExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/BytesExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/ComparatorExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/DoubleExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/ExprUtils.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/FixedLengthPrimitive.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/FloatExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/IntExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/KeyGenerator.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/LeafExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/LeafGenerator.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/LongExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/NegateExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/ShortExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/StringExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/TupleExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/comparator/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/BCFile.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/BoundedByteArrayOutputStream.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/BoundedRangeFileInputStream.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/ByteArray.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/Chunk.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/CompareUtils.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/Compression.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/MetaBlockAlreadyExists.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/MetaBlockDoesNotExist.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/RawComparable.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/SimpleBufferedOutputStream.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/TFile.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/TFileDumper.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/tfile/Utils.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/SortInfo.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestDuplicateMapKeyInDifferentCGs.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestMapSplitSchemaStorageColumnOutOfOrder.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestProjectionOnFullMap.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestSortedBasicTableSplits.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TableMRSampleSortedTable.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TableMRSortedTableZebraKeyGenerator.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TestTfileSplit.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMergeJoin.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMergeJoinNegative.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMergeJoinPartial.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveProjection.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveProjectionNegative.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveSimple.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveUnion.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveVariableTable.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnion.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionMergeJoin.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoin.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinAfterFilter.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinFloat.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinInteger.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinMultipleColsSort.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/KVGenerator.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/KeySampler.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/NanoTimer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/RandomDistribution.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFile.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileComparators.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileJClassComparatorByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileLzoCodecsByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileLzoCodecsStreams.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileNoneCodecsByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileNoneCodecsJClassComparatorByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileNoneCodecsStreams.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileSeek.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileSeqFileComparison.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileSplit.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileStreams.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestTFileUnsortedByteArrays.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/TestVLong.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/tfile/Timer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageGrammar.java
hadoop/pig/branches/load-store-redesign/lib/hbase-0.20.0-test.jar
hadoop/pig/branches/load-store-redesign/lib/hbase-0.20.0.jar
hadoop/pig/branches/load-store-redesign/lib/zookeeper-hbase-1329.jar
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/Accumulator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/AccumulatorOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnChainInfo.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnInfo.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSecondaryKeyComparator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SortKeyInfo.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SecondaryKeyPartitioner.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/AccumulativeTupleBuffer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/AccumulativeBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/util/CompilerUtils.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/util/UDFContext.java
hadoop/pig/branches/load-store-redesign/test/hbase-site.xml
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestAccumulator.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestPigStorage.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestSecondarySort.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestUDFContext.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/AccumulativeSumBag.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/AccumulatorBagCount.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/BagCount.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/UDFContextTestEvalFunc.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/UDFContextTestEvalFunc2.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/UDFContextTestLoader.java
Removed:
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/FieldType.java
hadoop/pig/branches/load-store-redesign/lib/hbase-0.18.1-test.jar
hadoop/pig/branches/load-store-redesign/lib/hbase-0.18.1.jar
Modified:
hadoop/pig/branches/load-store-redesign/CHANGES.txt
hadoop/pig/branches/load-store-redesign/build.xml
hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt
hadoop/pig/branches/load-store-redesign/contrib/zebra/build-contrib.xml
hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/BasicTable.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/BasicTableStatus.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/IOutils.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/KeyDistribution.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/MetaFile.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/TableScanner.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/io/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/BasicTableOutputFormat.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/CachedTableScanner.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/TableExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/TableInputFormat.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/TableUnionExpr.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/package-info.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/TableLoader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/pig/TableStorer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/ColumnType.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/Schema.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/schema/SchemaParser.jjt
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/CGSchema.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/Partition.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/Projection.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/SubColumnExtraction.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/TableStorageParser.jjt
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/java/org/apache/hadoop/zebra/types/TypesUtils.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestBasicTable.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestBasicTableMapSplits.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestBasicTableProjections.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestBasicTableSplits.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestCollection.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroup.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName1.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName2.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName3.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName4.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName5.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupName6.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupProjections.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestColumnGroupSplits.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestDropColumnGroup.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestMap.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestMapOfRecord.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestMixedType1.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestNegative.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestNonDefaultWholeMapSplit.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestRecord.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestRecord2Map.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestRecord3Map.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestRecordMap.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestSchema.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestSimple.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/io/TestWrite.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/ArticleGenerator.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/Dictionary.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TableMRSample2.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TableMapReduceExample.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TestBasicTableIOFormatLocalFS.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/mapred/TestCheckin.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableUnionLoader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicUnion.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollection.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableLoader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableStorer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMapTableLoader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMapTableStorer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMapType.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMixedType1.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSimpleType.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoader.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableStorer.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestUnionMixedTypes.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestColumnGroupName.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestColumnSecurity.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageCollection.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMap.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc1.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc2.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc3.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageRecord.java
hadoop/pig/branches/load-store-redesign/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorePrimitive.java
hadoop/pig/branches/load-store-redesign/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
hadoop/pig/branches/load-store-redesign/src/docs/src/documentation/content/xdocs/piglatin_reference.xml
hadoop/pig/branches/load-store-redesign/src/docs/src/documentation/content/xdocs/piglatin_users.xml
hadoop/pig/branches/load-store-redesign/src/docs/src/documentation/content/xdocs/tabs.xml
hadoop/pig/branches/load-store-redesign/src/docs/src/documentation/content/xdocs/udf.xml
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/Main.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/PigServer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/PigWarning.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/executionengine/PigSlice.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceOper.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogToPhyTranslationVisitor.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POStatus.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Add.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryExpressionOperator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ConstantExpression.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Divide.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Mod.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Multiply.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POAnd.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryExpressionOperator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrangeForIllustrate.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMultiQueryPackage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackageLite.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/executionengine/util/MapRedUtil.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/hadoop/hbase/HBaseSlice.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/datastorage/LocalPath.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/backend/local/executionengine/physicalLayer/relationalOperators/POCogroup.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/AVG.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/BinStorage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/BinaryStorage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/COUNT.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/COUNT_STAR.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/DoubleAvg.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/DoubleMax.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/DoubleMin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/DoubleSum.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/FloatAvg.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/FloatMax.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/FloatMin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/FloatSum.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/IntAvg.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/IntMax.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/IntMin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/IntSum.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/LongAvg.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/LongMax.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/LongMin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/LongSum.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/MAX.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/MIN.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/PigDump.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/PigStorage.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/SUM.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/StringMax.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/builtin/StringMin.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/DefaultAbstractBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/DistinctDataBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/InternalSortedBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/NonSpillableDataBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SingleTupleBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/SortedDataBag.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/data/TargetedTuple.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/PigContext.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/builtin/GFCross.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/io/FileLocalizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/ProjectStarTranslator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/optimizer/PushDownForeachFlatten.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/optimizer/StreamOptimizer.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/schema/Schema.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckingVisitor.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/plan/Operator.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/plan/OperatorPlan.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/streaming/ExecutableManager.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/streaming/StreamingCommand.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/util/JarManager.java
hadoop/pig/branches/load-store-redesign/src/org/apache/pig/tools/pigstats/PigStats.java
hadoop/pig/branches/load-store-redesign/test/findbugsExcludeFile.xml
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestCombiner.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestCounters.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestFRJoin.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestForEachNestedPlanLocal.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestHBaseStorage.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestJoin.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLoad.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestLogicalPlanBuilder.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQuery.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestMultiQueryLocal.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestPigContext.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestPigServer.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestPigStats.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestSkewedJoin.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestStore.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/data/GoldenFiles/MRC18.gld
hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/POCastDummy.java
Modified: hadoop/pig/branches/load-store-redesign/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/CHANGES.txt?rev=883836&r1=883835&r2=883836&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/CHANGES.txt (original)
+++ hadoop/pig/branches/load-store-redesign/CHANGES.txt Tue Nov 24 19:54:19 2009
@@ -18,8 +18,6 @@
Pig Change Log
-Pig Change Log
-
Trunk (unreleased changes)
INCOMPATIBLE CHANGES
@@ -40,6 +38,38 @@
IMPROVEMENTS
+PIG-1053: Consider moving to Hadoop for local mode (ankit.modi via olgan)
+
+PIG-1085: Pass JobConf and UDF specific configuration information to UDFs
+ (gates)
+
+OPTIMIZATIONS
+
+BUG FIXES
+
+PIG-1064: Behaviour of COGROUP with and without schema when using "*" operator
+(pradeepkth)
+
+Release 0.6.0 - Unreleased
+
+INCOMPATIBLE CHANGES
+
+IMPROVEMENTS
+
+PIG-1089: Pig 0.6.0 Documentation (chandec via olgan)
+
+PIG-958: Splitting output data on key field (ankur via pradeepkth)
+
+PIG-1058: FINDBUGS: remaining "Correctness Warnings" (olgan)
+
+PIG-1036: Fragment-replicate left outer join (ankit.modi via pradeepkth)
+
+PIG-920: optimizing diamond queries (rding via pradeepkth)
+
+PIG-1040: FINDBUGS: MS_SHOULD_BE_FINAL: Field isn't final but should be (olgan)
+
+PIG-1059: FINDBUGS: remaining Bad practice + Multithreaded correctness Warning (olgan)
+
PIG-953: Enable merge join in pig to work with loaders and store functions
which can internally index sorted data (pradeepkth)
@@ -115,10 +145,33 @@
PIG-1042: javac warnings: unchecked (daijy)
+PIG-1038: Optimize nested distinct/sort to use secondary key (daijy)
+
+PIG-979: Acummulator Interface for UDFs (yinghe via daijy)
+
OPTIMIZATIONS
BUG FIXES
+PIG-1080: PigStorage may miss records when loading a file (rding via olgan)
+
+PIG-1071: Support comma separated file/directory names in load statements
+(rding via pradeepkth)
+
+PIG-970: Changes to make HBase loader work with HBase 0.20 (vbarat and zjffdu
+ via gates)
+
+PIG-1035: support for skewed outer join (sriranjan via pradeepkth)
+
+PIG-1030: explain and dump not working with two UDFs inside inner plan of
+foreach (rding via pradeepkth)
+
+PIG-1048: inner join using 'skewed' produces multiple rows for keys with
+ single row in both input relations (sriranjan via gates)
+
+PIG-1063: Pig does not call checkOutSpecs() on OutputFormat provided by
+StoreFunc in the multistore case (pradeepkth)
+
PIG-746: Works in --exectype local, fails on grid - ERROR 2113: SingleTupleBag
should never be serialized (rding via pradeepkth)
@@ -163,7 +216,11 @@
PIG-790: Error message should indicate in which line number in the Pig script the error occured (debugging BinCond) (daijy)
-Release 0.5.0 - Unreleased
+PIG-1001: Generate more meaningful error message when one input file does not exist (daijy)
+
+PIG-1060: MultiQuery optimization throws error for multi-level splits (rding via daijy)
+
+Release 0.5.0
INCOMPATIBLE CHANGES
Modified: hadoop/pig/branches/load-store-redesign/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/build.xml?rev=883836&r1=883835&r2=883836&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/build.xml (original)
+++ hadoop/pig/branches/load-store-redesign/build.xml Tue Nov 24 19:54:19 2009
@@ -24,7 +24,7 @@
<!-- name and version properties -->
<property name="name" value="pig" />
<property name="Name" value="Pig" />
- <property name="version" value="0.6.0-dev" />
+ <property name="version" value="0.7.0-dev" />
<property name="final.name" value="${name}-${version}" />
<condition property="isWindows">
<os family="windows"/>
@@ -48,9 +48,10 @@
<property name="build.encoding" value="UTF8" />
<!-- TODO with only one version of hadoop in the lib folder we do not need that anymore -->
<property name="hadoop.jarfile" value="hadoop20.jar" />
- <property name="hbase.jarfile" value="hbase-0.18.1.jar" />
- <property name="hbase.test.jarfile" value="hbase-0.18.1-test.jar" />
-
+ <property name="hbase.jarfile" value="hbase-0.20.0.jar" />
+ <property name="hbase.test.jarfile" value="hbase-0.20.0-test.jar" />
+ <property name="zookeeper.jarfile" value="zookeeper-hbase-1329.jar" />
+
<!-- javac properties -->
<property name="javac.debug" value="on" />
<property name="javac.optimize" value="on" />
@@ -166,6 +167,7 @@
<fileset file="${lib.dir}/${hadoop.jarfile}" />
<fileset file="${lib.dir}/${hbase.jarfile}" />
<fileset file="${lib.dir}/${hbase.test.jarfile}" />
+ <fileset file="${lib.dir}/${zookeeper.jarfile}"/>
<!-- <fileset file="${lib.dir}/commons-collections-3.2.jar" /> -->
</path>
@@ -285,7 +287,8 @@
<param name="dist" value="${test.build.classes}" />
<param name="cp" value="test.classpath" />
</antcall>
-
+
+ <copy file="${basedir}/test/hbase-site.xml" tofile="${test.build.classes}/hbase-site.xml"/>
</target>
<!-- This target is for default compilation -->
@@ -507,6 +510,7 @@
<pathelement location="${output.jarfile.withouthadoop}" />
<pathelement location="${test.build.classes}" />
<pathelement location="${junit.hadoop.conf}" />
+
<pathelement path="${clover.jar}"/>
<path refid="classpath"/>
</classpath>
@@ -529,7 +533,7 @@
<!-- Excluded under Windows.-->
<exclude name="**/TestHBaseStorage.java" if="isWindows" />
<!-- Excluced because we don't want to run them -->
- <exclude name="**/TestHBaseStorage.java" />
+ <!-- <exclude name="**/TestHBaseStorage.java" /> -->
<exclude name="**/PigExecTestCase.java" />
<exclude name="**/TypeCheckingTestUtil.java" />
<exclude name="**/TypeGraphPrinter.java" />
Added: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java?rev=883836&view=auto
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java (added)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java Tue Nov 24 19:54:19 2009
@@ -0,0 +1,306 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you 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 org.apache.pig.piggybank.storage;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
+import org.apache.hadoop.mapred.FileOutputFormat;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.pig.StoreFunc;
+import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce;
+import org.apache.pig.builtin.PigStorage;
+import org.apache.pig.builtin.Utf8StorageConverter;
+import org.apache.pig.data.Tuple;
+import org.apache.tools.bzip2r.CBZip2OutputStream;
+
+/**
+ * The UDF is useful for splitting the output data into a bunch of directories
+ * and files dynamically based on user specified key field in the output tuple.
+ *
+ * Sample usage: <code>
+ * A = LOAD 'mydata' USING PigStorage() as (a, b, c);
+ * STORE A INTO '/my/home/output' USING MultiStorage('/my/home/output','0', 'bz2', '\\t');
+ * </code> Parameter details:- ========== <b>/my/home/output </b>(Required) :
+ * The DFS path where output directories and files will be created. <b> 0
+ * </b>(Required) : Index of field whose values should be used to create
+ * directories and files( field 'a' in this case). <b>'bz2' </b>(Optional) : The
+ * compression type. Default is 'none'. Supported types are:- 'none', 'gz' and
+ * 'bz2' <b> '\\t' </b>(Optional) : Output field separator.
+ *
+ * Let 'a1', 'a2' be the unique values of field 'a'. Then output may look like
+ * this
+ *
+ * /my/home/output/a1/a1-0000 /my/home/output/a1/a1-0001
+ * /my/home/output/a1/a1-0002 ... /my/home/output/a2/a2-0000
+ * /my/home/output/a2/a2-0001 /my/home/output/a2/a2-0002
+ *
+ * The prefix '0000*' is the task-id of the mapper/reducer task executing this
+ * store. In case user does a GROUP BY on the field followed by MultiStorage(),
+ * then its imperative that all tuples for a particular group will go exactly to
+ * 1 reducer. So in the above case for e.g. there will be only 1 file each under
+ * 'a1' and 'a2' directories.
+ */
+public class MultiStorage extends Utf8StorageConverter implements StoreFunc {
+
+ // map of all (key-field-values, PigStorage) received by this store
+ private Map<String, PigStorage> storeMap;
+ private List<OutputStream> outStreamList; // list of all open streams
+ private boolean isAbsolute; // Is the user specified output path absolute
+ private String partition; // Reduce partition ID executing this store
+ private Path outputPath; // User specified output Path
+ private Path workOutputPath; // Task specific temporary output path
+ private Compression comp; // Compression type of output data.
+ private int splitFieldIndex = -1; // Index of the key field
+ private String fieldDel; // delimiter of the output record.
+ private FileSystem fs; // Output file system
+
+ // filter for removing hidden files in a listing
+ public static final PathFilter hiddenPathFilter = new PathFilter() {
+ public boolean accept(Path p) {
+ String name = p.getName();
+ return !name.startsWith("_") && !name.startsWith(".");
+ }
+ };
+
+ // Compression types supported by this store
+ enum Compression {
+ none, bz2, bz, gz;
+ };
+
+ public MultiStorage(String parentPathStr, String splitFieldIndex) {
+ this(parentPathStr, splitFieldIndex, "none");
+ }
+
+ public MultiStorage(String parentPathStr, String splitFieldIndex,
+ String compression) {
+ this(parentPathStr, splitFieldIndex, compression, "\\t");
+
+ }
+
+ /**
+ * Constructor
+ *
+ * @param parentPathStr
+ * Parent output dir path
+ * @param splitFieldIndex
+ * key field index
+ * @param compression
+ * 'bz2', 'bz', 'gz' or 'none'
+ * @param fieldDel
+ * Output record field delimiter.
+ */
+ public MultiStorage(String parentPathStr, String splitFieldIndex,
+ String compression, String fieldDel) {
+ this.outputPath = new Path(parentPathStr);
+ this.splitFieldIndex = Integer.parseInt(splitFieldIndex);
+ this.fieldDel = fieldDel;
+ this.storeMap = new HashMap<String, PigStorage>();
+ this.outStreamList = new ArrayList<OutputStream>();
+ try {
+ this.comp = (compression == null) ? Compression.none : Compression
+ .valueOf(compression.toLowerCase());
+ } catch (IllegalArgumentException e) {
+ System.err.println("Exception when converting compression string: "
+ + compression + " to enum. No compression will be used");
+ this.comp = Compression.none;
+ }
+ }
+
+ /**
+ * Return the work output path suffixed with the parent output dir name.
+ *
+ * @param conf
+ * @return
+ * @throws IOException
+ */
+ private Path getWorkOutputPath(JobConf conf) throws IOException {
+ Path outPath = (conf != null) ? new Path(FileOutputFormat
+ .getWorkOutputPath(conf), this.outputPath) : this.outputPath;
+ return outPath;
+ }
+
+ /**
+ * Get the partition number of the reduce task in which it is executing.
+ *
+ * @param conf
+ * @return
+ */
+ private String getPartition(JobConf conf) {
+ int part = (conf != null) ? conf.getInt("mapred.task.partition", -1) : 0;
+ NumberFormat numberFormat = NumberFormat.getInstance();
+ numberFormat.setMinimumIntegerDigits(5);
+ numberFormat.setGroupingUsed(false);
+ return numberFormat.format(part);
+ }
+
+ /**
+ * hack to get the map/reduce task unique ID in which this is running. Also
+ * get the outputPath of the job to be used as base path where field value
+ * specific sub-directories will be created.
+ *
+ * @throws IOException
+ */
+ private void initJobSpecificParams() throws IOException {
+ this.partition = (this.partition == null) ? getPartition(PigMapReduce.sJobConf)
+ : this.partition;
+ // workOutputPath = workOutputPath/outputPath. Later we will remove the
+ // suffix.
+ this.workOutputPath = (this.workOutputPath == null) ? getWorkOutputPath(PigMapReduce.sJobConf)
+ : this.workOutputPath;
+ if (this.fs == null) {
+ this.fs = (PigMapReduce.sJobConf == null) ? FileSystem
+ .getLocal(new Configuration()) : FileSystem
+ .get(PigMapReduce.sJobConf);
+ }
+ }
+
+ @Override
+ public void bindTo(OutputStream os) throws IOException {
+ // Nothing to bind here as we will be writing each tuple into a split
+ // based on its schema
+ }
+
+ /**
+ * Create an appropriate output stream for the fieldValue.
+ *
+ * @param fieldValue
+ * @return
+ * @throws IOException
+ */
+ private OutputStream createOutputStream(String fieldValue) throws IOException {
+ Path path = new Path(fieldValue, fieldValue + '-' + partition);
+ Path fieldValueBasedPath = new Path(workOutputPath, path);
+ OutputStream os = null;
+ switch (comp) {
+ case bz:
+ case bz2:
+ os = fs.create(fieldValueBasedPath.suffix(".bz2"), false);
+ os = new CBZip2OutputStream(os);
+ break;
+ case gz:
+ os = fs.create(fieldValueBasedPath.suffix(".gz"), false);
+ os = new GZIPOutputStream(os);
+ break;
+ case none:
+ os = fs.create(fieldValueBasedPath, false);
+ }
+ return os;
+ }
+
+ /**
+ * Retrieve the pig storage corresponding to the field value.
+ *
+ * @param fieldValue
+ * @return
+ * @throws IOException
+ */
+ private PigStorage getStore(String fieldValue) throws IOException {
+ PigStorage store = storeMap.get(fieldValue);
+ if (store == null) {
+ store = new PigStorage(fieldDel);
+ OutputStream os = createOutputStream(fieldValue);
+ store.bindTo(os);
+ outStreamList.add(os);
+ storeMap.put(fieldValue, store);
+ }
+ return store;
+ }
+
+ @Override
+ public void putNext(Tuple tuple) throws IOException {
+ initJobSpecificParams();
+ if (tuple.size() <= splitFieldIndex) {
+ throw new IOException("split field index:" + this.splitFieldIndex
+ + " >= tuple size:" + tuple.size());
+ }
+ Object field = null;
+ try {
+ field = tuple.get(splitFieldIndex);
+ } catch (ExecException exec) {
+ throw new IOException(exec);
+ }
+ PigStorage store = getStore(String.valueOf(field));
+ store.putNext(tuple);
+ }
+
+ /**
+ * Flush the output streams and call pigStorage.finish() for each pigStorage
+ * object. Clear the map of pigStorage objects and move the final results to
+ * the correct location from the temporary output path since multiquery
+ * implementation might ignore our results.
+ *
+ * @ throws IOException
+ */
+ @Override
+ public void finish() throws IOException {
+ Collection<PigStorage> pigStores = storeMap.values();
+ for (PigStorage store : pigStores) {
+ store.finish();
+ }
+ storeMap.clear();
+ for (OutputStream os : outStreamList) {
+ os.flush();
+ os.close();
+ }
+ outStreamList.clear();
+ // move the results here
+ if (PigMapReduce.sJobConf != null) {
+ Path rem = FileOutputFormat.getWorkOutputPath(PigMapReduce.sJobConf);
+ String pathToRemove = rem.toUri().getPath() + (!isAbsolute ? "/" : "");
+ moveResults(workOutputPath, pathToRemove);
+ }
+ }
+
+ /**
+ * Moves the files and dir under given path 'p' to the actual path. The API
+ * traverses the workOutputPath recursively and renames the files and
+ * directories by removing 'rem' from their path names
+ *
+ * @param p
+ * The
+ * @param rem
+ * @throws IOException
+ */
+ private void moveResults(Path p, String rem) throws IOException {
+ for (FileStatus fstat : fs.listStatus(p, hiddenPathFilter)) {
+ Path src = fstat.getPath();
+ Path dst = new Path(src.toUri().getPath().replace(rem, ""));
+ if (fstat.isDir()) {
+ fs.mkdirs(dst);
+ moveResults(src, rem);
+ } else {
+ fs.rename(src, dst);
+ }
+ }
+ }
+
+ // @Override
+ public Class getStorePreparationClass() throws IOException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
Added: hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java?rev=883836&view=auto
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java (added)
+++ hadoop/pig/branches/load-store-redesign/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java Tue Nov 24 19:54:19 2009
@@ -0,0 +1,179 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you 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 org.apache.pig.piggybank.test.storage;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
+import org.apache.pig.ExecType;
+import org.apache.pig.PigServer;
+import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.test.MiniCluster;
+import org.apache.pig.test.Util;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class TestMultiStorage extends TestCase {
+ private static final String INPUT_FILE = "MultiStorageInput.txt";
+
+ private PigServer pigServer;
+ private PigServer pigServerLocal;
+
+ private MiniCluster cluster = MiniCluster.buildCluster();
+
+ public TestMultiStorage() throws ExecException, IOException {
+ pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
+ pigServerLocal = new PigServer(ExecType.LOCAL);
+ }
+
+ public static final PathFilter hiddenPathFilter = new PathFilter() {
+ public boolean accept(Path p) {
+ String name = p.getName();
+ return !name.startsWith("_") && !name.startsWith(".");
+ }
+ };
+
+ private void createFile() throws IOException {
+ PrintWriter w = new PrintWriter(new FileWriter(INPUT_FILE));
+ w.println("100\tapple\taaa1");
+ w.println("200\torange\tbbb1");
+ w.println("300\tstrawberry\tccc1");
+
+ w.println("101\tapple\taaa2");
+ w.println("201\torange\tbbb2");
+ w.println("301\tstrawberry\tccc2");
+
+ w.println("102\tapple\taaa3");
+ w.println("202\torange\tbbb3");
+ w.println("302\tstrawberry\tccc3");
+
+ w.close();
+ Util.deleteFile(cluster, INPUT_FILE);
+ Util.copyFromLocalToCluster(cluster, INPUT_FILE, INPUT_FILE);
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ createFile();
+ FileSystem fs = FileSystem.getLocal(new Configuration());
+ Path localOut = new Path("local-out");
+ Path dummy = new Path("dummy");
+ if (fs.exists(localOut)) {
+ fs.delete(localOut, true);
+ }
+ if (fs.exists(dummy)) {
+ fs.delete(dummy, true);
+ }
+ }
+
+ @Override
+ @After
+ public void tearDown() throws Exception {
+ new File(INPUT_FILE).delete();
+ Util.deleteFile(cluster, INPUT_FILE);
+ }
+
+ enum Mode {
+ local, cluster
+ };
+
+ @Test
+ public void testMultiStorage() throws IOException {
+ final String LOAD = "A = LOAD '" + INPUT_FILE + "' as (id, name, n);";
+ final String MULTI_STORE_CLUSTER = "STORE A INTO 'mr-out' USING "
+ + "org.apache.pig.piggybank.storage.MultiStorage('mr-out', '1');";
+ final String MULTI_STORE_LOCAL = "STORE A INTO 'dummy' USING "
+ + "org.apache.pig.piggybank.storage.MultiStorage('local-out', '1');";
+
+ System.out.print("Testing in LOCAL mode: ...");
+ //testMultiStorage(Mode.local, "local-out", LOAD, MULTI_STORE_LOCAL);
+ System.out.println("Succeeded!");
+
+ System.out.print("Testing in CLUSTER mode: ...");
+ testMultiStorage( Mode.cluster, "mr-out", LOAD, MULTI_STORE_CLUSTER);
+ System.out.println("Succeeded!");
+
+
+ }
+
+ /**
+ * The actual method that run the test in local or cluster mode.
+ *
+ * @param pigServer
+ * @param mode
+ * @param queries
+ * @throws IOException
+ */
+ private void testMultiStorage( Mode mode, String outPath,
+ String... queries) throws IOException {
+ PigServer pigServer = (Mode.local == mode) ? this.pigServerLocal : this.pigServer;
+ pigServer.setBatchOn();
+ for (String query : queries) {
+ pigServer.registerQuery(query);
+ }
+ pigServer.executeBatch();
+ verifyResults(mode, outPath);
+ }
+
+ /**
+ * Test if records are split into directories corresponding to split field
+ * values
+ *
+ * @param mode
+ * @throws IOException
+ */
+ private void verifyResults(Mode mode, String outPath) throws IOException {
+ FileSystem fs = (Mode.local == mode ? FileSystem
+ .getLocal(new Configuration()) : cluster.getFileSystem());
+ Path output = new Path(outPath);
+ Assert.assertTrue("Output dir does not exists!", fs.exists(output)
+ && fs.isDirectory(output));
+
+ Path[] paths = FileUtil.stat2Paths(fs.listStatus(output, hiddenPathFilter));
+ Assert.assertTrue("Split field dirs not found!", paths != null);
+
+ for (Path path : paths) {
+ String splitField = path.getName();
+ Path[] files = FileUtil.stat2Paths(fs.listStatus(path, hiddenPathFilter));
+ Assert.assertTrue("No files found for path: " + path.toUri().getPath(),
+ files != null);
+ for (Path filePath : files) {
+ if (fs.isFile(filePath)) {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(fs
+ .open(filePath)));
+ String line = "";
+ while ((line = reader.readLine()) != null) {
+ String[] fields = line.split("\\t");
+ Assert.assertEquals(fields.length, 3);
+ Assert.assertEquals("Unexpected field value in the output record",
+ splitField, fields[1]);
+ }
+ reader.close();
+ }
+ }
+ }
+ }
+}
Modified: hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt?rev=883836&r1=883835&r2=883836&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt Tue Nov 24 19:54:19 2009
@@ -3,8 +3,19 @@
Trunk (unreleased changes)
INCOMPATIBLE CHANGES
+ PIG-1099 Changed version number to be 0.7.0 to match Pig version number
+ change (yanz via gates)
IMPROVEMENTS
+
+ PIG-1077 Support record(row)-based file split in Zebra's
+ TableInputFormat (chaow via gates)
+
+ PIG-1089 Use Pig's version for Zebra's own versi (chaow via olgan)
+
+ PIG-1069 Order Preserving Sorted Table Union (yanz via gates)
+
+ PIG-997 Sorted Table Support by Zebra (yanz via gates)
PIG-996 Add findbugs, checkstyle, and clover to zebra build file (chaow via
gates)
@@ -18,6 +29,14 @@
BUG FIXES
+ PIG-1091: Exception when load with projection of map keys on a map column
+ that is not map split (yanz via gates).
+
+ PIG-1026: [zebra] map split returns null (yanz via pradeepkth)
+
+ PIG-1057 Zebra does not support concurrent deletions of column groups now
+ (chaow via gates).
+
PIG-944 Change schema to be taken from StoreConfig instead of
TableStorer's constructor (yanz via gates).
Modified: hadoop/pig/branches/load-store-redesign/contrib/zebra/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/zebra/build-contrib.xml?rev=883836&r1=883835&r2=883836&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/zebra/build-contrib.xml (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/zebra/build-contrib.xml Tue Nov 24 19:54:19 2009
@@ -23,7 +23,7 @@
<property name="name" value="${ant.project.name}"/>
<property name="root" value="${basedir}"/>
- <!--property name="version" value="0.1.0-dev"/-->
+ <property name="version" value="0.7.0-dev"/>
<!-- Load all the default properties, and any the user wants -->
<!-- to contribute (without having to type -D or edit this file -->
@@ -44,7 +44,7 @@
<property name="conf.dir" location="${pig.root}/conf"/>
<property name="test.junit.output.format" value="plain"/>
<property name="test.output" value="no"/>
- <property name="test.timeout" value="900000"/>
+ <property name="test.timeout" value="9000000"/>
<property name="build.dir" location="${pig.root}/build/contrib/${name}"/>
<property name="build.javadoc"
location="${pig.root}/build/contrib/${name}/docs"/>
@@ -53,6 +53,7 @@
<property name="build.examples" location="${build.dir}/examples"/>
<property name="pig.log.dir" location="${build.dir}/test/logs"/>
<property name="hadoop.jarfile" value="hadoop20.jar" />
+ <property name="pig.jarfile" value="pig-0.6.0-dev-core.jar" />
<property name="hbase.jarfile" value="hbase-0.18.1.jar" />
<property name="hbase.test.jarfile" value="hbase-0.18.1-test.jar" />
@@ -103,6 +104,9 @@
<include name="${hbase.jarfile}" />
<include name="${hbase.test.jarfile}" />
</fileset>
+ <fileset dir="${pig.root}/build">
+ <include name="${pig.jarfile}" />
+ </fileset>
<fileset dir="${pig.root}/build/ivy/lib">
<include name="**/*.jar"/>
</fileset>
Modified: hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml?rev=883836&r1=883835&r2=883836&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml Tue Nov 24 19:54:19 2009
@@ -24,23 +24,26 @@
<project name="zebra" default="jar">
<import file="build-contrib.xml"/>
- <property name="zebraVersion" value="0.2.0" />
<!-- Override jar target to specify main class -->
<target name="jar" depends="compile" description="Build zebra jar">
<jar
- jarfile="${build.dir}/${name}-${zebraVersion}.jar"
+ jarfile="${build.dir}/${name}-${version}.jar"
basedir="${build.classes}"
>
<manifest>
<attribute name="Main-Class" value="org.apache.hadoop.zebra.io.BasicTable"/>
</manifest>
+
+ <zipfileset src="${pig.root}/lib/${hadoop.jarfile}">
+ <include name="${hadoop.includes}" />
+ </zipfileset>
</jar>
</target>
<target name="schema-jar" depends="compile">
<jar
- jarfile="${build.dir}/schema-${zebraVersion}.jar"
+ jarfile="${build.dir}/schema-${version}.jar"
basedir="${build.classes}"
includes="**/schema/**"
>
@@ -105,7 +108,7 @@
<mkdir dir="${pig.log.dir}"/>
<junit
printsummary="yes" showoutput="${test.output}"
- haltonfailure="no" fork="yes" maxmemory="256m"
+ haltonfailure="no" fork="yes" maxmemory="1024m"
errorProperty="tests.failed" failureProperty="tests.failed"
timeout="${test.timeout}">
@@ -149,7 +152,7 @@
<mkdir dir="${pig.log.dir}"/>
<junit
printsummary="yes" showoutput="${test.output}"
- haltonfailure="no" fork="yes" maxmemory="256m"
+ haltonfailure="no" fork="yes" maxmemory="1024m"
errorProperty="tests.failed" failureProperty="tests.failed"
timeout="${test.timeout}">
@@ -170,9 +173,16 @@
<classpath refid="test.classpath"/>
<formatter type="${test.junit.output.format}" />
+ <!-- For the time being, we disable two test cases that need a real cluster to run -->
<batchtest todir="${build.test}">
- <fileset dir="${src.test}"
- includes="**/Test*.java" excludes="**/${test.exclude}.java" />
+ <fileset dir="${src.test}" includes="**/Test*.java" excludes="**/TestCheckin*.java">
+ <not>
+ <filename name="**/TestRealCluster.java"/>
+ </not>
+ <not>
+ <filename name="**/TestColumnSecurity.java"/>
+ </not>
+ </fileset>
</batchtest>
</junit>
<fail if="tests.failed">Tests failed!</fail>