You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/06/18 21:09:40 UTC
[10/10] asterixdb git commit: Merge branch 'release-0.9.4-pre-rc'
into master
Merge branch 'release-0.9.4-pre-rc' into master
Change-Id: Ia9a2b6512a5d8e6e6828e5fab115b68de19df8f3
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/8d04d7d6
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/8d04d7d6
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/8d04d7d6
Branch: refs/heads/master
Commit: 8d04d7d66c9e8745c273a07dd76e60d659412ffb
Parents: 5afd9fd 2d90c0c
Author: Michael Blow <mb...@apache.org>
Authored: Mon Jun 18 13:56:27 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Mon Jun 18 13:56:27 2018 -0400
----------------------------------------------------------------------
asterixdb/asterix-coverage/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 2 +-
asterixdb/pom.xml | 8 +-
.../hyracks-hdfs/hyracks-hdfs-1.x/pom.xml | 116 ------
.../org/apache/hyracks/hdfs/ContextFactory.java | 56 ---
.../hyracks/hdfs/MiniDFSClusterFactory.java | 35 --
.../hyracks-hdfs/hyracks-hdfs-2.x/pom.xml | 232 -----------
.../org/apache/hyracks/hdfs/ContextFactory.java | 57 ---
.../hyracks/hdfs/MiniDFSClusterFactory.java | 38 --
.../hyracks-hdfs/hyracks-hdfs-core/pom.xml | 409 -------------------
.../hyracks/hdfs/api/IKeyValueParser.java | 62 ---
.../hdfs/api/IKeyValueParserFactory.java | 46 ---
.../apache/hyracks/hdfs/api/INcCollection.java | 29 --
.../hyracks/hdfs/api/INcCollectionBuilder.java | 35 --
.../apache/hyracks/hdfs/api/ITupleWriter.java | 61 ---
.../hyracks/hdfs/api/ITupleWriterFactory.java | 40 --
.../hyracks/hdfs/dataflow/ConfFactory.java | 57 ---
.../dataflow/HDFSReadOperatorDescriptor.java | 153 -------
.../dataflow/HDFSWriteOperatorDescriptor.java | 134 ------
.../hdfs/dataflow/InputSplitsFactory.java | 109 -----
.../hdfs/lib/RawBinaryComparatorFactory.java | 48 ---
.../hdfs/lib/RawBinaryHashFunctionFactory.java | 47 ---
.../hdfs/lib/TextKeyValueParserFactory.java | 69 ----
.../hdfs/lib/TextTupleWriterFactory.java | 64 ---
.../IPProximityNcCollectionBuilder.java | 147 -------
.../scheduler/RackAwareNcCollectionBuilder.java | 215 ----------
.../hyracks/hdfs/scheduler/Scheduler.java | 405 ------------------
.../hyracks/hdfs2/dataflow/ConfFactory.java | 57 ---
.../hdfs2/dataflow/FileSplitsFactory.java | 109 -----
.../dataflow/HDFSReadOperatorDescriptor.java | 167 --------
.../dataflow/HDFSWriteOperatorDescriptor.java | 133 ------
.../hyracks/hdfs2/scheduler/Scheduler.java | 104 -----
.../hdfs2/scheduler/WrappedFileSplit.java | 69 ----
.../hyracks/hdfs/dataflow/DataflowTest.java | 217 ----------
.../hyracks/hdfs/scheduler/SchedulerTest.java | 268 ------------
.../apache/hyracks/hdfs/utils/HyracksUtils.java | 99 -----
.../hyracks/hdfs2/dataflow/DataflowTest.java | 134 ------
.../hyracks/hdfs2/scheduler/SchedulerTest.java | 170 --------
.../src/test/resources/data/customer.tbl | 150 -------
.../src/test/resources/expected/part-0 | 150 -------
.../test/resources/hadoop/conf/core-site.xml | 35 --
.../test/resources/hadoop/conf/hdfs-site.xml | 41 --
.../test/resources/hadoop/conf/log4j.properties | 112 -----
.../test/resources/hadoop/conf/mapred-site.xml | 43 --
.../src/test/resources/topology.xml | 51 ---
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 158 ++++++-
.../org/apache/hyracks/hdfs/ContextFactory.java | 57 +++
.../hyracks/hdfs/api/IKeyValueParser.java | 62 +++
.../hdfs/api/IKeyValueParserFactory.java | 46 +++
.../apache/hyracks/hdfs/api/INcCollection.java | 29 ++
.../hyracks/hdfs/api/INcCollectionBuilder.java | 35 ++
.../apache/hyracks/hdfs/api/ITupleWriter.java | 61 +++
.../hyracks/hdfs/api/ITupleWriterFactory.java | 40 ++
.../hyracks/hdfs/dataflow/ConfFactory.java | 57 +++
.../dataflow/HDFSReadOperatorDescriptor.java | 153 +++++++
.../dataflow/HDFSWriteOperatorDescriptor.java | 134 ++++++
.../hdfs/dataflow/InputSplitsFactory.java | 109 +++++
.../hdfs/lib/RawBinaryComparatorFactory.java | 48 +++
.../hdfs/lib/RawBinaryHashFunctionFactory.java | 47 +++
.../hdfs/lib/TextKeyValueParserFactory.java | 69 ++++
.../hdfs/lib/TextTupleWriterFactory.java | 64 +++
.../IPProximityNcCollectionBuilder.java | 147 +++++++
.../scheduler/RackAwareNcCollectionBuilder.java | 215 ++++++++++
.../hyracks/hdfs/scheduler/Scheduler.java | 405 ++++++++++++++++++
.../hyracks/hdfs2/dataflow/ConfFactory.java | 57 +++
.../hdfs2/dataflow/FileSplitsFactory.java | 109 +++++
.../dataflow/HDFSReadOperatorDescriptor.java | 167 ++++++++
.../dataflow/HDFSWriteOperatorDescriptor.java | 133 ++++++
.../hyracks/hdfs2/scheduler/Scheduler.java | 104 +++++
.../hdfs2/scheduler/WrappedFileSplit.java | 69 ++++
.../hyracks/hdfs/MiniDFSClusterFactory.java | 38 ++
.../hyracks/hdfs/dataflow/DataflowTest.java | 217 ++++++++++
.../hyracks/hdfs/scheduler/SchedulerTest.java | 268 ++++++++++++
.../apache/hyracks/hdfs/utils/HyracksUtils.java | 99 +++++
.../hyracks/hdfs2/dataflow/DataflowTest.java | 134 ++++++
.../hyracks/hdfs2/scheduler/SchedulerTest.java | 170 ++++++++
.../src/test/resources/data/customer.tbl | 150 +++++++
.../src/test/resources/expected/part-0 | 150 +++++++
.../test/resources/hadoop/conf/core-site.xml | 35 ++
.../test/resources/hadoop/conf/hdfs-site.xml | 41 ++
.../test/resources/hadoop/conf/log4j.properties | 112 +++++
.../test/resources/hadoop/conf/mapred-site.xml | 43 ++
.../src/test/resources/topology.xml | 51 +++
83 files changed, 4084 insertions(+), 4783 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8d04d7d6/asterixdb/asterix-external-data/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8d04d7d6/asterixdb/pom.xml
----------------------------------------------------------------------
diff --cc asterixdb/pom.xml
index 3885894,eaee996..5195967
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -867,6 -866,6 +867,10 @@@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
++ <exclusion>
++ <groupId>jdk.tools</groupId>
++ <artifactId>jdk.tools</artifactId>
++ </exclusion>
</exclusions>
</dependency>
<dependency>