Skip to content
This repository was archived by the owner on Dec 15, 2025. It is now read-only.

Commit cb633ac

Browse files
carsonwangcarsonwang
committed
Merge branch '6.0withMaster'
2 parents 1f49a4f + 6b02cac commit cb633ac

File tree

560 files changed

+108095
-52112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

560 files changed

+108095
-52112
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ report/
1414
.classpath
1515
.project
1616
.settings/
17+
conf/hadoop.conf
18+
conf/spark.conf

‎Base_SCSReportforHiBench.html‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎WISS10_conf_full_011.pdf‎

-591 KB
Binary file not shown.

‎autogen/pom.xml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>com.intel.hibench</groupId>
8+
<artifactId>hibench</artifactId>
9+
<version>6.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>autogen</artifactId>
13+
<packaging>jar</packaging>
14+
<groupId>com.intel.hibench</groupId>
15+
<name>HiBench data generation tools</name>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.intel.hibench</groupId>
20+
<artifactId>hibench-common</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.apache.mahout</groupId>
25+
<artifactId>mahout-core</artifactId>
26+
<version>${mahout.version}</version>
27+
<exclusions>
28+
<exclusion>
29+
<groupId>org.apache.hadoop</groupId>
30+
<artifactId>hadoop-core</artifactId>
31+
</exclusion>
32+
</exclusions>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.apache.mahout</groupId>
36+
<artifactId>mahout-math</artifactId>
37+
<version>${mahout.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.uncommons.maths</groupId>
41+
<artifactId>uncommons-maths</artifactId>
42+
<version>${uncommons-maths.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.kafka</groupId>
46+
<artifactId>kafka-clients</artifactId>
47+
<version>0.8.2.2</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.hadoop</groupId>
51+
<artifactId>hadoop-hdfs</artifactId>
52+
<version>${hadoop.mr2.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.hadoop</groupId>
56+
<artifactId>hadoop-client</artifactId>
57+
<version>${hadoop.mr2.version}</version>
58+
</dependency>
59+
</dependencies>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<artifactId>maven-assembly-plugin</artifactId>
65+
<version>${maven-assembly-plugin.version}</version>
66+
<configuration>
67+
<descriptorRefs>
68+
<descriptorRef>jar-with-dependencies</descriptorRef>
69+
</descriptorRefs>
70+
</configuration>
71+
<executions>
72+
<execution>
73+
<id>make-assembly</id>
74+
<phase>package</phase>
75+
<goals>
76+
<goal>single</goal>
77+
</goals>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
</plugins>
82+
</build>
83+
</project>

src/autogen/src/main/java/HiBench/BayesData.java renamed to autogen/src/main/java/HiBench/BayesData.java

File renamed without changes.

src/autogen/src/main/java/HiBench/Counters.java renamed to autogen/src/main/java/HiBench/Counters.java

File renamed without changes.

src/autogen/src/main/java/HiBench/DataGen.java renamed to autogen/src/main/java/HiBench/DataGen.java

File renamed without changes.

src/autogen/src/main/java/HiBench/DataOptions.java renamed to autogen/src/main/java/HiBench/DataOptions.java

File renamed without changes.

src/autogen/src/main/java/HiBench/Dummy.java renamed to autogen/src/main/java/HiBench/Dummy.java

File renamed without changes.

src/autogen/src/main/java/HiBench/HiveData.java renamed to autogen/src/main/java/HiBench/HiveData.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,11 @@ private void createRankingsTableDirectly() throws IOException, URISyntaxExceptio
331331
job.setInputFormat(NLineInputFormat.class);
332332
FileInputFormat.setInputPaths(job, dummy.getPath());
333333

334-
job.set("mapred.map.output.compression.type", "BLOCK");
335-
job.set("mapreduce.output.fileoutputformat.compress.type","BLOCK");
336-
MapFileOutputFormat.setCompressOutput(job, true);
334+
// job.set("mapred.map.output.compression.type", "BLOCK");
335+
// job.set("mapreduce.output.fileoutputformat.compress.type","BLOCK");
336+
// MapFileOutputFormat.setCompressOutput(job, true);
337337
// MapFileOutputFormat.setOutputCompressorClass(job, org.apache.hadoop.io.compress.LzoCodec.class);
338-
MapFileOutputFormat.setOutputCompressorClass(job, org.apache.hadoop.io.compress.DefaultCodec.class);
338+
// MapFileOutputFormat.setOutputCompressorClass(job, org.apache.hadoop.io.compress.DefaultCodec.class);
339339

340340
if (options.isSequenceOut()) {
341341
job.setOutputFormat(SequenceFileOutputFormat.class);

0 commit comments

Comments
 (0)