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.
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
PHOENIX-6627 remove tephra references - WIP #1455
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,9 +137,7 @@ public static synchronized Collection<Object[]> data() { | |
Arrays.asList(new Object[][] { | ||
{ false, false, null, false }, { false, false, null, true }, | ||
{ false, true, "OMID", false }, | ||
{ false, true, "TEPHRA", false }, { false, true, "TEPHRA", true }, | ||
{ true, false, null, false }, { true, false, null, true }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here we have a single combination that uses OMID, and four that uses Tephra (probably to save on execution time). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Correction: |
||
{ true, true, "TEPHRA", false }, { true, true, "TEPHRA", true }, | ||
}), 2); | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,6 @@ | |
import org.apache.hadoop.hbase.client.TableDescriptor; | ||
import org.apache.hadoop.hbase.client.TableDescriptorBuilder; | ||
import org.apache.hadoop.hbase.util.Bytes; | ||
import org.apache.phoenix.coprocessor.TephraTransactionalProcessor; | ||
import org.apache.phoenix.end2end.ParallelStatsDisabledIT; | ||
import org.apache.phoenix.end2end.ParallelStatsDisabledTest; | ||
import org.apache.phoenix.exception.SQLExceptionCode; | ||
|
@@ -305,9 +304,9 @@ public void testNonTxToTxTable() throws Exception { | |
} | ||
|
||
htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes( nonTxTableName)); | ||
assertTrue(htable.getDescriptor().getCoprocessors().contains(TephraTransactionalProcessor.class.getName())); | ||
//assertTrue(htable.getDescriptor().getCoprocessors().contains(TephraTransactionalProcessor.class.getName())); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. again, check for the Omid coprocessor instead. |
||
htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(index)); | ||
assertTrue(htable.getDescriptor().getCoprocessors().contains(TephraTransactionalProcessor.class.getName())); | ||
//assertTrue(htable.getDescriptor().getCoprocessors().contains(TephraTransactionalProcessor.class.getName())); | ||
|
||
conn.createStatement().execute("UPSERT INTO " + nonTxTableName + " VALUES (4, 'c')"); | ||
ResultSet rs = conn.createStatement().executeQuery("SELECT /*+ NO_INDEX */ k FROM " + nonTxTableName + " WHERE v IS NULL"); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1255,7 +1255,7 @@ private PTable getTableFromCells(List<Cell> tableCellList, List<List<Cell>> allC | |
transactionalKv.getValueOffset(), | ||
transactionalKv.getValueLength()))) { | ||
// For backward compat, prior to client setting TRANSACTION_PROVIDER | ||
transactionProvider = TransactionFactory.Provider.TEPHRA; | ||
transactionProvider = TransactionFactory.Provider.OMID; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a behaviour change for old clients that only expect Tephra to exist. I am assuming from the comment the the Omid aware clients always set the Provider, but haven't checked it. |
||
} | ||
} else { | ||
transactionProvider = TransactionFactory.Provider.fromCode( | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1867,7 +1867,7 @@ public static PTable createFromProto(PTableProtos.PTable table) { | |
transactionProvider = TransactionFactory.Provider.fromCode(table.getTransactionProvider()); | ||
} else if (table.hasTransactional()) { | ||
// For backward compatibility prior to transactionProvider field | ||
transactionProvider = TransactionFactory.Provider.TEPHRA; | ||
transactionProvider = TransactionFactory.Provider.OMID; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should consider erroring out in this case as well. |
||
} | ||
ViewType viewType = null; | ||
String viewStatement = null; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,7 +60,7 @@ public PhoenixTransactionClient getTransactionClient(Configuration config, Conne | |
|
||
@Override | ||
public Provider getProvider() { | ||
return TransactionFactory.Provider.TEPHRA; | ||
return TransactionFactory.Provider.OMID; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not right. |
||
} | ||
|
||
@Override | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of @Ignore-ing this test, we could just change it to test for OmidTransactionaProcessor instead.