Skip to content
This repository has been archived by the owner on Jul 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #26 from dgomezferro/api
Browse files Browse the repository at this point in the history 
Api Improvements
  • Loading branch information
@dgomezferro
dgomezferro committed Mar 21, 2013
2 parents 0899de0 + 2c7ec93 commit 9d9fca9
Show file tree
Hide file tree
Showing 33 changed files with 1,863 additions and 2,104 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
@@ -1,7 +1,7 @@
Omid
=====

The Omid project provides transactional support for key-value stores using Snapshot Isolation. Omid stands for Optimistically transactional Management in Datastores. At this stage of the project, HBase is the only supported data-store.
The Omid project provides transactional support for key-value stores using Snapshot Isolation. Omid stands for Optimistically transactional Management in Datasources. At this stage of the project, HBase is the only supported data-store.

If you have any question, please take a look to the [Wiki](https://github.com/yahoo/omid/wiki) or contact us at omid-project@googlegroups.com or read [the online archives](https://groups.google.com/forum/?fromgroups=#!forum/omid-project)

Expand All @@ -22,7 +22,7 @@ The core architecture of the software is described in more detail in the [Techni
Compilation
-----------

Omid uses Maven as its build system. We are using a temporary repository for Zookeeper and Bookkeeper packages to ease the installation procedure.
Omid uses Maven for its build system. We are using a temporary repository for Zookeeper and Bookkeeper packages to ease the installation procedure.

To compile Omid:

Expand All @@ -48,7 +48,7 @@ Hence, the order of starting should be:
3. TSO
4. Hbase

### Zookeeper & Bookkeeper
### Zookeeper & Bookkeepergit
Omid doesn't use anything special in Zookeeper or Bookkeeper, so you can use any install for these. However, if you are running this anywhere but localhost, you need to update the setting for HBase and TSO. See the HBase docs for changing the Zookeeper quorum. For TSO, you need to modify bin/omid.sh.

For simplicity we've included a utility script which starts Zookeeper and Bookkeeper. Run:
Expand Down Expand Up @@ -91,4 +91,4 @@ The logging preferences can be adjusted in src/main/resources/log4j.properties.

Acknowledgement
-------
This project has been partially supported by the EU Comission through the Cumulo Nimbo project (FP7-257993).
This project has been partially supported by the EU Comission through the Cumulo Nimbo project (FP7-257993).
14 changes: 11 additions & 3 deletions conf/log4j.properties
View file
@@ -1,3 +1,6 @@



########################################################################
#
# Copyright (c) 2011 Yahoo! Inc. All rights reserved.
Expand Down Expand Up @@ -39,7 +42,12 @@ log4j.appender.R.MaxBackupIndex=5
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.O.layout=org.apache.log4j.PatternLayout

log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n
log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n
#log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n
#log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n

log4j.appender.R.layout.ConversionPattern=[%d{HH:mm:ss,SSS}]%5p%6.6r[%t]%x - %C{1}.%M(%F:%L) - %m%n
log4j.appender.O.layout.ConversionPattern=[%d{HH:mm:ss,SSS}]%5p%6.6r[%t]%x - %C{1}.%M(%F:%L) - %m%n

log4j.logger.com.yahoo.omid.tso.ThroughputMonitor=TRACE
log4j.logger.com.yahoo.omid.tso.ThroughputMonitor=INFO
log4j.logger.com.yahoo.omid.notifications=TRACE
log4j.logger.com.yahoo.omid.examples.notifications=TRACE
76 changes: 1 addition & 75 deletions pom.xml
View file
Expand Up @@ -66,62 +66,7 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<!-- Build native code after .java compilation -->
<id>build-native</id>
<phase>process-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="jni"
description="Generate headers and compile the native code">
<echo>Generating JNI headers</echo>
<exec executable="javah">
<arg value="-d" />
<arg
value="${project.basedir}/target/main/native" />
<arg value="-classpath" />
<arg
value="${project.build.outputDirectory}" />
<arg value="-jni" />
<arg
value="com.yahoo.omid.tso.CommitHashMap" />
</exec>
<exec
dir="${project.basedir}/src/main/native"
executable="make" failonerror="true">
<arg value="all" />
</exec>
</target>
</configuration>
</execution>
<execution>
<!-- Make clean in the Maven clean phase -->
<id>clean-lib</id>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="clean-lib" description="Delete native lib">
<echo>Deleting native lib</echo>
<exec
dir="${project.basedir}/src/main/native"
executable="make">
<arg value="clean" />
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse
Expand All @@ -133,23 +78,6 @@
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
Expand Down Expand Up @@ -198,9 +126,7 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>0.92.0</version>
<type>jar</type>
<scope>compile</scope>
<version>0.94.3</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
Expand Down
181 changes: 0 additions & 181 deletions src/main/java/com/yahoo/omid/client/TransactionManager.java
View file

This file was deleted.

0 comments on commit 9d9fca9

Please sign in to comment.