Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ifwe #1

Open
wants to merge 413 commits into
base: master
Choose a base branch
from
Open

Ifwe #1

wants to merge 413 commits into from

Conversation

jeromebanks
Copy link
Contributor

merging from latest development

Yi Yin and others added 30 commits June 12, 2014 17:12
tryint to get null timestamp working for endTime
a585795
@jeromebanks
refactor TrackHistory a little bit; wire into ProofEngine
5ea9167
timestamp null is broken
d6c8c18
fixed null timestamp errors
f693fd2
@jeromebanks
start unit tests for abort
244c838
fixing completeRun
11b300e
finished testing start/completeRun
88a26fa
tested lookupGoalRun
37c8616
@jeromebanks
finish Abort and Restart logic
979d438
implemented jobhistory
66e1d4b
Merge remote-tracking branch 'upstream/master'
74f5147 
Conflicts:
	modules/engine/src/main/scala/satisfaction/track/JDBCSlickTrackHistory.scala
	modules/engine/src/test/scala/satisfaction/TrackHistorySpec.scala
finished TrackHistory but willrogers global is broken. Huh?
84a076e
trackhistory
750cfd8
clean up jobhistory
33074a8
first pass through TrackHistory done
67c78d7
@jeromebanks
fix non-partitioned table'
aec94cc
Merge pull request #43 from yyin/master
1e4cd9d 
Merge TrackHistory
@jeromebanks
rm .cache file
6ff6f65
@jeromebanks
Merge branch 'master' of https://github.tagged.com/jbanks/satisfactio…
49faf3c 
…n-limbo

Conflicts:
	modules/engine/.cache
patching willrogers trackhistory
17da268
@jeromebanks
refactor again; add witness to json mapping function
9f61b68
@jeromebanks
update readme for deployment
50b719f
first stable trackhistory UI - still lots of work to do
2513772
willrogers talks to trackhistory now keep truckin along
b193598
@jeromebanks
get service running on stagine
421c883
implement UI for lookup Goals - just truckin along
c5b58ac
filter has been implemented need to check if startTime and endTime ac…
db872d2 
…tually works
core trackHistory is implemented
ba5286b
@jeromebanks
attemp to publish to maven
f36412b
jobhistory complete
e656273
@jeromebanks
set rpmRelease back to 1
633d720
@jeromebanks
hold onto a metastore for 5 minutes ..
91db681
@jeromebanks
try to make continuous more robust; clean up output
5c2370d
@jeromebanks
try to workaround Cluster init bug
958f1d9
@jeromebanks
fix diamond graph bug
8523f43
@jeromebanks
use RemoteIterator for accessing files on HDFS;
f54a2f0 
 change FileSystem to use Iterable instead of Sequence
@jeromebanks
change rpm release to 1
08f3836
@jeromebanks
fix new HDFS remoteiterator
f3936df
@jeromebanks
revert implemention of Hdfs.listFiles
5f42feb
@jeromebanks
fix constant jobs; add on thread pool for JobRunner; add Add file , …
7f34833 
…implement DistCpSatisfier
@jeromebanks
configure akka threadpools for better throughput
87c94c1
@jeromebanks
remove @OverRide to force compile
4d6f658
@jeromebanks
avoid match error for isRunning
056ffb2
@jeromebanks
specify hive.aux.jars in properties;
4e90a49 
  fix VariablePath.variables
@jeromebanks
don't have to specify version for hive.aux.jars.path
2854850
@jeromebanks
fix ADD FILE regexes; Disctcp args; bump version
50f7c0f
@jeromebanks
try one static thread pool for all jobs, not one per job
e2dca88
@jeromebanks
set rpmRelease to 1
c7d8d91
@jeromebanks
remove var dependency on paths; add PathExists satisfier
655665c
@jeromebanks
fix problems with temporals and paths, plug leaks
6d24c87
@jeromebanks
bump version
b35423b
@jeromebanks
fix naming on Hive MS data outputs
d84aea3
@jeromebanks
No more poison pill
e212c07
@jeromebanks
update version of Hadoop
557ace5
@jeromebanks
change location of HADOOP_HOME
a4c9420
@jeromebanks
update hive version
ea2bd24
@jeromebanks
use hdp and conjars repos
ae3cf1f
@jeromebanks
fix mortbay dependency exclusion
dc65ac3
@jeromebanks
fix typo
ffdd051
@jeromebanks
Merge branch 'master' of https://github.com/jeromebanks/satisfaction …
62fc46c 
…into ifwe

Conflicts:
	apps/willrogers/app/controllers/ProjectPage.scala
	apps/willrogers/app/controllers/SatisfyGoalPage.scala
	apps/willrogers/app/controllers/ScheduleTrackPage.scala
	apps/willrogers/app/views/showproject.scala.html
	apps/willrogers/conf/routes
	apps/willrogers/src/main/public
	modules/core/src/main/scala/satisfaction/Goal.scala
	modules/core/src/main/scala/satisfaction/TemporalVariable.scala
	modules/core/src/main/scala/satisfaction/Track.scala
	modules/core/src/main/scala/satisfaction/fs/FileSystem.scala
	modules/core/src/main/scala/satisfaction/fs/LocalFs.scala
	modules/core/src/main/scala/satisfaction/fs/Path.scala
	modules/core/src/test/scala/satisfaction/FsSpec.scala
	modules/core/src/test/scala/satisfaction/SubstitutionSpec.scala
	modules/core/src/test/scala/satisfaction/TemporalSpec.scala
	modules/engine/src/main/scala/satisfaction/engine/actors/JobRunner.scala
	modules/engine/src/main/scala/satisfaction/engine/actors/LogWrapper.scala
	modules/engine/src/main/scala/satisfaction/engine/actors/PredicateProver.scala
	modules/engine/src/main/scala/satisfaction/engine/actors/ProofEngine.scala
	modules/engine/src/main/scala/satisfaction/track/TrackContext.scala
	modules/engine/src/main/scala/satisfaction/track/TrackFactory.scala
	modules/engine/src/main/scala/satisfaction/track/TrackScheduler.scala
	modules/hadoop/src/main/scala/satisfaction/hadoop/DistCpSatisfier.scala
	modules/hadoop/src/main/scala/satisfaction/hadoop/HadoopJobProgress.scala
	modules/hadoop/src/main/scala/satisfaction/hadoop/hdfs/Hdfs.scala
	modules/hadoop/src/main/scala/satisfaction/hadoop/hdfs/VariablePath.scala
	modules/hadoop/src/test/resources/config/hdfs-site.xml
	modules/hadoop/src/test/scala/satisfaction/hadoop/hdfs/HdfsSpec.scala
	modules/hive-ms/src/main/scala/satisfaction/hive/ms/HivePartitionSet.scala
	modules/hive-ms/src/main/scala/satisfaction/hive/ms/HiveTable.scala
	modules/hive-ms/src/main/scala/satisfaction/hive/ms/HiveTablePartitionGroup.scala
	modules/hive/src/main/scala/satisfaction/hadoop/hive/HiveDriver.scala
	modules/hive/src/main/scala/satisfaction/hadoop/hive/HiveLocalDriver.scala
	project/Build.scala
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jeromebanks