This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo.git
The following commit(s) were added to refs/heads/master by this push:
new 370158f fix spelling of encode (#1061)
370158f is described below
commit 370158f1c99b3351f2325b09dea42c0dfe058b3d
Author: Keith Turner <[email protected]>
AuthorDate: Thu Nov 8 14:21:07 2018 -0500
fix spelling of encode (#1061)
---
.../fluo/accumulo/iterators/SnapshotIterator.java | 8 ++++----
.../java/org/apache/fluo/accumulo/util/ColumnType.java | 2 +-
.../fluo/accumulo/iterators/SnapshotIteratorTest.java | 2 +-
.../org/apache/fluo/accumulo/iterators/TestData.java | 16 ++++++++--------
.../org/apache/fluo/accumulo/util/ColumnTypeTest.java | 2 +-
.../java/org/apache/fluo/core/impl/LockResolver.java | 6 +++---
.../org/apache/fluo/core/impl/TransactionImpl.java | 18 +++++++++---------
.../java/org/apache/fluo/core/util/ColumnUtil.java | 8 ++++----
.../apache/fluo/mapreduce/FluoKeyValueGenerator.java | 4 ++--
.../apache/fluo/mapreduce/FluoMutationGenerator.java | 4 ++--
pom.xml | 10 +++++-----
11 files changed, 40 insertions(+), 40 deletions(-)
diff --git
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/SnapshotIterator.java
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/SnapshotIterator.java
index 4b5ab9d..178ae7a 100644
---
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/SnapshotIterator.java
+++
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/SnapshotIterator.java
@@ -113,7 +113,7 @@ public class SnapshotIterator implements
SortedKeyValueIterator<Key, Value> {
source.skipToPrefix(curCol, ColumnType.DEL_LOCK);
continue;
} else {
- source.skipToTimestamp(curCol,
ColumnType.WRITE.enode(snaptime));
+ source.skipToTimestamp(curCol,
ColumnType.WRITE.encode(snaptime));
continue;
}
}
@@ -147,7 +147,7 @@ public class SnapshotIterator implements
SortedKeyValueIterator<Key, Value> {
source.skipColumn(curCol);
continue outer;
} else {
- source.skipToTimestamp(curCol,
ColumnType.DATA.enode(dataPointer));
+ source.skipToTimestamp(curCol,
ColumnType.DATA.encode(dataPointer));
continue;
}
}
@@ -164,7 +164,7 @@ public class SnapshotIterator implements
SortedKeyValueIterator<Key, Value> {
}
if (ts > dataPointer) {
- source.skipToTimestamp(curCol,
ColumnType.DATA.enode(dataPointer));
+ source.skipToTimestamp(curCol,
ColumnType.DATA.encode(dataPointer));
continue;
}
break;
@@ -174,7 +174,7 @@ public class SnapshotIterator implements
SortedKeyValueIterator<Key, Value> {
source.skipColumn(curCol);
continue outer;
} else {
- source.skipToTimestamp(curCol,
ColumnType.DATA.enode(dataPointer));
+ source.skipToTimestamp(curCol,
ColumnType.DATA.encode(dataPointer));
continue;
}
}
diff --git
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/util/ColumnType.java
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/util/ColumnType.java
index b16fe6d..fc194f5 100644
---
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/util/ColumnType.java
+++
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/util/ColumnType.java
@@ -37,7 +37,7 @@ public enum ColumnType {
/**
* @return The timestamp with this column type encoded into the high order
bits.
*/
- public long enode(long timestamp) {
+ public long encode(long timestamp) {
Preconditions.checkArgument((timestamp >>> (64 - BITS)) == 0);
return prefix | timestamp;
}
diff --git
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
index 7358e1e..aa7af83 100644
---
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
+++
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
@@ -320,6 +320,6 @@ public class SnapshotIteratorTest {
@Test(expected = IllegalArgumentException.class)
public void testNonZeroPrefix() {
- SnapshotIterator.setSnaptime(null, ColumnType.DATA.enode(6));
+ SnapshotIterator.setSnaptime(null, ColumnType.DATA.encode(6));
}
}
diff --git
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
index ad595e0..b34c933 100644
---
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
+++
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java
@@ -101,28 +101,28 @@ public class TestData {
switch (ct) {
case "ACK":
- ts = ColumnType.ACK.enode(ts);
+ ts = ColumnType.ACK.encode(ts);
break;
case "TX_DONE":
- ts = ColumnType.TX_DONE.enode(ts);
+ ts = ColumnType.TX_DONE.encode(ts);
break;
case "WRITE":
- ts = ColumnType.WRITE.enode(ts);
+ ts = ColumnType.WRITE.encode(ts);
long writeTs = Long.parseLong(value.split("\\s+")[0]);
val = WriteValue.encode(writeTs, value.contains("PRIMARY"),
value.contains("DELETE"));
break;
case "LOCK":
- ts = ColumnType.LOCK.enode(ts);
+ ts = ColumnType.LOCK.encode(ts);
String rc[] = value.split("\\s+");
val = LockValue.encode(Bytes.of(rc[0]), new Column(rc[1], rc[2]),
value.contains("WRITE"),
value.contains("DELETE"), value.contains("TRIGGER"), 42l);
break;
case "DATA":
- ts = ColumnType.DATA.enode(ts);
+ ts = ColumnType.DATA.encode(ts);
val = value.getBytes();
break;
case "DEL_LOCK":
- ts = ColumnType.DEL_LOCK.enode(ts);
+ ts = ColumnType.DEL_LOCK.encode(ts);
if (value.contains("ROLLBACK") || value.contains("ABORT")) {
val = DelLockValue.encodeRollback(value.contains("PRIMARY"), true);
} else {
@@ -132,11 +132,11 @@ public class TestData {
break;
case "RLOCK":
ts = ReadLockUtil.encodeTs(ts, false);
- ts = ColumnType.RLOCK.enode(ts);
+ ts = ColumnType.RLOCK.encode(ts);
break;
case "DEL_RLOCK":
ts = ReadLockUtil.encodeTs(ts, true);
- ts = ColumnType.RLOCK.enode(ts);
+ ts = ColumnType.RLOCK.encode(ts);
if (value.contains("ROLLBACK") || value.contains("ABORT")) {
val = DelReadLockValue.encodeRollback();
diff --git
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/util/ColumnTypeTest.java
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/util/ColumnTypeTest.java
index 3b0b09b..63e5151 100644
---
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/util/ColumnTypeTest.java
+++
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/util/ColumnTypeTest.java
@@ -57,7 +57,7 @@ public class ColumnTypeTest {
@Test
public void testPrefix() {
for (long l : new long[] {0, 2, 13, 19 * 19L, 1L << 50, 1L << 50 + 1L <<
48}) {
- EPM.forEach((prefix, colType) -> assertEquals(prefix | l,
colType.enode(l)));
+ EPM.forEach((prefix, colType) -> assertEquals(prefix | l,
colType.encode(l)));
}
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/LockResolver.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/LockResolver.java
index 54d2fa0..55fd7ba 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/LockResolver.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/LockResolver.java
@@ -221,11 +221,11 @@ public class LockResolver {
if (lockInfo.isReadLock) {
mut.put(k.getColumnFamilyData().toArray(),
k.getColumnQualifierData().toArray(),
k.getColumnVisibilityParsed(),
- ColumnType.RLOCK.enode(ReadLockUtil.encodeTs(lockInfo.lockTs,
true)),
+ ColumnType.RLOCK.encode(ReadLockUtil.encodeTs(lockInfo.lockTs,
true)),
DelReadLockValue.encodeRollback());
} else {
mut.put(k.getColumnFamilyData().toArray(),
k.getColumnQualifierData().toArray(),
- k.getColumnVisibilityParsed(),
ColumnType.DEL_LOCK.enode(lockInfo.lockTs),
+ k.getColumnVisibilityParsed(),
ColumnType.DEL_LOCK.encode(lockInfo.lockTs),
DelLockValue.encodeRollback(false, true));
}
}
@@ -241,7 +241,7 @@ public class LockResolver {
ConditionalFlutation delLockMutation = new ConditionalFlutation(env,
prc.prow,
new FluoCondition(env,
prc.pcol).setIterators(iterConf).setValue(lockValue));
- delLockMutation.put(prc.pcol, ColumnType.DEL_LOCK.enode(prc.startTs),
+ delLockMutation.put(prc.pcol, ColumnType.DEL_LOCK.encode(prc.startTs),
DelLockValue.encodeRollback(true, true));
ConditionalWriter cw = null;
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/TransactionImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/TransactionImpl.java
index 3cbbe5c..aecfa18 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/TransactionImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/TransactionImpl.java
@@ -406,14 +406,14 @@ public class TransactionImpl extends
AbstractTransactionBase implements AsyncTra
}
if (isWrite(val) && !isDelete(val)) {
- cm.put(col, ColumnType.DATA.enode(startTs), val.toArray());
+ cm.put(col, ColumnType.DATA.encode(startTs), val.toArray());
}
if (isReadLock(val)) {
- cm.put(col, ColumnType.RLOCK.enode(ReadLockUtil.encodeTs(startTs,
false)),
+ cm.put(col, ColumnType.RLOCK.encode(ReadLockUtil.encodeTs(startTs,
false)),
ReadLockValue.encode(primaryRow, primaryColumn, getTransactorID()));
} else {
- cm.put(col, ColumnType.LOCK.enode(startTs), LockValue.encode(primaryRow,
primaryColumn,
+ cm.put(col, ColumnType.LOCK.encode(startTs),
LockValue.encode(primaryRow, primaryColumn,
isWrite(val), isDelete(val), isTriggerRow, getTransactorID()));
}
@@ -670,7 +670,7 @@ public class TransactionImpl extends
AbstractTransactionBase implements AsyncTra
startKey.setTimestamp(ColumnType.ACK.first());
Key endKey = SpanUtil.toKey(notification.getRowColumn());
- endKey.setTimestamp(ColumnType.ACK.enode(notification.getTimestamp()
+ 1));
+
endKey.setTimestamp(ColumnType.ACK.encode(notification.getTimestamp() + 1));
Range range = new Range(startKey, endKey);
@@ -1110,10 +1110,10 @@ public class TransactionImpl extends
AbstractTransactionBase implements AsyncTra
m = new Flutation(env, row);
for (Entry<Column, Bytes> entry : updates.get(row).entrySet()) {
if (isReadLock(entry.getValue())) {
- m.put(entry.getKey(),
ColumnType.RLOCK.enode(ReadLockUtil.encodeTs(startTs, true)),
+ m.put(entry.getKey(),
ColumnType.RLOCK.encode(ReadLockUtil.encodeTs(startTs, true)),
DelReadLockValue.encodeRollback());
} else {
- m.put(entry.getKey(), ColumnType.DEL_LOCK.enode(startTs),
+ m.put(entry.getKey(), ColumnType.DEL_LOCK.encode(startTs),
DelLockValue.encodeRollback(false, true));
}
}
@@ -1131,9 +1131,9 @@ public class TransactionImpl extends
AbstractTransactionBase implements AsyncTra
// mark transaction as complete for garbage collection purposes
Flutation m = new Flutation(env, cd.prow);
- m.put(cd.pcol, ColumnType.DEL_LOCK.enode(startTs),
+ m.put(cd.pcol, ColumnType.DEL_LOCK.encode(startTs),
DelLockValue.encodeRollback(startTs, true, true));
- m.put(cd.pcol, ColumnType.TX_DONE.enode(startTs), EMPTY);
+ m.put(cd.pcol, ColumnType.TX_DONE.encode(startTs), EMPTY);
return Collections.singletonList(m);
}
@@ -1389,7 +1389,7 @@ public class TransactionImpl extends
AbstractTransactionBase implements AsyncTra
Flutation m = new Flutation(env, cd.prow);
// mark transaction as complete for garbage collection purposes
- m.put(cd.pcol, ColumnType.TX_DONE.enode(commitTs), EMPTY);
+ m.put(cd.pcol, ColumnType.TX_DONE.encode(commitTs), EMPTY);
afterFlushMutations.add(m);
if (weakNotification != null) {
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/util/ColumnUtil.java
b/modules/core/src/main/java/org/apache/fluo/core/util/ColumnUtil.java
index 9ea5130..bf32a61 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/util/ColumnUtil.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/util/ColumnUtil.java
@@ -56,18 +56,18 @@ public class ColumnUtil {
boolean isWrite, boolean isDelete, boolean isReadlock, long startTs,
long commitTs,
Set<Column> observedColumns, Mutation m) {
if (isReadlock) {
- Flutation.put(env, m, col,
ColumnType.RLOCK.enode(ReadLockUtil.encodeTs(startTs, true)),
+ Flutation.put(env, m, col,
ColumnType.RLOCK.encode(ReadLockUtil.encodeTs(startTs, true)),
DelReadLockValue.encodeCommit(commitTs));
} else if (isWrite) {
- Flutation.put(env, m, col, ColumnType.WRITE.enode(commitTs),
+ Flutation.put(env, m, col, ColumnType.WRITE.encode(commitTs),
WriteValue.encode(startTs, isPrimary, isDelete));
} else {
- Flutation.put(env, m, col, ColumnType.DEL_LOCK.enode(startTs),
+ Flutation.put(env, m, col, ColumnType.DEL_LOCK.encode(startTs),
DelLockValue.encodeCommit(commitTs, isPrimary));
}
if (isTrigger) {
- Flutation.put(env, m, col, ColumnType.ACK.enode(startTs),
TransactionImpl.EMPTY);
+ Flutation.put(env, m, col, ColumnType.ACK.encode(startTs),
TransactionImpl.EMPTY);
}
}
diff --git
a/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoKeyValueGenerator.java
b/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoKeyValueGenerator.java
index 3fa156c..12def1c 100644
---
a/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoKeyValueGenerator.java
+++
b/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoKeyValueGenerator.java
@@ -187,11 +187,11 @@ public class FluoKeyValueGenerator {
*/
public FluoKeyValue[] getKeyValues() {
FluoKeyValue kv = keyVals[0];
- kv.setKey(new Key(row, fam, qual, vis, ColumnType.WRITE.enode(1)));
+ kv.setKey(new Key(row, fam, qual, vis, ColumnType.WRITE.encode(1)));
kv.getValue().set(WriteValue.encode(0, false, false));
kv = keyVals[1];
- kv.setKey(new Key(row, fam, qual, vis, ColumnType.DATA.enode(0)));
+ kv.setKey(new Key(row, fam, qual, vis, ColumnType.DATA.encode(0)));
kv.getValue().set(val);
return keyVals;
diff --git
a/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoMutationGenerator.java
b/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoMutationGenerator.java
index e09f20e..9293c2c 100644
---
a/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoMutationGenerator.java
+++
b/modules/mapreduce/src/main/java/org/apache/fluo/mapreduce/FluoMutationGenerator.java
@@ -83,8 +83,8 @@ public class FluoMutationGenerator {
}
public FluoMutationGenerator put(Column col, byte[] value) {
- Flutation.put(mutation, col, ColumnType.DATA.enode(0), value);
- Flutation.put(mutation, col, ColumnType.WRITE.enode(1),
WriteValue.encode(0, false, false));
+ Flutation.put(mutation, col, ColumnType.DATA.encode(0), value);
+ Flutation.put(mutation, col, ColumnType.WRITE.encode(1),
WriteValue.encode(0, false, false));
return this;
}
diff --git a/pom.xml b/pom.xml
index c6ee249..2dfa651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,11 +93,6 @@
<version>27.0-jre</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.2</version>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
@@ -144,6 +139,11 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
