This repository was archived by the owner on Dec 15, 2025. It is now read-only.
Merge 6.0 branch#351
Merged
carsonwang merged 61 commits intoIntel-bigdata:masterfrom Nov 7, 2016
Merged
Conversation
… case (Intel-bigdata#313) * support multi benchmark/module and more flexible spark version * sparkbench's pom for multi spark module build * modify parent and remove mr profiles * modify parent remove mr profiles * add basic graph pom file * add basic pom file * add basic pom file for other benchmark * add sort run.sh * add sort.conf * flexibl specify benchmark and module
* Add 'Sleep' test case * Correct the parameter of 'enter_barch'
…tel-bigdata#312) * refactor generate_optional_value function to probe the JAVA_OPTS in a right way, gain a clearer hint & comments, wipe out support for CDH4 and MR1, and grant more readability. * Change probe_java_opts function to deal with any weird xml style, tune the codes and remove some unuseful codes * Use autopep8 to standardize the code * Add bin/conf for terasort, already finished test for Hadoop, Spark Standalone and Spark on yarn * Use new config name instead of the old
* Add workload Kmeans * Fix pom
…el-bigdata#319) * Refactor the functions to auto probe example(test) jars, add the function to auto probe webUI port number * Change the variable name to serve more general cases
* Add workload NWeight back * add license header and fix style
…-sql-scan()in workload-functions.sh to remove HIVE_SQL_COMPRESS_OPTS, add ScalaSparkSQLBench.scala to spark Sql bench
…/hadoop/run.sh to remove annotation
* add bayes tests * add words resources * mahout version * modify bayes conf * modify gitignore * modify bayes hadoop run.sh * modify mahout opensource version * add nutchindexing module * modify nutch conf * nutchindxing conf * add prepare.sh * modify func and run.sh * move nutch to websearch * modify hadoopbench/pom/xml
* Add unit test for load_config.py * Modify the unittest to use Python mock instead of touching fake files * Wipe out the bad import use: from MODULE import * * Add unittest for probe_hadoop_test_example using mock library * Add unittest functions which read conf files as expected answers for load_config module * Beautify the code using autopep8
* support spark 2.0 * change sql output format to text
…event some proxy problems which caused slaves.hostnames probing failure (Intel-bigdata#348)
Contributor
|
So master is 6.0 now? The README reflects 5.0. How was the push to master done? As I look at the history I'm confused how the merge occurred. |
Collaborator
Author
|
@harschware , I rebased the 6.0 branch on master and then merged it. |
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.