Skip to content

PR12052020 #29

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

Merged
interference-project merged 1 commit into from
May 12, 2020
Merged

PR12052020 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ frame.size=8192
frame.size.ix=8192

# system code page
codepage=Cp1251
codepage=UTF8

###########################################
# runtime parameters
Expand Down
Binary file removed interference-2020.1.jar
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion interference-2020.1.jar.md5
View file
Open in desktop

This file was deleted.

23 changes: 17 additions & 6 deletions src/main/java/su/interference/core/DataChunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ public DataChunk (ValueSet vs, Session s, Table t) {
} catch (Exception e) {
e.printStackTrace();
}
header.setLen(getChunkLen());
header.setLen(getChunk().length);
//header.setLen(getChunkLen());
}

//serializer INSERT ONLY!!! (with generate Id value)
Expand All @@ -332,7 +333,7 @@ public DataChunk (Object o, Session s) throws IOException, InvocationTargetExcep
public DataChunk (Object o, Session s, RowId r) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
this.entity = o;
this.state = NORMAL_STATE;
this.header = new RowHeader(r, null, getChunkLen(), false);
this.header = new RowHeader(r, null, getChunk().length, false);
}

public DataChunk (byte[] b, int file, long frame, int hsize, DataObject t, Class c) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InternalException, MalformedURLException {
Expand Down Expand Up @@ -411,6 +412,7 @@ public byte[] getChunk () {
return null;
}

//todo
public int getChunkLen () {
if (state == INIT_STATE) {
return chunk.length;
Expand Down Expand Up @@ -480,7 +482,8 @@ public Object getEntity () {
}
}
if (t.isIndex()) {
final DataChunk dc = (DataChunk) Instance.getInstance().getChunkByPointer(this.getHeader().getFramePtr(), this.getHeader().getFramePtrRowId().getRowPointer());
final ResultSetEntity rsa = (ResultSetEntity) ((Table) this.t).getTableClass().getAnnotation(ResultSetEntity.class);
final DataChunk dc = rsa == null ? (DataChunk) Instance.getInstance().getChunkByPointer(this.getHeader().getFramePtr(), this.getHeader().getFramePtrRowId().getRowPointer()) : this;
((IndexChunk)o).setDataChunk(dc);
if (dc == null) {
// todo during rframe.IndexFrame.init system directory not yet contains replicated FrameData objects
Expand Down Expand Up @@ -541,6 +544,8 @@ public Object getEntity (Class c, Object[] params) {
} catch (Exception e) {
e.printStackTrace();
}
this.chunk = null;
this.state = NORMAL_STATE;
return entity;
}

Expand Down Expand Up @@ -598,6 +603,12 @@ public void updateEntity(Object o) throws InternalException, ClassNotFoundExcept
}
}

protected void setNormalState() {
//set chunk to normal state after update
this.chunk = null;
this.state = NORMAL_STATE;
}

//for UNDO processing
public DataChunk cloneEntity(Session s) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
final byte[] b = this.getChunk();
Expand Down Expand Up @@ -644,8 +655,8 @@ public void setHeader(Header header) {
//lock mechanism

private synchronized DataChunk insertUC (FrameData cb, UndoChunk uc, Session s, LLT llt) throws Exception {
final FrameData ub = s.getTransaction().getAvailableFrame(uc, true);

final WaitFrame ubw = s.getTransaction().getAvailableFrame(uc, true);
final FrameData ub = ubw.getBd();
if (ub == null) {
//s.getTransaction().createUndoFrames(s);
//ub = s.getTransaction().getAvailableFrame(uc, true);
Expand All @@ -665,7 +676,7 @@ private synchronized DataChunk insertUC (FrameData cb, UndoChunk uc, Session s,
} else {
s.getTransaction().storeFrame(cb, ub, 0, s, llt);
}
ub.release();
ubw.release();
return dc;
}

Expand Down
48 changes: 13 additions & 35 deletions src/main/java/su/interference/core/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public FrameData getFrameData() {
return frameData;
}

public void setFrameData(FrameData frameData) {
this.frameData = frameData;
}

public DataObject getDataObject() {
return dataObject;
}
Expand Down Expand Up @@ -271,10 +275,11 @@ public Frame(byte[] bb, int file, long pointer, int size, FrameData bd, DataObje
this.res09 = bs.getIntFromBytes(92);

if ((this.file==0)&&(this.pointer==0)) {
logger.error("empty frame header frameId = " + (bd == null ? "N/A" : bd.getFrameId()) + " allocId = " + (bd == null ? "N/A" : bd.getAllocId()));
throw new EmptyFrameHeaderFound();
}
if ((this.file!=file)||(this.pointer!=pointer)) {
logger.error("InvalidFrameHeader: " + this.file + ":" + file + " " + this.pointer + ":" + pointer);
logger.error("invalid frame header frameId = " + (bd == null ? "N/A" : bd.getFrameId()) + " allocId = " + (bd == null ? "N/A" : bd.getAllocId()));
throw new InvalidFrameHeader();
}
if (this.objectId<0) {
Expand All @@ -296,8 +301,10 @@ public synchronized byte[] getFrame() throws InvalidFrame {

if (Config.getConfig().SYNC_LOCK_ENABLE||sync==0) {
for (Chunk c : data.getChunks()) {
final byte[] chunk_ = c.getChunk();
c.getHeader().setLen(chunk_.length);
res2.append(c.getHeader().getHeader());
res2.append(c.getChunk());
res2.append(chunk_);
used = used + c.getBytesAmount();
}
} else {
Expand All @@ -306,8 +313,10 @@ public synchronized byte[] getFrame() throws InvalidFrame {
}
for (Chunk c : data.getChunks()) {
if (c.getHeader().getLltId() < sync) {
final byte[] chunk_ = c.getChunk();
// c.getHeader().setLen(chunk_.length);
res2.append(c.getHeader().getHeader());
res2.append(c.getChunk());
res2.append(chunk_);
used = used + c.getBytesAmount();
}
}
Expand Down Expand Up @@ -352,32 +361,6 @@ public synchronized byte[] getFrame() throws InvalidFrame {
return res.getBytes();
}

public synchronized byte[] flushHeader() {
final ByteString res = new ByteString();
final ByteString bs = new ByteString(this.b);
res.addBytesFromInt(this.file);
res.addBytesFromLong(this.pointer);
res.addBytesFromInt(this.objectId);
res.addBytesFromInt(this.type);
res.addBytesFromInt(this.cptr);
res.addBytesFromInt(this.bytesAmount);
res.addBytesFromInt(this.rowCntr);
res.addBytesFromInt(this.sptr);
res.addBytesFromInt(this.allocFile);
res.addBytesFromLong(this.allocPointer);
res.addBytesFromInt(this.res01);
res.addBytesFromInt(this.res02);
res.addBytesFromInt(this.res03);
res.addBytesFromInt(this.res04);
res.addBytesFromInt(this.res05);
res.addBytesFromLong(this.res06);
res.addBytesFromLong(this.res07);
res.addBytesFromLong(this.res08);
res.addBytesFromInt(this.res09);
res.append(bs.substring(FRAME_HEADER_SIZE, this.b.length));
return res.getBytes();
}

public boolean equals (Frame bl) {
if ((this.file==bl.getFile())&&(this.pointer==bl.getPointer())) {
return true;
Expand Down Expand Up @@ -461,7 +444,7 @@ public synchronized int updateChunk(DataChunk chunk, Object o, Session s, LLT ll
if (chunk.getEntity()!=o) { //not same object
chunk.updateEntity(o);
}

chunk.setNormalState();
final byte[] ncb = chunk.getChunk();
chunk.getHeader().setLen(ncb.length);
final int newlen = chunk.getBytesAmount();
Expand Down Expand Up @@ -652,11 +635,6 @@ public HashMap getLiveTransactions() {
return rtran;
}

public ArrayList<TransFrame> getLiveTransFrames() {
final long ptr = this.file + this.pointer;
return Instance.getInstance().getTransFrames(ptr);
}

public int getBytesAmount() {
int used = FRAME_HEADER_SIZE;
final int size = data.getChunks().size();
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/su/interference/core/IndexElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,4 @@ public void setElement(Object element) {
this.element = element;
}

public String ElementToString () {
return "" + this.element;
}

}
15 changes: 7 additions & 8 deletions src/main/java/su/interference/core/IndexElementKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ public boolean equals(final Object obj) {
return false;
}

public String keyToString() {
String res = "";
for (int i=0; i<key.length; i++) {
res = res + key[i];
}
return res;
}

public Object[] getKey() {
return key;
}
Expand All @@ -92,4 +84,11 @@ public void setKey(Object[] key) {
this.key = key;
}

public int hashCode() {
int hashCode = 1;
for (Object o : key)
hashCode = 31 * hashCode + (o == null ? 0 : o.hashCode());
return hashCode;
}

}
53 changes: 19 additions & 34 deletions src/main/java/su/interference/core/Instance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ public void startupInstance(Session s) throws Exception, NoSuchMethodException,
startProcesses(s);
systemState = Instance.SYSTEM_STATE_UP;
//checkInMemoryIndexes();
logger.info(" ");
logger.info(" ");
logger.info("interference started");
logger.info(" ");
logger.info(" ");
logger.info("\n----------------------------------------------------------------------\n" +
"------------------------ interference started ------------------------\n" +
"------------------ (c) head systems, ltd 2010-2020 -------------------\n" +
"--------------------------- release 2020.1 ---------------------------\n" +
"----------------------------------------------------------------------");
} else {

systemState = Instance.SYSTEM_STATE_NA;
Expand All @@ -406,6 +406,8 @@ private static void registerMetrics() throws Exception {
Metrics.register(Metrics.HISTOGRAM, "recordRCount");
Metrics.register(Metrics.HISTOGRAM, "recordLCount");
Metrics.register(Metrics.HISTOGRAM, "syncQueue");
Metrics.register(Metrics.TIMER, "systemCleanUp");
Metrics.register(Metrics.METER, "сleanUpBlocks");
}

private void checkInMemoryIndexes() {
Expand Down Expand Up @@ -568,6 +570,12 @@ public Table getFrameDataTable() {
return (Table)((DataChunk)tt.getMapFieldByColumn("name").getMap().get("su.interference.persistent.FrameData")).getEntity();
}

protected Map getFramesMap () {
final Table t = getTableByName("su.interference.persistent.FrameData");
final MapField ixf = t.getMapFieldByColumn("frameId");
return ixf.getMap();
}

public FrameData getFrameById (long id) {
final Table t = getTableByName("su.interference.persistent.FrameData");
final MapField ixf = t.getMapFieldByColumn("frameId");
Expand Down Expand Up @@ -681,45 +689,22 @@ public synchronized List<Process> getProcesses () {
return r;
}

//used in getUndoChunkByRowId
public ArrayList<TransFrame> getTransFrames(long cframeId) {
final Table t = getTableByName("su.interference.persistent.TransFrame");
final ArrayList<TransFrame> r = new ArrayList<TransFrame>();
for (Object o : t.getIndexFieldByColumn("cframeId").getIndex().getObjectsByKey(cframeId)) {
r.add((TransFrame)((DataChunk)o).getEntity());
}
return r;
}

//used in storeFrame
public TransFrame getTransFrameById(long transId, long cframeId, long uframe) {
final Table t = getTableByName("su.interference.persistent.TransFrame");
for (Object o : t.getIndexFieldByColumn("cframeId").getIndex().getObjectsByKey(cframeId)) {
final TransFrame tb = (TransFrame)((DataChunk)o).getEntity();
if (tb.getTransId()==transId&&tb.getUframeId()==uframe) {
return tb;
}
final TransFrameId id = new TransFrameId(cframeId, uframe, transId);
DataChunk dc = (DataChunk) t.getMapFieldByColumn("frameId").getMap().get(id);
if (dc != null) {
return (TransFrame) dc.getEntity();
}
return null;
}

//used in commit/rollback mechanism
public synchronized ArrayList<TransFrame> getTransFrameByTransId (long transId) {
final Table t = getTableByName("su.interference.persistent.TransFrame");
final ArrayList<TransFrame> r = new ArrayList<TransFrame>();
for (Object o : t.getIndexFieldByColumn("transId").getIndex().getObjectsByKey(transId)) {
r.add((TransFrame)((DataChunk)o).getEntity());
}
return r;
}

//used in unlock table mechanism
@Deprecated
public synchronized ArrayList<TransFrame> getTransFrameByObjectId (int objectId) {
final Table t = getTableByName("su.interference.persistent.TransFrame");
//final Table t = getTableByName("su.interference.persistent.TransFrame");
final ArrayList<TransFrame> r = new ArrayList<TransFrame>();
for (Object o : t.getIndexFieldByColumn("objectId").getIndex().getObjectsByKey(objectId)) {
r.add((TransFrame)((DataChunk)o).getEntity());
}
return r;
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/su/interference/core/LLT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,15 @@ private static boolean poolNotEmpty() {
}

public void add(Frame b) {
b.getFrameData().setSynced(false);
frames.put(b.getFrameData().getFrameId(), b);
}

public void commit() {
pool.remove(this.id);
if (this.lock) {
for (Map.Entry<Long, Frame> entry : frames.entrySet()) {
entry.getValue().getFrameData().setSynced(true);
entry.getValue().clearSnaps(this.id);
}
frames.clear();
Expand All @@ -129,7 +131,7 @@ public long getId() {
return id;
}

public StackTraceElement[] getTrace() {
private StackTraceElement[] getTrace() {
return trace;
}
}
20 changes: 11 additions & 9 deletions src/main/java/su/interference/core/SyncFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public class SyncFrame implements Comparable, Serializable, AllowRPredicate {
private Frame rFrame;
private final HashMap<Long, Long> imap;
private final HashMap<Long, Transaction> rtran;
private final ArrayList<TransFrame> tframes;
private final static long serialVersionUID = 8712349857239487289L;

public SyncFrame(Frame frame, Session s, FreeFrame fb) throws Exception {
Expand All @@ -80,7 +79,6 @@ public SyncFrame(Frame frame, Session s, FreeFrame fb) throws Exception {

className = bd == null ? null : t.getName();
rtran = frame.getLiveTransactions();
tframes = frame.getLiveTransFrames();
if (frame.getClass().getName().equals("su.interference.core.DataFrame")) {
if (frame.getType()!=0) {
throw new InternalException();
Expand All @@ -92,8 +90,16 @@ public SyncFrame(Frame frame, Session s, FreeFrame fb) throws Exception {
final long nextId_ = db.getNextFrame()+db.getNextFile();
try {
//todo NPE possibly by evicted frame
prevId = prevId_ == 0 ? 0 : Instance.getInstance().getFrameById(prevId_).getAllocId();
nextId = nextId_ == 0 ? 0 : Instance.getInstance().getFrameById(nextId_).getAllocId();
try {
prevId = prevId_ == 0 ? 0 : Instance.getInstance().getFrameById(prevId_).getAllocId();
} catch (NullPointerException npe) {
logger.info("evicted frame caused an NPE during SyncFrame construction id = " + frame.getPtr());
}
try {
nextId = nextId_ == 0 ? 0 : Instance.getInstance().getFrameById(nextId_).getAllocId();
} catch (NullPointerException npe) {
logger.info("evicted frame caused an NPE during SyncFrame construction id = " + frame.getPtr());
}
} catch (Exception e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -126,7 +132,7 @@ public SyncFrame(Frame frame, Session s, FreeFrame fb) throws Exception {
fileType = Instance.getInstance().getDataFileById(frame.getFile()).getType();
b = frame.getFrame();
frameId = frame.getPtr();
this.allocId = frame.getAllocFile()+ frame.getAllocPointer();
this.allocId = frame.getAllocFile() + frame.getAllocPointer();
}

public Frame getRFrame() {
Expand Down Expand Up @@ -217,10 +223,6 @@ public HashMap<Long, Transaction> getRtran() {
return rtran;
}

public ArrayList<TransFrame> getTframes() {
return tframes;
}

public boolean equals (SyncFrame bl) {
if ((this.getFile()==bl.getFile())&&(this.getPointer()==bl.getPointer())) {
return true;
Expand Down
Loading